From c31fb69b88b93e613f02812a0a89d05d20b1e541 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=95=8A=E5=95=8A=E5=95=8A=E9=94=8B=E5=AD=90=E9=98=BF?= Date: Sat, 18 Feb 2023 19:16:15 +0800 Subject: [PATCH 01/11] =?UTF-8?q?doc=EF=BC=9A=E6=B7=BB=E5=8A=A0eslint?= =?UTF-8?q?=E5=BF=BD=E7=95=A5=E6=96=87=E4=BB=B6=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .eslintignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .eslintignore diff --git a/.eslintignore b/.eslintignore new file mode 100644 index 0000000..821c19d --- /dev/null +++ b/.eslintignore @@ -0,0 +1 @@ +.github \ No newline at end of file From 62b8a83299592d459edf768a1205df4c587534a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=95=8A=E5=95=8A=E5=95=8A=E9=94=8B=E5=AD=90=E9=98=BF?= Date: Sat, 18 Feb 2023 19:21:50 +0800 Subject: [PATCH 02/11] style --- src/views/Page1/Page1.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/Page1/Page1.vue b/src/views/Page1/Page1.vue index 12d84d3..5c3b629 100644 --- a/src/views/Page1/Page1.vue +++ b/src/views/Page1/Page1.vue @@ -84,6 +84,7 @@ const download = (type: TypeDownload) => { background-size: cover; background-repeat: no-repeat; + background-position: center; display: flex; justify-content: space-between; flex-wrap: wrap; From 276308ff0dc8cdb3299afc10c94ceac653ea6ddb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?George=20Kazami=20=5B=E4=B9=94=E6=B2=BB=C2=B7=E9=A2=A8?= =?UTF-8?q?=E8=A6=8B=5D?= Date: Sat, 18 Feb 2023 14:07:39 +0000 Subject: [PATCH 03/11] chore: add cf pages deploy --- .github/workflows/dev-cloudflare-pages.yml | 109 +++++++++++++++++++++ 1 file changed, 109 insertions(+) create mode 100644 .github/workflows/dev-cloudflare-pages.yml diff --git a/.github/workflows/dev-cloudflare-pages.yml b/.github/workflows/dev-cloudflare-pages.yml new file mode 100644 index 0000000..6988d65 --- /dev/null +++ b/.github/workflows/dev-cloudflare-pages.yml @@ -0,0 +1,109 @@ +name: Deploy DEV EOEFANS WEB to Cloudflare pages + +on: + push: + branches: [ "main","ci" ] +# pull_request: +# types: [synchronize, closed] +# branches: [ "main","ci" ] + +# Environment variables available to all jobs and steps in this workflow +env: + APP_LOCATION: "/" # location of your client code + APP_ARTIFACT_LOCATION: "dist" # location of client code build output + CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} + CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }} + RPOJECT_NAME: eoefans-landing-dev + +permissions: + contents: read + +jobs: + build_and_deploy_job: + permissions: + contents: read + deployments: write + 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 ] + environment: + name: 'Development' + + strategy: + matrix: + node-version: [18.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 }} + + - name: Install dependencies + 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: Publish + uses: cloudflare/pages-action@1 + with: + apiToken: ${{ env.CLOUDFLARE_API_TOKEN }} + accountId: ${{ env.CLOUDFLARE_ACCOUNT_ID }} + projectName: eoefans-web-dev # e.g. 'my-project' + directory: ${{ env.APP_ARTIFACT_LOCATION }} # e.g. 'dist' + gitHubToken: ${{ secrets.GITHUB_TOKEN }} + + close_pull_request_job: + permissions: + contents: none + if: github.event_name == 'pull_request' && github.event.action == 'closed' + runs-on: [ self-hosted, Linux ] + name: Close Pull Request Job + steps: + - name: Close Pull Request + id: closepullrequest + uses: cloudflare/pages-action@1 + with: + apiToken: ${{ env.CLOUDFLARE_API_TOKEN }} + accountId: ${{ env.CLOUDFLARE_ACCOUNT_ID }} + projectName: ${{ env.RPOJECT_NAME }} # e.g. 'my-project' + directory: ${{ env.APP_ARTIFACT_LOCATION }} # e.g. 'dist' + gitHubToken: ${{ secrets.GITHUB_TOKEN }} From 64e5dc02dbfbc0f97e0ff1d14a2e2d8aeeb1b9c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?George=20Kazami=20=5B=E4=B9=94=E6=B2=BB=C2=B7=E9=A2=A8?= =?UTF-8?q?=E8=A6=8B=5D?= Date: Sat, 18 Feb 2023 14:14:19 +0000 Subject: [PATCH 04/11] Update dev-cloudflare-pages.yml --- .github/workflows/dev-cloudflare-pages.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dev-cloudflare-pages.yml b/.github/workflows/dev-cloudflare-pages.yml index 6988d65..c2a0a10 100644 --- a/.github/workflows/dev-cloudflare-pages.yml +++ b/.github/workflows/dev-cloudflare-pages.yml @@ -13,7 +13,7 @@ env: APP_ARTIFACT_LOCATION: "dist" # location of client code build output CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }} - RPOJECT_NAME: eoefans-landing-dev + PROJECT_NAME: eoefans-landing-dev permissions: contents: read @@ -87,7 +87,7 @@ jobs: with: apiToken: ${{ env.CLOUDFLARE_API_TOKEN }} accountId: ${{ env.CLOUDFLARE_ACCOUNT_ID }} - projectName: eoefans-web-dev # e.g. 'my-project' + projectName: ${{ env.PROJECT_NAME }} # e.g. 'my-project' directory: ${{ env.APP_ARTIFACT_LOCATION }} # e.g. 'dist' gitHubToken: ${{ secrets.GITHUB_TOKEN }} From df70fd7a73cf3cfacc6a8cc97e222be3e7edf8a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?George=20Kazami=20=5B=E4=B9=94=E6=B2=BB=C2=B7=E9=A2=A8?= =?UTF-8?q?=E8=A6=8B=5D?= Date: Sun, 19 Feb 2023 04:05:14 +0000 Subject: [PATCH 05/11] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8b8891f..41c44b9 100644 --- a/README.md +++ b/README.md @@ -1,5 +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) +[![Deploy DEV EOEFANS WEB to Cloudflare pages](https://vlink.dev/EOEFANS/eoefans-landing/actions/workflows/dev-cloudflare-pages.yml/badge.svg)](https://vlink.dev/EOEFANS/eoefans-landing/actions/workflows/dev-cloudflare-pages.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. From a9e5a9fb7df106683151a324a00b3e1501bf256e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?George=20Kazami=20=5B=E4=B9=94=E6=B2=BB=C2=B7=E9=A2=A8?= =?UTF-8?q?=E8=A6=8B=5D?= Date: Sun, 19 Feb 2023 04:06:40 +0000 Subject: [PATCH 06/11] Update dev-cloudflare-pages.yml --- .github/workflows/dev-cloudflare-pages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev-cloudflare-pages.yml b/.github/workflows/dev-cloudflare-pages.yml index c2a0a10..8d8eb59 100644 --- a/.github/workflows/dev-cloudflare-pages.yml +++ b/.github/workflows/dev-cloudflare-pages.yml @@ -1,4 +1,4 @@ -name: Deploy DEV EOEFANS WEB to Cloudflare pages +name: Deploy DEV EOEFANS LANDING to Cloudflare pages on: push: From 8d5ec81391f8ef85bd1e400f98067223527ad07c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?George=20Kazami=20=5B=E4=B9=94=E6=B2=BB=C2=B7=E9=A2=A8?= =?UTF-8?q?=E8=A6=8B=5D?= Date: Sun, 19 Feb 2023 04:07:14 +0000 Subject: [PATCH 07/11] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 41c44b9..9b1a432 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # eoefans-landing -[![Deploy DEV EOEFANS WEB to Cloudflare pages](https://vlink.dev/EOEFANS/eoefans-landing/actions/workflows/dev-cloudflare-pages.yml/badge.svg)](https://vlink.dev/EOEFANS/eoefans-landing/actions/workflows/dev-cloudflare-pages.yml) +[![Deploy DEV EOEFANS LANDING to Cloudflare pages](https://vlink.dev/EOEFANS/eoefans-landing/actions/workflows/dev-cloudflare-pages.yml/badge.svg)](https://vlink.dev/EOEFANS/eoefans-landing/actions/workflows/dev-cloudflare-pages.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. From 4b5c65b0fe83f54ce7f13bf4bc6999c37d1a3d9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?George=20Kazami=20=5B=E4=B9=94=E6=B2=BB=C2=B7=E9=A2=A8?= =?UTF-8?q?=E8=A6=8B=5D?= Date: Sun, 19 Feb 2023 11:11:31 +0000 Subject: [PATCH 08/11] chore: remove dev env on azure static web apps. --- .github/workflows/dev-azure-staticwebapp.yml | 123 ------------------- 1 file changed, 123 deletions(-) delete mode 100644 .github/workflows/dev-azure-staticwebapp.yml diff --git a/.github/workflows/dev-azure-staticwebapp.yml b/.github/workflows/dev-azure-staticwebapp.yml deleted file mode 100644 index a3a409e..0000000 --- a/.github/workflows/dev-azure-staticwebapp.yml +++ /dev/null @@ -1,123 +0,0 @@ -# This workflow will build and push a web application to an Azure Static Web App when you change your code. -# -# This workflow assumes you have already created the target Azure Static Web App. -# For instructions see https://docs.microsoft.com/azure/static-web-apps/get-started-portal?tabs=vanilla-javascript -# -# To configure this workflow: -# -# 1. Set up a secret in your repository named AZURE_STATIC_WEB_APPS_API_TOKEN with the value of your Static Web Apps deployment token. -# For instructions on obtaining the deployment token see: https://docs.microsoft.com/azure/static-web-apps/deployment-token-management -# -# 3. Change the values for the APP_LOCATION, API_LOCATION and APP_ARTIFACT_LOCATION, AZURE_STATIC_WEB_APPS_API_TOKEN environment variables (below). -# For instructions on setting up the appropriate configuration values go to https://docs.microsoft.com/azure/static-web-apps/front-end-frameworks -name: Deploy DEV EOEFANS LANDING to Azure Static Web Apps - -on: - push: - branches: ["main"] -# pull_request: -# types: [synchronize, closed] -# branches: ["main"] - -# Environment variables available to all jobs and steps in this workflow -env: - APP_LOCATION: "dist" # location of your client code - API_LOCATION: "" # location of your api source code - optional - APP_ARTIFACT_LOCATION: "" # location of client code build output - AZURE_STATIC_WEB_APPS_API_TOKEN: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_DEV }} # secret containing deployment token for your static web app - SKIP_APP_BUILD: true - -permissions: - contents: read - -jobs: - build_and_deploy_job: - permissions: - 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] - environment: - name: "Development" - # 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 }} - - - name: Install dependencies - 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 - uses: Azure/static-web-apps-deploy@v1 - with: - azure_static_web_apps_api_token: ${{ env.AZURE_STATIC_WEB_APPS_API_TOKEN }} # secret containing api token for app - repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments) - action: "upload" - ###### Repository/Build Configurations - These values can be configured to match you app requirements. ###### - # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig - app_location: ${{ env.APP_LOCATION }} - api_location: ${{ env.API_LOCATION }} - app_artifact_location: ${{ env.APP_ARTIFACT_LOCATION }} - skip_app_build: ${{ env.SKIP_APP_BUILD }} #comment this out to use azure oryx build - ###### End of Repository/Build Configurations ###### - - close_pull_request_job: - permissions: - contents: none - if: github.event_name == 'pull_request' && github.event.action == 'closed' - runs-on: [self-hosted, Linux] - name: Close Pull Request Job - steps: - - name: Close Pull Request - id: closepullrequest - uses: Azure/static-web-apps-deploy@v1 - with: - azure_static_web_apps_api_token: ${{ env.AZURE_STATIC_WEB_APPS_API_TOKEN }} # secret containing api token for app - action: "close" From 66e4138b1f2c125944d74a73dd15184e006c5501 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=95=8A=E5=95=8A=E5=95=8A=E9=94=8B=E5=AD=90=E9=98=BF?= Date: Thu, 23 Feb 2023 02:31:36 +0800 Subject: [PATCH 09/11] =?UTF-8?q?feat:=20=20=E6=9B=B4=E6=96=B0=E5=8D=8F?= =?UTF-8?q?=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/agreement/disclaimer.vue | 308 ++++++++++++++++++------ src/views/agreement/privacy.vue | 370 +++++++++++++++++++++-------- 2 files changed, 505 insertions(+), 173 deletions(-) diff --git a/src/views/agreement/disclaimer.vue b/src/views/agreement/disclaimer.vue index 77fd168..00a9fc6 100644 --- a/src/views/agreement/disclaimer.vue +++ b/src/views/agreement/disclaimer.vue @@ -1,99 +1,249 @@ - diff --git a/src/views/agreement/privacy.vue b/src/views/agreement/privacy.vue index c88ae11..f8d6420 100644 --- a/src/views/agreement/privacy.vue +++ b/src/views/agreement/privacy.vue @@ -1,114 +1,296 @@ - From 70515474889dfa3d5716820f1115a76ada063f10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?George=20Kazami=20=5B=E4=B9=94=E6=B2=BB=C2=B7=E9=A2=A8?= =?UTF-8?q?=E8=A6=8B=5D?= Date: Sun, 26 Feb 2023 00:31:09 +0000 Subject: [PATCH 10/11] Update README.md --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index 9b1a432..8db6eac 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,15 @@ [![Deploy DEV EOEFANS LANDING to Cloudflare pages](https://vlink.dev/EOEFANS/eoefans-landing/actions/workflows/dev-cloudflare-pages.yml/badge.svg)](https://vlink.dev/EOEFANS/eoefans-landing/actions/workflows/dev-cloudflare-pages.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. ## Recommended IDE Setup From 1b0d3ee9d20f79034859b5856dd1f9c43cd31de3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?George=20Kazami=20=5B=E4=B9=94=E6=B2=BB=C2=B7=E9=A2=A8?= =?UTF-8?q?=E8=A6=8B=5D?= Date: Sun, 5 Mar 2023 05:04:56 +0000 Subject: [PATCH 11/11] update url --- src/views/Page1/Page1.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/Page1/Page1.vue b/src/views/Page1/Page1.vue index 5c3b629..57ce2ca 100644 --- a/src/views/Page1/Page1.vue +++ b/src/views/Page1/Page1.vue @@ -27,11 +27,11 @@ const swiperList = [ type TypeDownload = 'Android' | 'Web' | 'IOS' const download = (type: TypeDownload) => { if (type === 'Android') { - window.open('https://eoe.best/appdl') + window.open('https://alist.vtb.link/EOEFANS/client') return } if (type === 'Web') { - window.open('https://eoefans.com') + window.open('https://www.eoefans.com') return }