updated workflow and readme file

Cefalo · Sep 24, 2024 · 6655023 · 6655023
1 parent f2d8238
commit 6655023
Show file tree

Hide file tree

Showing 3 changed files with 91 additions and 120 deletions.
diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -3,7 +3,7 @@ name: Deploy to Azure App Service
 on:
   push:
     branches:
-      - main
+      - develop
     paths-ignore:
       - 'README.md'
 
@@ -36,41 +36,60 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
           cache: 'npm'
 
-      - name: Create .env file
+      - name: Create .env file for server
         run: |
-          echo "SQLITE_DB=${{ secrets.SQLITE_DB }}" >> .env
-          echo "TYPEORM_CLI=${{ secrets.TYPEORM_CLI }}" >> .env
-          echo "APP_PORT=${{ secrets.APP_PORT }}" >> .env
-          echo "NODE_ENV=${{ secrets.NODE_ENV }}" >> .env
-          echo "OAUTH_CLIENT_SECRET=${{ secrets.OAUTH_CLIENT_SECRET }}" >> .env
-          echo "OAUTH_CLIENT_ID=${{ secrets.OAUTH_CLIENT_ID }}" >> .env
-          echo "OAUTH_REDIRECT_URL=${{ secrets.OAUTH_REDIRECT_URL }}" >> .env
-          echo "JWT_SECRET=${{ secrets.JWT_SECRET }}" >> .env
-
-      - name: Install Client dependencies
-        run:  cd client && npm install
-
-      - name: Build Client dependencies
-        run: cd client && npm run build
-
-      - name: Install Server Dependencies
+          echo "SQLITE_DB=${{ secrets.SQLITE_DB }}" >> ./server/.env
+          echo "TYPEORM_CLI=${{ secrets.TYPEORM_CLI }}" >> ./server/.env
+          echo "APP_PORT=${{ secrets.APP_PORT }}" >> ./server/.env
+          echo "NODE_ENV=${{ secrets.NODE_ENV }}" >> ./server/.env
+          echo "OAUTH_CLIENT_SECRET=${{ secrets.OAUTH_CLIENT_SECRET }}" >> ./server/.env
+          echo "OAUTH_CLIENT_ID=${{ secrets.OAUTH_CLIENT_ID }}" >> ./server/.env
+          echo "OAUTH_REDIRECT_URL=${{ secrets.OAUTH_REDIRECT_URL }}" >> ./server/.env
+          echo "JWT_SECRET=${{ secrets.JWT_SECRET }}" >> ./server/.env
+
+      - name: Create .env file for client
+        run: |
+          echo "REACT_APP_APP_TITLE=${{ secrets.REACT_APP_APP_TITLE }}" >> ./client/.env
+          echo "REACT_APP_APP_SLOGAN=${{ secrets.REACT_APP_APP_SLOGAN }}" >> ./client/.env
+          echo "REACT_APP_CLIENT_ID=${{ secrets.REACT_APP_CLIENT_ID }}" >> ./client/.env
+          echo "REACT_APP_REDIRECT_URI=${{ secrets.REACT_APP_REDIRECT_URI }}" >> ./client/.env
+          echo "REACT_APP_BACKEND_ENDPOINT=${{ secrets.REACT_APP_BACKEND_ENDPOINT }}" >> ./client/.env
+          echo "REACT_APP_ENVIRONMENT=${{ secrets.REACT_APP_ENVIRONMENT }}" >> ./client/.env
+          echo "BUILD_PATH=${{ secrets.BUILD_PATH }}" >> ./client/.env
+
+      - name: Install dependencies
         run: npm install
 
+      - name: Build dependencies
+        run: npm run build
+
       - name: Run database migrations
         run: npm run migration:run
 
-      - name: Build project
-        run: npm run build
+      - name: Create app directory
+        run: mkdir -p app/client/build_web app/shared/dist app/server
+
+      - name: Copy client build dir to app/client
+        run: cp -R client/build_web/* app/client/build_web
+
+      - name: Copy shared dist to app/shared
+        run: cp -R shared/dist app/shared/dist
+
+      - name: Copy server folder to app/server
+        run: cp -R server/* app/server/
+
+      - name: Copy root package json to app/
+        run: cp -R package.json package-lock.json .nvmrc .npmrc app/
 
       - name: Upload artifact for deployment job
         uses: actions/upload-artifact@v4
         with:
-          name: node-app
-          path: .
+          name: bookify-app
+          path: ./app
 
   deploy:
     runs-on: ubuntu-latest
-    needs: 
+    needs:
       - build
       - cleanup
     environment:
@@ -81,7 +100,7 @@ jobs:
       - name: Download artifact from build job
         uses: actions/download-artifact@v4
         with:
-          name: node-app
+          name: bookify-app
 
       - name: Deploy to Azure App Service
         uses: azure/webapps-deploy@v2
@@ -91,4 +110,4 @@ jobs:
           package: .
 
       - name: Get the deployment URL
-        run: echo "url=https://${{ env.AZURE_WEBAPP_NAME }}.azurewebsites.net" >> $GITHUB_ENV
+        run: echo "url=https://${{ env.AZURE_WEBAPP_NAME }}.azurewebsites.net" >> $GITHUB_ENV
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -45,6 +45,53 @@ We use [GitHub Issues](https://github.com/Propo41/bookify/issues) for our public
 6. Run `npm run start:server` to start the server.
 7. Reload the extension
 
+### Project structure
+
+```
+├── shared/
+│   ├── dist
+│   ├── dto
+│   ├── interfaces
+│   ├── index.ts
+│   └── package.json
+├── client/
+│   ├── build_web
+│   ├── public
+│   ├── src/
+│   │   ├── api
+│   │   ├── components
+│   │   ├── helpers
+│   │   ├── config
+│   │   ├── pages
+│   │   ├── theme
+│   │   ├── App.tsx
+│   │   └── index.tsx
+│   ├── .env
+│   ├── .env.chrome
+│   └── package.json
+└── server/
+    ├── dist
+    ├── src/
+    │   ├── auth
+    │   ├── calender
+    │   ├── config
+    │   ├── helpers
+    │   ├── migrations
+    │   ├── app.controller.ts
+    │   ├── app.module.ts
+    │   ├── app.service.ts
+    │   └── main.ts
+    ├── .env
+    └── package.json
+```
+
+
+### Tech stack
+
+Frontend: ReactJs
+
+Backend: NestJs
+
 ### Commands
 
 ```bash