Merge pull request #69 from chingu-voyages/refactor-and-delete-unused…

…-files

refactor(app-wide): delete unused files and rename and restructure to…

src/App.jsx

@@ -1,15 +1,7 @@
 import Spa from "./routes";
 import makeServer from "./mirageServer/server";
 import { Routes, Route } from "react-router-dom";
-import {
-  Home,
-  Posts,
-  PostDetail,
-  About,
-  Search,
-  RecipeDetailsPage,
-  Components,
-} from "@/pages";
+import { Home, About, Search, RecipeDetails, Components } from "@/pages";
 // Please keep on when possible to avoid using up our Tasty API free quota
 // All api calls will be intercepted and fulfilled by the mirage server.
 const USE_MIRAGE_API = true;
@@ -24,11 +16,9 @@ function App() {
       <Route element={<Spa />}>
         <Route path="/" element={<Home />} />
         <Route path="/about" element={<About />} />
-        <Route path="/posts" element={<Posts />} />
-        <Route path="/posts/:postId" element={<PostDetail />} />
         <Route path="/search" element={<Search />} />
         <Route path="/recipes">
-          <Route path=":recipeId" element={<RecipeDetailsPage />} />
+          <Route path=":recipeId" element={<RecipeDetails />} />
         </Route>
         <Route path="/components" element={<Components />} />
       </Route>

src/assets/brand/food/index.js

@@ -0,0 +1,5 @@
+import chickenWings from "./ChickenWings.png";
+import chocoPBChips from "./ChocolateChipPB.png";
+import spicyChickenPizza from "./SpicyChickenPizza.png";
+
+export { chickenWings, chocoPBChips, spicyChickenPizza };

src/assets/brand/index.js

@@ -0,0 +1,5 @@
+import BellPeppers from "./bell-peppers/BellPeppers";
+import YumiWithSpatula from "./yumi-with-spatula/YumiWithSpatula";
+import YumiWithSpoon from "./yumi-with-spoon/YumiWithSpoon";
+
+export { BellPeppers, YumiWithSpatula, YumiWithSpoon };

src/assets/brand/logo/index.js

@@ -0,0 +1,4 @@
+import colorLogo from "./yumyumyes-logo-m.png";
+import creamLogo from "./yumyumyes-logo-lightcream.svg";
+
+export { colorLogo, creamLogo };

src/assets/icons/index.js

@@ -17,6 +17,7 @@ import Stir from "./Stir";
 import Thermometer from "./Thermometer";
 import UpArrow from "./UpArrow";
 import YellowDot from "./YellowDot";
+import github from "./github.png";
 
 export const icons = {
   Close,
@@ -39,3 +40,5 @@ export const icons = {
   UpArrow,
   YellowDot,
 };
+
+export { github };

src/assets/index.js

@@ -1,21 +1,8 @@
-import colorLogo from "./brand/yumyumyes-logo-m.png";
-import creamLogo from "./brand/yumyumyes-logo-lightcream.svg";
-import BellPeppers from "./brand/bell-peppers/BellPeppers";
-import SpicyChickenPizza from "./HomePage/SpicyChickenPizza.png";
-import ChickenWings from "./HomePage/ChickenWingsfood.png";
-import ChocoPBChip from "./HomePage/ChocolateChipPB.png";
 import FeatureRecipe from "./RecipePhoto.png";
-import github from "./github.png";
 
-export {
-  github,
-  colorLogo,
-  creamLogo,
-  SpicyChickenPizza,
-  ChickenWings,
-  ChocoPBChip,
-  BellPeppers,
-  FeatureRecipe,
-};
+export { FeatureRecipe };
 
+export * from "./brand";
+export * from "./brand/food";
+export * from "./brand/logo";
 export * from "./icons";

src/features/HomePage/components/Hero-section/heroSection.jsx → src/features/HomePage/components/hero-section/heroSection.jsx

@@ -1,5 +1,5 @@
 import YumiWithSpoon from "@/assets/brand/yumi-with-spoon/YumiWithSpoon.jsx";
-import SvgComponent from "@/assets/HomePage/svgWave";
+import SvgComponent from "@/assets/brand/swooshes/svgWave";
 import { welcome } from "@/constants";
 import { Heading, Button, Icon } from "@/features/ui";
 import { Link } from "react-router-dom";

src/features/HomePage/components/Search-section/SearchSection.jsx → src/features/HomePage/components/search-section/SearchSection.jsx

@@ -1,4 +1,4 @@
-import SvgComponent from "@/assets/HomePage/svgWave";
+import SvgComponent from "@/assets/brand/swooshes/svgWave";
 import { Icon } from "@/features/ui";
 
 import BellPeppers from "@/assets/brand/bell-peppers/BellPeppers.jsx";

src/features/HomePage/components/Top-recipes/topRecipes.jsx → src/features/HomePage/components/top-recipes/topRecipes.jsx

@@ -1,9 +1,12 @@
-// import { BananaLabel, ChickenLabel, FruitLabel } from "@/assets";
-import { ChocoPBChip, SpicyChickenPizza, ChickenWings } from "@/assets";
+import {
+  chickenWings,
+  chocoPBChips,
+  spicyChickenPizza,
+  YumiWithSpatula,
+} from "@/assets";
 
-import { Heading, RecipeLinkCard } from "@/features/ui";
-
-import YumiWithspatula from "@/assets/brand/yumi-with-spatula/YumiWithSpatula";
+import { Heading } from "@/features/ui";
+import { RecipeLinkCard } from "@/features/recipes";
 
 export const TopRecipes = () => {
   return (
@@ -15,27 +18,27 @@ export const TopRecipes = () => {
         <div className="recipe-link-cards-wrapper flex flex-wrap justify-around xl:content-end gap-x-2 gap-y-6 w-[300px] md:w-[50%] lg:w-[63%] xl:w-[75%]">
           <RecipeLinkCard
             text="Choco PB Chip Banana Muffins"
-            src={ChocoPBChip}
+            src={chocoPBChips}
             variant="banana"
             link="/recipes/5813"
           />
 
           <RecipeLinkCard
             text="Spicy Chicken Pizza"
-            src={SpicyChickenPizza}
+            src={spicyChickenPizza}
             variant="watermelon"
             link="/recipes/5149"
           />
 
           <RecipeLinkCard
             text="Chicken Wings"
-            src={ChickenWings}
+            src={chickenWings}
             variant="tangerine"
             link="/recipes/5232"
           />
         </div>
 
-        <YumiWithspatula
+        <YumiWithSpatula
           resolution="272"
           className="w-[272px] self-center xl:-mt-24 xl:max-w-[22%]"
           alt="Yumi holding a spatula surrounded by fruits"

src/features/HomePage/index.js

@@ -1,4 +1,3 @@
-export * from "./components/Hero-section";
-export * from "./components/Search-section";
-export * from "./components/Top-recipes";
-export * from "../HomePage/components/Hero-section";
+export * from "./components/hero-section";
+export * from "./components/search-section";
+export * from "./components/top-recipes";

src/features/ui/RecipeLinkCard/RecipeLinkCard.jsx → src/features/recipes/components/recipe-link-card/RecipeLinkCard.jsx

@@ -54,5 +54,5 @@ RecipeLinkCard.propTypes = {
   bgColor: PropTypes.string,
   text: PropTypes.string,
   variant: PropTypes.string,
-  bgGradient: PropTypes,
+  bgGradient: PropTypes.string,
 };

src/features/recipes/index.js

@@ -1,3 +1,4 @@
 export * from "./api";
 export * from "./components/recipe-list";
 export * from "./components/feature-of-the-day";
+export * from "./components/recipe-link-card";

src/features/ui/index.js

@@ -8,4 +8,3 @@ export * from "./Button";
 export * from "./Picture";
 export * from "./LoadingState";
 export * from "../HomePage";
-export * from "./RecipeLinkCard";