Merge branch 'main' of https://git2.tavasi.ir/front/base_ui into shadi/develop

.env

@@ -1,3 +1,6 @@
+NUXT_PUBLIC_API_NAME=api/
+NUXT_PUBLIC_BASE_URL=/
+
 # For more information refere to documents:  https://cli.vuejs.org/guide/mode-and-env.html#example-staging-mode
 
 VITE_GOOGLECLIENTID="1044522269248-903n0gpd6kv9slmmr7cp2o8u04ru78qv.apps.googleusercontent.com"

.env.haditha

@@ -1,5 +1,4 @@
-NUXT_PUBLIC_API_NAME=api/
+NUXT_PUBLIC_BASE_URL=http://192.168.23.161/
-NUXT_PUBLIC_BASE_URL=http://192.168.23.60/
 
 VITE_APP_NAME=Hadith
 

dockerfile

@@ -0,0 +1,14 @@
+FROM node:22
+
+WORKDIR /app
+
+
+COPY package*.json ./
+RUN npm install
+
+COPY . .
+RUN npm run  build-haditha
+
+EXPOSE 3000
+
+CMD ["node", ".output/server/index.mjs"]

nuxt.config.ts

@@ -51,7 +51,7 @@ export default defineNuxtConfig({
   nitro: {
     compressPublicAssets: true,
     prerender: {
-      routes: ["/haditha/about-us", "/haditha/contact"], // Pre-render these routes
+      routes: ["/haditha/about-us", "/haditha/contact-us"], // Pre-render these routes
     },
   },
 

plugins/api.ts

@@ -6,14 +6,16 @@ import { useStorage } from "@vueuse/core";
 //   lsToken = "GuestAccess";
 
 export default defineNuxtPlugin((nuxtApp) => {
+  const config = useRuntimeConfig();
+
   //   const { session } = useUserSession();
   // const authStore = useAuthStore();
   let token = useStorage("id_token", "GuestAccess").value;
   const api = $fetch.create({
     onRequest({ request, options, error }) {
       options.baseURL =
-        import.meta.env.VITE_BASE_URL +
+        config.public.NUXT_PUBLIC_BASE_URL +
-        import.meta.env.NUXT_PUBLIC_API_NAME+
+        config.public.NUXT_PUBLIC_API_NAME +
         options.baseURL;
 
       if (token) {

routes/haditha.ts

@@ -43,7 +43,7 @@ export default [
   {
     name: "hadithaContact",
     path: "/haditha/contact-us",
-    file: "~/systems/hadith_ui/pages/haditha/public-pages/ContactUs.vue",
+    file: "~/systems/hadith_ui/pages/haditha/public-pages/contactus.vue",
   },
   {
     name: "hadithaRules",

stores/authStore.ts

@@ -69,7 +69,7 @@ export const useAuthStore = defineStore("authStore", {
     isGuest(state) {
       return !state.isRealUser;
     },
-    async isAuthenticatedGetter(state) {
+    isAuthenticatedGetter(state) {
       let isAuthenticated = useStorage("id_token", "GuestAccess").value;
       // updating value sample
       // isAuthenticated.value = null
@@ -266,8 +266,6 @@ export const useAuthStore = defineStore("authStore", {
       // });
     },
     async login(credentials) {
-      console.info(import.meta.env.VITE_AUTH_BASE_URL)
-      
       try {
         const { $api } = useNuxtApp();
         const response = await $api(apis.login, {

tailwind.config.js

@@ -1,24 +1,32 @@
 module.exports = {
-    prefix: 'tw-',
+  prefix: "tw-",
+  content: [
+    "./components/**/*.{js,vue,ts}",
+    "./layouts/**/*.vue",
+    "./pages/**/*.vue",
+    "./plugins/**/*.{js,ts}",
+    "./nuxt.config.{js,ts}",
+  ],
+  theme: {
+    screens: {
+      sm: "360px",
+      md: "720px",
+      lg: "992px",
+      xl: "1200px",
+      "2xl": "1400px",
+      "3xl": "1900px",
+    },
+    extend: {},
+  },
+  plugins: [],
+  purge: {
+    enabled: process.env.NODE_ENV === "production",
     content: [
-      './components/**/*.{js,vue,ts}',
+      "./components/**/*.{js,vue,ts}",
-      './layouts/**/*.vue',
+      "./layouts/**/*.vue",
-      './pages/**/*.vue',
+      "./pages/**/*.vue",
-      './plugins/**/*.{js,ts}',
+      "./plugins/**/*.{js,ts}",
-      './nuxt.config.{js,ts}',
+      "./nuxt.config.{js,ts}",
     ],
-    theme: {
+  },
-      extend: {},
+};
-    },
-    plugins: [],
-    purge: {
-      enabled: process.env.NODE_ENV === 'production',
-      content: [
-        './components/**/*.{js,vue,ts}',
-        './layouts/**/*.vue',
-        './pages/**/*.vue',
-        './plugins/**/*.{js,ts}',
-        './nuxt.config.{js,ts}',
-      ],
-    },
-  };

utils/globalMixin.ts

@@ -169,6 +169,8 @@ export const copyToClipboard = async (
   id = undefined,
   domainUrl = undefined
 ) => {
+  const toast = useToast();
+
   try {
     const _id = id ? "/" + id : "";
     let url = location.href;
@@ -177,27 +179,37 @@ export const copyToClipboard = async (
     }
     await navigator.clipboard.writeText(url + _id);
 
-    mySwalToast({
+    toast.add({
-      html: "نشانی پیوند کپی شد.",
+      title: "انجام شد.",
+      description: "نشانی پیوند کپی شد.",
+      color: "success",
     });
   } catch (err) {
     console.log(err.message);
-    mySwalToast({
+    toast.add({
-      html: "خطایی رخ داد.لطفا دوباره امتحان کنید.",
+      title: "انجام شد.",
+      description: "خطایی رخ داد.لطفا دوباره امتحان کنید.",
+      color: "error",
     });
   }
 };
 export const copyTextToClipboard = async (text) => {
+  const toast = useToast();
+
   try {
     await navigator.clipboard.writeText(text);
 
-    mySwalToast({
+    toast.add({
-      html: "متن کپی شد.",
+      title: "انجام شد.",
+      description: "متن کپی شد.",
+      color: "success",
     });
   } catch (err) {
     console.log(err.message);
-    mySwalToast({
+    toast.add({
-      html: "خطایی رخ داد.لطفا دوباره امتحان کنید.",
+      title: "انجام شد.",
+      description: "خطایی رخ داد.لطفا دوباره امتحان کنید.",
+      color: "error",
     });
   }
 };
@@ -275,7 +287,7 @@ export const userAvatar = (user = undefined) => {
       if (user?.avatar && user?.avatar?.length) {
         return (
           import.meta.env.VITE_BASE_URL +
-          import.meta.env.NUXT_PUBLIC_API_NAME+
+          import.meta.env.NUXT_PUBLIC_API_NAME +
           fileUrl() +
           user.avatar
         );