Merge pull request #490 from t3-innovation-network/staging

Release 04/09/2024

.cloud66/manifest.yml

@@ -3,9 +3,11 @@ default: &default
     configuration:
       asset_pipeline_enabled: true
       asset_pipeline_precompile: true
-      node_version: 16.20.0
-      operating_system: ubuntu2004
-      ruby_version: 3.2.2
+      node_version: "16.20.0"
+      operating_system: ubuntu2204
+      ruby_version: "3.2.2"
+  redis:
+      version: 7.0.5
 
 production:
   <<: *default

.eslintrc.json

@@ -4,12 +4,12 @@
     "es2021": true
   },
   "globals": {
-    "$": false,
     "_": false
   },
   "extends": [
     "eslint:recommended",
     "plugin:react/recommended",
+    "plugin:react/jsx-runtime",
     "prettier"
   ],
   "overrides": [

.rubocop.yml

@@ -22,7 +22,7 @@ AllCops:
     - 'config/**/*'
     - 'config.ru'
   NewCops: enable
-  TargetRubyVersion: 3.0
+  TargetRubyVersion: 3.2
 
 Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented_relative_to_receiver

Gemfile

@@ -20,24 +20,21 @@ gem "rack-cors", require: "rack/cors"
 ###
 # REST OF THE DEPENDENCIES
 
+gem "active_model_serializers", "~> 0.10"
+
 # Audit changes
 gem "audited", "~> 4.9"
 
-gem "autoprefixer-rails"
-
 # Reduces boot times through caching; required in config/boot.rb
 gem "bootsnap", ">= 1.4.2", require: false
 
-# Load env variables in dev & test modes
-gem "dotenv-rails", "~> 2.7", groups: %i[development test]
-
 # For http requests
 gem "httparty"
 
 gem "interactor-rails", "~> 2.0"
 
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem "jbuilder", "~> 2.7"
+# gem "jbuilder", "~> 2.7"
 
 gem "json_schema_tools", "~> 0.6"
 
@@ -69,9 +66,6 @@ gem "pundit"
 # Centralize access to tasks
 gem "rake"
 
-# Get react support on rails
-gem "react-rails"
-
 # A Ruby client library for Redis
 gem "redis"
 
@@ -100,17 +94,19 @@ group :development, :test do
   gem "database_cleaner"
   # See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem
   gem "debug", platforms: %i[mri mingw x64_mingw]
+  # Load env variables in dev & test modes
+  gem "dotenv-rails", "~> 2.7"
   gem "factory_bot_rails"
   gem "faker"
-  gem "rspec-rails", "~> 4.0.1"
+  gem "rspec-rails"
   # Use rubocop to ensure our code is clean
   gem "rubocop", "~> 1.60", require: false
   # Disable rubocop for specs for now, too many offenses
   # gem "rubocop-rspec", require: false
   gem "shoulda-matchers"
   gem "traceroute"
-  gem "vcr", "~> 6.0"
-  gem "webmock", "~> 3.13"
+  gem "vcr", "~> 6.2"
+  gem "webmock", "~> 3.23"
 end
 
 group :development do

Gemfile.lock

@@ -46,6 +46,11 @@ GEM
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    active_model_serializers (0.10.14)
+      actionpack (>= 4.1)
+      activemodel (>= 4.1)
+      case_transform (>= 0.2)
+      jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
     activejob (6.1.6.1)
       activesupport (= 6.1.6.1)
       globalid (>= 0.3.6)
@@ -75,12 +80,6 @@ GEM
     ast (2.4.2)
     audited (4.10.0)
       activerecord (>= 4.2, < 6.2)
-    autoprefixer-rails (10.4.16.0)
-      execjs (~> 2)
-    babel-source (5.8.35)
-    babel-transpiler (0.7.0)
-      babel-source (>= 4.0, < 6)
-      execjs (~> 2.0)
     backport (1.2.0)
     bcp47_spec (0.2.1)
     bcrypt (3.1.20)
@@ -105,6 +104,8 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
+    case_transform (0.2)
+      activesupport
     childprocess (5.0.0)
     choice (0.2.0)
     concurrent-ruby (1.2.3)
@@ -138,7 +139,6 @@ GEM
       sxp (~> 1.3)
       unicode-types (~> 1.8)
     erubi (1.12.0)
-    execjs (2.9.1)
     factory_bot (6.4.6)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.4.3)
@@ -164,7 +164,7 @@ GEM
     httparty (0.21.0)
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.14.1)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
     iniparse (1.5.0)
     interactor (3.1.2)
@@ -176,9 +176,6 @@ GEM
       rdoc
       reline (>= 0.4.2)
     jaro_winkler (1.5.6)
-    jbuilder (2.11.5)
-      actionview (>= 5.0.0)
-      activesupport (>= 5.0.0)
     json (2.7.1)
     json-canonicalization (1.0.0)
     json-ld (3.3.1)
@@ -195,6 +192,7 @@ GEM
       addressable (>= 2.8)
     json_schema_tools (0.6.6)
       json
+    jsonapi-renderer (0.2.2)
     jwt (2.7.1)
     kramdown (2.4.0)
       rexml
@@ -259,7 +257,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
     mini_mime (1.1.2)
-    minitest (5.22.2)
+    minitest (5.22.3)
     msgpack (1.7.2)
     multi_json (1.15.0)
     multi_xml (0.6.0)
@@ -276,9 +274,9 @@ GEM
       net-protocol
     netrc (0.11.0)
     nio4r (2.5.8)
