Skip to content

Commit df733c7

Browse files
committed
fix: another action try
1 parent cce6bac commit df733c7

File tree

2 files changed

+15
-9
lines changed

2 files changed

+15
-9
lines changed

.github/workflows/deploypages.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,17 @@ jobs:
108108
- name: Remove Tina .gitignore (prevent admin from being ignored)
109109
run: rm ./build/admin/.gitignore || true
110110

111-
- name: Move Tina Admin to match baseUrl
111+
- name: Relocate Tina admin under baseUrl
112112
run: |
113-
ADMIN_SRC="./build/admin"
114-
ADMIN_DEST="./build${{ secrets.DOCS_BASEURL }}/admin"
115-
mkdir -p "$ADMIN_DEST"
116-
mv "$ADMIN_SRC"/* "$ADMIN_DEST"/
113+
BASE="${DOCS_BASEURL#/}" # strip leading slash
114+
BASE="${BASE%/}" # strip trailing slash
115+
SRC="./build/admin"
116+
DEST="./build/${BASE}/admin"
117+
echo "Moving $SRC → $DEST"
118+
mkdir -p "$DEST"
119+
mv "$SRC"/* "$DEST"/
120+
env:
121+
DOCS_BASEURL: ${{ secrets.DOCS_BASEURL }}
117122

118123
- name: Deploy to GitHub Pages
119124
uses: peaceiris/actions-gh-pages@v3

src/pages/admin/index.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
import React, { useEffect } from 'react';
22
import useBaseUrl from '@docusaurus/useBaseUrl';
33

4-
export default function AdminRedirect() {
4+
export default function AdminRedirect(): JSX.Element {
5+
// resolve to “…/Docusaurus-docs/admin/index.html” in production
56
const adminUrl = useBaseUrl('/admin/index.html');
67

78
useEffect(() => {
8-
window.location.href = adminUrl;
9-
}, []);
9+
window.location.replace(adminUrl);
10+
}, [adminUrl]);
1011

11-
return <p>Redirecting to Tina Admin...</p>;
12+
return <p>Redirecting to Tina Admin</p>;
1213
}

0 commit comments

Comments
 (0)