fix: docker database

.gitignore

@@ -175,3 +175,4 @@ tags
 .ipython/
 .envs/*
 !.envs/.local/
+.db_data

README.md

@@ -85,16 +85,23 @@ Start the Docker containers using Docker Compose:
 docker-compose up
 ```
 
+#### 4. Setup the initial database:
+
+```sh
+# You can run this from a 2nd terminal. It will create a production database
+docker-compose exec backend flask db reset
+```
+
 This will start the backend, frontend, and database services defined in the `docker-compose.yml` file.
 
-### 4. Access the Application
+### 5. Access the Application
 
 Once the containers are up and running, you can access the application in your web browser:
 
 - Backend API: `http://localhost:5000/`
 - Frontend: `http://localhost:5173/`
 
-### 5. Stop the Containers
+### 6. Stop the Containers
 
 To stop the Docker containers, press `Ctrl + C` in the terminal where the containers are running.
 

backend/Dockerfile

@@ -24,4 +24,5 @@ RUN pip install --upgrade pip && pip install -r requirements.txt
 
 COPY . /app
 
-CMD /wait &&  flask db reset && flask run --host=0.0.0.0
+# CMD /wait &&  flask db reset && flask run --host=0.0.0.0
+CMD /wait && flask run --host=0.0.0.0

docker-compose.yml

@@ -36,6 +36,8 @@ services:
     image: mysql:5.7.22
     container_name: database
     restart: unless-stopped
+    volumes:
+      - .db_data:/var/lib/mysql
     environment:
       MYSQL_DATABASE: energize_swap_db
       MYSQL_USER: root
@@ -48,3 +50,6 @@ services:
 networks:
   net1:
     driver: bridge
+
+volumes:
+  .db_data:

frontend/Dockerfile

@@ -2,8 +2,8 @@ FROM node:16-alpine
 
 WORKDIR /usr/src/app
 
-COPY ./package.json ./
-COPY ./yarn.lock ./
+COPY ./package.json .
+COPY ./yarn.lock .
 
 RUN yarn install
 

frontend/src/App.jsx

@@ -8,7 +8,7 @@ function App() {
   return (
     <BrowserRouter>
       <Routes>
-        {userData() == null && <Route path="/login" element={<LoginPage />} />}
+        <Route path="/login" element={<LoginPage />} />
         <Route path="/" element={<MainLayout role={userData()?.role} />}>
           {routes}
         </Route>

frontend/src/pages/Login/LoginPage.jsx

@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useEffect } from "react";
 import Box from "@mui/material/Box";
 import Tabs from "@mui/material/Tabs";
 import Tab from "@mui/material/Tab";
@@ -8,6 +8,7 @@ import { toast } from "react-toastify"
 
 import "./login.css";
 import { BASE_URL } from "../../configs";
+import userData from '../../configs/helpers'
 
 function TabPanel(props) {
   const { children, value, index, ...other } = props;
@@ -58,6 +59,12 @@ function LoginPage() {
   const [value, setTab] = React.useState(0);
   const [stations, setStations] = React.useState([]);
 
+  useEffect(()=>{
+    if(userData() != null){
+      window.location.replace("/");
+    }
+  },[])
+
   const {
     register,
     handleSubmit,

frontend/src/routes/index.jsx

@@ -40,7 +40,6 @@ const generateRoute = (routes) => {
 
 const ProtectedRoute = ({ role, redirectPath = "/unauthorized", children }) => {
   const userInfo = userData()
-  console.log("========", userInfo)
   if (userInfo == null || role !== userInfo?.role) {
     return <Navigate to={redirectPath} replace />;
   }