From ad78de787c1106a94f11d7f2d5a255731da8a1a3 Mon Sep 17 00:00:00 2001
From: Cristiano Urban <cristiano.urban@inaf.it>
Date: Mon, 17 Jan 2022 14:26:01 +0100
Subject: [PATCH] Minor changes.
Signed-off-by: Cristiano Urban <cristiano.urban@inaf.it>
---
vospace-ui-frontend/src/components/FAQMenuItem.vue | 8 ++++++++
vospace-ui-frontend/src/components/Jobs.vue | 6 ++++++
vospace-ui-frontend/src/components/TopMenu.vue | 7 +++++--
3 files changed, 19 insertions(+), 2 deletions(-)
create mode 100644 vospace-ui-frontend/src/components/FAQMenuItem.vue
diff --git a/vospace-ui-frontend/src/components/FAQMenuItem.vue b/vospace-ui-frontend/src/components/FAQMenuItem.vue
new file mode 100644
index 0000000..03239e6
--- /dev/null
+++ b/vospace-ui-frontend/src/components/FAQMenuItem.vue
@@ -0,0 +1,8 @@
+<!--
+ This file is part of vospace-ui
+ Copyright (C) 2021 Istituto Nazionale di Astrofisica
+ SPDX-License-Identifier: GPL-3.0-or-later
+-->
+<template>
+<b-nav-item right v-b-modal.modal-faq>FAQ</b-nav-item>
+</template>
diff --git a/vospace-ui-frontend/src/components/Jobs.vue b/vospace-ui-frontend/src/components/Jobs.vue
index c77089c..ade7775 100644
--- a/vospace-ui-frontend/src/components/Jobs.vue
+++ b/vospace-ui-frontend/src/components/Jobs.vue
@@ -37,11 +37,17 @@
<b-spinner variant="primary" style="width: 3rem; height: 3rem;" label="Loading"></b-spinner>
</div>
</div>
+ <FAQModal/>
</div>
</template>
<script>
+import FAQModal from './modal/FAQModal.vue'
+
export default {
+ components: {
+ FAQModal
+ },
computed: {
jobs() { return this.$store.state.jobs },
jobsLoading() { return this.$store.state.jobsLoading }
diff --git a/vospace-ui-frontend/src/components/TopMenu.vue b/vospace-ui-frontend/src/components/TopMenu.vue
index 3fbcf2f..b921d8e 100644
--- a/vospace-ui-frontend/src/components/TopMenu.vue
+++ b/vospace-ui-frontend/src/components/TopMenu.vue
@@ -9,7 +9,8 @@
<b-navbar-brand href="#/" class="d-none d-md-block">VOSpace<sup>BETA</sup></b-navbar-brand>
<JobsMenuItem />
<b-navbar-nav class="ml-auto">
- <b-nav-item right v-b-modal.modal-faq>FAQ</b-nav-item>
+ <!--<b-nav-item right v-b-modal.modal-faq href="#">FAQ</b-nav-item>-->
+ <FAQMenuItem />
<b-nav-item href="login" class="mr-4" v-if="user === 'anonymous'">Login</b-nav-item>
<b-nav-item-dropdown :text="user" right v-if="user !== 'anonymous'">
<b-dropdown-item href="vospace-logout">Logout</b-dropdown-item>
@@ -21,10 +22,12 @@
<script>
import JobsMenuItem from './JobsMenuItem.vue';
+import FAQMenuItem from './FAQMenuItem.vue';
export default {
components: {
- JobsMenuItem
+ JobsMenuItem,
+ FAQMenuItem
},
computed: {
user() { return this.$store.state.user }
--
GitLab