diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index beac2bb..8453200 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,12 +3,9 @@ name: GitHub Classroom Workflow on: - schedule: - - cron: '0 */1 * * *' push: branches: - main - workflow_dispatch: jobs: build: name: Autograding @@ -26,22 +23,14 @@ jobs: - name: add pnpm run: | npm i pnpm -g - npm i yarn -g - - name: install spider pkg and run - run: | - cd spider && yarn - yarn start + - name: build beta pages run: | cd web-beta && pnpm install --no-frozen-lockfile pnpm run build pnpm run export mv out ../build - - name: build pages - run: | - cd web && pnpm install --no-frozen-lockfile - pnpm run build - cp dist ../build/older_version -r + - name: GitHub Pages uses: crazy-max/ghaction-github-pages@v3.0.0 with: diff --git a/web-beta/common/constants.ts b/web-beta/common/constants.ts index 9696c24..05ade11 100644 --- a/web-beta/common/constants.ts +++ b/web-beta/common/constants.ts @@ -2,7 +2,7 @@ export const Links: { [key: string]: MenuLink } = { link1: { key: '/link1', url: "https://learningos.github.io/classroom-grading", label: 'rCore内核排行榜', year: '2022春夏季' }, //2022 夏季os - link2: { key: '/link2', url: "https:/os2edu.cn/ranking/rank", label: 'OS训练营排行榜', year: '2022秋冬季' }, //2022 秋冬季os + link2: { key: '/link2', url: "https://os2edu.cn/ranking/rank", label: 'OS训练营排行榜', year: '2022秋冬季' }, //2022 秋冬季os link3: { key: '/link3', url: "https://learningos.github.io/rust-rustlings-ranking", label: 'Rust编程排行榜', year: '2023春夏季' },//2023春夏季 rust link4: { key: '/link4', url: "https://learningos.github.io/2023S-OS-uCore-Classroom-Rank-list/", label: 'uCore内核排行榜', year: '2023春夏季' },//2023春夏季 基于C语言的uCore Tutorial ClassRoom排行榜 link5: { key: '/link5', url: "https://learningos.github.io/2023S-OS-rCore-Classroom-Rank-list/", label: 'rCore内核排行榜', year: '2023春夏季' },//2023春夏季 基于Rust语言的rCore Tutorial ClassRoom排行榜 diff --git a/web-beta/components/Iframe/index.module.scss b/web-beta/components/Iframe/index.module.scss index 60d228f..bcc6373 100644 --- a/web-beta/components/Iframe/index.module.scss +++ b/web-beta/components/Iframe/index.module.scss @@ -2,4 +2,11 @@ width: 100%; height:120vh; border: none; +} +.empty{ + width: 100%; + height:80vh; + display: flex; + align-items: center; + justify-content: center; } \ No newline at end of file diff --git a/web-beta/components/Iframe/index.tsx b/web-beta/components/Iframe/index.tsx index 6bc1c6a..94a22dd 100644 --- a/web-beta/components/Iframe/index.tsx +++ b/web-beta/components/Iframe/index.tsx @@ -8,7 +8,7 @@ type Iprops = { const Iframe = (props: Iprops) => { return <> - {props.src === '/' ? : } diff --git a/web-beta/components/layout.tsx b/web-beta/components/layout.tsx index 9c69575..29c5a54 100644 --- a/web-beta/components/layout.tsx +++ b/web-beta/components/layout.tsx @@ -64,6 +64,7 @@ export default function DefaultLayout({ children }: { children: React.ReactNode setCurrLink(key.split('/')[1] as LinksKey) } else { setCurrLink('/') + } router.push(key) } @@ -80,7 +81,7 @@ export default function DefaultLayout({ children }: { children: React.ReactNode + // customRender: