Skip to content

Commit

Permalink
Merge branch 'develop' into feat/imprint-service
Browse files Browse the repository at this point in the history
  • Loading branch information
Mocca101 committed Oct 9, 2023
2 parents e81b3f5 + 51d45fd commit 56949cf
Show file tree
Hide file tree
Showing 5 changed files with 76 additions and 3 deletions.
39 changes: 39 additions & 0 deletions components/OADFooter.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<script setup lang="ts">
const config = useRuntimeConfig();
const frontenVersion = `${config.public.gitTag ?? "version"} - ${
config.public.branchName ?? "branch"
}`;
</script>
<template>
<div>
<v-footer border class="py-2">
<div 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>
</div>

<div class="text-center" style="font-size: 0.75em">
<b>Versions</b>
<div>
<p>Frontend: {{ frontenVersion }}</p>
</div>
</div>

<span class="relative" style="font-size: 0.75em">
With
<v-icon 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"
src="/oad-favicon.svg"
alt="OpenAtlas Logo"
height="24px"
/>
</NuxtLink>
</span>
</div>
</v-footer>
</div>
</template>
4 changes: 3 additions & 1 deletion layouts/default.vue
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
<script setup lang="ts"></script>
<template>
<v-app>
<v-main>
<v-main class="d-flex flex-column">
<HeaderBar />
<v-divider />
<nuxt-page />
<v-spacer />
<OADFooter />
</v-main>
</v-app>
</template>
Expand Down
10 changes: 9 additions & 1 deletion nuxt.config.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
import { execSync } from "node:child_process";
import { DiscoveryConfig } from "./config/discoveryConfig";
import discoveryConfig from "./config/discoveryConfig.json";

const config: DiscoveryConfig = discoveryConfig as DiscoveryConfig;
const branchName = execSync("git rev-parse --abbrev-ref HEAD").toString().trimEnd();
const commitHash = execSync("git rev-parse HEAD").toString().trimEnd();
const gitTag = execSync("git describe --always --tags").toString().trimEnd();

// https://nuxt.com/docs/api/configuration/nuxt-config
export default defineNuxtConfig({
Expand All @@ -19,7 +23,11 @@ export default defineNuxtConfig({
},
runtimeConfig: {
// Keys within public, will be also exposed to the client-side
public: {},
public: {
commitHash,
branchName,
gitTag,
},
},
modules: ["@nuxtjs/i18n", "@nuxt/image", "@nuxt/content", "vuetify-nuxt-module"],
vuetify: {
Expand Down
2 changes: 1 addition & 1 deletion pages/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const contentToUse = computed(() => {
});
</script>
<template>
<v-sheet height="calc(100vh - 65px)" class="landing-page d-flex justify-center pt-5">
<v-sheet class="landing-page d-flex justify-center pt-5">
<v-container class="text-center" data-test="main-content-renderer">
<ContentRenderer v-if="contentToUse">
<ContentRendererMarkdown :value="contentToUse" class="w-50 mx-auto" />
Expand Down
24 changes: 24 additions & 0 deletions public/oad-favicon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 56949cf

Please sign in to comment.