Upgraded API and Client

.github/workflows/api-deploy.yml

@@ -0,0 +1,60 @@
+ name: API Deploy
+
+ on:
+   push:
+     branches:
+       - main
+     paths:
+       - 'server/**/*'
+
+ # https://github.com/codeigniter4/CodeIgniter4/blob/develop/.github/workflows/deploy-apidocs.yml
+ jobs:
+   api-ssh-deploy:
+     name: Production
+     runs-on: ubuntu-latest
+
+     steps:
+       - uses: actions/checkout@v4
+
+       # Docs: https://github.com/shivammathur/setup-php
+       - name: Setup PHP
+         uses: shivammathur/setup-php@v2
+         with:
+           php-version: 8.2
+           extensions: mbstring, intl, curl, dom
+           coverage: none
+
+       - name: Get composer cache directory
+         id: composer-cache
+         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+         working-directory: server
+
+       - name: Cache composer dependencies
+         uses: actions/cache@v4
+         with:
+           path: ${{ steps.composer-cache.outputs.dir }}
+           key: ${{ runner.os }}-composer-${{ hashFiles('server/composer.lock') }}
+           restore-keys: ${{ runner.os }}-composer-
+
+       - name: Install dependencies
+         run: composer install --no-dev --no-progress --prefer-dist --optimize-autoloader
+         working-directory: server
+
+       - name: Install LFTP
+         run: sudo apt install lftp
+
+       - name: Configure LFTP
+         run: mkdir ~/.lftp && echo "set ssl:verify-certificate false;" >> ~/.lftp/rc
+
+       - name: Load Secrets
+         run: echo "machine ${{ secrets.FTP_HOSTNAME }} login ${{ secrets.FTP_USERNAME }} password ${{ secrets.FTP_PASSWORD }}" > ~/.netrc
+
+       - name: Upload Folder
+         run: |
+           lftp -e "put -O / .htaccess" ${{ secrets.FTP_HOSTNAME }}
+           lftp -e "rm -rf app" ${{ secrets.FTP_HOSTNAME }}
+           lftp -e "mirror --parallel=100 -R app" ${{ secrets.FTP_HOSTNAME }}
+           lftp -e "mirror --parallel=100 -R vendor" ${{ secrets.FTP_HOSTNAME }}
+           lftp -e "mirror --parallel=100 -R public" ${{ secrets.FTP_HOSTNAME }}
+           lftp -e "mirror --parallel=100 -R writable" ${{ secrets.FTP_HOSTNAME }}
+         working-directory: server

.github/workflows/ui-checks.yml

@@ -5,64 +5,79 @@ on:
     branches:
       - main
     paths:
-      - 'frontend/**/*'
+      - 'client/**/*'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 
 jobs:
   ui-checks:
+    if: github.event.pull_request.draft == false
+    name: Build & Tests
     runs-on: ubuntu-latest
+
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
-          cache: 'npm'
-          cache-dependency-path: 'frontend/package-lock.json'
+          node-version: 20
+          cache: 'yarn'
+          cache-dependency-path: 'client/yarn.lock'
 
       - name: Cache node modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: cache-npm
         with:
           path: |
-            frontend/node_modules
+            client/node_modules
             ~/.npm
