App Overhaul & Stabilization

.github/workflows/dev-forestgeo-livesite.yml

@@ -0,0 +1,106 @@
+# Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
+# More GitHub Actions for Azure: https://github.com/Azure/actions
+
+name: ForestGEO Development Live Site Deployment Pipeline
+
+on:
+  push:
+    branches:
+      - 'forestgeo-app-*'
+  workflow_dispatch:
+
+jobs:
+  build-app-development:
+    if: startsWith(github.ref, 'refs/heads/forestgeo-app-')
+    runs-on: ubuntu-latest
+    environment: development
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Node.js version
+        uses: actions/setup-node@v3
+        with:
+          node-version: '18.x'
+
+      - name: create env file (in frontend/ directory) -- development
+        id: create-env-file-dev
+        run: |
+          touch frontend/.env
+          echo AZURE_AD_CLIENT_SECRET=${{ secrets.AZURE_AD_CLIENT_SECRET }} >> frontend/.env
+          echo AZURE_AD_CLIENT_ID=${{ secrets.AZURE_AD_CLIENT_ID }} >> frontend/.env
+          echo AZURE_AD_TENANT_ID=${{ secrets.AZURE_AD_TENANT_ID }} >> frontend/.env
+          echo NEXTAUTH_SECRET=${{ secrets.NEXTAUTH_SECRET }} >> frontend/.env
+          echo NEXTAUTH_URL=${{ secrets.NEXTAUTH_URL_DEV }} >> frontend/.env
+          echo AZURE_SQL_USER=${{ secrets.AZURE_SQL_USER }} >> frontend/.env
+          echo AZURE_SQL_PASSWORD=${{ secrets.AZURE_SQL_PASSWORD }} >> frontend/.env
+          echo AZURE_SQL_SERVER=${{ secrets.AZURE_SQL_SERVER }} >> frontend/.env
+          echo AZURE_SQL_DATABASE=${{ secrets.AZURE_SQL_DATABASE }} >> frontend/.env
+          echo AZURE_SQL_PORT=${{ secrets.AZURE_SQL_PORT }} >> frontend/.env
+          echo AZURE_STORAGE_SAS_CONNECTION_STRING=${{ secrets.AZURE_STORAGE_SAS_CONNECTION_STRING }} >> frontend/.env
+          echo AZURE_SQL_SCHEMA=${{ secrets.AZURE_SQL_SCHEMA }} >> frontend/.env
+          echo AZURE_SQL_CATALOG_SCHEMA=${{ secrets.AZURE_SQL_CATALOG_SCHEMA }} >> frontend/.env
+          echo AZURE_STORAGE_CONNECTION_STRING=${{ secrets.AZURE_STORAGE_CONNECTION_STRING }} >> frontend/.env
+          echo NEXTAUTH_DEBUG=true >> frontend/.env
+          echo NODE_ENV=development >> frontend/.env
+          echo PORT=3000 >> frontend/.env
+          echo FG_PAT=${{ secrets.FG_PAT }} >> frontend/.env
+          echo OWNER=${{ secrets.OWNER }} >> frontend/.env
+          echo REPO=${{ secrets.REPO }} >> frontend/.env
+
+      - name: Cache node modules
+        uses: actions/cache@v2
+        with:
+          path: frontend/node_modules
+          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-node-
+
+      - name: Cache Next.js build
+        uses: actions/cache@v2
+        with:
+          path: frontend/build/cache
+          key: ${{ runner.os }}-next-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**/.next/cache') }}
+          restore-keys: |
+            ${{ runner.os }}-next-
+            ${{ runner.os }}-next-${{ hashFiles('**/package-lock.json') }}
+
+      - name: move into frontend --> npm install, build, and test
+        run: |
+          cd frontend/
+          npm install
+          npm run build
+          npm run test --if-present
+
+      - name: Move directories into build/standalone to reduce app load
+        run: |
+          mv ./frontend/build/static ./frontend/build/standalone/build
+          mv ./frontend/public ./frontend/build/standalone
+
+      - name: Upload build artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: app-build
+          path: frontend/build/standalone
+
+  deploy-app-development:
+    needs: build-app-development
+    runs-on: ubuntu-latest
+    environment: development
+
+    steps:
+      - name: Download build artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: app-build
+          path: frontend/build/standalone
+
+      - name: 'Deploy to Azure Web App (development)'
+        id: deploy-to-webapp-dev
+        if: startsWith(github.ref, 'refs/heads/forestgeo-app-')
+        uses: azure/webapps-deploy@v2
+        with:
+          app-name: 'forestgeo-development'
+          slot-name: 'Production'
+          publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_DEVELOPMENT }}
+          package: frontend/build/standalone

