rfac: project file structure seperated for backend and frontend

.github/workflows/build.yml

@@ -1,13 +1,13 @@
 name: CI Workflow
 on: 
  pull_request:
-    branches: [ masterm main ]
+    branches: [ master, main ]
     paths:
-        - 'src/**'
+        - 'backend/src/**'
  push:
     branches: [master, main]
     paths:
-        - 'src/**'
+        - 'backend/src/**'
 jobs:
     build:
         runs-on: ubuntu-latest

.gitignore

@@ -1,64 +1,11 @@
-HELP.md
 
-target
-
-.m2
-
-bin
-
-!.mvn/wrapper/maven-wrapper.jar
-
-!**/src/main/**/target/
-
-!**/src/test/**/target/
 
 **.jpeg
 **.png
 **.jpg
 ### STS ###
 
-.apt_generated
-
-.classpath
-
-.factorypath
-
-.project
-
-.settings
-
-.springBeans
-
-.sts4-cache
-
-### IntelliJ IDEA ###
-
-.idea
-
-- .iws
-- .iml
-- .ipr
-
-### NetBeans ###
-
-/nbproject/private/
-
-/nbbuild/
-
-/dist/
-
-/nbdist/
-
-/.nb-gradle/
-
-build/
-
-!**/src/main/**/build/
-
-!**/src/test/**/build/
-
-### VS Code ###
-
+.idea/
 .vscode/
 
 # keys
@@ -69,27 +16,4 @@ postgres
 files
 
 
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
-# dependencies
-/node_modules
-/.pnp
-.pnp.js
-
-# testing
-/coverage
-
-# production
-/build
-
-# misc
-.DS_Store
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
-.env
-
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
+target

CONTRIBUTING.md

@@ -42,13 +42,15 @@ npm ci
 
 ```
 source env.sh
+cd frontend
 npm start
 ```
 
 ### Run backend
 
 ```
 source env.sh
+cd backend
 mvn spring-boot:run -DskipTests
 ```
 
