diff --git a/storefront/src/App.vue b/storefront/src/App.vue
index 4b92bf5f..e9dfd165 100644
--- a/storefront/src/App.vue
+++ b/storefront/src/App.vue
@@ -1,12 +1,20 @@
+
+
\ No newline at end of file
diff --git a/storefront/src/components/base/base-header.vue b/storefront/src/components/base/base-header.vue
new file mode 100644
index 00000000..7bb95a87
--- /dev/null
+++ b/storefront/src/components/base/base-header.vue
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/storefront/src/components/forms/contact-form.vue b/storefront/src/components/forms/contact-form.vue
new file mode 100644
index 00000000..e3bb55d0
--- /dev/null
+++ b/storefront/src/components/forms/contact-form.vue
@@ -0,0 +1,88 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/storefront/src/components/forms/deposit-form.vue b/storefront/src/components/forms/deposit-form.vue
new file mode 100644
index 00000000..b023fc6b
--- /dev/null
+++ b/storefront/src/components/forms/deposit-form.vue
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/storefront/src/components/forms/login-form.vue b/storefront/src/components/forms/login-form.vue
index aeda459f..861b22e4 100644
--- a/storefront/src/components/forms/login-form.vue
+++ b/storefront/src/components/forms/login-form.vue
@@ -1,5 +1,5 @@
-
+
+
diff --git a/storefront/src/components/forms/new-password-form.vue b/storefront/src/components/forms/new-password-form.vue
new file mode 100644
index 00000000..07ffe618
--- /dev/null
+++ b/storefront/src/components/forms/new-password-form.vue
@@ -0,0 +1,66 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/storefront/src/components/forms/register-form.vue b/storefront/src/components/forms/register-form.vue
index 711cba31..2188c0af 100644
--- a/storefront/src/components/forms/register-form.vue
+++ b/storefront/src/components/forms/register-form.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
\ No newline at end of file
diff --git a/storefront/src/components/forms/update-form.vue b/storefront/src/components/forms/update-form.vue
new file mode 100644
index 00000000..1d884a81
--- /dev/null
+++ b/storefront/src/components/forms/update-form.vue
@@ -0,0 +1,104 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/storefront/src/components/ui/ui-button.vue b/storefront/src/components/ui/ui-button.vue
index 967a2b14..163a3c00 100644
--- a/storefront/src/components/ui/ui-button.vue
+++ b/storefront/src/components/ui/ui-button.vue
@@ -1,5 +1,10 @@
-
+
@@ -24,6 +29,8 @@ const props = defineProps({
border: 1px solid $black;
background-color: $white;
padding-block: 5px;
+ display: grid;
+ place-items: center;
z-index: 1;
color: $black;
@@ -33,15 +40,18 @@ const props = defineProps({
&:hover, &.active {
background-color: $black;
+ color: $white;
}
&:disabled {
cursor: not-allowed;
background-color: rgba($black, 0.5);
+ color: $black;
}
&:disabled:hover, &.active {
background-color: rgba($black, 0.5);
+ color: $black;
}
&__loader {
diff --git a/storefront/src/components/ui/ui-checkbox.vue b/storefront/src/components/ui/ui-checkbox.vue
new file mode 100644
index 00000000..bb8c7b5f
--- /dev/null
+++ b/storefront/src/components/ui/ui-checkbox.vue
@@ -0,0 +1,67 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/storefront/src/components/ui/ui-input.vue b/storefront/src/components/ui/ui-input.vue
index 87fa53c8..de73fece 100644
--- a/storefront/src/components/ui/ui-input.vue
+++ b/storefront/src/components/ui/ui-input.vue
@@ -6,6 +6,7 @@
:type="isPasswordVisible"
:value="modelValue"
@input="onInput"
+ @keydown="numberOnly ? onlyNumbersKeydown($event) : null"
class="block__input"
>
{
isPasswordVisible.value = 'password'
}
+const onlyNumbersKeydown = (event) => {
+ if (!/^\d$/.test(event.key) &&
+ !['ArrowLeft', 'ArrowRight', 'Backspace', 'Delete', 'Tab', 'Home', 'End'].includes(event.key)) {
+ event.preventDefault();
+ }
+}
+
const validate = ref(true)
const errorMessage = ref('')
const onInput = (e) => {
+ let value = e.target.value;
+
+ if (props.numberOnly) {
+ const newValue = value.replace(/\D/g, '');
+ if (newValue !== value) {
+ e.target.value = newValue;
+ value = newValue;
+ }
+ }
+
let result = true
props.rules?.forEach((rule) => {
@@ -87,7 +106,6 @@ const onInput = (e) => {
font-size: 12px;
font-weight: 400;
line-height: 20px;
- letter-spacing: 0.14px;
&::placeholder {
color: #2B2B2B;
diff --git a/storefront/src/components/ui/ui-textarea.vue b/storefront/src/components/ui/ui-textarea.vue
new file mode 100644
index 00000000..cee2a744
--- /dev/null
+++ b/storefront/src/components/ui/ui-textarea.vue
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/storefront/src/composables/auth/index.js b/storefront/src/composables/auth/index.js
new file mode 100644
index 00000000..1552cf62
--- /dev/null
+++ b/storefront/src/composables/auth/index.js
@@ -0,0 +1,6 @@
+export * from './useLogin';
+export * from './useLogout';
+export * from './useNewPassword';
+export * from './usePasswordReset';
+export * from './useRefresh';
+export * from './useRegister';
\ No newline at end of file
diff --git a/storefront/src/composables/auth/useLogin.js b/storefront/src/composables/auth/useLogin.js
index d3bc9e54..f6926ee6 100644
--- a/storefront/src/composables/auth/useLogin.js
+++ b/storefront/src/composables/auth/useLogin.js
@@ -5,25 +5,33 @@ import {ElNotification} from "element-plus";
import {useI18n} from "vue-i18n";
import {useAuthStore} from "@/stores/auth.js";
import translations from "@/core/helpers/translations.js";
-import {LOCALE_STORAGE_REFRESH_KEY} from "@/config/index.js";
-import { useAuthOrder } from './useAuthOrder';
-import { useAuthWishlist } from './useAuthWishlist';
+import {
+ DEFAULT_LOCALE,
+ LOCALE_STORAGE_LOCALE_KEY,
+ LOCALE_STORAGE_REFRESH_KEY,
+ LOCALE_STORAGE_STAY_LOGIN_KEY
+} from "@/config/index.js";
+import {useRoute, useRouter} from "vue-router";
+import {usePendingOrder} from "@/composables/orders";
+import {useWishlist} from "@/composables/wishlist";
export function useLogin() {
- const loading = ref(false);
- const userData = ref(null);
-
+ const router = useRouter();
+ const route = useRoute();
const authStore = useAuthStore()
const {t} = useI18n();
const { mutate: loginMutation } = useMutation(LOGIN);
- const { getPendingOrder } = useAuthOrder();
- const { getWishlist } = useAuthWishlist();
+ const { getPendingOrder } = usePendingOrder();
+ const { getWishlist } = useWishlist();
+
+ const loading = ref(false);
async function login(
email,
- password
+ password,
+ isStayLogin
) {
loading.value = true;
@@ -33,6 +41,10 @@ export function useLogin() {
password
});
+ if (isStayLogin) {
+ localStorage.setItem(LOCALE_STORAGE_STAY_LOGIN_KEY, 'remember')
+ }
+
if (response.data?.obtainJwtToken) {
authStore.setUser({
user: response.data.obtainJwtToken.user,
@@ -42,26 +54,33 @@ export function useLogin() {
localStorage.setItem(LOCALE_STORAGE_REFRESH_KEY, response.data.obtainJwtToken.refreshToken)
ElNotification({
- message: t('popup.login.text'),
+ message: t('popup.success.login'),
type: 'success'
})
+ await router.push({
+ name: 'home',
+ params: {
+ locale: localStorage.getItem(LOCALE_STORAGE_LOCALE_KEY) || DEFAULT_LOCALE
+ }
+ })
+
if (response.data.obtainJwtToken.user.language !== translations.currentLocale) {
- translations.switchLanguage(response.data.obtainJwtToken.user.language)
+ translations.switchLanguage(response.data.obtainJwtToken.user.language, router, route)
}
await getPendingOrder(response.data.obtainJwtToken.user.email);
await getWishlist();
}
} catch (error) {
- console.error("Login error:", error);
+ console.error("useLogin error:", error);
const errorMessage = error.graphQLErrors?.[0]?.message ||
error.message ||
- t('popup.genericError');
+ t('popup.errors.defaultError');
ElNotification({
- title: t('popup.error'),
+ title: t('popup.errors.main'),
message: errorMessage,
type: 'error'
});
@@ -72,7 +91,6 @@ export function useLogin() {
return {
login,
- loading,
- userData
+ loading
};
}
\ No newline at end of file
diff --git a/storefront/src/composables/auth/useLogout.js b/storefront/src/composables/auth/useLogout.js
new file mode 100644
index 00000000..33881d33
--- /dev/null
+++ b/storefront/src/composables/auth/useLogout.js
@@ -0,0 +1,34 @@
+import {useAuthStore} from "@/stores/auth.js";
+import {
+ DEFAULT_LOCALE,
+ LOCALE_STORAGE_LOCALE_KEY,
+ LOCALE_STORAGE_REFRESH_KEY,
+ LOCALE_STORAGE_STAY_LOGIN_KEY
+} from "@/config/index.js";
+import {useRouter} from "vue-router";
+
+export function useLogout() {
+ const authStore = useAuthStore()
+ const router = useRouter()
+
+ async function logout() {
+ authStore.setUser({
+ user: null,
+ accessToken: null
+ })
+
+ localStorage.removeItem(LOCALE_STORAGE_REFRESH_KEY)
+ localStorage.removeItem(LOCALE_STORAGE_STAY_LOGIN_KEY)
+
+ await router.push({
+ name: 'home',
+ params: {
+ locale: localStorage.getItem(LOCALE_STORAGE_LOCALE_KEY) || DEFAULT_LOCALE
+ }
+ })
+ }
+
+ return {
+ logout
+ };
+}
\ No newline at end of file
diff --git a/storefront/src/composables/auth/useNewPassword.js b/storefront/src/composables/auth/useNewPassword.js
new file mode 100644
index 00000000..ff2340c2
--- /dev/null
+++ b/storefront/src/composables/auth/useNewPassword.js
@@ -0,0 +1,73 @@
+import {useMutation} from "@vue/apollo-composable";
+import {NEW_PASSWORD} from "@/graphql/mutations/auth.js";
+import {computed, ref} from "vue";
+import {ElNotification} from "element-plus";
+import {useI18n} from "vue-i18n";
+import {useRoute, useRouter} from "vue-router";
+import {DEFAULT_LOCALE, LOCALE_STORAGE_LOCALE_KEY} from "@/config/index.js";
+
+export function useNewPassword() {
+ const {t} = useI18n();
+ const route = useRoute();
+ const router = useRouter();
+
+ const { mutate: newPasswordMutation } = useMutation(NEW_PASSWORD);
+
+ const token = computed(() =>
+ route.query.token ? (route.query.token) : undefined,
+ );
+ const uid = computed(() =>
+ route.query.uid ? (route.query.uid) : undefined,
+ );
+
+ const loading = ref(false);
+
+ async function newPassword(
+ password,
+ confirmPassword
+ ) {
+ loading.value = true;
+
+ try {
+ const response = await newPasswordMutation({
+ password,
+ confirmPassword,
+ token: token.value,
+ uid: uid.value
+ });
+
+ if (response.data?.confirmResetPassword.success) {
+ ElNotification({
+ message: t('popup.success.newPassword'),
+ type: 'success'
+ })
+
+ await router.push({
+ name: 'home',
+ params: {
+ locale: localStorage.getItem(LOCALE_STORAGE_LOCALE_KEY) || DEFAULT_LOCALE
+ }
+ })
+ }
+ } catch (error) {
+ console.error("useNewPassword error:", error);
+
+ const errorMessage = error.graphQLErrors?.[0]?.message ||
+ error.message ||
+ t('popup.errors.defaultError');
+
+ ElNotification({
+ title: t('popup.errors.main'),
+ message: errorMessage,
+ type: 'error'
+ });
+ } finally {
+ loading.value = false;
+ }
+ }
+
+ return {
+ newPassword,
+ loading
+ };
+}
\ No newline at end of file
diff --git a/storefront/src/composables/auth/usePasswordReset.js b/storefront/src/composables/auth/usePasswordReset.js
new file mode 100644
index 00000000..b2500d31
--- /dev/null
+++ b/storefront/src/composables/auth/usePasswordReset.js
@@ -0,0 +1,51 @@
+import {useMutation} from "@vue/apollo-composable";
+import {RESET_PASSWORD} from "@/graphql/mutations/auth.js";
+import {ref} from "vue";
+import {ElNotification} from "element-plus";
+import {useI18n} from "vue-i18n";
+
+export function usePasswordReset() {
+ const {t} = useI18n();
+
+ const { mutate: resetPasswordMutation } = useMutation(RESET_PASSWORD);
+
+ const loading = ref(false);
+
+ async function resetPassword(
+ email
+ ) {
+ loading.value = true;
+
+ try {
+ const response = await resetPasswordMutation({
+ email
+ });
+
+ if (response.data?.resetPassword.success) {
+ ElNotification({
+ message: t('popup.success.reset'),
+ type: 'success'
+ })
+ }
+ } catch (error) {
+ console.error("usePasswordReset error:", error);
+
+ const errorMessage = error.graphQLErrors?.[0]?.message ||
+ error.message ||
+ t('popup.errors.defaultError');
+
+ ElNotification({
+ title: t('popup.errors.main'),
+ message: errorMessage,
+ type: 'error'
+ });
+ } finally {
+ loading.value = false;
+ }
+ }
+
+ return {
+ resetPassword,
+ loading
+ };
+}
\ No newline at end of file
diff --git a/storefront/src/composables/auth/useRefresh.js b/storefront/src/composables/auth/useRefresh.js
index ecd4b4c7..295f1826 100644
--- a/storefront/src/composables/auth/useRefresh.js
+++ b/storefront/src/composables/auth/useRefresh.js
@@ -4,16 +4,13 @@ import {computed, ref} from "vue";
import {ElNotification} from "element-plus";
import {useI18n} from "vue-i18n";
import {useAuthStore} from "@/stores/auth.js";
-import { useAuthOrder } from './useAuthOrder';
-import { useAuthWishlist } from './useAuthWishlist';
-import {DEFAULT_LOCALE, LOCALE_STORAGE_LOCALE_KEY, LOCALE_STORAGE_REFRESH_KEY} from "@/config/index.js";
+import {LOCALE_STORAGE_REFRESH_KEY} from "@/config/index.js";
import {useRoute, useRouter} from "vue-router";
import translations from "@/core/helpers/translations.js";
+import {usePendingOrder} from "@/composables/orders";
+import {useWishlist} from "@/composables/wishlist";
export function useRefresh() {
- const loading = ref(false);
- const userData = ref(null);
-
const router = useRouter()
const route = useRoute()
const authStore = useAuthStore()
@@ -21,15 +18,15 @@ export function useRefresh() {
const { mutate: refreshMutation } = useMutation(REFRESH);
- const { getPendingOrder } = useAuthOrder();
- const { getWishlist } = useAuthWishlist();
+ const { getPendingOrder } = usePendingOrder();
+ const { getWishlist } = useWishlist();
+
+ const loading = ref(false);
async function refresh() {
loading.value = true;
- const refreshToken = computed(() => {
- return localStorage.getItem(LOCALE_STORAGE_REFRESH_KEY)
- })
+ const refreshToken = computed(() => localStorage.getItem(LOCALE_STORAGE_REFRESH_KEY))
if (!refreshToken.value) return
@@ -45,13 +42,7 @@ export function useRefresh() {
})
if (response.data.refreshJwtToken.user.language !== translations.currentLocale) {
- translations.switchLanguage(response.data.refreshJwtToken.user.language)
- await router.push({
- name: route.name,
- params: {
- locale: localStorage.getItem(LOCALE_STORAGE_LOCALE_KEY) || DEFAULT_LOCALE
- }
- })
+ translations.switchLanguage(response.data.refreshJwtToken.user.language, router, route)
}
localStorage.setItem(LOCALE_STORAGE_REFRESH_KEY, response.data.refreshJwtToken.refreshToken)
@@ -60,14 +51,14 @@ export function useRefresh() {
await getWishlist();
}
} catch (error) {
- console.error("Refresh error:", error);
+ console.error("useRefresh error:", error);
const errorMessage = error.graphQLErrors?.[0]?.message ||
error.message ||
- t('popup.genericError');
+ t('popup.errors.defaultError');
ElNotification({
- title: t('popup.error'),
+ title: t('popup.errors.main'),
message: errorMessage,
type: 'error'
});
@@ -78,7 +69,6 @@ export function useRefresh() {
return {
refresh,
- loading,
- userData
+ loading
};
}
\ No newline at end of file
diff --git a/storefront/src/composables/auth/useRegister.js b/storefront/src/composables/auth/useRegister.js
index 751ef929..4ae09eca 100644
--- a/storefront/src/composables/auth/useRegister.js
+++ b/storefront/src/composables/auth/useRegister.js
@@ -3,18 +3,17 @@ import {REGISTER} from "@/graphql/mutations/auth.js";
import {h, ref} from "vue";
import {ElNotification} from "element-plus";
import {useI18n} from "vue-i18n";
-import {useMailClient} from "@/composables/auth/useMainClient.js";
+import {useMailClient} from "@/composables/utils";
export function useRegister() {
- const loading = ref(false);
- const mailClient = ref(null)
-
const {t} = useI18n();
const { mutate: registerMutation } = useMutation(REGISTER);
const { mailClientUrl, detectMailClient, openMailClient } = useMailClient();
+ const loading = ref(false);
+
async function register(
firstName,
lastName,
@@ -39,9 +38,8 @@ export function useRegister() {
detectMailClient(email);
ElNotification({
- title: t('popup.register.title'),
message: h('div', [
- h('p', t('popup.register.text')),
+ h('p', t('popup.success.register')),
mailClientUrl.value ? h(
'button',
{
@@ -64,14 +62,14 @@ export function useRegister() {
})
}
} catch (error) {
- console.error("Register error:", error);
+ console.error("useRegister error:", error);
const errorMessage = error.graphQLErrors?.[0]?.message ||
error.message ||
- t('popup.genericError');
+ t('popup.errors.defaultError');
ElNotification({
- title: t('popup.error'),
+ title: t('popup.errors.main'),
message: errorMessage,
type: 'error'
});
diff --git a/storefront/src/composables/blog/index.js b/storefront/src/composables/blog/index.js
new file mode 100644
index 00000000..1c8a9b08
--- /dev/null
+++ b/storefront/src/composables/blog/index.js
@@ -0,0 +1 @@
+export * from './usePosts'
\ No newline at end of file
diff --git a/storefront/src/composables/blog/usePostBySlug.js b/storefront/src/composables/blog/usePostBySlug.js
new file mode 100644
index 00000000..d8a9f21b
--- /dev/null
+++ b/storefront/src/composables/blog/usePostBySlug.js
@@ -0,0 +1,24 @@
+import { useLazyQuery } from "@vue/apollo-composable";
+import {GET_POST_BY_SLUG} from "@/graphql/queries/blog.js";
+import {computed} from "vue";
+
+export function usePostbySlug() {
+ const { result, loading, error, load } = useLazyQuery(GET_POST_BY_SLUG);
+
+ const post = computed(() => result.value?.posts.edges[0].node ?? []);
+
+ if (error.value) {
+ console.error("usePostbySlug error:", error.value);
+ }
+
+ const getPost = (slug) => {
+ return load(null, { slug });
+ };
+
+ return {
+ post,
+ loading,
+ error,
+ getPost
+ };
+}
\ No newline at end of file
diff --git a/storefront/src/composables/blog/usePosts.js b/storefront/src/composables/blog/usePosts.js
new file mode 100644
index 00000000..298a0a16
--- /dev/null
+++ b/storefront/src/composables/blog/usePosts.js
@@ -0,0 +1,20 @@
+import { useLazyQuery } from "@vue/apollo-composable";
+import { GET_POSTS } from "@/graphql/queries/blog.js";
+import {computed} from "vue";
+
+export function usePosts() {
+ const { result, loading, error, load } = useLazyQuery(GET_POSTS);
+
+ const posts = computed(() => result.value?.posts.edges ?? []);
+
+ if (error.value) {
+ console.error("usePosts error:", error.value);
+ }
+
+ return {
+ posts,
+ loading,
+ error,
+ getPosts: load
+ };
+}
\ No newline at end of file
diff --git a/storefront/src/composables/categories/index.js b/storefront/src/composables/categories/index.js
new file mode 100644
index 00000000..83a7be21
--- /dev/null
+++ b/storefront/src/composables/categories/index.js
@@ -0,0 +1,2 @@
+export * from './useCategories'
+export * from './useCategorybySlug'
\ No newline at end of file
diff --git a/storefront/src/composables/categories/useCategories.js b/storefront/src/composables/categories/useCategories.js
new file mode 100644
index 00000000..c843e2c3
--- /dev/null
+++ b/storefront/src/composables/categories/useCategories.js
@@ -0,0 +1,20 @@
+import { useLazyQuery } from "@vue/apollo-composable";
+import {computed} from "vue";
+import {GET_CATEGORIES} from "@/graphql/queries/categories.js";
+
+export function useCategories() {
+ const { result, loading, error, load } = useLazyQuery(GET_CATEGORIES);
+
+ const categories = computed(() => result.value?.categories.edges ?? []);
+
+ if (error.value) {
+ console.error("useCategories error:", error.value);
+ }
+
+ return {
+ categories,
+ loading,
+ error,
+ getCategories: load
+ };
+}
\ No newline at end of file
diff --git a/storefront/src/composables/categories/useCategorybySlug.js b/storefront/src/composables/categories/useCategorybySlug.js
new file mode 100644
index 00000000..96e26d62
--- /dev/null
+++ b/storefront/src/composables/categories/useCategorybySlug.js
@@ -0,0 +1,24 @@
+import { useLazyQuery } from "@vue/apollo-composable";
+import {computed} from "vue";
+import {GET_CATEGORY_BY_SLUG} from "@/graphql/queries/categories.js";
+
+export function usePostbySlug() {
+ const { result, loading, error, load } = useLazyQuery(GET_CATEGORY_BY_SLUG);
+
+ const category = computed(() => result.value?.categories.edges[0].node ?? []);
+
+ if (error.value) {
+ console.error("usePostbySlug error:", error.value);
+ }
+
+ const getCategory = (slug) => {
+ return load(null, { slug });
+ };
+
+ return {
+ category,
+ loading,
+ error,
+ getCategory
+ };
+}
\ No newline at end of file
diff --git a/storefront/src/composables/company/index.js b/storefront/src/composables/company/index.js
new file mode 100644
index 00000000..1b3ed723
--- /dev/null
+++ b/storefront/src/composables/company/index.js
@@ -0,0 +1 @@
+export * from './useCompanyInfo';
\ No newline at end of file
diff --git a/storefront/src/composables/company/useCompanyInfo.js b/storefront/src/composables/company/useCompanyInfo.js
new file mode 100644
index 00000000..a95d8b92
--- /dev/null
+++ b/storefront/src/composables/company/useCompanyInfo.js
@@ -0,0 +1,26 @@
+import {useLazyQuery} from "@vue/apollo-composable";
+import {GET_COMPANY_INFO} from "@/graphql/queries/company.js";
+import {useCompanyStore} from "@/stores/company.js";
+import {watchEffect} from "vue";
+
+export function useCompanyInfo() {
+ const companyStore = useCompanyStore()
+
+ const { result, loading, error, load } = useLazyQuery(GET_COMPANY_INFO);
+
+ if (error.value) {
+ console.error("useCompanyInfo error:", error.value);
+ }
+
+ watchEffect(() => {
+ if (result.value?.parameters) {
+ companyStore.setCompanyInfo(result.value.parameters);
+ }
+ });
+
+ return {
+ loading,
+ error,
+ getCompanyInfo: load
+ };
+}
\ No newline at end of file
diff --git a/storefront/src/composables/contact/index.js b/storefront/src/composables/contact/index.js
new file mode 100644
index 00000000..df9eddfe
--- /dev/null
+++ b/storefront/src/composables/contact/index.js
@@ -0,0 +1 @@
+export * from './useContactUs'
\ No newline at end of file
diff --git a/storefront/src/composables/contact/useContactUs.js b/storefront/src/composables/contact/useContactUs.js
new file mode 100644
index 00000000..e51930b1
--- /dev/null
+++ b/storefront/src/composables/contact/useContactUs.js
@@ -0,0 +1,59 @@
+import {useMutation} from "@vue/apollo-composable";
+import {ref} from "vue";
+import {ElNotification} from "element-plus";
+import {useI18n} from "vue-i18n";
+import {CONTACT_US} from "@/graphql/mutations/contact.js";
+
+export function useContactUs() {
+ const {t} = useI18n();
+
+ const { mutate: contactUsMutation } = useMutation(CONTACT_US);
+
+ const loading = ref(false);
+
+ async function contactUs(
+ name,
+ email,
+ phoneNumber,
+ subject,
+ message
+ ) {
+ loading.value = true;
+
+ try {
+ const response = await contactUsMutation({
+ name,
+ email,
+ phoneNumber,
+ subject,
+ message
+ });
+
+ if (response.data?.contactUs.received) {
+ ElNotification({
+ message: t('popup.success.contactUs'),
+ type: 'success'
+ })
+ }
+ } catch (error) {
+ console.error("useContactUs error:", error);
+
+ const errorMessage = error.graphQLErrors?.[0]?.message ||
+ error.message ||
+ t('popup.errors.defaultError');
+
+ ElNotification({
+ title: t('popup.errors.main'),
+ message: errorMessage,
+ type: 'error'
+ });
+ } finally {
+ loading.value = false;
+ }
+ }
+
+ return {
+ contactUs,
+ loading
+ };
+}
\ No newline at end of file
diff --git a/storefront/src/composables/languages/index.js b/storefront/src/composables/languages/index.js
new file mode 100644
index 00000000..c4fc3ca9
--- /dev/null
+++ b/storefront/src/composables/languages/index.js
@@ -0,0 +1,2 @@
+export * from './useLanguageSwitch.js'
+export * from './useLanguages'
\ No newline at end of file
diff --git a/storefront/src/composables/languages/useLanguageSwitch.js b/storefront/src/composables/languages/useLanguageSwitch.js
new file mode 100644
index 00000000..a41de7ab
--- /dev/null
+++ b/storefront/src/composables/languages/useLanguageSwitch.js
@@ -0,0 +1,61 @@
+import {useMutation} from "@vue/apollo-composable";
+import {computed, ref} from "vue";
+import {ElNotification} from "element-plus";
+import {useI18n} from "vue-i18n";
+import {useAuthStore} from "@/stores/auth.js";
+import translations from "@/core/helpers/translations.js";
+import {SWITCH_LANGUAGE} from "@/graphql/mutations/languages.js";
+
+export function useLanguageSwitch() {
+ const authStore = useAuthStore()
+ const {t} = useI18n();
+
+ const { mutate: languageSwitchMutation } = useMutation(SWITCH_LANGUAGE);
+
+ const accessToken = computed(() => authStore.accessToken)
+ const userUuid = computed(() => authStore.user?.uuid)
+
+ const loading = ref(false);
+
+ async function switchLanguage(
+ locale
+ ) {
+ loading.value = true;
+
+ try {
+ translations.switchLanguage(locale)
+ if (accessToken.value) {
+ const response = await languageSwitchMutation(
+ userUuid.value,
+ locale
+ );
+
+ if (response.data?.updateUser) {
+ authStore.setUser({
+ user: response.data.updateUser.user,
+ accessToken: accessToken.value
+ })
+ }
+ }
+ } catch (error) {
+ console.error("useLanguageSet error:", error);
+
+ const errorMessage = error.graphQLErrors?.[0]?.message ||
+ error.message ||
+ t('popup.errors.defaultError');
+
+ ElNotification({
+ title: t('popup.errors.main'),
+ message: errorMessage,
+ type: 'error'
+ });
+ } finally {
+ loading.value = false;
+ }
+ }
+
+ return {
+ switchLanguage,
+ loading
+ };
+}
\ No newline at end of file
diff --git a/storefront/src/composables/languages/useLanguages.js b/storefront/src/composables/languages/useLanguages.js
new file mode 100644
index 00000000..7ad2d3d2
--- /dev/null
+++ b/storefront/src/composables/languages/useLanguages.js
@@ -0,0 +1,33 @@
+import { useLazyQuery } from "@vue/apollo-composable";
+import {watchEffect} from "vue";
+import {GET_LANGUAGES} from "@/graphql/queries/languages.js";
+import {useLanguageStore} from "@/stores/languages.js";
+import {SUPPORTED_LOCALES} from "@/config/index.js";
+
+export function useLanguages() {
+ const languageStore = useLanguageStore()
+
+ const { result, loading, error, load } = useLazyQuery(GET_LANGUAGES);
+
+ if (error.value) {
+ console.error("useLanguages error:", error.value);
+ }
+
+ watchEffect(() => {
+ if (result.value?.languages) {
+ languageStore.setLanguages(
+ result.value.languages.filter((locale) =>
+ SUPPORTED_LOCALES.some(supportedLocale =>
+ supportedLocale.code === locale.code
+ )
+ )
+ );
+ }
+ });
+
+ return {
+ loading,
+ error,
+ getLanguages: load
+ };
+}
\ No newline at end of file
diff --git a/storefront/src/composables/orders/index.js b/storefront/src/composables/orders/index.js
new file mode 100644
index 00000000..95ea2494
--- /dev/null
+++ b/storefront/src/composables/orders/index.js
@@ -0,0 +1 @@
+export * from './usePendingOrder';
\ No newline at end of file
diff --git a/storefront/src/composables/auth/useAuthOrder.js b/storefront/src/composables/orders/usePendingOrder.js
similarity index 93%
rename from storefront/src/composables/auth/useAuthOrder.js
rename to storefront/src/composables/orders/usePendingOrder.js
index 6080b868..14803c6c 100644
--- a/storefront/src/composables/auth/useAuthOrder.js
+++ b/storefront/src/composables/orders/usePendingOrder.js
@@ -2,7 +2,7 @@ import {useMutation} from "@vue/apollo-composable";
import {GET_ORDERS} from "@/graphql/queries/orders.js";
import {useCartStore} from "@/stores/cart.js";
-export function useAuthOrder() {
+export function usePendingOrder() {
const cartStore = useCartStore()
const { mutate: pendingOrderMutation } = useMutation(GET_ORDERS);
diff --git a/storefront/src/composables/products/index.js b/storefront/src/composables/products/index.js
new file mode 100644
index 00000000..8583c06b
--- /dev/null
+++ b/storefront/src/composables/products/index.js
@@ -0,0 +1 @@
+export * from './useProducts'
\ No newline at end of file
diff --git a/storefront/src/composables/products/useProductBySlug.js b/storefront/src/composables/products/useProductBySlug.js
new file mode 100644
index 00000000..adf0c5d8
--- /dev/null
+++ b/storefront/src/composables/products/useProductBySlug.js
@@ -0,0 +1,24 @@
+import { useLazyQuery } from "@vue/apollo-composable";
+import {computed} from "vue";
+import {GET_PRODUCT_BY_SLUG} from "@/graphql/queries/products.js";
+
+export function useProductbySlug() {
+ const { result, loading, error, load } = useLazyQuery(GET_PRODUCT_BY_SLUG);
+
+ const product = computed(() => result.value?.products.edges[0].node ?? []);
+
+ if (error.value) {
+ console.error("useProductbySlug error:", error.value);
+ }
+
+ const getProduct = (slug) => {
+ return load(null, { slug });
+ };
+
+ return {
+ product,
+ loading,
+ error,
+ getProduct
+ };
+}
\ No newline at end of file
diff --git a/storefront/src/composables/products/useProducts.js b/storefront/src/composables/products/useProducts.js
new file mode 100644
index 00000000..df554bed
--- /dev/null
+++ b/storefront/src/composables/products/useProducts.js
@@ -0,0 +1,53 @@
+import { ref } from 'vue';
+import { useQuery } from '@vue/apollo-composable';
+import {GET_PRODUCTS} from "@/graphql/queries/products.js";
+
+export function useProducts() {
+ const products = ref([]);
+ const pageInfo = ref([]);
+ const loading = ref(false);
+
+ const getProducts = async (params = {}) => {
+ loading.value = true;
+
+ const defaults = {
+ first: 12
+ };
+
+ const variables = {};
+
+ Object.entries(params).forEach(([key, value]) => {
+ if (value !== undefined && value !== null && value !== '') {
+ variables[key] = value;
+ }
+ });
+
+ Object.entries(defaults).forEach(([key, value]) => {
+ if (!(key in variables)) {
+ variables[key] = value;
+ }
+ });
+
+ try {
+ const { onResult } = useQuery(GET_PRODUCTS, variables);
+
+ onResult(result => {
+ if (result.data && result.data.products) {
+ products.value = result.data.products.edges;
+ pageInfo.value = result.data.products.pageInfo;
+ }
+ loading.value = false;
+ });
+ } catch (error) {
+ console.error('useProducts error:', error);
+ loading.value = false;
+ }
+ };
+
+ return {
+ products,
+ pageInfo,
+ loading,
+ getProducts
+ };
+}
\ No newline at end of file
diff --git a/storefront/src/composables/user/index.js b/storefront/src/composables/user/index.js
new file mode 100644
index 00000000..1f2e5ffe
--- /dev/null
+++ b/storefront/src/composables/user/index.js
@@ -0,0 +1,3 @@
+export * from './useUserUpdating';
+export * from './useUserActivation';
+export * from '../languages/useLanguageSwitch.js';
\ No newline at end of file
diff --git a/storefront/src/composables/user/useDeposit.js b/storefront/src/composables/user/useDeposit.js
new file mode 100644
index 00000000..61236929
--- /dev/null
+++ b/storefront/src/composables/user/useDeposit.js
@@ -0,0 +1,48 @@
+import {useMutation} from "@vue/apollo-composable";
+import {ref} from "vue";
+import {ElNotification} from "element-plus";
+import {useI18n} from "vue-i18n";
+import {DEPOSIT} from "@/graphql/mutations/deposit.js";
+
+export function useDeposit() {
+ const {t} = useI18n();
+
+ const { mutate: depositMutation } = useMutation(DEPOSIT);
+
+ const loading = ref(false);
+
+ async function deposit(
+ amount
+ ) {
+ loading.value = true;
+
+ try {
+ const response = await depositMutation(
+ amount
+ );
+
+ if (response.data?.deposit) {
+ window.open(response.data.deposit.transaction.process.url)
+ }
+ } catch (error) {
+ console.error("useDeposit error:", error);
+
+ const errorMessage = error.graphQLErrors?.[0]?.message ||
+ error.message ||
+ t('popup.errors.defaultError');
+
+ ElNotification({
+ title: t('popup.errors.main'),
+ message: errorMessage,
+ type: 'error'
+ });
+ } finally {
+ loading.value = false;
+ }
+ }
+
+ return {
+ deposit,
+ loading
+ };
+}
\ No newline at end of file
diff --git a/storefront/src/composables/user/useUserActivation.js b/storefront/src/composables/user/useUserActivation.js
new file mode 100644
index 00000000..bb25a6ed
--- /dev/null
+++ b/storefront/src/composables/user/useUserActivation.js
@@ -0,0 +1,59 @@
+import {useMutation} from "@vue/apollo-composable";
+import {computed, ref} from "vue";
+import {ElNotification} from "element-plus";
+import {useI18n} from "vue-i18n";
+import {useRoute} from "vue-router";
+import {ACTIVATE_USER} from "@/graphql/mutations/user.js";
+
+export function useUserActivation() {
+ const {t} = useI18n();
+ const route = useRoute();
+
+ const { mutate: userActivationMutation } = useMutation(ACTIVATE_USER);
+
+ const token = computed(() =>
+ route.query.token ? (route.query.token) : undefined,
+ );
+ const uid = computed(() =>
+ route.query.uid ? (route.query.uid) : undefined,
+ );
+
+ const loading = ref(false);
+
+ async function activateUser() {
+ loading.value = true;
+
+ try {
+ const response = await userActivationMutation({
+ token: token.value,
+ uid: uid.value
+ });
+
+ if (response.data?.activateUser) {
+ ElNotification({
+ message: t("popup.activationSuccess"),
+ type: "success"
+ });
+ }
+ } catch (error) {
+ console.error("useUserActivation error:", error);
+
+ const errorMessage = error.graphQLErrors?.[0]?.message ||
+ error.message ||
+ t('popup.errors.defaultError');
+
+ ElNotification({
+ title: t('popup.errors.main'),
+ message: errorMessage,
+ type: 'error'
+ });
+ } finally {
+ loading.value = false;
+ }
+ }
+
+ return {
+ activateUser,
+ loading
+ };
+}
\ No newline at end of file
diff --git a/storefront/src/composables/user/useUserUpdating.js b/storefront/src/composables/user/useUserUpdating.js
new file mode 100644
index 00000000..f5e6ce18
--- /dev/null
+++ b/storefront/src/composables/user/useUserUpdating.js
@@ -0,0 +1,120 @@
+import {useMutation} from "@vue/apollo-composable";
+import {computed, ref} from "vue";
+import {ElNotification} from "element-plus";
+import {useI18n} from "vue-i18n";
+import {useAuthStore} from "@/stores/auth.js";
+import translations from "@/core/helpers/translations.js";
+import {useRoute, useRouter} from "vue-router";
+import {useLogout} from "@/composables/auth";
+import {UPDATE_USER} from "@/graphql/mutations/user.js";
+
+export function useUserUpdating() {
+ const router = useRouter();
+ const route = useRoute();
+ const authStore = useAuthStore()
+ const {t} = useI18n();
+
+ const { mutate: userUpdatingMutation } = useMutation(UPDATE_USER);
+
+ const { logout } = useLogout();
+
+ const accessToken = computed(() => authStore.accessToken)
+ const userUuid = computed(() => authStore.user?.uuid)
+ const userEmail = computed(() => authStore.user?.email)
+
+ const loading = ref(false);
+
+ async function updateUser(
+ firstName,
+ lastName,
+ email,
+ phoneNumber,
+ password,
+ confirmPassword
+ ) {
+ loading.value = true;
+
+ try {
+ const fields = {
+ uuid: userUuid.value,
+ firstName,
+ lastName,
+ email,
+ phoneNumber,
+ password,
+ confirmPassword
+ };
+
+ const params = Object.fromEntries(
+ Object.entries(fields).filter(([_, value]) =>
+ value !== undefined && value !== null && value !== ''
+ )
+ );
+
+ // if (('password' in params && !('passwordConfirm' in params)) ||
+ // (!('password' in params) && 'passwordConfirm' in params)) {
+ // ElNotification({
+ // title: t('popup.errors.main'),
+ // message: t('popup.errors.noDataToUpdate'),
+ // type: 'error'
+ // });
+ // }
+
+ if (Object.keys(params).length === 0) {
+ ElNotification({
+ title: t('popup.errors.main'),
+ message: t('popup.errors.noDataToUpdate'),
+ type: 'error'
+ });
+ }
+
+ const response = await userUpdatingMutation(
+ params
+ );
+
+ if (response.data?.updateUser) {
+ if (userEmail.value !== email) {
+ await logout()
+
+ ElNotification({
+ message: t("popup.success.confirmEmail"),
+ type: "success"
+ });
+ } else {
+ authStore.setUser({
+ user: response.data.updateUser.user,
+ accessToken: accessToken.value
+ })
+
+ ElNotification({
+ message: t("popup.successUpdate"),
+ type: "success"
+ });
+
+ if (response.data.updateUser.user.language !== translations.currentLocale) {
+ translations.switchLanguage(response.data.updateUser.user.language, router, route)
+ }
+ }
+ }
+ } catch (error) {
+ console.error("useUserUpdating error:", error);
+
+ const errorMessage = error.graphQLErrors?.[0]?.message ||
+ error.message ||
+ t('popup.errors.defaultError');
+
+ ElNotification({
+ title: t('popup.errors.main'),
+ message: errorMessage,
+ type: 'error'
+ });
+ } finally {
+ loading.value = false;
+ }
+ }
+
+ return {
+ updateUser,
+ loading
+ };
+}
\ No newline at end of file
diff --git a/storefront/src/composables/utils/index.js b/storefront/src/composables/utils/index.js
new file mode 100644
index 00000000..fb218427
--- /dev/null
+++ b/storefront/src/composables/utils/index.js
@@ -0,0 +1 @@
+export * from './useMainClient';
\ No newline at end of file
diff --git a/storefront/src/composables/auth/useMainClient.js b/storefront/src/composables/utils/useMainClient.js
similarity index 71%
rename from storefront/src/composables/auth/useMainClient.js
rename to storefront/src/composables/utils/useMainClient.js
index 27d94602..4d34154c 100644
--- a/storefront/src/composables/auth/useMainClient.js
+++ b/storefront/src/composables/utils/useMainClient.js
@@ -6,8 +6,12 @@ export function useMailClient() {
const mailClients = {
'gmail.com': 'https://mail.google.com/',
'outlook.com': 'https://outlook.live.com/',
- 'icloud.com': 'https://www.icloud.com/',
- 'yahoo.com': 'https://mail.yahoo.com/'
+ 'icloud.com': 'https://www.icloud.com/mail/',
+ 'yahoo.com': 'https://mail.yahoo.com/',
+ 'mail.ru': 'https://e.mail.ru/inbox/',
+ 'yandex.ru': 'https://mail.yandex.ru/',
+ 'proton.me': 'https://account.proton.me/mail',
+ 'fastmail.com': 'https://fastmail.com/'
};
function detectMailClient(email) {
diff --git a/storefront/src/composables/wishlist/index.js b/storefront/src/composables/wishlist/index.js
new file mode 100644
index 00000000..50ed36e7
--- /dev/null
+++ b/storefront/src/composables/wishlist/index.js
@@ -0,0 +1 @@
+export * from './useWishlist';
\ No newline at end of file
diff --git a/storefront/src/composables/auth/useAuthWishlist.js b/storefront/src/composables/wishlist/useWishlist.js
similarity index 93%
rename from storefront/src/composables/auth/useAuthWishlist.js
rename to storefront/src/composables/wishlist/useWishlist.js
index 6130b30a..8144b251 100644
--- a/storefront/src/composables/auth/useAuthWishlist.js
+++ b/storefront/src/composables/wishlist/useWishlist.js
@@ -2,7 +2,7 @@ import {useMutation} from "@vue/apollo-composable";
import {GET_WISHLIST} from "@/graphql/queries/wishlist.js";
import {useWishlistStore} from "@/stores/wishlist.js";
-export function useAuthWishlist() {
+export function useWishlist() {
const wishlistStore = useWishlistStore()
const { mutate: wishlistMutation } = useMutation(GET_WISHLIST);
diff --git a/storefront/src/config/index.js b/storefront/src/config/index.js
index 813a4f96..5067d2eb 100644
--- a/storefront/src/config/index.js
+++ b/storefront/src/config/index.js
@@ -2,7 +2,7 @@
export const APP_NAME = import.meta.env.EVIBES_PROJECT_NAME
-export const APP_NAME_KEY = import.meta.env.EVIBES_PROJECT_NAME.toLowerCase()
+export const APP_NAME_KEY = APP_NAME.toLowerCase()
@@ -23,4 +23,6 @@ export const DEFAULT_LOCALE = SUPPORTED_LOCALES.find(locale => locale.default)?.
export const LOCALE_STORAGE_LOCALE_KEY = `${APP_NAME_KEY}-user-locale`;
-export const LOCALE_STORAGE_REFRESH_KEY = `${APP_NAME_KEY}-refresh`;
\ No newline at end of file
+export const LOCALE_STORAGE_REFRESH_KEY = `${APP_NAME_KEY}-refresh`;
+
+export const LOCALE_STORAGE_STAY_LOGIN_KEY = `${APP_NAME_KEY}-remember`;
\ No newline at end of file
diff --git a/storefront/src/core/helpers/translations.js b/storefront/src/core/helpers/translations.js
index 9427f3d4..d5fee54e 100644
--- a/storefront/src/core/helpers/translations.js
+++ b/storefront/src/core/helpers/translations.js
@@ -1,7 +1,7 @@
import i18n from '@/core/plugins/i18n.config';
import {DEFAULT_LOCALE, LOCALE_STORAGE_LOCALE_KEY, SUPPORTED_LOCALES} from "@/config/index.js";
-const translation = {
+const translations = {
get currentLocale() {
return i18n.global.locale.value
},
@@ -10,12 +10,28 @@ const translation = {
i18n.global.locale.value = newLocale
},
- switchLanguage(newLocale) {
- translation.currentLocale = newLocale
+ switchLanguage(newLocale, router = null, route = null) {
+ translations.currentLocale = newLocale
document.querySelector('html').setAttribute('lang', newLocale)
localStorage.setItem(LOCALE_STORAGE_LOCALE_KEY, newLocale)
+
+ if (router && route) {
+ const newRoute = {
+ ...route,
+ params: {
+ ...route.params,
+ locale: newLocale
+ }
+ };
+
+ router.push(newRoute).catch(err => {
+ if (err.name !== 'NavigationDuplicated') {
+ console.error('Navigation error:', err);
+ }
+ });
+ }
},
isLocaleSupported(locale) {
@@ -39,7 +55,7 @@ const translation = {
getPersistedLocale() {
const persistedLocale = localStorage.getItem(LOCALE_STORAGE_LOCALE_KEY)
- if (translation.isLocaleSupported(persistedLocale)) {
+ if (translations.isLocaleSupported(persistedLocale)) {
return persistedLocale
} else {
return null
@@ -47,18 +63,18 @@ const translation = {
},
guessDefaultLocale() {
- const userPersistedLocale = translation.getPersistedLocale()
+ const userPersistedLocale = translations.getPersistedLocale()
if (userPersistedLocale) {
return userPersistedLocale
}
- const userPreferredLocale = translation.getUserLocale()
+ const userPreferredLocale = translations.getUserLocale()
- if (translation.isLocaleSupported(userPreferredLocale.locale)) {
+ if (translations.isLocaleSupported(userPreferredLocale.locale)) {
return userPreferredLocale.locale
}
- if (translation.isLocaleSupported(userPreferredLocale.localeNoRegion)) {
+ if (translations.isLocaleSupported(userPreferredLocale.localeNoRegion)) {
return userPreferredLocale.localeNoRegion
}
@@ -68,11 +84,11 @@ const translation = {
async routeMiddleware(to, _from, next) {
const paramLocale = to.params.locale
- if (!translation.isLocaleSupported(paramLocale)) {
- return next(translation.guessDefaultLocale())
+ if (!translations.isLocaleSupported(paramLocale)) {
+ return next(translations.guessDefaultLocale())
}
- await translation.switchLanguage(paramLocale)
+ await translations.switchLanguage(paramLocale)
return next()
},
@@ -81,11 +97,11 @@ const translation = {
return {
...to,
params: {
- locale: translation.currentLocale,
+ locale: translations.currentLocale,
...to.params
}
}
}
}
-export default translation
+export default translations
diff --git a/storefront/src/graphql/fragments/categories.fragment.js b/storefront/src/graphql/fragments/categories.fragment.js
new file mode 100644
index 00000000..3ed77f9d
--- /dev/null
+++ b/storefront/src/graphql/fragments/categories.fragment.js
@@ -0,0 +1,11 @@
+import gql from 'graphql-tag'
+
+export const CATEGORY_FRAGMENT = gql`
+ fragment Category on CategoryType {
+ name
+ uuid
+ image
+ description
+ slug
+ }
+`
\ No newline at end of file
diff --git a/storefront/src/graphql/fragments/company.fragment.js b/storefront/src/graphql/fragments/company.fragment.js
new file mode 100644
index 00000000..cea7ec88
--- /dev/null
+++ b/storefront/src/graphql/fragments/company.fragment.js
@@ -0,0 +1,12 @@
+import gql from 'graphql-tag'
+
+export const COMPANY_FRAGMENT = gql`
+ fragment Company on ConfigType {
+ companyAddress
+ companyName
+ companyPhoneNumber
+ emailFrom
+ emailHostUser
+ projectName
+ }
+`
\ No newline at end of file
diff --git a/storefront/src/graphql/fragments/languages.fragment.js b/storefront/src/graphql/fragments/languages.fragment.js
new file mode 100644
index 00000000..d6aed9c2
--- /dev/null
+++ b/storefront/src/graphql/fragments/languages.fragment.js
@@ -0,0 +1,9 @@
+import gql from 'graphql-tag'
+
+export const LANGUAGES_FRAGMENT = gql`
+ fragment Languages on LanguageType {
+ code
+ flag
+ name
+ }
+`
\ No newline at end of file
diff --git a/storefront/src/graphql/fragments/orders.fragment.js b/storefront/src/graphql/fragments/orders.fragment.js
new file mode 100644
index 00000000..98e13e78
--- /dev/null
+++ b/storefront/src/graphql/fragments/orders.fragment.js
@@ -0,0 +1,28 @@
+import gql from 'graphql-tag'
+import {PRODUCT_FRAGMENT} from "@/graphql/fragments/products.fragment.js";
+
+export const ORDER_FRAGMENT = gql`
+ fragment Order on OrderType {
+ totalPrice
+ uuid
+ status
+ buyTime
+ totalPrice
+ humanReadableId
+ orderProducts {
+ edges {
+ node {
+ uuid
+ notifications
+ attributes
+ quantity
+ status
+ product {
+ ...Product
+ }
+ }
+ }
+ }
+ }
+ ${PRODUCT_FRAGMENT}
+`
\ No newline at end of file
diff --git a/storefront/src/graphql/fragments/products.fragment.js b/storefront/src/graphql/fragments/products.fragment.js
new file mode 100644
index 00000000..069fbfb8
--- /dev/null
+++ b/storefront/src/graphql/fragments/products.fragment.js
@@ -0,0 +1,37 @@
+import gql from 'graphql-tag'
+
+export const PRODUCT_FRAGMENT = gql`
+ fragment Product on ProductType {
+ uuid
+ name
+ price
+ quantity
+ slug
+ category {
+ name
+ }
+ images {
+ edges {
+ node {
+ image
+ }
+ }
+ }
+ attributeGroups {
+ edges {
+ node {
+ name
+ uuid
+ attributes {
+ name
+ uuid
+ values {
+ value
+ uuid
+ }
+ }
+ }
+ }
+ }
+ }
+`
\ No newline at end of file
diff --git a/storefront/src/graphql/fragments/user.fragment.js b/storefront/src/graphql/fragments/user.fragment.js
new file mode 100644
index 00000000..1b45bc88
--- /dev/null
+++ b/storefront/src/graphql/fragments/user.fragment.js
@@ -0,0 +1,17 @@
+import gql from 'graphql-tag'
+
+export const USER_FRAGMENT = gql`
+ fragment User on UserType {
+ avatar
+ uuid
+ attributes
+ language
+ email
+ firstName
+ lastName
+ phoneNumber
+ balance {
+ amount
+ }
+ }
+`
\ No newline at end of file
diff --git a/storefront/src/graphql/fragments/wishlist.fragment.js b/storefront/src/graphql/fragments/wishlist.fragment.js
new file mode 100644
index 00000000..b79d86ca
--- /dev/null
+++ b/storefront/src/graphql/fragments/wishlist.fragment.js
@@ -0,0 +1,16 @@
+import gql from 'graphql-tag'
+import {PRODUCT_FRAGMENT} from "@/graphql/fragments/products.fragment.js";
+
+export const WISHLIST_FRAGMENT = gql`
+ fragment Wishlist on WishlistType {
+ uuid
+ products {
+ edges {
+ node {
+ ...Product
+ }
+ }
+ }
+ }
+ ${PRODUCT_FRAGMENT}
+`
\ No newline at end of file
diff --git a/storefront/src/graphql/mutations/auth.js b/storefront/src/graphql/mutations/auth.js
index 2b3aaa87..250d6071 100644
--- a/storefront/src/graphql/mutations/auth.js
+++ b/storefront/src/graphql/mutations/auth.js
@@ -1,4 +1,5 @@
import gql from 'graphql-tag'
+import {USER_FRAGMENT} from "@/graphql/fragments/user.fragment.js";
export const REGISTER = gql`
mutation register(
@@ -34,20 +35,11 @@ export const LOGIN = gql`
accessToken
refreshToken
user {
- avatar
- uuid
- attributes
- language
- email
- firstName
- lastName
- phoneNumber
- balance {
- amount
- }
+ ...User
}
}
}
+ ${USER_FRAGMENT}
`
export const REFRESH = gql`
@@ -60,68 +52,11 @@ export const REFRESH = gql`
accessToken
refreshToken
user {
- avatar
- uuid
- attributes
- language
- email
- firstName
- lastName
- phoneNumber
- balance {
- amount
- }
- }
- }
- }
-`
-
-export const ACTIVATE_USER = gql`
- mutation activateUser(
- $token: String!,
- $uid: String!
- ) {
- activateUser(
- token: $token,
- uid: $uid
- ) {
- success
- }
- }
-`
-
-export const UPDATE_USER = gql`
- mutation updateUser(
- $firstName: String,
- $lastName: String,
- $email: String,
- $phoneNumber: String,
- $password: String,
- $confirmPassword: String,
- ) {
- updateUser(
- firstName: $firstName,
- lastName: $lastName,
- email: $email,
- phoneNumber: $phoneNumber,
- password: $password,
- confirmPassword: $confirmPassword,
- ) {
- user {
- avatar
- uuid
- attributes
- language
- email
- firstName
- lastName
- phoneNumber
- balance {
- amount
- }
+ ...User
}
}
}
+ ${USER_FRAGMENT}
`
export const RESET_PASSWORD = gql`
@@ -136,7 +71,7 @@ export const RESET_PASSWORD = gql`
}
`
-export const CONFIRM_RESET_PASSWORD = gql`
+export const NEW_PASSWORD = gql`
mutation confirmResetPassword(
$password: String!,
$confirmPassword: String!,
diff --git a/storefront/src/graphql/mutations/cart.js b/storefront/src/graphql/mutations/cart.js
index 4d792484..b1534d2e 100644
--- a/storefront/src/graphql/mutations/cart.js
+++ b/storefront/src/graphql/mutations/cart.js
@@ -1,4 +1,5 @@
import gql from 'graphql-tag'
+import {ORDER_FRAGMENT} from "@/graphql/fragments/orders.fragment.js";
export const ADD_TO_CART = gql`
mutation addToCart(
@@ -10,61 +11,11 @@ export const ADD_TO_CART = gql`
productUuid: $productUuid
) {
order {
- status
- uuid
- totalPrice
- orderProducts {
- edges {
- node {
- uuid
- notifications
- attributes
- quantity
- status
- product {
- uuid
- price
- name
- description
- quantity
- slug
- category {
- name
- }
- images {
- edges {
- node {
- uuid
- image
- }
- }
- }
- category {
- name
- }
- attributeGroups {
- edges {
- node {
- name
- uuid
- attributes {
- name
- uuid
- values {
- value
- uuid
- }
- }
- }
- }
- }
- }
- }
- }
- }
+ ...Order
}
}
}
+ ${ORDER_FRAGMENT}
`
export const REMOVE_FROM_CART = gql`
@@ -77,61 +28,11 @@ export const REMOVE_FROM_CART = gql`
productUuid: $productUuid
) {
order {
- status
- uuid
- totalPrice
- orderProducts {
- edges {
- node {
- uuid
- notifications
- attributes
- quantity
- status
- product {
- uuid
- price
- name
- description
- quantity
- slug
- category {
- name
- }
- images {
- edges {
- node {
- uuid
- image
- }
- }
- }
- category {
- name
- }
- attributeGroups {
- edges {
- node {
- name
- uuid
- attributes {
- name
- uuid
- values {
- value
- uuid
- }
- }
- }
- }
- }
- }
- }
- }
- }
+ ...Order
}
}
}
+ ${ORDER_FRAGMENT}
`
export const REMOVE_KIND_FROM_CART = gql`
@@ -144,61 +45,11 @@ export const REMOVE_KIND_FROM_CART = gql`
productUuid: $productUuid
) {
order {
- status
- uuid
- totalPrice
- orderProducts {
- edges {
- node {
- uuid
- notifications
- attributes
- quantity
- status
- product {
- uuid
- price
- name
- description
- quantity
- slug
- category {
- name
- }
- images {
- edges {
- node {
- uuid
- image
- }
- }
- }
- category {
- name
- }
- attributeGroups {
- edges {
- node {
- name
- uuid
- attributes {
- name
- uuid
- values {
- value
- uuid
- }
- }
- }
- }
- }
- }
- }
- }
- }
+ ...Order
}
}
}
+ ${ORDER_FRAGMENT}
`
export const REMOVE_ALL_FROM_CART = gql`
@@ -209,59 +60,9 @@ export const REMOVE_ALL_FROM_CART = gql`
orderUuid: $orderUuid
) {
order {
- status
- uuid
- totalPrice
- orderProducts {
- edges {
- node {
- uuid
- notifications
- attributes
- quantity
- status
- product {
- uuid
- price
- name
- description
- quantity
- slug
- category {
- name
- }
- images {
- edges {
- node {
- uuid
- image
- }
- }
- }
- category {
- name
- }
- attributeGroups {
- edges {
- node {
- name
- uuid
- attributes {
- name
- uuid
- values {
- value
- uuid
- }
- }
- }
- }
- }
- }
- }
- }
- }
+ ...Order
}
}
}
+ ${ORDER_FRAGMENT}
`
\ No newline at end of file
diff --git a/storefront/src/graphql/mutations/contact.js b/storefront/src/graphql/mutations/contact.js
index 0c419145..c825ab2f 100644
--- a/storefront/src/graphql/mutations/contact.js
+++ b/storefront/src/graphql/mutations/contact.js
@@ -2,14 +2,16 @@ import gql from 'graphql-tag'
export const CONTACT_US = gql`
mutation contactUs(
- $email: String!,
$name: String!,
+ $email: String!,
+ $phoneNumber: String,
$subject: String!,
$message: String!,
) {
contactUs(
- email: $email,
name: $name,
+ email: $email,
+ phoneNumber: $phoneNumber,
subject: $subject,
message: $message
) {
diff --git a/storefront/src/graphql/mutations/languages.js b/storefront/src/graphql/mutations/languages.js
new file mode 100644
index 00000000..a35164ef
--- /dev/null
+++ b/storefront/src/graphql/mutations/languages.js
@@ -0,0 +1,17 @@
+import gql from "graphql-tag";
+
+export const SWITCH_LANGUAGE = gql`
+ mutation setlanguage(
+ $uuid: UUID!,
+ $language: String,
+ ) {
+ updateUser(
+ uuid: $uuid,
+ language: $language
+ ) {
+ user {
+ ...User
+ }
+ }
+ }
+`
\ No newline at end of file
diff --git a/storefront/src/graphql/mutations/user.js b/storefront/src/graphql/mutations/user.js
new file mode 100644
index 00000000..89f075e6
--- /dev/null
+++ b/storefront/src/graphql/mutations/user.js
@@ -0,0 +1,41 @@
+import gql from 'graphql-tag'
+
+export const ACTIVATE_USER = gql`
+ mutation activateUser(
+ $token: String!,
+ $uid: String!
+ ) {
+ activateUser(
+ token: $token,
+ uid: $uid
+ ) {
+ success
+ }
+ }
+`
+
+export const UPDATE_USER = gql`
+ mutation updateUser(
+ $uuid: UUID!,
+ $firstName: String,
+ $lastName: String,
+ $email: String,
+ $phoneNumber: String,
+ $password: String,
+ $confirmPassword: String,
+ ) {
+ updateUser(
+ uuid: $uuid,
+ firstName: $firstName,
+ lastName: $lastName,
+ email: $email,
+ phoneNumber: $phoneNumber,
+ password: $password,
+ confirmPassword: $confirmPassword,
+ ) {
+ user {
+ ...User
+ }
+ }
+ }
+`
\ No newline at end of file
diff --git a/storefront/src/graphql/mutations/wishlist.js b/storefront/src/graphql/mutations/wishlist.js
index c6afb89e..076974bf 100644
--- a/storefront/src/graphql/mutations/wishlist.js
+++ b/storefront/src/graphql/mutations/wishlist.js
@@ -1,4 +1,5 @@
import gql from 'graphql-tag'
+import {WISHLIST_FRAGMENT} from "@/graphql/fragments/wishlist.fragment.js";
export const ADD_TO_WISHLIST = gql`
mutation addToWishlist(
@@ -10,30 +11,11 @@ export const ADD_TO_WISHLIST = gql`
productUuid: $productUuid
) {
wishlist {
- uuid
- products {
- edges {
- node {
- uuid
- price
- name
- description
- quantity
- slug
- images {
- edges {
- node {
- uuid
- image
- }
- }
- }
- }
- }
- }
+ ...Wishlist
}
}
}
+ ${WISHLIST_FRAGMENT}
`
export const REMOVE_FROM_WISHLIST = gql`
@@ -46,93 +28,24 @@ export const REMOVE_FROM_WISHLIST = gql`
productUuid: $productUuid
) {
wishlist {
- uuid
- products {
- edges {
- node {
- uuid
- price
- name
- description
- quantity
- slug
- images {
- edges {
- node {
- uuid
- image
- }
- }
- }
- }
- }
- }
+ ...Wishlist
}
}
}
+ ${WISHLIST_FRAGMENT}
`
export const REMOVE_ALL_FROM_WISHLIST = gql`
- mutation removeAllFromCart(
+ mutation removeAllFromWishlist(
$wishlistUuid: String!
) {
removeAllWishlistProducts(
wishlistUuid: $wishlistUuid
) {
- order {
- status
- uuid
- totalPrice
- orderProducts {
- edges {
- node {
- uuid
- notifications
- attributes
- quantity
- status
- product {
- uuid
- price
- name
- description
- quantity
- slug
- category {
- name
- }
- images {
- edges {
- node {
- uuid
- image
- }
- }
- }
- category {
- name
- }
- attributeGroups {
- edges {
- node {
- name
- uuid
- attributes {
- name
- uuid
- values {
- value
- uuid
- }
- }
- }
- }
- }
- }
- }
- }
- }
+ wishlist {
+ ...Wishlist
}
}
}
+ ${WISHLIST_FRAGMENT}
`
\ No newline at end of file
diff --git a/storefront/src/graphql/queries/blog.js b/storefront/src/graphql/queries/blog.js
new file mode 100644
index 00000000..975a0e7b
--- /dev/null
+++ b/storefront/src/graphql/queries/blog.js
@@ -0,0 +1,29 @@
+import gql from 'graphql-tag'
+
+export const GET_POSTS = gql`
+ query getPosts {
+ posts {
+ edges {
+ node {
+ content
+ }
+ }
+ }
+ }
+`
+
+export const GET_POST_BY_SLUG = gql`
+ query getPostBySlug(
+ $slug: String!
+ ) {
+ posts(
+ slug: $slug
+ ) {
+ edges {
+ node {
+ content
+ }
+ }
+ }
+ }
+`
\ No newline at end of file
diff --git a/storefront/src/graphql/queries/categories.js b/storefront/src/graphql/queries/categories.js
index e6b79eab..9d8e26b8 100644
--- a/storefront/src/graphql/queries/categories.js
+++ b/storefront/src/graphql/queries/categories.js
@@ -1,19 +1,17 @@
import gql from 'graphql-tag'
+import {CATEGORY_FRAGMENT} from "@/graphql/fragments/categories.fragment.js";
export const GET_CATEGORIES = gql`
query getCategories {
categories {
edges {
node {
- name
- uuid
- image
- description
- slug
+ ...Category
}
}
}
}
+ ${CATEGORY_FRAGMENT}
`
export const GET_CATEGORY_BY_SLUG = gql`
@@ -25,11 +23,7 @@ export const GET_CATEGORY_BY_SLUG = gql`
) {
edges {
node {
- name
- uuid
- image
- description
- slug
+ ...Category
filterableAttributes {
possibleValues
attributeName
@@ -42,4 +36,5 @@ export const GET_CATEGORY_BY_SLUG = gql`
}
}
}
+ ${CATEGORY_FRAGMENT}
`
\ No newline at end of file
diff --git a/storefront/src/graphql/queries/company.js b/storefront/src/graphql/queries/company.js
index 50c5f4f8..a34474e9 100644
--- a/storefront/src/graphql/queries/company.js
+++ b/storefront/src/graphql/queries/company.js
@@ -1,14 +1,11 @@
import gql from 'graphql-tag'
+import {COMPANY_FRAGMENT} from "@/graphql/fragments/company.fragment.js";
export const GET_COMPANY_INFO = gql`
query getCompanyInfo {
parameters {
- companyAddress
- companyName
- companyPhoneNumber
- emailFrom
- emailHostUser
- projectName
+ ...Company
}
}
+ ${COMPANY_FRAGMENT}
`
\ No newline at end of file
diff --git a/storefront/src/graphql/queries/docs.js b/storefront/src/graphql/queries/docs.js
deleted file mode 100644
index 72e722b2..00000000
--- a/storefront/src/graphql/queries/docs.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import gql from 'graphql-tag'
-
-export const GET_DOCS = gql`
- query getDocs(
- $slug: String!
- ) {
- posts(
- slug: $slug
- ) {
- edges {
- node {
- content
- }
- }
- }
- }
-`
\ No newline at end of file
diff --git a/storefront/src/graphql/queries/languages.js b/storefront/src/graphql/queries/languages.js
index 6b14dee5..5fae8532 100644
--- a/storefront/src/graphql/queries/languages.js
+++ b/storefront/src/graphql/queries/languages.js
@@ -1,11 +1,11 @@
import gql from 'graphql-tag'
+import {LANGUAGES_FRAGMENT} from "@/graphql/fragments/languages.fragment.js";
export const GET_LANGUAGES = gql`
query getLanguages {
languages {
- code
- flag
- name
+ ...Languages
}
}
+ ${LANGUAGES_FRAGMENT}
`
\ No newline at end of file
diff --git a/storefront/src/graphql/queries/orders.js b/storefront/src/graphql/queries/orders.js
index b83d4ef9..4011188c 100644
--- a/storefront/src/graphql/queries/orders.js
+++ b/storefront/src/graphql/queries/orders.js
@@ -1,4 +1,5 @@
import gql from 'graphql-tag'
+import {ORDER_FRAGMENT} from "@/graphql/fragments/orders.fragment.js";
export const GET_ORDERS = gql`
query getOrders(
@@ -12,63 +13,10 @@ export const GET_ORDERS = gql`
) {
edges {
node {
- totalPrice
- uuid
- status
- buyTime
- totalPrice
- humanReadableId
- orderProducts {
- edges {
- node {
- uuid
- notifications
- attributes
- quantity
- status
- product {
- uuid
- price
- name
- description
- quantity
- slug
- category {
- name
- }
- images {
- edges {
- node {
- uuid
- image
- }
- }
- }
- category {
- name
- }
- attributeGroups {
- edges {
- node {
- name
- uuid
- attributes {
- name
- uuid
- values {
- value
- uuid
- }
- }
- }
- }
- }
- }
- }
- }
- }
+ ...Order
}
}
}
}
+ ${ORDER_FRAGMENT}
`
\ No newline at end of file
diff --git a/storefront/src/graphql/queries/products.js b/storefront/src/graphql/queries/products.js
index a4324b2f..055bc40c 100644
--- a/storefront/src/graphql/queries/products.js
+++ b/storefront/src/graphql/queries/products.js
@@ -1,13 +1,14 @@
import gql from 'graphql-tag'
+import {PRODUCT_FRAGMENT} from "@/graphql/fragments/products.fragment.js";
export const GET_PRODUCTS = gql`
query getProducts(
$after: String,
- $first: Number,
+ $first: Int,
$categorySlugs: String,
$orderBy: String,
- $minPrice: String,
- $maxPrice: String,
+ $minPrice: Decimal,
+ $maxPrice: Decimal,
$name: String
) {
products(
@@ -22,34 +23,7 @@ export const GET_PRODUCTS = gql`
edges {
cursor
node {
- uuid
- name
- price
- quantity
- slug
- images {
- edges {
- node {
- image
- }
- }
- }
- attributeGroups {
- edges {
- node {
- name
- uuid
- attributes {
- name
- uuid
- values {
- value
- uuid
- }
- }
- }
- }
- }
+ ...Product
}
}
pageInfo {
@@ -58,6 +32,7 @@ export const GET_PRODUCTS = gql`
}
}
}
+ ${PRODUCT_FRAGMENT}
`
export const GET_PRODUCT_BY_SLUG = gql`
@@ -69,48 +44,10 @@ export const GET_PRODUCT_BY_SLUG = gql`
) {
edges {
node {
- uuid
- name
- price
- quantity
- description
- slug
- category {
- name
- slug
- }
- images {
- edges {
- node {
- image
- }
- }
- }
- attributeGroups {
- edges {
- node {
- name
- uuid
- attributes {
- name
- uuid
- values {
- value
- uuid
- }
- }
- }
- }
- }
- feedbacks {
- edges {
- node {
- rating
- }
- }
- }
+ ...Product
}
}
}
}
+ ${PRODUCT_FRAGMENT}
`
\ No newline at end of file
diff --git a/storefront/src/graphql/queries/wishlist.js b/storefront/src/graphql/queries/wishlist.js
index 76a9422c..99dc799b 100644
--- a/storefront/src/graphql/queries/wishlist.js
+++ b/storefront/src/graphql/queries/wishlist.js
@@ -1,48 +1,15 @@
import gql from 'graphql-tag'
+import {WISHLIST_FRAGMENT} from "@/graphql/fragments/wishlist.fragment.js";
export const GET_WISHLIST = gql`
query getWishlist {
wishlists {
edges {
node {
- uuid
- products {
- edges {
- node {
- uuid
- price
- name
- description
- slug
- images {
- edges {
- node {
- uuid
- image
- }
- }
- }
- attributeGroups {
- edges {
- node {
- name
- uuid
- attributes {
- name
- uuid
- values {
- value
- uuid
- }
- }
- }
- }
- }
- }
- }
- }
+ ...Wishlist
}
}
}
}
+ ${WISHLIST_FRAGMENT}
`
\ No newline at end of file
diff --git a/storefront/src/locales/en-gb.json b/storefront/src/locales/en-gb.json
index e3629841..4b20aaf6 100644
--- a/storefront/src/locales/en-gb.json
+++ b/storefront/src/locales/en-gb.json
@@ -7,7 +7,9 @@
"goEmail": "Take me to my inbox",
"logout": "Log Out",
"buy": "Buy Now",
- "save": "Save"
+ "save": "Save",
+ "sendLink": "Send link",
+ "topUp": "Top up"
},
"errors": {
"required": "This field is required!",
@@ -22,36 +24,42 @@
},
"fields": {
"search": "Search Cards",
+ "name": "Name",
"firstName": "First name",
"lastName": "Last name",
- "phone": "Phone number",
+ "phoneNumber": "Phone number",
"email": "Email",
+ "subject": "Subject",
"message": "Your message",
"password": "Password",
"newPassword": "New password",
"confirmPassword": "Confirm password",
"confirmNewPassword": "Confirm new password"
},
+ "checkboxes": {
+ "remember": "Remember me"
+ },
"popup": {
- "error": "Error!",
- "login": {
- "title": "Wellcome back!",
- "text": "Sign in successes"
+ "errors": {
+ "main": "Error!",
+ "defaultError": "Something went wrong..",
+ "noDataToUpdate": "There is no data to update."
},
- "register": {
- "title": "Welcome!",
- "text": "Account successfully created. Please confirm your Email before Sign In!"
+ "success": {
+ "login": "Sign in successes",
+ "register": "Account successfully created. Please confirm your Email before Sign In!",
+ "confirmEmail": "Verification E-mail link successfully sent!",
+ "reset": "If specified email exists in our system, we will send a password recovery email!",
+ "newPassword": "You have successfully changed your password!",
+ "contactUs": "Your message was sent successfully!"
},
"addToCart": "{product} has been added to the cart!",
"addToCartLimit": "Total quantity limit is {quantity}!",
"failAdd": "Please log in to make a purchase",
- "contactSuccess": "Your message was sent successfully!",
"activationSuccess": "E-mail successfully verified. Please Sign In!",
"successUpdate": "Profile successfully updated!",
- "confirmEmail": "Verification E-mail link successfully sent!",
+
"payment": "Your purchase is being processed! Please stand by",
- "reset": "If specified email exists in our system, we will send a password recovery email!",
- "successNewPassword": "You have successfully changed your password!",
"successCheckout": "Order purchase successful!",
"addToWishlist": "{product} has been added to the wishlist!"
}
diff --git a/storefront/src/pages/blog-page.vue b/storefront/src/pages/blog-page.vue
new file mode 100644
index 00000000..8bcdddca
--- /dev/null
+++ b/storefront/src/pages/blog-page.vue
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/storefront/src/pages/home-page.vue b/storefront/src/pages/home-page.vue
index 07db6abc..ffb5e949 100644
--- a/storefront/src/pages/home-page.vue
+++ b/storefront/src/pages/home-page.vue
@@ -5,7 +5,21 @@
\ No newline at end of file
diff --git a/storefront/src/pages/product-page.vue b/storefront/src/pages/product-page.vue
new file mode 100644
index 00000000..1dc7755b
--- /dev/null
+++ b/storefront/src/pages/product-page.vue
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/storefront/src/pages/profile-page.vue b/storefront/src/pages/profile-page.vue
new file mode 100644
index 00000000..73213b1e
--- /dev/null
+++ b/storefront/src/pages/profile-page.vue
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/storefront/src/pages/store-page.vue b/storefront/src/pages/store-page.vue
new file mode 100644
index 00000000..9171d8b4
--- /dev/null
+++ b/storefront/src/pages/store-page.vue
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/storefront/src/router/index.js b/storefront/src/router/index.js
index fd0825f0..171cdc2e 100644
--- a/storefront/src/router/index.js
+++ b/storefront/src/router/index.js
@@ -2,6 +2,16 @@ import {createRouter, createWebHistory, RouterView} from 'vue-router'
import HomePage from "@/pages/home-page.vue";
import translation from "@/core/helpers/translations.js";
import {APP_NAME} from "@/config/index.js";
+import NewPasswordForm from "@/components/forms/new-password-form.vue";
+import BlogPage from "@/pages/blog-page.vue";
+import PostPage from "@/pages/post-page.vue";
+import ProfilePage from "@/pages/profile-page.vue";
+import {useAuthStore} from "@/stores/auth.js";
+import RegisterForm from "@/components/forms/register-form.vue";
+import LoginForm from "@/components/forms/login-form.vue";
+import ResetPasswordForm from "@/components/forms/reset-password-form.vue";
+import StorePage from "@/pages/store-page.vue";
+import ProductPage from "@/pages/product-page.vue";
const routes = [
{
@@ -16,6 +26,90 @@ const routes = [
meta: {
title: "Home"
}
+ },
+ {
+ path: 'activate-user',
+ name: 'activate-user',
+ component: HomePage,
+ meta: {
+ title: 'Home'
+ }
+ },
+ {
+ path: 'reset-password',
+ name: 'reset-password',
+ component: NewPasswordForm,
+ meta: {
+ title: 'New Password'
+ }
+ },
+ {
+ path: 'register',
+ name: 'register',
+ component: RegisterForm,
+ meta: {
+ title: 'Register',
+ requiresGuest: true
+ }
+ },
+ {
+ path: 'login',
+ name: 'login',
+ component: LoginForm,
+ meta: {
+ title: 'Login',
+ requiresGuest: true
+ }
+ },
+ {
+ path: 'forgot-password',
+ name: 'forgot-password',
+ component: ResetPasswordForm,
+ meta: {
+ title: 'Forgot Password',
+ requiresGuest: true
+ }
+ },
+ {
+ path: 'blog',
+ name: 'blog',
+ component: BlogPage,
+ meta: {
+ title: 'Blog'
+ }
+ },
+ {
+ path: 'blog/post/:postSlug',
+ name: 'blog-post',
+ component: PostPage,
+ meta: {
+ title: 'Post'
+ }
+ },
+ {
+ path: 'store',
+ name: 'store',
+ component: StorePage,
+ meta: {
+ title: 'Store'
+ }
+ },
+ {
+ path: 'product/:productSlug',
+ name: 'product',
+ component: ProductPage,
+ meta: {
+ title: 'Product'
+ }
+ },
+ {
+ path: 'profile',
+ name: 'profile',
+ component: ProfilePage,
+ meta: {
+ title: 'Profile',
+ requiresAuth: true
+ }
}
]
}
@@ -34,8 +128,24 @@ const router = createRouter({
}
})
-router.beforeEach((to, from) => {
+router.beforeEach((to, from, next) => {
+ const authStore = useAuthStore();
+ const isAuthenticated = authStore.accessToken
+
document.title = to.meta.title ? `${APP_NAME} | ` + to.meta?.title : APP_NAME
+
+ if (to.meta.requiresAuth && !isAuthenticated) {
+ return next({
+ name: 'home',
+ query: { redirect: to.fullPath }
+ });
+ }
+
+ if (to.meta.requiresGuest && isAuthenticated) {
+ return next({ name: 'home' });
+ }
+
+ next();
})
export default router
\ No newline at end of file
diff --git a/storefront/src/stores/auth.js b/storefront/src/stores/auth.js
index 9bb903d1..bc7e5c69 100644
--- a/storefront/src/stores/auth.js
+++ b/storefront/src/stores/auth.js
@@ -2,13 +2,13 @@ import {defineStore} from "pinia";
import {ref} from "vue";
export const useAuthStore = defineStore('auth', () => {
- const user = ref(null)
- const accessToken = ref(null)
+ const user = ref(null);
+ const accessToken = ref(null);
- const setUser = (payload) => {
- user.value = payload.user
- accessToken.value = payload.accessToken
- }
+ const setUser = (payload) => {
+ user.value = payload.user
+ accessToken.value = payload.accessToken
+ }
- return { user, accessToken, setUser }
+ return { user, accessToken, setUser }
})
\ No newline at end of file
diff --git a/storefront/src/stores/cart.js b/storefront/src/stores/cart.js
index 5a19f74c..43bc9722 100644
--- a/storefront/src/stores/cart.js
+++ b/storefront/src/stores/cart.js
@@ -2,10 +2,10 @@ import {defineStore} from "pinia";
import {ref} from "vue";
export const useCartStore = defineStore('cart', () => {
- const currentOrder = ref({})
+ const currentOrder = ref({});
const setCurrentOrders = (order) => {
currentOrder.value = order
- }
+ };
return {
currentOrder,
diff --git a/storefront/src/stores/company.js b/storefront/src/stores/company.js
index c4d065e4..4d1406ae 100644
--- a/storefront/src/stores/company.js
+++ b/storefront/src/stores/company.js
@@ -2,10 +2,10 @@ import { defineStore } from 'pinia'
import { ref } from 'vue'
export const useCompanyStore = defineStore('company', () => {
- const companyInfo = ref([])
+ const companyInfo = ref([]);
const setCompanyInfo = (payload) => {
companyInfo.value = payload
- }
+ };
return {
companyInfo,
diff --git a/storefront/src/stores/languages.js b/storefront/src/stores/languages.js
new file mode 100644
index 00000000..066dcf10
--- /dev/null
+++ b/storefront/src/stores/languages.js
@@ -0,0 +1,14 @@
+import { defineStore } from 'pinia'
+import { ref } from 'vue'
+
+export const useLanguageStore = defineStore('language', () => {
+ const languages = ref([]);
+ const setLanguages = (payload) => {
+ languages.value = payload
+ };
+
+ return {
+ languages,
+ setLanguages
+ }
+})
diff --git a/storefront/src/stores/wishlist.js b/storefront/src/stores/wishlist.js
index 9e855f16..e7507ec3 100644
--- a/storefront/src/stores/wishlist.js
+++ b/storefront/src/stores/wishlist.js
@@ -2,10 +2,10 @@ import { defineStore } from 'pinia'
import { ref } from 'vue'
export const useWishlistStore = defineStore('wishlist', () => {
- const wishlist = ref({})
+ const wishlist = ref({});
const setWishlist = (order) => {
wishlist.value = order
- }
+ };
return {
wishlist,