From 4fd00bbf82d60fc2ee08b30c212b8be4af927a28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D8=AD=D8=B3=DB=8C=D9=86=20=D9=85=D8=B9=D8=B5=D9=88=D9=85?= =?UTF-8?q?=DB=8C=20=D9=BE=D9=88=D8=B1?= Date: Mon, 26 Aug 2024 13:38:26 +0330 Subject: [PATCH] .app add --- .env | 6 +-- .env.production | 6 +-- Dockerfile.emergency | 4 +- components/AppHeader/page.jsx | 6 +-- components/NavBar/NavBAr.jsx | 8 ++-- components/UnderDevelopeTimer.jsx | 2 +- components/landingComponents/Hero.jsx | 45 +++++++++++++----- .../landingComponents/MovingLogos/page.jsx | 43 +++++++++++++++++ components/landingComponents/Navbar.jsx | 18 +++---- public/images/bg.png | Bin 652715 -> 705757 bytes public/sw.js.map | 2 +- src/app/{ => app}/acount/page.jsx | 0 src/app/{ => app}/coffee-brew/page.jsx | 0 src/app/{ => app}/employees/page.jsx | 0 src/app/{ => app}/home/page.jsx | 4 +- src/app/{ => app}/login/page.jsx | 14 +++++- src/app/{ => app}/news/page.jsx | 0 .../{ => app}/shifts/complete-shift/page.jsx | 0 .../{ => app}/shifts/manage-shift/page.jsx | 2 +- src/app/{ => app}/shifts/page.jsx | 12 +++-- src/app/{ => app}/tasks/add-task/page.jsx | 2 +- src/app/{ => app}/tasks/page.jsx | 2 +- src/app/layout.jsx | 10 ++-- src/assets/logo2.png | Bin 98149 -> 142233 bytes src/constans/index.js | 17 ++++--- style/globals.css | 43 ++++++++++++++++- 26 files changed, 186 insertions(+), 60 deletions(-) create mode 100644 components/landingComponents/MovingLogos/page.jsx rename src/app/{ => app}/acount/page.jsx (100%) rename src/app/{ => app}/coffee-brew/page.jsx (100%) rename src/app/{ => app}/employees/page.jsx (100%) rename src/app/{ => app}/home/page.jsx (99%) rename src/app/{ => app}/login/page.jsx (78%) rename src/app/{ => app}/news/page.jsx (100%) rename src/app/{ => app}/shifts/complete-shift/page.jsx (100%) rename src/app/{ => app}/shifts/manage-shift/page.jsx (99%) rename src/app/{ => app}/shifts/page.jsx (97%) rename src/app/{ => app}/tasks/add-task/page.jsx (99%) rename src/app/{ => app}/tasks/page.jsx (99%) diff --git a/.env b/.env index ad42260..5d3d8c1 100644 --- a/.env +++ b/.env @@ -14,9 +14,9 @@ NODE_ENV="development" -NEXT_PUBLIC_SERVER_URL=https://api.brizco.io -NEXT_PUBLIC_PUBLIC_URL=https://api.brizco.io -NEXT_PUBLIC_API_URL=https://api.brizco.io/api +NEXT_PUBLIC_SERVER_URL=https://api.brizco.app +NEXT_PUBLIC_PUBLIC_URL=https://api.brizco.app +NEXT_PUBLIC_API_URL=https://api.brizco.app/api # NEXT_PUBLIC_VERSION=1.0.3.4 # NEXT_PUBLIC_API_URL_IMAGE=https://api.macsonline.ir/Files/ReportImages # NEXT_PUBLIC_API_URL_BackUp=https://api.macsonline.ir/Files/Back1.10 \ No newline at end of file diff --git a/.env.production b/.env.production index 6060884..cdf7728 100644 --- a/.env.production +++ b/.env.production @@ -1,5 +1,5 @@ NODE_ENV="production" -NEXT_PUBLIC_SERVER_URL=https://api.brizco.io -NEXT_PUBLIC_PUBLIC_URL=https://api.brizco.io -NEXT_PUBLIC_API_URL=https://api.brizco.io/api +NEXT_PUBLIC_SERVER_URL=https://api.brizco.app +NEXT_PUBLIC_PUBLIC_URL=https://api.brizco.app +NEXT_PUBLIC_API_URL=https://api.brizco.app/api NEXT_PUBLIC_VERSION=1.0.3.4 \ No newline at end of file diff --git a/Dockerfile.emergency b/Dockerfile.emergency index a9548a0..29ec79a 100644 --- a/Dockerfile.emergency +++ b/Dockerfile.emergency @@ -14,5 +14,5 @@ CMD ["/app/node_modules/.bin/next", "start"] -# docker build -f Dockerfile.emergency -t registry.vnfco.ir/brizco/web:1.0.5.6 . -# docker push registry.vnfco.ir/brizco/web:1.0.5.6 \ No newline at end of file +# docker build -f Dockerfile.emergency -t registry.vnfco.ir/brizco/web:1.0.7.9 . +# docker push registry.vnfco.ir/brizco/web:1.0.7.9 \ No newline at end of file diff --git a/components/AppHeader/page.jsx b/components/AppHeader/page.jsx index 9db6809..3e84487 100644 --- a/components/AppHeader/page.jsx +++ b/components/AppHeader/page.jsx @@ -37,7 +37,7 @@ const AppHeader = ({ const handlelogOut = () => { CTX.setStepLogin(0); localStorage.removeItem("token"); - router.push("/login"); + router.push("/app/login"); }; const attrs = useLongPress(() => handlelogOut(), { @@ -130,7 +130,7 @@ const AppHeader = ({ return (
- +
{userIcon && (
@@ -193,7 +193,7 @@ const AppHeader = ({ )} {notif && ( - + {notifUnreadData > 0 && (
diff --git a/components/NavBar/NavBAr.jsx b/components/NavBar/NavBAr.jsx index 9b3f517..58714ea 100644 --- a/components/NavBar/NavBAr.jsx +++ b/components/NavBar/NavBAr.jsx @@ -43,7 +43,7 @@ const NavBAr = (props) => {
{HasPermission("ViewDashboard", permissions) && ( - + <> {usePath.includes("/home") ? (
@@ -86,7 +86,7 @@ const NavBAr = (props) => { )} {HasPermission("ViewShiftPlans", permissions) && ( - + <> {usePath.includes("/shifts") ? (
@@ -144,7 +144,7 @@ const NavBAr = (props) => { )} {HasPermission("ViewComplexSettings", permissions) && ( - + <> {usePath.includes("/employees") ? (
@@ -164,7 +164,7 @@ const NavBAr = (props) => { )} {HasPermission("ViewActivities", permissions) && ( - + <> {notifUnreadData > 0 && (
diff --git a/components/UnderDevelopeTimer.jsx b/components/UnderDevelopeTimer.jsx index 28cdf0f..d420aa5 100644 --- a/components/UnderDevelopeTimer.jsx +++ b/components/UnderDevelopeTimer.jsx @@ -75,7 +75,7 @@ const UnderDevelopeTimer = () => {
- +

diff --git a/components/landingComponents/Hero.jsx b/components/landingComponents/Hero.jsx index aa7ceda..2fd31c2 100644 --- a/components/landingComponents/Hero.jsx +++ b/components/landingComponents/Hero.jsx @@ -1,5 +1,6 @@ import { motion } from "framer-motion"; import Link from "next/link"; +import MovingLogos from "./MovingLogos/page"; const Hero = () => { return ( @@ -11,22 +12,31 @@ const Hero = () => {

*/}
-

- Briz -

+
+ + " + +

+ SIMPLE AND SMOOTH OPERATION +

+ + " + +

- " harmonious Routine - Management " + A task and shift management solution for coffee shops that provides + clear, trackable task management and monitoring of store operations.{" "}

- -
-
@@ -34,6 +44,17 @@ const Hero = () => {
{/* */} + +
+

+ Brands that trust us and use BRIZ for their managing. +

+
+ +
+
); }; diff --git a/components/landingComponents/MovingLogos/page.jsx b/components/landingComponents/MovingLogos/page.jsx new file mode 100644 index 0000000..2a6a1de --- /dev/null +++ b/components/landingComponents/MovingLogos/page.jsx @@ -0,0 +1,43 @@ +"use client"; +import Image from "next/image"; +import logobrand1 from "@img/logo/alp.png"; +import logobrand2 from "@img/logo/lam.png"; +import logobrand3 from "@img/logo/tuk.png"; +import logobrand4 from "@img/logo/vi.png"; +import logobrand5 from "@img/logo/woo.png"; + +const MovingLogos = () => { + const logos = [ + { id: 1, logo: logobrand1 }, + { id: 2, logo: logobrand2 }, + { id: 3, logo: logobrand3 }, + { id: 4, logo: logobrand4 }, + { id: 5, logo: logobrand5 }, + { id: 6, logo: logobrand1 }, + { id: 7, logo: logobrand2 }, + { id: 8, logo: logobrand3 }, + { id: 9, logo: logobrand4 }, + { id: 10, logo: logobrand5 }, + ]; + + // Duplicate logos array to ensure seamless infinite scroll + const duplicatedLogos = [...logos, ...logos, ...logos]; // Tripling the logos array + + return ( +
+
+ {duplicatedLogos.map((e, index) => ( +
+ {`Logo +
+ ))} +
+
+ ); +}; + +export default MovingLogos; diff --git a/components/landingComponents/Navbar.jsx b/components/landingComponents/Navbar.jsx index 2e22314..946e67b 100644 --- a/components/landingComponents/Navbar.jsx +++ b/components/landingComponents/Navbar.jsx @@ -31,7 +31,7 @@ const Navbar = () => { return (