Bye gitlab pages, welcome cd/ci with server

.gitlab-ci.yml

@@ -1,14 +1,14 @@
-image: node:lts
+deploy-site:
-pages:
+  stage: deploy
-  cache:
+  before_script:
-    paths:
+  - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
-      - node_modules/
+  - eval $(ssh-agent -s)
+  - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null
+  - mkdir -p ~/.ssh
+  - chmod 700 ~/.ssh
+  - echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts
+  - chmod 644 ~/.ssh/known_hosts
+
   script:
-    - npm install
+    - echo "Connecting to proxmox machine"
-    - npm run build
+    - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -X -S website-firq-npx kill; rm -r -f public/*; cd build; git pull; rm -r -f node_modules; npm install; npm run build; cp -R public ~; cd ~; screen -S website-firq-npx -dm npx serve public/ -p 9000"
-  artifacts:
-    paths:
-      - public
-    expire_in: 3 days
-  only:
-    - main

.old.gitlab-ci.yml

@@ -0,0 +1,14 @@
+image: node:lts
+pages:
+  cache:
+    paths:
+      - node_modules/
+  script:
+    - npm install
+    - npm run build
+  artifacts:
+    paths:
+      - public
+    expire_in: 3 days
+  only:
+    - main

astro.config.mjs

@@ -3,8 +3,8 @@ import { defineConfig } from 'astro/config';
 // https://astro.build/config
 export default defineConfig({
     sitemap: true,
-    base: '/fgosite',
+    base: '/',
     outDir: 'public',
     publicDir: 'static',
-    site: 'https://firq.pages.neshweb.net/fgosite/'
+    site: 'https://firq.dev/'
 });

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@firq/fgosite",
 	"type": "module",
-	"version": "0.0.1",
+	"version": "0.1.1",
 	"private": true,
 	"scripts": {
 		"dev": "astro dev",

src/components/ceCard.astro

@@ -7,8 +7,8 @@ export interface Props {
 
 const {mlb, link, name } = Astro.props;
 
-const ce_img: string = `/fgosite/ce/${link}.webp`;
+const ce_img: string = `/ce/${link}.webp`;
-const mlb_ce: string = `/fgosite/ce/mlb.webp`
+const mlb_ce: string = `/ce/mlb.webp`
 let mlb_image: string = "mlbalign";
 
 if(mlb === "false") {

src/components/favouriteCard.astro

@@ -7,7 +7,7 @@ export interface Props {
 
 const {image, origin, name } = Astro.props;
 
-const img: string = `/fgosite/favourites/${image}.webp`;
+const img: string = `/favourites/${image}.webp`;
 
 ---
 

src/components/navbar.astro

@@ -2,8 +2,8 @@
 ---
 
 <header>
-    <a href="/fgosite/" rel="noopener noreferrer" aria-label="Home">
+    <a href="/" rel="noopener noreferrer" aria-label="Home">
-        <img src="/fgosite/logo.svg" alt="">
+        <img src="/logo.svg" alt="">
     </a>
     <ul class="desktop">
         <slot />

src/components/navbarEntry.astro

@@ -17,7 +17,7 @@ if (currentPage === slug) {
     currPage = "current"
 }
 
-const fulllink = `/fgosite/${slug}`;
+const fulllink = `/${slug}`;
 ---
 
 <li>

src/components/servantCard.astro

@@ -12,8 +12,8 @@ export interface Props {
 
 const {bond10, ml, image_bond, image_servant, np, skills, level, name } = Astro.props;
 
-const servant_img: string = `/fgosite/servant/${image_servant}.webp`;
+const servant_img: string = `/servant/${image_servant}.webp`;
-const bondce_img: string = `/fgosite/ce/bond-ce/${image_bond}.webp`
+const bondce_img: string = `/ce/bond-ce/${image_bond}.webp`
 let bondce_css: string = "bond-ce";
 
 if(bond10 === "false") {

src/components/taCard.astro

@@ -7,7 +7,7 @@ export interface Props {
 
 const { image, link, title } = Astro.props;
 
-const icon: string = `background: url('/fgosite/ta_icons/${image}.webp')`
+const icon: string = `background: url('/ta_icons/${image}.webp')`
 ---
 <a href={link} target="_blank" rel="noopener noreferrer" aria-label={title}>
     <article>

src/components/technologyCard.astro

@@ -7,7 +7,7 @@ export interface Props {
 
 const { image, link, title } = Astro.props;
 
-const icon: string = `background-image: url('/fgosite/technologies/${image}.webp')`
+const icon: string = `background-image: url('/technologies/${image}.webp')`
 ---
 <a href={link} target="_blank" rel="noopener noreferrer" aria-label={title}>
     <article>

src/layouts/Layout.astro

@@ -18,7 +18,7 @@ if(descriptionOverride === undefined) {
 	description = descriptionOverride;
 }
 
-let currPage = "https://firq.pages.neshweb.net/fgosite/"
+let currPage = "https://firq.pages.neshweb.net/"
 if (currentpage !== "home") {
 	currPage += currentpage;
 }
@@ -29,13 +29,13 @@ if (currentpage !== "home") {
 	<head>
 		<meta charset="UTF-8" />
 		<meta name="viewport" content="width=device-width" />
-		<link rel="icon" type="image/ico" href="/fgosite/favicon.ico" />
+		<link rel="icon" type="image/ico" href="/favicon.ico" />
 		<meta name="generator" content={Astro.generator} />
 		<meta property="og:title" content={title} />
     	<meta property="og:url" content={currPage} />
     	<meta name="description" content={description}/>
     	<meta property="og:description" content={description}/>
-    	<meta property="og:image" content="https://firq.pages.neshweb.net/fgosite/link_192.png" />
+    	<meta property="og:image" content="https://firq.pages.neshweb.net/link_192.png" />
     	<meta property="og:type" content="website" />
     	<meta property="og:locale" content="en_US" />
 		<title>{title}</title>

src/layouts/customFooter.astro

@@ -21,7 +21,7 @@
         Thanks to <a href="https://mitsunee.com" target="_blank" rel="noopener noreferrer">Mitsunee</a> for the support when building this site. I could not have done it without you 🧡
         Check out <a href="https://fgo.mitsunee.com" target="_blank" rel="noopener noreferrer">FGO Timers here</a>
         <div class="sticky-image-wrapper">
-            <img src="/fgosite/lurker.png" alt="">
+            <img src="/lurker.png" alt="">
         </div>
     </div>
     <br>
@@ -33,7 +33,7 @@
     <div>
         Thanks to <a href="https://twitter.com/its_Anthony_J" target="_blank" rel="noopener noreferrer">AnthonyJ</a> for providing me with the custom Shishou favicon.
         <div class="sticky-image-wrapper">
-            <img src="/fgosite/padoru.png" alt="">
+            <img src="/padoru.png" alt="">
         </div>
     </div>
 </footer>