Monolith final

.github/workflows/ruby.yml

@@ -3,72 +3,26 @@ name: Ruby
 on: [push]
 
 jobs:
-  docker_build:
-    name: Build Dockerfile
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/[email protected]
-      - name: Build the Dockerfile
-        run: docker build -t app .
   build:
-    name: The Build
+    name: Build and test
     runs-on: ubuntu-latest
-
-    services:
-      redis:
-        image: redis:4
-        ports:
-          - 6379:6379
-      postgres:
-        image: postgres:10
-        env:
-          POSTGRES_DB: postgres
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_USER: postgres
-        ports: ["5432:5432"]
-        # needed because the postgres container does not provide a healthcheck
-        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
     steps:
-    - uses: actions/[email protected]
+      - uses: actions/checkout@v3
+      - name: Copy .env file
+        uses: canastro/copy-file-action@master
+        with:
+          source: "env.example"
+          target: ".env"
 
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        bundler-cache: true
+      - name: Build the Stack
+        run: "docker compose build"
 
-    - name: Show available Ruby versions
-      run: |
-        ls $RUNNER_TOOL_CACHE/Ruby
-        uname -a
-        cat /etc/os-release
+      - name: Start dependencies
+        run: "docker compose up -d --no-deps db redis app"
 
-    - name: Install required packages
-      run: sudo apt-get install libpq-dev
+      - name: Run all tests
+        run: "docker compose exec app ./ci.sh"
 
-    - name: Test
-      run: |
-        RAILS_ENV=test bundle exec rails db:create
-        RAILS_ENV=test bundle exec rails db:schema:load
-        bundle exec rake
-      env:
-        #Note: DATABASE_URL does not work in TEST env.
-        TEST_DB_HOST: localhost
-        TEST_DB_USERNAME: postgres
-        TEST_DB_PASSWORD: postgres
-        TEST_DB_NAME: postgres
-        discourse_sso_secret: "secret"
-        discourse_endpoint: "https://example.com"
-        PG_PORT: ${{ job.services.postgres.ports['5432'] }}
+      - name: Teardown the stack
+        run: "docker compose down"
 
-    #- name: Deploy to server via SSH
-      #uses: appleboy/ssh-action@master
-      #with:
-        #host: ${{ secrets.HOST }}
-        #key: ${{ secrets.KEY }}
-        #port: ${{ secrets.PORT }}
-        #username: ${{ secrets.USERNAME }}
-        #script: |
-          #cd smartcitizen-api
-          #pwd
-          #./scripts/deploy.sh
-      #if: github.ref == 'refs/heads/master' && job.status == 'success'

.gitignore

@@ -20,6 +20,7 @@
 /config/application.yml
 
 /public/api
+/public/assets
 /public/coverage
 /coverage
 *.rdb
@@ -54,3 +55,10 @@ scripts/emqt
 .tool-versions
 
 compose.override.yml
+
+/public/packs
+/public/packs-test
+/node_modules
+/yarn-error.log
+yarn-debug.log*
+.yarn-integrity

Dockerfile

@@ -1,11 +1,35 @@
 FROM ruby:3.0.6
 
+SHELL ["/bin/bash", "--login", "-c"]
+
+# Set debconf to run non-interactively
+RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
+
 # Install essential Linux packages
 RUN apt-get update -qq && apt-get install -y \
     build-essential \
     libpq-dev \
     postgresql-client \
-    nodejs
+    apt-transport-https \
+    ca-certificates \
+    curl \
+    git \
+    libssl-dev \
+    wget
+
+ENV NVM_DIR /usr/local/nvm
+ENV NODE_VERSION 22.12.0
+ENV NODE_PATH $NVM_DIR/v$NODE_VERSION/lib/node_modules
+ENV PATH      $NVM_DIR/v$NODE_VERSION/bin:$PATH
+
+RUN mkdir $NVM_DIR
+
+RUN curl https://raw.githubusercontent.com/creationix/nvm/v0.40.1/install.sh | bash \
+    && . $NVM_DIR/nvm.sh \
+    && nvm install $NODE_VERSION \
+    && nvm alias default $NODE_VERSION \
+    && nvm use default \
+    && npm install -g yarn
 
 WORKDIR /app
 
@@ -18,6 +42,10 @@ ARG BUNDLE_WITHOUT
 ENV BUNDLE_WITHOUT ${BUNDLE_WITHOUT}
 RUN bundle install
 
+
+COPY package.json yarn.lock /app/
+RUN . $NVM_DIR/nvm.sh && nvm use default && yarn install
+
 # Copy the Rails application into place
 COPY . /app
 

Gemfile

@@ -4,12 +4,15 @@ source 'https://rubygems.org'
 gem 'rails', '6.1.7.3'
 gem 'sidekiq', '~> 6'
 gem 'doorkeeper', '~> 5'
-
+gem "webpacker"
 gem 'jquery-rails'
 gem 'sass-rails'
 gem 'turbolinks'
 gem 'uglifier'
-
+gem "autoprefixer-rails"
+gem "bootstrap", "~> 5.3.3"
+gem "bootstrap_form", "~> 5.4"
+gem "font-awesome-sass", "~> 4.6.2"
 # To resize active storage images:
 # Revise if this is needed after Rails 6.0
 gem 'image_processing'