-    nokogiri (1.16.2-arm64-darwin)
+    nokogiri (1.16.3-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.2-x86_64-linux)
+    nokogiri (1.16.3-x86_64-linux)
       racc (~> 1.4)
     open_uri_redirections (0.2.1)
     overcommit (0.62.0)
@@ -298,7 +296,7 @@ GEM
     pundit (2.3.1)
       activesupport (>= 3.0.0)
     racc (1.7.3)
-    rack (2.2.8)
+    rack (2.2.9)
     rack-cors (2.0.1)
       rack (>= 2.0.0)
     rack-proxy (0.7.7)
@@ -410,12 +408,6 @@ GEM
       rexml (~> 3.2)
     rdoc (6.6.2)
       psych (>= 4.0.0)
-    react-rails (3.2.0)
-      babel-transpiler (>= 0.7.0)
-      connection_pool
-      execjs
-      railties (>= 3.2)
-      tilt
     redis (5.1.0)
       redis-client (>= 0.17.0)
     redis-client (0.20.0)
@@ -441,15 +433,15 @@ GEM
     rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (4.0.2)
-      actionpack (>= 4.2)
-      activesupport (>= 4.2)
-      railties (>= 4.2)
-      rspec-core (~> 3.10)
-      rspec-expectations (~> 3.10)
-      rspec-mocks (~> 3.10)
-      rspec-support (~> 3.10)
-    rspec-support (3.13.0)
+    rspec-rails (6.1.1)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
+      railties (>= 6.1)
+      rspec-core (~> 3.12)
+      rspec-expectations (~> 3.12)
+      rspec-mocks (~> 3.12)
+      rspec-support (~> 3.12)
+    rspec-support (3.13.1)
     rubocop (1.60.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
@@ -487,7 +479,7 @@ GEM
       rdf-xsd (~> 3.3)
       sparql (~> 3.3)
       sxp (~> 1.3)
-    shoulda-matchers (5.3.0)
+    shoulda-matchers (6.1.0)
       activesupport (>= 5.2.0)
     simplecov (0.22.0)
       docile (~> 1.1)
@@ -545,7 +537,7 @@ GEM
       rdf (~> 3.3)
     temple (0.10.3)
     test-prof (1.3.1)
-    thor (1.3.0)
+    thor (1.3.1)
     tilt (2.0.10)
     timeout (0.4.1)
     traceroute (0.8.1)
@@ -565,7 +557,7 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webmock (3.20.0)
+    webmock (3.23.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -592,9 +584,9 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
+  active_model_serializers (~> 0.10)
   annotate
   audited (~> 4.9)
-  autoprefixer-rails
   bcrypt (~> 3.1, >= 3.1.15)
   bootsnap (>= 1.4.2)
   brakeman
@@ -609,7 +601,6 @@ DEPENDENCIES
   htmlbeautifier
   httparty
   interactor-rails (~> 2.0)
-  jbuilder (~> 2.7)
   json-schema
   json_schema_tools (~> 0.6)
   jwt
@@ -627,10 +618,9 @@ DEPENDENCIES
   rails (= 6.1.6.1)
   rails-erd
   rake
-  react-rails
   redis
   rerun
-  rspec-rails (~> 4.0.1)
+  rspec-rails
   rubocop (~> 1.60)
   ruby-prof (>= 0.17.0)
   rubyzip (~> 2.3)
@@ -646,10 +636,10 @@ DEPENDENCIES
   test-prof
   traceroute
   turbolinks (~> 5)
-  vcr (~> 6.0)
+  vcr (~> 6.2)
   vernier (>= 0.3.0)
   web-console (>= 3.3.0)
-  webmock (~> 3.13)
+  webmock (~> 3.23)
   webpacker (~> 5.x)
 
 RUBY VERSION

app/assets/stylesheets/application.scss

@@ -1,4 +1,12 @@
-@import 'colors';
+@import 'utils/bem';
+@import 'base/colors';
+@import 'utils/utilities';
+@import 'components/card';
+@import 'components/drag-n-drop';
+@import 'customradio';
+@import 'forms';
+@import 'navbar';
+@import 'stepper';
 
 /* General */
 
@@ -79,6 +87,10 @@ a:hover {
 .hover-col-primary:hover {
   background-color: $primary-color;
   color: $foreground-color;
+
+  .text-muted {
+    color: $foreground-color !important;
+  }
 }
 
 .underlined {
@@ -253,6 +265,9 @@ a:hover {
 }
 
 /* Others */
+button[disabled] {
+  pointer-events: auto;
+}
 
 .desm-tooltip {
   color: $primary-color;
@@ -293,6 +308,10 @@ a:hover {
   border: 2px solid $dashboard-background-color;
 }
 
+.border-warning {
+  border: 2px solid $warning-color !important;
+}
+
 .dashboard-active-tab {
   border-top: 2px solid $dashboard-background-color-highlight;
 }
@@ -303,7 +322,7 @@ a:hover {
 }
 
 .term-card {
-  min-height: 5.5rem;
+  min-height: 3rem;
 }
 
 /* Mobile */

app/assets/stylesheets/colors.scss → app/assets/stylesheets/base/_colors.scss

@@ -12,3 +12,4 @@ $dashboard-background-color: #132639;
 $dashboard-background-color-light: #efefef;
 $dashboard-background-color-highlight: #2d9bf0;
 $dashboard-background-color-highlight2: #a9c9e9;
+$warning-color: #ffc107;

app/assets/stylesheets/components/_card.scss

@@ -0,0 +1,7 @@
+.card-body {
+  padding: $card-spacer-y $card-spacer-x;
+}
+
+p.card-text {
+  margin-bottom: $card-spacer-y;
+}