.github/workflows/main-forestgeo-livesite.yml

@@ -10,9 +10,10 @@ on:
   workflow_dispatch:
 
 jobs:
-  build-and-deploy:
+  build-app-production:
+    if: github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
-    environment: development
+    environment: production
 
     steps:
       - uses: actions/checkout@v4
@@ -22,14 +23,14 @@ jobs:
         with:
           node-version: '18.x'
 
-      - name: create env file (in frontend/ directory)
+      - name: create env file (in frontend/ directory) -- production
+        id: create-env-file-prod
         run: |
           touch frontend/.env
-          echo AZURE_AD_CLIENT_SECRET=${{ secrets.AZURE_AD_CLIENT_SECRET }} >> frontend/.env
-          echo AZURE_AD_CLIENT_ID=${{ secrets.AZURE_AD_CLIENT_ID }} >> frontend/.env
-          echo AZURE_AD_TENANT_ID=${{ secrets.AZURE_AD_TENANT_ID }} >> frontend/.env
+          echo AZURE_AD_CLIENT_SECRET=${{ secrets.AZURE_AD_CLIENT_SECRET_PRODUCTION }} >> frontend/.env
+          echo AZURE_AD_CLIENT_ID=${{ secrets.AZURE_AD_CLIENT_ID_PRODUCTION }} >> frontend/.env
+          echo AZURE_AD_TENANT_ID=${{ secrets.AZURE_AD_TENANT_ID_PRODUCTION }} >> frontend/.env
           echo NEXTAUTH_SECRET=${{ secrets.NEXTAUTH_SECRET }} >> frontend/.env
-          echo NEXTAUTH_URL=${{ secrets.NEXTAUTH_URL }} >> frontend/.env
           echo AZURE_SQL_USER=${{ secrets.AZURE_SQL_USER }} >> frontend/.env
           echo AZURE_SQL_PASSWORD=${{ secrets.AZURE_SQL_PASSWORD }} >> frontend/.env
           echo AZURE_SQL_SERVER=${{ secrets.AZURE_SQL_SERVER }} >> frontend/.env
@@ -39,12 +40,12 @@ jobs:
           echo AZURE_SQL_SCHEMA=${{ secrets.AZURE_SQL_SCHEMA }} >> frontend/.env
           echo AZURE_SQL_CATALOG_SCHEMA=${{ secrets.AZURE_SQL_CATALOG_SCHEMA }} >> frontend/.env
           echo AZURE_STORAGE_CONNECTION_STRING=${{ secrets.AZURE_STORAGE_CONNECTION_STRING }} >> frontend/.env
-          echo NODE_ENV=development >> frontend/.env
+          echo NEXTAUTH_DEBUG=true >> frontend/.env
+          echo NODE_ENV=production >> frontend/.env
           echo PORT=3000 >> frontend/.env
-
-      - name: Write Certificate to File
-        run: |
-          echo "${{ secrets.CERTIFICATE }}" > frontend/DigiCertGlobalRootCA.crt.pem
+          echo FG_PAT=${{ secrets.FG_PAT }} >> frontend/.env
+          echo OWNER=${{ secrets.OWNER }} >> frontend/.env
+          echo REPO=${{ secrets.REPO }} >> frontend/.env
 
       - name: Cache node modules
         uses: actions/cache@v2
@@ -54,6 +55,15 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-node-
 
