Merge pull request #8 from EOEFANS/main

feat: add disclaimer and privacy policies
EOEFANS · Feb 18, 2023 · 730e7f4 · 730e7f4
2 parents 7ce2070 + 458d623
commit 730e7f4
Show file tree

Hide file tree

Showing 15 changed files with 7,175 additions and 2,553 deletions.
diff --git a/.github/workflows/azure-staticwebapp.yml b/.github/workflows/azure-staticwebapp.yml
@@ -14,7 +14,7 @@ name: Deploy EOEFANS LANDING to Azure Static Web Apps
 
 on:
   push:
-    branches: [ "release" ]
+    branches: ["release"]
 #   pull_request:
 #     types: [synchronize, closed]
 #     branches: [ "release" ]
@@ -36,57 +36,62 @@ jobs:
       contents: read # for actions/checkout to fetch code
       pull-requests: write # for Azure/static-web-apps-deploy to comment on PRs
     if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
-    runs-on: [ self-hosted, Linux ]
+    runs-on: [self-hosted, Linux]
     environment:
-      name: 'Production'
-#       url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
-    
+      name: "Production"
+    #       url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
+
     strategy:
       matrix:
         node-version: [16.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
-    
+
     name: Build and Deploy Job
     steps:
       - uses: actions/checkout@v3
         with:
           submodules: true
-
-
+
       - uses: actions/setup-node@v3
         name: Use Node.js ${{ matrix.node-version }}
         with:
           node-version: ${{ matrix.node-version }}
-
-      - uses: pnpm/action-setup@v2
-        name: Install pnpm
-        id: pnpm-install
-        with:
-          version: 7
-          run_install: false
-
-      - name: Get pnpm store directory
-        id: pnpm-cache
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
-
-      - uses: actions/cache@v3
-        name: Setup pnpm cache
-        with:
-          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-pnpm-store-
-            
+
       - name: Install dependencies
-        run: pnpm install
-
-      - name: Use pnpm to build
-        run: pnpm run build
-
-#      - name: post-build test
-#        run: pnpm test
+        run: npm install
+
+      - name: Use npm to build
+        run: npm run build
+
+      #       - uses: pnpm/action-setup@v2
+      #         name: Install pnpm
+      #         id: pnpm-install
+      #         with:
+      #           version: 7
+      #           run_install: false
+
+      #       - name: Get pnpm store directory
+      #         id: pnpm-cache
+      #         shell: bash
+      #         run: |
+      #           echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
+
+      #       - uses: actions/cache@v3
+      #         name: Setup pnpm cache
+      #         with:
+      #           path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
+      #           key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+      #           restore-keys: |
+      #             ${{ runner.os }}-pnpm-store-
+
+      #       - name: Install dependencies
+      #         run: pnpm install
+
+      #       - name: Use pnpm to build
+      #         run: pnpm run build
+
+      #       - name: post-build test
+      #         run: pnpm test
 
       - name: Deploy build artifacts to Azure
         id: builddeploy
@@ -107,7 +112,7 @@ jobs:
     permissions:
       contents: none
     if: github.event_name == 'pull_request' && github.event.action == 'closed'
-    runs-on: [ self-hosted, Linux ]
+    runs-on: [self-hosted, Linux]
     name: Close Pull Request Job
     steps:
       - name: Close Pull Request

diff --git a/.github/workflows/dev-azure-staticwebapp.yml b/.github/workflows/dev-azure-staticwebapp.yml
@@ -57,35 +57,41 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
-      - uses: pnpm/action-setup@v2
-        name: Install pnpm
-        id: pnpm-install
-        with:
-          version: 7
-          run_install: false
+      - name: Install dependencies
+        run: npm install
 
-      - name: Get pnpm store directory
-        id: pnpm-cache
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
+      - name: Use npm to build
+        run: npm run build
 
-      - uses: actions/cache@v3
-        name: Setup pnpm cache
-        with:
-          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-pnpm-store-
+#       - uses: pnpm/action-setup@v2
+#         name: Install pnpm
+#         id: pnpm-install
+#         with:
+#           version: 7
+#           run_install: false
 
-      - name: Install dependencies
-        run: pnpm install
+#       - name: Get pnpm store directory
+#         id: pnpm-cache
+#         shell: bash
+#         run: |
+#           echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
+
+#       - uses: actions/cache@v3
+#         name: Setup pnpm cache
+#         with:
+#           path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
+#           key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+#           restore-keys: |
+#             ${{ runner.os }}-pnpm-store-
+
+#       - name: Install dependencies
+#         run: pnpm install
 
-      - name: Use pnpm to build
-        run: pnpm run build
+#       - name: Use pnpm to build
+#         run: pnpm run build
 
-      #      - name: post-build test
-      #        run: pnpm test
+#       - name: post-build test
+#         run: pnpm test
 
       - name: Deploy build artifacts to Azure
         id: builddeploy

diff --git a/.gitignore b/.gitignore
@@ -13,7 +13,7 @@ dist
 dist-ssr
 coverage
 *.local
-package-lock.json
+pnpm-lock.yaml
 
 /cypress/videos/
 /cypress/screenshots/

diff --git a/README.md b/README.md
@@ -1,4 +1,5 @@
 # eoefans-landing
+[![EOEFANS-DEV-LANDING-AZURE-DEPLOY](https://vlink.dev/EOEFANS/eoefans-landing/actions/workflows/dev-azure-staticwebapp.yml/badge.svg)](https://vlink.dev/EOEFANS/eoefans-landing/actions/workflows/dev-azure-staticwebapp.yml)
 [![EOEFANS-LANDING-AZURE-DEPLOY](https://vlink.dev/EOEFANS/eoefans-landing/actions/workflows/azure-staticwebapp.yml/badge.svg)](https://vlink.dev/EOEFANS/eoefans-landing/actions/workflows/azure-staticwebapp.yml)
 
 This template should help get you started developing with Vue 3 in Vite.