Working on feature 645

src/components/Admin/Sidebar/Sidebar.js

@@ -0,0 +1,20 @@
+import React from "react";
+import {
+  SidebarContainer,
+  SidebarContent,
+  SidebarHeader,
+} from "./Sidebar.styled";
+import { ReactComponent as LogoHorizontal } from "../../../assets/images/svg/logo-horizontal.svg";
+
+const Sidebar = () => {
+  return (
+    <SidebarContainer>
+      <SidebarHeader>
+        <LogoHorizontal />
+      </SidebarHeader>
+      <SidebarContent></SidebarContent>
+    </SidebarContainer>
+  );
+};
+
+export default Sidebar;

src/components/Admin/Sidebar/Sidebar.styled.js

@@ -0,0 +1,20 @@
+import styled from "styled-components";
+import { Box } from "@mui/material";
+
+export const SidebarContainer = styled(Box)`
+  margin-top: 73px;
+`;
+
+export const SidebarHeader = styled(Box)`
+  background-color: #f5edff;
+  width: 281px;
+  padding-top: 36px;
+  padding-left: 36px;
+  padding-bottom: 36px;
+`;
+
+export const SidebarContent = styled(Box)``;
+
+export const SidebarProfileImageContainer = styled(Box)``;
+
+export const SidebarNavigation = styled(Box)``;

src/pages/AdminHomePage/AdminHomePage.js

@@ -1,14 +1,13 @@
-import React from 'react'
-import PropTypes from 'prop-types'
+import React from "react";
+import PropTypes from "prop-types";
+import Sidebar from "../../components/Admin/Sidebar/Sidebar";
 
 const AdminHomePage = () => {
-    return (
-        <div>Admin home page brateee</div>
-    )
-}
+  return <Sidebar />;
+};
 
 AdminHomePage.propTypes = {
-    children: PropTypes.node,
-}
+  children: PropTypes.node,
+};
 
-export default AdminHomePage
+export default AdminHomePage;

src/request/index.js

@@ -5,9 +5,9 @@ const request = axios.create({
   // baseURL: "http://192.168.88.150:3001/", // DJOLE
   // baseURL: "http://192.168.88.175:3005/",
   // baseURL: "http://192.168.88.143:3001/", // DULE
-  // baseURL: "https://trampa-api-test.dilig.net/",
+  baseURL: "https://trampa-api-test.dilig.net/",
   // baseURL: "http://localhost:3001/",
-  baseURL: process.env.REACT_APP_BASE_API_URL,
+  // baseURL: process.env.REACT_APP_BASE_API_URL,
   headers: {
     "Content-Type": "application/json",
   },

src/store/middleware/accessTokensMiddleware.js

@@ -15,10 +15,10 @@ import { logoutUser, refreshUserToken } from "../actions/login/loginActions";
 //Change URL with .env
 // const baseURL = "http://192.168.88.143:3001/"; // DULE
 // const baseURL = "http://192.168.88.175:3005/";
-// const baseURL = "https://trampa-api-test.dilig.net/";
+const baseURL = "https://trampa-api-test.dilig.net/";
 // const baseURL = "http://192.168.88.150:3001/"; // DJOLE
 // const baseURL = "http://localhost:3001/";
-const baseURL = process.env.REACT_APP_BASE_API_URL
+// const baseURL = process.env.REACT_APP_BASE_API_URL
 
 //Interceptor unique name
 export const accessTokensMiddlewareInterceptorName = "ACCESS_TOKEN_INTERCEPTOR";

src/util/helpers/routeHelpers.js

@@ -33,6 +33,7 @@ export const isAuthRoute = () => {
     routeMatches(REGISTER_SUCCESSFUL_PAGE) ||
     routeMatches(FORGOT_PASSWORD_PAGE) ||
     routeMatches(FORGOT_PASSWORD_MAIL_SENT) ||
+    routeMatches(ADMIN_LOGIN_PAGE) ||
     dynamicRouteMatches(RESET_PASSWORD_PAGE)
   ) {
     return true;