+      - name: Cache Next.js build
+        uses: actions/cache@v2
+        with:
+          path: frontend/.next/cache
+          key: ${{ runner.os }}-next-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**/.next/cache') }}
+          restore-keys: |
+            ${{ runner.os }}-next-
+            ${{ runner.os }}-next-${{ hashFiles('**/package-lock.json') }}
+
       - name: move into frontend --> npm install, build, and test
         run: |
           cd frontend/
@@ -65,13 +75,31 @@ jobs:
         run: |
           mv ./frontend/build/static ./frontend/build/standalone/build
           mv ./frontend/public ./frontend/build/standalone
-          mv ./frontend/*.pem ./frontend/build/standalone/
 
-      - name: 'Deploy to Azure Web App'
-        id: deploy-to-webapp
+      - name: Upload build artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: app-build
+          path: frontend/build/standalone
+
+  deploy-app-production:
+    needs: build-app-production
+    runs-on: ubuntu-latest
+    environment: production
+
+    steps:
+      - name: Download build artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: app-build
+          path: frontend/build/standalone
+
+      - name: 'Deploy to Azure Web App (main)'
+        id: deploy-to-webapp-main
+        if: github.ref == 'refs/heads/main'
         uses: azure/webapps-deploy@v2
         with:
           app-name: 'forestgeo-livesite'
           slot-name: 'Production'
-          publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_852346BD764D45D08854E6679137F844 }}
-          package: ./frontend/build/standalone
+          publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_PRODUCTION }}
+          package: frontend/build/standalone

.gitignore

@@ -2,6 +2,7 @@
 
 # dependencies
 /node_modules
+/liquibase
 /.pnp
 .pnp.js
 /.idea/*
@@ -38,10 +39,14 @@ yarn-error.log*
 next-env.d.ts
 /.idea
 /.vscode
+/.idea
+/.vscode
 /*.zip
 .github/workflows/new-file-upload-system_forestgeo-livesite.yml
 /.fleet
 /frontend/sampledata
 /frontend/scripts
-/frontend/sqlscripting
 /frontend/.vscode
+/documentation/.obsidian
+/documentation/.obsidian/*
+frontend/liquibase/

frontend/.eslintrc.cjs

@@ -0,0 +1,22 @@
+module.exports = {
+  parser: '@typescript-eslint/parser',
+  extends: ['next', 'plugin:@typescript-eslint/recommended', 'plugin:prettier/recommended'],
+  settings: {
+    next: {
+      rootDir: '.'
+    }
+  },
+  plugins: ['@typescript-eslint', 'unused-imports', 'prettier', 'import'],
+  rules: {
+    'react-hooks/exhaustive-deps': 'off',
+    semi: ['error', 'always'],
+    'unused-imports/no-unused-imports': 'error',
+    '@typescript-eslint/no-explicit-any': 'off',
+    '@typescript-eslint/no-unused-vars': 'off',
+    '@typescript-eslint/no-var-requires': 'off',
+    'unused-imports/no-unused-vars': 'off',
+    'react-hooks/rules-of-hooks': 'off',
+    'no-case-declarations': 'off',
+    'prettier/prettier': 'error'
+  }
+};

frontend/.gitignore

@@ -17,7 +17,6 @@
 # production
 /build
 /sampledata
-/sqlscripting
 /scripts
 DigiCertGlobalRootCA.crt.pem
 
@@ -49,3 +48,16 @@ yarn-error.log*
 /playwright-report/
 /blob-report/
 /playwright/.cache/
+/.fleet
+/.vscode
+/.idea
+/test-results/
+/playwright-report/
+/blob-report/
+/playwright/.cache/
+
+*storybook.log
+/test-results/
+/playwright-report/
+/blob-report/
+/playwright/.cache/

frontend/.prettierrc.json

@@ -0,0 +1,13 @@
+{
+  "semi": true,
+  "singleQuote": true,
+  "trailingComma": "none",
+  "bracketSpacing": true,
+  "jsxBracketSameLine": false,
+  "arrowParens": "avoid",
+  "proseWrap": "preserve",
+  "endOfLine": "lf",
+  "printWidth": 160,
+  "tabWidth": 2,
+  "useTabs": false
+}