@@ -23,6 +26,7 @@ gem "bootsnap", '~> 1.9.4'
 gem 'browser'
 gem 'c_geohash', require: false
 gem 'countries'
+gem "country_select"
 gem 'dalli'
 gem 'date_validator'
 gem 'diffy', require: false
@@ -77,6 +81,7 @@ group :test do
   gem 'vcr'
   gem 'webmock'
   gem 'zonebie'
+  gem 'rails-controller-testing'
 end
 
 group :development do

Gemfile.lock

@@ -93,6 +93,8 @@ GEM
     api-pagination (5.0.0)
     api_cache (0.3.0)
     ast (2.4.2)
+    autoprefixer-rails (10.4.19.0)
+      execjs (~> 2)
     awesome_print (1.9.2)
     aws-eventstream (1.2.0)
     aws-partitions (1.769.0)
@@ -113,6 +115,12 @@ GEM
     bcrypt (3.1.18)
     bootsnap (1.9.4)
       msgpack (~> 1.0)
+    bootstrap (5.3.3)
+      autoprefixer-rails (>= 9.1.0)
+      popper_js (>= 2.11.8, < 3)
+    bootstrap_form (5.4.0)
+      actionpack (>= 6.1)
+      activemodel (>= 6.1)
     browser (5.3.1)
     builder (3.2.4)
     byebug (11.1.3)
@@ -134,6 +142,8 @@ GEM
     connection_pool (2.4.1)
     countries (5.4.0)
       unaccent (~> 0.3)
+    country_select (9.0.0)
+      countries (> 5.0, < 7.0)
     crack (0.4.5)
       rexml
     crass (1.0.6)
@@ -189,6 +199,8 @@ GEM
     fog-xml (0.1.4)
       fog-core
       nokogiri (>= 1.5.11, < 2.0.0)
+    font-awesome-sass (4.6.2)
+      sass (>= 3.2)
     formatador (1.1.0)
     friendly_id (5.5.0)
       activerecord (>= 4.0.0)
@@ -323,6 +335,7 @@ GEM
       activerecord (>= 5.2)
       activesupport (>= 5.2)
     polyglot (0.3.5)
+    popper_js (2.11.8)
     premailer (1.21.0)
       addressable
       css_parser (>= 1.12.0)
@@ -356,6 +369,8 @@ GEM
       rack (>= 2.0.0)
     rack-protection (3.0.6)
       rack
+    rack-proxy (0.7.7)
+      rack
     rack-test (2.1.0)
       rack (>= 1.3)
     rack-timeout (0.6.3)
@@ -375,6 +390,10 @@ GEM
       bundler (>= 1.15.0)
       railties (= 6.1.7.3)
       sprockets-rails (>= 2.0.0)
+    rails-controller-testing (1.0.5)
+      actionpack (>= 5.0.1.rc1)
+      actionview (>= 5.0.1.rc1)
+      activesupport (>= 5.0.1.rc1)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
@@ -460,6 +479,11 @@ GEM
     rufus-scheduler (3.8.2)
       fugit (~> 1.1, >= 1.1.6)
     safe_yaml (1.0.5)
+    sass (3.7.4)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
     sass-rails (6.0.0)
       sassc-rails (~> 2.1, >= 2.1.1)
     sassc (2.4.0)
@@ -470,6 +494,7 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
+    semantic_range (3.1.0)
     sentry-rails (5.9.0)
       railties (>= 5.0)
       sentry-ruby (~> 5.9.0)
@@ -548,6 +573,11 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webpacker (5.4.4)
+      activesupport (>= 5.2)
+      rack-proxy (>= 0.6.1)
+      railties (>= 5.2)
+      semantic_range (>= 2.3.0)
     webrick (1.8.1)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
@@ -569,17 +599,21 @@ DEPENDENCIES
   ancestry
   api-pagination
   api_cache
+  autoprefixer-rails
   awesome_print
   aws-sdk-s3
   bcrypt
   bootsnap (~> 1.9.4)
+  bootstrap (~> 5.3.3)
+  bootstrap_form (~> 5.4)
   brakeman!
   browser
   byebug
   c_geohash
   cane
   capybara
   countries
+  country_select
   dalli
   date_validator
   diffy
@@ -589,6 +623,7 @@ DEPENDENCIES
   faker
   fast_blank
   fog-aws (~> 3.19.0)
+  font-awesome-sass (~> 4.6.2)
   friendly_id
   geocoder
   guard-rspec
@@ -620,6 +655,7 @@ DEPENDENCIES
   rack-timeout
   railroady
   rails (= 6.1.7.3)
+  rails-controller-testing
   rails-erd
   ransack
   rdoc
@@ -648,6 +684,7 @@ DEPENDENCIES
   vcr
   versionist!
   webmock
+  webpacker
   webrick
   workflow
   workflow-activerecord
@@ -657,4 +694,4 @@ RUBY VERSION
    ruby 3.0.6p216
 
 BUNDLED WITH
-   2.5.22
+   2.5.23

app/assets/config/manifest.js

@@ -1,3 +1,2 @@
 //= link_tree ../images
-//= link_directory ../javascripts .js
-//= link_directory ../stylesheets .css
+//= link application.css