IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2004-Basic-Menu' into 2290-New-Design

Browse Source
This commit is contained in:
ogerly 2022-11-03 13:52:44 +01:00
commit 8450075135
2 changed files with 56 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/App.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div id="app" class="h-100"> <div id="app" class="placeholder">
<component :is="$route.meta.requiresAuth ? 'DashboardLayout' : 'AuthLayout'" /> <component :is="$route.meta.requiresAuth ? 'DashboardLayout' : 'AuthLayout'" />
<div class="goldrand position-fixed w-100 fixed-bottom zindex1000"></div> <div class="goldrand position-fixed w-100 fixed-bottom zindex1000"></div>
</div> </div>

38
frontend/src/layouts/DashboardLayout.vue
View File

@ -1,6 +1,7 @@
<template> <template>
<div class="main-page h-100"> <div class="main-page">
<div v-if="skeleton"> <div v-if="skeleton">
<b-container class="pl-0 pl-lg-0 pl-md-2">
<b-row class="text-center"> <b-row class="text-center">
<b-col> <b-col>
<b-skeleton-img no-aspect animation="wave" height="118px"></b-skeleton-img> <b-skeleton-img no-aspect animation="wave" height="118px"></b-skeleton-img>
@ -40,29 +41,25 @@
<b-skeleton animation="wave" width="70%"></b-skeleton> <b-skeleton animation="wave" width="70%"></b-skeleton>
</b-col> </b-col>
</b-row> </b-row>
</b-container>
</div> </div>
<div v-else class="position-absolute w-100 h-100"> <div v-else>
<!--<navbar <!--sm menu mobil hamburger button-->
class="main-navbar"
:balance="balance"
:visible="visible"
:pending="pending"
:elopageUri="elopageUri"
@set-visible="setVisible"
@admin="admin"
@logout="logout"
/>-->
<navbar-new class="main-navbar" :balance="balance"></navbar-new>
<!-- menu mobil -->
<div class="d-block d-lg-none d-md-none d-sm-block fixed-bottom h-15 width70 zindex1000"> <div class="d-block d-lg-none d-md-none d-sm-block fixed-bottom h-15 width70 zindex1000">
<b-button @click="toogleMobilMenu"> <b-button @click="toogleMobilMenu">
<span v-if="hamburger" class="navbar-toggler-icon"></span> <span v-if="hamburger" class="navbar-toggler-icon"></span>
<span v-else><b-icon icon="x-square" aria-hidden="true"></b-icon></span> <span v-else><b-icon icon="x-square" aria-hidden="true"></b-icon></span>
</b-button> </b-button>
</div> </div>
<b-container fluid class="pl-0 pl-lg-0 pl-md-2"> <b-container class="pl-0 pl-lg-0 pl-md-2">
<b-row> <b-row>
<!-- navbar -->
<b-col>
<navbar-new class="main-navbar" :balance="balance"></navbar-new>
</b-col>
</b-row>
<b-row>
<!-- sidebar left-->
<b-col <b-col
cols="1" cols="1"
lg="2" lg="2"
@ -70,12 +67,6 @@
ref="sideMenu" ref="sideMenu"
class="d-none d-lg-block d-md-block position-absolute h-100 zindex10" class="d-none d-lg-block d-md-block position-absolute h-100 zindex10"
> >
<!-- <sidebar
class="main-sidebar"
:elopageUri="elopageUri"
@admin="admin"
@logout="logout"
/> -->
<sidebar-new <sidebar-new
class="main-sidebar" class="main-sidebar"
@admin="admin" @admin="admin"
@ -83,6 +74,7 @@
@modeToggle="modeToggle" @modeToggle="modeToggle"
/> />
</b-col> </b-col>
<!-- content header -->
<b-col <b-col
cols="12" cols="12"
lg="7" lg="7"
@ -95,6 +87,7 @@
> >
<!-- content header --> <!-- content header -->
</b-col> </b-col>
<!--right box -->
<b-col <b-col
cols="12" cols="12"
lg="3" lg="3"
@ -107,6 +100,7 @@
> >
<!--rechtebox --> <!--rechtebox -->
</b-col> </b-col>
<!--content -->
<b-col cols="12" lg="7" md="11" offset="0" offset-lg="2" offset-md="1" order-1> <b-col cols="12" lg="7" md="11" offset="0" offset-lg="2" offset-md="1" order-1>
<div class="main-content mt-3"> <div class="main-content mt-3">
<fade-transition :duration="200" origin="center top" mode="out-in"> <fade-transition :duration="200" origin="center top" mode="out-in">