New UI 2023

.codeclimate.yml

@@ -7,19 +7,39 @@ prepare:
 plugins:
   brakeman:
     enabled: true
+    checks:
+      mass_assign_permit!:
+        enabled: false
   bundler-audit:
     enabled: true
   duplication:
     enabled: true
     config:
+      count_threshold: 3
       languages:
-      - ruby
-      - javascript
+        ruby:
+          mass_threshold: 100
+        javascript:
+          mass_threshold: 100
   eslint:
     enabled: true
+    channel: eslint-5
+  fixme:
+    enabled: true
+    checks:
+      TODO:
+        enabled: false
   rubocop:
     enabled: true
-    channel: rubocop-1-12-1
+    # channel: rubocop-1-56-3
+    config: .rubocop.yml
+checks:
+  method-lines:
+    config:
+      threshold: 40
+  method-count:
+    config:
+      threshold: 25
 exclude_patterns:
   - "bin/"
   - "config/"
@@ -28,4 +48,5 @@ exclude_patterns:
   - "vendor/"
   - "test/"
   - "karma.conf.js"
-  - "app/packs/src/semantic/"
+  - "app/packs/"
+  - "CHANGELOG.md"

.github/workflows/ruby.yml

@@ -15,8 +15,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04]
-        ruby: [ '3.2.2' ]
+        os: [ubuntu-22.04]
+        ruby: [ '3.2', '3.2.2' ]
     runs-on: ${{ matrix.os }}
     continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'debug' }}
     steps:
@@ -36,14 +36,12 @@ jobs:
           bundle config set deployment '[secure]'
           bundle env
           head -n1 $(which bundle)
-      - name: Install wkhtmlpdf (push)
+
+      - name: Install wkhtmltopdf (push)
         run: |
-          sudo apt-get update
-          wget http://ppa.launchpad.net/linuxuprising/libpng12/ubuntu/pool/main/libp/libpng/libpng12-0_1.2.54-1ubuntu1.1+1~ppa0~eoan_amd64.deb
-          sudo dpkg -i libpng12-0_1.2.54-1ubuntu1.1+1~ppa0~eoan_amd64.deb
-          wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.focal_amd64.deb
-          sudo apt-get install -y gdebi
-          sudo gdebi --non-interactive wkhtmltox_0.12.6-1.focal_amd64.deb
+          sudo apt-get install -y xfonts-base xfonts-75dpi
+          wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-2/wkhtmltox_0.12.6.1-2.jammy_amd64.deb
+          sudo dpkg -i wkhtmltox_0.12.6.1-2.jammy_amd64.deb
         if: github.event_name == 'push'
 
       - name: Set ENV for codeclimate (pull_request)
@@ -66,6 +64,7 @@ jobs:
           curl -LSs 'https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64' >./cc-test-reporter;
           chmod +x ./cc-test-reporter
           ./cc-test-reporter before-build
+
       - name: Run Tests
         env:
           PG_DATABASE: postgres
@@ -76,6 +75,7 @@ jobs:
           RAILS_ENV: test
           COVERAGE: true
           DISABLE_SPRING: 1
+          CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
         run: |
           cp config/database.yml.sample config/database.yml
           cp config/customization.yml.sample config/customization.yml
@@ -87,17 +87,19 @@ jobs:
       - name: Save coverage
         run: ./cc-test-reporter format-coverage --output coverage/codeclimate.${{ matrix.ruby }}.json
 
-      - uses: actions/upload-artifact@v4.3.1
+      - uses: actions/upload-artifact@v3.1.3
         with:
           name: coverage-${{ matrix.ruby }}
           path: coverage/codeclimate.${{ matrix.ruby }}.json
 
   upload_coverage:
     strategy:
+      fail-fast: false
       matrix:
-        os: [ ubuntu-20.04 ]
+        os: [ ubuntu-22.04 ]
         ruby: [ '3.2.2' ]
     runs-on: ubuntu-22.04
+
     env:
       CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
       CC_TEST_REPORTER_URL: https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64
