Răsfoiți Sursa

Merge remote-tracking branch 'origin/development'

Denis 4 săptămâni în urmă
părinte
comite
3347c2e7c0
46 a modificat fișierele cu 2354 adăugiri și 1167 ștergeri
  1. 823 123
      package-lock.json
  2. BIN
      public/background.png
  3. BIN
      public/icons/user-icon.jpg
  4. BIN
      public/images/background-opacity.png
  5. 1 1
      quasar.config.js
  6. 1 21
      src/App.vue
  7. 21 0
      src/api/auth.js
  8. 6 0
      src/assets/images/logo.svg
  9. 7 0
      src/assets/images/mini-logo.svg
  10. 0 2
      src/boot/defaultPropsComponents.js
  11. 57 0
      src/components/charts/AniversariantesCard.vue
  12. 2 10
      src/components/charts/CardIconChart.vue
  13. 2 10
      src/components/charts/CardIconMiniChart.vue
  14. 42 0
      src/components/charts/DashboardChartCard.vue
  15. 48 0
      src/components/charts/DashboardStatCard.vue
  16. 1 1
      src/components/charts/custom/NPSChart.vue
  17. 1 1
      src/components/charts/custom/SpeedometerChart.vue
  18. 6 17
      src/components/charts/normal/BarChart.vue
  19. 5 14
      src/components/charts/normal/DoughnutChart.vue
  20. 189 0
      src/components/charts/normal/GroupedBarChart.vue
  21. 6 17
      src/components/charts/normal/LineChart.vue
  22. 5 14
      src/components/charts/normal/PieChart.vue
  23. 3 11
      src/components/defaults/DefaultFilePicker.vue
  24. 10 7
      src/components/defaults/DefaultInput.vue
  25. 4 4
      src/components/defaults/DefaultPasswordInput.vue
  26. 27 32
      src/components/layout/DefaultHeaderPage.vue
  27. 33 69
      src/components/layout/LeftMenuLayout.vue
  28. 1 2
      src/components/layout/LeftMenuLayoutMobile.vue
  29. 1 0
      src/composables/useAuth.js
  30. 11 53
      src/css/app.scss
  31. 52 153
      src/css/quasar.variables.scss
  32. 17 84
      src/css/table.scss
  33. 2 0
      src/layouts/LoginLayout.vue
  34. 2 23
      src/layouts/MainLayout.vue
  35. 86 0
      src/pages/ForgotMyPasswordPage.vue
  36. 96 0
      src/pages/RecoveryPasswordPage.vue
  37. 359 181
      src/pages/dashboard/DashboardPage.vue
  38. 67 0
      src/pages/forgot-password/EmailDataStep.vue
  39. 71 0
      src/pages/forgot-password/NewPasswordStep.vue
  40. 67 0
      src/pages/forgot-password/ResendEmailStep.vue
  41. 138 0
      src/pages/forgot-password/VerifyCodeStep.vue
  42. 47 27
      src/pages/login/LoginPage.vue
  43. 0 231
      src/pages/login/component/WavePattern.vue
  44. 3 1
      src/router/index.js
  45. 26 4
      src/router/routes.js
  46. 8 54
      src/stores/navigation.js

Fișier diff suprimat deoarece este prea mare
+ 823 - 123
package-lock.json


BIN
public/background.png


BIN
public/icons/user-icon.jpg


BIN
public/images/background-opacity.png


+ 1 - 1
quasar.config.js

