Skip to content

release #17

Merged
merged 11 commits into from Mar 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .eslintignore
@@ -0,0 +1 @@
.github
123 changes: 0 additions & 123 deletions .github/workflows/dev-azure-staticwebapp.yml

This file was deleted.

109 changes: 109 additions & 0 deletions .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 }}
11 changes: 10 additions & 1 deletion 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
Expand Down
5 changes: 3 additions & 2 deletions src/views/Page1/Page1.vue
Expand Up @@ -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
}

Expand Down Expand Up @@ -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;
Expand Down