Merge remote-tracking branch 'origin' into SSGDHA-199-Finaliza-o-do-m…

…odal-de-Turmas-Di-rios
ladesa-ro · Oct 26, 2024 · a23033d · a23033d
2 parents 7892cf9 + 68997b4
commit a23033d
Show file tree

Hide file tree

Showing 14 changed files with 14,031 additions and 13,972 deletions.
diff --git a/app.vue b/app.vue
@@ -1,9 +1,7 @@
 <script lang="ts" setup>
-import { ref } from 'vue';
-
 const { isDark } = useCustomTheme();
 
-setupApiClient();
+setupApiClient(); 
 
 const dayjs = useDayJs();
 const selectedDay = ref(dayjs());
@@ -34,4 +32,5 @@ provide('selectedDay', selectedDay);
 
 <style>
 @import '~/styles/app.css';
+/* @import '~/assets/styles/themes/theme.css'; */
 </style>
diff --git a/assets/styles/themes/theme.css b/assets/styles/themes/theme.css
@@ -11,6 +11,8 @@
   --sisgha-theme-primary-half: 156, 207, 163;
 
   --sisgha-theme-divider: 0, 0, 0;
+
+  --ladesa-card: 87, 239, 87; /*57ed57*/
 }
 
 .app-color-mode-dark {
@@ -25,6 +27,8 @@
   --sisgha-theme-primary-half: 37, 90, 45;
 
   --sisgha-theme-divider: 255, 255, 255;
+
+  --ladesa-card: 35, 180, 93; /*23b45d*/
 }
 
 .app {

diff --git a/components/UI/Layouts/Dashboard/Sisgha/Dape/Sidebar/Items/Items.ts b/components/UI/Layouts/Dashboard/Sisgha/Dape/Sidebar/Items/Items.ts
@@ -10,48 +10,50 @@ import iconPerfil from '~/assets/icons/Usuario.svg';
 import iconUsuarios from '~/assets/icons/Usuarios.svg';
 import type { ISidebarItem } from '../../../../../../../Sidebar/ISidebarItem';
 
+const CAMINHO_DAPE: string = '/sisgha/dape';
+
 export const useLayoutsDashboardSisghaDapeSidebarItems = () => {
   const items: ISidebarItem[] = [
     {
       type: 'link',
       title: 'Início',
       icon: iconHome,
-      to: '/sisgha/dape',
+      to: `${CAMINHO_DAPE}/`,
       exact: true,
     },
     {
       type: 'link',
       title: 'Turmas',
       icon: iconTurmas,
-      to: '/sisgha/dape/turmas',
+      to: `${CAMINHO_DAPE}/turmas`,
       exact: false,
     },
     {
       type: 'link',
       title: 'Disciplinas',
       icon: iconDisciplina,
-      to: '/sisgha/dape/disciplinas',
+      to: `${CAMINHO_DAPE}/disciplinas`,
       exact: false,
     },
     {
       type: 'link',
       title: 'Perfil',
       icon: iconPerfil,
-      to: '/perfil',
+      to: `${CAMINHO_DAPE}/perfil`,
       exact: false,
     },
     {
       type: 'link',
       title: 'Diários',
       icon: iconDiario,
-      to: '/sisgha/dape/diarios',
+      to: '/dashboard/diarios', //alterar depois que terminar a configuração da tela
       exact: false,
     },
     {
       type: 'link',
       title: 'Calendário',
       icon: iconCalendario,
-      to: '/sisgha/dape/calendario',
+      to: `${CAMINHO_DAPE}/calendario`,
       exact: false,
     },
     {
@@ -63,14 +65,14 @@ export const useLayoutsDashboardSisghaDapeSidebarItems = () => {
           type: 'link',
           title: 'Usuários',
           icon: iconUsuarios,
-          to: '/sisgha/dape/usuarios',
+          to: `${CAMINHO_DAPE}/usuarios`,
           exact: false,
         },
         {
           type: 'link',
           title: 'Cursos',
           icon: iconCursos,
-          to: '/sisgha/dape/cursos',
+          to: `${CAMINHO_DAPE}/cursos`,
           exact: false,
         },
       ],

diff --git a/components/UI/Layouts/Dashboard/Sisgha/Professor/Sidebar/Items/Items.ts b/components/UI/Layouts/Dashboard/Sisgha/Professor/Sidebar/Items/Items.ts
@@ -4,29 +4,31 @@ import iconLogout from '~/assets/icons/Logout.svg';
 import iconPerfil from '~/assets/icons/Usuario.svg';
 import type { ISidebarItem } from '../../../../../../../Sidebar/ISidebarItem';
 
+const CAMINHO_PROFESSOR: string = '/sisgha/professor';
+
 export const useLayoutsDashboardSisghaProfessorSidebarItems = () => {
   const items: ISidebarItem[] = [
     {
       type: 'link',
       title: 'Início',
       icon: iconHome,
-      to: '/sisgha/professor',
+      to: `${CAMINHO_PROFESSOR}/`,
       exact: true,
     },
 
     {
       type: 'link',
       title: 'Perfil',
       icon: iconPerfil,
-      to: '/perfil',
+      to: `${CAMINHO_PROFESSOR}/perfil`,
       exact: false,
     },
 
     {
       type: 'link',
       title: 'Calendário',
       icon: iconCalendario,
-      to: '/calendario',
+      to: `${CAMINHO_PROFESSOR}/calendario`,
       exact: false,
     },
 

diff --git a/composables/useCustomTheme.ts b/composables/useCustomTheme.ts
@@ -1,19 +1,22 @@
-import { useDark, useToggle } from '@vueuse/core';
-
-// composables/useCustomTheme.ts
 export function useCustomTheme() {
   const { $vuetify } = useNuxtApp();
 
-  const isDark = useDark({
-    valueDark: 'dark',
-    valueLight: 'light',
-    initialValue: 'light',
-    onChanged: (dark: boolean) => {
-      $vuetify.theme.global.name.value = dark ? 'dark' : 'light';
-    },
-  });
+  const colorMode = useColorMode();
+
+  const changeTheme = () => {
+    colorMode.preference = (colorMode.preference === 'dark' ? 'light' : 'dark');
+  }
 
-  const toggle = useToggle(isDark);
+  const isDark = computed(() =>{
+    return colorMode.value === 'dark';
+  })
+
+  watch(isDark, () => {
+    if (isDark.value)
+      $vuetify.theme.global.name.value = 'dark';
+    else
+      $vuetify.theme.global.name.value = 'light';
+  }, { immediate: true });
 
-  return { isDark, toggle };
-}
+  return { changeTheme, isDark };
+}
diff --git a/nuxt.config.ts b/nuxt.config.ts
@@ -42,10 +42,23 @@ export default defineNuxtConfig({
   modules: [
     '@sidebase/nuxt-auth',
     '@nuxtjs/tailwindcss',
+    '@nuxtjs/color-mode',
     'vue3-carousel-nuxt',
     'vuetify-nuxt-module',
   ],
 
+  tailwindcss: {
+    configPath: './tailwind.config.mts',
+  },
+
+  // ==============================================
+
+  colorMode: {
+    preference: 'system',
+    classPrefix: '',
+    classSuffix: '',
+  },
+
   // ==============================================
 
   auth: {