#83: Restructuring of files in project root

Blagoja95 · Feb 8, 2024 · 7363215 · 7363215
1 parent 72019b7
commit 7363215
Show file tree

Hide file tree

Showing 69 changed files with 10 additions and 10 deletions.
diff --git a/src/main/ui/package-lock.json → app/web/package-lock.json b/src/main/ui/package-lock.json → app/web/package-lock.json
diff --git a/src/main/ui/package.json → app/web/package.json b/src/main/ui/package.json → app/web/package.json
diff --git a/src/main/ui/public/favicon.ico → app/web/public/favicon.ico b/src/main/ui/public/favicon.ico → app/web/public/favicon.ico
diff --git a/src/main/ui/public/index.html → app/web/public/index.html b/src/main/ui/public/index.html → app/web/public/index.html
diff --git a/src/main/ui/public/manifest.json → app/web/public/manifest.json b/src/main/ui/public/manifest.json → app/web/public/manifest.json
diff --git a/src/main/ui/src/App.js → app/web/src/App.js b/src/main/ui/src/App.js → app/web/src/App.js
diff --git a/src/main/ui/src/assets/DashNET.svg → app/web/src/assets/DashNET.svg b/src/main/ui/src/assets/DashNET.svg → app/web/src/assets/DashNET.svg
diff --git a/...ui/src/components/layout/header/Header.js → ...eb/src/components/layout/header/Header.js b/...ui/src/components/layout/header/Header.js → ...eb/src/components/layout/header/Header.js
diff --git a/...components/layout/header/menu/ItemMenu.js → ...components/layout/header/menu/ItemMenu.js b/...components/layout/header/menu/ItemMenu.js → ...components/layout/header/menu/ItemMenu.js
diff --git a/...components/layout/header/menu/UserMenu.js → ...components/layout/header/menu/UserMenu.js b/...components/layout/header/menu/UserMenu.js → ...components/layout/header/menu/UserMenu.js
diff --git a/...omponents/layout/navigation/Navigation.js → ...omponents/layout/navigation/Navigation.js b/...omponents/layout/navigation/Navigation.js → ...omponents/layout/navigation/Navigation.js
diff --git a/...ui/src/components/layout/search/Search.js → ...eb/src/components/layout/search/Search.js b/...ui/src/components/layout/search/Search.js → ...eb/src/components/layout/search/Search.js
diff --git a/...ents/layout/search/debounced/Debounced.js → ...ents/layout/search/debounced/Debounced.js b/...ents/layout/search/debounced/Debounced.js → ...ents/layout/search/debounced/Debounced.js
diff --git a/...ayout/search/searchRecord/SearchRecord.js → ...ayout/search/searchRecord/SearchRecord.js b/...ayout/search/searchRecord/SearchRecord.js → ...ayout/search/searchRecord/SearchRecord.js
diff --git a/...rc/components/pages/auth/AuthContainer.js → ...rc/components/pages/auth/AuthContainer.js b/...rc/components/pages/auth/AuthContainer.js → ...rc/components/pages/auth/AuthContainer.js
diff --git a/...rc/components/pages/auth/HandleSession.js → ...rc/components/pages/auth/HandleSession.js b/...rc/components/pages/auth/HandleSession.js → ...rc/components/pages/auth/HandleSession.js
diff --git a/.../src/components/pages/auth/login/Login.js → .../src/components/pages/auth/login/Login.js b/.../src/components/pages/auth/login/Login.js → .../src/components/pages/auth/login/Login.js
diff --git a/...omponents/pages/auth/register/Register.js → ...omponents/pages/auth/register/Register.js b/...omponents/pages/auth/register/Register.js → ...omponents/pages/auth/register/Register.js
diff --git a/...main/ui/src/components/pages/home/Home.js → app/web/src/components/pages/home/Home.js b/...main/ui/src/components/pages/home/Home.js → app/web/src/components/pages/home/Home.js
diff --git a/...c/components/pages/home/HomeController.js → ...c/components/pages/home/HomeController.js b/...c/components/pages/home/HomeController.js → ...c/components/pages/home/HomeController.js
diff --git a/.../components/pages/home/hcards/InfoCard.js → .../components/pages/home/hcards/InfoCard.js b/.../components/pages/home/hcards/InfoCard.js → .../components/pages/home/hcards/InfoCard.js
diff --git a/...nts/pages/home/hcards/InfoCardSkeleton.js → ...nts/pages/home/hcards/InfoCardSkeleton.js b/...nts/pages/home/hcards/InfoCardSkeleton.js → ...nts/pages/home/hcards/InfoCardSkeleton.js
diff --git a/.../components/pages/home/hcards/TeamCard.js → .../components/pages/home/hcards/TeamCard.js b/.../components/pages/home/hcards/TeamCard.js → .../components/pages/home/hcards/TeamCard.js
diff --git a/...nents/pages/home/teamHeader/TeamHeader.js → ...nents/pages/home/teamHeader/TeamHeader.js b/...nents/pages/home/teamHeader/TeamHeader.js → ...nents/pages/home/teamHeader/TeamHeader.js
diff --git a/...mponents/pages/settings/ChangePassword.js → ...mponents/pages/settings/ChangePassword.js b/...mponents/pages/settings/ChangePassword.js → ...mponents/pages/settings/ChangePassword.js
diff --git a/...c/components/pages/settings/Profession.js → ...c/components/pages/settings/Profession.js b/...c/components/pages/settings/Profession.js → ...c/components/pages/settings/Profession.js
diff --git a/...src/components/pages/settings/Settings.js → ...src/components/pages/settings/Settings.js b/...src/components/pages/settings/Settings.js → ...src/components/pages/settings/Settings.js
diff --git a/...c/components/pages/settings/UserAvatar.js → ...c/components/pages/settings/UserAvatar.js b/...c/components/pages/settings/UserAvatar.js → ...c/components/pages/settings/UserAvatar.js
diff --git a/...ponents/pages/settings/UserInformation.js → ...ponents/pages/settings/UserInformation.js b/...ponents/pages/settings/UserInformation.js → ...ponents/pages/settings/UserInformation.js
diff --git a/src/main/ui/src/components/ui/InputGroup.js → app/web/src/components/ui/InputGroup.js b/src/main/ui/src/components/ui/InputGroup.js → app/web/src/components/ui/InputGroup.js
diff --git a/...ui/src/components/ui/avatar/UserAvatar.js → ...eb/src/components/ui/avatar/UserAvatar.js b/...ui/src/components/ui/avatar/UserAvatar.js → ...eb/src/components/ui/avatar/UserAvatar.js
diff --git a/src/main/ui/src/components/ui/grid/Grid.js → app/web/src/components/ui/grid/Grid.js b/src/main/ui/src/components/ui/grid/Grid.js → app/web/src/components/ui/grid/Grid.js
diff --git a/src/main/ui/src/index.js → app/web/src/index.js b/src/main/ui/src/index.js → app/web/src/index.js
diff --git a/.../ui/src/store/controllers/uiController.js → ...web/src/store/controllers/uiController.js b/.../ui/src/store/controllers/uiController.js → ...web/src/store/controllers/uiController.js
diff --git a/...i/src/store/controllers/userController.js → ...b/src/store/controllers/userController.js b/...i/src/store/controllers/userController.js → ...b/src/store/controllers/userController.js
diff --git a/src/main/ui/src/store/slices/teamSlice.js → app/web/src/store/slices/teamSlice.js b/src/main/ui/src/store/slices/teamSlice.js → app/web/src/store/slices/teamSlice.js
diff --git a/src/main/ui/src/store/slices/uiSlice.js → app/web/src/store/slices/uiSlice.js b/src/main/ui/src/store/slices/uiSlice.js → app/web/src/store/slices/uiSlice.js
diff --git a/src/main/ui/src/store/slices/userSlice.js → app/web/src/store/slices/userSlice.js b/src/main/ui/src/store/slices/userSlice.js → app/web/src/store/slices/userSlice.js
diff --git a/src/main/ui/src/store/store.js → app/web/src/store/store.js b/src/main/ui/src/store/store.js → app/web/src/store/store.js
diff --git a/src/main/ui/src/theme/dark/dark.js → app/web/src/theme/dark/dark.js b/src/main/ui/src/theme/dark/dark.js → app/web/src/theme/dark/dark.js
diff --git a/src/main/db/script/tasks.sql → db/script/init.sql b/src/main/db/script/tasks.sql → db/script/init.sql
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -30,7 +30,7 @@ services:
       - SPRING_DATASOURCE_PASSWORD=${SPRING_DB_PASSWORD}
 
   frontend-production:
