feat: Add a Navbar to all views

eri · Nov 1, 2021 · d45959a · d45959a
1 parent c7b327b
commit d45959a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/src/App.jsx b/src/App.jsx
@@ -2,7 +2,7 @@ import * as React from "react";
 import "./index.css";
 
 // Components
-import { Loading } from "./components/Loading";
+// import { Loading } from "./components/Loading";
 import { Navbar } from "./components/Navbar";
 
 // Views
@@ -47,9 +47,9 @@ class App extends React.Component {
 
     return (
       <div className="min-h-screen bg-yellow-25">
-        {/* <Navbar /> */}
-        {/* <ChooseBread order={this.state} /> */}
-        <ChooseMeat order={this.state} />
+        <Navbar />
+        <ChooseBread order={this.state} />
+        {/* <ChooseMeat order={this.state} /> */}
         {/* <ChooseVegetables order={this.state} /> */}
         {/* <ChooseSauces order={this.state} /> */}
       </div>

diff --git a/src/components/Navbar.jsx b/src/components/Navbar.jsx
@@ -0,0 +1,14 @@
+import * as React from "react";
+
+import "../index.css";
+import logo_colored from "../assets/logo_colored.png";
+
+export class Navbar extends React.Component {
+  render() {
+    return (
+      <div className="flex flex-row items-center justify-center bg-yellow-25">
+        <img src={logo_colored} className="my-10 w-50" alt="magic_kebab_logo"/>
+      </div>
+    );
+  }
+}