From b6129f131344a9482d32d68b8471035235fdeca6 Mon Sep 17 00:00:00 2001 From: Quentin Bramas <bramas@unistra.fr> Date: Mon, 11 Nov 2024 15:25:44 +0100 Subject: [PATCH] fix deploy --- .gitlab-ci.yml | 2 ++ README.md | 2 ++ app.config.ts | 4 ++-- package.json | 3 +-- public/favicon.ico | Bin 664 -> 15406 bytes src/app.css | 2 +- src/app.tsx | 9 ++++----- src/entry-server.tsx | 2 +- 8 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 07e8a4f..847219c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,6 +19,8 @@ before_script: build: stage: build + variables: + BASE_URL: "/git-cheat/" script: # Construire le site avec Vite (le bundler par défaut pour SolidJS) - yarn build-static diff --git a/README.md b/README.md index c88fb2c..49e8f98 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,8 @@ Small Git cheat sheet for french students. +[https://bramas.pages.unistra.fr/git-cheat](https://bramas.pages.unistra.fr/git-cheat) + ## Building diff --git a/app.config.ts b/app.config.ts index f95ed13..5e74261 100644 --- a/app.config.ts +++ b/app.config.ts @@ -4,9 +4,9 @@ export default defineConfig({ ssr: true, server: { prerender: { - crawlLinks: true + crawlLinks: true, }, - baseURL: "/git-cheat/", + baseURL: process.env.BASE_URL || "/", preset: 'gitlab-pages', }, }); \ No newline at end of file diff --git a/package.json b/package.json index 28aea69..e8d2491 100644 --- a/package.json +++ b/package.json @@ -5,8 +5,7 @@ "dev": "vinxi dev", "build": "vinxi build", "start": "vinxi start", - "version": "vinxi version", - "build-static": "vinxi build --preset static --base=/git-cheat/" + "version": "vinxi version" }, "dependencies": { "@solidjs/meta": "^0.29.4", diff --git a/public/favicon.ico b/public/favicon.ico index fb282da0719ef6ab4c1732df93be6216b0d85520..8312a3f17e450c3edd8ab31074e5f4d027c7042a 100644 GIT binary patch literal 15406 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 literal 664 zcmV;J0%!e+P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0007CNkl<ZcmZva z1MD746vfZEv;O1RR{U(+Hp9o@*|zI8Zll_5P@7S0+xDlK+xd_!f18u*-5n4o;oota z&QC&lki=Eisk06%y`AY)mwo%-`9&Os;5hymz2PbnJwbF+#g7X7?9~;(a8>m9ebk1R zejT~~6f_`?;`cEd!+`7(hw@%%2<H?PFWZo-Sro166z{jUiZKC>;?RN8gX-L?z6cM( zKoG@&w+0}f@Pfvwc+deid)qgE!L$ENKYjViZC_Zcr>L(`2oXUT8f0mRQ(6-=HN_Ai zeBBEz3WP+1Cw`m!49Wf!MnZzp5bH8VkR~BcJ1s-j90TAS2Yo4j!J|KodxYR%3Numw zA?gq6e`5@!W~F$_De3yt&uspo&2yLb$(NwcPPI-4LGc!}HdY%jfq@AFs8LiZ4k(p} zZ!c9o+qbW<CO?In-x+*5McxWRc_j$U9mWVvXb|{8<0X*+N!U^aUfU~W`|_B7ADWQg z1CsBGu!B(U6z@n-|6Nc4sny{s&db79?3vEG+tDDn<-MWTkbFmsc%#0dfO4S>Ys-Mg zgdyTALzJX&7QXHdI_DPTFL33;w}88{e6Zk)MX0kN{3DX9uz#O_L58&XRH$Nvvu;fO zf&)7@?C~$z1K<>j0ga$$MIg+5xN;eQ?1-CA=`^Y169@Ab6!vcaNP=hxfKN%@Ly^R* zK1iv*s1Yl6_dVyz8>ZqYhz6J4|3fQ@2LQeX@^%W(B~8>=MoEmBEGGD1;gHXlpX>!W ym)!leA2L@`cpb^hy)P75=I!`pBYxP7<2VfQ3j76qLgzIA0000<MNUMnLSTaaEIPaZ diff --git a/src/app.css b/src/app.css index e56868d..4f39245 100644 --- a/src/app.css +++ b/src/app.css @@ -18,7 +18,7 @@ h1 { font-size: 3rem; font-weight: 100; line-height: 1.1; - margin: 4rem auto; + margin: 1rem auto 2rem auto; max-width: 14rem; } diff --git a/src/app.tsx b/src/app.tsx index 0afe80d..1592370 100644 --- a/src/app.tsx +++ b/src/app.tsx @@ -1,22 +1,21 @@ import { MetaProvider, Title } from "@solidjs/meta"; -import { Router } from "@solidjs/router"; +import { StaticRouter, A } from "@solidjs/router"; import { FileRoutes } from "@solidjs/start/router"; import { Suspense } from "solid-js"; import "./app.css"; export default function App() { return ( - <Router + <StaticRouter + base={process.env.BASE_URL || import.meta.env.BASE_URL || "/"} root={props => ( <MetaProvider> <Title>Aide-mémoire Git</Title> - <a href="/">Index</a> - <a href="/about">About</a> <Suspense>{props.children}</Suspense> </MetaProvider> )} > <FileRoutes /> - </Router> + </StaticRouter> ); } diff --git a/src/entry-server.tsx b/src/entry-server.tsx index 401eff8..164b3bb 100644 --- a/src/entry-server.tsx +++ b/src/entry-server.tsx @@ -8,7 +8,7 @@ export default createHandler(() => ( <head> <meta charset="utf-8" /> <meta name="viewport" content="width=device-width, initial-scale=1" /> - <link rel="icon" href="/favicon.ico" /> + <link rel="icon" href="./favicon.ico" /> {assets} </head> <body> -- GitLab