Merge pull request #17 from bitovi/feature/exercise-routing

Feature/exercise routing
bitovi · Jul 25, 2024 · 786f9f2 · 786f9f2
2 parents ac46b97 + b1a6b52
commit 786f9f2
Show file tree

Hide file tree

Showing 30 changed files with 342 additions and 157 deletions.
diff --git a/.env.example b/.env.example
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -20,6 +20,8 @@
     "packages/*"
   ],
   "dependencies": {
+    "@mantine/code-highlight": "^7.11.2",
+    "react-canvas-confetti": "^2.0.7",
     "webpack": "^5.92.1"
   }
 }
diff --git a/packages/catalog/rsbuild.config.ts b/packages/catalog/rsbuild.config.ts
@@ -46,7 +46,7 @@ export default defineConfig({
           singleton: true,
         },
         "@mantine/emotion": {
-          requiredVersion: false,
+          requiredVersion: "^7.10.2",
           singleton: true,
         },
         "react-router-dom": {

diff --git a/packages/catalog/src/scenes/Filter/components/Categories/Categories.tsx b/packages/catalog/src/scenes/Filter/components/Categories/Categories.tsx
@@ -7,7 +7,7 @@ const categories = [
   ["/shop/men%27s%20clothing", "Men's Clothing"],
   ["/shop/women%27s%20clothing", "Women's Clothing"],
   ["/shop/electronics", "Electronics"],
-  ["/shop/jewelery", "Jewelery"],
+  ["/shop/jewelry", "Jewelry"],
 ];
 
 const Link: FC<{ to: string; text: string }> = ({ to, text }) => {

diff --git a/packages/marketing/rsbuild.config.ts b/packages/marketing/rsbuild.config.ts
@@ -49,7 +49,7 @@ export default defineConfig({
           singleton: true,
         },
         "@mantine/emotion": {
-          requiredVersion: false,
+          requiredVersion: "^7.10.2",
           singleton: true,
         },
         "react-router-dom": {

diff --git a/packages/order/rsbuild.config.ts b/packages/order/rsbuild.config.ts
@@ -46,7 +46,7 @@ export default defineConfig({
           singleton: true,
         },
         "@mantine/emotion": {
-          requiredVersion: false,
+          requiredVersion: "^7.10.2",
           singleton: true,
         },
         "@mantine/notifications": {

diff --git a/packages/profile/rsbuild.config.ts b/packages/profile/rsbuild.config.ts
@@ -40,7 +40,7 @@ export default defineConfig({
           singleton: true,
         },
         "@mantine/emotion": {
-          requiredVersion: false,
+          requiredVersion: "^7.10.2",
           singleton: true,
         },
         "react-router-dom": {

diff --git a/packages/shell/rsbuild.config.ts b/packages/shell/rsbuild.config.ts
@@ -38,7 +38,11 @@ export default defineConfig({
           singleton: true,
         },
         "@mantine/emotion": {
-          requiredVersion: false,
+          requiredVersion: "^7.10.2",
+          singleton: true,
+        },
+        "@mantine/code-highlight": {
+          requiredVersion: "^7.11.2",
           singleton: true,
         },
         "@mantine/notifications": {

diff --git a/packages/shell/src/App.tsx b/packages/shell/src/App.tsx
@@ -5,8 +5,8 @@ import { emotionTransform, MantineEmotionProvider } from "@mantine/emotion";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 
 import { BrowserRouter, Route, Routes } from "react-router-dom";
-import * as Sentry from "@sentry/react";
 import { Notifications } from "@mantine/notifications";
+import * as Sentry from "@sentry/react";
 
 import Layout from "./components/Layout";
 import LayoutNoLogin from "./components/LayoutNoLogin";

diff --git a/packages/shell/src/bootstrap.tsx b/packages/shell/src/bootstrap.tsx
@@ -5,6 +5,7 @@ import App from "./App";
 
 import "@mantine/core/styles.css";
 import "@mantine/notifications/styles.css";
+import "@mantine/code-highlight/styles.css";
 import "./reset.css";
 
 import "./sentry";

diff --git a/packages/workshop/rsbuild.config.ts b/packages/workshop/rsbuild.config.ts
@@ -49,7 +49,11 @@ export default defineConfig({
           singleton: true,
         },
         "@mantine/emotion": {
-          requiredVersion: false,
+          requiredVersion: "^7.10.2",
+          singleton: true,
+        },
+        "@mantine/code-highlight": {
+          requiredVersion: "^7.11.2",
           singleton: true,
         },
         "react-router-dom": {

diff --git a/packages/workshop/src/App.tsx b/packages/workshop/src/App.tsx
@@ -3,9 +3,10 @@ import { MantineEmotionProvider, emotionTransform } from "@mantine/emotion";
 import { BrowserRouter, Route, Routes } from "react-router-dom";
 
 import Welcome from "./scenes/Welcome/Welcome";
+import Workshop from "./scenes/Exercises";
 
 import "@mantine/core/styles.css";
-import Workshop from "./scenes/Exercises";
+import "@mantine/code-highlight/styles.css";
 
 const App = () => {
   return (

diff --git a/packages/workshop/src/scenes/Exercises/Exercises.tsx b/packages/workshop/src/scenes/Exercises/Exercises.tsx
@@ -9,11 +9,13 @@ import ConfiguringModuleFederation from "./components/ConfiguringModuleFederatio
 import SharingCommonModules from "./components/SharingCommonModules";
 import FaultTolerance from "./components/FaultTolerance";
 import AddingMoreMicroFrontends from "./components/AddingMoreMicroFrontends";
-
 import SettingUpRoutes from "./components/SettingUpRoutes";
 import CheckoutFlow from "./components/CheckoutFlow";
 import AddingItemsToCart from "./components/AddingItemsToCart";
 import FilteringByPrice from "./components/FilteringByPrice";
+import ShopCategories from "./components/ShopCategories";
+import SearchingTheCatalog from "./components/SearchingTheCatalog";
+import Conclusion from "./components/Conclusion";
 
 const Workshop: WorkshopScene = () => {
   return (
@@ -28,6 +30,9 @@ const Workshop: WorkshopScene = () => {
         <Route path="exercise-6" element={<CheckoutFlow />} />
         <Route path="exercise-7" element={<AddingItemsToCart />} />
         <Route path="exercise-8" element={<FilteringByPrice />} />
+        <Route path="exercise-9" element={<ShopCategories />} />
+        <Route path="exercise-10" element={<SearchingTheCatalog />} />
+        <Route path="complete" element={<Conclusion />} />
       </Route>
     </Routes>
   );