diff --git a/src/App.tsx b/src/App.tsx index ac8d42bc..644e8f67 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -23,7 +23,7 @@ import useSamsungBrowserWarning from "./hooks/useSamsungBrowserWarning"; import InternetStatusDetector from "./components/InternetStatusDetector"; import "./App.css"; -import LayoutWithFooter from "./new-ui/appointment/components/FooterLayout"; +import LayoutWithNavigation from "./new-ui/appointment/components/FooterLayout"; const preventPinchZoom = (event: TouchEvent) => { if (event.touches.length > 1) event.preventDefault(); @@ -69,9 +69,9 @@ function App() { )} > - + - + diff --git a/src/apps/appointment/utils/types.ts b/src/apps/appointment/utils/types.ts index 85d2d162..689ea25c 100644 --- a/src/apps/appointment/utils/types.ts +++ b/src/apps/appointment/utils/types.ts @@ -336,3 +336,7 @@ export interface IAcademyCategory { [videoTitle: string]: string[] | IAcademyCategory; }; } + +export type ISubmitFeeling={ + feeling:number +} diff --git a/src/new-ui/appointment/assets/appointmentIconBig.svg b/src/new-ui/appointment/assets/appointmentIconBig.svg new file mode 100644 index 00000000..2665d5f4 --- /dev/null +++ b/src/new-ui/appointment/assets/appointmentIconBig.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/new-ui/appointment/assets/appointmentIconSmall.svg b/src/new-ui/appointment/assets/appointmentIconSmall.svg new file mode 100644 index 00000000..9efdb75d --- /dev/null +++ b/src/new-ui/appointment/assets/appointmentIconSmall.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/new-ui/appointment/assets/navAppointment.svg b/src/new-ui/appointment/assets/navAppointment.svg deleted file mode 100644 index 0bd7e21a..00000000 --- a/src/new-ui/appointment/assets/navAppointment.svg +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/new-ui/appointment/assets/navProfile.svg b/src/new-ui/appointment/assets/navProfile.svg deleted file mode 100644 index e5f8a744..00000000 --- a/src/new-ui/appointment/assets/navProfile.svg +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/new-ui/appointment/assets/navReport.svg b/src/new-ui/appointment/assets/navReport.svg deleted file mode 100644 index 4f32c6af..00000000 --- a/src/new-ui/appointment/assets/navReport.svg +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/new-ui/appointment/assets/navSalona.svg b/src/new-ui/appointment/assets/navSalona.svg deleted file mode 100644 index 6e00f71f..00000000 --- a/src/new-ui/appointment/assets/navSalona.svg +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/new-ui/appointment/assets/navShare.svg b/src/new-ui/appointment/assets/navShare.svg deleted file mode 100644 index fba88178..00000000 --- a/src/new-ui/appointment/assets/navShare.svg +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/new-ui/appointment/assets/profileIconBig.svg b/src/new-ui/appointment/assets/profileIconBig.svg new file mode 100644 index 00000000..de6566fe --- /dev/null +++ b/src/new-ui/appointment/assets/profileIconBig.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/new-ui/appointment/assets/profileIconSmall.svg b/src/new-ui/appointment/assets/profileIconSmall.svg new file mode 100644 index 00000000..59b6f865 --- /dev/null +++ b/src/new-ui/appointment/assets/profileIconSmall.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/new-ui/appointment/assets/reportIconBig.svg b/src/new-ui/appointment/assets/reportIconBig.svg new file mode 100644 index 00000000..e6ad248c --- /dev/null +++ b/src/new-ui/appointment/assets/reportIconBig.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/new-ui/appointment/assets/reportIconSmall.svg b/src/new-ui/appointment/assets/reportIconSmall.svg new file mode 100644 index 00000000..bb034aee --- /dev/null +++ b/src/new-ui/appointment/assets/reportIconSmall.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/new-ui/appointment/assets/salonaIconBig.svg b/src/new-ui/appointment/assets/salonaIconBig.svg new file mode 100644 index 00000000..f777658b --- /dev/null +++ b/src/new-ui/appointment/assets/salonaIconBig.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/new-ui/appointment/assets/salonaIconSmall.svg b/src/new-ui/appointment/assets/salonaIconSmall.svg new file mode 100644 index 00000000..0600e01d --- /dev/null +++ b/src/new-ui/appointment/assets/salonaIconSmall.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/new-ui/appointment/assets/shareIconBig.svg b/src/new-ui/appointment/assets/shareIconBig.svg new file mode 100644 index 00000000..24633e93 --- /dev/null +++ b/src/new-ui/appointment/assets/shareIconBig.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/new-ui/appointment/assets/shareIconSmall.svg b/src/new-ui/appointment/assets/shareIconSmall.svg new file mode 100644 index 00000000..de4c6d8d --- /dev/null +++ b/src/new-ui/appointment/assets/shareIconSmall.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/new-ui/appointment/components/Footer.tsx b/src/new-ui/appointment/components/Footer.tsx deleted file mode 100644 index 03d8e5d0..00000000 --- a/src/new-ui/appointment/components/Footer.tsx +++ /dev/null @@ -1,64 +0,0 @@ -import { useLocation, useNavigate } from "react-router-dom"; - -import navAppointment from "../assets/navAppointment.svg"; -import navReport from "../assets/navReport.svg"; -import navSalona from "../assets/navSalona.svg"; -import navShare from "../assets/navShare.svg"; -import navProfile from "../assets/navProfile.svg"; - -const tabs = [ - { - id: 1, - icon: navProfile, - path: "/profile", - }, - { - id: 2, - icon: navShare, - path: "/share", - }, - { - id: 3, - icon: navSalona, - path: "/explore", - }, - { - id: 4, - icon: navReport, - path: "/report", - }, - { - id: 5, - icon: navAppointment, - path: "/appointments", - }, -]; - -const Footer = () => { - const navigate = useNavigate(); - const location = useLocation(); - - const activeTab = - tabs.find((tab) => tab.path === location.pathname) || tabs[2]; // default: explore - - return ( -
- {/* active footer pic */} - footer - -
- {tabs.map((tab) => ( - - ))} -
-
- ); -}; - -export default Footer; diff --git a/src/new-ui/appointment/components/FooterLayout.tsx b/src/new-ui/appointment/components/FooterLayout.tsx index b49ae52c..a6dfa8de 100644 --- a/src/new-ui/appointment/components/FooterLayout.tsx +++ b/src/new-ui/appointment/components/FooterLayout.tsx @@ -1,7 +1,7 @@ import { useLocation } from "react-router-dom"; -import Footer from "@/new-ui/appointment/components/Footer"; +import NavigationBar from "@/new-ui/appointment/components/NavigationBar"; -const LayoutWithFooter = ({ children }: { children: React.ReactNode }) => { +const LayoutWithNavigation = ({ children }: { children: React.ReactNode }) => { const location = useLocation(); const hideFooterPaths = [ "/", @@ -17,9 +17,9 @@ const LayoutWithFooter = ({ children }: { children: React.ReactNode }) => { return ( <> {children} - {shouldShowFooter &&