@@ -111,7 +113,7 @@ jobs:
       - name: Give test coverage reporter executable permissions
         run: chmod +x cc-test-reporter
 
-      - uses: actions/download-artifact@v4.1.4
+      - uses: actions/download-artifact@v3.0.2
         with:
           name: coverage-${{ matrix.ruby }}
           path: coverage

.gitignore

@@ -30,8 +30,6 @@
 
 /public/assets
 .byebug_history
-.rubocop-ruby.yml
-.rubocop.yml
 
 # Test files
 /coverage/
@@ -55,5 +53,9 @@ yarn-debug.log*
 /public/assets/builds
 public/assets/builds/*
 app/assets/builds/*
+.DS_Store
+/app/assets/builds/*
+!/app/assets/builds/.keep1
+!/app/assets/builds/.keep
 
-.DS_Store
+Dockerfile.dev

.rubocop.yml

@@ -0,0 +1,6 @@
+AllCops:
+  Exclude:
+    - 'test/**/*'
+    - 'config/**/*'
+Style/Documentation:
+  Enabled: false

.ruby-version

@@ -1,2 +1 @@
 3.2.2
-

Dockerfile

@@ -1,78 +1,21 @@
-FROM internetee/ruby:3.2.2
+FROM internetee/ruby:3.2.2-refactor as base
 
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-RUN apt-get update > /dev/null && apt-get install -y --no-install-recommends > /dev/null \
-    build-essential=* \
-    imagemagick=* \
-    curl \
-    wget \
-    gnupg2 \
-    git \
-    apt-utils \
-    && apt-get dist-upgrade -yf\
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y locales
-RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen
-RUN sed -i -e 's/# et_EE.UTF-8 UTF-8/et_EE.UTF-8 UTF-8/' /etc/locale.gen && \
-    dpkg-reconfigure --frontend=noninteractive locales && \
-    update-locale LANG=et_EE.UTF-8
-
-ENV LANG et_EE.UTF-8
-RUN curl https://www.postgresql.org/media/keys/ACCC4CF8.asc -s | apt-key add -
-RUN sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
-RUN apt-get update > /dev/null && apt-get install -y --no-install-recommends > /dev/null \
-    postgresql-client-13=* \
-    libpq-dev \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-# add repository for Node.js in the LTS version
-RUN curl -sL https://deb.nodesource.com/setup_18.x | bash -
+RUN npm install -g yarn@latest
+COPY --link Gemfile Gemfile.lock ./
+RUN gem install bundler && bundle install --jobs 20 --retry 5
+COPY --link package.json yarn.lock ./
+RUN yarn install --frozen-lockfile
 
