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 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" diff --git a/.github/workflows/dev-cloudflare-pages.yml b/.github/workflows/dev-cloudflare-pages.yml new file mode 100644 index 0000000..8d8eb59 --- /dev/null +++ b/.github/workflows/dev-cloudflare-pages.yml @@ -0,0 +1,109 @@ +name: Deploy DEV EOEFANS LANDING 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 }} + PROJECT_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: ${{ env.PROJECT_NAME }} # 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 }} diff --git a/README.md b/README.md index 8b8891f..8db6eac 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,16 @@ # 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 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 diff --git a/src/views/Page1/Page1.vue b/src/views/Page1/Page1.vue index 12d84d3..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 } @@ -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; 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 @@ -