-    container_name: dashNet-react-fe-pro
+    container_name: dashNet-web-production
     build:
       context: .
       dockerfile: docker/React.Production.Dockerfile
@@ -40,7 +40,7 @@ services:
       - 'production'
 
   frontend-development:
-    container_name: dashNet-react-fe
+    container_name: dashNet-web-development
     profiles:
       - 'react'
       - 'no-admin'
@@ -95,7 +95,7 @@ services:
 
   phpmyadmin:
     image: phpmyadmin/phpmyadmin
-    container_name: php_my_admin
+    container_name: dashNet-php-my-admin
     profiles:
       - 'phpadmin'
       - 'mysql-admin'

diff --git a/docker/MySql.Dockerfile b/docker/MySql.Dockerfile
@@ -2,4 +2,4 @@ FROM mysql:latest
 
 LABEL maintainer="Boris Blagojević <[email protected]>"
 
-COPY ./src/main/db/script /docker-entrypoint-initdb.d/
+COPY ./db/script /docker-entrypoint-initdb.d/
diff --git a/docker/React.Dockerfile b/docker/React.Dockerfile
@@ -4,10 +4,10 @@ LABEL maintainer="Boris Blagojević <[email protected]>"
 
 WORKDIR /app
 
-COPY ./src/main/ui/package*.json .
+COPY ./app/web/package*.json .
 
 RUN npm install
 
