Merge pull request #112 from tahmid-saj/dev-redux-toolkit

changing dir structure

src/components/shared/mui/drawer/drawer.component.jsx

@@ -158,10 +158,19 @@ export default function MiniDrawer({ navLinksHeaders, children }) {
  >
  <MenuIcon />
  </IconButton>
-
- <Typography variant="h6" noWrap component="div">
- nutri-sight
- </Typography>
+
+ <div className="nutri-sight-title">
+ <Typography variant="h6" noWrap component="div">
+ nutri-sight
+ </Typography>
+
+ {
+ currentUser ?
+ <Typography variant="body2" noWrap component="div">
+ { `Hello ${currentUser.displayName}` }
+ </Typography> : null
+ }
+ </div>
  </Toolbar>
  </AppBar>
 

src/components/shared/mui/drawer/drawer.styles.scss

@@ -1,3 +1,9 @@
 ion-icon {
  font-size: 23px;
+}
+
+.nutri-sight-title {
+ display: block;
+ justify-content: left;
+ align-items: center;
 }

src/components/shared/recipes/recipes.component.jsx

@@ -1,7 +1,7 @@
-import React, { useRef, useEffect } from "react";
-import ReactDom from "react-dom/client";
+// import React, { useRef, useEffect } from "react";
+// import ReactDom from "react-dom/client";
 
-export default function Recipes() {
- const container = document.getElementById("container");
- const root = ReactDOM.createRoot(container);
-};
+// export default function Recipes() {
+//  const container = document.getElementById("container");
+//  const root = ReactDOM.createRoot(container);
+// };

src/components/shared/chatbot/chatbot.component.jsx → src/pages/shared/chatbot/chatbot.component.jsx

@@ -1,12 +1,12 @@
 import { useState, useContext } from "react"
-import FormInput from "../form-input/form-input.component"
-import Button from "../button/button.component"
+import FormInput from "../../../components/shared/form-input/form-input.component.jsx"
+import Button from "../../../components/shared/button/button.component.jsx"
 import "./chatbot.styles.jsx"
 import { ChatBotContainer, ChatBotInputMessage } from "./chatbot.styles.jsx"
-import ChatBotResponse from "./chatbot-response/chatbot-response.component"
-import { ChatBotContext } from "../../../contexts/shared/chatbot/chatbot.context"
+import ChatBotResponse from "../../../components/shared/chatbot/chatbot-response/chatbot-response.component.jsx"
+import { ChatBotContext } from "../../../contexts/shared/chatbot/chatbot.context.js"
 import { Divider, Typography } from "@mui/material"
-import { ButtonsContainer } from "../button/button.styles.jsx"
+import { ButtonsContainer } from "../../../components/shared/button/button.styles.jsx"
 
 const defaultFormFields = {
  messageInput: ""

src/components/shared/home/home.component.jsx → src/pages/shared/home/home.component.jsx

@@ -1,20 +1,23 @@
 import "./home.styles.jsx";
 import { HomeContainer } from "./home.styles.jsx";
-import MediaCard from "../mui/media-card/media-card.component.jsx"
+import MediaCard from "../../../components/shared/mui/media-card/media-card.component.jsx"
 import { Fragment } from "react";
 
 import { useContext } from "react";
-import { UserContext } from "../../../contexts/shared/user/user.context";
+// import { UserContext } from "../../../contexts/shared/user/user.context";
+import { useSelector } from "react-redux";
+import { selectCurrentUser } from "../../../store/shared/user/user.selector.js";
 
-import { NAV_LINKS } from "../../../utils/constants/shared.constants";
+import { NAV_LINKS } from "../../../utils/constants/shared.constants.js";
 
 const styles = {
  width: 475,
  height: 400,
 }
 
 const Home = () => {
- const { currentUser } = useContext(UserContext)
+ // const { currentUser } = useContext(UserContext)
+ const currentUser = useSelector(selectCurrentUser)
 
  const homeCardContent = {
  chatbot: {

src/components/shared/nutrient-predictor/nutrient-predictor.component.jsx → src/pages/shared/nutrient-predictor/nutrient-predictor.component.jsx

@@ -2,10 +2,10 @@ import "./nutrient-predictor.styles.jsx";
 import { NutrientPredictorContainer, NutrientPredictionInfo } from "./nutrient-predictor.styles"
 
 import React, { Component, useContext } from "react";
-import UploadFoodImage from "./upload-food-image/upload-food-image.component";
-import NutrientsInfo from "./nutrients-info/nutrients-info.component";
+import UploadFoodImage from "../../../components/shared/nutrient-predictor/upload-food-image/upload-food-image.component.jsx";
+import NutrientsInfo from "../../../components/shared/nutrient-predictor/nutrients-info/nutrients-info.component.jsx";
 
-import { NutrientPredictorContext } from "../../../contexts/shared/nutrient-predictor/nutrient-predictor.context";
+import { NutrientPredictorContext } from "../../../contexts/shared/nutrient-predictor/nutrient-predictor.context.js";
 import { Divider, Typography } from "@mui/material";
 
 const NutrientPredictor = () => {

src/components/shared/recipes/components/recipes.component.jsx → src/pages/shared/recipes/recipes.component.jsx

@@ -3,12 +3,12 @@ import { SearchResultsRecipeContainer, SearchResultsMainContainer } from "./reci
 
 import React, { Fragment, Component, useEffect, useContext } from "react";
 
-import Header from "./header/header.component";
-import SearchResults from "./search-results/search-results.component";
-import Recipe from "./recipe/recipe.component";
-import RecipesView from "./recipes-view/recipes-view.component";
+import Header from "../../../components/shared/recipes/components/header/header.component.jsx";
+import SearchResults from "../../../components/shared/recipes/components/search-results/search-results.component.jsx";
+import Recipe from "../../../components/shared/recipes/components/recipe/recipe.component.jsx";
+import RecipesView from "../../../components/shared/recipes/components/recipes-view/recipes-view.component.jsx";
 
-import { RecipesContext } from "../../../../contexts/shared/recipes/recipes.context";
+import { RecipesContext } from "../../../contexts/shared/recipes/recipes.context.js";
 import { Divider, Typography } from "@mui/material";
 
 const Recipes = () => {

src/components/signed-in/calories-burned/calories-burned.component.jsx → src/pages/signed-in/calories-burned/calories-burned.component.jsx

@@ -1,14 +1,14 @@
 import "./calories-burned.styles.scss"
 
-import SummaryInfo from "./summary/summary-info/summary-info.component"
-import ActivityDateFilter from "./summary/activity-date-filter/activity-date-filter.component"
+import SummaryInfo from "../../../components/signed-in/calories-burned/summary/summary-info/summary-info.component"
+import ActivityDateFilter from "../../../components/signed-in/calories-burned/summary/activity-date-filter/activity-date-filter.component"
 
-import CaloriesBurnedGraphPie from "./view/calories-burned-graph/calories-burned-graph-pie.component"
-import CaloriesBurnedGraphLine from "./view/calories-burned-graph/calories-burned-graph-line.component"
-import CaloriesBurnedTable from "./view/calories-burned-table/calories-burned-table.component"
+import CaloriesBurnedGraphPie from "../../../components/signed-in/calories-burned/view/calories-burned-graph/calories-burned-graph-pie.component"
+import CaloriesBurnedGraphLine from "../../../components/signed-in/calories-burned/view/calories-burned-graph/calories-burned-graph-line.component"
+import CaloriesBurnedTable from "../../../components/signed-in/calories-burned/view/calories-burned-table/calories-burned-table.component"
 
-import ActivityDateForm from "./add-activity/activity-date-form/activity-date-form.component"
-import ActivityDateTable from "./add-activity/activity-date-table/activity-date-table.component"
+import ActivityDateForm from "../../../components/signed-in/calories-burned/add-activity/activity-date-form/activity-date-form.component"
+import ActivityDateTable from "../../../components/signed-in/calories-burned/add-activity/activity-date-table/activity-date-table.component"
 
 import { Fragment, useContext } from "react"
 import { CaloriesBurnedContext } from "../../../contexts/signed-in/calories-burned/calories-burned.context"

src/components/signed-in/dashboard/dashboard.component.jsx → src/pages/signed-in/dashboard/dashboard.component.jsx

@@ -1,10 +1,10 @@
-import CaloriesBurnedGraphPie from "./calories-burned/calories-burned-graph/calories-burned-graph-pie.component"
-import CaloriesBurnedGraph from "./calories-burned/calories-burned-graph/calories-burned-graph.component"
-import CaloriesBurnedSummary from "./calories-burned/calories-burned-summary/calories-burned-summary.component"
+import CaloriesBurnedGraphPie from "../../../components/signed-in/dashboard/calories-burned/calories-burned-graph/calories-burned-graph-pie.component"
+import CaloriesBurnedGraph from "../../../components/signed-in/dashboard/calories-burned/calories-burned-graph/calories-burned-graph.component"
+import CaloriesBurnedSummary from "../../../components/signed-in/dashboard/calories-burned/calories-burned-summary/calories-burned-summary.component"
 import "./dashboard.styles.scss"
-import NutritionTrackerGraphCalories from "./nutrition-tracker/nutrition-tracker-graph-calories/nutrition-tracker-graph-calories.component"
-import NutritionTrackerGraphMacronutrients from "./nutrition-tracker/nutrition-tracker-graph-macronutrients/nutrition-tracker-graph-macronutrients.component"
-import NutritionTrackerSummary from "./nutrition-tracker/nutrition-tracker-summary/nutrition-tracker-summary.component"
+import NutritionTrackerGraphCalories from "../../../components/signed-in/dashboard/nutrition-tracker/nutrition-tracker-graph-calories/nutrition-tracker-graph-calories.component"
+import NutritionTrackerGraphMacronutrients from "../../../components/signed-in/dashboard/nutrition-tracker/nutrition-tracker-graph-macronutrients/nutrition-tracker-graph-macronutrients.component"
+import NutritionTrackerSummary from "../../../components/signed-in/dashboard/nutrition-tracker/nutrition-tracker-summary/nutrition-tracker-summary.component"
 
 import { useContext, Fragment } from "react"
 import { NutritionTrackerContext } from "../../../contexts/signed-in/nutrition-tracker/nutrition-tracker.context"

src/components/signed-in/nutrition-tracker/nutrition-tracker.component.jsx → src/pages/signed-in/nutrition-tracker/nutrition-tracker.component.jsx

@@ -1,13 +1,13 @@
 import React, { Component, useContext, Fragment } from "react";
 
-import Summary from "./summary/summary.component";
+import Summary from "../../../components/signed-in/nutrition-tracker/summary/summary.component";
 
 import "./nutrition-tracker.styles.scss";
-import SearchDays from "./search-days/search-days.component";
-import UpdateConsumptionForm from "./update-consumption-form/update-consumption-form.component";
-import ConsumptionInfo from "./consumption-info/consumption-info.component";
+import SearchDays from "../../../components/signed-in/nutrition-tracker/search-days/search-days.component";
+import UpdateConsumptionForm from "../../../components/signed-in/nutrition-tracker/update-consumption-form/update-consumption-form.component";
+import ConsumptionInfo from "../../../components/signed-in/nutrition-tracker/consumption-info/consumption-info.component";
 
-import TopSearch from "./top-search/top-search.component";
+import TopSearch from "../../../components/signed-in/nutrition-tracker/top-search/top-search.component";
 
 import { NutritionTrackerContext } from "../../../contexts/signed-in/nutrition-tracker/nutrition-tracker.context";
 

src/components/signed-out/calories-burned/calories-burned.component.jsx → src/pages/signed-out/calories-burned/calories-burned.component.jsx

@@ -1,14 +1,14 @@
 import "./calories-burned.styles.scss"
 
-import SummaryInfo from "./summary/summary-info/summary-info.component"
-import ActivityDateFilter from "./summary/activity-date-filter/activity-date-filter.component"
+import SummaryInfo from "../../../components/signed-out/calories-burned/summary/summary-info/summary-info.component"
+import ActivityDateFilter from "../../../components/signed-out/calories-burned/summary/activity-date-filter/activity-date-filter.component"
 
-import CaloriesBurnedGraphPie from "./view/calories-burned-graph/calories-burned-graph-pie.component"
-import CaloriesBurnedGraphLine from "./view/calories-burned-graph/calories-burned-graph-line.component"
-import CaloriesBurnedTable from "./view/calories-burned-table/calories-burned-table.component"
+import CaloriesBurnedGraphPie from "../../../components/signed-out/calories-burned/view/calories-burned-graph/calories-burned-graph-pie.component"
+import CaloriesBurnedGraphLine from "../../../components/signed-out/calories-burned/view/calories-burned-graph/calories-burned-graph-line.component"
+import CaloriesBurnedTable from "../../../components/signed-out/calories-burned/view/calories-burned-table/calories-burned-table.component"
 
-import ActivityDateForm from "./add-activity/activity-date-form/activity-date-form.component"
-import ActivityDateTable from "./add-activity/activity-date-table/activity-date-table.component"
+import ActivityDateForm from "../../../components/signed-out/calories-burned/add-activity/activity-date-form/activity-date-form.component"
+import ActivityDateTable from "../../../components/signed-out/calories-burned/add-activity/activity-date-table/activity-date-table.component"
 
 import { Fragment, useContext } from "react"
 import { CaloriesBurnedContext } from "../../../contexts/signed-out/calories-burned/calories-burned.context"

src/components/signed-out/dashboard/dashboard.component.jsx → src/pages/signed-out/dashboard/dashboard.component.jsx

@@ -1,10 +1,10 @@
-import CaloriesBurnedGraphPie from "./calories-burned/calories-burned-graph/calories-burned-graph-pie.component"
-import CaloriesBurnedGraph from "./calories-burned/calories-burned-graph/calories-burned-graph.component"
-import CaloriesBurnedSummary from "./calories-burned/calories-burned-summary/calories-burned-summary.component"
+import CaloriesBurnedGraphPie from "../../../components/signed-out/dashboard/calories-burned/calories-burned-graph/calories-burned-graph-pie.component"
+import CaloriesBurnedGraph from "../../../components/signed-out/dashboard/calories-burned/calories-burned-graph/calories-burned-graph.component"
+import CaloriesBurnedSummary from "../../../components/signed-out/dashboard/calories-burned/calories-burned-summary/calories-burned-summary.component"
 import "./dashboard.styles.scss"
-import NutritionTrackerGraphCalories from "./nutrition-tracker/nutrition-tracker-graph-calories/nutrition-tracker-graph-calories.component"
-import NutritionTrackerGraphMacronutrients from "./nutrition-tracker/nutrition-tracker-graph-macronutrients/nutrition-tracker-graph-macronutrients.component"
-import NutritionTrackerSummary from "./nutrition-tracker/nutrition-tracker-summary/nutrition-tracker-summary.component"
+import NutritionTrackerGraphCalories from "../../../components/signed-out/dashboard/nutrition-tracker/nutrition-tracker-graph-calories/nutrition-tracker-graph-calories.component"
+import NutritionTrackerGraphMacronutrients from "../../../components/signed-out/dashboard/nutrition-tracker/nutrition-tracker-graph-macronutrients/nutrition-tracker-graph-macronutrients.component"
+import NutritionTrackerSummary from "../../../components/signed-out/dashboard/nutrition-tracker/nutrition-tracker-summary/nutrition-tracker-summary.component"
 
 import { useContext, Fragment } from "react"
 import { NutritionTrackerContext } from "../../../contexts/signed-out/nutrition-tracker/nutrition-tracker.context"

src/components/signed-out/nutrition-tracker/nutrition-tracker.component.jsx → src/pages/signed-out/nutrition-tracker/nutrition-tracker.component.jsx

@@ -1,13 +1,13 @@
 import React, { Component, useEffect, Fragment } from "react";
 
-import Summary from "./summary/summary.component";
+import Summary from "../../../components/signed-out/nutrition-tracker/summary/summary.component";
 
 import "./nutrition-tracker.styles.scss";
-import SearchDays from "./search-days/search-days.component";
-import UpdateConsumptionForm from "./update-consumption-form/update-consumption-form.component";
-import ConsumptionInfo from "./consumption-info/consumption-info.component";
+import SearchDays from "../../../components/signed-out/nutrition-tracker/search-days/search-days.component";
+import UpdateConsumptionForm from "../../../components/signed-out/nutrition-tracker/update-consumption-form/update-consumption-form.component";
+import ConsumptionInfo from "../../../components/signed-out/nutrition-tracker/consumption-info/consumption-info.component";
 
-import TopSearch from "./top-search/top-search.component";
+import TopSearch from "../../../components/signed-out/nutrition-tracker/top-search/top-search.component";
 
 // import { NutritionTrackerContext } from "../../../contexts/signed-out/nutrition-tracker/nutrition-tracker.context";
 import { useDispatch, useSelector } from "react-redux"

src/routes/shared/home/home.component.jsx

@@ -1,6 +1,6 @@
 import { Outlet } from "react-router-dom";
 
-import Home from "../../../components/shared/home/home.component";
+import Home from "../../../pages/shared/home/home.component";
 
 import "./home.styles.scss";
 

src/routes/shared/nutrient-predictor/nutrient-predictor.component.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 
 import "./nutrient-predictor.styles.scss";
-import NutrientPredictor from '../../../components/shared/nutrient-predictor/nutrient-predictor.component';
+import NutrientPredictor from '../../../pages/shared/nutrient-predictor/nutrient-predictor.component';
 
 const NutrientPredictorRoute = () => {
  return (

src/routes/shared/recipes/recipes.component.jsx

@@ -1,6 +1,6 @@
 import "./recipes.styles.scss";
 
-import Recipes from "../../../components/shared/recipes/components/recipes.component";
+import Recipes from "../../../pages/shared/recipes/recipes.component";
 
 const RecipesRoute = () => {
  return (

src/routes/signed-in/calories-burned/calories-burned.component.jsx

@@ -1,4 +1,4 @@
-import CaloriesBurned from "../../../components/signed-in/calories-burned/calories-burned.component";
+import CaloriesBurned from "../../../pages/signed-in/calories-burned/calories-burned.component";
 import "./calories-burned.styles.scss";
 
 

src/routes/signed-in/dashboard/dashboard.component.jsx

@@ -1,5 +1,5 @@
 import "./dashboard.styles.scss"
-import Dashboard from "../../../components/signed-in/dashboard/dashboard.component"
+import Dashboard from "../../../pages/signed-in/dashboard/dashboard.component"
 
 const DashboardRouteSignedIn = () => {
  return (

src/routes/signed-in/nutrition-tracker/nutrition-tracker.component.jsx

@@ -1,6 +1,6 @@
 import "./nutrition-tracker.styles.scss";
 
-import NutritionTracker from "../../../components/signed-in/nutrition-tracker/nutrition-tracker.component";
+import NutritionTracker from "../../../pages/signed-in/nutrition-tracker/nutrition-tracker.component";
 
 const NutritionTrackerRouteSignedIn = () => {
  return (

src/routes/signed-out/calories-burned/calories-burned.component.jsx

@@ -1,6 +1,6 @@
 import "./calories-burned.styles.scss";
 
-import CaloriesBurned from "../../../components/signed-out/calories-burned/calories-burned.component";
+import CaloriesBurned from "../../../pages/signed-out/calories-burned/calories-burned.component";
 
 const CaloriesBurnedRoute = () => {
  return (

src/routes/signed-out/dashboard/dashboard.component.jsx

@@ -1,5 +1,5 @@
 import "./dashboard.styles.scss"
-import Dashboard from "../../../components/signed-out/dashboard/dashboard.component"
+import Dashboard from "../../../pages/signed-out/dashboard/dashboard.component"
 
 const DashboardRoute = () => {
  return (

src/routes/signed-out/nutrition-tracker/nutrition-tracker.component.jsx

@@ -1,6 +1,5 @@
 import "./nutrition-tracker.styles.scss";
-
-import NutritionTracker from "../../../components/signed-out/nutrition-tracker/nutrition-tracker.component";
+import NutritionTracker from "../../../pages/signed-out/nutrition-tracker/nutrition-tracker.component";
 
 const NutritionTrackerRoute = () => {
  return (