Merge remote-tracking branch 'origin/main' into feature/invoices/disc…

…ounts

# Conflicts:
#	frontend/static/js/bundle.js
#	frontend/static/src/output.css
#	package.json

.editorconfig

@@ -0,0 +1,30 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+
+# Top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+# Trim trailing whitespace automatically
+trim_trailing_whitespace = true
+
+# Set default charset
+charset = utf-8
+
+# Use tabs for indentation
+[*.{py,html}]
+indent_style = space
+indent_size = 4
+
+[*.{js,yml}]
+indent_style = space
+indent_size = 2
+
+# Ignore some directories
+[**/__pycache__]
+[**/migrations]
+[**/node_modules]

.github/workflows/check_typos.yml

@@ -0,0 +1,36 @@
+name: Check Typos
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  check-typos:
+    strategy:
+      fail-fast: true
+      matrix:
+        os: [ ubuntu-latest ]
+        python-version: [ "3.*" ]
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      #----------------------------------------------
+      #       check-out repo and set-up python
+      #----------------------------------------------
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      #----------------------------------------------
+      #       check grammar with typos
+      #----------------------------------------------
+      - name: Check grammar with typos
+        run: |
+          pip3 install typos
+          typos

.github/workflows/push_release.yml

@@ -24,6 +24,28 @@ jobs:
         id: get_version
         run: echo ::set-output name=TAG_NAME::${GITHUB_REF/refs\/tags\//}
 
+      #----------------------------------------------
+      #       build Frontend files
+      #----------------------------------------------
+      - name: Build frontend
+        run: |
+          npm ci
+          npm run tailwind-build
+          npm run webpack-build
+
+          if [ -f frontend/static/src/output.css ]; then
+            echo "output.css is created"
+          else
+            echo "output.css is not created"
+            exit 1
+          fi
+          if [ -f frontend/static/js/bundle.js ] && [ -f frontend/static/js/bundle.js.map ]; then
+            echo "bundle.js and bundle.js.map are created"
+          else
+            echo "bundle.js and/or bundle.js.map are not created"
+            exit 1
+          fi
+
       - name: Configure AWS credentials
         id: aws-credentials
         uses: aws-actions/configure-aws-credentials@v4

.github/workflows/run_tests.yml

@@ -42,22 +42,35 @@ jobs:
           virtualenvs-in-project: false
           installer-parallel: true
 
-      #----------------------------------------------
-      #       install docker compose
-      #       setup + configure docker compose
-      #----------------------------------------------
-      - name: Install Docker Compose
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y docker-compose
-
-
       #----------------------------------------------
       #       copy docker compose file
       #----------------------------------------------
       - name: Copy docker compose file
         run: |
           cp $GITHUB_WORKSPACE/$DOCKER_COMPOSE_PATH ./docker-compose.yml
+      
+      #----------------------------------------------
+      #       build Frontend files
+      #----------------------------------------------
+
+      - name: Install dependencies and build frontend
+        run: |
+          npm ci
+          npm run tailwind-build
+          npm run webpack-build
+
+          if [ -f frontend/static/src/output.css ]; then
+            echo "output.css is created"
+          else
+            echo "output.css is not created"
+            exit 1
+          fi
+          if [ -f frontend/static/js/bundle.js ] && [ -f frontend/static/js/bundle.js.map ]; then
+            echo "bundle.js and bundle.js.map are created"
+          else
+            echo "bundle.js and/or bundle.js.map are not created"
+            exit 1
+          fi
 
       #----------------------------------------------
       #       run docker compose & tests

.gitignore

@@ -105,6 +105,7 @@ celerybeat.pid
 # Environments
 .env
 *.env
+environment.yml
 
 !.env.sample
 
@@ -161,4 +162,9 @@ override.tf.json
 terraform.rc
 
 # Temporary (WRITERSIDE)
-Writerside/**
+Writerside/**
+
+# Generated fronted files
+frontend/static/src/output.css
+frontend/static/js/bundle.js
+frontend/static/js/bundle.js.map

.typos.toml

@@ -0,0 +1,2 @@
+[files]
+extend-exclude = ["**/bundle.js", "**/bundle.js.map"]