@@ -107,7 +107,7 @@ export default defineConfig((ctx) => {
     framework: {
       lang: "pt-BR",
       config: {
-        dark: "auto",
+        dark: "false",
         notify: {
           position: "top-right",
         },

+ 1 - 21
src/App.vue

@@ -3,7 +3,7 @@
 </template>
 
 <script setup>
-import { Cookies, useQuasar } from "quasar";
+import { Cookies } from "quasar";
 import { watch } from "vue";
 import { useI18n } from "vue-i18n";
 
@@ -13,26 +13,6 @@ defineOptions({
 
 const { locale } = useI18n();
 
-const $q = useQuasar();
-const systemTheme = window.matchMedia("(prefers-color-scheme: dark)").matches
-  ? "dark"
-  : "light";
-
-const theme = Cookies.get("theme") || systemTheme;
-
-$q.dark.set(theme == "dark");
-
-watch(
-  () => $q.dark.isActive,
-  (value) => {
-    Cookies.set("theme", value ? "dark" : "light", {
-      expires: 365,
-      sameSite: "Lax",
-      path: "/",
-    });
-  },
-);
-
 watch(
   () => locale.value,
   (value) => {

+ 21 - 0
src/api/auth.js

@@ -0,0 +1,21 @@
+import api from "src/api";
+
+export const forgotPassword = async (email) => {
+  const { data } = await api.post("/forgot-password", { email });
+  return data;
+};
+
+export const verifyPasswordCode = async (email, code) => {
+  const { data } = await api.post("/forgot-password/verify-code", { email, code });
+  return data;
+};
+
+export const resetPassword = async (email, code, password, passwordConfirmation) => {
+  const { data } = await api.post("/reset-password", {
+    email,
+    code,
+    password,
+    password_confirmation: passwordConfirmation,
+  });
+  return data;
+};

Fișier diff suprimat deoarece este prea mare
+ 6 - 0
src/assets/images/logo.svg


Fișier diff suprimat deoarece este prea mare
+ 7 - 0
src/assets/images/mini-logo.svg


+ 0 - 2
src/boot/defaultPropsComponents.js

@@ -21,14 +21,12 @@ export default defineBoot(() => {
   });
   SetComponentDefaults(QInput, {
     rounded: true,
-    dark: true,
     standout: true,
     dense: true,
   });
   SetComponentDefaults(QSelect, {
     rounded: true,
     standout: true,
-    dark: true,
     dense: true,
   });
   SetComponentDefaults(QCard, {

+ 57 - 0
src/components/charts/AniversariantesCard.vue

@@ -0,0 +1,57 @@
+<template>
+  <q-card flat class="dashboard-chart-card card-ring">
+    <div class="flex justify-between items-center no-wrap q-mb-sm">
+      <span class="text-subtitle2 text-weight-medium">Aniversariantes do Mês</span>
+      <q-btn flat round dense icon="mdi-book-open-outline" color="grey-6" size="sm" />
+    </div>
+
+    <div class="text-caption text-grey-6 q-mb-xs">Nome</div>
+    <q-separator />
+
+    <q-list>
+      <template v-for="(person, index) in people" :key="index">
+        <q-item class="q-px-none q-py-md">
+          <q-item-section avatar>
+            <div class="day-badge">{{ person.day }}</div>
+          </q-item-section>
+          <q-item-section>
+            <q-item-label>{{ person.name }}</q-item-label>
+          </q-item-section>
+        </q-item>
+        <q-separator v-if="index < people.length - 1" />
+      </template>
+    </q-list>
+  </q-card>
+</template>
+
+<script setup>
+defineProps({
+  people: {
+    type: Array,
+    default: () => [],
+  },
+});
+</script>
+
+<style scoped>
+.dashboard-chart-card {
+  border-radius: 8px;
+  padding: 16px;
+  display: flex;
+  flex-direction: column;
+}
+
+.day-badge {
+  width: 32px;
+  height: 32px;
+  border-radius: 50%;
+  background-color: #f97316;
+  color: #fff;
+  font-size: 13px;
+  font-weight: 600;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-shrink: 0;
+}
+</style>

+ 2 - 10
src/components/charts/CardIconChart.vue

@@ -63,16 +63,8 @@ const { color, title, icon } = defineProps({
 @use "sass:map";
 @use "src/css/quasar.variables.scss";
 
-body.body--light {
-  .background {
-    background: rgba(map.get($colors, "primary"), 0.2) !important;
-  }
-}
-
-body.body--dark {
-  .background {
-    background: rgba(map.get($colors-dark, "primary"), 0.2) !important;
-  }
+.background {
+  background: rgba(map.get($colors, "primary"), 0.2) !important;
 }
 
 .chart-card {

+ 2 - 10
src/components/charts/CardIconMiniChart.vue

@@ -67,16 +67,8 @@ const { color, title, icon, chartData, numberCard, numberPorcent } =
 @use "sass:map";
 @use "src/css/quasar.variables.scss";
 
-body.body--light {
-  .background {
-    background: rgba(map.get($colors, "primary"), 0.2) !important;
-  }
-}
-
-body.body--dark {
-  .background {
-    background: rgba(map.get($colors-dark, "primary"), 0.2) !important;
-  }
+.background {
+  background: rgba(map.get($colors, "primary"), 0.2) !important;
 }
 
 .mini-card {

+ 42 - 0
src/components/charts/DashboardChartCard.vue

@@ -0,0 +1,42 @@
+<template>
+  <q-card flat class="dashboard-chart-card card-ring">
+    <div class="flex justify-between items-center no-wrap q-mb-sm">
+      <span class="text-subtitle2 text-weight-medium">{{ title }}</span>
+      <q-btn
+        flat
+        round
+        dense
+        icon="mdi-book-open-outline"
+        color="grey-6"
+        size="sm"
+        @click="$emit('export')"
+      />
+    </div>
+    <div class="chart-slot-wrapper">
+      <slot />
+    </div>
+  </q-card>
+</template>
+
+<script setup>
+defineProps({
+  title: { type: String, required: true },
+});
+
+defineEmits(["export"]);
+</script>
+
+<style scoped>
+.dashboard-chart-card {
+  border-radius: 8px;
+  padding: 16px;
+  display: flex;
+  flex-direction: column;
+}
+
+.chart-slot-wrapper {
+  flex: 1;
+  min-height: 220px;
+  position: relative;
+}
+</style>

+ 48 - 0
src/components/charts/DashboardStatCard.vue

@@ -0,0 +1,48 @@
+<template>
+  <q-card class="stat-card q-pa-lg">
+    <div class="column full-width" style="gap: 8px">
+      <div class="flex justify-between items-start no-wrap">
+        <span class="text-body2 text-grey-6">{{ title }}</span>
+        <q-icon :name="icon" size="22px" color="grey-5" />
+      </div>
+
+      <span class="text-h4 text-primary" style="font-weight: 600; line-height: 1.2">
+        {{ value }}
+      </span>
+
+      <q-badge
+        v-if="badge"
+        :color="badgeColor"
+        :label="badge"
+        class="stat-badge"
+      />
+      <span v-else class="text-caption text-grey-6">{{ subtitle }}</span>
+    </div>
+  </q-card>
+</template>
+
+<script setup>
+defineProps({
+  title: { type: String, required: true },
+  icon: { type: String, default: "mdi-information-outline" },
+  value: { type: [String, Number], required: true },
+  subtitle: { type: String, default: "" },
+  badge: { type: String, default: "" },
+  badgeColor: { type: String, default: "secondary" },
+});
+</script>
+
+<style scoped>
+.stat-card {
+  flex: 1 1 200px;
+  border-radius: 8px;
+  box-shadow: 0 0 0 1px #c0c0c0c0 !important;
+}
+
+.stat-badge {
+  font-size: 0.75rem;
+  padding: 4px 8px;
+  border-radius: 4px;
+  width: fit-content;
+}
+</style>

+ 1 - 1
src/components/charts/custom/NPSChart.vue

@@ -14,7 +14,7 @@
         @click="downloadImage"
       />
     </q-card-section>
-    <q-separator dark inset />
+    <q-separator inset />
     <div class="graph-container">
       <div class="column">
         <div class="col-4 row">

+ 1 - 1
src/components/charts/custom/SpeedometerChart.vue

@@ -16,7 +16,7 @@
           @click="downloadImage"
         />
       </div>
-      <q-separator dark />
+      <q-separator />
     </q-card-section>
     <div class="graph-container">
       <Doughnut

+ 6 - 17
src/components/charts/normal/BarChart.vue

@@ -29,7 +29,7 @@ import {
 } from "chart.js";
 import ChartDataLabels from "chartjs-plugin-datalabels";
 import { base64ToJPEG } from "src/helpers/convertBase64Image";
-import { useQuasar, colors, getCssVar } from "quasar";
+import { colors, getCssVar } from "quasar";
 
 ChartJS.register(
   Title,
@@ -40,7 +40,6 @@ ChartJS.register(
   LinearScale,
 );
 
-const $q = useQuasar();
 const chart_ref = ref(null);
 const { lighten } = colors;
 
@@ -86,21 +85,13 @@ const onResize = () => {
   }
 };
 
-const textColor = computed(() => {
-  return $q.dark.isActive ? "text-white" : "text-black";
-});
+const textColor = computed(() => "text-black");
 
-const labelColor = computed(() => {
-  return $q.dark.isActive ? "#ffffff" : "#000000";
-});
+const labelColor = computed(() => "#000000");
 
-const gridColor = computed(() => {
-  return $q.dark.isActive ? "rgba(255, 255, 255, 0.1)" : "rgba(0, 0, 0, 0.1)";
-});
+const gridColor = computed(() => "rgba(0, 0, 0, 0.1)");
 
-const dataLabelColor = computed(() => {
-  return $q.dark.isActive ? "#ffffff" : "#000000";
-});
+const dataLabelColor = computed(() => "#000000");
 
 const hasData = computed(() => {
   return props.data?.chart_data && props.data.chart_data.length > 0;
@@ -170,9 +161,7 @@ const chartBarOptions = computed(() => ({
       },
     },
     tooltip: {
-      backgroundColor: $q.dark.isActive
-        ? "rgba(0, 0, 0, 0.8)"
-        : "rgba(255, 255, 255, 0.9)",
+      backgroundColor: "rgba(255, 255, 255, 0.9)",
       titleColor: labelColor.value,
       bodyColor: labelColor.value,
       borderColor: labelColor.value,

+ 5 - 14
src/components/charts/normal/DoughnutChart.vue

@@ -21,11 +21,10 @@ import { Chart as ChartJS, ArcElement, Tooltip, Legend } from "chart.js";
 import { Doughnut } from "vue-chartjs";
 import ChartDataLabels from "chartjs-plugin-datalabels";
 import { base64ToJPEG } from "src/helpers/convertBase64Image";
-import { useQuasar, colors, getCssVar } from "quasar";
+import { colors, getCssVar } from "quasar";
 
 ChartJS.register(ArcElement, Tooltip, Legend);
 
-const $q = useQuasar();
 const { lighten } = colors;
 
 const props = defineProps({
@@ -59,17 +58,11 @@ const onResize = () => {
   }
 };
 
-const textColor = computed(() => {
-  return $q.dark.isActive ? "text-white" : "text-black";
-});
+const textColor = computed(() => "text-black");
 
-const labelColor = computed(() => {
-  return $q.dark.isActive ? "#ffffff" : "#000000";
-});
+const labelColor = computed(() => "#000000");
 
-const dataLabelColor = computed(() => {
-  return $q.dark.isActive ? "#ffffff" : "#000000";
-});
+const dataLabelColor = computed(() => "#000000");
 
 const hasData = computed(() => {
   return props.data?.chart_data && props.data.chart_data.length > 0;
@@ -145,9 +138,7 @@ const chartPieOptions = computed(() => ({
       },
     },
     tooltip: {
-      backgroundColor: $q.dark.isActive
-        ? "rgba(0, 0, 0, 0.8)"
-        : "rgba(255, 255, 255, 0.9)",
+      backgroundColor: "rgba(255, 255, 255, 0.9)",
       titleColor: labelColor.value,
       bodyColor: labelColor.value,
       borderColor: labelColor.value,

+ 189 - 0
src/components/charts/normal/GroupedBarChart.vue

@@ -0,0 +1,189 @@
+<template>
+  <div v-bind="$attrs" class="chart-wrapper full-width full-height">
+    <q-resize-observer @resize="onResize" />
+    <div v-if="hasData" class="chart-container">
+      <Bar
+        ref="chart_ref"
+        :options="chartOptions"
+        :data="chartData"
+        :plugins="[ChartDataLabels]"
+      />
+    </div>
+    <div v-else class="no-data-container">
+      <span class="text-grey-6">{{ $t("http.errors.no_records_found") }}</span>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref, computed } from "vue";
+import { Bar } from "vue-chartjs";
+import {
+  Chart as ChartJS,
+  Title,
+  Tooltip,
+  Legend,
+  BarElement,
+  CategoryScale,
+  LinearScale,
+} from "chart.js";
+import ChartDataLabels from "chartjs-plugin-datalabels";
+import { base64ToJPEG } from "src/helpers/convertBase64Image";
+
+ChartJS.register(Title, Tooltip, Legend, BarElement, CategoryScale, LinearScale);
+
+const chart_ref = ref(null);
+
+const props = defineProps({
+  /**
+   * Array de labels do eixo X
+   */
+  labels: {
+    type: Array,
+    default: () => [],
+  },
+  /**
+   * Array de datasets no formato:
+   * [{ label: String, data: Number[], color: String }]
+   */
+  datasets: {
+    type: Array,
+    default: () => [],
+  },
+  title: {
+    type: String,
+    default: "",
+  },
+  labelY: {
+    type: String,
+    default: "",
+  },
+  /** Raio das bordas das barras. Use valores altos (ex: 50) para efeito "pill". */
+  barRadius: {
+    type: Number,
+    default: 4,
+  },
+  /** Exibe datalabels em cima de cada barra */
+  showDatalabels: {
+    type: Boolean,
+    default: false,
+  },
+  tickFormatter: {
+    type: Function,
+    default: null,
+  },
+  tooltipFormatter: {
+    type: Function,
+    default: null,
+  },
+});
+
+const onResize = () => {
+  if (chart_ref.value?.chart) {
+    setTimeout(() => chart_ref.value.chart.resize(), 50);
+  }
+};
+
+const hasData = computed(
+  () => props.labels.length > 0 && props.datasets.length > 0,
+);
+
+const chartData = computed(() => ({
+  labels: props.labels,
+  datasets: props.datasets.map((ds) => ({
+    label: ds.label,
+    data: ds.data,
+    backgroundColor: ds.color,
+    borderColor: ds.color,
+    borderRadius: props.barRadius,
+    borderSkipped: false,
+    borderWidth: 0,
+  })),
+}));
+
+const labelColor = "#555555";
+const gridColor = "rgba(0,0,0,0.07)";
+
+const chartOptions = computed(() => ({
+  responsive: true,
+  maintainAspectRatio: false,
+  plugins: {
+    legend: {
+      display: false,
+    },
+    datalabels: {
+      display: props.showDatalabels,
+      anchor: "end",
+      align: "top",
+      offset: 4,
+      color: "#333",
+      font: { size: 12, weight: "bold" },
+      formatter: (v) => (v > 0 ? v : ""),
+    },
+    tooltip: {
+      backgroundColor: "rgba(255,255,255,0.95)",
+      titleColor: "#333",
+      bodyColor: "#555",
+      borderColor: "rgba(0,0,0,0.1)",
+      borderWidth: 1,
+      callbacks: props.tooltipFormatter
+        ? { label: props.tooltipFormatter }
+        : {},
+    },
+  },
+  scales: {
+    x: {
+      grid: { display: false },
+      ticks: { color: labelColor, font: { size: 11 } },
+    },
+    y: {
+      display: true,
+      title: {
+        display: !!props.labelY,
+        text: props.labelY,
+        color: labelColor,
+        font: { size: 12 },
+      },
+      grid: { color: gridColor },
+      ticks: {
+        color: labelColor,
+        font: { size: 11 },
+        callback: props.tickFormatter ?? ((v) => v),
+      },
+      suggestedMin: 0,
+    },
+  },
+}));
+
+const downloadImage = () => {
+  const image = chart_ref.value?.chart?.toBase64Image("image/jpeg", 1);
+  if (image) base64ToJPEG(image, props.title || "grouped-bar-chart");
+};
+
+defineExpose({ downloadImage, chart_ref });
+</script>
+
+<style scoped>
+.chart-wrapper {
+  position: relative;
+}
+
+.chart-container {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  width: 100%;
+  height: 100%;
+}
+
+.no-data-container {
+  position: absolute;
+  inset: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 1.5rem;
+}
+</style>

+ 6 - 17
src/components/charts/normal/LineChart.vue

@@ -30,7 +30,7 @@ import {
 } from "chart.js";
 import ChartDataLabels from "chartjs-plugin-datalabels";
 import { base64ToJPEG } from "src/helpers/convertBase64Image";
-import { useQuasar, getCssVar, colors } from "quasar";
+import { getCssVar, colors } from "quasar";
 
 ChartJS.register(
   Title,
@@ -42,7 +42,6 @@ ChartJS.register(
   LinearScale,
 );
 
-const $q = useQuasar();
 const { lighten } = colors;
 const chart_ref = ref(null);
 
@@ -83,21 +82,13 @@ const onResize = () => {
   }
 };
 
-const textColor = computed(() => {
-  return $q.dark.isActive ? "text-white" : "text-black";
-});
+const textColor = computed(() => "text-black");
 
-const labelColor = computed(() => {
-  return $q.dark.isActive ? "#ffffff" : "#000000";
-});
+const labelColor = computed(() => "#000000");
 
-const gridColor = computed(() => {
-  return $q.dark.isActive ? "rgba(255, 255, 255, 0.1)" : "rgba(0, 0, 0, 0.1)";
-});
+const gridColor = computed(() => "rgba(0, 0, 0, 0.1)");
 
-const dataLabelColor = computed(() => {
-  return $q.dark.isActive ? "#ffffff" : "#000000";
-});
+const dataLabelColor = computed(() => "#000000");
 
 const hasData = computed(() => {
   return props.data?.chart_data && props.data.chart_data.length > 0;
@@ -170,9 +161,7 @@ const chartLineOptions = computed(() => ({
       },
     },
     tooltip: {
-      backgroundColor: $q.dark.isActive
-        ? "rgba(0, 0, 0, 0.8)"
-        : "rgba(255, 255, 255, 0.9)",
+      backgroundColor: "rgba(255, 255, 255, 0.9)",
       titleColor: labelColor.value,
       bodyColor: labelColor.value,
       borderColor: labelColor.value,

+ 5 - 14
src/components/charts/normal/PieChart.vue

@@ -21,11 +21,10 @@ import { Chart as ChartJS, ArcElement, Tooltip, Legend } from "chart.js";
 import { Pie } from "vue-chartjs";
 import ChartDataLabels from "chartjs-plugin-datalabels";
 import { base64ToJPEG } from "src/helpers/convertBase64Image";
-import { useQuasar, getCssVar, colors } from "quasar";
+import { getCssVar, colors } from "quasar";
 
 ChartJS.register(ArcElement, Tooltip, Legend);
 
-const $q = useQuasar();
 const { lighten } = colors;
 
 const props = defineProps({
@@ -60,17 +59,11 @@ const onResize = () => {
   }
 };
 
-const textColor = computed(() => {
-  return $q.dark.isActive ? "text-white" : "text-black";
-});
+const textColor = computed(() => "text-black");
 
-const labelColor = computed(() => {
-  return $q.dark.isActive ? "#ffffff" : "#000000";
-});
+const labelColor = computed(() => "#000000");
 
-const dataLabelColor = computed(() => {
-  return $q.dark.isActive ? "#ffffff" : "#000000";
-});
+const dataLabelColor = computed(() => "#000000");
 
 const hasData = computed(() => {
   return props.data?.chart_data && props.data.chart_data.length > 0;
@@ -146,9 +139,7 @@ const chartPieOptions = computed(() => ({
       },
     },
     tooltip: {
-      backgroundColor: $q.dark.isActive
-        ? "rgba(0, 0, 0, 0.8)"
-        : "rgba(255, 255, 255, 0.9)",
+      backgroundColor: "rgba(255, 255, 255, 0.9)",
       titleColor: labelColor.value,
       bodyColor: labelColor.value,
       borderColor: labelColor.value,

+ 3 - 11
src/components/defaults/DefaultFilePicker.vue

@@ -270,17 +270,9 @@ onUnmounted(cleanupObjectURL);
   align-items: center;
 
   .q-field__inner {
-    .body--dark & {
-      --image-bg-color: #{map.get($colors-dark, "surface")};
-      --image-border-color: #{map.get($colors-dark, "primary")};
-      --image-border-hover-color: #{map.get($colors-dark, "primary-dark")};
-    }
-
-    .body--light & {
-      --image-bg-color: #{map.get($colors, "surface")};
-      --image-border-color: #{map.get($colors, "primary")};
-      --image-border-hover-color: #{map.get($colors, "primary-dark")};
-    }
+    --image-bg-color: #{map.get($colors, "surface")};
+    --image-border-color: #{map.get($colors, "primary")};
+    --image-border-hover-color: #{map.get($colors, "primary-dark")};
 
     display: flex;
     flex-direction: column;

+ 10 - 7
src/components/defaults/DefaultInput.vue

@@ -1,16 +1,11 @@
 <template>
   <div class="column" :class="attrs.class" :style="attrs.style">
-    <div v-if="label || $slots.label" class="q-pl-xs">
-      <slot name="label">
-        <span>{{ label }}</span>
-      </slot>
-      <span v-if="required" class="text-negative q-ml-xs">*</span>
-    </div>
     <div class="col">
       <q-input
         ref="inputRef"
         v-model="model"
         v-bind="inputAttrs"
+        :label
         :error="!!error"
         :error-message="errorMessage"
         :rules
@@ -22,6 +17,10 @@
         <template v-for="(_, slotName) in $slots" #[slotName]>
           <slot :name="slotName" />
         </template>
+
+        <template #append>
+          <q-icon v-if="icon" :name="icon" size="sm" color="secondary" />
+        </template>
       </q-input>
     </div>
   </div>
@@ -41,11 +40,15 @@ defineOptions({
   inheritAttrs: false,
 });
 
-const { label, nativeInputClass, inputClass, rules } = defineProps({
+const { label, nativeInputClass, inputClass, rules, icon } = defineProps({
   label: {
     type: String,
     default: "",
   },
+  icon: {
+    type: String,
+    default: "",
+  },
   rules: {
     type: Array,
     default: () => [],

+ 4 - 4
src/components/defaults/DefaultPasswordInput.vue

@@ -4,22 +4,22 @@
     v-bind="$attrs"
     :type="!seePassword ? 'password' : 'text'"
   >
-     <template #append>
+    <template #append>
       <q-icon
-        :name="seePassword ? 'mdi-eye-off' : 'mdi-eye'"
+        :name="seePassword ? 'mdi-lock-open-outline' : 'mdi-lock-outline'"
         class="cursor-pointer q-ml-md"
+        color="secondary"
         @click="seePassword = !seePassword"
       />
     </template>
   </DefaultInput>
 </template>
 <script setup>
-import DefaultInput from "./DefaultInput.vue"
+import DefaultInput from "./DefaultInput.vue";
 
 const password = defineModel({ type: String });
 const seePassword = defineModel("seePassword", {
   default: false,
   type: Boolean,
 });
-
 </script>

+ 27 - 32
src/components/layout/DefaultHeaderPage.vue

@@ -2,7 +2,7 @@
   <div>
     <q-breadcrumbs
       v-if="displayBreadcrumbs != null"
-      class="q-mb-xs"
+      class="q-mb-xs text-secondary flex items-center"
       :class="$q.screen.lt.sm ? '' : 'q-pl-lg'"
     >
       <q-breadcrumbs-el
@@ -12,6 +12,7 @@
         :to="crumb.name ? { name: crumb.name, params: crumb.params } : null"
       />
     </q-breadcrumbs>
+
     <div
       v-else
       style="max-width: 180px"
@@ -21,21 +22,32 @@
     </div>
 
     <div class="flex items-center justify-between">
-      <div class="column q-pl-xs" :class="$q.screen.lt.sm ? '' : 'q-pt-md'">
-        <span v-if="displayTitle" class="text-h4 text-primary q-mb-xs">
+      <div
+        class="flex items-center q-pl-xs"
+        :class="$q.screen.lt.sm ? '' : 'q-pt-md'"
+      >
+        <span
+          v-if="displayTitle"
+          class="text-h6 text-primary text-weight-regular"
+        >
           {{ displayTitle }}
         </span>
         <div v-else style="width: 280px">
           <q-skeleton type="text" height="40px" />
         </div>
-        <span v-if="displayDescription" class="text-body2">
-          {{ displayDescription }}
-        </span>
-        <div v-else style="width: 380px">
-          <q-skeleton type="text" height="20px" />
-        </div>
+        <q-icon
+          v-if="showFilterIcon"
+          name="mdi-filter-outline"
+          color="background"
+          size="sm"
+          class="q-ml-sm bg-primary"
+          style="border-radius: 8px; padding: 2px"
+        />
       </div>
-      <div>
+      <div
+        class="flex items-center q-pr-sm"
+        :class="$q.screen.lt.sm ? '' : 'q-pt-md'"
+      >
         <slot name="after" />
       </div>
     </div>
@@ -48,19 +60,19 @@ import { computed } from "vue";
 import { useRoute } from "vue-router";
 import { useI18n } from "vue-i18n";
 
-const { title, description, breadcrumbs } = defineProps({
+const { title, breadcrumbs } = defineProps({
   title: {
     type: Object,
     default: null,
   },
-  description: {
-    type: Object,
-    default: null,
-  },
   breadcrumbs: {
     type: Object,
     default: null,
   },
+  showFilterIcon: {
+    type: Boolean,
+    default: false,
+  },
 });
 
 const route = useRoute();
@@ -83,23 +95,6 @@ const displayTitle = computed(() => {
   return null;
 });
 
-const displayDescription = computed(() => {
-  if (description) {
-    if (description.translate) {
-      return t(description.value);
-    } else {
-      return description.value;
-    }
-  } else if (route.meta?.description) {
-    if (route.meta?.description.translate) {
-      return t(route.meta?.description.value);
-    } else {
-      return route.meta?.description.value;
-    }
-  }
-  return null;
-});
-
 const displayBreadcrumbs = computed(() => {
   if (!breadcrumbs && breadcrumbs?.length <= 0) {
     return null;

+ 33 - 69
src/components/layout/LeftMenuLayout.vue

@@ -12,18 +12,18 @@
     :behavior="'desktop'"
     class="detached-container"
   >
-    <div class="column full-height no-wrap">
+    <div class="column full-height no-wrap q-drawer-container">
       <div class="overflow-hidden" style="border-radius: 8px 8px 0px 0px">
         <div
-          class="flex flex-center full-width q-pa-sm"
+          class="flex flex-center full-width q-pa-sm bg-terciary"
           style="height: 60px"
         >
           <q-img
             v-if="!miniState"
             :src="Logo"
-            style="width: 92px; height: 32px"
+            style="width: 138px; height: 39px"
           />
-          <q-img v-else :src="Logo" style="width: 32px" />
+          <q-img v-else :src="MiniLogo" style="width: 59px; height: 50px" />
         </div>
       </div>
 
@@ -41,7 +41,7 @@
                   ? 'mdi-page-layout-sidebar-right'
                   : 'mdi-page-layout-sidebar-left'
               "
-              color="primary"
+              color="dark"
             />
             <q-tooltip
               anchor="center right"
@@ -69,7 +69,11 @@
                 :to="{ name: item.name }"
               >
                 <q-item-section avatar>
-                  <q-icon :name="item.icon" style="font-size: 20px" />
+                  <q-icon
+                    :name="item.icon"
+                    style="font-size: 20px"
+                    color="dark"
+                  />
                 </q-item-section>
                 <q-item-section>{{ $t(item.title) }}</q-item-section>
                 <q-tooltip
@@ -185,44 +189,19 @@
         <q-list class="column q-mb-md no-wrap" style="border-radius: 6px">
         </q-list>
         <q-list class="q-mt-auto">
-          <q-item v-ripple clickable @click="changeTheme">
-            <div class="flex">
-              <q-item-section avatar>
-                <q-icon
-                  :name="
-                    $q.dark.isActive ? 'mdi-weather-sunny' : 'mdi-weather-night'
-                  "
-                  style="font-size: 20px"
-                />
-              </q-item-section>
-              <q-item-section>{{
-                $q.dark.isActive
-                  ? $t("common.terms.light")
-                  : $t("common.terms.dark")
-              }}</q-item-section>
-            </div>
-            <q-tooltip
-              v-if="miniState"
-              anchor="center right"
-              self="center left"
-              :offset="[10, 10]"
-              >{{
-                $q.dark.isActive
-                  ? $t("common.terms.light")
-                  : $t("common.terms.dark")
-              }}</q-tooltip
-            >
-          </q-item>
           <q-item v-ripple clickable @click="logoutFn">
-            <div class="flex">
+            <div class="flex q-mx-auto">
               <q-item-section avatar>
-                <q-icon
-                  name="logout"
-                  color="negative"
-                  style="font-size: 20px"
-                />
+                <div class="flex q-mx-auto q-gutter-x-xs">
+                  <q-icon
+                    name="logout"
+                    color="negative"
+                    style="font-size: 20px"
+                  />
+
+                  <div>SAIR</div>
+                </div>
               </q-item-section>
-              <q-item-section>{{ $t("auth.logout") }}</q-item-section>
             </div>
             <q-tooltip
               v-if="miniState"
@@ -253,17 +232,13 @@
           </q-item>
         </q-list>
         <div
-          class="full-width text-center text-subtitle3 q-pb-xs cursor-pointer"
+          class="full-width text-center q-pb-xs cursor-pointer text-dark"
           @click="gotoVersionPage()"
         >
-          <span
-            v-if="!(miniState || $q.screen.lt.md)"
-            class="text-caption text-weight-light"
-            >{{ $t("common.terms.version") + " " + version }}</span
-          >
-          <span v-else class="text-caption text-weight-light">{{
-            version
+          <span v-if="!(miniState || $q.screen.lt.md)" class="text-caption">{{
+            $t("common.terms.version") + " " + version
           }}</span>
+          <span v-else class="text-caption">{{ version }}</span>
         </div>
       </div>
     </div>
@@ -277,7 +252,8 @@ import { navigationStore } from "src/stores/navigation";
 import { useQuasar, Cookies } from "quasar";
 import { version } from "src/../package.json";
 
-import Logo from "src/assets/logo.png";
+import Logo from "src/assets/images/logo.svg";
+import MiniLogo from "src/assets/images/mini-logo.svg";
 import LogoSoftparLight from "src/assets/softpar_logo_light.svg";
 import LogoSoftparDark from "src/assets/softpar_logo_dark.svg";
 import LogoSoftparMini from "src/assets/softpar_logo_mini.svg";
@@ -288,9 +264,6 @@ const route = useRoute();
 const navigation_store = navigationStore();
 const $q = useQuasar();
 
-const systemTheme = window.matchMedia("(prefers-color-scheme: dark)").matches
-  ? "dark"
-  : "light";
 const miniStateCookies = Cookies.get("miniState");
 const miniState = ref(miniStateCookies === "true" ? true : false);
 
@@ -312,15 +285,6 @@ watchEffect(() => {
   }
 });
 
-const changeTheme = async () => {
-  const theme = $q.cookies.get("theme") || systemTheme;
-  if (theme == "dark") {
-    $q.dark.set(false);
-  } else {
-    $q.dark.set(true);
-  }
-};
-
 const logoutFn = async () => {
   await logout();
   router.push({ name: "LoginPage" });
@@ -350,14 +314,9 @@ onMounted(() => {
 <style lang="scss" scoped>
 @import "/src/css/quasar.variables.scss";
 
-.text-subtitle3 {
-  font-size: 1.1rem !important;
-  font-weight: 400 !important;
-}
-
 .menu-selected {
-  background-color: rgba($primary, 0.1);
-  color: $primary;
+  background-color: $secondary;
+  color: $dark;
 }
 
 .toggle-button-wrapper {
@@ -367,4 +326,9 @@ onMounted(() => {
 .toggle-button-wrapper:hover {
   transform: scale(1.1);
 }
+
+.q-drawer-container {
+  background-image: url("images/background-opacity.png");
+  background-position: 15%;
+}
 </style>

+ 1 - 2
src/components/layout/LeftMenuLayoutMobile.vue

@@ -78,7 +78,7 @@
           <q-item v-ripple clickable @click="openUrl('https://softpar.inf.br')">
             <div class="flex full-width justify-center">
               <q-img
-                :src="$q.dark.isActive ? LogoSoftparLight : LogoSoftparDark"
+                :src="LogoSoftparDark"
                 style="width: 100%; height: 30px; max-width: 114px"
               />
             </div>
@@ -104,7 +104,6 @@ import { navigationStore } from "src/stores/navigation";
 import { version } from "src/../package.json";
 
 import Logo from "src/assets/logo.png";
-import LogoSoftparLight from "src/assets/softpar_logo_light.svg";
 import LogoSoftparDark from "src/assets/softpar_logo_dark.svg";
 
 const router = useRouter();

+ 1 - 0
src/composables/useAuth.js

@@ -15,6 +15,7 @@ export const useAuth = () => {
       const response = await api.post("/login", {
         email: email,
         password: password,
+        origem: 'admin'
       });
 
       if (response.status === 200) {

+ 11 - 53
src/css/app.scss

@@ -1,5 +1,10 @@
 @use "sass:map";
 @use "src/css/quasar.variables.scss";
+@import url('https://fonts.googleapis.com/css2?family=Inter:ital,opsz,wght@0,14..32,100..900;1,14..32,100..900&family=Rethink+Sans:ital,wght@0,400..800;1,400..800&display=swap');
+
+body {
+  font-family: "Inter", sans-serif;
+}
 
 .flex-grow {
   flex-grow: 1;
@@ -57,28 +62,7 @@ body.body--light {
     }
   }
 
-  background: #{map.get($colors, "page")} !important;
-
-  .q-list--dark,
-  .q-item--dark:not(.q-item--active) {
-    color: black;
-  }
-
-  .q-field--dark {
-    .q-field__control:not(.text-negative) {
-      .q-field__marginal {
-        color: rgba(0, 0, 0, 0.54);
-      }
-      & ~ .q-field__bottom {
-        color: rgba(0, 0, 0, 0.54);
-      }
-    }
-    &:not(.q-field--highlighted)
-      .q-field__control:not(.text-negative)
-      .q-field__label {
-      color: rgba(0, 0, 0, 0.54);
-    }
-  }
+  background: #{map.get($colors, "background")} !important;
 
   .card-ring {
     box-shadow: 0 0 0 1px #c0c0c0c0 !important;
@@ -89,21 +73,6 @@ body.body--light {
   }
 }
 
-body.body--dark {
-  background: #{map.get($colors-dark, "page")};
-
-  .q-drawer:has(.detached-container) {
-    background: #{map.get($colors-dark, "surface")} !important;
-  }
-
-  .q-menu {
-    background: #{map.get($colors-dark, "surface")};
-  }
-
-  .card-ring {
-    box-shadow: 0 0 0 1px #505050 !important;
-  }
-}
 
 .q-card__actions .q-btn {
   padding: 10px 16px;
@@ -139,22 +108,6 @@ input[type="number"]::-webkit-outer-spin-button {
   background: #fff !important;
 }
 
-.q-field--dark .q-field__native {
-  color: black;
-}
-
-.q-field--dark .q-field__native,
-.q-field--dark .q-field__prefix,
-.q-field--dark .q-field__suffix,
-.q-field--dark .q-field__input {
-  color: black;
-}
-
-.q-field--dark:not(.q-field--highlighted) .q-field__label,
-.q-field--dark .q-field__marginal,
-.q-field--dark {
-  color: black;
-}
 
 .q-field--standout.q-field--rounded .q-field__control {
   border-radius: 8px;
@@ -174,3 +127,8 @@ input[type="number"]::-webkit-outer-spin-button {
     }
   }
 }
+
+.q-field--standout.q-field--highlighted .q-field__native {
+  color: $secondary;
+}
+

+ 52 - 153
src/css/quasar.variables.scss

@@ -1,150 +1,60 @@
-// Quasar SCSS Variables with Material Design Color System
-// --------------------------------------------------
+$primary: #003e29; 
+$secondary: #ff8340; 
+$terciary: #ace4e4;
+$accent: #e91e63;
 
-// Primary Theme Colors
-$primary: #1976d2; // Material Blue 700
-$secondary: #9c27b0; // Material Purple 500
-$accent: #e91e63; // Material Pink 500
+$positive: #2e7d32;
+$negative: #d32f2f;
+$info: #0288d1;
+$warning: #ed6c02;
 
-// Dark Theme Base Colors
-$dark: #1d1d1d;
-
-// Status Colors
-$positive: #2e7d32; // Material Green 800
-$negative: #d32f2f; // Material Red 700
-$info: #0288d1; // Material Light Blue 700
-$warning: #ed6c02; // Material Orange 800
-
-// Extended Color System with Light/Dark Variants
 $colors: (
-  // Primary Colors and Variants
-  "primary": #1976d2,
-  // Base - Blue 700
-  "primary-light": #42a5f5,
-  // Light - Blue 400
-  "primary-dark": #1565c0,
-
-  // Dark - Blue 800
-  // Secondary Colors and Variants
-  "secondary": #9c27b0,
-  // Base - Purple 500
-  "secondary-light": #ba68c8,
-  // Light - Purple 300
-  "secondary-dark": #7b1fa2,
-
-  // Terceary Colors and Variants
-  "terciary": #ff9800,
-  // Base - Orange 500
-  "terciary-light": #ffb74d,
-  // Light - Orange 300
-  "terciary-dark": #f57c00,
-
-  // Dark - Purple 700
-  // Background Colors
-  "page": #f1f1f1,
-
-  // Surface Colors
-  "surface": #ffffff,
-  "surface-light": #f5f5f5,
-  "surface-dark": #f1f1f1,
-
-  //text color
-  "text": #000000,
-
-  // Status Colors with Variants
-  "success": #2e7d32,
-  // Green 800
-  "success-light": #4caf50,
-  // Green 500
-  "success-dark": #1b5e20,
-
-  // Green 900
-  "error": #d32f2f,
-  // Red 700
-  "error-light": #ef5350,
-  // Red 400
-  "error-dark": #c62828,
-
-  // Red 800
-  "warning": #ed6c02,
-  // Orange 800
-  "warning-light": #ff9800,
-  // Orange 500
-  "warning-dark": #e65100,
-
-  // Orange 900
-  "info": #0288d1,
-  // Light Blue 700
-  "info-light": #03a9f4,
-  // Light Blue 500
-  "info-dark": #01579b
+  "primary": #003e29,
+  "primary-2": #406e5f,
+  "primary-3": #809f94,
+  "primary-4": #c0cfca,
+
+  
+  "secondary": #ff8340,
+  "secondary-2": #ffa270,
+  "secondary-3": #ffc1a0,
+  "secondary-4": #ffe0d0,
+
+  "terciary": #ace4e4,
+  "terciary-2": #c1ebeb,
+  "terciary-3": #d6f2f2,
+  "terciary-4": #eaf8f8,
+
+  "background": #ececf0,
+  "background-2": #f1f1f4,
+  "background-3": #f6f6f8,
+  "background-4": #fafafb,
+
+  "suface": #ffffff,
+
+  "stroke": #c9c9c9,
+  "stroke-2": #d7d7d7,
+  "stroke-3": #e4e4e4,
+  "stroke-4": #f2f2f2,
+
+  "alert": #e6cc00,
+  "alert-2": #edd940,
+  "alert-3": #f3e580,
+  "alert-4": #f9f2c0,
+
+  "approved": #00e339,
+  "approved-2": #40ea6b,
+  "approved-3": #80f19c,
+  "approved-4": #c0f8ce,
+
+  "declined": #ff383c,
+  "declined-2": #ff6a6d,
+  "declined-3": #ff9c9e,
+  "declined-4": #ffcecf,
+
+  "warning": #BF6A02,
 );
 
-// Dark Theme Color Overrides
-$colors-dark: (
-  // Primary Colors and Variants
-  "primary": #1976d2,
-  // Base - Blue 700
-  "primary-light": #42a5f5,
-  // Blue 50
-  "primary-dark": #1565c0,
-
-  "dark": #1d1d1d,
-
-  // Blue 400
-  // Secondary Colors - Lighter in Dark Mode
-  "secondary": #ce93d8,
-  // Purple 200
-  "secondary-light": #f3e5f5,
-  // Purple 50
-  "secondary-dark": #ab47bc,
-
-  //Terceary Colors - Lighter in Dark Mode
-  "terciary": #ffd191,
-  // Yellow 200
-  "terciary-light": #ffecb3,
-  // Yellow 50
-  "terciary-dark": #ffab40,
-
-  "page": #121212,
-
-  "surface": #1d1d1d,
-  "surface-light": #333333,
-  "surface-dark": #121212,
-
-  "text": #ffffff,
-
-  // Black Background
-  // Status Colors - Adjusted for Dark Mode
-  "success": #66bb6a,
-  // Green 400
-  "success-light": #81c784,
-  // Green 300
-  "success-dark": #388e3c,
-
-  // Green 700
-  "error": #f44336,
-  // Red 500
-  "error-light": #e57373,
-  // Red 300
-  "error-dark": #d32f2f,
-
-  // Red 700
-  "warning": #ffa726,
-  // Orange 400
-  "warning-light": #ffb74d,
-  // Orange 300
-  "warning-dark": #f57c00,
-
-  // Orange 700
-  "info": #29b6f6,
-  // Light Blue 400
-  "info-light": #4fc3f7,
-  // Light Blue 300
-  "info-dark": #0288d1 // Light Blue 700
-);
-
-// Generate color utility classes for light theme
 @each $name, $color in $colors {
   .text-#{$name} {
     color: $color !important;
@@ -154,14 +64,3 @@ $colors-dark: (
   }
 }
 
-// Generate color utility classes for dark theme
-.body--dark {
-  @each $name, $color in $colors-dark {
-    .text-#{$name} {
-      color: $color !important;
-    }
-    .bg-#{$name} {
-      background: $color !important;
-    }
-  }
-}

+ 17 - 84
src/css/table.scss

@@ -1,19 +1,10 @@
 @use "sass:map";
 @use "src/css/quasar.variables.scss";
 .softpar-table {
-  .body--dark & {
-    --table-bg-color: #{map.get($colors-dark, "surface")}; // Using our dark background
-    --table-border-color: #{map.get($colors-dark, "surface-light")}; // Darker border
-    --table-header-color: #{map.get($colors-dark, "text")}; // Light text for dark mode
-    --table-ring-color: #505050;
-  }
-
-  .body--light & {
-    --table-bg-color: #{map.get($colors, "surface")}; // Light background
-    --table-border-color: #{map.get($colors, "surface-light")}; // Border color
-    --table-header-color: #{map.get($colors, "text")}; // Dark text for light mode
-    --table-ring-color: #c0c0c0c0;
-  }
+  --table-bg-color: #{map.get($colors, "surface")};
+  --table-border-color: #{map.get($colors, "surface-light")};
+  --table-header-color: #{map.get($colors, "text")};
+  --table-ring-color: #c0c0c0c0;
 
   padding-left: 16px !important;
   padding-right: 16px !important;
@@ -71,16 +62,8 @@
   width: fit-content;
   margin-right: auto;
   margin-left: auto;
-
-  .body--dark & {
-    background: none;
-    border: 1px solid #{map.get($colors, "positive-1")};
-  }
-
-  .body--light & {
-    background: #{map.get($colors, "positive-1")};
-    border: none;
-  }
+  background: #{map.get($colors, "positive-1")};
+  border: none;
 }
 
 .inativo {
@@ -91,16 +74,8 @@
   width: fit-content;
   margin-right: auto;
   margin-left: auto;
-
-  .body--dark & {
-    background: none;
-    border: 1px solid #{map.get($colors, "negative-1")};
-  }
-
-  .body--light & {
-    background: #{map.get($colors, "negative-1")};
-    border: none;
-  }
+  background: #{map.get($colors, "negative-1")};
+  border: none;
 }
 
 .rejeitado {
@@ -111,16 +86,8 @@
   width: fit-content;
   margin-right: auto;
   margin-left: auto;
-
-  .body--dark & {
-    background: none;
-    border: 1px solid #{map.get($colors, "negative-1")};
-  }
-
-  .body--light & {
-    background: #{map.get($colors, "negative-1")};
-    border: none;
-  }
+  background: #{map.get($colors, "negative-1")};
+  border: none;
 }
 
 .gerado {
@@ -131,16 +98,8 @@
   width: fit-content;
   margin-right: auto;
   margin-left: auto;
-
-  .body--dark & {
-    background: none;
-    border: 1px solid #{map.get($colors, "primary-1")};
-  }
-
-  .body--light & {
-    background: #{map.get($colors, "primary-1")};
-    border: none;
-  }
+  background: #{map.get($colors, "primary-1")};
+  border: none;
 }
 
 .pendente {
@@ -151,46 +110,20 @@
   width: fit-content;
   margin-right: auto;
   margin-left: auto;
-
-  .body--dark & {
-    background: none;
-    border: 1px solid #{map.get($colors, "warning")};
-  }
-
-  .body--light & {
-    background: #{map.get($colors, "warning")};
-    border: none;
-  }
+  background: #{map.get($colors, "warning")};
+  border: none;
 }
 
 .table-bottom {
   .q-table__top {
-    .body--light & {
-      background: #{map.get($colors, "page")};
-    }
-
-    .body--dark & {
-      background: #{map.get($colors, "background-3")};
-    }
+    background: #{map.get($colors, "page")};
   }
 
   .q-table__bottom {
-    .body--light & {
-      background: #{map.get($colors, "page")};
-    }
-
-    .body--dark & {
-      background: #{map.get($colors, "background-3")};
-    }
+    background: #{map.get($colors, "page")};
   }
 }
 
 .q-table__grid-item-card {
-  .body--light & {
-    background: #{map.get($colors, "dark")};
-  }
-
-  .body--dark & {
-    background: #{map.get($colors, "background-3")};
-  }
+  background: #{map.get($colors, "dark")};
 }

+ 2 - 0
src/layouts/LoginLayout.vue

@@ -5,3 +5,5 @@
     </q-page-container>
   </q-layout>
 </template>
+
+<script setup></script>

+ 2 - 23
src/layouts/MainLayout.vue

@@ -10,21 +10,12 @@
         <q-btn dense flat @click="toggleLeftDrawer">
           <q-icon
             name="menu"
-            :color="$q.dark.isActive ? 'white' : 'black'"
+            color="black"
             style="font-size: 20px"
           />
         </q-btn>
         <div>
-          <q-btn dense flat class="q-mr-sm" @click="changeTheme">
-            <q-icon
-              :color="$q.dark.isActive ? 'white' : 'black'"
-              :name="
-                $q.dark.isActive ? 'mdi-weather-sunny' : 'mdi-weather-night'
-              "
-              style="font-size: 20px"
-            />
-          </q-btn>
-          <q-btn dense flat @click="logoutFn">
+              <q-btn dense flat @click="logoutFn">
             <q-icon name="logout" color="negative" style="font-size: 20px" />
           </q-btn>
         </div>
@@ -73,9 +64,6 @@ const leftDrawerOpen = ref(false);
 const scrollAreaRef = useTemplateRef("scrollAreaRef");
 
 let oldValue = route.path;
-const systemTheme = window.matchMedia("(prefers-color-scheme: dark)").matches
-  ? "dark"
-  : "light";
 
 const logoutFn = async () => {
   await logout();
@@ -86,15 +74,6 @@ const toggleLeftDrawer = () => {
   leftDrawerOpen.value = !leftDrawerOpen.value;
 };
 
-const changeTheme = async () => {
-  const theme = $q.cookies.get("theme") || systemTheme;
-  if (theme == "dark") {
-    $q.dark.set(false);
-  } else {
-    $q.dark.set(true);
-  }
-};
-
 watch(route, (value) => {
   if (oldValue.path != value.path) {
     scrollAreaRef.value.setScrollPosition("vertical", 0, 0);

+ 86 - 0
src/pages/ForgotMyPasswordPage.vue

@@ -0,0 +1,86 @@
+<template>
+  <q-page class="column justify-center items-center login-page">
+    <div
+      flat
+      class="column justify-center items-center flex-grow full-width z-top bg-background"
+      style="
+        max-width: 659px;
+        max-height: 539px;
+        width: 100%;
+        height: 100%;
+        border-radius: 15px;
+      "
+    >
+      <div class="flex full-width q-gutter-x-sm items-center q-mb-xl">
+        <q-icon
+          name="mdi-arrow-left"
+          size="sm"
+          color="primary"
+          @click="currentStep === 'resend-email' ? currentStep = 'email-data' : $router.back()"
+        />
+        <span class="text-h6 text-weight-regular">Esqueci minha senha</span>
+      </div>
+
+      <EmailDataStep
+        v-if="currentStep === 'email-data'"
+        :loading
+        :email-error="emailError"
+        @submit="handleSubmit"
+        @clear-error="emailError = ''"
+      />
+
+      <ResendEmailStep
+        v-else-if="currentStep === 'resend-email'"
+        :email
+        :loading
+        @resend="handleResend"
+      />
+    </div>
+  </q-page>
+</template>
+
+<script setup>
+import { ref } from "vue";
+import EmailDataStep from "./forgot-password/EmailDataStep.vue";
+import ResendEmailStep from "./forgot-password/ResendEmailStep.vue";
+import { forgotPassword } from "src/api/auth";
+
+const currentStep = ref("email-data");
+const email = ref("");
+const loading = ref(false);
+const emailError = ref("");
+
+async function handleSubmit(submittedEmail) {
+  loading.value = true;
+  emailError.value = "";
+  try {
+    await forgotPassword(submittedEmail);
+    email.value = submittedEmail;
+    currentStep.value = "resend-email";
+  } catch (err) {
+    if (err.response?.status === 422) {
+      emailError.value = err.response.data.message;
+    }
+  } finally {
+    loading.value = false;
+  }
+}
+
+async function handleResend() {
+  loading.value = true;
+  try {
+    await forgotPassword(email.value);
+  } finally {
+    loading.value = false;
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.login-page {
+  background-image: url("background.png");
+  background-size: cover;
+  background-repeat: no-repeat;
+  background-position: center;
+}
+</style>

+ 96 - 0
src/pages/RecoveryPasswordPage.vue

@@ -0,0 +1,96 @@
+<template>
+  <q-page class="column justify-center items-center login-page">
+    <div
+      flat
+      class="column justify-center items-center full-width z-top bg-background q-py-xl"
+      style="max-width: 659px; border-radius: 15px;"
+    >
+      <div class="flex full-width q-gutter-x-sm items-center q-mb-xl">
+        <q-icon
+          name="mdi-arrow-left"
+          size="sm"
+          color="primary"
+          @click="handleBack"
+        />
+        <span class="text-h6 text-weight-regular">Recuperar senha</span>
+      </div>
+
+      <VerifyCodeStep
+        v-if="currentStep === 'verify-code'"
+        :loading
+        @submit="handleVerify"
+        @resend="handleResend"
+      />
+
+      <NewPasswordStep
+        v-else-if="currentStep === 'new-password'"
+        :loading
+        @submit="handleReset"
+      />
+    </div>
+  </q-page>
+</template>
+
+<script setup>
+import { ref } from "vue";
+import { useRoute, useRouter } from "vue-router";
+import VerifyCodeStep from "./forgot-password/VerifyCodeStep.vue";
+import NewPasswordStep from "./forgot-password/NewPasswordStep.vue";
+import { forgotPassword, verifyPasswordCode, resetPassword } from "src/api/auth";
+
+const route = useRoute();
+const router = useRouter();
+
+const email = route.query.email ?? "";
+const currentStep = ref("verify-code");
+const verifiedCode = ref("");
+const loading = ref(false);
+
+function handleBack() {
+  if (currentStep.value === "new-password") {
+    currentStep.value = "verify-code";
+  } else {
+    router.push("/forgot-my-password");
+  }
+}
+
+async function handleVerify(code) {
+  loading.value = true;
+  try {
+    await verifyPasswordCode(email, code);
+    verifiedCode.value = code;
+    await new Promise((resolve) => setTimeout(resolve, 3000));
+    currentStep.value = "new-password";
+  } finally {
+    loading.value = false;
+  }
+}
+
+async function handleResend() {
+  loading.value = true;
+  try {
+    await forgotPassword(email);
+  } finally {
+    loading.value = false;
+  }
+}
+
+async function handleReset({ password, passwordConfirmation }) {
+  loading.value = true;
+  try {
+    await resetPassword(email, verifiedCode.value, password, passwordConfirmation);
+    router.push("/login");
+  } finally {
+    loading.value = false;
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.login-page {
+  background-image: url("background.png");
+  background-size: cover;
+  background-repeat: no-repeat;
+  background-position: center;
+}
+</style>

+ 359 - 181
src/pages/dashboard/DashboardPage.vue

@@ -1,167 +1,243 @@
 <template>
   <div>
-    <DefaultHeaderPage>
+    <DefaultHeaderPage show-filter-icon class="q-pa-sm">
       <template #after>
-        <q-btn
-          outline
-          icon="mdi-calendar"
-          color="primary"
-          @click="showFilter"
-        />
-      </template>
-    </DefaultHeaderPage>
-    <q-expansion-item
-      v-model="filter"
-      dense
-      hide-expand-icon
-      class="remove-header-expansion-item"
-    >
-      <DatePeriodSelector
-        v-model:selected-period="defaultPeriod"
-        v-model:selected-event-id="defaultEventId"
-        class="q-pa-sm"
-      />
-    </q-expansion-item>
-
-    <div v-if="!isLoading" class="column gap q-pa-sm">
-      <div class="flex full-width gap">
-        <div class="flex flex-grow gap">
-          <CardIconMiniChart
-            class="flex-grow"
-            :title="t('dashboard.cards.total_earnings')"
-            :icon="'mdi-currency-usd'"
-            :number-porcent="paymentsChart.percentage_change"
-            :number-card="
-              t('dashboard.currency_format', {
-                value: paymentsChart.current_total,
-              })
-            "
+        <div class="flex items-center no-wrap" style="gap: 12px">
+          <q-select
+            v-if="$q.screen.gt.xs"
+            v-model="selectedUnit"
+            dense
+            :options="[]"
+            label="Unidade"
+            style="width: 250px; flex-shrink: 0"
+            color="secondary"
+            label-color="secondary"
+            hide-dropdown-icon
           >
-            <template #chart>
-              <MiniLineChart
-                :data="paymentsChart.trend_data"
-                fill-color="rgba(0, 0, 0, 0)"
-              />
+            <template #append>
+              <q-icon name="mdi-map-marker-outline" color="secondary" />
             </template>
-          </CardIconMiniChart>
-          <CardIconMiniChart
-            class="flex-grow"
-            :title="t('orders.plural')"
-            :icon="'mdi-package-variant'"
-            :number-porcent="ordersChart.percentage_change"
-            :number-card="ordersChart.current_total"
-          >
-            <template #chart>
-              <MiniBarChart
-                :data="ordersChart.trend_data"
-                fill-color="rgba(0, 0, 0, 0)"
-              />
-            </template>
-          </CardIconMiniChart>
-        </div>
-        <div class="flex flex-grow gap">
-          <CardIconMiniChart
-            class="flex-grow"
-            :title="t('dashboard.cards.tickets_sold')"
-            :icon="'mdi-ticket-outline'"
-            :number-porcent="ticketsSoldChart.percentage_change"
-            :number-card="ticketsSoldChart.current_total"
+          </q-select>
+
+          <div
+            class="flex items-center no-wrap q-gutter-x-md q-px-sm q-ml-md"
+            style="flex-shrink: 0"
           >
-            <template #chart>
-              <MiniLineChart
-                :data="ticketsSoldChart.trend_data"
-                fill-color="rgba(0, 0, 0, 0)"
-              />
-            </template>
-          </CardIconMiniChart>
-          <CardIconMiniChart
-            class="flex-grow"
-            :title="t('dashboard.cards.registrations')"
-            :icon="'mdi-account-group-outline'"
-            :number-porcent="participantsChart.percentage_change"
-            :number-card="participantsChart.current_total"
+            <q-img src="icons/user-icon.jpg" class="avatar-circle" />
+
+            <div
+              v-if="$q.screen.gt.xs"
+              class="column q-gutter-y-none"
+              style="white-space: nowrap"
+            >
+              <span class="text-body2 text-center">Ana Laura</span>
+              <span
+                v-if="$q.screen.gt.sm"
+                class="text-overline text-center"
+                style="line-height: 1rem; font-weight: 400"
+                >Gerente</span
+              >
+            </div>
+          </div>
+
+          <template v-if="$q.screen.gt.sm">
+            <q-separator
+              vertical
+              style="height: 36px; width: 2px; flex-shrink: 0"
+              color="dark"
+            />
+
+            <div
+              class="column"
+              style="line-height: 1.2; white-space: nowrap; flex-shrink: 0"
+            >
+              <span class="text-caption text-grey-6 text-primary text-center"
+                >Ultimo acesso</span
+              >
+              <span class="text-caption text-primary text-center"
+                >16/02/2026, 14:16</span
+              >
+            </div>
+          </template>
+
+          <div
+            class="flex items-center no-wrap"
+            style="gap: 2px; flex-shrink: 0"
           >
-            <template #chart>
-              <MiniBarChart
-                :data="participantsChart.trend_data"
-                fill-color="rgba(0, 0, 0, 0)"
-              />
-            </template>
-          </CardIconMiniChart>
+            <q-btn flat round dense icon="mdi-bell-badge" color="secondary" />
+            <q-btn flat round dense icon="mdi-account" color="secondary" />
+            <q-btn flat round dense icon="mdi-cog-outline" color="secondary" />
+          </div>
         </div>
-      </div>
+      </template>
+    </DefaultHeaderPage>
+
+    <div class="q-pa-sm">
+      <div class="filter-row">
+        <q-select
+          v-model="selectedPeriod"
+          :options="periodOptions"
+          option-value="value"
+          option-label="label"
+          emit-value
+          map-options
+          dense
+          label="Selecione o Período"
+          color="secondary"
+          class="filter-item"
+          hide-dropdown-icon
+        >
+          <template #append>
+            <q-icon name="mdi-chevron-down" color="secondary" />
+          </template>
+        </q-select>
 
-      <div class="flex full-width gap">
-        <div class="flex flex-grow">
-          <CardIconChart
-            :title="t('dashboard.charts.tickets_by_type.title')"
-            :icon="'mdi-ticket-account'"
-            class="flex-grow"
+        <template v-if="selectedPeriod === 'custom'">
+          <q-input
+            v-model="startDate"
+            dense
+            label="Data Inicial"
+            mask="##/##/####"
+            placeholder="DD/MM/AAAA"
+            color="secondary"
+            class="filter-item"
           >
-            <template #chart>
-              <BarChart
-                :data="eventTicketsByTypeChart"
-                :data-set-label="t('events.tickets.plural')"
-                :label-x="t('events.tickets.types_singular')"
-                :label-y="t('common.terms.quantity')"
-                :show-legend="true"
-              />
+            <template #append>
+              <q-icon
+                name="mdi-calendar"
+                color="secondary"
+                class="cursor-pointer"
+              >
+                <q-popup-proxy
+                  cover
+                  transition-show="scale"
+                  transition-hide="scale"
+                >
+                  <q-date
+                    v-model="startDate"
+                    mask="DD/MM/YYYY"
+                    color="secondary"
+                  >
+                    <div class="row items-center justify-end">
+                      <q-btn v-close-popup label="OK" color="secondary" flat />
+                    </div>
+                  </q-date>
+                </q-popup-proxy>
+              </q-icon>
             </template>
-          </CardIconChart>
-        </div>
-        <div class="flex flex-grow">
-          <CardIconChart
-            :title="t('dashboard.charts.participants_by_document.title')"
-            :icon="'mdi-badge-account'"
-            class="flex-grow"
+          </q-input>
+
+          <q-input
+            v-model="endDate"
+            dense
+            label="Data Final"
+            mask="##/##/####"
+            placeholder="DD/MM/AAAA"
+            color="secondary"
+            class="filter-item"
           >
-            <template #chart>
-              <DoughnutChart
-                :data="eventParticipantsByCNPJAndCPF"
-                :data-set-label="t('events.attendance.participant_plural')"
-              />
+            <template #append>
+              <q-icon
+                name="mdi-calendar"
+                color="secondary"
+                class="cursor-pointer"
+              >
+                <q-popup-proxy
+                  cover
+                  transition-show="scale"
+                  transition-hide="scale"
+                >
+                  <q-date v-model="endDate" mask="DD/MM/YYYY" color="secondary">
+                    <div class="row items-center justify-end">
+                      <q-btn v-close-popup label="OK" color="secondary" flat />
+                    </div>
+                  </q-date>
+                </q-popup-proxy>
+              </q-icon>
             </template>
-          </CardIconChart>
-        </div>
+          </q-input>
+        </template>
       </div>
+    </div>
 
-      <div class="flex full-width gap">
-        <div class="flex flex-grow">
-          <CardIconChart
-            :title="t('dashboard.charts.sales_over_time.title')"
-            :icon="'mdi-chart-line'"
-            class="flex-grow"
-          >
-            <template #chart>
-              <LineChart
-                :data="salesOverTimeLineChart"
-                :data-set-label="t('ui.navigation.sales')"
-                :label-x="t('common.terms.month')"
-                :label-y="
-                  t('dashboard.charts.sales_over_time.y_label', {
-                    currency: 'R$',
-                  })
-                "
-              />
-            </template>
-          </CardIconChart>
-        </div>
-        <div class="flex flex-grow">
-          <CardIconChart
-            :title="t('dashboard.charts.registration_source.title')"
-            :icon="'mdi-chart-pie'"
-            class="flex-grow"
-          >
-            <template #chart>
-              <PieChart
-                :data="eventSourcePieChart"
-                :data-set-label="
-                  t('dashboard.charts.registration_source.source')
-                "
-              />
-            </template>
-          </CardIconChart>
-        </div>
+    <div v-if="!isLoading" class="column gap q-pa-sm">
+      <div class="stat-cards-row">
+        <DashboardStatCard
+          title="Total alunos (contratos ativos)"
+          icon="mdi-account-multiple"
+          value="4.527"
+          badge="3.200 ativos"
+        />
+        <DashboardStatCard
+          title="Contratos Congelados"
+          icon="mdi-snowflake"
+          value="57"
+          subtitle="É hora de incentivar nossos alunos"
+        />
+        <DashboardStatCard
+          title="Contratos Cancelados"
+          icon="mdi-cancel"
+          value="57"
+          subtitle="É hora de incentivar nossos alunos"
+        />
+        <DashboardStatCard
+          title="Receita Geral"
+          icon="mdi-currency-usd"
+          value="R$ 51.548,80"
+          subtitle="0 pagamentos pendentes"
+        />
+      </div>
+
+      <div class="charts-row">
+        <DashboardChartCard title="Faturamento Serviço / Materiais">
+          <GroupedBarChart
+            :labels="faturamentoChart.labels"
+            :datasets="faturamentoChart.datasets"
+            label-y="R$"
+            :tick-formatter="formatCurrencyTick"
+            :tooltip-formatter="formatCurrencyTooltip"
+            class="full-width full-height"
+          />
+        </DashboardChartCard>
+
+        <DashboardChartCard title="Matrículas por Período">
+          <GroupedBarChart
+            :labels="matriculasChart.labels"
+            :datasets="matriculasChart.datasets"
+            :bar-radius="50"
+            :show-datalabels="true"
+            class="full-width full-height"
+          />
+        </DashboardChartCard>
+
+        <AniversariantesCard :people="aniversariantes" />
+      </div>
+
+      <div class="stat-cards-row">
+        <DashboardStatCard
+          title="Frequência Média"
+          icon="mdi-account-multiple-outline"
+          value="87%"
+          badge="Alta"
+          badge-color="positive"
+        />
+        <DashboardStatCard
+          title="Estoque Geral de Produtos"
+          icon="mdi-currency-usd"
+          value="56"
+        />
+        <DashboardStatCard
+          title="Tarefas Pendentes"
+          icon="mdi-draw"
+          value="4"
+          subtitle="Não deixe para amanhã"
+        />
+        <DashboardStatCard
+          title="Tickets Abertos"
+          icon="mdi-calendar-outline"
+          value="2"
+          subtitle="Estável"
+        />
       </div>
     </div>
 
@@ -172,43 +248,83 @@
 </template>
 
 <script setup>
-import { onMounted, ref, watch, defineAsyncComponent } from "vue";
+import { onMounted, ref, watch } from "vue";
 import { useI18n } from "vue-i18n";
 import DefaultHeaderPage from "src/components/layout/DefaultHeaderPage.vue";
-import DatePeriodSelector from "./components/DatePeriodSelector.vue";
-
-const MiniLineChart = defineAsyncComponent(
-  () => import("src/components/charts/mini/MiniLineChart.vue"),
-);
-const MiniBarChart = defineAsyncComponent(
-  () => import("src/components/charts/mini/MiniBarChart.vue"),
-);
-const CardIconMiniChart = defineAsyncComponent(
-  () => import("src/components/charts/CardIconMiniChart.vue"),
-);
-const CardIconChart = defineAsyncComponent(
-  () => import("src/components/charts/CardIconChart.vue"),
-);
-const BarChart = defineAsyncComponent(
-  () => import("src/components/charts/normal/BarChart.vue"),
-);
-const DoughnutChart = defineAsyncComponent(
-  () => import("src/components/charts/normal/DoughnutChart.vue"),
-);
-const LineChart = defineAsyncComponent(
-  () => import("src/components/charts/normal/LineChart.vue"),
-);
-const PieChart = defineAsyncComponent(
-  () => import("src/components/charts/normal/PieChart.vue"),
-);
+import DashboardStatCard from "src/components/charts/DashboardStatCard.vue";
+import DashboardChartCard from "src/components/charts/DashboardChartCard.vue";
+import GroupedBarChart from "src/components/charts/normal/GroupedBarChart.vue";
+import AniversariantesCard from "src/components/charts/AniversariantesCard.vue";
 
 const { t } = useI18n();
 
 const isLoading = ref(true);
-const filter = ref(false);
+const selectedUnit = ref(null);
 const defaultPeriod = ref("month");
 const defaultEventId = ref(1);
 
+const selectedPeriod = ref("custom");
+const startDate = ref("");
+const endDate = ref("");
+
+const periodOptions = [
+  { label: "Hoje", value: "today" },
+  { label: "Esta semana", value: "week" },
+  { label: "Este mês", value: "month" },
+  { label: "Este ano", value: "year" },
+  { label: "Personalizado", value: "custom" },
+];
+
+// --- Aniversariantes do Mês (hardcoded) ---
+const aniversariantes = [
+  { day: 10, name: "Heloisa Faria" },
+  { day: 7, name: "Juliana Costa" },
+  { day: 24, name: "Fernando Almeida" },
+  { day: 28, name: "Patrícia Lima" },
+];
+// -------------------------------------------
+
+// --- Matrículas por Período (hardcoded) ---
+const matriculasChart = {
+  labels: ["JAN", "FEV", "MAR", "ABR", "MAI", "JUN"],
+  datasets: [
+    {
+      label: "Matrículas",
+      data: [120, 200, 150, 80, 70, 110],
+      color: ["#3B82F6", "#EF4444", "#A855F7", "#374151", "#EAB308", "#06B6D4"],
+    },
+  ],
+};
+// ---------------------------------------------------
+
+// --- Faturamento Serviço / Materiais (hardcoded) ---
+const faturamentoChart = {
+  labels: ["17/02", "20/02", "23/02", "26/02"],
+  datasets: [
+    {
+      label: "Serviço",
+      data: [18500, 22300, 15800, 27600],
+      color: "#7C3AED",
+    },
+    {
+      label: "Materiais",
+      data: [9200, 11400, 8700, 13100],
+      color: "#EC4899",
+    },
+  ],
+};
+
+const formatCurrencyTick = (value) => {
+  if (value >= 1000) return `R$ ${(value / 1000).toFixed(0)}k`;
+  return `R$ ${value}`;
+};
+
+const formatCurrencyTooltip = (context) => {
+  const value = context.parsed.y;
+  return ` ${context.dataset.label}: R$ ${value.toLocaleString("pt-BR", { minimumFractionDigits: 2 })}`;
+};
+// ---------------------------------------------------
+
 const ordersChart = ref({});
 const participantsChart = ref({});
 const paymentsChart = ref({});
@@ -218,10 +334,6 @@ const eventParticipantsByCNPJAndCPF = ref({});
 const salesOverTimeLineChart = ref({});
 const eventSourcePieChart = ref({});
 
-const showFilter = () => {
-  filter.value = !filter.value;
-};
-
 const generateMockData = () => {
   const createMiniChartData = (currentTotal, percentage) => ({
     current_total: currentTotal,
@@ -378,4 +490,70 @@ onMounted(async () => {
 .gap {
   gap: 16px;
 }
+
+.avatar-circle {
+  width: 36px;
+  height: 36px;
+  border-radius: 50%;
+  flex-shrink: 0;
+}
+
+.stat-cards-row {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 16px;
+}
+
+.stat-cards-row > * {
+  flex: 1 1 200px;
+  min-width: 180px;
+}
+
+@media (max-width: 599px) {
+  .stat-cards-row > * {
+    flex: 1 1 100%;
+  }
+}
+
+.charts-row {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 16px;
+}
+
+.charts-row > * {
+  flex: 1 1 350px;
+  min-width: 280px;
+}
+
+.charts-row > *:last-child {
+  flex: 0 1 240px;
+  min-width: 200px;
+}
+
+@media (max-width: 599px) {
+  .charts-row > * {
+    flex: 1 1 100%;
+  }
+}
+
+.filter-row {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 12px;
+  align-items: center;
+}
+
+.filter-item {
+  flex: 1 1 200px;
+  min-width: 180px;
+  max-width: 300px;
+}
+
+@media (max-width: 599px) {
+  .filter-item {
+    flex: 1 1 100%;
+    max-width: 100%;
+  }
+}
 </style>

+ 67 - 0
src/pages/forgot-password/EmailDataStep.vue

@@ -0,0 +1,67 @@
+<template>
+  <div class="column items-center full-width">
+    <q-img
+      :src="Logo"
+      style="max-width: 379px; max-height: 106px; height: 100%; width: 100%"
+    />
+
+    <div
+      class="items-center full-width q-px-lg q-mt-xl"
+      style="display: flex; gap: 12px"
+    >
+      <div class="bg-primary" style="height: 1px; flex: 1"></div>
+      <q-icon name="mdi-chevron-down" size="lg" color="warning" />
+      <div class="bg-primary" style="height: 1px; flex: 1"></div>
+    </div>
+
+    <div class="text-body1 q-my-lg text-primary" style="font-weight: 400">
+      Informe o seu e-mail para redefinir sua senha
+    </div>
+
+    <q-form class="full-width q-px-lg column q-gutter-y-lg q-mt-xs" @submit.prevent="emit('submit', email)">
+      <DefaultInput
+        v-model="email"
+        type="email"
+        lazy-rules
+        :label="$t('common.terms.email')"
+        :rules="[inputRules.required]"
+        :error="!!emailError"
+        :error-message="emailError"
+        @update:model-value="emit('clear-error')"
+      />
+
+      <div>
+        <q-btn
+          class="full-width q-mt-md"
+          color="primary-2"
+          label="Continuar"
+          size="md"
+          padding="sm"
+          type="submit"
+          :loading
+        >
+          <template #loading>
+            <q-spinner />
+          </template>
+        </q-btn>
+      </div>
+    </q-form>
+  </div>
+</template>
+
+<script setup>
+import Logo from "src/assets/images/logo.svg";
+import DefaultInput from "src/components/defaults/DefaultInput.vue";
+import { useInputRules } from "src/composables/useInputRules";
+import { ref } from "vue";
+
+defineProps({
+  loading: Boolean,
+  emailError: { type: String, default: "" },
+});
+
+const emit = defineEmits(["submit", "clear-error"]);
+
+const email = ref("");
+const { inputRules } = useInputRules();
+</script>

+ 71 - 0
src/pages/forgot-password/NewPasswordStep.vue

@@ -0,0 +1,71 @@
+<template>
+  <div class="column items-center full-width">
+    <q-img
+      :src="Logo"
+      style="max-width: 379px; max-height: 106px; height: 100%; width: 100%"
+    />
+
+    <div class="text-h5 text-weight-regular q-mt-lg text-primary text-center">
+      Definir nova senha
+    </div>
+
+    <div
+      class="items-center full-width q-px-lg q-mt-lg"
+      style="display: flex; gap: 12px"
+    >
+      <div class="bg-primary" style="height: 1px; flex: 1"></div>
+      <q-icon name="mdi-chevron-down" size="lg" color="warning" />
+      <div class="bg-primary" style="height: 1px; flex: 1"></div>
+    </div>
+
+    <q-form
+      class="full-width q-px-lg column q-gutter-y-md q-mt-md"
+      @submit.prevent="emit('submit', { password, passwordConfirmation })"
+    >
+      <DefaultPasswordInput
+        v-model="password"
+        label="Nova senha"
+        lazy-rules
+        :rules="[inputRules.required, inputRules.min(8)]"
+      />
+
+      <DefaultPasswordInput
+        v-model="passwordConfirmation"
+        label="Confirmar nova senha"
+        lazy-rules
+        :rules="[inputRules.required, (v) => v === password || 'As senhas não conferem']"
+      />
+
+      <q-btn
+        class="full-width q-mt-sm"
+        color="primary-2"
+        label="Confirmar"
+        size="md"
+        padding="sm"
+        type="submit"
+        :loading
+      >
+        <template #loading>
+          <q-spinner />
+        </template>
+      </q-btn>
+    </q-form>
+  </div>
+</template>
+
+<script setup>
+import Logo from "src/assets/images/logo.svg";
+import DefaultPasswordInput from "src/components/defaults/DefaultPasswordInput.vue";
+import { useInputRules } from "src/composables/useInputRules";
+import { ref } from "vue";
+
+defineProps({
+  loading: Boolean,
+});
+
+const emit = defineEmits(["submit"]);
+
+const password = ref("");
+const passwordConfirmation = ref("");
+const { inputRules } = useInputRules();
+</script>

+ 67 - 0
src/pages/forgot-password/ResendEmailStep.vue

@@ -0,0 +1,67 @@
+<template>
+  <div class="column items-center full-width">
+    <q-img
+      :src="Logo"
+      style="max-width: 379px; max-height: 106px; height: 100%; width: 100%"
+    />
+    <div class="text-h4 text-weight-regular q-mt-lg text-primary">
+      Verifique seu e-mail
+    </div>
+
+    <div
+      class="items-center full-width q-px-lg q-mt-xl"
+      style="display: flex; gap: 12px"
+    >
+      <div class="bg-primary" style="height: 1px; flex: 1"></div>
+      <q-icon name="mdi-chevron-down" size="lg" color="warning" />
+      <div class="bg-primary" style="height: 1px; flex: 1"></div>
+    </div>
+
+    <div
+      class="text-body2 text-center text-primary q-px-lg"
+      style="font-weight: 400"
+    >
+      Enviamos um e-mail com um link para redefinir sua senha<br />
+      Por favor confira sua caixa de entrada e clique no link para prosseguir
+    </div>
+
+    <div class="text-body1 text-weight-medium text-primary q-mt-md">
+      {{ email }}
+    </div>
+
+    <div
+      class="text-body2 text-center text-primary q-mt-sm q-px-lg"
+      style="font-weight: 400"
+    >
+      Não achou o e-mail? Verifique a caixa de spam ou tente novamente
+    </div>
+
+    <div class="full-width q-px-lg q-mt-lg">
+      <q-btn
+        class="full-width"
+        color="primary-2"
+        size="md"
+        padding="sm"
+        :loading
+        @click="emit('resend')"
+      >
+        <q-icon name="mdi-refresh" class="q-mr-sm" />
+        Reenviar E-mail
+        <template #loading>
+          <q-spinner />
+        </template>
+      </q-btn>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import Logo from "src/assets/images/logo.svg";
+
+defineProps({
+  email: { type: String, required: true },
+  loading: Boolean,
+});
+
+const emit = defineEmits(["resend"]);
+</script>

+ 138 - 0
src/pages/forgot-password/VerifyCodeStep.vue

@@ -0,0 +1,138 @@
+<template>
+  <div class="column items-center full-width">
+    <q-img
+      :src="Logo"
+      style="max-width: 379px; max-height: 106px; height: 100%; width: 100%"
+    />
+
+    <div class="text-h5 text-weight-regular q-mt-lg text-primary text-center">
+      Digite o código de verificação
+    </div>
+
+    <div
+      class="items-center full-width q-px-lg q-mt-lg"
+      style="display: flex; gap: 12px"
+    >
+      <div class="bg-primary" style="height: 1px; flex: 1"></div>
+      <q-icon name="mdi-chevron-down" size="lg" color="warning" />
+      <div class="bg-primary" style="height: 1px; flex: 1"></div>
+    </div>
+
+    <div
+      class="text-body2 text-center text-primary q-px-lg q-mt-md"
+      style="font-weight: 400"
+    >
+      Enviamos um código de 6 dígitos para seu e-mail<br />
+      Digite o código para verificar
+    </div>
+
+    <div class="row q-gutter-x-sm q-mt-xl justify-center">
+      <input
+        v-for="(_, index) in 6"
+        :key="index"
+        :ref="(el) => (inputs[index] = el)"
+        v-model="digits[index]"
+        type="text"
+        inputmode="numeric"
+        maxlength="1"
+        class="otp-input text-primary text-h5 text-center text-weight-medium"
+        :disabled="loading"
+        @input="handleInput(index)"
+        @keydown="handleKeydown(index, $event)"
+        @paste="handlePaste"
+      />
+    </div>
+
+    <div class="full-width q-px-lg q-mt-xl">
+      <q-btn
+        class="full-width"
+        color="primary-2"
+        size="md"
+        padding="sm"
+        :loading
+        @click="emit('resend')"
+      >
+        <q-icon name="mdi-refresh" class="q-mr-sm" />
+        Reenviar E-mail
+        <template #loading>
+          <q-spinner />
+        </template>
+      </q-btn>
+    </div>
+
+    <div class="q-mt-md text-body2 text-primary">
+      Lembrou sua senha?
+      <router-link to="/login" class="text-warning text-weight-medium" style="text-decoration: none">
+        Faça seu Login
+      </router-link>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import Logo from "src/assets/images/logo.svg";
+import { ref } from "vue";
+
+defineProps({
+  loading: Boolean,
+});
+
+const emit = defineEmits(["submit", "resend"]);
+
+const digits = ref(["", "", "", "", "", ""]);
+const inputs = ref([]);
+
+function handleInput(index) {
+  const val = digits.value[index].replace(/\D/g, "").slice(-1);
+  digits.value[index] = val;
+
+  if (val && index < 5) {
+    inputs.value[index + 1]?.focus();
+  }
+
+  const code = digits.value.join("");
+  if (code.length === 6) {
+    emit("submit", code);
+  }
+}
+
+function handleKeydown(index, event) {
+  if (event.key === "Backspace" && !digits.value[index] && index > 0) {
+    inputs.value[index - 1]?.focus();
+  }
+}
+
+function handlePaste(event) {
+  event.preventDefault();
+  const text = event.clipboardData.getData("text").replace(/\D/g, "").slice(0, 6);
+  text.split("").forEach((char, i) => {
+    digits.value[i] = char;
+  });
+  const nextIndex = Math.min(text.length, 5);
+  inputs.value[nextIndex]?.focus();
+
+  if (text.length === 6) {
+    emit("submit", text);
+  }
+}
+</script>
+
+<style scoped>
+.otp-input {
+  width: 44px;
+  height: 52px;
+  border: none;
+  border-bottom: 2px solid #1a5c38;
+  background: transparent;
+  outline: none;
+  font-size: 1.5rem;
+}
+
+.otp-input:focus {
+  border-bottom-color: #f5a623;
+}
+
+.otp-input:disabled {
+  opacity: 0.5;
+}
+</style>

+ 47 - 27
src/pages/login/LoginPage.vue

@@ -1,18 +1,38 @@
 <template>
-  <q-page class="column">
+  <q-page class="column justify-center items-center login-page">
     <div
       flat
-      class="column justify-around items-center flex-grow full-width full-height z-top frosted-glass"
+      class="column justify-center items-center flex-grow full-width z-top bg-background"
+      style="
+        max-width: 659px;
+        max-height: 738px;
+        width: 100%;
+        height: 100%;
+        border-radius: 15px;
+      "
     >
-      <div class="column flex-center full-width q-px-md">
-        <q-img :src="Logo" style="max-width: 650px" />
-        <div class="text-h5 q-mt-xl">{{ $t("auth.login") }}</div>
+      <div class="column flex-center full-width">
+        <q-img
+          :src="Logo"
+          style="max-width: 611px; max-height: 171px; height: 100%; width: 100%"
+        />
+        <div class="text-h4 q-mt-xl text-primary" style="font-weight: 400">
+          Faça seu Login
+        </div>
+
+        <div
+          class="items-center full-width q-px-lg q-mt-xl"
+          style="display: flex; gap: 12px"
+        >
+          <div class="bg-primary" style="height: 1px; flex: 1"></div>
+          <q-icon name="mdi-chevron-down" size="lg" color="warning" />
+          <div class="bg-primary" style="height: 1px; flex: 1"></div>
+        </div>
       </div>
 
       <q-form
         ref="formRef"
-        class="full-width q-pa-md q-pb-xl"
-        style="max-width: 400px"
+        class="full-width q-px-lg column q-gutter-y-md q-mt-xs"
         autocorrect="off"
         autocapitalize="off"
         autocomplete="off"
@@ -24,28 +44,30 @@
           v-model:error="validationErrors.email"
           type="email"
           lazy-rules
-          autofocus
+          icon="mdi-account"
           :label="$t('common.terms.email')"
           :rules="[inputRules.required, inputRules.email]"
         />
+
         <DefaultPasswordInput
           v-model="form.password"
           v-model:error="validationErrors.password"
           :rules="[inputRules.required, inputRules.min(6)]"
           :label="$t('common.terms.password')"
         />
-        <q-checkbox
-          v-model="checkbox"
-          size="xs"
-          label="Lembrar email"
-          class="q-mb-md"
-          style="margin-left: -6px"
-        />
+
+        <span
+          class="q-ma-xs text-body2 text-primary cursor-pointer"
+          style="letter-spacing: 0.25px"
+          @click="$router.push({ name: 'ForgotMyPasswordPage' })"
+          >Esqueceu sua senha?</span
+        >
+
         <div>
           <q-btn
-            class="full-width"
-            color="primary"
-            :label="$t('auth.sign-in')"
+            class="full-width q-mt-md"
+            color="primary-2"
+            label="Entrar"
             size="md"
             padding="sm"
             type="submit"
@@ -56,10 +78,8 @@
             </template>
           </q-btn>
         </div>
-        <div style="height: 160px"></div>
       </q-form>
     </div>
-    <WavePattern class="absolute-top" />
   </q-page>
 </template>
 
@@ -71,10 +91,9 @@ import { useRouter } from "vue-router";
 import { useInputRules } from "src/composables/useInputRules";
 import { useSubmitHandler } from "src/composables/useSubmitHandler";
 
-import Logo from "src/assets/logo.png";
+import Logo from "src/assets/images/logo.svg";
 import DefaultInput from "src/components/defaults/DefaultInput.vue";
 import DefaultPasswordInput from "src/components/defaults/DefaultPasswordInput.vue";
-import WavePattern from "./component/WavePattern.vue";
 
 const router = useRouter();
 const $q = useQuasar();
@@ -102,10 +121,12 @@ const checkbox = ref(false);
 
 const onSubmit = async () => {
   await submitForm(() => login(form.value.email, form.value.password));
+
   const email_storage = $q.cookies.get("email");
   if (email_storage && !checkbox.value) {
     $q.cookies.remove("email");
   }
+
   if (checkbox.value) {
     $q.cookies.set("email", form.value.email, {
       path: "/",
@@ -125,10 +146,9 @@ onBeforeMount(() => {
 
 <style lang="scss" scoped>
 .login-page {
-  position: relative;
-}
-
-.frosted-glass {
-  backdrop-filter: blur(60px);
+  background-image: url("background.png");
+  background-size: cover;
+  background-repeat: no-repeat;
+  background-position: center;
 }
 </style>

+ 0 - 231
src/pages/login/component/WavePattern.vue

@@ -1,231 +0,0 @@
-<template>
-  <div class="overflow-hidden full-height" v-bind="$attrs">
-    <div class="element-with-wave"></div>
-  </div>
-</template>
-<style lang="scss" scoped>
-@use "sass:map";
-@use "src/css/quasar.variables.scss";
-
-.element-with-wave {
-  position: relative;
-  background: rgba(map.get($colors-dark, "primary"), 1) !important;
-  margin-top: 60dvh;
-  width: 100%;
-  height: 100dvh;
-  transform: translateZ(0);
-}
-
-.element-with-wave::before {
-  content: "";
-  position: absolute;
-  top: -240px;
-  left: 0;
-  width: 100%;
-  height: 240px;
-  background-color: rgba(map.get($colors-dark, "primary"), 1) !important;
-  will-change: clip-path;
-  animation: organic-swell 20s ease-in-out infinite alternate;
-  clip-path: polygon(
-    0% 100%,
-    0% 50%,
-    5% 45%,
-    10% 55%,
-    18% 40%,
-    25% 60%,
-    33% 45%,
-    42% 60%,
-    50% 40%,
-    58% 60%,
-    67% 45%,
-    75% 60%,
-    82% 40%,
-    91% 60%,
-    100% 50%,
-    100% 100%
-  );
-}
-
-@keyframes organic-swell {
-  0% {
-    clip-path: polygon(
-      0% 100%,
-      0% 50%,
-      5% 45%,
-      10% 55%,
-      18% 40%,
-      25% 60%,
-      33% 45%,
-      42% 60%,
-      50% 40%,
-      58% 60%,
-      67% 45%,
-      75% 60%,
-      82% 40%,
-      91% 60%,
-      100% 50%,
-      100% 100%
-    );
-  }
-  12.5% {
-    clip-path: polygon(
-      0% 100%,
-      0% 10%,
-      5% 20%,
-      10% 15%,
-      18% 30%,
-      25% 40%,
-      33% 35%,
-      42% 50%,
-      50% 55%,
-      58% 65%,
-      67% 60%,
-      75% 70%,
-      82% 65%,
-      91% 75%,
-      100% 60%,
-      100% 100%
-    );
-  }
-  25% {
-    clip-path: polygon(
-      0% 100%,
-      0% 40%,
-      5% 30%,
-      10% 50%,
-      18% 20%,
-      25% 30%,
-      33% 15%,
-      42% 40%,
-      50% 50%,
-      58% 60%,
-      67% 55%,
-      75% 65%,
-      82% 60%,
-      91% 70%,
-      100% 55%,
-      100% 100%
-    );
-  }
-  37.5% {
-    clip-path: polygon(
-      0% 100%,
-      0% 30%,
-      5% 25%,
-      10% 35%,
-      18% 20%,
-      25% 25%,
-      33% 20%,
-      42% 30%,
-      50% 20%,
-      58% 35%,
-      67% 25%,
-      75% 30%,
-      82% 20%,
-      91% 35%,
-      100% 30%,
-      100% 100%
-    );
-  }
-  50% {
-    clip-path: polygon(
-      0% 100%,
-      0% 60%,
-      5% 70%,
-      10% 60%,
-      18% 50%,
-      25% 40%,
-      33% 30%,
-      42% 10%,
-      50% 20%,
-      58% 30%,
-      67% 40%,
-      75% 50%,
-      82% 60%,
-      91% 70%,
-      100% 60%,
-      100% 100%
-    );
-  }
-  62.5% {
-    clip-path: polygon(
-      0% 100%,
-      0% 80%,
-      5% 75%,
-      10% 85%,
-      18% 70%,
-      25% 80%,
-      33% 65%,
-      42% 75%,
-      50% 60%,
-      58% 50%,
-      67% 35%,
-      75% 25%,
-      82% 40%,
-      91% 20%,
-      100% 30%,
-      100% 100%
-    );
-  }
-  75% {
-    clip-path: polygon(
-      0% 100%,
-      0% 70%,
-      5% 85%,
-      10% 75%,
-      18% 90%,
-      25% 80%,
-      33% 85%,
-      42% 70%,
-      50% 80%,
-      58% 75%,
-      67% 85%,
-      75% 80%,
-      82% 90%,
-      91% 75%,
-      100% 80%,
-      100% 100%
-    );
-  }
-  87.5% {
-    clip-path: polygon(
-      0% 100%,
-      0% 55%,
-      5% 50%,
-      10% 55%,
-      18% 50%,
-      25% 55%,
-      33% 50%,
-      42% 55%,
-      50% 50%,
-      58% 55%,
-      67% 50%,
-      75% 55%,
-      82% 50%,
-      91% 55%,
-      100% 50%,
-      100% 100%
-    );
-  }
-  100% {
-    clip-path: polygon(
-      0% 100%,
-      0% 45%,
-      5% 40%,
-      10% 50%,
-      18% 35%,
-      25% 55%,
-      33% 40%,
-      42% 55%,
-      50% 35%,
-      58% 55%,
-      67% 40%,
-      75% 55%,
-      82% 35%,
-      91% 55%,
-      100% 45%,
-      100% 100%
-    );
-  }
-}
-</style>

+ 3 - 1
src/router/index.js

@@ -43,7 +43,9 @@ export default defineRouter(function (/* { store, ssrContext } */) {
         await useAuth().refresh();
       } catch {
         refreshed = true;
-        return next({ name: "LoginPage" });
+        if (!to.meta.public) {
+          return next({ name: "LoginPage" });
+        }
       }
     }
     if (userStore().accessToken) {

+ 26 - 4
src/router/routes.js

@@ -26,10 +26,6 @@ const routes = [
         component: () => import("pages/dashboard/DashboardPage.vue"),
         meta: {
           title: { value: "Dashboard" },
-          description: {
-            value: "page.system-dashboard.description",
-            translate: true,
-          },
           requireAuth: true,
           requiredPermission: "dashboard",
           breadcrumbs: [
@@ -80,6 +76,32 @@ const routes = [
       },
     ],
   },
+  {
+    path: "/forgot-my-password",
+    component: () => import("layouts/LoginLayout.vue"),
+    meta: { public: true },
+    children: [
+      {
+        path: "",
+        name: "ForgotMyPasswordPage",
+        component: () => import("pages/ForgotMyPasswordPage.vue"),
+        meta: { public: true },
+      },
+    ],
+  },
+  {
+    path: "/recovery-password",
+    component: () => import("layouts/LoginLayout.vue"),
+    meta: { public: true },
+    children: [
+      {
+        path: "",
+        name: "RecoveryPasswordPage",
+        component: () => import("pages/RecoveryPasswordPage.vue"),
+        meta: { public: true },
+      },
+    ],
+  },
 
   // Always leave this as last one,
   // but you can also remove it

+ 8 - 54
src/stores/navigation.js

@@ -4,14 +4,14 @@ import { permissionStore } from "src/stores/permission";
 
 export const navigationStore = defineStore("navigation", () => {
   const navigationStructure = Object.freeze([
-    {
-      type: "single",
-      title: "ui.navigation.home",
-      name: "HomePage",
-      icon: "mdi-home-outline",
-      disable: false,
-      permission: true,
-    },
+    // {
+    //   type: "single",
+    //   title: "ui.navigation.home",
+    //   name: "HomePage",
+    //   icon: "mdi-home-outline",
+    //   disable: false,
+    //   permission: true,
+    // },
     {
       type: "single",
       title: "ui.navigation.dashboard",
@@ -21,52 +21,6 @@ export const navigationStore = defineStore("navigation", () => {
       permission: false,
       permissionScope: "dashboard",
     },
-    {
-      type: "expansive",
-      title: "ui.navigation.registration",
-      icon: "mdi-plus",
-      disable: false,
-      permission: false,
-      permissionScope: "config",
-      childrens: [
-        {
-          type: "single",
-          title: "ui.navigation.users",
-          name: "UsersPage",
-          icon: "mdi-account-multiple-outline",
-          disable: false,
-          permission: false,
-          permissionScope: "config.user",
-        },
-        {
-          type: "single",
-          title: "ui.navigation.city",
-          name: "CityPage",
-          icon: "mdi-city-variant-outline",
-          disable: false,
-          permission: false,
-          permissionScope: "config.city",
-        },
-        {
-          type: "single",
-          title: "ui.navigation.country",
-          name: "CountryPage",
-          icon: "mdi-earth",
-          disable: false,
-          permission: false,
-          permissionScope: "config.country",
-        },
-        {
-          type: "single",
-          title: "ui.navigation.state",
-          name: "StatePage",
-          icon: "mdi-map-marker",
-          disable: false,
-          permission: false,
-          permissionScope: "config.state",
-        },
-      ],
-    },
   ]);
 
   const getNavigationAccess = () => {

Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff