Merge branch 'main' of https://git.vnfco.ir/Brizco/web

.env

@@ -1,8 +1,8 @@
 NODE_ENV="development"
 
-NEXT_PUBLIC_SERVER_URL=http://192.168.88.12:32769
+NEXT_PUBLIC_SERVER_URL=http://192.168.31.46:32769
-NEXT_PUBLIC_PUBLIC_URL=http://192.168.88.12:32769
+NEXT_PUBLIC_PUBLIC_URL=http://192.168.31.46:32769
-NEXT_PUBLIC_API_URL=http://192.168.88.12:32769/api
+NEXT_PUBLIC_API_URL=http://192.168.31.46:32769/api
 # SECURE_LOCAL_STORAGE_HASH_KEY=f1da2b2c7a4c446934267fea631102ec389b5b99
 # NEXT_PUBLIC_API_URL_IMAGE=https://192.168.88.12:49154/Files/ReportImages
 # NEXT_PUBLIC_API_URL_BackUp=https://192.168.88.12:49154/Files/BackUps

Dockerfile

@@ -1,11 +1,12 @@
-FROM registry.vnfco.ir/library/node:14-alpine AS deps
+FROM node:20-alpine3.18 AS deps
 RUN apk add --no-cache libc6-compat
+RUN npm install -g pnpm
 WORKDIR /app
 COPY package.json ./
 RUN npm install --force --production
 
 
-FROM registry.vnfco.ir/library/node:14-alpine AS builder
+FROM node:20-alpine3.18 AS builder
 WORKDIR /app
 ARG NODE_ENV=production
 COPY . .
@@ -13,7 +14,7 @@ COPY --from=deps /app/node_modules ./node_modules
 RUN npm run build
 
 
-FROM registry.vnfco.ir/library/node:14-alpine AS runner
+FROM node:20-alpine3.18 AS runner
 WORKDIR /app
 ARG NODE_ENV=production
 COPY --from=builder /app/public ./public

pnpm-lock.yaml

@@ -731,10 +731,13 @@ packages:
     resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
     dev: false
 
+<<<<<<< HEAD
   /core-util-is@1.0.3:
     resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==}
     dev: false
 
+=======
+>>>>>>> e41e593cde5b6163efe27a5dd7b6af11013cad88
   /css-loader@6.8.1(webpack@5.89.0):
     resolution: {integrity: sha512-xDAXtEVGlD0gJ07iclwWVkLoZOpEvAWaSyf6W18S2pOC//K8+qUDIx8IIT3D+HjnmkJPQeesOPv5aiUaJsCM2g==}
     engines: {node: '>= 12.13.0'}

src/app/layout.jsx

@@ -725,7 +725,7 @@ export default function RootLayout({ children }) {
                 animate={{ opacity: [0, 0.5, 1] }}
                 transition={{ duration: 0.3 }}
               >
-                <div className="bg-BigPlus h-screen">
+                <div className="h-screen bg-BigPlus">
                   <div className="flex justify-center">
                     <div className="bg-primary-200 w-[60px] h-[60px] rounded-full fixed bottom-[37px] ">
                       <div
@@ -753,13 +753,13 @@ export default function RootLayout({ children }) {
                   </div>
                   <div className="flex justify-between  px-4 fixed bottom-[110px] w-full">
                     <Link href={"/dsdasd"}>
-                      <div className="bg-secondaryDark-100 p-3 m-2 w-full rounded-full">
+                      <div className="w-full p-3 m-2 rounded-full bg-secondaryDark-100">
                         <p className="mb-0 text-white">افزودن خرید جدیـــــد</p>
                       </div>
                     </Link>
 
                     <Link href={"/dsdasd"}>
-                      <div className="bg-secondaryDark-100 p-3 m-2 w-full rounded-full">
+                      <div className="w-full p-3 m-2 rounded-full bg-secondaryDark-100">
                         <p className="mb-0 text-white">افزودن وظیفه جدید</p>
                       </div>
                     </Link>

style/fontiran.css

@@ -13,7 +13,7 @@
 Kalameh ././fonts are considered a proprietary software. To gain information about the laws regarding the use of these ././fonts, please visit www.fontiran.com 
 --------------------------------------------------------------------------------------
 This set of ././fonts are used in this project under the license: (.....)
-------------------------------------------------------------------------------------- ././fonts/-
+------------------------------------------------------------------------------------- .//fonts/-
 *	
 **/
 
@@ -21,40 +21,40 @@ This set of ././fonts are used in this project under the license: (.....)
   font-family: KalamehWeb;
   font-style: normal;
   font-weight: 100;
-  src: url("./fonts/woff2/KalamehWeb-Thin.woff2") format("woff2"),
+  src: url("/fonts/woff2/KalamehWeb-Thin.woff2") format("woff2"),
-    /* FF39+,Chrome36+, Opera24+*/ url("./fonts/woff/KalamehWeb-Thin.woff")
+    /* FF39+,Chrome36+, Opera24+*/ url("/fonts/woff/KalamehWeb-Thin.woff")
       format("woff"); /* FF3.6+, IE9, Chrome6+, Saf5.1+*/
 }
 @font-face {
   font-family: KalamehWeb;
   font-style: normal;
   font-weight: 200;
-  src: url("./fonts/woff2/KalamehWeb-ExtraLight.woff2") format("woff2"),
+  src: url("/fonts/woff2/KalamehWeb-ExtraLight.woff2") format("woff2"),
     /* FF39+,Chrome36+, Opera24+*/
-      url("./fonts/woff/KalamehWeb-ExtraLight.woff") format("woff"); /* FF3.6+, IE9, Chrome6+, Saf5.1+*/
+      url("/fonts/woff/KalamehWeb-ExtraLight.woff") format("woff"); /* FF3.6+, IE9, Chrome6+, Saf5.1+*/
 }
 @font-face {
   font-family: KalamehWeb;
   font-style: normal;
   font-weight: 300;
-  src: url("./fonts/woff2/KalamehWeb-Light.woff2") format("woff2"),
+  src: url("/fonts/woff2/KalamehWeb-Light.woff2") format("woff2"),
-    /* FF39+,Chrome36+, Opera24+*/ url("./fonts/woff/KalamehWeb-Light.woff")
+    /* FF39+,Chrome36+, Opera24+*/ url("/fonts/woff/KalamehWeb-Light.woff")
       format("woff"); /* FF3.6+, IE9, Chrome6+, Saf5.1+*/
 }
 @font-face {
   font-family: KalamehWeb;
   font-style: normal;
   font-weight: 500;
-  src: url("./fonts/woff2/KalamehWeb-Medium.woff2") format("woff2"),
+  src: url("/fonts/woff2/KalamehWeb-Medium.woff2") format("woff2"),
-    /* FF39+,Chrome36+, Opera24+*/ url("./fonts/woff/KalamehWeb-Medium.woff")
+    /* FF39+,Chrome36+, Opera24+*/ url("/fonts/woff/KalamehWeb-Medium.woff")
       format("woff"); /* FF3.6+, IE9, Chrome6+, Saf5.1+*/
 }
 @font-face {
   font-family: KalamehWeb;
   font-style: normal;
   font-weight: 600;
-  src: url("./fonts/woff2/KalamehWeb-Semibold.woff2") format("woff2"),
+  src: url("/fonts/woff2/KalamehWeb-Semibold.woff2") format("woff2"),
-    /* FF39+,Chrome36+, Opera24+*/ url("./fonts/woff/KalamehWeb-Semibold.woff")
+    /* FF39+,Chrome36+, Opera24+*/ url("/fonts/woff/KalamehWeb-Semibold.woff")
       format("woff"); /* FF3.6+, IE9, Chrome6+, Saf5.1+*/
 }
 
@@ -62,31 +62,31 @@ This set of ././fonts are used in this project under the license: (.....)
   font-family: KalamehWeb;
   font-style: normal;
   font-weight: 800;
-  src: url("./fonts/woff2/KalamehWeb-ExtraBold.woff2") format("woff2"),
+  src: url("/fonts/woff2/KalamehWeb-ExtraBold.woff2") format("woff2"),
-    /* FF39+,Chrome36+, Opera24+*/ url("./fonts/woff/KalamehWeb-ExtraBold.woff")
+    /* FF39+,Chrome36+, Opera24+*/ url("/fonts/woff/KalamehWeb-ExtraBold.woff")
       format("woff"); /* FF3.6+, IE9, Chrome6+, Saf5.1+*/
 }
 @font-face {
   font-family: KalamehWeb;
   font-style: normal;
   font-weight: 900;
-  src: url("./fonts/woff2/KalamehWeb-Black.woff2") format("woff2"),
+  src: url("/fonts/woff2/KalamehWeb-Black.woff2") format("woff2"),
-    /* FF39+,Chrome36+, Opera24+*/ url("./fonts/woff/KalamehWeb-Black.woff")
+    /* FF39+,Chrome36+, Opera24+*/ url("/fonts/woff/KalamehWeb-Black.woff")
       format("woff"); /* FF3.6+, IE9, Chrome6+, Saf5.1+*/
 }
 @font-face {
   font-family: KalamehWeb;
   font-style: normal;
   font-weight: bold;
-  src: url("./fonts/woff2/KalamehWeb-Bold.woff2") format("woff2"),
+  src: url("/fonts/woff2/KalamehWeb-Bold.woff2") format("woff2"),
-    /* FF39+,Chrome36+, Opera24+*/ url("./fonts/woff/KalamehWeb-Bold.woff")
+    /* FF39+,Chrome36+, Opera24+*/ url("/fonts/woff/KalamehWeb-Bold.woff")
       format("woff"); /* FF3.6+, IE9, Chrome6+, Saf5.1+*/
 }
 @font-face {
   font-family: KalamehWeb;
   font-style: normal;
   font-weight: normal;
-  src: url("./fonts/woff2/KalamehWeb-Regular.woff2") format("woff2"),
+  src: url("/fonts/woff2/KalamehWeb-Regular.woff2") format("woff2"),
-    /* FF39+,Chrome36+, Opera24+*/ url("./fonts/woff/KalamehWeb-Regular.woff")
+    /* FF39+,Chrome36+, Opera24+*/ url("/fonts/woff/KalamehWeb-Regular.woff")
       format("woff"); /* FF3.6+, IE9, Chrome6+, Saf5.1+*/
 }