Merge branch 'develop' into feat/zod-integration

# Conflicts: # package.json
acdh-oeaw · Nov 6, 2023 · 6a4c0d9 · 6a4c0d9
2 parents 2802afd + 71663d8
commit 6a4c0d9
Show file tree

Hide file tree

Showing 13 changed files with 975 additions and 140 deletions.
diff --git a/.github/workflows/starter.yaml b/.github/workflows/starter.yaml
@@ -46,50 +46,6 @@ jobs:
       image_tagged: ${{ needs.setup_workflow_env.outputs.image_tagged }}
       default_port: ${{ needs.setup_workflow_env.outputs.default_port }}
       submodules: ${{ needs.setup_workflow_env.outputs.submodules }}
-  _1-mamems:
-    needs: [setup_workflow_env]
-    uses: acdh-oeaw/gl-autodevops-minimal-port/.github/workflows/build-herokuish-and-push-to-registry.yaml@main
-    secrets: inherit
-    # if you run this outside of acdh-oeaw yo uneed to specify every secret you want to pass by name
-    with:
-      environment: ${{ needs.setup_workflow_env.outputs.environment}}-mamems
-      registry_root: ${{ needs.setup_workflow_env.outputs.registry_root }}
-      image_tagged: ${{ needs.setup_workflow_env.outputs.image_tagged }}-mamems
-      default_port: ${{ needs.setup_workflow_env.outputs.default_port }}
-      submodules: ${{ needs.setup_workflow_env.outputs.submodules }}
-  _1-approaching-byzantium:
-    needs: [setup_workflow_env]
-    uses: acdh-oeaw/gl-autodevops-minimal-port/.github/workflows/build-herokuish-and-push-to-registry.yaml@main
-    secrets: inherit
-    # if you run this outside of acdh-oeaw yo uneed to specify every secret you want to pass by name
-    with:
-      environment: ${{ needs.setup_workflow_env.outputs.environment}}-approaching-byzantium
-      registry_root: ${{ needs.setup_workflow_env.outputs.registry_root }}
-      image_tagged: ${{ needs.setup_workflow_env.outputs.image_tagged }}-approaching-byzantium
-      default_port: ${{ needs.setup_workflow_env.outputs.default_port }}
-      submodules: ${{ needs.setup_workflow_env.outputs.submodules }}
-  _1-moving-byzantium:
-    needs: [setup_workflow_env]
-    uses: acdh-oeaw/gl-autodevops-minimal-port/.github/workflows/build-herokuish-and-push-to-registry.yaml@main
-    secrets: inherit
-    # if you run this outside of acdh-oeaw yo uneed to specify every secret you want to pass by name
-    with:
-      environment: ${{ needs.setup_workflow_env.outputs.environment}}-moving-byzantium
-      registry_root: ${{ needs.setup_workflow_env.outputs.registry_root }}
-      image_tagged: ${{ needs.setup_workflow_env.outputs.image_tagged }}-moving-byzantium
-      default_port: ${{ needs.setup_workflow_env.outputs.default_port }}
-      submodules: ${{ needs.setup_workflow_env.outputs.submodules }}
-  _1-femcarevienna:
-    needs: [setup_workflow_env]
-    uses: acdh-oeaw/gl-autodevops-minimal-port/.github/workflows/build-herokuish-and-push-to-registry.yaml@main
-    secrets: inherit
-    # if you run this outside of acdh-oeaw yo uneed to specify every secret you want to pass by name
-    with:
-      environment: ${{ needs.setup_workflow_env.outputs.environment}}-femcarevienna
-      registry_root: ${{ needs.setup_workflow_env.outputs.registry_root }}
-      image_tagged: ${{ needs.setup_workflow_env.outputs.image_tagged }}-femcarevienna
-      default_port: ${{ needs.setup_workflow_env.outputs.default_port }}
-      submodules: ${{ needs.setup_workflow_env.outputs.submodules }}
   _2:
     needs: [setup_workflow_env]
     uses: acdh-oeaw/gl-autodevops-minimal-port/.github/workflows/herokuish-tests-db-url.yaml@main
