- npm updates
Some checks failed
CI Pipeline / japa-tests (push) Failing after 51s

- added views and controller coder for reviewer role
- added program logic for publishing a dataset by editor
- added reviewer menu
- adapted routes.ts for additional routes
This commit is contained in:
Kaimbacher 2024-01-04 16:40:05 +01:00
parent c70fa4a0d8
commit 18635f77b3
17 changed files with 1224 additions and 393 deletions

View file

@ -271,18 +271,14 @@ const handleDrawEventCreated = async (event) => {
</script>
<template>
<SectionMain>
<!-- <div class="dark:bg-slate-900 bg-white"> -->
<SectionMain>
<div id="map" class="map-container mt-6 mb-6 rounded-2xl py-12 px-6 text-center dark:bg-slate-900 bg-white">
<ZoomControlComponent ref="zoomControl" :mapId="mapId"></ZoomControlComponent>
<DrawControlComponent ref="drawControl" :preserve="false" :mapId="mapId" :southWest="southWest"
:northEast="northEast">
</DrawControlComponent>
</div>
<!-- </div> -->
</SectionMain>
<!-- </section> -->
</div>
</SectionMain>
</template>

View file

@ -20,7 +20,7 @@ import {
mdiCloud,
mdiCrop,
mdiAccountCog,
mdiFormatListGroup ,
mdiFormatListGroup,
mdiFormatListNumbered,
// mdiEmail,
mdiLogout,
@ -29,6 +29,7 @@ import {
mdiViewDashboard,
mdiMapSearch,
mdiInformationVariant,
mdiGlasses,
} from '@mdi/js';
import NavBarItem from '@/Components/NavBarItem.vue';
import NavBarItemLabel from '@/Components/NavBarItemLabel.vue';
@ -100,10 +101,9 @@ const showAbout = async () => {
</script>
<template>
<nav class="text-base top-0 left-0 right-0 fixed bg-gray-50 h-14 z-40 w-screen transition-position lg:w-auto dark:bg-slate-800"
:class="{ 'xl:pl-60': props.showBurger == true }">
<FirstrunWizard ref="about"></FirstrunWizard>
<FirstrunWizard ref="about"></FirstrunWizard>
<div class="flex lg:items-stretch" :class="containerMaxW">
<div class="flex-1 items-stretch flex h-14">
<NavBarItem type="flex lg:hidden" @click.prevent="layoutStore.asideMobileToggle()" v-if="props.showBurger">
@ -113,10 +113,11 @@ const showAbout = async () => {
<BaseIcon :path="mdiMenu" size="24" />
</NavBarItem>
<NavBarItem route-name="apps.dashboard">
<NavBarItemLabel :icon="mdiViewDashboard" label="Dashboard" size="22" is-hover-label-only route-name="apps.dashboard" />
<NavBarItemLabel :icon="mdiViewDashboard" label="Dashboard" size="22" is-hover-label-only
route-name="apps.dashboard" />
</NavBarItem>
<NavBarItem route-name="apps.map">
<NavBarItemLabel :icon="mdiMapSearch" label="Map" size="22" is-hover-label-only route-name="apps.map" />
<NavBarItemLabel :icon="mdiMapSearch" label="Map" size="22" is-hover-label-only route-name="apps.map" />
</NavBarItem>
<!-- <NavBarItem>
<NavBarSearch />
@ -131,7 +132,7 @@ const showAbout = async () => {
:class="[isMenuNavBarActive ? 'block' : 'hidden']">
<div
class="max-h-screen-menu overflow-y-auto lg:overflow-visible lg:flex lg:items-stretch lg:justify-end lg:ml-auto">
<!-- help menu -->
<NavBarMenu>
<NavBarItemLabel :icon="mdiMenu" label="Help menu" />
@ -165,13 +166,16 @@ const showAbout = async () => {
</NavBarItem>
<NavBarItem v-if="userHasRoles(['administrator'])" :route-name="'settings.overview'">
<NavBarItemLabel :icon="mdiFormatListGroup" label="Administration" />
</NavBarItem>
</NavBarItem>
<NavBarItem v-if="userHasRoles(['submitter'])" :route-name="'dataset.list'">
<NavBarItemLabel :icon="mdiFormatListNumbered" label="Submitter Setup" />
</NavBarItem>
<NavBarItemLabel :icon="mdiFormatListNumbered" label="Submitter Menu" />
</NavBarItem>
<NavBarItem v-if="userHasRoles(['editor'])" :route-name="'editor.dataset.list'">
<NavBarItemLabel :icon="mdiFormatListNumbered" label="Editor Setup" />
</NavBarItem>
<NavBarItemLabel :icon="mdiFormatListNumbered" label="Editor Menu" />
</NavBarItem>
<NavBarItem v-if="userHasRoles(['reviewer'])" :route-name="'reviewer.dataset.list'">
<NavBarItemLabel :icon="mdiGlasses" label="Reviewer Menu" />
</NavBarItem>
<!-- <NavBarItem>
<NavBarItemLabel :icon="mdiEmail" label="Messages" />
</NavBarItem> -->
@ -196,7 +200,7 @@ const showAbout = async () => {
</NavBarItem>
<NavBarItem is-desktop-icon-only @click="logout">
<NavBarItemLabel v-bind:icon="mdiLogout" label="Log out" is-desktop-icon-only />
</NavBarItem>
</NavBarItem>
</div>
</div>
</div>