-          key: ${{ runner.os }}-modules-${{ hashFiles('frontend/package-lock.json') }}
+            ${{ github.workspace }}/.next/cache
+          key: ${{ runner.os }}-modules-${{ hashFiles('client/yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-modules-
             ${{ runner.os }}-
 
       - if: ${{ steps.cache-npm.outputs.cache-hit != 'true' }}
         name: Install dependencies
-        working-directory: frontend
-        run: npm ci -f
+        working-directory: client
+        run: yarn install
 
       - name: Linter
-        run: npm run eslint:check
-        working-directory: frontend
+        run: yarn eslint:check
+        working-directory: client
 
       - name: Prettier
-        run: npm run prettier:check
-        working-directory: frontend
+        run: yarn prettier:check
+        working-directory: client
 
       - name: Cache UI build
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: cache-build
         with:
-          path: client/out
-          key: ${{ runner.os }}-build-${{ hashFiles('frontend/**/*.ts', 'frontend/**/*.tsx') }}
+          path: client/.next
+          key: ${{ runner.os }}-build-${{ hashFiles('client/**/*.ts', 'client/**/*.tsx') }}
           restore-keys: |
             ${{ runner.os }}-build-
             ${{ runner.os }}-
 
       - if: ${{ steps.cache-build.outputs.cache-hit != 'true' }}
-        name: Build UI
+        name: Configure Client
         run: |
-          export dateNow=$(date +"%d.%m.%Y %H:%M")
-          echo "export const update = '$dateNow'" > src/update.ts
-          npm run build --if-present
-        working-directory: frontend
+          echo "NEXT_PUBLIC_API_HOST = '${{ secrets.NEXT_PUBLIC_API_HOST }}'
+          NEXT_PUBLIC_SITE_LINK = '${{ secrets.NEXT_PUBLIC_SITE_LINK }}'" > .env
+        working-directory: client
+
+      # - name: UI Unit Tests
+      #  run: yarn test
+      #  working-directory: client
 
-      - name: Test
-        run: npm run test:coverage
-        working-directory: frontend
+      - if: ${{ steps.cache-build.outputs.cache-hit != 'true' }}
+        name: Build UI
+        run: |
+          export dateNow=$(date +"%Y-%m-%dT%H:%M")
+          echo "export const update = '$dateNow'" > update.ts
+          yarn build
+        working-directory: client

.github/workflows/ui-deploy.yml

@@ -1,72 +1,124 @@
-name: FTP Deploy
+name: UI Deploy
 
 on:
   push:
     branches:
       - main
     paths:
-      - 'frontend/**/*'
+      - 'client/**/*'
+
+  pull_request:
+    branches:
+      - main
 
 jobs:
-  ftp-ui-deploy:
+  ui-ssh-deploy:
+    name: Production
     runs-on: ubuntu-latest
+
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
-          cache: 'npm'
-          cache-dependency-path: 'frontend/package-lock.json'
+          node-version: 20
+          cache: 'yarn'
+          cache-dependency-path: 'client/yarn.lock'
 
       - name: Cache node modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: cache-npm
         with:
           path: |
-            frontend/node_modules
+            client/node_modules
             ~/.npm
-          key: ${{ runner.os }}-modules-${{ hashFiles('frontend/package-lock.json') }}
+            ${{ github.workspace }}/.next/cache
+          key: ${{ runner.os }}-modules-${{ hashFiles('client/yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-modules-
             ${{ runner.os }}-
 
       - if: ${{ steps.cache-npm.outputs.cache-hit != 'true' }}
         name: Install dependencies
-        working-directory: frontend
-        run: npm ci -f
-
-      - name: Configure Client
-        run: echo "REACT_APP_API_HOST = '${{ secrets.CLIENT_API_HOST }}'" > .env
-        working-directory: frontend
+        working-directory: client
+        run: yarn install
 
       - name: Cache UI build
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: cache-build
         with:
-          path: client/out
-          key: ${{ runner.os }}-build-${{ hashFiles('frontend/**/*.ts', 'frontend/**/*.tsx') }}
+          path: client/.next
+          key: ${{ runner.os }}-build-${{ hashFiles('client/**/*.ts', 'client/**/*.tsx') }}
           restore-keys: |
             ${{ runner.os }}-build-
             ${{ runner.os }}-
 
+      - if: ${{ steps.cache-build.outputs.cache-hit != 'true' }}
+        name: Configure Client
+        run: |
+          echo "NEXT_PUBLIC_API_HOST = '${{ secrets.NEXT_PUBLIC_API_HOST }}'
+          NEXT_PUBLIC_SITE_LINK = '${{ secrets.NEXT_PUBLIC_SITE_LINK }}'" > .env
+        working-directory: client
+
       - if: ${{ steps.cache-build.outputs.cache-hit != 'true' }}
         name: Build UI
         run: |
-          export dateNow=$(date +"%d.%m.%Y %H:%M")
-          echo "export const update = '$dateNow'" > src/update.ts
-          npm run build --if-present
-        working-directory: frontend
+          export dateNow=$(date +"%Y-%m-%dT%H:%M")
+          echo "export const update = '$dateNow'" > update.ts
+          yarn build
+        working-directory: client
 
-      - name: Install LFTP client
-        run: sudo apt install lftp
+      - name: Configure SSH
+        env:
+          SSH_HOST: ${{secrets.SSH_HOST}}
+          SSH_PORT: ${{secrets.SSH_PORT}}
+          SSH_USER: ${{secrets.SSH_USER}}
+          SSH_KEY: ${{secrets.SSH_KEY}}
+        run: |
+          mkdir -p ~/.ssh/
+          echo "$SSH_KEY" > ~/.ssh/deploy
+          chmod 400 ~/.ssh/deploy
+          cat >>~/.ssh/config <<END
+          Host vps
+            HostName $SSH_HOST
+            Port $SSH_PORT
+            User $SSH_USER
+            IdentityFile ~/.ssh/deploy
+            StrictHostKeyChecking no
+          END
 
-      - name: Configure LFTP
-        run: mkdir ~/.lftp && echo "set ssl:verify-certificate false;" >> ~/.lftp/rc
+      # If we just use nginx and the application is exported to plain HTML
+      #- name: Send files
+      #  run: rsync -avz -e ssh ./client/out/ vps:/var/www/meteo.miksoft.pro
+
+      # If we run NextJS on a Node server using PM2
+      - name: Send files
+        run: |
+          ssh vps "cd /var/www/meteo.miksoft.pro && rm -rf .next"
+          rsync -avz -e ssh client/.next/standalone/ vps:/var/www/meteo.miksoft.pro
+          rsync -avz -e ssh client/.next/static vps:/var/www/meteo.miksoft.pro/.next
+          rsync -avz -e ssh client/public vps:/var/www/meteo.miksoft.pro
+          rsync -avz -e ssh client/ecosystem.config.js vps:/var/www/meteo.miksoft.pro
 
-      - name: Load Secrets
-        run: echo "machine ${{ secrets.FTP_HOSTNAME }} login ${{ secrets.FTP_USERNAME }} password ${{ secrets.FTP_PASSWORD }}" > ~/.netrc
+      # For the first launch of the application on the server:
+      # pm2 start ecosystem.config.js && pm2 save
+      - name: Restart PM2
+        run: ssh vps "pm2 restart meteo.miksoft.pro"
 
-      - name: Deploy UI
-        run: lftp -e "mirror --parallel=100 -R frontend/build/ /" ${{ secrets.FTP_HOSTNAME }}
+      # If for deployment we use not SSH, but an FTP connection
+      # - name: Export UI
+      #  working-directory: client
+      #  run: yarn export
+      #
+      # - name: Install LFTP
+      #  run: sudo apt install lftp
+      #
+      # - name: Configure LFTP
+      #  run: mkdir ~/.lftp && echo "set ssl:verify-certificate false;" >> ~/.lftp/rc
+      #
+      # - name: Load Secrets
+      #  run: echo "machine ${{ secrets.FTP_HOSTNAME }} login ${{ secrets.FTP_USERNAME }} password ${{ secrets.FTP_PASSWORD }}" > ~/.netrc
+      #
+      # - name: Upload Folder
+      #  run: lftp -e "mirror --parallel=100 -R client/out/ /" ${{ secrets.FTP_HOSTNAME }}