From de0bd786659328ded56a3a8aae77e43670daf79c Mon Sep 17 00:00:00 2001 From: erenfn Date: Tue, 10 Sep 2024 03:14:18 +0300 Subject: [PATCH 1/2] solved 192 --- frontend/src/App.jsx | 36 ++++----- frontend/src/scenes/bannerPage/BannerPage.jsx | 67 ++++++++-------- frontend/src/scenes/dashboard/Dashboard.jsx | 4 +- .../scenes/dashboard/Dashboard.module.scss | 1 + frontend/src/scenes/hints/CreateHintPage.jsx | 60 +++++++-------- frontend/src/scenes/hints/HintDefaultPage.jsx | 3 - frontend/src/scenes/hints/HintPage.jsx | 69 ++++++++--------- frontend/src/scenes/home/Home.css | 3 - frontend/src/scenes/home/Home.jsx | 10 +-- .../src/scenes/links/LinksDefaultPage.jsx | 4 - frontend/src/scenes/popup/CreatePopupPage.jsx | 77 +++++++++---------- .../src/scenes/popup/PopupDefaultPage.jsx | 5 +- .../src/scenes/tours/ToursDefaultPage.jsx | 5 +- .../DefaultPageTemplate.jsx | 4 +- .../HomePageTemplate/HomePageTemplate.jsx | 6 +- frontend/src/utils/constants.js | 4 +- 16 files changed, 161 insertions(+), 197 deletions(-) delete mode 100644 frontend/src/scenes/home/Home.css diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx index 4fe5d3b8..4bbd512c 100644 --- a/frontend/src/App.jsx +++ b/frontend/src/App.jsx @@ -20,38 +20,38 @@ import HintPage from "./scenes/hints/HintPage"; import CreatePopupPage from "./scenes/popup/CreatePopupPage"; import { Error404 } from "./scenes/errors/404"; import { Error403 } from "./scenes/errors/403"; +import HomePageTemplate from "./templates/HomePageTemplate/HomePageTemplate"; function App() { - const { isLoggedIn } = useAuth(); //commented out for testing - // const isLoggedIn = true; + const { isLoggedIn } = useAuth(); + return ( <> - : } - /> - {/* } /> */} - {/* } /> */} + : }> + } /> + } /> + } /> + } /> + } /> + } /> + } /> + } /> + } /> + } /> + + } /> } /> } /> } /> } /> } /> + } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> } /> } /> - + ); } diff --git a/frontend/src/scenes/bannerPage/BannerPage.jsx b/frontend/src/scenes/bannerPage/BannerPage.jsx index 7e399fb5..3d1d29d6 100644 --- a/frontend/src/scenes/bannerPage/BannerPage.jsx +++ b/frontend/src/scenes/bannerPage/BannerPage.jsx @@ -63,8 +63,8 @@ const BannerPage = () => { }; try { const response = location.state?.isEdit - ? await editBanner(location.state?.id, bannerData) - : await addBanner(bannerData); + ? await editBanner(location.state?.id, bannerData) + : await addBanner(bannerData); const toastMessage = location.state?.isEdit ? 'You edited this banner' : 'New banner saved' toastEmitter.emit(TOAST_EMITTER_KEY, toastMessage); navigate('/banner'); @@ -78,39 +78,36 @@ const BannerPage = () => { } return ( -
- - - } - leftContent={() => - } - leftAppearance={() => ( - - )} /> - -
+ + + } + leftContent={() => + } + leftAppearance={() => ( + + )} /> ); }; diff --git a/frontend/src/scenes/dashboard/Dashboard.jsx b/frontend/src/scenes/dashboard/Dashboard.jsx index b4a54d87..1b9cfd92 100644 --- a/frontend/src/scenes/dashboard/Dashboard.jsx +++ b/frontend/src/scenes/dashboard/Dashboard.jsx @@ -29,7 +29,7 @@ const Dashboard = ({ fullName }) => { }, ]; return ( - <> +
@@ -40,9 +40,7 @@ const Dashboard = ({ fullName }) => {
-
- ); }; diff --git a/frontend/src/scenes/dashboard/Dashboard.module.scss b/frontend/src/scenes/dashboard/Dashboard.module.scss index 8b3fcba9..ddc245bd 100644 --- a/frontend/src/scenes/dashboard/Dashboard.module.scss +++ b/frontend/src/scenes/dashboard/Dashboard.module.scss @@ -4,6 +4,7 @@ width: 100%; padding: 3rem; gap:1.5rem; + .top{ display: flex; justify-content: space-between; diff --git a/frontend/src/scenes/hints/CreateHintPage.jsx b/frontend/src/scenes/hints/CreateHintPage.jsx index d7e32619..7961b164 100644 --- a/frontend/src/scenes/hints/CreateHintPage.jsx +++ b/frontend/src/scenes/hints/CreateHintPage.jsx @@ -1,5 +1,4 @@ import React, { useState } from "react"; -import HomePageTemplate from "../../templates/HomePageTemplate/HomePageTemplate"; import GuideTemplate from "../../templates/GuideTemplate/GuideTemplate"; import RichTextEditor from "../../components/RichTextEditor/RichTextEditor"; import HintLeftContent from "../../components/HintPageComponents/HintLeftContent/HintLeftContent"; @@ -48,38 +47,35 @@ const HintPage = () => { ]; return ( -
- - ( - - )} - leftContent={() => ( - - )} - leftAppearance={() => } + + ( + + )} + leftContent={() => ( + - -
+ )} + leftAppearance={() => } + /> ); }; diff --git a/frontend/src/scenes/hints/HintDefaultPage.jsx b/frontend/src/scenes/hints/HintDefaultPage.jsx index e5e69684..fb9d1a39 100644 --- a/frontend/src/scenes/hints/HintDefaultPage.jsx +++ b/frontend/src/scenes/hints/HintDefaultPage.jsx @@ -1,5 +1,4 @@ import CreateActivityButton from "../../components/Button/CreateActivityButton/CreateActivityButton" -import HomePageTemplate from "../../templates/HomePageTemplate/HomePageTemplate" import { ACTIVITY_TYPES } from "../../data/CreateActivityButtonData"; import ParagraphCSS from "../../components/ParagraphCSS/ParagraphCSS"; import { useNavigate } from "react-router"; @@ -14,7 +13,6 @@ const HintDefaultPage = () => { "align-items": "center", }; return ( -
{ onClick={() => navigate("/hint/create")} />
- ); }; diff --git a/frontend/src/scenes/hints/HintPage.jsx b/frontend/src/scenes/hints/HintPage.jsx index 0ca304dc..710465f9 100644 --- a/frontend/src/scenes/hints/HintPage.jsx +++ b/frontend/src/scenes/hints/HintPage.jsx @@ -1,7 +1,6 @@ import React from "react"; import Button from "../../components/Button/Button"; import List from "../../components/TourComponents/List/List"; -import HomePageTemplate from "../../templates/HomePageTemplate/HomePageTemplate"; import HintDefaultPage from "./HintDefaultPage"; import "./HintPage.css"; import { useNavigate } from "react-router-dom"; @@ -25,43 +24,41 @@ const HintPage = () => { return ; } else { return ( - -
-
-

All Hints

- { }} /> -
-
-
- +
); } }; diff --git a/frontend/src/scenes/home/Home.css b/frontend/src/scenes/home/Home.css deleted file mode 100644 index 119ec63a..00000000 --- a/frontend/src/scenes/home/Home.css +++ /dev/null @@ -1,3 +0,0 @@ -.content{ - display: inline-block; -} \ No newline at end of file diff --git a/frontend/src/scenes/home/Home.jsx b/frontend/src/scenes/home/Home.jsx index 0e7d2d99..1c6044ee 100644 --- a/frontend/src/scenes/home/Home.jsx +++ b/frontend/src/scenes/home/Home.jsx @@ -1,6 +1,4 @@ -import HomePageTemplate from "../../templates/HomePageTemplate/HomePageTemplate"; import Dashboard from "../dashboard/Dashboard"; -import "./Home.css"; import React, { useEffect, useState } from 'react'; import { getCurrentUser } from '../../services/loginServices'; import Cookies from 'js-cookie'; @@ -18,13 +16,7 @@ const Home = () => { }, [fullName]); return ( -
-
- - - -
-
+ ); }; diff --git a/frontend/src/scenes/links/LinksDefaultPage.jsx b/frontend/src/scenes/links/LinksDefaultPage.jsx index 0eb76908..4481be37 100644 --- a/frontend/src/scenes/links/LinksDefaultPage.jsx +++ b/frontend/src/scenes/links/LinksDefaultPage.jsx @@ -1,5 +1,4 @@ import CreateActivityButton from "../../components/Button/CreateActivityButton/CreateActivityButton" -import HomePageTemplate from "../../templates/HomePageTemplate/HomePageTemplate" import { ACTIVITY_TYPES } from "../../data/CreateActivityButtonData"; import ParagraphCSS from "../../components/ParagraphCSS/ParagraphCSS"; @@ -12,13 +11,10 @@ const LinksDefaultPage = () => { "align-items": "center", } return ( -
- - ) } diff --git a/frontend/src/scenes/popup/CreatePopupPage.jsx b/frontend/src/scenes/popup/CreatePopupPage.jsx index 3fa57436..2b9e16ce 100644 --- a/frontend/src/scenes/popup/CreatePopupPage.jsx +++ b/frontend/src/scenes/popup/CreatePopupPage.jsx @@ -87,9 +87,9 @@ const CreatePopupPage = () => { }; try { const response = location.state?.isEdit - ? await editPopup(location.state?.id, popupData) - : await addPopup(popupData); - + ? await editPopup(location.state?.id, popupData) + : await addPopup(popupData); + const toastMessage = location.state?.isEdit ? 'You edited this popup' : 'New popup Saved' toastEmitter.emit(TOAST_EMITTER_KEY, toastMessage) @@ -109,44 +109,39 @@ const CreatePopupPage = () => { }; return ( -
- - - } - leftContent={() => - } - leftAppearance={() => ( - - )} /> - - -
+ + } + leftContent={() => + } + leftAppearance={() => ( + + )} /> ); }; diff --git a/frontend/src/scenes/popup/PopupDefaultPage.jsx b/frontend/src/scenes/popup/PopupDefaultPage.jsx index 20cc2d85..5da97c27 100644 --- a/frontend/src/scenes/popup/PopupDefaultPage.jsx +++ b/frontend/src/scenes/popup/PopupDefaultPage.jsx @@ -1,6 +1,5 @@ import React, { useState, useEffect } from 'react'; import CreateActivityButton from "../../components/Button/CreateActivityButton/CreateActivityButton"; -import HomePageTemplate from "../../templates/HomePageTemplate/HomePageTemplate"; import { ACTIVITY_TYPES } from "../../data/CreateActivityButtonData"; import ParagraphCSS from "../../components/ParagraphCSS/ParagraphCSS"; import { useNavigate } from 'react-router-dom'; @@ -73,7 +72,7 @@ const PopupDefaultPage = () => { return ( - + <> {popups.length === 0 ? (
@@ -88,7 +87,7 @@ const PopupDefaultPage = () => { type={ACTIVITY_TYPES_INFO.POPUPS} onClick={navigateToCreate}/> )} - + ); } diff --git a/frontend/src/scenes/tours/ToursDefaultPage.jsx b/frontend/src/scenes/tours/ToursDefaultPage.jsx index 321a8292..37d0517f 100644 --- a/frontend/src/scenes/tours/ToursDefaultPage.jsx +++ b/frontend/src/scenes/tours/ToursDefaultPage.jsx @@ -1,6 +1,5 @@ import React, { useState } from 'react'; import CreateActivityButton from "../../components/Button/CreateActivityButton/CreateActivityButton"; -import HomePageTemplate from "../../templates/HomePageTemplate/HomePageTemplate"; import { ACTIVITY_TYPES } from "../../data/CreateActivityButtonData"; import ParagraphCSS from "../../components/ParagraphCSS/ParagraphCSS"; import TourPage from './ProductTour'; @@ -21,7 +20,7 @@ const ToursDefaultPage = () => { }; return ( - + <> {showTourPage ? ( ) : ( @@ -30,7 +29,7 @@ const ToursDefaultPage = () => {
)} - + ); }; diff --git a/frontend/src/templates/DefaultPageTemplate/DefaultPageTemplate.jsx b/frontend/src/templates/DefaultPageTemplate/DefaultPageTemplate.jsx index 7f632e02..0d8a6e33 100644 --- a/frontend/src/templates/DefaultPageTemplate/DefaultPageTemplate.jsx +++ b/frontend/src/templates/DefaultPageTemplate/DefaultPageTemplate.jsx @@ -56,7 +56,7 @@ const DefaultPageTemplate = ({ getItems, deleteItem, navigateToCreate, itemType, })); return ( - + <> {items.length === 0 ? (
@@ -72,7 +72,7 @@ const DefaultPageTemplate = ({ getItems, deleteItem, navigateToCreate, itemType, onClick={navigateToCreate} /> )} - + ); }; diff --git a/frontend/src/templates/HomePageTemplate/HomePageTemplate.jsx b/frontend/src/templates/HomePageTemplate/HomePageTemplate.jsx index 4f793e5b..a0e30987 100644 --- a/frontend/src/templates/HomePageTemplate/HomePageTemplate.jsx +++ b/frontend/src/templates/HomePageTemplate/HomePageTemplate.jsx @@ -2,17 +2,17 @@ import React from 'react'; import LeftMenu from "../../components/LeftMenu/LeftMenu"; import Header from "../../components/Header/Header"; import "./HomePageTemplate.css"; +import { Outlet } from "react-router-dom"; -const HomePageTemplate = ({ children}) => { +const HomePageTemplate = () => { return (
- {children} - {/* some content */} +
); diff --git a/frontend/src/utils/constants.js b/frontend/src/utils/constants.js index e7a23573..efe34050 100644 --- a/frontend/src/utils/constants.js +++ b/frontend/src/utils/constants.js @@ -1,8 +1,8 @@ // API constants //local environment -// export const API_BASE_URL = 'http://localhost:3000/'; +export const API_BASE_URL = 'http://localhost:3000/'; //staging environment -export const API_BASE_URL = 'https://onboarding-demo.bluewavelabs.ca/api/'; +// export const API_BASE_URL = 'https://onboarding-demo.bluewavelabs.ca/api/'; // Other constants export const APP_TITLE = 'Bluewave Onboarding'; export const SUPPORT_EMAIL = 'support@bluewave.com'; \ No newline at end of file From 2b575c9294bf6f64e3575404facd017c13998455 Mon Sep 17 00:00:00 2001 From: erenfn <81182796+erenfn@users.noreply.github.com> Date: Tue, 10 Sep 2024 15:32:44 +0300 Subject: [PATCH 2/2] Update constants.js --- frontend/src/utils/constants.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/utils/constants.js b/frontend/src/utils/constants.js index efe34050..17aa104a 100644 --- a/frontend/src/utils/constants.js +++ b/frontend/src/utils/constants.js @@ -1,8 +1,8 @@ // API constants //local environment -export const API_BASE_URL = 'http://localhost:3000/'; +// export const API_BASE_URL = 'http://localhost:3000/'; //staging environment -// export const API_BASE_URL = 'https://onboarding-demo.bluewavelabs.ca/api/'; +export const API_BASE_URL = 'https://onboarding-demo.bluewavelabs.ca/api/'; // Other constants export const APP_TITLE = 'Bluewave Onboarding'; -export const SUPPORT_EMAIL = 'support@bluewave.com'; \ No newline at end of file +export const SUPPORT_EMAIL = 'support@bluewave.com';