diff --git a/src/App.css b/src/App.css index 16c9a7f..8eeb486 100644 --- a/src/App.css +++ b/src/App.css @@ -191,6 +191,21 @@ background-color: black; } +.pages-layout { + width: 100%; + height: 100vh; + min-height: 450px; + display: flex; + flex-direction: column; + align-items: center; + justify-content: flex-start; + padding: 1.2rem; +} + +.tesla-logo-mobile { + display: none !important; +} + @media screen and (max-width: 767px) { .burger-menu { display: flex !important; @@ -285,6 +300,10 @@ .form-label { width: 100%; } + + .tesla-logo-mobile { + display: block; + } } @media screen and (min-width: 768px) and (max-width: 950px) { diff --git a/src/components/CarsCard/CarsCard.jsx b/src/components/CarsCard/CarsCard.jsx index 3d737c0..5ed00cc 100644 --- a/src/components/CarsCard/CarsCard.jsx +++ b/src/components/CarsCard/CarsCard.jsx @@ -10,6 +10,7 @@ import { useDispatch } from 'react-redux'; import PropTypes from 'prop-types'; import CarDetails from '../CarDetails/CarDetails'; import deleteCar from '../../redux/requests/deleteCar'; +import Logo from '../Sidebar/Logo'; const CarsCard = ({ cars, delete: isDeleteMode }) => { const dispatch = useDispatch(); @@ -46,6 +47,9 @@ const CarsCard = ({ cars, delete: isDeleteMode }) => { return (
+
+ +
{!selectedCar && (
{isDeleteMode ? ( diff --git a/src/components/DeleteCar/DeleteCar.jsx b/src/components/DeleteCar/DeleteCar.jsx index 65d25e5..a8b2460 100644 --- a/src/components/DeleteCar/DeleteCar.jsx +++ b/src/components/DeleteCar/DeleteCar.jsx @@ -5,6 +5,7 @@ import Sidebar from '../Sidebar/Sidebar'; import Session from '../Session/Session'; import getCars from '../../redux/requests/getCars'; import CarsCard from '../CarsCard/CarsCard'; +import BurgerMenu from '../Menu/BurgerMenu'; const DeleteCar = () => { const user = useSelector((state) => state.login.data); @@ -26,6 +27,7 @@ const DeleteCar = () => {
+
diff --git a/src/components/Menu/BurgerMenu.jsx b/src/components/Menu/BurgerMenu.jsx index 27765d0..d8f22f6 100644 --- a/src/components/Menu/BurgerMenu.jsx +++ b/src/components/Menu/BurgerMenu.jsx @@ -15,22 +15,20 @@ const BurgerMenu = () => { <>
-
-
-
{
- + HOME { > ADD CARS - +
diff --git a/src/components/Menu/Navbar.jsx b/src/components/Menu/Navbar.jsx deleted file mode 100644 index e222395..0000000 --- a/src/components/Menu/Navbar.jsx +++ /dev/null @@ -1,24 +0,0 @@ -import React from 'react'; -import { NavLink } from 'react-router-dom'; - -const Navbar = () => ( -
-
- - HOME - - - RESERVE MODEL - - - MY RESERVATIONS - - - ADD CARS - - -
-
-); - -export default Navbar; diff --git a/src/components/Sidebar/Sidebar.jsx b/src/components/Sidebar/Sidebar.jsx index 72874ba..1bb55cc 100644 --- a/src/components/Sidebar/Sidebar.jsx +++ b/src/components/Sidebar/Sidebar.jsx @@ -49,7 +49,7 @@ const Sidebar = () => {
diff --git a/src/pages/AddCar/AddCar.jsx b/src/pages/AddCar/AddCar.jsx index 09dc7c5..954c56d 100644 --- a/src/pages/AddCar/AddCar.jsx +++ b/src/pages/AddCar/AddCar.jsx @@ -3,6 +3,7 @@ import { useNavigate } from 'react-router-dom'; import { useDispatch } from 'react-redux'; import Sidebar from '../../components/Sidebar/Sidebar'; import createCar from '../../redux/requests/createCar'; +import Logo from '../../components/Sidebar/Logo'; const AddCar = () => { const navigate = useNavigate(); @@ -41,16 +42,21 @@ const AddCar = () => {
-
+
+
+ +
+
+

Add Car

{
-
diff --git a/src/pages/AddReservation/AddReservation.jsx b/src/pages/AddReservation/AddReservation.jsx index 38981c6..82b79c2 100644 --- a/src/pages/AddReservation/AddReservation.jsx +++ b/src/pages/AddReservation/AddReservation.jsx @@ -4,6 +4,7 @@ import { useNavigate, useParams } from 'react-router-dom'; import Sidebar from '../../components/Sidebar/Sidebar'; import getUser from '../../redux/requests/getUser'; import createUserReservation from '../../redux/requests/createUserReservation'; +import Logo from '../../components/Sidebar/Logo'; const AddReservation = () => { const dispatch = useDispatch(); @@ -54,97 +55,99 @@ const AddReservation = () => {
-
+
+ +
+ +
+
-
-
-
-
-

Reserve a Car

-
-

- Current User: - - {currentUser ? currentUser.username : 'Loading...'} - -

-
+
+
+
+

Reserve Model

+

+ Current User: + {currentUser ? currentUser.username : 'Loading...'} +

+
-
-

- Select Tesla Model: - - {cars ? ( - - ) : ( -

Cars loading or no cars, please add cars

- )} - -

-
- -
- -
-
- -
-
- -
-
- -
- -
+
+

+ Select Tesla Model: + + {cars ? ( + + ) : ( +

Cars loading or no cars, please add cars

+ )} + +

+
+
+ +
+
+ +
+
+ +
+ +
+ +
+
diff --git a/src/pages/ReservationsList/ReservationList.jsx b/src/pages/ReservationsList/ReservationList.jsx index 2881c74..8a9f6ea 100644 --- a/src/pages/ReservationsList/ReservationList.jsx +++ b/src/pages/ReservationsList/ReservationList.jsx @@ -4,6 +4,7 @@ import { useDispatch, useSelector } from 'react-redux'; import Sidebar from '../../components/Sidebar/Sidebar'; import getUserReservations from '../../redux/requests/getUserReservations'; import { deleteReservation } from '../../redux/slices/reservationSlice'; +import Logo from '../../components/Sidebar/Logo'; const ReservationList = () => { const navigate = useNavigate(); @@ -21,21 +22,24 @@ const ReservationList = () => {
-
+
-
+
+ +
+ +
-

Your Reservations

-
+

My Reservations

{reservations && reservations.length > 0 ? (
{reservations?.map((reservation) => ( @@ -71,11 +75,7 @@ const ReservationList = () => { -