Skip to content

Commit

Permalink
Merge pull request #40 from tkzt/main
Browse files Browse the repository at this point in the history
feat: supports title and desc customization
  • Loading branch information
tkzt authored Dec 30, 2024
2 parents 54daf12 + 86bd289 commit 6c833e2
Show file tree
Hide file tree
Showing 14 changed files with 2,749 additions and 3,319 deletions.
26 changes: 16 additions & 10 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,13 @@ on:
pull_request:
branches: [ main ]

permissions:
contents: read
pages: write
id-token: write

jobs:
deploy:
environment:
name: github-pages
name: Documentation
build:
runs-on: ubuntu-latest
permissions:
contents: read
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Move manager out
run: mv ./manager/* ./
- name: Setup PDM
Expand All @@ -30,6 +24,18 @@ jobs:
run: pdm install -Gdoc
- name: Build documentation
run: pdm run mkdocs build --clean

deploy:
needs: build
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
runs-on: ubuntu-latest
permissions:
pages: write
id-token: write
environment:
name: github-pages
steps:
- uses: actions/checkout@v4
- name: Upload to GitHub Pages
uses: actions/upload-pages-artifact@v3
with:
Expand Down
1 change: 1 addition & 0 deletions app/.dockerignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
node_modules/
.env
2 changes: 1 addition & 1 deletion app/.env.example
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
VITE_IMG_FETCH_BASE=/manager
VITE_IMG_FETCH_BASE=/api
VITE_BASE=/
2 changes: 1 addition & 1 deletion app/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ COPY . /app
WORKDIR /app

RUN npm install -g pnpm
RUN pwd && ls -l && pnpm i && VITE_IMG_FETCH_BASE=/manager pnpm build
RUN pwd && ls -l && pnpm i && VITE_IMG_FETCH_BASE=/api pnpm build

FROM nginx:alpine

Expand Down
7 changes: 6 additions & 1 deletion app/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,12 @@ http {
index index.html;
}

location /manager {
location ~* ^/api/manager/?$ {
return 302 http://$host:20090;
break;
}

location /api {
proxy_pass http://manager:5000/;
proxy_redirect off;
proxy_set_header Host $host;
Expand Down
27 changes: 14 additions & 13 deletions app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,24 @@
"preview": "vite preview"
},
"dependencies": {
"@fingerprintjs/fingerprintjs": "^4.1.0",
"@vueuse/core": "^9.6.0",
"@fingerprintjs/fingerprintjs": "^4.5.1",
"@vueuse/core": "^9.13.0",
"animate.css": "^4.1.1",
"blurhash": "^2.0.4",
"blurhash": "^2.0.5",
"emoji-reaction": "^2.1.1",
"leancloud-storage": "^4.15.0",
"vue": "^3.2.45"
"leancloud-storage": "^4.15.2",
"vue": "^3.5.13"
},
"devDependencies": {
"@iconify-json/mdi": "^1.1.52",
"@unocss/transformer-directives": "^0.53.1",
"@vitejs/plugin-vue": "^4.0.0",
"eslint": "^7.32.0 || ^8.2.0",
"@iconify-json/line-md": "^1.2.4",
"@iconify-json/mdi": "^1.2.2",
"@unocss/transformer-directives": "^0.53.6",
"@vitejs/plugin-vue": "^4.6.2",
"eslint": "^8.57.1",
"eslint-import-resolver-alias": "^1.1.2",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-vue": "^9.8.0",
"unocss": "^0.53.0",
"vite": "^4.0.0"
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-vue": "^9.32.0",
"unocss": "^0.53.6",
"vite": "^4.5.5"
}
}
Loading

0 comments on commit 6c833e2

Please sign in to comment.