Index: frontend/src/Components/Layout/Navbar/Navigation.js
===================================================================
--- frontend/src/Components/Layout/Navbar/Navigation.js	(revision e6c2521bc7455763be50cf2e37427887b6efb4b9)
+++ frontend/src/Components/Layout/Navbar/Navigation.js	(revision e6c2521bc7455763be50cf2e37427887b6efb4b9)
@@ -0,0 +1,121 @@
+import {Button, Modal} from "react-bootstrap";
+import React, {useState} from "react";
+import { Container, Image, Navbar } from "react-bootstrap";
+import { Nav } from "react-bootstrap";
+import { BsFillPersonFill } from "react-icons/bs";
+import { useNavigate } from "react-router-dom";
+import useGet from "../../Hooks/useGet";
+import axios from "../../../axios.js";
+import {useAuth} from "../../Context/AuthContext";
+import ImageUpload from "../../ImageUpload/ImageUpload";
+//import logo from 'assets/images/logo.png';
+//src="https://upload.wikimedia.org/wikipedia/commons/0/08/Vergina_Sun_-_Golden_Larnax.png"
+
+function Navigation(props) {
+  const navigator = useNavigate();
+  const Auth = useAuth();
+  const isLoggedIn = Auth.userIsAuthenticated();
+
+  const [show, setShow] = useState(false);
+
+  const handleClose = () => setShow(false);
+  const handleShow = () => setShow(true);
+
+  return (
+    <>
+      <Navbar
+        bg="white"
+        variant="white"
+        expand="md"
+        className={props.mt == "0" ? "px-5 m-4" : ""}
+      >
+        <Container>
+          <Navbar.Brand href="/home">
+            <span className="ikona">
+              <Image
+                id="background-img"
+                src="https://i.ibb.co/BwtmZqX/logo.png"
+                width={60}
+                height={60}
+              ></Image>
+            </span>
+            <span className="mx-3 ikona">
+              <span className="svetlo">Tour</span>
+              <span className="temno">Mate</span>
+            </span>
+          </Navbar.Brand>
+          <Navbar.Toggle aria-controls="navbarScroll" />
+          <Navbar.Collapse id="navbarScroll">
+            <Nav className="ms-auto" navbarScroll>
+              <Nav.Link className="m-2" href="/home">
+                Home
+              </Nav.Link>
+              <Nav.Link className="m-2" href="#features">
+                Features
+              </Nav.Link>
+              <Nav.Link className="m-2" href="#pricing">
+                <Button onClick={handleShow}></Button>
+              </Nav.Link>
+              {!isLoggedIn && (
+                <Button
+                  className="m-2"
+                  size="md"
+                  style={{ backgroundColor: "#159895" }}
+                  onClick={() => {
+                    navigator("/login");
+                  }}
+                >
+                  <BsFillPersonFill size={"1.5em"}></BsFillPersonFill> Најави се
+                </Button>
+              )}
+              {isLoggedIn && (
+                <>
+                  <Nav.Link className="m-2" href="/profile">
+                    {Auth.getUser().username}
+                  </Nav.Link>
+                  <Button
+                    className="m-2"
+                    size="md"
+                    style={{ backgroundColor: "#159895" }}
+                    onClick={async () => {
+                      await axios.get("/logout")
+                      .then((res) => {
+                        console.log(res);
+                        Auth.userLogout();
+                      })
+                      .catch((err) => {
+                        console.log(err)
+                        window.location.href="/login"
+                      })
+                    }}
+                  >
+                    <BsFillPersonFill size={"1.5em"}></BsFillPersonFill> 
+                    Одјави се
+                  </Button>
+                </>
+              )}
+            </Nav>
+          </Navbar.Collapse>
+        </Container>
+      </Navbar>
+      <br />
+
+      <Modal show={show} onHide={handleClose}>
+        <Modal.Header closeButton>
+          <Modal.Title>Modal heading</Modal.Title>
+        </Modal.Header>
+        <Modal.Body><ImageUpload/></Modal.Body>
+        <Modal.Footer>
+          <Button variant="secondary" onClick={handleClose}>
+            Close
+          </Button>
+          <Button variant="primary" onClick={handleClose}>
+            Save Changes
+          </Button>
+        </Modal.Footer>
+      </Modal>
+    </>
+  );
+}
+
+export default Navigation;