-RUN apt-get install -y --no-install-recommends > /dev/null \
-  nodejs=* \
-  qt5-default=* \
-  libqt5webkit5-dev=* \
-  gstreamer1.0-plugins-base=* \
-  libappindicator3-1=* \
-  gstreamer1.0-tools=* \
-  qtdeclarative5-dev=* \
-  fonts-liberation=* \
-  gstreamer1.0-x=* \
-  libasound2=* \
-  libnspr4=* \
-  libnss3=* \
-  libxss1=* \
-  libxtst6=* \
-  xdg-utils=* \
-  qtdeclarative5-dev=* \
-  fonts-liberation=* \
-  gstreamer1.0-x=* \
-  wkhtmltopdf \
-  libxslt1-dev \
-  libxml2-dev \
-  python-dev \
-  && apt-get clean \
-  && rm -rf /var/lib/apt/lists/*
+FROM base
 
-RUN npm install -g yarn@latest
+RUN useradd rails
+RUN mkdir -p /home/rails && chown rails:rails /home/rails
 
-RUN curl https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb -o /chrome.deb
-RUN dpkg -i /chrome.deb || apt-get update > /dev/null \
-    && apt-get install -yf --no-install-recommends > /dev/null && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-RUN dpkg -i /chrome.deb
-RUN rm /chrome.deb
-RUN sed -i 's/SECLEVEL=2/SECLEVEL=1/' /etc/ssl/openssl.cnf
+USER rails:rails
 
-RUN mkdir -p /opt/webapps/app/tmp/pids
-WORKDIR /opt/webapps/app
+RUN mkdir -p /opt/webapps/app/tmp/pids 
 
-COPY Rakefile Gemfile Gemfile.lock ./
-RUN gem install bundler && bundle install --jobs 20 --retry 5
-COPY package.json yarn.lock ./
-RUN yarn install --check-files
+COPY --from=base --chown=rails:rails /usr/local/bundle /usr/local/bundle
+COPY --from=base --chown=rails:rails /opt/webapps/app /opt/webapps/app
 
 EXPOSE 3000

Gemfile

@@ -8,37 +8,44 @@ gem 'amazing_print'
 gem 'bootsnap', '>= 1.1.0', require: false
 gem 'cancancan'
 gem 'chartkick'
+gem 'cssbundling-rails'
 gem 'data_migrate'
 gem 'delayed_job', '~> 4.1.0'
 gem 'delayed_job_active_record'
 gem 'devise'
 gem 'directo', github: 'internetee/directo', branch: 'master'
+gem 'faker'
 gem 'faraday'
+gem 'freezolite', require: false
+gem 'hotwire-rails', '~> 0.1.3'
 gem 'jbuilder', '~> 2.11'
+gem 'jsbundling-rails'
+gem 'jwt'
 gem 'lograge'
 gem 'mimemagic', '~> 0.4.3'
 gem 'money'
+gem 'noticed', '~> 1.6'
 gem 'okcomputer', '~> 1.18.4'
 gem 'omniauth-rails_csrf_protection'
 gem 'omniauth-tara', github: 'internetee/omniauth-tara'
+gem 'pagy', '~> 6.0'
 gem 'pdfkit'
 gem 'pg', '>= 0.18', '< 2.0'
 gem 'puma', '~> 6.4.2'
+gem 'pg_search'
+gem 'propshaft'
 gem 'rails', '>= 6.0.3.5'
 gem 'rails-i18n'
 gem 'recaptcha'
+gem 'redis', '~> 5.0'
 gem 'ruby-openai'
 gem 'scenic'
 gem 'simpleidn'
 gem 'skylight'
-gem 'sprockets', '~> 4.0'
 gem 'turbo-rails'
-gem 'webpacker', '~> 6.0.0.rc.5'
-gem 'webpush'
 gem 'valvat'
-
-# token
-gem 'jwt'
+gem 'view_component'
+gem 'webpush'
 
 group :development, :test do
   gem 'bullet'
@@ -52,37 +59,23 @@ group :development, :test do
   gem "rubocop-packaging"
   gem "rubocop-rspec"
   gem "rubocop-shopify"
-  gem "rubocop-thread_safety"
+  # gem "rubocop-thread_safety"
 end
 
 group :development do
+  gem 'htmlbeautifier'
   gem 'i18n-debug'
+  gem 'letter_opener', '~> 1.8'
   gem 'listen', '>= 3.0.5', '< 3.9'
+  gem 'ruby-lsp-rails'
   gem 'web-console', '>= 3.3.0'
 end
 
 group :test do
   gem 'capybara', '>= 2.15'
-  gem 'selenium-webdriver'
-  gem 'simplecov', '~> 0.10', '< 0.18', require: false
+  gem 'cuprite'
+  # gem 'selenium-webdriver'
+  gem 'simplecov', require: false
   gem 'spy'
   gem 'webmock'
 end
-
-# frontend
-gem 'hotwire-rails', '~> 0.1.3'
-# Use Redis for Action Cable
-
-# gem 'redis', '~> 5.0'
-gem 'redis', '~> 5.0'
-
-# For search
-gem 'pg_search'
-
-# For pagination
-gem 'pagy', '~> 6.0'
-
-# For mock username
-gem 'faker'
-
-gem 'noticed', '~> 1.6'