Skip to content

Commit 6142092

Browse files
Merge branch 'next' of https://github.com/Geode-solutions/PEGGHy into fix/DragViewer
2 parents dc58d00 + f0341e4 commit 6142092

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

app/layouts/default.vue

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,21 @@
11
<script setup>
22
import FeedBackSnackers from "@ogw_front/components/FeedBack/Snackers";
33
import FeedbackErrorBanner from "@ogw_front/components/FeedBack/ErrorBanner";
4+
import Launcher from "@ogw_front/components/Launcher";
5+
import { Status } from "@ogw_front/utils/status";
6+
import { useInfraStore } from "@ogw_front/stores/infra";
47
58
import Footer from "@pegghy/components/Footer";
69
import TopBar from "@pegghy/components/TopBar";
10+
11+
const infraStore = useInfraStore();
712
</script>
813

914
<template>
1015
<v-app>
1116
<TopBar />
1217
<v-main class="custom-background" style="padding-bottom: 70px; min-height: calc(100vh - 70px)">
18+
<Launcher v-if="infraStore.status != Status.CREATED" app-name="PEGGHy" logo="/logo.png" />
1319
<v-row class="fill-height pa-2 mr-1 ml-1">
1420
<v-col cols="12" class="pa-1">
1521
<FeedbackErrorBanner style="border-radius: 15px" />

app/pages/index.vue

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { Status } from "@ogw_front/utils/status";
33
import { importWorkflow } from "@ogw_front/utils/import_workflow";
44
55
import HybridRenderingView from "@ogw_front/components/HybridRenderingView";
6-
import Launcher from "@ogw_front/components/Launcher";
76
import ViewerUI from "@ogw_front/components/Viewer/Ui";
87
98
import { useBackStore } from "@ogw_front/stores/back";
@@ -220,7 +219,6 @@ async function openMenu(event) {
220219
</script>
221220

222221
<template>
223-
<Launcher v-if="infraStore.status != Status.CREATED" app-name="PEGGHy" :logo="pegghyLogo" />
224222
<Partners v-if="infraStore.status != Status.CREATED" />
225223
<v-card
226224
v-else

0 commit comments

Comments
 (0)