Merge pull request #53 from StreetSupport/feature/merge_staging_into_main

Feature/merge staging into main

Author: o-seliuchenko

.github/workflows/azure-deploy.yml

@@ -15,36 +15,55 @@ jobs:
   build:
     runs-on: ubuntu-latest
     permissions:
-      contents: read #This is required for actions/checkout
+      contents: read
+
+    env:
+      SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+      SENTRY_ORG: ${{ vars.SENTRY_ORG }}
+      SENTRY_PROJECT: ${{ vars.SENTRY_PROJECT }}
+      SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
+      SENTRY_ENV: ${{ github.ref_name == 'main' && 'production' || 'staging' }}
 
     steps:
       - uses: actions/checkout@v4
 
       - name: Set up Node.js version
         uses: actions/setup-node@v3
         with:
-          node-version: '20.x'
+          node-version: '24.x'
 
-      - name: npm install, build, and test
+      - name: Setup Sentry
+        run: |
+          npm install -g @sentry/cli
+          sentry-cli --auth-token $SENTRY_AUTH_TOKEN info
+          
+      - name: npm install, lint, build, and test
         run: |
           npm install
+          npm run lint
           npm run build --if-present
           npm run test --if-present
 
+      - name: Clean build artifacts and dependencies
+        run: rm -rf dist node_modules
+
+      - name: Zip artifact for deployment
+        run: zip -r release.zip .
+
       - name: Upload artifact for deployment job
         uses: actions/upload-artifact@v4
         with:
           name: node-app
-          path: .
+          path: release.zip
 
   deploy:
     runs-on: ubuntu-latest
     needs: build
-    # Update to 'Production' || 'Staging' when configure additional environment
-    environment: ${{ github.ref_name == 'main' && 'Staging' || 'Staging' }}
+    environment: ${{ github.ref_name == 'main' && 'production' || 'staging' }}
     permissions:
-      id-token: write #This is required for requesting the JWT
-      contents: read #This is required for actions/checkout
+      id-token: write
+      contents: read
+
 
     steps:
       - name: Download artifact from build job
@@ -59,16 +78,12 @@ jobs:
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
           subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
 
-      - name: 'Deploy to Azure Web App Slot'
+      - name: 'Deploy to Azure Web App'
         id: deploy-to-webapp
         uses: azure/webapps-deploy@v3
         with:
-          # Current: Using slots in a single web app
-          app-name: 'streetsupport-platform-api'
-          # Update to 'Production' || 'Staging' when configure additional environment
-          slot-name: ${{ github.ref_name == 'main' && 'Production' || 'Production' }}
-          
-          # Alternative: For separate web apps (uncomment and modify as needed)
-          # app-name: ${{ github.ref_name == 'main' && 'streetsupport-platform-api' || 'streetsupport-platform-api-staging' }}
-          # Remove or comment out slot-name when using separate apps
-          package: .
+          app-name: ${{ vars.AZURE_APP_NAME }}
+          # To think about reverting this part
+          package: release.zip
+          startup-command: 'npm start'
+          clean: true

.github/workflows/ci-github-tests.yml

@@ -0,0 +1,33 @@
+name: Test
+
+on:
+  pull_request:
+    branches:
+      - staging
+      - main
+
+jobs:
+  test:
+    name: test
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '24.x'
+          cache: 'npm'
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Run ESLint
+        run: npm run lint
+
+      - name: Run tests
+        run: npm run test

.gitignore

@@ -0,0 +1,30 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+node_modules
+dist
+dist-ssr
+*.local
+
+# production
+/build
+/app
+
+# env files (can opt-in for committing if needed)
+.env*
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+# Windsurf configuration
+.windsurf

LICENSE

@@ -0,0 +1,38 @@
+import eslint from '@eslint/js';
+import tseslint from '@typescript-eslint/eslint-plugin';
+import tseslintParser from '@typescript-eslint/parser';
+import globals from 'globals';
+
+export default [
+  {
+    ignores: ['dist/**', 'node_modules/**']
+  },
+  {
+    files: ['src/**/*.{ts,tsx}'],
+    languageOptions: {
+      parser: tseslintParser,
+      parserOptions: {
+        ecmaVersion: 2020,
+        sourceType: 'module',
+        project: './tsconfig.json'
+      },
+      globals: {
+        ...globals.node
+      }
+    },
+    plugins: {
+      '@typescript-eslint': tseslint
+    },
+    rules: {
+      ...eslint.configs.recommended.rules,
+      ...tseslint.configs.recommended.rules,
+      'indent': ['error', 2],
+      'linebreak-style': 'off',
+      'semi': ['error', 'always'],
+      '@typescript-eslint/explicit-function-return-type': 'off',
+      '@typescript-eslint/no-explicit-any': 'off',
+      '@typescript-eslint/no-unused-vars': 'error',
+      '@typescript-eslint/no-non-null-assertion': 'off'
+    }
+  }
+];

README.md

@@ -0,0 +1,6 @@
+/** @type {import('jest').Config} */
+module.exports = {
+  testEnvironment: 'node',
+  roots: ['<rootDir>/tests'],
+  testMatch: ['**/?(*.)+(spec|test).[jt]s?(x)'],
+};