@@ -111,12 +113,6 @@ chor: Chnge project colour (frontend)
 rfac: Get UserApi (backend)
 ```
 
-## File Structure
-
-- **src/main:** Contains all the backend code 
-- **src/test:** Contains all the tests
-- **src/frontend:** Contains all the frontend code
-
 ## Backend API'S
 
 API's for testing purpose can be found in [thunder-client-collection](thunder-collection_Tracer.json)

.dockerignore → backend/.dockerignore

@@ -34,22 +34,3 @@ build/
 
 # Maven
 .m2/
-
-# Postgresql Data
-.postgresql_data/
-postgres
-files
-
-docker-compose.yaml
-Dockerfile
-README.md
-run.sh
-build
-.github
-node_modules
-.eslintignore
-.eslintrc.json
-.prettierignore
-.prettierrc
-package-lock.json
-

backend/.gitignore

@@ -0,0 +1,62 @@
+HELP.md
+
+target
+
+.m2
+
+bin
+
+!.mvn/wrapper/maven-wrapper.jar
+
+!**/src/main/**/target/
+
+!**/src/test/**/target/
+
+**.jpeg
+**.png
+**.jpg
+### STS ###
+
+.apt_generated
+
+.classpath
+
+.factorypath
+
+.project
+
+.settings
+
+.springBeans
+
+.sts4-cache
+
+### IntelliJ IDEA ###
+
+.idea
+
+- .iws
+- .iml
+- .ipr
+
+### NetBeans ###
+
+/nbproject/private/
+
+/nbbuild/
+
+/dist/
+
+/nbdist/
+
+/.nb-gradle/
+
+build/
+
+!**/src/main/**/build/
+
+!**/src/test/**/build/
+
+### VS Code ###
+
+.vscode/

pom.xml → backend/pom.xml

@@ -16,7 +16,7 @@
 	<artifactId>activityleaderboard</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>activityleaderboard</name>
-	<description>Spring boot backend for activity-leaderboard</description>
+	<description>Spring boot backend for tracer</description>
 
 	<!-- Project properties to set versions for plugins and dependencies -->
 	<properties>

docker-compose.yaml

@@ -32,7 +32,7 @@ services:
       "
   backend:
     build: 
-      context: .
+      context: ./backend
       dockerfile: Dockerfile.backend
     container_name: tracer-backend
     networks:
@@ -48,7 +48,7 @@ services:
 
   frontend:
     build: 
-      context: .
+      context: ./frontend
       dockerfile: Dockerfile.frontend
     container_name: tracer-frontend
     network_mode: host

frontend/.dockerignore

@@ -0,0 +1,12 @@
+docker-compose.yaml
+Dockerfile
+README.md
+run.sh
+build
+.github
+node_modules
+.eslintignore
+.eslintrc.json
+.prettierignore
+.prettierrc
+package-lock.json

frontend/.gitignore

@@ -0,0 +1,21 @@
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# production
+/build
+
+# misc
+.DS_Store
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+.env
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*

src/App.test.tsx → frontend/src/App.test.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { render, screen } from '@testing-library/react';
-import App from 'frontend/app';
+import App from 'app';
 
 test('renders learn react link', () => {
   render(<App />);

src/frontend/app/components/buttonBar/index.tsx → frontend/src/app/components/buttonBar/index.tsx

@@ -1,8 +1,8 @@
 import React, { useState } from 'react';
-import TimeRangeSwitch from 'frontend/app/components/timeRangeSwitch';
+import TimeRangeSwitch from 'app/components/timeRangeSwitch';
 
 import './index.scss';
-import { GetProject } from 'frontend/app/api/project';
+import { GetProject } from 'app/api/project';
 import { useNavigate } from 'react-router-dom';
 interface Props {
   weekly: boolean;

src/frontend/app/components/search/index.tsx → frontend/src/app/components/search/index.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { useDispatch } from 'react-redux';
-import { searchAction } from 'frontend/features/workspace/slices/projectSearchSlice';
+import { searchAction } from 'features/workspace/slices/projectSearchSlice';
 import search_icon from 'app/assets/images/search_icon.svg';
 import './index.scss';
 

src/frontend/app/components/timeRangeSwitch/index.tsx → frontend/src/app/components/timeRangeSwitch/index.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-import { timeRangeModel } from 'frontend/features/project/components/contributorCard/types';
+import { timeRangeModel } from 'features/project/components/contributorCard/types';
 import { weekAction, monthAction } from './timeRangeSlice';
 import './index.scss';
 import { clearConfigCache } from 'prettier';

src/frontend/app/components/timeRangeSwitch/timeRangeSlice.ts → frontend/src/app/components/timeRangeSwitch/timeRangeSlice.ts

@@ -1,5 +1,5 @@
 import { createSlice } from '@reduxjs/toolkit';
-import { TIMERANGE } from 'frontend/app/constants/sliceNames';
+import { TIMERANGE } from 'app/constants/sliceNames';
 
 export const timeRangeSlice = createSlice({
   name: TIMERANGE,

src/frontend/app/context/user/userContext.tsx → frontend/src/app/context/user/userContext.tsx

@@ -1,4 +1,4 @@
-import { UserOrgs } from 'frontend/app/api/user';
+import { UserOrgs } from 'app/api/user';
 import { createContext } from 'react';
 
 export interface UserContextType {

src/frontend/app/context/user/userState.tsx → frontend/src/app/context/user/userState.tsx

@@ -1,6 +1,6 @@
 import { FC, ReactNode, useState } from 'react';
 import UserContext from './userContext';
-import {  UserOrgs } from 'frontend/app/api/user';
+import {  UserOrgs } from 'app/api/user';
 
 interface Props {
   children: ReactNode;

src/frontend/app/index.tsx → frontend/src/app/index.tsx

@@ -1,5 +1,5 @@
-import Navbar from 'frontend/app/components/navbar';
-import BasicRoutes from 'frontend/app/routes/BasicRoutes';
+import Navbar from 'app/components/navbar';
+import BasicRoutes from 'app/routes/BasicRoutes';
 import './index.scss';
 import toast, { Toaster } from 'react-hot-toast';
 import { getUser } from './api/user';

src/frontend/app/routes/BasicRoutes.tsx → frontend/src/app/routes/BasicRoutes.tsx

@@ -1,19 +1,19 @@
 
 import { Routes, Route } from 'react-router-dom';
-import ProjectPage from 'frontend/features/project';
-import AddProject from 'frontend/features/AddProject';
-import Error from 'frontend/features/Error';
-import WorkspaceView from 'frontend/features/workspace-view';
-import Login from 'frontend/features/login';
-import AddWorkspace from 'frontend/features/AddWorkspace';
-import Workspace from 'frontend/features/workspace';
+import ProjectPage from 'features/project';
+import AddProject from 'features/AddProject';
+import Error from 'features/Error';
+import WorkspaceView from 'features/workspace-view';
+import Login from 'features/login';
+import AddWorkspace from 'features/AddWorkspace';
+import Workspace from 'features/workspace';
 
-import EditWorkspace from 'frontend/features/EditWorkspace';
-import EditProject from 'frontend/features/EditProject';
-import WorkspaceMembers from 'frontend/features/workspace-members ';
-import WorkspaceAddMember from 'frontend/features/WorkspaceAddMember';
-import ProjectMembers from 'frontend/features/project-members ';
-import ProjectAddMember from 'frontend/features/ProjectAddMember ';
+import EditWorkspace from 'features/EditWorkspace';
+import EditProject from 'features/EditProject';
+import WorkspaceMembers from 'features/workspace-members ';
+import WorkspaceAddMember from 'features/WorkspaceAddMember';
+import ProjectMembers from 'features/project-members ';
+import ProjectAddMember from 'features/ProjectAddMember ';
 import FirstVisit from '../components/firstVisit';
 
 const BasicRoutes = () => {

src/frontend/app/state/reducers/index.ts → frontend/src/app/state/reducers/index.ts

@@ -1,7 +1,7 @@
 import { combineReducers } from 'redux';
 import { setAllUsernamesReducer, setUsernameReducer } from './usersReducers';
-import timeRangeReducer from 'frontend/app/components/timeRangeSwitch/timeRangeSlice';
-import searchReducer from 'frontend/features/workspace/slices/projectSearchSlice';
+import timeRangeReducer from 'app/components/timeRangeSwitch/timeRangeSlice';
+import searchReducer from 'features/workspace/slices/projectSearchSlice';
 import { orgReducer } from './orgReducers';
 
 export const reducers = combineReducers({