diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c7fbe27..5cc2436 100644 --- a/.github/workflows/build.yml +++ b/.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 diff --git a/.gitignore b/.gitignore index 1cb3c74..f6e6df3 100644 --- a/.gitignore +++ b/.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 \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2fbfb7b..dbe0730 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -42,6 +42,7 @@ npm ci ``` source env.sh +cd frontend npm start ``` @@ -49,6 +50,7 @@ npm start ``` 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) \ No newline at end of file diff --git a/.dockerignore b/backend/.dockerignore similarity index 66% rename from .dockerignore rename to backend/.dockerignore index 6fc6f0f..0e1d69d 100644 --- a/.dockerignore +++ b/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 - diff --git a/backend/.gitignore b/backend/.gitignore new file mode 100644 index 0000000..20d12b8 --- /dev/null +++ b/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/ diff --git a/.mvn/wrapper/maven-wrapper.jar b/backend/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from .mvn/wrapper/maven-wrapper.jar rename to backend/.mvn/wrapper/maven-wrapper.jar diff --git a/.mvn/wrapper/maven-wrapper.properties b/backend/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from .mvn/wrapper/maven-wrapper.properties rename to backend/.mvn/wrapper/maven-wrapper.properties diff --git a/Dockerfile.backend b/backend/Dockerfile.backend similarity index 100% rename from Dockerfile.backend rename to backend/Dockerfile.backend diff --git a/mvnw b/backend/mvnw similarity index 100% rename from mvnw rename to backend/mvnw diff --git a/mvnw.cmd b/backend/mvnw.cmd similarity index 100% rename from mvnw.cmd rename to backend/mvnw.cmd diff --git a/pom.xml b/backend/pom.xml similarity index 98% rename from pom.xml rename to backend/pom.xml index 2216c34..ceb2b8d 100644 --- a/pom.xml +++ b/backend/pom.xml @@ -16,7 +16,7 @@ activityleaderboard 0.0.1-SNAPSHOT activityleaderboard - Spring boot backend for activity-leaderboard + Spring boot backend for tracer diff --git a/src/main/java/com/mdgspace/activityleaderboard/ActivityleaderboardApplication.java b/backend/src/main/java/com/mdgspace/activityleaderboard/ActivityleaderboardApplication.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/ActivityleaderboardApplication.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/ActivityleaderboardApplication.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/controllers/AuthControler.java b/backend/src/main/java/com/mdgspace/activityleaderboard/controllers/AuthControler.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/controllers/AuthControler.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/controllers/AuthControler.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/controllers/FileController.java b/backend/src/main/java/com/mdgspace/activityleaderboard/controllers/FileController.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/controllers/FileController.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/controllers/FileController.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/controllers/GithubController.java b/backend/src/main/java/com/mdgspace/activityleaderboard/controllers/GithubController.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/controllers/GithubController.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/controllers/GithubController.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/controllers/OrgController.java b/backend/src/main/java/com/mdgspace/activityleaderboard/controllers/OrgController.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/controllers/OrgController.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/controllers/OrgController.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/controllers/ProjectController.java b/backend/src/main/java/com/mdgspace/activityleaderboard/controllers/ProjectController.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/controllers/ProjectController.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/controllers/ProjectController.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/controllers/UserController.java b/backend/src/main/java/com/mdgspace/activityleaderboard/controllers/UserController.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/controllers/UserController.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/controllers/UserController.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/models/Organization.java b/backend/src/main/java/com/mdgspace/activityleaderboard/models/Organization.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/models/Organization.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/models/Organization.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/models/Project.java b/backend/src/main/java/com/mdgspace/activityleaderboard/models/Project.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/models/Project.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/models/Project.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/models/User.java b/backend/src/main/java/com/mdgspace/activityleaderboard/models/User.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/models/User.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/models/User.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/models/enums/EOrgRole.java b/backend/src/main/java/com/mdgspace/activityleaderboard/models/enums/EOrgRole.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/models/enums/EOrgRole.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/models/enums/EOrgRole.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/models/enums/EProjectRole.java b/backend/src/main/java/com/mdgspace/activityleaderboard/models/enums/EProjectRole.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/models/enums/EProjectRole.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/models/enums/EProjectRole.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/models/redis/OrgStats.java b/backend/src/main/java/com/mdgspace/activityleaderboard/models/redis/OrgStats.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/models/redis/OrgStats.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/models/redis/OrgStats.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/models/redis/OrganizationRank.java b/backend/src/main/java/com/mdgspace/activityleaderboard/models/redis/OrganizationRank.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/models/redis/OrganizationRank.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/models/redis/OrganizationRank.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/models/redis/ProjectStats.java b/backend/src/main/java/com/mdgspace/activityleaderboard/models/redis/ProjectStats.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/models/redis/ProjectStats.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/models/redis/ProjectStats.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/models/roles/OrgRole.java b/backend/src/main/java/com/mdgspace/activityleaderboard/models/roles/OrgRole.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/models/roles/OrgRole.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/models/roles/OrgRole.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/models/roles/ProjectRole.java b/backend/src/main/java/com/mdgspace/activityleaderboard/models/roles/ProjectRole.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/models/roles/ProjectRole.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/models/roles/ProjectRole.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/payload/github/Accesstoken.java b/backend/src/main/java/com/mdgspace/activityleaderboard/payload/github/Accesstoken.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/payload/github/Accesstoken.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/payload/github/Accesstoken.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/payload/github/Commit.java b/backend/src/main/java/com/mdgspace/activityleaderboard/payload/github/Commit.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/payload/github/Commit.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/payload/github/Commit.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/payload/github/Committer.java b/backend/src/main/java/com/mdgspace/activityleaderboard/payload/github/Committer.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/payload/github/Committer.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/payload/github/Committer.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/payload/github/GithubUser.java b/backend/src/main/java/com/mdgspace/activityleaderboard/payload/github/GithubUser.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/payload/github/GithubUser.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/payload/github/GithubUser.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/payload/github/Issue.java b/backend/src/main/java/com/mdgspace/activityleaderboard/payload/github/Issue.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/payload/github/Issue.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/payload/github/Issue.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/payload/github/PullRequest.java b/backend/src/main/java/com/mdgspace/activityleaderboard/payload/github/PullRequest.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/payload/github/PullRequest.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/payload/github/PullRequest.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/payload/github/Repository.java b/backend/src/main/java/com/mdgspace/activityleaderboard/payload/github/Repository.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/payload/github/Repository.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/payload/github/Repository.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/payload/github/UserObject.java b/backend/src/main/java/com/mdgspace/activityleaderboard/payload/github/UserObject.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/payload/github/UserObject.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/payload/github/UserObject.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/payload/request/AddMembersRequest.java b/backend/src/main/java/com/mdgspace/activityleaderboard/payload/request/AddMembersRequest.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/payload/request/AddMembersRequest.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/payload/request/AddMembersRequest.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/payload/request/AddOrgRequest.java b/backend/src/main/java/com/mdgspace/activityleaderboard/payload/request/AddOrgRequest.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/payload/request/AddOrgRequest.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/payload/request/AddOrgRequest.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/payload/request/AddProjectRequest.java b/backend/src/main/java/com/mdgspace/activityleaderboard/payload/request/AddProjectRequest.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/payload/request/AddProjectRequest.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/payload/request/AddProjectRequest.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/payload/request/ChangeOrgMembersStatusRequest.java b/backend/src/main/java/com/mdgspace/activityleaderboard/payload/request/ChangeOrgMembersStatusRequest.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/payload/request/ChangeOrgMembersStatusRequest.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/payload/request/ChangeOrgMembersStatusRequest.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/payload/request/ChangeProjectMembersStatusRequest.java b/backend/src/main/java/com/mdgspace/activityleaderboard/payload/request/ChangeProjectMembersStatusRequest.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/payload/request/ChangeProjectMembersStatusRequest.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/payload/request/ChangeProjectMembersStatusRequest.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/payload/request/LoginRequest.java b/backend/src/main/java/com/mdgspace/activityleaderboard/payload/request/LoginRequest.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/payload/request/LoginRequest.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/payload/request/LoginRequest.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/payload/request/SetArcheiveStatusRequest.java b/backend/src/main/java/com/mdgspace/activityleaderboard/payload/request/SetArcheiveStatusRequest.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/payload/request/SetArcheiveStatusRequest.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/payload/request/SetArcheiveStatusRequest.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/payload/request/SetBookmarkStatusRequest.java b/backend/src/main/java/com/mdgspace/activityleaderboard/payload/request/SetBookmarkStatusRequest.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/payload/request/SetBookmarkStatusRequest.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/payload/request/SetBookmarkStatusRequest.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/payload/response/AddMembersResponse.java b/backend/src/main/java/com/mdgspace/activityleaderboard/payload/response/AddMembersResponse.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/payload/response/AddMembersResponse.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/payload/response/AddMembersResponse.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/payload/response/FileResponse.java b/backend/src/main/java/com/mdgspace/activityleaderboard/payload/response/FileResponse.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/payload/response/FileResponse.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/payload/response/FileResponse.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/payload/response/GetAllOrgsResponse.java b/backend/src/main/java/com/mdgspace/activityleaderboard/payload/response/GetAllOrgsResponse.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/payload/response/GetAllOrgsResponse.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/payload/response/GetAllOrgsResponse.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/payload/response/GetMembersResponse.java b/backend/src/main/java/com/mdgspace/activityleaderboard/payload/response/GetMembersResponse.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/payload/response/GetMembersResponse.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/payload/response/GetMembersResponse.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/payload/response/GetOrgStatsResponse.java b/backend/src/main/java/com/mdgspace/activityleaderboard/payload/response/GetOrgStatsResponse.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/payload/response/GetOrgStatsResponse.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/payload/response/GetOrgStatsResponse.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/payload/response/GetProjectStatsResponse.java b/backend/src/main/java/com/mdgspace/activityleaderboard/payload/response/GetProjectStatsResponse.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/payload/response/GetProjectStatsResponse.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/payload/response/GetProjectStatsResponse.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/payload/response/GetProjectsResponse.java b/backend/src/main/java/com/mdgspace/activityleaderboard/payload/response/GetProjectsResponse.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/payload/response/GetProjectsResponse.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/payload/response/GetProjectsResponse.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/payload/response/GetUsersOrgs.java b/backend/src/main/java/com/mdgspace/activityleaderboard/payload/response/GetUsersOrgs.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/payload/response/GetUsersOrgs.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/payload/response/GetUsersOrgs.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/payload/response/GetUsersProjectsResponse.java b/backend/src/main/java/com/mdgspace/activityleaderboard/payload/response/GetUsersProjectsResponse.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/payload/response/GetUsersProjectsResponse.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/payload/response/GetUsersProjectsResponse.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/payload/response/JwtResponse.java b/backend/src/main/java/com/mdgspace/activityleaderboard/payload/response/JwtResponse.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/payload/response/JwtResponse.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/payload/response/JwtResponse.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/payload/response/MessageResponse.java b/backend/src/main/java/com/mdgspace/activityleaderboard/payload/response/MessageResponse.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/payload/response/MessageResponse.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/payload/response/MessageResponse.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/payload/response/ProjectStatsResponse.java b/backend/src/main/java/com/mdgspace/activityleaderboard/payload/response/ProjectStatsResponse.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/payload/response/ProjectStatsResponse.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/payload/response/ProjectStatsResponse.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/payload/response/RemoveMembersResponse.java b/backend/src/main/java/com/mdgspace/activityleaderboard/payload/response/RemoveMembersResponse.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/payload/response/RemoveMembersResponse.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/payload/response/RemoveMembersResponse.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/payload/response/UsersResponse.java b/backend/src/main/java/com/mdgspace/activityleaderboard/payload/response/UsersResponse.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/payload/response/UsersResponse.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/payload/response/UsersResponse.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/repository/OrgRepository.java b/backend/src/main/java/com/mdgspace/activityleaderboard/repository/OrgRepository.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/repository/OrgRepository.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/repository/OrgRepository.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/repository/OrgRoleRepository.java b/backend/src/main/java/com/mdgspace/activityleaderboard/repository/OrgRoleRepository.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/repository/OrgRoleRepository.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/repository/OrgRoleRepository.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/repository/ProjectRepository.java b/backend/src/main/java/com/mdgspace/activityleaderboard/repository/ProjectRepository.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/repository/ProjectRepository.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/repository/ProjectRepository.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/repository/ProjectRoleRepository.java b/backend/src/main/java/com/mdgspace/activityleaderboard/repository/ProjectRoleRepository.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/repository/ProjectRoleRepository.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/repository/ProjectRoleRepository.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/repository/UserRepository.java b/backend/src/main/java/com/mdgspace/activityleaderboard/repository/UserRepository.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/repository/UserRepository.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/repository/UserRepository.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/repository/redis/OrgStatsRepository.java b/backend/src/main/java/com/mdgspace/activityleaderboard/repository/redis/OrgStatsRepository.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/repository/redis/OrgStatsRepository.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/repository/redis/OrgStatsRepository.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/repository/redis/OrgStatsRepositoryImpl.java b/backend/src/main/java/com/mdgspace/activityleaderboard/repository/redis/OrgStatsRepositoryImpl.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/repository/redis/OrgStatsRepositoryImpl.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/repository/redis/OrgStatsRepositoryImpl.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/repository/redis/OrganizationRankRepository.java b/backend/src/main/java/com/mdgspace/activityleaderboard/repository/redis/OrganizationRankRepository.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/repository/redis/OrganizationRankRepository.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/repository/redis/OrganizationRankRepository.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/repository/redis/OrganizationRankRepositoryImpl.java b/backend/src/main/java/com/mdgspace/activityleaderboard/repository/redis/OrganizationRankRepositoryImpl.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/repository/redis/OrganizationRankRepositoryImpl.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/repository/redis/OrganizationRankRepositoryImpl.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/repository/redis/ProjectStatsRepository.java b/backend/src/main/java/com/mdgspace/activityleaderboard/repository/redis/ProjectStatsRepository.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/repository/redis/ProjectStatsRepository.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/repository/redis/ProjectStatsRepository.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/repository/redis/ProjectStatsRepositoryImpl.java b/backend/src/main/java/com/mdgspace/activityleaderboard/repository/redis/ProjectStatsRepositoryImpl.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/repository/redis/ProjectStatsRepositoryImpl.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/repository/redis/ProjectStatsRepositoryImpl.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/security/WebSecurityConfig.java b/backend/src/main/java/com/mdgspace/activityleaderboard/security/WebSecurityConfig.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/security/WebSecurityConfig.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/security/WebSecurityConfig.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/security/jwt/AuthEntryPointJwt.java b/backend/src/main/java/com/mdgspace/activityleaderboard/security/jwt/AuthEntryPointJwt.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/security/jwt/AuthEntryPointJwt.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/security/jwt/AuthEntryPointJwt.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/security/jwt/AuthTokenFilter.java b/backend/src/main/java/com/mdgspace/activityleaderboard/security/jwt/AuthTokenFilter.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/security/jwt/AuthTokenFilter.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/security/jwt/AuthTokenFilter.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/security/jwt/JwtUtils.java b/backend/src/main/java/com/mdgspace/activityleaderboard/security/jwt/JwtUtils.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/security/jwt/JwtUtils.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/security/jwt/JwtUtils.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/security/services/UserDetailsImpl.java b/backend/src/main/java/com/mdgspace/activityleaderboard/security/services/UserDetailsImpl.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/security/services/UserDetailsImpl.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/security/services/UserDetailsImpl.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/security/services/UserDetailsServiceImpl.java b/backend/src/main/java/com/mdgspace/activityleaderboard/security/services/UserDetailsServiceImpl.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/security/services/UserDetailsServiceImpl.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/security/services/UserDetailsServiceImpl.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/services/aws/S3/S3ClientConfig.java b/backend/src/main/java/com/mdgspace/activityleaderboard/services/aws/S3/S3ClientConfig.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/services/aws/S3/S3ClientConfig.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/services/aws/S3/S3ClientConfig.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/services/aws/S3/exceptions/FileDownloadException.java b/backend/src/main/java/com/mdgspace/activityleaderboard/services/aws/S3/exceptions/FileDownloadException.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/services/aws/S3/exceptions/FileDownloadException.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/services/aws/S3/exceptions/FileDownloadException.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/services/aws/S3/exceptions/FileEmptyException.java b/backend/src/main/java/com/mdgspace/activityleaderboard/services/aws/S3/exceptions/FileEmptyException.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/services/aws/S3/exceptions/FileEmptyException.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/services/aws/S3/exceptions/FileEmptyException.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/services/aws/S3/exceptions/FileUploadException.java b/backend/src/main/java/com/mdgspace/activityleaderboard/services/aws/S3/exceptions/FileUploadException.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/services/aws/S3/exceptions/FileUploadException.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/services/aws/S3/exceptions/FileUploadException.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/services/aws/S3/exceptions/SpringBootFileUploadException.java b/backend/src/main/java/com/mdgspace/activityleaderboard/services/aws/S3/exceptions/SpringBootFileUploadException.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/services/aws/S3/exceptions/SpringBootFileUploadException.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/services/aws/S3/exceptions/SpringBootFileUploadException.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/services/aws/S3/exceptions/SpringBootFileUploadExceptionHandler.java b/backend/src/main/java/com/mdgspace/activityleaderboard/services/aws/S3/exceptions/SpringBootFileUploadExceptionHandler.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/services/aws/S3/exceptions/SpringBootFileUploadExceptionHandler.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/services/aws/S3/exceptions/SpringBootFileUploadExceptionHandler.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/services/aws/S3/service/FileService.java b/backend/src/main/java/com/mdgspace/activityleaderboard/services/aws/S3/service/FileService.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/services/aws/S3/service/FileService.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/services/aws/S3/service/FileService.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/services/aws/S3/service/FileServiceImpl.java b/backend/src/main/java/com/mdgspace/activityleaderboard/services/aws/S3/service/FileServiceImpl.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/services/aws/S3/service/FileServiceImpl.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/services/aws/S3/service/FileServiceImpl.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/services/github/service/GithubService.java b/backend/src/main/java/com/mdgspace/activityleaderboard/services/github/service/GithubService.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/services/github/service/GithubService.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/services/github/service/GithubService.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/services/github/service/GithubServiceImpl.java b/backend/src/main/java/com/mdgspace/activityleaderboard/services/github/service/GithubServiceImpl.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/services/github/service/GithubServiceImpl.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/services/github/service/GithubServiceImpl.java diff --git a/src/main/java/com/mdgspace/activityleaderboard/services/reddis/RedisConfiguration.java b/backend/src/main/java/com/mdgspace/activityleaderboard/services/reddis/RedisConfiguration.java similarity index 100% rename from src/main/java/com/mdgspace/activityleaderboard/services/reddis/RedisConfiguration.java rename to backend/src/main/java/com/mdgspace/activityleaderboard/services/reddis/RedisConfiguration.java diff --git a/src/main/resources/application.properties b/backend/src/main/resources/application.properties similarity index 100% rename from src/main/resources/application.properties rename to backend/src/main/resources/application.properties diff --git a/src/test/java/com/mdgspace/activityleaderboard/ActivityleaderboardApplicationTests.java b/backend/src/test/java/com/mdgspace/activityleaderboard/ActivityleaderboardApplicationTests.java similarity index 100% rename from src/test/java/com/mdgspace/activityleaderboard/ActivityleaderboardApplicationTests.java rename to backend/src/test/java/com/mdgspace/activityleaderboard/ActivityleaderboardApplicationTests.java diff --git a/src/test/java/com/mdgspace/activityleaderboard/auth/AuthControllerTest.java b/backend/src/test/java/com/mdgspace/activityleaderboard/auth/AuthControllerTest.java similarity index 100% rename from src/test/java/com/mdgspace/activityleaderboard/auth/AuthControllerTest.java rename to backend/src/test/java/com/mdgspace/activityleaderboard/auth/AuthControllerTest.java diff --git a/src/test/java/com/mdgspace/activityleaderboard/auth/UserControllerTest.java b/backend/src/test/java/com/mdgspace/activityleaderboard/auth/UserControllerTest.java similarity index 100% rename from src/test/java/com/mdgspace/activityleaderboard/auth/UserControllerTest.java rename to backend/src/test/java/com/mdgspace/activityleaderboard/auth/UserControllerTest.java diff --git a/src/test/java/com/mdgspace/activityleaderboard/user/UserControllerTest.java b/backend/src/test/java/com/mdgspace/activityleaderboard/user/UserControllerTest.java similarity index 100% rename from src/test/java/com/mdgspace/activityleaderboard/user/UserControllerTest.java rename to backend/src/test/java/com/mdgspace/activityleaderboard/user/UserControllerTest.java diff --git a/src/test/resources/application-test.properties b/backend/src/test/resources/application-test.properties similarity index 100% rename from src/test/resources/application-test.properties rename to backend/src/test/resources/application-test.properties diff --git a/docker-compose.yaml b/docker-compose.yaml index 2d54bcf..32516fd 100644 --- a/docker-compose.yaml +++ b/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 diff --git a/frontend/.dockerignore b/frontend/.dockerignore new file mode 100644 index 0000000..13655b8 --- /dev/null +++ b/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 diff --git a/.eslintignore b/frontend/.eslintignore similarity index 100% rename from .eslintignore rename to frontend/.eslintignore diff --git a/.eslintrc.json b/frontend/.eslintrc.json similarity index 100% rename from .eslintrc.json rename to frontend/.eslintrc.json diff --git a/frontend/.gitignore b/frontend/.gitignore new file mode 100644 index 0000000..ce26360 --- /dev/null +++ b/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* diff --git a/.prettierignore b/frontend/.prettierignore similarity index 100% rename from .prettierignore rename to frontend/.prettierignore diff --git a/.prettierrc b/frontend/.prettierrc similarity index 100% rename from .prettierrc rename to frontend/.prettierrc diff --git a/Dockerfile.frontend b/frontend/Dockerfile.frontend similarity index 100% rename from Dockerfile.frontend rename to frontend/Dockerfile.frontend diff --git a/package-lock.json b/frontend/package-lock.json similarity index 100% rename from package-lock.json rename to frontend/package-lock.json diff --git a/package.json b/frontend/package.json similarity index 100% rename from package.json rename to frontend/package.json diff --git a/public/favicon.ico b/frontend/public/favicon.ico similarity index 100% rename from public/favicon.ico rename to frontend/public/favicon.ico diff --git a/public/index.html b/frontend/public/index.html similarity index 100% rename from public/index.html rename to frontend/public/index.html diff --git a/public/manifest.json b/frontend/public/manifest.json similarity index 100% rename from public/manifest.json rename to frontend/public/manifest.json diff --git a/public/robots.txt b/frontend/public/robots.txt similarity index 100% rename from public/robots.txt rename to frontend/public/robots.txt diff --git a/src/App.test.tsx b/frontend/src/App.test.tsx similarity index 88% rename from src/App.test.tsx rename to frontend/src/App.test.tsx index 9f5966a..28c41da 100644 --- a/src/App.test.tsx +++ b/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(); diff --git a/src/frontend/app/api/file.ts b/frontend/src/app/api/file.ts similarity index 100% rename from src/frontend/app/api/file.ts rename to frontend/src/app/api/file.ts diff --git a/src/frontend/app/api/githubData.ts b/frontend/src/app/api/githubData.ts similarity index 100% rename from src/frontend/app/api/githubData.ts rename to frontend/src/app/api/githubData.ts diff --git a/src/frontend/app/api/login.ts b/frontend/src/app/api/login.ts similarity index 100% rename from src/frontend/app/api/login.ts rename to frontend/src/app/api/login.ts diff --git a/src/frontend/app/api/organization.ts b/frontend/src/app/api/organization.ts similarity index 100% rename from src/frontend/app/api/organization.ts rename to frontend/src/app/api/organization.ts diff --git a/src/frontend/app/api/project.ts b/frontend/src/app/api/project.ts similarity index 100% rename from src/frontend/app/api/project.ts rename to frontend/src/app/api/project.ts diff --git a/src/frontend/app/api/user.ts b/frontend/src/app/api/user.ts similarity index 100% rename from src/frontend/app/api/user.ts rename to frontend/src/app/api/user.ts diff --git a/src/frontend/app/assets/gifs/loader.gif b/frontend/src/app/assets/gifs/loader.gif similarity index 100% rename from src/frontend/app/assets/gifs/loader.gif rename to frontend/src/app/assets/gifs/loader.gif diff --git a/src/frontend/app/assets/images/bronze.svg b/frontend/src/app/assets/images/bronze.svg similarity index 100% rename from src/frontend/app/assets/images/bronze.svg rename to frontend/src/app/assets/images/bronze.svg diff --git a/src/frontend/app/assets/images/dumy_profile.svg b/frontend/src/app/assets/images/dumy_profile.svg similarity index 100% rename from src/frontend/app/assets/images/dumy_profile.svg rename to frontend/src/app/assets/images/dumy_profile.svg diff --git a/src/frontend/app/assets/images/gold.svg b/frontend/src/app/assets/images/gold.svg similarity index 100% rename from src/frontend/app/assets/images/gold.svg rename to frontend/src/app/assets/images/gold.svg diff --git a/src/frontend/app/assets/images/left_navigation_button.svg b/frontend/src/app/assets/images/left_navigation_button.svg similarity index 100% rename from src/frontend/app/assets/images/left_navigation_button.svg rename to frontend/src/app/assets/images/left_navigation_button.svg diff --git a/src/frontend/app/assets/images/mdg_logo.svg b/frontend/src/app/assets/images/mdg_logo.svg similarity index 100% rename from src/frontend/app/assets/images/mdg_logo.svg rename to frontend/src/app/assets/images/mdg_logo.svg diff --git a/src/frontend/app/assets/images/next_contributor.svg b/frontend/src/app/assets/images/next_contributor.svg similarity index 100% rename from src/frontend/app/assets/images/next_contributor.svg rename to frontend/src/app/assets/images/next_contributor.svg diff --git a/src/frontend/app/assets/images/previous_contributor.svg b/frontend/src/app/assets/images/previous_contributor.svg similarity index 100% rename from src/frontend/app/assets/images/previous_contributor.svg rename to frontend/src/app/assets/images/previous_contributor.svg diff --git a/src/frontend/app/assets/images/right_navigation_button.svg b/frontend/src/app/assets/images/right_navigation_button.svg similarity index 100% rename from src/frontend/app/assets/images/right_navigation_button.svg rename to frontend/src/app/assets/images/right_navigation_button.svg diff --git a/src/frontend/app/assets/images/search_icon.svg b/frontend/src/app/assets/images/search_icon.svg similarity index 100% rename from src/frontend/app/assets/images/search_icon.svg rename to frontend/src/app/assets/images/search_icon.svg diff --git a/src/frontend/app/assets/images/silver.svg b/frontend/src/app/assets/images/silver.svg similarity index 100% rename from src/frontend/app/assets/images/silver.svg rename to frontend/src/app/assets/images/silver.svg diff --git a/src/frontend/app/components/buttonBar/index.scss b/frontend/src/app/components/buttonBar/index.scss similarity index 100% rename from src/frontend/app/components/buttonBar/index.scss rename to frontend/src/app/components/buttonBar/index.scss diff --git a/src/frontend/app/components/buttonBar/index.tsx b/frontend/src/app/components/buttonBar/index.tsx similarity index 87% rename from src/frontend/app/components/buttonBar/index.tsx rename to frontend/src/app/components/buttonBar/index.tsx index 21758ef..4945f7e 100644 --- a/src/frontend/app/components/buttonBar/index.tsx +++ b/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; diff --git a/src/frontend/app/components/firstVisit/index.scss b/frontend/src/app/components/firstVisit/index.scss similarity index 100% rename from src/frontend/app/components/firstVisit/index.scss rename to frontend/src/app/components/firstVisit/index.scss diff --git a/src/frontend/app/components/firstVisit/index.tsx b/frontend/src/app/components/firstVisit/index.tsx similarity index 100% rename from src/frontend/app/components/firstVisit/index.tsx rename to frontend/src/app/components/firstVisit/index.tsx diff --git a/src/frontend/app/components/navbar/index.scss b/frontend/src/app/components/navbar/index.scss similarity index 100% rename from src/frontend/app/components/navbar/index.scss rename to frontend/src/app/components/navbar/index.scss diff --git a/src/frontend/app/components/navbar/index.tsx b/frontend/src/app/components/navbar/index.tsx similarity index 100% rename from src/frontend/app/components/navbar/index.tsx rename to frontend/src/app/components/navbar/index.tsx diff --git a/src/frontend/app/components/popup/index.scss b/frontend/src/app/components/popup/index.scss similarity index 100% rename from src/frontend/app/components/popup/index.scss rename to frontend/src/app/components/popup/index.scss diff --git a/src/frontend/app/components/popup/index.tsx b/frontend/src/app/components/popup/index.tsx similarity index 100% rename from src/frontend/app/components/popup/index.tsx rename to frontend/src/app/components/popup/index.tsx diff --git a/src/frontend/app/components/reactPortal/index.tsx b/frontend/src/app/components/reactPortal/index.tsx similarity index 100% rename from src/frontend/app/components/reactPortal/index.tsx rename to frontend/src/app/components/reactPortal/index.tsx diff --git a/src/frontend/app/components/search/index.scss b/frontend/src/app/components/search/index.scss similarity index 100% rename from src/frontend/app/components/search/index.scss rename to frontend/src/app/components/search/index.scss diff --git a/src/frontend/app/components/search/index.tsx b/frontend/src/app/components/search/index.tsx similarity index 89% rename from src/frontend/app/components/search/index.tsx rename to frontend/src/app/components/search/index.tsx index 1d00a2f..f568707 100644 --- a/src/frontend/app/components/search/index.tsx +++ b/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'; diff --git a/src/frontend/app/components/timeRangeSwitch/index.scss b/frontend/src/app/components/timeRangeSwitch/index.scss similarity index 100% rename from src/frontend/app/components/timeRangeSwitch/index.scss rename to frontend/src/app/components/timeRangeSwitch/index.scss diff --git a/src/frontend/app/components/timeRangeSwitch/index.tsx b/frontend/src/app/components/timeRangeSwitch/index.tsx similarity index 91% rename from src/frontend/app/components/timeRangeSwitch/index.tsx rename to frontend/src/app/components/timeRangeSwitch/index.tsx index b92fc85..6e62dec 100644 --- a/src/frontend/app/components/timeRangeSwitch/index.tsx +++ b/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'; diff --git a/src/frontend/app/components/timeRangeSwitch/timeRangeSlice.ts b/frontend/src/app/components/timeRangeSwitch/timeRangeSlice.ts similarity index 86% rename from src/frontend/app/components/timeRangeSwitch/timeRangeSlice.ts rename to frontend/src/app/components/timeRangeSwitch/timeRangeSlice.ts index 627ded9..0f0e033 100644 --- a/src/frontend/app/components/timeRangeSwitch/timeRangeSlice.ts +++ b/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, diff --git a/src/frontend/app/constants/api.ts b/frontend/src/app/constants/api.ts similarity index 100% rename from src/frontend/app/constants/api.ts rename to frontend/src/app/constants/api.ts diff --git a/src/frontend/app/constants/sliceNames.ts b/frontend/src/app/constants/sliceNames.ts similarity index 100% rename from src/frontend/app/constants/sliceNames.ts rename to frontend/src/app/constants/sliceNames.ts diff --git a/src/frontend/app/context/user/userContext.tsx b/frontend/src/app/context/user/userContext.tsx similarity index 86% rename from src/frontend/app/context/user/userContext.tsx rename to frontend/src/app/context/user/userContext.tsx index e3ca854..0d7da6e 100644 --- a/src/frontend/app/context/user/userContext.tsx +++ b/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 { diff --git a/src/frontend/app/context/user/userState.tsx b/frontend/src/app/context/user/userState.tsx similarity index 90% rename from src/frontend/app/context/user/userState.tsx rename to frontend/src/app/context/user/userState.tsx index 6798d85..9648558 100644 --- a/src/frontend/app/context/user/userState.tsx +++ b/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; diff --git a/src/frontend/app/index.scss b/frontend/src/app/index.scss similarity index 100% rename from src/frontend/app/index.scss rename to frontend/src/app/index.scss diff --git a/src/frontend/app/index.tsx b/frontend/src/app/index.tsx similarity index 92% rename from src/frontend/app/index.tsx rename to frontend/src/app/index.tsx index cd4d0f9..3a9bf08 100644 --- a/src/frontend/app/index.tsx +++ b/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'; diff --git a/src/frontend/app/models/contributorPropTypes.ts b/frontend/src/app/models/contributorPropTypes.ts similarity index 100% rename from src/frontend/app/models/contributorPropTypes.ts rename to frontend/src/app/models/contributorPropTypes.ts diff --git a/src/frontend/app/models/mockDataTypes.ts b/frontend/src/app/models/mockDataTypes.ts similarity index 100% rename from src/frontend/app/models/mockDataTypes.ts rename to frontend/src/app/models/mockDataTypes.ts diff --git a/src/frontend/app/models/workSpaceCardTypes.ts b/frontend/src/app/models/workSpaceCardTypes.ts similarity index 100% rename from src/frontend/app/models/workSpaceCardTypes.ts rename to frontend/src/app/models/workSpaceCardTypes.ts diff --git a/src/frontend/app/routes/BasicRoutes.tsx b/frontend/src/app/routes/BasicRoutes.tsx similarity index 65% rename from src/frontend/app/routes/BasicRoutes.tsx rename to frontend/src/app/routes/BasicRoutes.tsx index 88315de..576a76f 100644 --- a/src/frontend/app/routes/BasicRoutes.tsx +++ b/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 = () => { diff --git a/src/frontend/app/state/action-creators/orgActions.ts b/frontend/src/app/state/action-creators/orgActions.ts similarity index 100% rename from src/frontend/app/state/action-creators/orgActions.ts rename to frontend/src/app/state/action-creators/orgActions.ts diff --git a/src/frontend/app/state/action-creators/projectActions.ts b/frontend/src/app/state/action-creators/projectActions.ts similarity index 100% rename from src/frontend/app/state/action-creators/projectActions.ts rename to frontend/src/app/state/action-creators/projectActions.ts diff --git a/src/frontend/app/state/action-creators/usersActions.ts b/frontend/src/app/state/action-creators/usersActions.ts similarity index 100% rename from src/frontend/app/state/action-creators/usersActions.ts rename to frontend/src/app/state/action-creators/usersActions.ts diff --git a/src/frontend/app/state/reducers/index.ts b/frontend/src/app/state/reducers/index.ts similarity index 71% rename from src/frontend/app/state/reducers/index.ts rename to frontend/src/app/state/reducers/index.ts index 3cd01ff..564b80f 100644 --- a/src/frontend/app/state/reducers/index.ts +++ b/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({ diff --git a/src/frontend/app/state/reducers/orgReducers.ts b/frontend/src/app/state/reducers/orgReducers.ts similarity index 100% rename from src/frontend/app/state/reducers/orgReducers.ts rename to frontend/src/app/state/reducers/orgReducers.ts diff --git a/src/frontend/app/state/reducers/usersReducers.ts b/frontend/src/app/state/reducers/usersReducers.ts similarity index 100% rename from src/frontend/app/state/reducers/usersReducers.ts rename to frontend/src/app/state/reducers/usersReducers.ts diff --git a/src/frontend/app/state/store.ts b/frontend/src/app/state/store.ts similarity index 100% rename from src/frontend/app/state/store.ts rename to frontend/src/app/state/store.ts diff --git a/src/frontend/app/utils/data.ts b/frontend/src/app/utils/data.ts similarity index 94% rename from src/frontend/app/utils/data.ts rename to frontend/src/app/utils/data.ts index 6e60d7c..4fb6afc 100644 --- a/src/frontend/app/utils/data.ts +++ b/frontend/src/app/utils/data.ts @@ -1,4 +1,4 @@ -import mockdatatypes from 'frontend/app/models/mockDataTypes'; +import mockdatatypes from 'app/models/mockDataTypes'; export const mockData = Array.from([ { diff --git a/src/frontend/app/utils/sort.ts b/frontend/src/app/utils/sort.ts similarity index 100% rename from src/frontend/app/utils/sort.ts rename to frontend/src/app/utils/sort.ts diff --git a/src/frontend/app/utils/workspaceData.ts b/frontend/src/app/utils/workspaceData.ts similarity index 98% rename from src/frontend/app/utils/workspaceData.ts rename to frontend/src/app/utils/workspaceData.ts index 098639e..5d3c29b 100644 --- a/src/frontend/app/utils/workspaceData.ts +++ b/frontend/src/app/utils/workspaceData.ts @@ -1,4 +1,4 @@ -import workspaceCardidops from 'frontend/app/models/workSpaceCardTypes'; +import workspaceCardidops from 'app/models/workSpaceCardTypes'; export const workSpaceData = Array.from([ { diff --git a/src/envConstants.ts b/frontend/src/envConstants.ts similarity index 100% rename from src/envConstants.ts rename to frontend/src/envConstants.ts diff --git a/src/frontend/features/EditProject/index.scss b/frontend/src/features/AddProject/index.scss similarity index 100% rename from src/frontend/features/EditProject/index.scss rename to frontend/src/features/AddProject/index.scss diff --git a/src/frontend/features/AddProject/index.tsx b/frontend/src/features/AddProject/index.tsx similarity index 97% rename from src/frontend/features/AddProject/index.tsx rename to frontend/src/features/AddProject/index.tsx index 0e14843..b8f3464 100644 --- a/src/frontend/features/AddProject/index.tsx +++ b/frontend/src/features/AddProject/index.tsx @@ -3,8 +3,8 @@ import './index.scss'; import tick from '../../app/assets/images/tick.png'; import { useNavigate, useParams } from 'react-router-dom'; import toast from 'react-hot-toast'; -import { addProject } from 'frontend/app/api/project'; -import { Projects, getOrgProjects } from 'frontend/app/api/organization'; +import { addProject } from 'app/api/project'; +import { Projects, getOrgProjects } from 'app/api/organization'; const AddProject = () => { diff --git a/src/frontend/features/WorkspaceAddMember/index.scss b/frontend/src/features/AddWorkspace/index.scss similarity index 100% rename from src/frontend/features/WorkspaceAddMember/index.scss rename to frontend/src/features/AddWorkspace/index.scss diff --git a/src/frontend/features/AddWorkspace/index.tsx b/frontend/src/features/AddWorkspace/index.tsx similarity index 96% rename from src/frontend/features/AddWorkspace/index.tsx rename to frontend/src/features/AddWorkspace/index.tsx index 733e9d9..3372f93 100644 --- a/src/frontend/features/AddWorkspace/index.tsx +++ b/frontend/src/features/AddWorkspace/index.tsx @@ -1,13 +1,13 @@ -import { getAllUser } from 'frontend/app/api/user'; +import { getAllUser } from 'app/api/user'; import { ChangeEvent, useContext, useEffect, useState } from 'react'; import { useNavigate } from 'react-router-dom'; import toast from 'react-hot-toast'; -import { addOrg, addOrgMembers, getAllOrgs } from 'frontend/app/api/organization'; -import { uploadIcon } from 'frontend/app/api/file'; +import { addOrg, addOrgMembers, getAllOrgs } from 'app/api/organization'; +import { uploadIcon } from 'app/api/file'; import './index.scss'; -import UserContext from 'frontend/app/context/user/userContext'; -import { AVATAR_URL } from 'frontend/app/constants/api'; +import UserContext from 'app/context/user/userContext'; +import { AVATAR_URL } from 'app/constants/api'; import { AVATAR_API } from 'envConstants'; const AddWorkspace = () => { diff --git a/src/frontend/features/AddProject/index.scss b/frontend/src/features/EditProject/index.scss similarity index 100% rename from src/frontend/features/AddProject/index.scss rename to frontend/src/features/EditProject/index.scss diff --git a/src/frontend/features/EditProject/index.tsx b/frontend/src/features/EditProject/index.tsx similarity index 96% rename from src/frontend/features/EditProject/index.tsx rename to frontend/src/features/EditProject/index.tsx index 4f70def..3fc9ad5 100644 --- a/src/frontend/features/EditProject/index.tsx +++ b/frontend/src/features/EditProject/index.tsx @@ -6,9 +6,9 @@ import toast from 'react-hot-toast'; import { getProject, updateProject, -} from 'frontend/app/api/project'; -import UserContext from 'frontend/app/context/user/userContext'; -import { Projects, getOrgProjects } from 'frontend/app/api/organization'; +} from 'app/api/project'; +import UserContext from 'app/context/user/userContext'; +import { Projects, getOrgProjects } from 'app/api/organization'; diff --git a/src/frontend/features/EditWorkspace/index.scss b/frontend/src/features/EditWorkspace/index.scss similarity index 100% rename from src/frontend/features/EditWorkspace/index.scss rename to frontend/src/features/EditWorkspace/index.scss diff --git a/src/frontend/features/EditWorkspace/index.tsx b/frontend/src/features/EditWorkspace/index.tsx similarity index 96% rename from src/frontend/features/EditWorkspace/index.tsx rename to frontend/src/features/EditWorkspace/index.tsx index 4aa8386..4bc35a9 100644 --- a/src/frontend/features/EditWorkspace/index.tsx +++ b/frontend/src/features/EditWorkspace/index.tsx @@ -1,4 +1,4 @@ -import { getAllUser, getUser } from 'frontend/app/api/user'; +import { getAllUser, getUser } from 'app/api/user'; import { ChangeEvent, useContext, useEffect, useState } from 'react'; import { useNavigate, useParams } from 'react-router-dom'; import toast from 'react-hot-toast'; @@ -7,11 +7,11 @@ import { getAllOrgs, getOrg, updateOrg, -} from 'frontend/app/api/organization'; -import { uploadIcon } from 'frontend/app/api/file'; +} from 'app/api/organization'; +import { uploadIcon } from 'app/api/file'; import './index.scss'; -import UserContext from 'frontend/app/context/user/userContext'; +import UserContext from 'app/context/user/userContext'; const EditWorkspace = () => { const navigate = useNavigate(); diff --git a/src/frontend/features/Error/index.scss b/frontend/src/features/Error/index.scss similarity index 100% rename from src/frontend/features/Error/index.scss rename to frontend/src/features/Error/index.scss diff --git a/src/frontend/features/Error/index.tsx b/frontend/src/features/Error/index.tsx similarity index 100% rename from src/frontend/features/Error/index.tsx rename to frontend/src/features/Error/index.tsx diff --git a/src/frontend/features/ProjectAddMember /index.scss b/frontend/src/features/ProjectAddMember /index.scss similarity index 100% rename from src/frontend/features/ProjectAddMember /index.scss rename to frontend/src/features/ProjectAddMember /index.scss diff --git a/src/frontend/features/ProjectAddMember /index.tsx b/frontend/src/features/ProjectAddMember /index.tsx similarity index 96% rename from src/frontend/features/ProjectAddMember /index.tsx rename to frontend/src/features/ProjectAddMember /index.tsx index 6b9a534..b08ff09 100644 --- a/src/frontend/features/ProjectAddMember /index.tsx +++ b/frontend/src/features/ProjectAddMember /index.tsx @@ -2,15 +2,15 @@ import { ChangeEvent, useContext, useEffect, useState } from 'react'; import { useNavigate, useParams } from 'react-router-dom'; import { AVATAR_API } from 'envConstants'; -import { AVATAR_URL } from 'frontend/app/constants/api'; +import { AVATAR_URL } from 'app/constants/api'; import toast from 'react-hot-toast'; import { getOrgMembers, -} from 'frontend/app/api/organization'; +} from 'app/api/organization'; import './index.scss'; -import UserContext from 'frontend/app/context/user/userContext'; -import { addProjectsMembers, getMembers } from 'frontend/app/api/project'; +import UserContext from 'app/context/user/userContext'; +import { addProjectsMembers, getMembers } from 'app/api/project'; const ProjectAddMember = () => { const navigate = useNavigate(); diff --git a/src/frontend/features/AddWorkspace/index.scss b/frontend/src/features/WorkspaceAddMember/index.scss similarity index 100% rename from src/frontend/features/AddWorkspace/index.scss rename to frontend/src/features/WorkspaceAddMember/index.scss diff --git a/src/frontend/features/WorkspaceAddMember/index.tsx b/frontend/src/features/WorkspaceAddMember/index.tsx similarity index 96% rename from src/frontend/features/WorkspaceAddMember/index.tsx rename to frontend/src/features/WorkspaceAddMember/index.tsx index e2a9b14..0126778 100644 --- a/src/frontend/features/WorkspaceAddMember/index.tsx +++ b/frontend/src/features/WorkspaceAddMember/index.tsx @@ -1,16 +1,16 @@ -import { getAllUser, getUser } from 'frontend/app/api/user'; +import { getAllUser, getUser } from 'app/api/user'; import { ChangeEvent, useContext, useEffect, useState } from 'react'; import { useNavigate, useParams } from 'react-router-dom'; import toast from 'react-hot-toast'; import { addOrgMembers, getOrgMembers, -} from 'frontend/app/api/organization'; +} from 'app/api/organization'; import './index.scss'; -import UserContext from 'frontend/app/context/user/userContext'; -import { AVATAR_URL } from 'frontend/app/constants/api'; +import UserContext from 'app/context/user/userContext'; +import { AVATAR_URL } from 'app/constants/api'; import { AVATAR_API } from 'envConstants'; const WorkspaceAddMember = () => { diff --git a/src/frontend/features/login/index.scss b/frontend/src/features/login/index.scss similarity index 100% rename from src/frontend/features/login/index.scss rename to frontend/src/features/login/index.scss diff --git a/src/frontend/features/login/index.tsx b/frontend/src/features/login/index.tsx similarity index 97% rename from src/frontend/features/login/index.tsx rename to frontend/src/features/login/index.tsx index f7e722c..4c6fd0e 100644 --- a/src/frontend/features/login/index.tsx +++ b/frontend/src/features/login/index.tsx @@ -1,7 +1,7 @@ import { CLIENT_ID } from '../../envConstants'; import { useNavigate, useSearchParams } from 'react-router-dom'; -import { login } from 'frontend/app/api/login'; +import { login } from 'app/api/login'; import { useQuery } from 'react-query'; import toast from 'react-hot-toast'; import loader from '../../app/assets/gifs/loader.gif'; diff --git a/src/frontend/features/project-members /components/BackNavigation.tsx b/frontend/src/features/project-members /components/BackNavigation.tsx similarity index 100% rename from src/frontend/features/project-members /components/BackNavigation.tsx rename to frontend/src/features/project-members /components/BackNavigation.tsx diff --git a/src/frontend/features/project-members /components/MemberCard.tsx b/frontend/src/features/project-members /components/MemberCard.tsx similarity index 97% rename from src/frontend/features/project-members /components/MemberCard.tsx rename to frontend/src/features/project-members /components/MemberCard.tsx index 9f54699..88c24d7 100644 --- a/src/frontend/features/project-members /components/MemberCard.tsx +++ b/frontend/src/features/project-members /components/MemberCard.tsx @@ -2,8 +2,8 @@ import { changeProjectMembersStatus, removeProjectMembers, -} from 'frontend/app/api/project'; -import UserContext from 'frontend/app/context/user/userContext'; +} from 'app/api/project'; +import UserContext from 'app/context/user/userContext'; import { ChangeEvent, useContext, diff --git a/src/frontend/features/project-members /components/Options.tsx b/frontend/src/features/project-members /components/Options.tsx similarity index 94% rename from src/frontend/features/project-members /components/Options.tsx rename to frontend/src/features/project-members /components/Options.tsx index 309d104..ecf9975 100644 --- a/src/frontend/features/project-members /components/Options.tsx +++ b/frontend/src/features/project-members /components/Options.tsx @@ -1,4 +1,4 @@ -import UserContext from 'frontend/app/context/user/userContext'; +import UserContext from 'app/context/user/userContext'; import { useContext } from 'react'; import { useNavigate } from 'react-router-dom'; diff --git a/src/frontend/features/workspace-members /index.scss b/frontend/src/features/project-members /index.scss similarity index 100% rename from src/frontend/features/workspace-members /index.scss rename to frontend/src/features/project-members /index.scss diff --git a/src/frontend/features/project-members /index.tsx b/frontend/src/features/project-members /index.tsx similarity index 92% rename from src/frontend/features/project-members /index.tsx rename to frontend/src/features/project-members /index.tsx index 68e3f21..5af9b6d 100644 --- a/src/frontend/features/project-members /index.tsx +++ b/frontend/src/features/project-members /index.tsx @@ -4,10 +4,10 @@ import MemberCard from './components/MemberCard'; import Options from './components/Options'; import './index.scss'; import { useEffect, useState } from 'react'; -import { getOrgMembers } from 'frontend/app/api/organization'; -import { AVATAR_URL } from 'frontend/app/constants/api'; +import { getOrgMembers } from 'app/api/organization'; +import { AVATAR_URL } from 'app/constants/api'; import { AVATAR_API } from 'envConstants'; -import { getMembers } from 'frontend/app/api/project'; +import { getMembers } from 'app/api/project'; const ProjectMembers = () => { const { spaceName, projectName } = useParams(); const token = localStorage.getItem('token'); diff --git a/src/frontend/features/project/components/contributorCard/index.scss b/frontend/src/features/project/components/contributorCard/index.scss similarity index 100% rename from src/frontend/features/project/components/contributorCard/index.scss rename to frontend/src/features/project/components/contributorCard/index.scss diff --git a/src/frontend/features/project/components/contributorCard/index.tsx b/frontend/src/features/project/components/contributorCard/index.tsx similarity index 85% rename from src/frontend/features/project/components/contributorCard/index.tsx rename to frontend/src/features/project/components/contributorCard/index.tsx index 20b8506..0017431 100644 --- a/src/frontend/features/project/components/contributorCard/index.tsx +++ b/frontend/src/features/project/components/contributorCard/index.tsx @@ -1,8 +1,8 @@ import './index.scss'; -import contributorPropTypes from 'frontend/app/models/contributorPropTypes'; +import contributorPropTypes from 'app/models/contributorPropTypes'; import { AVATAR_API } from 'envConstants'; -import { AVATAR_URL } from 'frontend/app/constants/api'; +import { AVATAR_URL } from 'app/constants/api'; const ContributorCard = (props: contributorPropTypes) => { const { Name, PR, Commits, Issues } = props; const url = AVATAR_URL + '/' + Name + '.png?apikey=' + AVATAR_API; diff --git a/src/frontend/features/project/components/contributorCard/types.ts b/frontend/src/features/project/components/contributorCard/types.ts similarity index 100% rename from src/frontend/features/project/components/contributorCard/types.ts rename to frontend/src/features/project/components/contributorCard/types.ts diff --git a/src/frontend/features/project/components/contributors/index.scss b/frontend/src/features/project/components/contributors/index.scss similarity index 100% rename from src/frontend/features/project/components/contributors/index.scss rename to frontend/src/features/project/components/contributors/index.scss diff --git a/src/frontend/features/project/components/contributors/index.tsx b/frontend/src/features/project/components/contributors/index.tsx similarity index 98% rename from src/frontend/features/project/components/contributors/index.tsx rename to frontend/src/features/project/components/contributors/index.tsx index 7c55488..17c8100 100644 --- a/src/frontend/features/project/components/contributors/index.tsx +++ b/frontend/src/features/project/components/contributors/index.tsx @@ -4,7 +4,7 @@ import ContributorCard from '../contributorCard'; import next_contributor from 'app/assets/images/next_contributor.svg'; import previous_contributor from 'app/assets/images/previous_contributor.svg'; import ReactSimplyCarousel from 'react-simply-carousel'; -import { Contributors as contri } from 'frontend/app/api/githubData'; +import { Contributors as contri } from 'app/api/githubData'; const btn_style = { alignSelf: 'center', diff --git a/src/frontend/features/project/index.scss b/frontend/src/features/project/index.scss similarity index 100% rename from src/frontend/features/project/index.scss rename to frontend/src/features/project/index.scss diff --git a/src/frontend/features/project/index.tsx b/frontend/src/features/project/index.tsx similarity index 90% rename from src/frontend/features/project/index.tsx rename to frontend/src/features/project/index.tsx index 7a2dff4..17d9e85 100644 --- a/src/frontend/features/project/index.tsx +++ b/frontend/src/features/project/index.tsx @@ -1,13 +1,13 @@ import { useEffect, useState } from 'react'; import Contributors from './components/contributors'; -import ButtonBar from 'frontend/app/components/buttonBar'; +import ButtonBar from 'app/components/buttonBar'; import './index.scss'; import { useParams } from 'react-router-dom'; -import { GetProject, getProject } from 'frontend/app/api/project'; +import { GetProject, getProject } from 'app/api/project'; import { Contributors as contri, getProjectGithubData, -} from 'frontend/app/api/githubData'; +} from 'app/api/githubData'; const ProjectPage = () => { const { spaceName, projectName } = useParams(); diff --git a/src/frontend/features/workspace-members /components/BackNavigation.tsx b/frontend/src/features/workspace-members /components/BackNavigation.tsx similarity index 100% rename from src/frontend/features/workspace-members /components/BackNavigation.tsx rename to frontend/src/features/workspace-members /components/BackNavigation.tsx diff --git a/src/frontend/features/workspace-members /components/MemberCard.tsx b/frontend/src/features/workspace-members /components/MemberCard.tsx similarity index 95% rename from src/frontend/features/workspace-members /components/MemberCard.tsx rename to frontend/src/features/workspace-members /components/MemberCard.tsx index 3c02a2b..d8b0ac4 100644 --- a/src/frontend/features/workspace-members /components/MemberCard.tsx +++ b/frontend/src/features/workspace-members /components/MemberCard.tsx @@ -1,5 +1,5 @@ -import { changeOrgMembersStatus, removeOrgMembers } from 'frontend/app/api/organization'; -import UserContext from 'frontend/app/context/user/userContext'; +import { changeOrgMembersStatus, removeOrgMembers } from 'app/api/organization'; +import UserContext from 'app/context/user/userContext'; import { ChangeEvent, useContext, diff --git a/src/frontend/features/workspace-members /components/Options.tsx b/frontend/src/features/workspace-members /components/Options.tsx similarity index 100% rename from src/frontend/features/workspace-members /components/Options.tsx rename to frontend/src/features/workspace-members /components/Options.tsx diff --git a/src/frontend/features/project-members /index.scss b/frontend/src/features/workspace-members /index.scss similarity index 100% rename from src/frontend/features/project-members /index.scss rename to frontend/src/features/workspace-members /index.scss diff --git a/src/frontend/features/workspace-members /index.tsx b/frontend/src/features/workspace-members /index.tsx similarity index 93% rename from src/frontend/features/workspace-members /index.tsx rename to frontend/src/features/workspace-members /index.tsx index 199cb26..1c83020 100644 --- a/src/frontend/features/workspace-members /index.tsx +++ b/frontend/src/features/workspace-members /index.tsx @@ -4,8 +4,8 @@ import MemberCard from './components/MemberCard'; import Options from './components/Options'; import './index.scss'; import { useEffect, useState } from 'react'; -import { getOrgMembers } from 'frontend/app/api/organization'; -import { AVATAR_URL } from 'frontend/app/constants/api'; +import { getOrgMembers } from 'app/api/organization'; +import { AVATAR_URL } from 'app/constants/api'; import { AVATAR_API } from 'envConstants'; const WorkspaceMembers = () => { const { spaceName } = useParams(); diff --git a/src/frontend/features/workspace-view/index.scss b/frontend/src/features/workspace-view/index.scss similarity index 100% rename from src/frontend/features/workspace-view/index.scss rename to frontend/src/features/workspace-view/index.scss diff --git a/src/frontend/features/workspace-view/index.tsx b/frontend/src/features/workspace-view/index.tsx similarity index 91% rename from src/frontend/features/workspace-view/index.tsx rename to frontend/src/features/workspace-view/index.tsx index 6ba3437..3a2af2b 100644 --- a/src/frontend/features/workspace-view/index.tsx +++ b/frontend/src/features/workspace-view/index.tsx @@ -1,13 +1,13 @@ -import SearchBar from 'frontend/app/components/search'; +import SearchBar from 'app/components/search'; import { useContext, useEffect, useState } from 'react'; import './index.scss'; import WorkspaceCard from './workspace-card'; -import UserContext from 'frontend/app/context/user/userContext'; -import { UserOrgDetails, getUserOrgs } from 'frontend/app/api/user'; +import UserContext from 'app/context/user/userContext'; +import { UserOrgDetails, getUserOrgs } from 'app/api/user'; import loader from '../../app/assets/gifs/loader.gif'; import { useNavigate } from 'react-router-dom'; import { useSelector } from 'react-redux'; -import FirstVisit from 'frontend/app/components/firstVisit'; +import FirstVisit from 'app/components/firstVisit'; import toast from 'react-hot-toast'; const WorkspaceView = () => { diff --git a/src/frontend/features/workspace-view/workspace-card/index.scss b/frontend/src/features/workspace-view/workspace-card/index.scss similarity index 100% rename from src/frontend/features/workspace-view/workspace-card/index.scss rename to frontend/src/features/workspace-view/workspace-card/index.scss diff --git a/src/frontend/features/workspace-view/workspace-card/index.tsx b/frontend/src/features/workspace-view/workspace-card/index.tsx similarity index 96% rename from src/frontend/features/workspace-view/workspace-card/index.tsx rename to frontend/src/features/workspace-view/workspace-card/index.tsx index 4022e4c..c95457d 100644 --- a/src/frontend/features/workspace-view/workspace-card/index.tsx +++ b/frontend/src/features/workspace-view/workspace-card/index.tsx @@ -1,9 +1,9 @@ import React, { useContext, useEffect, useState } from 'react'; import './index.scss'; import rightNavbtn from '../../../app/assets/images/right_navigation_button.svg'; -import { deleteOrg, getOrg, getOrgMembers } from 'frontend/app/api/organization'; -import { deleteFile, getIcon, getIconName } from 'frontend/app/api/file'; -import UserContext from 'frontend/app/context/user/userContext'; +import { deleteOrg, getOrg, getOrgMembers } from 'app/api/organization'; +import { deleteFile, getIcon, getIconName } from 'app/api/file'; +import UserContext from 'app/context/user/userContext'; import toast from 'react-hot-toast'; import { FaBookmark } from "react-icons/fa"; @@ -12,10 +12,10 @@ import { UserOrgDetails, setOrgArcheiveStatus, setOrgBookmarkStatus, -} from 'frontend/app/api/user'; +} from 'app/api/user'; import { useNavigate } from 'react-router-dom'; import { AVATAR_API } from 'envConstants'; -import { AVATAR_URL } from 'frontend/app/constants/api'; +import { AVATAR_URL } from 'app/constants/api'; type workspaceCardProps = { workspaceName: string; role: string; diff --git a/src/frontend/features/workspace/components/leaderboard/index.scss b/frontend/src/features/workspace/components/leaderboard/index.scss similarity index 100% rename from src/frontend/features/workspace/components/leaderboard/index.scss rename to frontend/src/features/workspace/components/leaderboard/index.scss diff --git a/src/frontend/features/workspace/components/leaderboard/index.tsx b/frontend/src/features/workspace/components/leaderboard/index.tsx similarity index 98% rename from src/frontend/features/workspace/components/leaderboard/index.tsx rename to frontend/src/features/workspace/components/leaderboard/index.tsx index e76c4a6..76de64c 100644 --- a/src/frontend/features/workspace/components/leaderboard/index.tsx +++ b/frontend/src/features/workspace/components/leaderboard/index.tsx @@ -5,7 +5,7 @@ import bronze from 'app/assets/images/bronze.svg'; import leftNavButton from 'app/assets/images/left_navigation_button.svg'; import rightNavButton from 'app/assets/images/right_navigation_button.svg'; import './index.scss'; -import { Contributors } from 'frontend/app/api/githubData'; +import { Contributors } from 'app/api/githubData'; interface Prop { weekly: boolean; diff --git a/src/frontend/features/workspace/components/projectCard/index.scss b/frontend/src/features/workspace/components/projectCard/index.scss similarity index 100% rename from src/frontend/features/workspace/components/projectCard/index.scss rename to frontend/src/features/workspace/components/projectCard/index.scss diff --git a/src/frontend/features/workspace/components/projectCard/index.tsx b/frontend/src/features/workspace/components/projectCard/index.tsx similarity index 94% rename from src/frontend/features/workspace/components/projectCard/index.tsx rename to frontend/src/features/workspace/components/projectCard/index.tsx index 46224a3..8d28722 100644 --- a/src/frontend/features/workspace/components/projectCard/index.tsx +++ b/frontend/src/features/workspace/components/projectCard/index.tsx @@ -1,12 +1,12 @@ import React, { useContext, useEffect, useState } from 'react'; import './index.scss'; -import { deleteProject, getMembers, getProject } from 'frontend/app/api/project'; +import { deleteProject, getMembers, getProject } from 'app/api/project'; import { FaBookmark } from "react-icons/fa"; -import { GetProject } from 'frontend/app/api/project'; -import { AVATAR_URL } from 'frontend/app/constants/api'; +import { GetProject } from 'app/api/project'; +import { AVATAR_URL } from 'app/constants/api'; import { AVATAR_API } from 'envConstants'; -import UserContext from 'frontend/app/context/user/userContext'; -import { setArcheiveStatus, setBookmarkStatus } from 'frontend/app/api/organization'; +import UserContext from 'app/context/user/userContext'; +import { setArcheiveStatus, setBookmarkStatus } from 'app/api/organization'; import toast from 'react-hot-toast'; import { useNavigate } from 'react-router-dom'; import rightNavbtn from '../../../../app/assets/images/right_navigation_button.svg'; diff --git a/src/frontend/features/workspace/components/projectCardContainer/index.scss b/frontend/src/features/workspace/components/projectCardContainer/index.scss similarity index 100% rename from src/frontend/features/workspace/components/projectCardContainer/index.scss rename to frontend/src/features/workspace/components/projectCardContainer/index.scss diff --git a/src/frontend/features/workspace/components/projectCardContainer/index.tsx b/frontend/src/features/workspace/components/projectCardContainer/index.tsx similarity index 92% rename from src/frontend/features/workspace/components/projectCardContainer/index.tsx rename to frontend/src/features/workspace/components/projectCardContainer/index.tsx index fb0556c..bd64cd2 100644 --- a/src/frontend/features/workspace/components/projectCardContainer/index.tsx +++ b/frontend/src/features/workspace/components/projectCardContainer/index.tsx @@ -1,8 +1,8 @@ import React, { useEffect, useState } from 'react'; import ProjectCard from '../projectCard'; import './index.scss'; -import { Projects } from 'frontend/app/api/organization'; -import { ProjectsGithubData } from 'frontend/app/api/githubData'; +import { Projects } from 'app/api/organization'; +import { ProjectsGithubData } from 'app/api/githubData'; import { useSelector } from 'react-redux'; interface Props { diff --git a/src/frontend/features/workspace/index.scss b/frontend/src/features/workspace/index.scss similarity index 100% rename from src/frontend/features/workspace/index.scss rename to frontend/src/features/workspace/index.scss diff --git a/src/frontend/features/workspace/index.tsx b/frontend/src/features/workspace/index.tsx similarity index 89% rename from src/frontend/features/workspace/index.tsx rename to frontend/src/features/workspace/index.tsx index df4f52e..40ae173 100644 --- a/src/frontend/features/workspace/index.tsx +++ b/frontend/src/features/workspace/index.tsx @@ -1,20 +1,20 @@ import React, { useContext, useEffect, useState } from 'react'; -import SearchBar from 'frontend/app/components/search'; -import TimeRangeSwitch from 'frontend/app/components/timeRangeSwitch'; +import SearchBar from 'app/components/search'; +import TimeRangeSwitch from 'app/components/timeRangeSwitch'; import ProjectCardCont from './components/projectCardContainer'; import LeaderBoard from './components/leaderboard'; import './index.scss'; import { useNavigate, useParams } from 'react-router-dom'; -import { getOrgProjects } from 'frontend/app/api/organization'; +import { getOrgProjects } from 'app/api/organization'; import { getOrgGithubData, getOrgRank, -} from 'frontend/app/api/githubData'; -import { Projects } from 'frontend/app/api/organization'; -import { ProjectsGithubData } from 'frontend/app/api/githubData'; -import { Contributors } from 'frontend/app/api/githubData'; +} from 'app/api/githubData'; +import { Projects } from 'app/api/organization'; +import { ProjectsGithubData } from 'app/api/githubData'; +import { Contributors } from 'app/api/githubData'; import loader from '../../app/assets/gifs/loader.gif'; -import UserContext from 'frontend/app/context/user/userContext'; +import UserContext from 'app/context/user/userContext'; const Workspace = () => { diff --git a/src/frontend/features/workspace/slices/projectSearchSlice.ts b/frontend/src/features/workspace/slices/projectSearchSlice.ts similarity index 86% rename from src/frontend/features/workspace/slices/projectSearchSlice.ts rename to frontend/src/features/workspace/slices/projectSearchSlice.ts index d9a6e43..4bbee7b 100644 --- a/src/frontend/features/workspace/slices/projectSearchSlice.ts +++ b/frontend/src/features/workspace/slices/projectSearchSlice.ts @@ -1,5 +1,5 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit'; -import { SEARCH } from 'frontend/app/constants/sliceNames'; +import { SEARCH } from 'app/constants/sliceNames'; export const searchSlice = createSlice({ name: SEARCH, diff --git a/src/index.tsx b/frontend/src/index.tsx similarity index 83% rename from src/index.tsx rename to frontend/src/index.tsx index dc1fb7e..f4dc382 100644 --- a/src/index.tsx +++ b/frontend/src/index.tsx @@ -1,12 +1,12 @@ import React from 'react'; import ReactDOM from 'react-dom/client'; -import App from 'frontend/app'; +import App from 'app'; import reportWebVitals from 'reportWebVitals'; import { BrowserRouter } from 'react-router-dom'; -import { store } from 'frontend/app/state/store'; +import { store } from 'app/state/store'; import { Provider } from 'react-redux'; import { QueryClient, QueryClientProvider } from 'react-query'; -import UserState from 'frontend/app/context/user/userState'; +import UserState from 'app/context/user/userState'; const queryClient = new QueryClient(); diff --git a/src/react-app-env.d.ts b/frontend/src/react-app-env.d.ts similarity index 100% rename from src/react-app-env.d.ts rename to frontend/src/react-app-env.d.ts diff --git a/src/reportWebVitals.ts b/frontend/src/reportWebVitals.ts similarity index 100% rename from src/reportWebVitals.ts rename to frontend/src/reportWebVitals.ts diff --git a/src/setupTests.ts b/frontend/src/setupTests.ts similarity index 100% rename from src/setupTests.ts rename to frontend/src/setupTests.ts diff --git a/src/frontend/utils/data.ts b/frontend/src/utils/data.ts similarity index 94% rename from src/frontend/utils/data.ts rename to frontend/src/utils/data.ts index 7409ca2..581e97b 100644 --- a/src/frontend/utils/data.ts +++ b/frontend/src/utils/data.ts @@ -1,4 +1,4 @@ -import mockdatatypes from 'frontend/app/models/mockDataTypes'; +import mockdatatypes from 'app/models/mockDataTypes'; export const mockData: Array = [ { diff --git a/src/frontend/utils/sort.ts b/frontend/src/utils/sort.ts similarity index 75% rename from src/frontend/utils/sort.ts rename to frontend/src/utils/sort.ts index cd9cc25..c6bfe27 100644 --- a/src/frontend/utils/sort.ts +++ b/frontend/src/utils/sort.ts @@ -1,4 +1,4 @@ -import mockdatatypes from 'frontend/app/models/mockDataTypes'; +import mockdatatypes from 'app/models/mockDataTypes'; export function sortJSON(arr: Array): Array { return arr.sort(function (a, b) { diff --git a/tsconfig.json b/frontend/tsconfig.json similarity index 100% rename from tsconfig.json rename to frontend/tsconfig.json