Merge branch 'dev' of ssh://git.codelfi.com:2202/telemedpro/hgh_admin into dev
This commit is contained in:
commit
fb95feef0f
@ -4,12 +4,12 @@ import { themeConfig } from '@themeConfig'
|
||||
|
||||
// Components
|
||||
import Footer from '@/layouts/components/Footer.vue'
|
||||
import NavBarNotifications from '@/layouts/components/NavBarNotifications.vue'
|
||||
import NavSearchBar from '@/layouts/components/NavSearchBar.vue'
|
||||
import NavbarShortcuts from '@/layouts/components/NavbarShortcuts.vue'
|
||||
// import NavBarNotifications from '@/layouts/components/NavBarNotifications.vue'
|
||||
// import NavSearchBar from '@/layouts/components/NavSearchBar.vue'
|
||||
// import NavbarShortcuts from '@/layouts/components/NavbarShortcuts.vue'
|
||||
import NavbarThemeSwitcher from '@/layouts/components/NavbarThemeSwitcher.vue'
|
||||
import UserProfile from '@/layouts/components/UserProfile.vue'
|
||||
import NavBarI18n from '@core/components/I18n.vue'
|
||||
// import NavBarI18n from '@core/components/I18n.vue'
|
||||
import { HorizontalNavLayout } from '@layouts'
|
||||
import { VNodeRenderer } from '@layouts/components/VNodeRenderer'
|
||||
|
||||
@ -45,16 +45,16 @@ watch([
|
||||
</RouterLink>
|
||||
<VSpacer />
|
||||
|
||||
<NavSearchBar />
|
||||
<!-- <NavSearchBar /> -->
|
||||
|
||||
<NavBarI18n
|
||||
<!-- <NavBarI18n
|
||||
v-if="themeConfig.app.i18n.enable && themeConfig.app.i18n.langConfig?.length"
|
||||
:languages="themeConfig.app.i18n.langConfig"
|
||||
/>
|
||||
/> -->
|
||||
|
||||
<NavbarThemeSwitcher />
|
||||
<NavbarShortcuts />
|
||||
<NavBarNotifications class="me-2" />
|
||||
<!-- <NavbarShortcuts /> -->
|
||||
<!-- <NavBarNotifications class="me-2" /> -->
|
||||
<UserProfile />
|
||||
</template>
|
||||
|
||||
@ -77,6 +77,6 @@ watch([
|
||||
</template>
|
||||
|
||||
<!-- 👉 Customizer -->
|
||||
<TheCustomizer />
|
||||
<!-- <TheCustomizer /> -->
|
||||
</HorizontalNavLayout>
|
||||
</template>
|
||||
|
@ -1,16 +1,15 @@
|
||||
<script setup>
|
||||
import navItems from '@/navigation/vertical';
|
||||
import { themeConfig } from '@themeConfig';
|
||||
import { useStore } from 'vuex';
|
||||
const store = useStore()
|
||||
// Components
|
||||
import Footer from '@/layouts/components/Footer.vue';
|
||||
import NavBarNotifications from '@/layouts/components/NavBarNotifications.vue';
|
||||
import NavSearchBar from '@/layouts/components/NavSearchBar.vue';
|
||||
import NavbarShortcuts from '@/layouts/components/NavbarShortcuts.vue';
|
||||
// import NavBarNotifications from '@/layouts/components/NavBarNotifications.vue';
|
||||
// import NavSearchBar from '@/layouts/components/NavSearchBar.vue';
|
||||
// import NavbarShortcuts from '@/layouts/components/NavbarShortcuts.vue';
|
||||
import NavbarThemeSwitcher from '@/layouts/components/NavbarThemeSwitcher.vue';
|
||||
import UserProfile from '@/layouts/components/UserProfile.vue';
|
||||
import NavBarI18n from '@core/components/I18n.vue';
|
||||
// import NavBarI18n from '@core/components/I18n.vue';
|
||||
|
||||
// @layouts plugin
|
||||
import { VerticalNavLayout } from '@layouts';
|
||||
@ -45,17 +44,17 @@ watch([
|
||||
<VIcon icon="ri-menu-line" />
|
||||
</IconBtn>
|
||||
|
||||
<NavSearchBar class="ms-lg-n2" />
|
||||
<!-- <NavSearchBar class="ms-lg-n2" /> -->
|
||||
|
||||
<VSpacer />
|
||||
|
||||
<NavBarI18n
|
||||
<!-- <NavBarI18n
|
||||
v-if="themeConfig.app.i18n.enable && themeConfig.app.i18n.langConfig?.length"
|
||||
:languages="themeConfig.app.i18n.langConfig"
|
||||
/>
|
||||
/> -->
|
||||
<NavbarThemeSwitcher />
|
||||
<NavbarShortcuts />
|
||||
<NavBarNotifications class="me-2" />
|
||||
<!-- <NavbarShortcuts /> -->
|
||||
<!-- <NavBarNotifications class="me-2" /> -->
|
||||
<UserProfile />
|
||||
</div>
|
||||
</template>
|
||||
@ -79,6 +78,6 @@ watch([
|
||||
</template>
|
||||
|
||||
<!-- 👉 Customizer -->
|
||||
<TheCustomizer />
|
||||
<!-- <TheCustomizer /> -->
|
||||
</VerticalNavLayout>
|
||||
</template>
|
||||
|
@ -2,10 +2,10 @@
|
||||
<div class="h-100 d-flex align-center justify-space-between text-medium-emphasis">
|
||||
<!-- 👉 Footer: left content -->
|
||||
<span class="d-flex align-center">
|
||||
©
|
||||
© Copyright
|
||||
{{ new Date().getFullYear() }}
|
||||
Made With
|
||||
<VIcon
|
||||
, All Rights Reserved.
|
||||
<!-- <VIcon
|
||||
icon="ri-heart-line"
|
||||
color="error"
|
||||
size="1.25rem"
|
||||
@ -16,10 +16,10 @@
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
class="text-primary ms-1"
|
||||
>ThemeSelection</a>
|
||||
>ThemeSelection</a> -->
|
||||
</span>
|
||||
<!-- 👉 Footer: right content -->
|
||||
<span class="d-md-flex gap-x-4 text-primary d-none">
|
||||
<!-- <span class="d-md-flex gap-x-4 text-primary d-none">
|
||||
<a
|
||||
href="https://themeselection.com/license/"
|
||||
target="noopener noreferrer"
|
||||
@ -32,6 +32,6 @@
|
||||
href="https://demos.themeselection.com/materio-vuetify-vuejs-admin-template/documentation/guide/laravel-integration/folder-structure.html"
|
||||
target="noopener noreferrer"
|
||||
>Documentation</a>
|
||||
</span>
|
||||
</span> -->
|
||||
</div>
|
||||
</template>
|
||||
|
Loading…
Reference in New Issue
Block a user