From 5e958e4166abd22236e94bcacb02c8fc2a374c46 Mon Sep 17 00:00:00 2001 From: Viet An Date: Wed, 27 May 2026 14:14:02 +0700 Subject: [PATCH] changes --- app/assets/styles/main.scss | 5 - app/components/customer/Customer.vue | 7 +- app/components/customer/CustomerForm.vue | 699 ++++++++++++++++++ .../dashboard/DeliveryInteractive.vue | 5 +- .../marketing/email/dataGmail/EmailSent.vue | 5 +- app/plugins/04-components.js | 2 + public/map-demo.png | Bin 180682 -> 0 bytes server/api/hello.js | 12 - 8 files changed, 711 insertions(+), 24 deletions(-) create mode 100644 app/components/customer/CustomerForm.vue delete mode 100644 public/map-demo.png delete mode 100644 server/api/hello.js diff --git a/app/assets/styles/main.scss b/app/assets/styles/main.scss index a85403f..af89648 100644 --- a/app/assets/styles/main.scss +++ b/app/assets/styles/main.scss @@ -1,8 +1,3 @@ -@use "sass:color"; -@use "bulma/sass/utilities/initial-variables.scss" as *; -@use "bulma/sass/utilities/derived-variables.scss" as *; -@use "bulma/sass/utilities/mixins.scss" as *; -@use "bulma/sass/components/card.scss" as *; @use "utils.scss"; @use "overrides-components.scss"; diff --git a/app/components/customer/Customer.vue b/app/components/customer/Customer.vue index 21ab4bd..9a24c9c 100644 --- a/app/components/customer/Customer.vue +++ b/app/components/customer/Customer.vue @@ -34,7 +34,7 @@
- import { computed, ref } from "vue"; import { useNuxtApp } from "#app"; -import CustomerInfo2 from "~/components/customer/CustomerInfo2"; -import CustomerView from "~/components/customer/CustomerView"; +import CustomerForm from "~/components/customer/CustomerForm.vue"; +import CustomerView from "~/components/customer/CustomerView.vue"; import Modal from "~/components/Modal.vue"; import { useStore } from "@/stores/index"; +import ImageGallery from "@/components/media/ImageGallery.vue"; const nuxtApp = useNuxtApp(); const { $dialog } = nuxtApp; diff --git a/app/components/customer/CustomerForm.vue b/app/components/customer/CustomerForm.vue new file mode 100644 index 0000000..3590339 --- /dev/null +++ b/app/components/customer/CustomerForm.vue @@ -0,0 +1,699 @@ + + + diff --git a/app/components/dashboard/DeliveryInteractive.vue b/app/components/dashboard/DeliveryInteractive.vue index 48ee74a..419de19 100644 --- a/app/components/dashboard/DeliveryInteractive.vue +++ b/app/components/dashboard/DeliveryInteractive.vue @@ -302,8 +302,9 @@ cx="12" cy="10" r="3" - >Hà Nội + > + + Hà Nội
diff --git a/app/components/marketing/email/dataGmail/EmailSent.vue b/app/components/marketing/email/dataGmail/EmailSent.vue index cab724b..4e47b76 100644 --- a/app/components/marketing/email/dataGmail/EmailSent.vue +++ b/app/components/marketing/email/dataGmail/EmailSent.vue @@ -249,10 +249,10 @@