Merge pull request #8 from FrankensteinVariorum/dev

Dev
FrankensteinVariorum · Aug 14, 2023 · dbbe93b · dbbe93b
2 parents 7190ae5 + ac3690d
commit dbbe93b
Show file tree

Hide file tree

Showing 218 changed files with 365,877 additions and 51,995 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -1,10 +1,10 @@
-name: Deploy to GitHub Pages
+name: CI
 
 on:
-  # Trigger the workflow every time you push to the `main` branch
-  # Using a different branch name? Replace `main` with your branch’s name
   push:
     branches: [ main ]
+  pull_request:
+    branches: [ main]
   # Allows you to run this workflow manually from the Actions tab on GitHub.
   workflow_dispatch:
 
@@ -23,17 +23,27 @@ jobs:
       - name: Install, build, and upload your site
         uses: withastro/action@v0
         with:
-            # path: . # The root location of your Astro project inside the repository. (optional)
-            node-version: 18 # The specific version of Node that should be used to build your site. Defaults to 16. (optional)
-            # package-manager: yarn # The Node package manager that should be used to install dependencies and build your site. Automatically detected based on your lockfile. (optional)
-
-  deploy:
-    needs: build
-    runs-on: ubuntu-latest
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    steps:
-      - name: Deploy to GitHub Pages
+          # path: . # The root location of your Astro project inside the repository. (optional)
+          node-version: 18 # The specific version of Node that should be used to build your site. Defaults to 16. (optional)
+          # package-manager: yarn # The Node package manager that should be used to install dependencies and build your site. Automatically detected based on your lockfile. (optional)
+      - name: Pushes to another repo
         id: deployment
         uses: actions/deploy-pages@v1
+        with: 
+          source-directory: 'output'
+          destination-github-username: 'FrankensteinVariorum'
+          destination-repository-name: 'frankensteinvariorum.github.io'
+          target-branch: main
+
+
+  # deploy:
+  #   needs: build
+  #   runs-on: ubuntu-latest
+  #   environment:
+  #     name: github-pages
+  #     url: ${{ steps.deployment.outputs.page_url }}
+  #   steps:
+  #     - name: Deploy to GitHub Pages
+  #       id: deployment
+  #       uses: actions/deploy-pages@v1
+
diff --git a/CNAME.txt b/CNAME.txt
@@ -0,0 +1 @@
+frankensteinvariorum.org
diff --git a/astro.config.mjs b/astro.config.mjs
@@ -2,20 +2,26 @@ import { defineConfig } from 'astro/config';
 import react from "@astrojs/react";
 import tailwind from "@astrojs/tailwind";
 import image from "@astrojs/image";
+// import netlify from "@astrojs/netlify/functions";
 
 // https://astro.build/config
-
 export default defineConfig({
   integrations: [tailwind(), react(), image()],
   vite: {
     assetsInclude: "**/*.xml",
     ssr: {
       external: ['firebase/database']
-    },
+    }
   },
   fileExtensions: {
     ".tei": "tsx"
   },
-  site: 'https://frankensteinvariorum.github.io', // https://docs.astro.build/en/guides/deploy/github/
-  base: '/fv-web2023',
-});
+  site: 'https://frankensteinvariorum.github.io',
+  // https://docs.astro.bnpm install netlify-cli -guild/en/guides/deploy/github/
+  // base: '/fv-web2023',
+  // output: "server",
+  // adapter: netlify(),
+  // build: {
+  //   split: true,
+  // },
+});
diff --git a/dist/404.html b/dist/404.html
@@ -4,19 +4,19 @@
 		<meta charset="UTF-8">
 		<meta name="viewport" content="width=device-width">
 		<link rel="icon" type="image/ico" href="/favicon.ico">
-		<meta name="generator" content="Astro v2.9.6">
+		<meta name="generator" content="Astro v2.10.1">
 		<title></title>
-	<link rel="stylesheet" href="/fv-web2023/_astro/404.a2450ec6.css" />
-<link rel="stylesheet" href="/fv-web2023/_astro/index.fa0f08b1.css" /></head>
+	<link rel="stylesheet" href="/_astro/404.e4135a07.css" />
+<link rel="stylesheet" href="/_astro/index.6aaf91ae.css" /></head>
 	<body>
         <header>
   <nav>
-    <a href="/fv-web2023/">Home</a>
-    <a href="/fv-web2023/viewer/1818/vol_1_preface">Variorum Viewer</a>
-    <a href="/fv-web2023/about">About</a>
-    <a href="/fv-web2023/method">Method</a>
-    <a href="/fv-web2023/data">Data</a>
-    <a href="/fv-web2023/people">People</a>
+    <a href="/">Home</a>
+    <a href="/viewer/MS/box_c56_from_chapter_1">Variorum Viewer</a>
+    <a href="/about">About</a>
+    <a href="/method">Method</a>
+    <a href="/data">Data</a>
+    <a href="/people">People</a>
   </nav>
 </header>
         <div id="content-area">

diff --git a/dist/_astro/404.a2450ec6.css → dist/_astro/404.e4135a07.css b/dist/_astro/404.a2450ec6.css → dist/_astro/404.e4135a07.css