diff --git a/backend/account/admin.py b/backend/account/admin.py index 588da46..2bd36fc 100644 --- a/backend/account/admin.py +++ b/backend/account/admin.py @@ -28,7 +28,7 @@ class UserAdmin(BaseUserAdmin, ModelAdmin, ImportExportModelAdmin): list_filter = ['is_superuser'] search_fields = ['phone', 'first_name', 'last_name', 'email'] list_display = ['full_name_display', 'phone', 'email', 'is_superuser', ] - readonly_fields = [] + # readonly_fields = ['phone', 'email', 'otp_expiry', 'otp_hash', 'date_joined', 'profile_photo'] exclude = ('otp_hash', 'otp_expiry', 'is_active', 'is_staff', 'password', 'last_login') import_form_class = ImportForm @@ -73,6 +73,7 @@ class AddressAdmin(ModelAdmin, ImportExportModelAdmin): export_form_class = ExportForm search_fields = ['address', 'name', 'city', 'province'] list_display = ['user', 'name', 'address_display', 'postal_code', 'city', 'province', 'for_me'] + #readonly_fields = ['user', 'name', 'address', 'postal_code', 'phone', 'city', 'province', 'for_me'] compressed_fields = True warn_unsaved_form = True formfield_overrides = { diff --git a/frontend/components/global/Avatar.vue b/frontend/components/global/Avatar.vue new file mode 100644 index 0000000..1b2111e --- /dev/null +++ b/frontend/components/global/Avatar.vue @@ -0,0 +1,30 @@ + + + diff --git a/frontend/components/global/Header.vue b/frontend/components/global/Header.vue index 231b578..faf40cc 100644 --- a/frontend/components/global/Header.vue +++ b/frontend/components/global/Header.vue @@ -14,6 +14,7 @@ type NavLink = { // state const { data: account } = useGetAccount(); +const route = useRoute(); const { logout } = useAuth(); const nav_links = ref([ @@ -38,41 +39,56 @@ const nav_links = ref([ path: "#", }, ]); + +// computed + +const isHomePage = computed(() => route.path === "/"); + +// lifecycle + +onMounted(() => {}); diff --git a/frontend/components/global/product-detail/ProductsSlider.vue b/frontend/components/global/product-detail/ProductsSlider.vue index 41f6c07..6599e64 100644 --- a/frontend/components/global/product-detail/ProductsSlider.vue +++ b/frontend/components/global/product-detail/ProductsSlider.vue @@ -23,9 +23,7 @@ const swiper_instance = ref(null); // queries -await useAsyncData(async () => { - await suspense(); -}); +await suspense(); // methods diff --git a/frontend/components/home/Categories.vue b/frontend/components/home/Categories.vue index a95a60f..15afeae 100644 --- a/frontend/components/home/Categories.vue +++ b/frontend/components/home/Categories.vue @@ -29,13 +29,20 @@ const onSwiper = (swiper: SwiperClass) => {