Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move version chip to footer #3518

Merged
merged 11 commits into from
Oct 16, 2024
Merged

Move version chip to footer #3518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
065dc00
move version to footer
Annehab2011 Oct 9, 2024
5965238
move version to footer
Annehab2011 Oct 9, 2024
f828b43
add version inside div
Annehab2011 Oct 10, 2024
e751a24
hide version if it is not existed
Annehab2011 Oct 10, 2024
aae0a5b
remove unused div
Annehab2011 Oct 10, 2024
afdb112
update main footer
Annehab2011 Oct 14, 2024
194f933
update main footer
ehab-hassan Oct 14, 2024
bb7fe3f
update main footer
ehab-hassan Oct 14, 2024
05603b9
inject global var for no app version to show
amiraabouhadid Oct 15, 2024
75ac7cc
remove unncessary as any
amiraabouhadid Oct 15, 2024
9a3c1dc
change message var name for no version shown
amiraabouhadid Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions packages/playground/src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,14 +108,6 @@
</v-list>
</div>
</div>

<template v-if="version">
<div class="version">
<v-chip color="secondary">
{{ version }}
</v-chip>
</div>
</template>
</v-navigation-drawer>

<v-main :style="{ paddingTop: navbarConfig ? '140px' : '70px' }">
Expand Down Expand Up @@ -363,7 +355,6 @@ async function setTimeouts() {
}
}
// eslint-disable-next-line no-undef
const version = process.env.VERSION as any;

const routes: AppRoute[] = [
{
Expand Down
18 changes: 15 additions & 3 deletions packages/playground/src/components/main_footer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,24 @@
</v-col>
</v-row>
<v-divider class="my-3 w-25 mx-auto" />
<div class="text-center mb-12">{{ new Date().getFullYear() }} — ThreeFoldTech</div>

<div class="mb-12 d-flex justify-center text-subtitle-2">
<p>
&#169; {{ new Date().getFullYear() }} ThreeFoldTech
<span v-if="version !== noAppVersionMessage">
<span class="mx-2">|</span>Version
<span class="footer_header">
{{ version }}
</span></span
>
</p>
</div>
</v-container>
</v-footer>
</template>

<script lang="ts" setup>
import { inject } from "vue";
import { useRouter } from "vue-router";
import { useTheme } from "vuetify";

Expand All @@ -96,10 +108,10 @@ import { AppThemeSelection } from "@/utils/app_theme";
import { manual } from "@/utils/manual";

const theme = useTheme();

const version = process.env.VERSION;
const baseUrl = import.meta.env.BASE_URL;
const $router = useRouter();

const noAppVersionMessage = inject("noAppVersion");
function navigateToHome() {
return $router.push(DashboardRoutes.Other.HomePage);
}
Expand Down
2 changes: 1 addition & 1 deletion packages/playground/src/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import { defineGlobals } from "./config";
import Monitor from "./Monitor.vue";
import router from "./router";
import { normalizeError } from "./utils/helpers";

const app = createApp(Monitor);

app.config.errorHandler = error => {
Expand Down Expand Up @@ -43,5 +42,6 @@ app.use(createPinia());
app.use(router);
app.use(vuetify);
defineGlobals(app);
app.provide("noAppVersion", "No version to show");

app.mount("#app");
Loading