-COPY ./src/main/ui .
+COPY ./app/web .
 
 CMD npm start
diff --git a/docker/Spring.Dockerfile b/docker/Spring.Dockerfile
@@ -2,14 +2,14 @@ FROM eclipse-temurin:17-jdk-alpine
 
 LABEL maintainer="Boris Blagojević <[email protected]>"
 
-COPY .mvn/ .mvn
-COPY mvnw mvnw.cmd pom.xml ./
+COPY ./service/.mvn/ .mvn
+COPY ./service/mvnw ./service/mvnw.cmd ./service/pom.xml ./
 
 RUN dos2unix mvnw && chmod +x mvnw
 
 RUN ./mvnw dependency:resolve
 
-COPY src/main/java ./src/main/java
-COPY src/main/resources ./src/main/resources
+COPY ./service/src/main/java ./src/main/java
+COPY ./service/src/main/resources ./src/main/resources
 
 CMD ["./mvnw", "spring-boot:run"]
diff --git a/.mvn/wrapper/MavenWrapperDownloader.java → .../.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java → .../.mvn/wrapper/MavenWrapperDownloader.java
diff --git a/.mvn/wrapper/maven-wrapper.jar → service/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar → service/.mvn/wrapper/maven-wrapper.jar
diff --git a/.mvn/wrapper/maven-wrapper.properties → ...ice/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties → ...ice/.mvn/wrapper/maven-wrapper.properties
diff --git a/mvnw → service/mvnw b/mvnw → service/mvnw
diff --git a/mvnw.cmd → service/mvnw.cmd b/mvnw.cmd → service/mvnw.cmd
diff --git a/pom.xml → service/pom.xml b/pom.xml → service/pom.xml
diff --git a/...m/dashnet/dashNet/DashNetApplication.java → ...m/dashnet/dashNet/DashNetApplication.java b/...m/dashnet/dashNet/DashNetApplication.java → ...m/dashnet/dashNet/DashNetApplication.java
diff --git a/...shnet/dashNet/Security/JwtAuthFilter.java → ...shnet/dashNet/Security/JwtAuthFilter.java b/...shnet/dashNet/Security/JwtAuthFilter.java → ...shnet/dashNet/Security/JwtAuthFilter.java
diff --git a/...om/dashnet/dashNet/Security/JwtUtils.java → ...om/dashnet/dashNet/Security/JwtUtils.java b/...om/dashnet/dashNet/Security/JwtUtils.java → ...om/dashnet/dashNet/Security/JwtUtils.java
diff --git a/...hnet/dashNet/Security/SecurityConfig.java → ...hnet/dashNet/Security/SecurityConfig.java b/...hnet/dashNet/Security/SecurityConfig.java → ...hnet/dashNet/Security/SecurityConfig.java
diff --git a/...hNet/Security/UserDetailsServiceImpl.java → ...hNet/Security/UserDetailsServiceImpl.java b/...hNet/Security/UserDetailsServiceImpl.java → ...hNet/Security/UserDetailsServiceImpl.java
diff --git a/...hNet/Task/Advices/TaskNotFoundAdvice.java → ...hNet/Task/Advices/TaskNotFoundAdvice.java b/...hNet/Task/Advices/TaskNotFoundAdvice.java → ...hNet/Task/Advices/TaskNotFoundAdvice.java
diff --git a/...ask/Exceptions/TaskNotFoundException.java → ...ask/Exceptions/TaskNotFoundException.java b/...ask/Exceptions/TaskNotFoundException.java → ...ask/Exceptions/TaskNotFoundException.java
diff --git a/...n/java/com/dashnet/dashNet/Task/Task.java → ...n/java/com/dashnet/dashNet/Task/Task.java b/...n/java/com/dashnet/dashNet/Task/Task.java → ...n/java/com/dashnet/dashNet/Task/Task.java
diff --git a/.../dashnet/dashNet/Task/TaskController.java → .../dashnet/dashNet/Task/TaskController.java b/.../dashnet/dashNet/Task/TaskController.java → .../dashnet/dashNet/Task/TaskController.java
diff --git a/.../dashnet/dashNet/Task/TaskRepository.java → .../dashnet/dashNet/Task/TaskRepository.java b/.../dashnet/dashNet/Task/TaskRepository.java → .../dashnet/dashNet/Task/TaskRepository.java
diff --git a/...com/dashnet/dashNet/Task/TaskService.java → ...com/dashnet/dashNet/Task/TaskService.java b/...com/dashnet/dashNet/Task/TaskService.java → ...com/dashnet/dashNet/Task/TaskService.java
diff --git a/...n/java/com/dashnet/dashNet/User/User.java → ...n/java/com/dashnet/dashNet/User/User.java b/...n/java/com/dashnet/dashNet/User/User.java → ...n/java/com/dashnet/dashNet/User/User.java
diff --git a/.../dashnet/dashNet/User/UserController.java → .../dashnet/dashNet/User/UserController.java b/.../dashnet/dashNet/User/UserController.java → .../dashnet/dashNet/User/UserController.java
diff --git a/.../dashnet/dashNet/User/UserRepository.java → .../dashnet/dashNet/User/UserRepository.java b/.../dashnet/dashNet/User/UserRepository.java → .../dashnet/dashNet/User/UserRepository.java
diff --git a/...om/dashnet/dashNet/User/UserResponse.java → ...om/dashnet/dashNet/User/UserResponse.java b/...om/dashnet/dashNet/User/UserResponse.java → ...om/dashnet/dashNet/User/UserResponse.java
diff --git a/...com/dashnet/dashNet/User/UserService.java → ...com/dashnet/dashNet/User/UserService.java b/...com/dashnet/dashNet/User/UserService.java → ...com/dashnet/dashNet/User/UserService.java
diff --git a/src/main/resources/application.properties → ...src/main/resources/application.properties b/src/main/resources/application.properties → ...src/main/resources/application.properties
diff --git a/...hnet/dashNet/DashNetApplicationTests.java → ...hnet/dashNet/DashNetApplicationTests.java b/...hnet/dashNet/DashNetApplicationTests.java → ...hnet/dashNet/DashNetApplicationTests.java
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@ FROM mysql:latest

		LABEL maintainer="Boris Blagojević <[email protected]>"

		COPY ./src/main/db/script /docker-entrypoint-initdb.d/
		COPY ./db/script /docker-entrypoint-initdb.d/