@@ -128,67 +84,3 @@ jobs:
       POSTGRES_ENABLED: ${{ needs.setup_workflow_env.outputs.POSTGRES_ENABLED == 'true'}}
       default_port: "${{ needs.setup_workflow_env.outputs.default_port}}"
       submodules: ${{ needs.setup_workflow_env.outputs.submodules }}
-  _3-mamems:
-    needs: [setup_workflow_env, _1-mamems, _2]
-    uses: acdh-oeaw/gl-autodevops-minimal-port/.github/workflows/deploy.yml@main
-    secrets: inherit
-    with:
-      environment: ${{ needs.setup_workflow_env.outputs.environment}}-mamems
-      DOCKER_TAG:
-        ${{ needs.setup_workflow_env.outputs.registry_root }}${{
-        needs.setup_workflow_env.outputs.image_tagged }}-mamems
-      APP_NAME: mamems-app-${{ needs.setup_workflow_env.outputs.environment_short }}
-      APP_ROOT: ${{ needs.setup_workflow_env.outputs.APP_ROOT }}
-      SERVICE_ID: ${{ needs.setup_workflow_env.outputs.SERVICE_ID }}
-      PUBLIC_URL: ${{ needs.setup_workflow_env.outputs.PUBLIC_URL }}
-      POSTGRES_ENABLED: ${{ needs.setup_workflow_env.outputs.POSTGRES_ENABLED == 'true'}}
-      default_port: "${{ needs.setup_workflow_env.outputs.default_port}}"
-      submodules: ${{ needs.setup_workflow_env.outputs.submodules }}
-  _3-approaching-byzantium:
-    needs: [setup_workflow_env, _1-approaching-byzantium, _2]
-    uses: acdh-oeaw/gl-autodevops-minimal-port/.github/workflows/deploy.yml@main
-    secrets: inherit
-    with:
-      environment: ${{ needs.setup_workflow_env.outputs.environment}}-approaching-byzantium
-      DOCKER_TAG:
-        ${{ needs.setup_workflow_env.outputs.registry_root }}${{
-        needs.setup_workflow_env.outputs.image_tagged }}-approaching-byzantium
-      APP_NAME: approaching-byzantium-app-${{ needs.setup_workflow_env.outputs.environment_short }}
-      APP_ROOT: ${{ needs.setup_workflow_env.outputs.APP_ROOT }}
-      SERVICE_ID: ${{ needs.setup_workflow_env.outputs.SERVICE_ID }}
-      PUBLIC_URL: ${{ needs.setup_workflow_env.outputs.PUBLIC_URL }}
-      POSTGRES_ENABLED: ${{ needs.setup_workflow_env.outputs.POSTGRES_ENABLED == 'true'}}
-      default_port: "${{ needs.setup_workflow_env.outputs.default_port}}"
-      submodules: ${{ needs.setup_workflow_env.outputs.submodules }}
-  _3-moving-byzantium:
-    needs: [setup_workflow_env, _1-moving-byzantium, _2]
-    uses: acdh-oeaw/gl-autodevops-minimal-port/.github/workflows/deploy.yml@main
-    secrets: inherit
-    with:
-      environment: ${{ needs.setup_workflow_env.outputs.environment}}-moving-byzantium
-      DOCKER_TAG:
-        ${{ needs.setup_workflow_env.outputs.registry_root }}${{
-        needs.setup_workflow_env.outputs.image_tagged }}-moving-byzantium
-      APP_NAME: moving-byzantium-app-${{ needs.setup_workflow_env.outputs.environment_short }}
-      APP_ROOT: ${{ needs.setup_workflow_env.outputs.APP_ROOT }}
-      SERVICE_ID: ${{ needs.setup_workflow_env.outputs.SERVICE_ID }}
-      PUBLIC_URL: ${{ needs.setup_workflow_env.outputs.PUBLIC_URL }}
-      POSTGRES_ENABLED: ${{ needs.setup_workflow_env.outputs.POSTGRES_ENABLED == 'true'}}
-      default_port: "${{ needs.setup_workflow_env.outputs.default_port}}"
-      submodules: ${{ needs.setup_workflow_env.outputs.submodules }}
-  _3-femcarevienna:
-    needs: [setup_workflow_env, _1-femcarevienna, _2]
-    uses: acdh-oeaw/gl-autodevops-minimal-port/.github/workflows/deploy.yml@main
-    secrets: inherit
-    with:
-      environment: ${{ needs.setup_workflow_env.outputs.environment}}-femcarevienna
-      DOCKER_TAG:
-        ${{ needs.setup_workflow_env.outputs.registry_root }}${{
-        needs.setup_workflow_env.outputs.image_tagged }}-femcarevienna
-      APP_NAME: femcarevienna-app-${{ needs.setup_workflow_env.outputs.environment_short }}
-      APP_ROOT: ${{ needs.setup_workflow_env.outputs.APP_ROOT }}
-      SERVICE_ID: ${{ needs.setup_workflow_env.outputs.SERVICE_ID }}
-      PUBLIC_URL: ${{ needs.setup_workflow_env.outputs.PUBLIC_URL }}
-      POSTGRES_ENABLED: ${{ needs.setup_workflow_env.outputs.POSTGRES_ENABLED == 'true'}}
-      default_port: "${{ needs.setup_workflow_env.outputs.default_port}}"
-      submodules: ${{ needs.setup_workflow_env.outputs.submodules }}
diff --git a/components/OADFooter.vue b/components/OADFooter.vue
@@ -8,31 +8,30 @@ const frontenVersion = `${config.public.gitTag ?? "version"} - ${
 <template>
 	<div>
 		<v-footer border class="py-2">
-			<div class="w-50 mx-auto d-flex justify-center justify-space-between align-center">
+			<div
+				style="font-size: 0.75em"
+				class="w-50 mx-auto d-flex justify-center justify-space-between align-center">
 				<div>
-					<NuxtLink style="text-decoration: none; color: inherit" to="/">Home</NuxtLink>
+					<NuxtLink style="text-decoration: none; color: inherit" to="/imprint">{{ $t('global.imprint') }}</NuxtLink>
 				</div>
 
-				<div class="text-center" style="font-size: 0.75em">
-					<b>Versions</b>
-					<div>
-						<p>Frontend: {{ frontenVersion }}</p>
-					</div>
+				<div class="text-center" >
+					<p><b>Version:</b> {{ frontenVersion }}</p>
 				</div>
 
-				<span class="relative" style="font-size: 0.75em">
+				<div class="relative">
 					With
-					<v-icon style="position: relative; top: -2px">mdi-heart</v-icon>
+					<v-icon size="16" style="position: relative; top: -2px">mdi-heart</v-icon>
 					from
 					<NuxtLink style="text-decoration: none; color: inherit" to="https://openatlas.eu/">
 						<v-nuxt-image
-							style="position: relative; top: 6px"
+							style="position: absolute; top: 6px"
 							src="/oad-favicon.svg"
 							alt="OpenAtlas Logo"
-							height="24px"
+							height="20px"
 						/>
 					</NuxtLink>
-				</span>
+				</div>
 			</div>
 		</v-footer>
 	</div>

diff --git a/content/de/index.md b/content/de/index.md
@@ -1,3 +1,8 @@
+---
+title: Home
+navigation:
+  title: OpenAtlas Discovery
+---
 ![logo](/OpenAtlasDiscovery_logo.jpg)
 
 # OpenAtlas Discovery

diff --git a/content/en/about.md b/content/en/about.md
@@ -1,6 +1,7 @@
 ---
+title: About
 navigation:
-  title: "About"
+  title: About
 ---
 
 # About

diff --git a/content/en/index.md b/content/en/index.md
@@ -1,3 +1,8 @@
+---
+title: Home
+navigation:
+  title: OpenAtlas Disovery
+---
 ![logo](/logo.svg)
 
 # OpenAtlas Discovery

diff --git a/cypress/e2e/MainPage.cy.ts b/cypress/e2e/MainPage.cy.ts
@@ -1,3 +1,6 @@
+// Import discovery config
+import discoveryConfig from "../../config/discoveryConfig.json";
+
 describe("Main Page", () => {
 	beforeEach(() => {
 		cy.visit("/");
@@ -6,6 +9,11 @@ describe("Main Page", () => {
 	it("Has the main Elements", () => {
 		cy.get('[data-test="main-content-renderer"]').should("exist");
 
+		if (discoveryConfig.APIbase === undefined) {
+			cy.task("log", "APIbase is undefined, skipping map button & data button");
+			return;
+		}
+
 		cy.get('[data-test="main-map-btn"]').should("exist");
 
 		cy.get('[data-test="main-data-btn"]').should("exist");

diff --git a/cypress/e2e/MainToOtherPages.cy.ts b/cypress/e2e/MainToOtherPages.cy.ts
@@ -9,7 +9,7 @@ describe("Navigation", () => {
 	it("Main to Map", () => {
 		if (discoveryConfig.APIbase === undefined) {
 			cy.task("log", "APIbase is undefined, skipping test");
-			this.skip();
+			return;
 		}
 
 		cy.get('[data-test="main-map-btn"]').should("exist").click();
@@ -20,22 +20,21 @@ describe("Navigation", () => {
 	it("Main to Data", () => {
 		if (discoveryConfig.APIbase === undefined) {
 			cy.task("log", "APIbase is undefined, skipping test");
-			this.skip();
-		} else {
-			cy.get('[data-test="main-data-btn"]').should("exist").click();
-
-			cy.get('[data-test="data-page-container"]').should("exist");
+			return;
 		}
+
+		cy.get('[data-test="main-data-btn"]').should("exist").click();
+
+		cy.get('[data-test="data-page-container"]').should("exist");
 	});
 
 	it("Successive Nav Clicks", () => {
 		if (discoveryConfig.APIbase === undefined) {
 			cy.task("log", "APIbase is undefined, skipping test");
-			this.skip();
-		} else {
-			cy.get('[data-test="main-map-btn"]').should("exist").dblclick();
-
-			cy.get('[data-test="map-page-container"]').should("exist");
+			return;
 		}
+		cy.get('[data-test="main-map-btn"]').should("exist").dblclick();
+
+		cy.get('[data-test="map-page-container"]').should("exist");
 	});
 });
diff --git a/deployment/loadContent.mjs b/deployment/loadContent.mjs
@@ -3,7 +3,7 @@ import fs from "fs-extra";
 
 const clonedContentPath = "temp";
 
-// from env variable or argument or default value
+// from .env variable or argument or default value
 const repo =
 	process.env.CONTENT_REPO ?? process.argv[2] ?? "acdh-oeaw/OpenAtlas-Discovery-Content-Template";
 const branch = process.env.CONTENT_BRANCH ?? process.argv[3] ?? "main";
@@ -40,7 +40,7 @@ if (fs.existsSync(clonedContentPath)) {
  */
 function cloneRepo(targetpath, repo, branch, useHttp = true) {
 	// From https://cheatcode.co/tutorials/how-to-clone-and-sync-a-github-repo-via-node-js
-	// child_process.execSync(`git clone ${getBranch(branch)} https://${username}:${process.env.PERSONAL_ACCESS_TOKEN}@github.com/${username}/${repo}.git ${targetpath}`);
+	// child_process.execSync(`git clone ${getBranch(branch)} https://${username}:${process..env.PERSONAL_ACCESS_TOKEN}@github.com/${username}/${repo}.git ${targetpath}`);
 
 	if (fs.existsSync(targetpath)) {
 		fs.rmSync(clonedContentPath, { recursive: true, force: true });