From 8f06ddfa33a1511dad1265d4087d7ad18a5f76d2 Mon Sep 17 00:00:00 2001 From: Sam Millington Date: Fri, 27 Sep 2019 16:39:57 +0100 Subject: [PATCH] [BAEL-17651] - spring-boot-angular & spring-boot-angular-ecommerce merge (#7866) * [BAEL-17651] - angular merge * Added article link the readme * added colon * removed spring-boot-angular-ecommerce from parent pom --- pom.xml | 2 - spring-boot-angular-ecommerce/README.md | 6 -- spring-boot-angular-ecommerce/pom.xml | 81 ------------------ spring-boot-angular/README.md | 5 +- spring-boot-angular/pom.xml | 3 +- .../ecommerce/EcommerceApplication.java | 0 .../ecommerce/controller/OrderController.java | 0 .../controller/ProductController.java | 0 .../ecommerce/dto/OrderProductDto.java | 0 .../exception/ApiExceptionHandler.java | 0 .../exception/ResourceNotFoundException.java | 0 .../com/baeldung/ecommerce/model/Order.java | 0 .../ecommerce/model/OrderProduct.java | 0 .../ecommerce/model/OrderProductPK.java | 0 .../baeldung/ecommerce/model/OrderStatus.java | 0 .../com/baeldung/ecommerce/model/Product.java | 0 .../repository/OrderProductRepository.java | 0 .../ecommerce/repository/OrderRepository.java | 0 .../repository/ProductRepository.java | 0 .../service/OrderProductService.java | 0 .../service/OrderProductServiceImpl.java | 0 .../ecommerce/service/OrderService.java | 0 .../ecommerce/service/OrderServiceImpl.java | 0 .../ecommerce/service/ProductService.java | 0 .../ecommerce/service/ProductServiceImpl.java | 0 .../main/js/application}/.angular-cli.json | 0 .../main/js/application}/.editorconfig | 0 .../main/js/application}/.gitignore | 4 +- .../main/js/application}/README.md | 0 .../main/js/application}/e2e/app.e2e-spec.ts | 0 .../src/main/js/application/e2e}/app.po.ts | 0 .../js/application}/e2e/tsconfig.e2e.json | 0 .../main/js/application}/karma.conf.js | 0 .../main/js/application}/package-lock.json | 0 .../main/js/application}/package.json | 0 .../main/js/application}/protractor.conf.js | 0 .../src/app/app-routing.module.ts | 0 .../js/application}/src/app/app.component.css | 0 .../application}/src/app/app.component.html | 0 .../src/app/app.component.spec.ts | 0 .../js/application}/src/app/app.component.ts | 0 .../js/application}/src/app/app.module.ts | 0 .../js/application}/src/app/model/user.ts | 0 .../src/app/service/user.service.spec.ts | 0 .../src/app/service/user.service.ts | 0 .../src/app/user-form/user-form.component.css | 0 .../app/user-form/user-form.component.html | 0 .../app/user-form/user-form.component.spec.ts | 0 .../src/app/user-form/user-form.component.ts | 0 .../src/app/user-list/user-list.component.css | 0 .../app/user-list/user-list.component.html | 0 .../app/user-list/user-list.component.spec.ts | 0 .../src/app/user-list/user-list.component.ts | 0 .../main/js/application}/src/assets/.gitkeep | 0 .../src/environments/environment.prod.ts | 0 .../src/environments/environment.ts | 0 .../src/main/js/application}/src/favicon.ico | Bin .../main/js/application}/src/index.html | 0 .../src/main/js/application}/src/main.ts | 0 .../main/js/application}/src/polyfills.ts | 0 .../src/main/js/application}/src/styles.css | 0 .../js/application}/src/tsconfig.app.json | 0 .../js/application}/src/tsconfig.spec.json | 0 .../main/js/application}/src/typings.d.ts | 0 .../main/js/application}/tsconfig.json | 0 .../main/js/application}/tslint.json | 0 .../src/main/js/ecommerce}/.editorconfig | 0 .../src/main/js/ecommerce}/README.md | 0 .../src/main/js/ecommerce}/angular.json | 0 .../main/js/ecommerce}/e2e/protractor.conf.js | 0 .../js/ecommerce}/e2e/src/app.e2e-spec.ts | 0 .../main/js/ecommerce/e2e/src}/app.po.ts | 0 .../main/js/ecommerce}/e2e/tsconfig.e2e.json | 0 .../src/main/js/ecommerce}/package-lock.json | 0 .../src/main/js/ecommerce}/package.json | 0 .../src/main/js/ecommerce}/proxy-conf.json | 0 .../js/ecommerce}/src/app/app.component.css | 0 .../js/ecommerce}/src/app/app.component.html | 0 .../ecommerce}/src/app/app.component.spec.ts | 0 .../js/ecommerce}/src/app/app.component.ts | 0 .../main/js/ecommerce}/src/app/app.module.ts | 0 .../src/app/ecommerce/ecommerce.component.css | 0 .../app/ecommerce/ecommerce.component.html | 0 .../app/ecommerce/ecommerce.component.spec.ts | 0 .../src/app/ecommerce/ecommerce.component.ts | 0 .../ecommerce/models/product-order.model.ts | 0 .../ecommerce/models/product-orders.model.ts | 0 .../src/app/ecommerce/models/product.model.ts | 0 .../app/ecommerce/orders/orders.component.css | 0 .../ecommerce/orders/orders.component.html | 0 .../ecommerce/orders/orders.component.spec.ts | 0 .../app/ecommerce/orders/orders.component.ts | 0 .../ecommerce/products/products.component.css | 0 .../products/products.component.html | 0 .../products/products.component.spec.ts | 0 .../ecommerce/products/products.component.ts | 0 .../ecommerce/services/EcommerceService.ts | 0 .../shopping-cart/shopping-cart.component.css | 0 .../shopping-cart.component.html | 0 .../shopping-cart.component.spec.ts | 0 .../shopping-cart/shopping-cart.component.ts | 0 .../main/js/ecommerce}/src/assets/.gitkeep | 0 .../src/main/js/ecommerce}/src/browserslist | 0 .../src/environments/environment.prod.ts | 0 .../src/environments/environment.ts | 0 .../main/js/ecommerce}/src/favicon.ico | Bin .../src/main/js/ecommerce}/src/index.html | 0 .../src/main/js/ecommerce}/src/karma.conf.js | 0 .../main/js/ecommerce}/src/main.ts | 0 .../src/main/js/ecommerce}/src/polyfills.ts | 0 .../main/js/ecommerce}/src/styles.css | 0 .../src/main/js/ecommerce}/src/test.ts | 0 .../main/js/ecommerce}/src/tsconfig.app.json | 0 .../main/js/ecommerce}/src/tsconfig.spec.json | 0 .../src/main/js/ecommerce}/src/tslint.json | 0 .../src/main/js/ecommerce}/tsconfig.json | 0 .../src/main/js/ecommerce}/tslint.json | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/logback.xml | 0 .../EcommerceApplicationIntegrationTest.java | 0 .../SpringContextIntegrationTest.java | 0 .../java/org/baeldung/SpringContextTest.java | 0 122 files changed, 7 insertions(+), 94 deletions(-) delete mode 100644 spring-boot-angular-ecommerce/README.md delete mode 100644 spring-boot-angular-ecommerce/pom.xml rename {spring-boot-angular-ecommerce => spring-boot-angular}/src/main/java/com/baeldung/ecommerce/EcommerceApplication.java (100%) rename {spring-boot-angular-ecommerce => spring-boot-angular}/src/main/java/com/baeldung/ecommerce/controller/OrderController.java (100%) rename {spring-boot-angular-ecommerce => spring-boot-angular}/src/main/java/com/baeldung/ecommerce/controller/ProductController.java (100%) rename {spring-boot-angular-ecommerce => spring-boot-angular}/src/main/java/com/baeldung/ecommerce/dto/OrderProductDto.java (100%) rename {spring-boot-angular-ecommerce => spring-boot-angular}/src/main/java/com/baeldung/ecommerce/exception/ApiExceptionHandler.java (100%) rename {spring-boot-angular-ecommerce => spring-boot-angular}/src/main/java/com/baeldung/ecommerce/exception/ResourceNotFoundException.java (100%) rename {spring-boot-angular-ecommerce => spring-boot-angular}/src/main/java/com/baeldung/ecommerce/model/Order.java (100%) rename {spring-boot-angular-ecommerce => spring-boot-angular}/src/main/java/com/baeldung/ecommerce/model/OrderProduct.java (100%) rename {spring-boot-angular-ecommerce => spring-boot-angular}/src/main/java/com/baeldung/ecommerce/model/OrderProductPK.java (100%) rename {spring-boot-angular-ecommerce => spring-boot-angular}/src/main/java/com/baeldung/ecommerce/model/OrderStatus.java (100%) rename {spring-boot-angular-ecommerce => spring-boot-angular}/src/main/java/com/baeldung/ecommerce/model/Product.java (100%) rename {spring-boot-angular-ecommerce => spring-boot-angular}/src/main/java/com/baeldung/ecommerce/repository/OrderProductRepository.java (100%) rename {spring-boot-angular-ecommerce => spring-boot-angular}/src/main/java/com/baeldung/ecommerce/repository/OrderRepository.java (100%) rename {spring-boot-angular-ecommerce => spring-boot-angular}/src/main/java/com/baeldung/ecommerce/repository/ProductRepository.java (100%) rename {spring-boot-angular-ecommerce => spring-boot-angular}/src/main/java/com/baeldung/ecommerce/service/OrderProductService.java (100%) rename {spring-boot-angular-ecommerce => spring-boot-angular}/src/main/java/com/baeldung/ecommerce/service/OrderProductServiceImpl.java (100%) rename {spring-boot-angular-ecommerce => spring-boot-angular}/src/main/java/com/baeldung/ecommerce/service/OrderService.java (100%) rename {spring-boot-angular-ecommerce => spring-boot-angular}/src/main/java/com/baeldung/ecommerce/service/OrderServiceImpl.java (100%) rename {spring-boot-angular-ecommerce => spring-boot-angular}/src/main/java/com/baeldung/ecommerce/service/ProductService.java (100%) rename {spring-boot-angular-ecommerce => spring-boot-angular}/src/main/java/com/baeldung/ecommerce/service/ProductServiceImpl.java (100%) rename spring-boot-angular/{angularclient => src/main/js/application}/.angular-cli.json (100%) rename spring-boot-angular/{angularclient => src/main/js/application}/.editorconfig (100%) rename spring-boot-angular/{angularclient => src/main/js/application}/.gitignore (82%) rename spring-boot-angular/{angularclient => src/main/js/application}/README.md (100%) rename spring-boot-angular/{angularclient => src/main/js/application}/e2e/app.e2e-spec.ts (100%) rename {spring-boot-angular-ecommerce/src/main/frontend/e2e/src => spring-boot-angular/src/main/js/application/e2e}/app.po.ts (100%) rename spring-boot-angular/{angularclient => src/main/js/application}/e2e/tsconfig.e2e.json (100%) rename spring-boot-angular/{angularclient => src/main/js/application}/karma.conf.js (100%) rename spring-boot-angular/{angularclient => src/main/js/application}/package-lock.json (100%) rename spring-boot-angular/{angularclient => src/main/js/application}/package.json (100%) rename spring-boot-angular/{angularclient => src/main/js/application}/protractor.conf.js (100%) rename spring-boot-angular/{angularclient => src/main/js/application}/src/app/app-routing.module.ts (100%) rename spring-boot-angular/{angularclient => src/main/js/application}/src/app/app.component.css (100%) rename spring-boot-angular/{angularclient => src/main/js/application}/src/app/app.component.html (100%) rename spring-boot-angular/{angularclient => src/main/js/application}/src/app/app.component.spec.ts (100%) rename spring-boot-angular/{angularclient => src/main/js/application}/src/app/app.component.ts (100%) rename spring-boot-angular/{angularclient => src/main/js/application}/src/app/app.module.ts (100%) rename spring-boot-angular/{angularclient => src/main/js/application}/src/app/model/user.ts (100%) rename spring-boot-angular/{angularclient => src/main/js/application}/src/app/service/user.service.spec.ts (100%) rename spring-boot-angular/{angularclient => src/main/js/application}/src/app/service/user.service.ts (100%) rename spring-boot-angular/{angularclient => src/main/js/application}/src/app/user-form/user-form.component.css (100%) rename spring-boot-angular/{angularclient => src/main/js/application}/src/app/user-form/user-form.component.html (100%) rename spring-boot-angular/{angularclient => src/main/js/application}/src/app/user-form/user-form.component.spec.ts (100%) rename spring-boot-angular/{angularclient => src/main/js/application}/src/app/user-form/user-form.component.ts (100%) rename spring-boot-angular/{angularclient => src/main/js/application}/src/app/user-list/user-list.component.css (100%) rename spring-boot-angular/{angularclient => src/main/js/application}/src/app/user-list/user-list.component.html (100%) rename spring-boot-angular/{angularclient => src/main/js/application}/src/app/user-list/user-list.component.spec.ts (100%) rename spring-boot-angular/{angularclient => src/main/js/application}/src/app/user-list/user-list.component.ts (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/application}/src/assets/.gitkeep (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/application}/src/environments/environment.prod.ts (100%) rename spring-boot-angular/{angularclient => src/main/js/application}/src/environments/environment.ts (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/application}/src/favicon.ico (100%) rename spring-boot-angular/{angularclient => src/main/js/application}/src/index.html (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/application}/src/main.ts (100%) rename spring-boot-angular/{angularclient => src/main/js/application}/src/polyfills.ts (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/application}/src/styles.css (100%) rename spring-boot-angular/{angularclient => src/main/js/application}/src/tsconfig.app.json (100%) rename spring-boot-angular/{angularclient => src/main/js/application}/src/tsconfig.spec.json (100%) rename spring-boot-angular/{angularclient => src/main/js/application}/src/typings.d.ts (100%) rename spring-boot-angular/{angularclient => src/main/js/application}/tsconfig.json (100%) rename spring-boot-angular/{angularclient => src/main/js/application}/tslint.json (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/ecommerce}/.editorconfig (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/ecommerce}/README.md (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/ecommerce}/angular.json (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/ecommerce}/e2e/protractor.conf.js (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/ecommerce}/e2e/src/app.e2e-spec.ts (100%) rename spring-boot-angular/{angularclient/e2e => src/main/js/ecommerce/e2e/src}/app.po.ts (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/ecommerce}/e2e/tsconfig.e2e.json (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/ecommerce}/package-lock.json (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/ecommerce}/package.json (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/ecommerce}/proxy-conf.json (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/ecommerce}/src/app/app.component.css (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/ecommerce}/src/app/app.component.html (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/ecommerce}/src/app/app.component.spec.ts (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/ecommerce}/src/app/app.component.ts (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/ecommerce}/src/app/app.module.ts (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/ecommerce}/src/app/ecommerce/ecommerce.component.css (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/ecommerce}/src/app/ecommerce/ecommerce.component.html (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/ecommerce}/src/app/ecommerce/ecommerce.component.spec.ts (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/ecommerce}/src/app/ecommerce/ecommerce.component.ts (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/ecommerce}/src/app/ecommerce/models/product-order.model.ts (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/ecommerce}/src/app/ecommerce/models/product-orders.model.ts (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/ecommerce}/src/app/ecommerce/models/product.model.ts (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/ecommerce}/src/app/ecommerce/orders/orders.component.css (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/ecommerce}/src/app/ecommerce/orders/orders.component.html (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/ecommerce}/src/app/ecommerce/orders/orders.component.spec.ts (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/ecommerce}/src/app/ecommerce/orders/orders.component.ts (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/ecommerce}/src/app/ecommerce/products/products.component.css (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/ecommerce}/src/app/ecommerce/products/products.component.html (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/ecommerce}/src/app/ecommerce/products/products.component.spec.ts (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/ecommerce}/src/app/ecommerce/products/products.component.ts (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/ecommerce}/src/app/ecommerce/services/EcommerceService.ts (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/ecommerce}/src/app/ecommerce/shopping-cart/shopping-cart.component.css (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/ecommerce}/src/app/ecommerce/shopping-cart/shopping-cart.component.html (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/ecommerce}/src/app/ecommerce/shopping-cart/shopping-cart.component.spec.ts (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/ecommerce}/src/app/ecommerce/shopping-cart/shopping-cart.component.ts (100%) rename spring-boot-angular/{angularclient => src/main/js/ecommerce}/src/assets/.gitkeep (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/ecommerce}/src/browserslist (100%) rename spring-boot-angular/{angularclient => src/main/js/ecommerce}/src/environments/environment.prod.ts (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/ecommerce}/src/environments/environment.ts (100%) rename spring-boot-angular/{angularclient => src/main/js/ecommerce}/src/favicon.ico (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/ecommerce}/src/index.html (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/ecommerce}/src/karma.conf.js (100%) rename spring-boot-angular/{angularclient => src/main/js/ecommerce}/src/main.ts (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/ecommerce}/src/polyfills.ts (100%) rename spring-boot-angular/{angularclient => src/main/js/ecommerce}/src/styles.css (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/ecommerce}/src/test.ts (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/ecommerce}/src/tsconfig.app.json (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/ecommerce}/src/tsconfig.spec.json (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/ecommerce}/src/tslint.json (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/ecommerce}/tsconfig.json (100%) rename {spring-boot-angular-ecommerce/src/main/frontend => spring-boot-angular/src/main/js/ecommerce}/tslint.json (100%) rename {spring-boot-angular-ecommerce => spring-boot-angular}/src/main/resources/application.properties (100%) rename {spring-boot-angular-ecommerce => spring-boot-angular}/src/main/resources/logback.xml (100%) rename {spring-boot-angular-ecommerce => spring-boot-angular}/src/test/java/com/baeldung/ecommerce/EcommerceApplicationIntegrationTest.java (100%) rename {spring-boot-angular-ecommerce => spring-boot-angular}/src/test/java/org/baeldung/SpringContextIntegrationTest.java (100%) rename {spring-boot-angular-ecommerce => spring-boot-angular}/src/test/java/org/baeldung/SpringContextTest.java (100%) diff --git a/pom.xml b/pom.xml index 3c335f82bd..79e5194ee8 100644 --- a/pom.xml +++ b/pom.xml @@ -671,7 +671,6 @@ spring-boot spring-boot-admin spring-boot-angular - spring-boot-angular-ecommerce spring-boot-autoconfiguration spring-boot-bootstrap spring-boot-camel @@ -1389,7 +1388,6 @@ spring-boot spring-boot-admin spring-boot-angular - spring-boot-angular-ecommerce spring-boot-autoconfiguration spring-boot-bootstrap spring-boot-camel diff --git a/spring-boot-angular-ecommerce/README.md b/spring-boot-angular-ecommerce/README.md deleted file mode 100644 index 9b592de9cc..0000000000 --- a/spring-boot-angular-ecommerce/README.md +++ /dev/null @@ -1,6 +0,0 @@ -## Spring Boot Angular Ecommerce - -This module contains articles about Spring Boot with Angular in regards to ecommerce applications. - -### Relevant Articles: -- [A Simple E-Commerce Implementation with Spring](https://www.baeldung.com/spring-angular-ecommerce) diff --git a/spring-boot-angular-ecommerce/pom.xml b/spring-boot-angular-ecommerce/pom.xml deleted file mode 100644 index 510e6c6ec3..0000000000 --- a/spring-boot-angular-ecommerce/pom.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - 4.0.0 - spring-boot-angular-ecommerce - 0.0.1-SNAPSHOT - spring-boot-angular-ecommerce - jar - Spring Boot Angular E-commerce Appliciation - - - com.baeldung - parent-modules - 1.0.0-SNAPSHOT - - - - - - org.springframework.boot - spring-boot-dependencies - ${spring.boot.version} - pom - import - - - - - - - org.springframework.boot - spring-boot-starter-data-jpa - ${spring.boot.version} - - - org.springframework.boot - spring-boot-starter-web - ${spring.boot.version} - - - org.springframework.boot - spring-boot-devtools - ${spring.boot.version} - runtime - - - com.h2database - h2 - 1.4.197 - runtime - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - 2.9.6 - - - org.springframework.boot - spring-boot-starter-test - ${spring.boot.version} - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - ${spring-boot-maven-plugin.version} - - - - - - UTF-8 - UTF-8 - 2.0.3.RELEASE - 2.0.4.RELEASE - - diff --git a/spring-boot-angular/README.md b/spring-boot-angular/README.md index a1904c2c17..027b23202e 100644 --- a/spring-boot-angular/README.md +++ b/spring-boot-angular/README.md @@ -1,7 +1,8 @@ ## Spring Boot Angular -This module contains articles about Spring Boot with Angular +This module contains articles about Spring Boot with Angular ### Relevant Articles: -- [Building a Web Application with Spring Boot and Angular](https://www.baeldung.com/spring-boot-angular-web) +- [Building a Web Application with Spring Boot and Angular](https://www.baeldung.com/spring-boot-angular-web) +- [A Simple E-Commerce Implementation with Spring](https://www.baeldung.com/spring-angular-ecommerce) diff --git a/spring-boot-angular/pom.xml b/spring-boot-angular/pom.xml index 71c46cb7f5..8c26668752 100644 --- a/spring-boot-angular/pom.xml +++ b/spring-boot-angular/pom.xml @@ -7,11 +7,12 @@ 1.0 jar + parent-boot-2 com.baeldung 0.0.1-SNAPSHOT - ../../parent-boot-2 + ../parent-boot-2 diff --git a/spring-boot-angular-ecommerce/src/main/java/com/baeldung/ecommerce/EcommerceApplication.java b/spring-boot-angular/src/main/java/com/baeldung/ecommerce/EcommerceApplication.java similarity index 100% rename from spring-boot-angular-ecommerce/src/main/java/com/baeldung/ecommerce/EcommerceApplication.java rename to spring-boot-angular/src/main/java/com/baeldung/ecommerce/EcommerceApplication.java diff --git a/spring-boot-angular-ecommerce/src/main/java/com/baeldung/ecommerce/controller/OrderController.java b/spring-boot-angular/src/main/java/com/baeldung/ecommerce/controller/OrderController.java similarity index 100% rename from spring-boot-angular-ecommerce/src/main/java/com/baeldung/ecommerce/controller/OrderController.java rename to spring-boot-angular/src/main/java/com/baeldung/ecommerce/controller/OrderController.java diff --git a/spring-boot-angular-ecommerce/src/main/java/com/baeldung/ecommerce/controller/ProductController.java b/spring-boot-angular/src/main/java/com/baeldung/ecommerce/controller/ProductController.java similarity index 100% rename from spring-boot-angular-ecommerce/src/main/java/com/baeldung/ecommerce/controller/ProductController.java rename to spring-boot-angular/src/main/java/com/baeldung/ecommerce/controller/ProductController.java diff --git a/spring-boot-angular-ecommerce/src/main/java/com/baeldung/ecommerce/dto/OrderProductDto.java b/spring-boot-angular/src/main/java/com/baeldung/ecommerce/dto/OrderProductDto.java similarity index 100% rename from spring-boot-angular-ecommerce/src/main/java/com/baeldung/ecommerce/dto/OrderProductDto.java rename to spring-boot-angular/src/main/java/com/baeldung/ecommerce/dto/OrderProductDto.java diff --git a/spring-boot-angular-ecommerce/src/main/java/com/baeldung/ecommerce/exception/ApiExceptionHandler.java b/spring-boot-angular/src/main/java/com/baeldung/ecommerce/exception/ApiExceptionHandler.java similarity index 100% rename from spring-boot-angular-ecommerce/src/main/java/com/baeldung/ecommerce/exception/ApiExceptionHandler.java rename to spring-boot-angular/src/main/java/com/baeldung/ecommerce/exception/ApiExceptionHandler.java diff --git a/spring-boot-angular-ecommerce/src/main/java/com/baeldung/ecommerce/exception/ResourceNotFoundException.java b/spring-boot-angular/src/main/java/com/baeldung/ecommerce/exception/ResourceNotFoundException.java similarity index 100% rename from spring-boot-angular-ecommerce/src/main/java/com/baeldung/ecommerce/exception/ResourceNotFoundException.java rename to spring-boot-angular/src/main/java/com/baeldung/ecommerce/exception/ResourceNotFoundException.java diff --git a/spring-boot-angular-ecommerce/src/main/java/com/baeldung/ecommerce/model/Order.java b/spring-boot-angular/src/main/java/com/baeldung/ecommerce/model/Order.java similarity index 100% rename from spring-boot-angular-ecommerce/src/main/java/com/baeldung/ecommerce/model/Order.java rename to spring-boot-angular/src/main/java/com/baeldung/ecommerce/model/Order.java diff --git a/spring-boot-angular-ecommerce/src/main/java/com/baeldung/ecommerce/model/OrderProduct.java b/spring-boot-angular/src/main/java/com/baeldung/ecommerce/model/OrderProduct.java similarity index 100% rename from spring-boot-angular-ecommerce/src/main/java/com/baeldung/ecommerce/model/OrderProduct.java rename to spring-boot-angular/src/main/java/com/baeldung/ecommerce/model/OrderProduct.java diff --git a/spring-boot-angular-ecommerce/src/main/java/com/baeldung/ecommerce/model/OrderProductPK.java b/spring-boot-angular/src/main/java/com/baeldung/ecommerce/model/OrderProductPK.java similarity index 100% rename from spring-boot-angular-ecommerce/src/main/java/com/baeldung/ecommerce/model/OrderProductPK.java rename to spring-boot-angular/src/main/java/com/baeldung/ecommerce/model/OrderProductPK.java diff --git a/spring-boot-angular-ecommerce/src/main/java/com/baeldung/ecommerce/model/OrderStatus.java b/spring-boot-angular/src/main/java/com/baeldung/ecommerce/model/OrderStatus.java similarity index 100% rename from spring-boot-angular-ecommerce/src/main/java/com/baeldung/ecommerce/model/OrderStatus.java rename to spring-boot-angular/src/main/java/com/baeldung/ecommerce/model/OrderStatus.java diff --git a/spring-boot-angular-ecommerce/src/main/java/com/baeldung/ecommerce/model/Product.java b/spring-boot-angular/src/main/java/com/baeldung/ecommerce/model/Product.java similarity index 100% rename from spring-boot-angular-ecommerce/src/main/java/com/baeldung/ecommerce/model/Product.java rename to spring-boot-angular/src/main/java/com/baeldung/ecommerce/model/Product.java diff --git a/spring-boot-angular-ecommerce/src/main/java/com/baeldung/ecommerce/repository/OrderProductRepository.java b/spring-boot-angular/src/main/java/com/baeldung/ecommerce/repository/OrderProductRepository.java similarity index 100% rename from spring-boot-angular-ecommerce/src/main/java/com/baeldung/ecommerce/repository/OrderProductRepository.java rename to spring-boot-angular/src/main/java/com/baeldung/ecommerce/repository/OrderProductRepository.java diff --git a/spring-boot-angular-ecommerce/src/main/java/com/baeldung/ecommerce/repository/OrderRepository.java b/spring-boot-angular/src/main/java/com/baeldung/ecommerce/repository/OrderRepository.java similarity index 100% rename from spring-boot-angular-ecommerce/src/main/java/com/baeldung/ecommerce/repository/OrderRepository.java rename to spring-boot-angular/src/main/java/com/baeldung/ecommerce/repository/OrderRepository.java diff --git a/spring-boot-angular-ecommerce/src/main/java/com/baeldung/ecommerce/repository/ProductRepository.java b/spring-boot-angular/src/main/java/com/baeldung/ecommerce/repository/ProductRepository.java similarity index 100% rename from spring-boot-angular-ecommerce/src/main/java/com/baeldung/ecommerce/repository/ProductRepository.java rename to spring-boot-angular/src/main/java/com/baeldung/ecommerce/repository/ProductRepository.java diff --git a/spring-boot-angular-ecommerce/src/main/java/com/baeldung/ecommerce/service/OrderProductService.java b/spring-boot-angular/src/main/java/com/baeldung/ecommerce/service/OrderProductService.java similarity index 100% rename from spring-boot-angular-ecommerce/src/main/java/com/baeldung/ecommerce/service/OrderProductService.java rename to spring-boot-angular/src/main/java/com/baeldung/ecommerce/service/OrderProductService.java diff --git a/spring-boot-angular-ecommerce/src/main/java/com/baeldung/ecommerce/service/OrderProductServiceImpl.java b/spring-boot-angular/src/main/java/com/baeldung/ecommerce/service/OrderProductServiceImpl.java similarity index 100% rename from spring-boot-angular-ecommerce/src/main/java/com/baeldung/ecommerce/service/OrderProductServiceImpl.java rename to spring-boot-angular/src/main/java/com/baeldung/ecommerce/service/OrderProductServiceImpl.java diff --git a/spring-boot-angular-ecommerce/src/main/java/com/baeldung/ecommerce/service/OrderService.java b/spring-boot-angular/src/main/java/com/baeldung/ecommerce/service/OrderService.java similarity index 100% rename from spring-boot-angular-ecommerce/src/main/java/com/baeldung/ecommerce/service/OrderService.java rename to spring-boot-angular/src/main/java/com/baeldung/ecommerce/service/OrderService.java diff --git a/spring-boot-angular-ecommerce/src/main/java/com/baeldung/ecommerce/service/OrderServiceImpl.java b/spring-boot-angular/src/main/java/com/baeldung/ecommerce/service/OrderServiceImpl.java similarity index 100% rename from spring-boot-angular-ecommerce/src/main/java/com/baeldung/ecommerce/service/OrderServiceImpl.java rename to spring-boot-angular/src/main/java/com/baeldung/ecommerce/service/OrderServiceImpl.java diff --git a/spring-boot-angular-ecommerce/src/main/java/com/baeldung/ecommerce/service/ProductService.java b/spring-boot-angular/src/main/java/com/baeldung/ecommerce/service/ProductService.java similarity index 100% rename from spring-boot-angular-ecommerce/src/main/java/com/baeldung/ecommerce/service/ProductService.java rename to spring-boot-angular/src/main/java/com/baeldung/ecommerce/service/ProductService.java diff --git a/spring-boot-angular-ecommerce/src/main/java/com/baeldung/ecommerce/service/ProductServiceImpl.java b/spring-boot-angular/src/main/java/com/baeldung/ecommerce/service/ProductServiceImpl.java similarity index 100% rename from spring-boot-angular-ecommerce/src/main/java/com/baeldung/ecommerce/service/ProductServiceImpl.java rename to spring-boot-angular/src/main/java/com/baeldung/ecommerce/service/ProductServiceImpl.java diff --git a/spring-boot-angular/angularclient/.angular-cli.json b/spring-boot-angular/src/main/js/application/.angular-cli.json similarity index 100% rename from spring-boot-angular/angularclient/.angular-cli.json rename to spring-boot-angular/src/main/js/application/.angular-cli.json diff --git a/spring-boot-angular/angularclient/.editorconfig b/spring-boot-angular/src/main/js/application/.editorconfig similarity index 100% rename from spring-boot-angular/angularclient/.editorconfig rename to spring-boot-angular/src/main/js/application/.editorconfig diff --git a/spring-boot-angular/angularclient/.gitignore b/spring-boot-angular/src/main/js/application/.gitignore similarity index 82% rename from spring-boot-angular/angularclient/.gitignore rename to spring-boot-angular/src/main/js/application/.gitignore index eabf65e51a..0537fca516 100644 --- a/spring-boot-angular/angularclient/.gitignore +++ b/spring-boot-angular/src/main/js/application/.gitignore @@ -36,8 +36,8 @@ testem.log /typings # e2e -/e2e/*.js -/e2e/*.map +/spring-boot-angular/src/main/js/application/e2e/*.js +/spring-boot-angular/src/main/js/application/e2e/*.map # System Files .DS_Store diff --git a/spring-boot-angular/angularclient/README.md b/spring-boot-angular/src/main/js/application/README.md similarity index 100% rename from spring-boot-angular/angularclient/README.md rename to spring-boot-angular/src/main/js/application/README.md diff --git a/spring-boot-angular/angularclient/e2e/app.e2e-spec.ts b/spring-boot-angular/src/main/js/application/e2e/app.e2e-spec.ts similarity index 100% rename from spring-boot-angular/angularclient/e2e/app.e2e-spec.ts rename to spring-boot-angular/src/main/js/application/e2e/app.e2e-spec.ts diff --git a/spring-boot-angular-ecommerce/src/main/frontend/e2e/src/app.po.ts b/spring-boot-angular/src/main/js/application/e2e/app.po.ts similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/e2e/src/app.po.ts rename to spring-boot-angular/src/main/js/application/e2e/app.po.ts diff --git a/spring-boot-angular/angularclient/e2e/tsconfig.e2e.json b/spring-boot-angular/src/main/js/application/e2e/tsconfig.e2e.json similarity index 100% rename from spring-boot-angular/angularclient/e2e/tsconfig.e2e.json rename to spring-boot-angular/src/main/js/application/e2e/tsconfig.e2e.json diff --git a/spring-boot-angular/angularclient/karma.conf.js b/spring-boot-angular/src/main/js/application/karma.conf.js similarity index 100% rename from spring-boot-angular/angularclient/karma.conf.js rename to spring-boot-angular/src/main/js/application/karma.conf.js diff --git a/spring-boot-angular/angularclient/package-lock.json b/spring-boot-angular/src/main/js/application/package-lock.json similarity index 100% rename from spring-boot-angular/angularclient/package-lock.json rename to spring-boot-angular/src/main/js/application/package-lock.json diff --git a/spring-boot-angular/angularclient/package.json b/spring-boot-angular/src/main/js/application/package.json similarity index 100% rename from spring-boot-angular/angularclient/package.json rename to spring-boot-angular/src/main/js/application/package.json diff --git a/spring-boot-angular/angularclient/protractor.conf.js b/spring-boot-angular/src/main/js/application/protractor.conf.js similarity index 100% rename from spring-boot-angular/angularclient/protractor.conf.js rename to spring-boot-angular/src/main/js/application/protractor.conf.js diff --git a/spring-boot-angular/angularclient/src/app/app-routing.module.ts b/spring-boot-angular/src/main/js/application/src/app/app-routing.module.ts similarity index 100% rename from spring-boot-angular/angularclient/src/app/app-routing.module.ts rename to spring-boot-angular/src/main/js/application/src/app/app-routing.module.ts diff --git a/spring-boot-angular/angularclient/src/app/app.component.css b/spring-boot-angular/src/main/js/application/src/app/app.component.css similarity index 100% rename from spring-boot-angular/angularclient/src/app/app.component.css rename to spring-boot-angular/src/main/js/application/src/app/app.component.css diff --git a/spring-boot-angular/angularclient/src/app/app.component.html b/spring-boot-angular/src/main/js/application/src/app/app.component.html similarity index 100% rename from spring-boot-angular/angularclient/src/app/app.component.html rename to spring-boot-angular/src/main/js/application/src/app/app.component.html diff --git a/spring-boot-angular/angularclient/src/app/app.component.spec.ts b/spring-boot-angular/src/main/js/application/src/app/app.component.spec.ts similarity index 100% rename from spring-boot-angular/angularclient/src/app/app.component.spec.ts rename to spring-boot-angular/src/main/js/application/src/app/app.component.spec.ts diff --git a/spring-boot-angular/angularclient/src/app/app.component.ts b/spring-boot-angular/src/main/js/application/src/app/app.component.ts similarity index 100% rename from spring-boot-angular/angularclient/src/app/app.component.ts rename to spring-boot-angular/src/main/js/application/src/app/app.component.ts diff --git a/spring-boot-angular/angularclient/src/app/app.module.ts b/spring-boot-angular/src/main/js/application/src/app/app.module.ts similarity index 100% rename from spring-boot-angular/angularclient/src/app/app.module.ts rename to spring-boot-angular/src/main/js/application/src/app/app.module.ts diff --git a/spring-boot-angular/angularclient/src/app/model/user.ts b/spring-boot-angular/src/main/js/application/src/app/model/user.ts similarity index 100% rename from spring-boot-angular/angularclient/src/app/model/user.ts rename to spring-boot-angular/src/main/js/application/src/app/model/user.ts diff --git a/spring-boot-angular/angularclient/src/app/service/user.service.spec.ts b/spring-boot-angular/src/main/js/application/src/app/service/user.service.spec.ts similarity index 100% rename from spring-boot-angular/angularclient/src/app/service/user.service.spec.ts rename to spring-boot-angular/src/main/js/application/src/app/service/user.service.spec.ts diff --git a/spring-boot-angular/angularclient/src/app/service/user.service.ts b/spring-boot-angular/src/main/js/application/src/app/service/user.service.ts similarity index 100% rename from spring-boot-angular/angularclient/src/app/service/user.service.ts rename to spring-boot-angular/src/main/js/application/src/app/service/user.service.ts diff --git a/spring-boot-angular/angularclient/src/app/user-form/user-form.component.css b/spring-boot-angular/src/main/js/application/src/app/user-form/user-form.component.css similarity index 100% rename from spring-boot-angular/angularclient/src/app/user-form/user-form.component.css rename to spring-boot-angular/src/main/js/application/src/app/user-form/user-form.component.css diff --git a/spring-boot-angular/angularclient/src/app/user-form/user-form.component.html b/spring-boot-angular/src/main/js/application/src/app/user-form/user-form.component.html similarity index 100% rename from spring-boot-angular/angularclient/src/app/user-form/user-form.component.html rename to spring-boot-angular/src/main/js/application/src/app/user-form/user-form.component.html diff --git a/spring-boot-angular/angularclient/src/app/user-form/user-form.component.spec.ts b/spring-boot-angular/src/main/js/application/src/app/user-form/user-form.component.spec.ts similarity index 100% rename from spring-boot-angular/angularclient/src/app/user-form/user-form.component.spec.ts rename to spring-boot-angular/src/main/js/application/src/app/user-form/user-form.component.spec.ts diff --git a/spring-boot-angular/angularclient/src/app/user-form/user-form.component.ts b/spring-boot-angular/src/main/js/application/src/app/user-form/user-form.component.ts similarity index 100% rename from spring-boot-angular/angularclient/src/app/user-form/user-form.component.ts rename to spring-boot-angular/src/main/js/application/src/app/user-form/user-form.component.ts diff --git a/spring-boot-angular/angularclient/src/app/user-list/user-list.component.css b/spring-boot-angular/src/main/js/application/src/app/user-list/user-list.component.css similarity index 100% rename from spring-boot-angular/angularclient/src/app/user-list/user-list.component.css rename to spring-boot-angular/src/main/js/application/src/app/user-list/user-list.component.css diff --git a/spring-boot-angular/angularclient/src/app/user-list/user-list.component.html b/spring-boot-angular/src/main/js/application/src/app/user-list/user-list.component.html similarity index 100% rename from spring-boot-angular/angularclient/src/app/user-list/user-list.component.html rename to spring-boot-angular/src/main/js/application/src/app/user-list/user-list.component.html diff --git a/spring-boot-angular/angularclient/src/app/user-list/user-list.component.spec.ts b/spring-boot-angular/src/main/js/application/src/app/user-list/user-list.component.spec.ts similarity index 100% rename from spring-boot-angular/angularclient/src/app/user-list/user-list.component.spec.ts rename to spring-boot-angular/src/main/js/application/src/app/user-list/user-list.component.spec.ts diff --git a/spring-boot-angular/angularclient/src/app/user-list/user-list.component.ts b/spring-boot-angular/src/main/js/application/src/app/user-list/user-list.component.ts similarity index 100% rename from spring-boot-angular/angularclient/src/app/user-list/user-list.component.ts rename to spring-boot-angular/src/main/js/application/src/app/user-list/user-list.component.ts diff --git a/spring-boot-angular-ecommerce/src/main/frontend/src/assets/.gitkeep b/spring-boot-angular/src/main/js/application/src/assets/.gitkeep similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/src/assets/.gitkeep rename to spring-boot-angular/src/main/js/application/src/assets/.gitkeep diff --git a/spring-boot-angular-ecommerce/src/main/frontend/src/environments/environment.prod.ts b/spring-boot-angular/src/main/js/application/src/environments/environment.prod.ts similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/src/environments/environment.prod.ts rename to spring-boot-angular/src/main/js/application/src/environments/environment.prod.ts diff --git a/spring-boot-angular/angularclient/src/environments/environment.ts b/spring-boot-angular/src/main/js/application/src/environments/environment.ts similarity index 100% rename from spring-boot-angular/angularclient/src/environments/environment.ts rename to spring-boot-angular/src/main/js/application/src/environments/environment.ts diff --git a/spring-boot-angular-ecommerce/src/main/frontend/src/favicon.ico b/spring-boot-angular/src/main/js/application/src/favicon.ico similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/src/favicon.ico rename to spring-boot-angular/src/main/js/application/src/favicon.ico diff --git a/spring-boot-angular/angularclient/src/index.html b/spring-boot-angular/src/main/js/application/src/index.html similarity index 100% rename from spring-boot-angular/angularclient/src/index.html rename to spring-boot-angular/src/main/js/application/src/index.html diff --git a/spring-boot-angular-ecommerce/src/main/frontend/src/main.ts b/spring-boot-angular/src/main/js/application/src/main.ts similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/src/main.ts rename to spring-boot-angular/src/main/js/application/src/main.ts diff --git a/spring-boot-angular/angularclient/src/polyfills.ts b/spring-boot-angular/src/main/js/application/src/polyfills.ts similarity index 100% rename from spring-boot-angular/angularclient/src/polyfills.ts rename to spring-boot-angular/src/main/js/application/src/polyfills.ts diff --git a/spring-boot-angular-ecommerce/src/main/frontend/src/styles.css b/spring-boot-angular/src/main/js/application/src/styles.css similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/src/styles.css rename to spring-boot-angular/src/main/js/application/src/styles.css diff --git a/spring-boot-angular/angularclient/src/tsconfig.app.json b/spring-boot-angular/src/main/js/application/src/tsconfig.app.json similarity index 100% rename from spring-boot-angular/angularclient/src/tsconfig.app.json rename to spring-boot-angular/src/main/js/application/src/tsconfig.app.json diff --git a/spring-boot-angular/angularclient/src/tsconfig.spec.json b/spring-boot-angular/src/main/js/application/src/tsconfig.spec.json similarity index 100% rename from spring-boot-angular/angularclient/src/tsconfig.spec.json rename to spring-boot-angular/src/main/js/application/src/tsconfig.spec.json diff --git a/spring-boot-angular/angularclient/src/typings.d.ts b/spring-boot-angular/src/main/js/application/src/typings.d.ts similarity index 100% rename from spring-boot-angular/angularclient/src/typings.d.ts rename to spring-boot-angular/src/main/js/application/src/typings.d.ts diff --git a/spring-boot-angular/angularclient/tsconfig.json b/spring-boot-angular/src/main/js/application/tsconfig.json similarity index 100% rename from spring-boot-angular/angularclient/tsconfig.json rename to spring-boot-angular/src/main/js/application/tsconfig.json diff --git a/spring-boot-angular/angularclient/tslint.json b/spring-boot-angular/src/main/js/application/tslint.json similarity index 100% rename from spring-boot-angular/angularclient/tslint.json rename to spring-boot-angular/src/main/js/application/tslint.json diff --git a/spring-boot-angular-ecommerce/src/main/frontend/.editorconfig b/spring-boot-angular/src/main/js/ecommerce/.editorconfig similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/.editorconfig rename to spring-boot-angular/src/main/js/ecommerce/.editorconfig diff --git a/spring-boot-angular-ecommerce/src/main/frontend/README.md b/spring-boot-angular/src/main/js/ecommerce/README.md similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/README.md rename to spring-boot-angular/src/main/js/ecommerce/README.md diff --git a/spring-boot-angular-ecommerce/src/main/frontend/angular.json b/spring-boot-angular/src/main/js/ecommerce/angular.json similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/angular.json rename to spring-boot-angular/src/main/js/ecommerce/angular.json diff --git a/spring-boot-angular-ecommerce/src/main/frontend/e2e/protractor.conf.js b/spring-boot-angular/src/main/js/ecommerce/e2e/protractor.conf.js similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/e2e/protractor.conf.js rename to spring-boot-angular/src/main/js/ecommerce/e2e/protractor.conf.js diff --git a/spring-boot-angular-ecommerce/src/main/frontend/e2e/src/app.e2e-spec.ts b/spring-boot-angular/src/main/js/ecommerce/e2e/src/app.e2e-spec.ts similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/e2e/src/app.e2e-spec.ts rename to spring-boot-angular/src/main/js/ecommerce/e2e/src/app.e2e-spec.ts diff --git a/spring-boot-angular/angularclient/e2e/app.po.ts b/spring-boot-angular/src/main/js/ecommerce/e2e/src/app.po.ts similarity index 100% rename from spring-boot-angular/angularclient/e2e/app.po.ts rename to spring-boot-angular/src/main/js/ecommerce/e2e/src/app.po.ts diff --git a/spring-boot-angular-ecommerce/src/main/frontend/e2e/tsconfig.e2e.json b/spring-boot-angular/src/main/js/ecommerce/e2e/tsconfig.e2e.json similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/e2e/tsconfig.e2e.json rename to spring-boot-angular/src/main/js/ecommerce/e2e/tsconfig.e2e.json diff --git a/spring-boot-angular-ecommerce/src/main/frontend/package-lock.json b/spring-boot-angular/src/main/js/ecommerce/package-lock.json similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/package-lock.json rename to spring-boot-angular/src/main/js/ecommerce/package-lock.json diff --git a/spring-boot-angular-ecommerce/src/main/frontend/package.json b/spring-boot-angular/src/main/js/ecommerce/package.json similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/package.json rename to spring-boot-angular/src/main/js/ecommerce/package.json diff --git a/spring-boot-angular-ecommerce/src/main/frontend/proxy-conf.json b/spring-boot-angular/src/main/js/ecommerce/proxy-conf.json similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/proxy-conf.json rename to spring-boot-angular/src/main/js/ecommerce/proxy-conf.json diff --git a/spring-boot-angular-ecommerce/src/main/frontend/src/app/app.component.css b/spring-boot-angular/src/main/js/ecommerce/src/app/app.component.css similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/src/app/app.component.css rename to spring-boot-angular/src/main/js/ecommerce/src/app/app.component.css diff --git a/spring-boot-angular-ecommerce/src/main/frontend/src/app/app.component.html b/spring-boot-angular/src/main/js/ecommerce/src/app/app.component.html similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/src/app/app.component.html rename to spring-boot-angular/src/main/js/ecommerce/src/app/app.component.html diff --git a/spring-boot-angular-ecommerce/src/main/frontend/src/app/app.component.spec.ts b/spring-boot-angular/src/main/js/ecommerce/src/app/app.component.spec.ts similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/src/app/app.component.spec.ts rename to spring-boot-angular/src/main/js/ecommerce/src/app/app.component.spec.ts diff --git a/spring-boot-angular-ecommerce/src/main/frontend/src/app/app.component.ts b/spring-boot-angular/src/main/js/ecommerce/src/app/app.component.ts similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/src/app/app.component.ts rename to spring-boot-angular/src/main/js/ecommerce/src/app/app.component.ts diff --git a/spring-boot-angular-ecommerce/src/main/frontend/src/app/app.module.ts b/spring-boot-angular/src/main/js/ecommerce/src/app/app.module.ts similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/src/app/app.module.ts rename to spring-boot-angular/src/main/js/ecommerce/src/app/app.module.ts diff --git a/spring-boot-angular-ecommerce/src/main/frontend/src/app/ecommerce/ecommerce.component.css b/spring-boot-angular/src/main/js/ecommerce/src/app/ecommerce/ecommerce.component.css similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/src/app/ecommerce/ecommerce.component.css rename to spring-boot-angular/src/main/js/ecommerce/src/app/ecommerce/ecommerce.component.css diff --git a/spring-boot-angular-ecommerce/src/main/frontend/src/app/ecommerce/ecommerce.component.html b/spring-boot-angular/src/main/js/ecommerce/src/app/ecommerce/ecommerce.component.html similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/src/app/ecommerce/ecommerce.component.html rename to spring-boot-angular/src/main/js/ecommerce/src/app/ecommerce/ecommerce.component.html diff --git a/spring-boot-angular-ecommerce/src/main/frontend/src/app/ecommerce/ecommerce.component.spec.ts b/spring-boot-angular/src/main/js/ecommerce/src/app/ecommerce/ecommerce.component.spec.ts similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/src/app/ecommerce/ecommerce.component.spec.ts rename to spring-boot-angular/src/main/js/ecommerce/src/app/ecommerce/ecommerce.component.spec.ts diff --git a/spring-boot-angular-ecommerce/src/main/frontend/src/app/ecommerce/ecommerce.component.ts b/spring-boot-angular/src/main/js/ecommerce/src/app/ecommerce/ecommerce.component.ts similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/src/app/ecommerce/ecommerce.component.ts rename to spring-boot-angular/src/main/js/ecommerce/src/app/ecommerce/ecommerce.component.ts diff --git a/spring-boot-angular-ecommerce/src/main/frontend/src/app/ecommerce/models/product-order.model.ts b/spring-boot-angular/src/main/js/ecommerce/src/app/ecommerce/models/product-order.model.ts similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/src/app/ecommerce/models/product-order.model.ts rename to spring-boot-angular/src/main/js/ecommerce/src/app/ecommerce/models/product-order.model.ts diff --git a/spring-boot-angular-ecommerce/src/main/frontend/src/app/ecommerce/models/product-orders.model.ts b/spring-boot-angular/src/main/js/ecommerce/src/app/ecommerce/models/product-orders.model.ts similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/src/app/ecommerce/models/product-orders.model.ts rename to spring-boot-angular/src/main/js/ecommerce/src/app/ecommerce/models/product-orders.model.ts diff --git a/spring-boot-angular-ecommerce/src/main/frontend/src/app/ecommerce/models/product.model.ts b/spring-boot-angular/src/main/js/ecommerce/src/app/ecommerce/models/product.model.ts similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/src/app/ecommerce/models/product.model.ts rename to spring-boot-angular/src/main/js/ecommerce/src/app/ecommerce/models/product.model.ts diff --git a/spring-boot-angular-ecommerce/src/main/frontend/src/app/ecommerce/orders/orders.component.css b/spring-boot-angular/src/main/js/ecommerce/src/app/ecommerce/orders/orders.component.css similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/src/app/ecommerce/orders/orders.component.css rename to spring-boot-angular/src/main/js/ecommerce/src/app/ecommerce/orders/orders.component.css diff --git a/spring-boot-angular-ecommerce/src/main/frontend/src/app/ecommerce/orders/orders.component.html b/spring-boot-angular/src/main/js/ecommerce/src/app/ecommerce/orders/orders.component.html similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/src/app/ecommerce/orders/orders.component.html rename to spring-boot-angular/src/main/js/ecommerce/src/app/ecommerce/orders/orders.component.html diff --git a/spring-boot-angular-ecommerce/src/main/frontend/src/app/ecommerce/orders/orders.component.spec.ts b/spring-boot-angular/src/main/js/ecommerce/src/app/ecommerce/orders/orders.component.spec.ts similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/src/app/ecommerce/orders/orders.component.spec.ts rename to spring-boot-angular/src/main/js/ecommerce/src/app/ecommerce/orders/orders.component.spec.ts diff --git a/spring-boot-angular-ecommerce/src/main/frontend/src/app/ecommerce/orders/orders.component.ts b/spring-boot-angular/src/main/js/ecommerce/src/app/ecommerce/orders/orders.component.ts similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/src/app/ecommerce/orders/orders.component.ts rename to spring-boot-angular/src/main/js/ecommerce/src/app/ecommerce/orders/orders.component.ts diff --git a/spring-boot-angular-ecommerce/src/main/frontend/src/app/ecommerce/products/products.component.css b/spring-boot-angular/src/main/js/ecommerce/src/app/ecommerce/products/products.component.css similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/src/app/ecommerce/products/products.component.css rename to spring-boot-angular/src/main/js/ecommerce/src/app/ecommerce/products/products.component.css diff --git a/spring-boot-angular-ecommerce/src/main/frontend/src/app/ecommerce/products/products.component.html b/spring-boot-angular/src/main/js/ecommerce/src/app/ecommerce/products/products.component.html similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/src/app/ecommerce/products/products.component.html rename to spring-boot-angular/src/main/js/ecommerce/src/app/ecommerce/products/products.component.html diff --git a/spring-boot-angular-ecommerce/src/main/frontend/src/app/ecommerce/products/products.component.spec.ts b/spring-boot-angular/src/main/js/ecommerce/src/app/ecommerce/products/products.component.spec.ts similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/src/app/ecommerce/products/products.component.spec.ts rename to spring-boot-angular/src/main/js/ecommerce/src/app/ecommerce/products/products.component.spec.ts diff --git a/spring-boot-angular-ecommerce/src/main/frontend/src/app/ecommerce/products/products.component.ts b/spring-boot-angular/src/main/js/ecommerce/src/app/ecommerce/products/products.component.ts similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/src/app/ecommerce/products/products.component.ts rename to spring-boot-angular/src/main/js/ecommerce/src/app/ecommerce/products/products.component.ts diff --git a/spring-boot-angular-ecommerce/src/main/frontend/src/app/ecommerce/services/EcommerceService.ts b/spring-boot-angular/src/main/js/ecommerce/src/app/ecommerce/services/EcommerceService.ts similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/src/app/ecommerce/services/EcommerceService.ts rename to spring-boot-angular/src/main/js/ecommerce/src/app/ecommerce/services/EcommerceService.ts diff --git a/spring-boot-angular-ecommerce/src/main/frontend/src/app/ecommerce/shopping-cart/shopping-cart.component.css b/spring-boot-angular/src/main/js/ecommerce/src/app/ecommerce/shopping-cart/shopping-cart.component.css similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/src/app/ecommerce/shopping-cart/shopping-cart.component.css rename to spring-boot-angular/src/main/js/ecommerce/src/app/ecommerce/shopping-cart/shopping-cart.component.css diff --git a/spring-boot-angular-ecommerce/src/main/frontend/src/app/ecommerce/shopping-cart/shopping-cart.component.html b/spring-boot-angular/src/main/js/ecommerce/src/app/ecommerce/shopping-cart/shopping-cart.component.html similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/src/app/ecommerce/shopping-cart/shopping-cart.component.html rename to spring-boot-angular/src/main/js/ecommerce/src/app/ecommerce/shopping-cart/shopping-cart.component.html diff --git a/spring-boot-angular-ecommerce/src/main/frontend/src/app/ecommerce/shopping-cart/shopping-cart.component.spec.ts b/spring-boot-angular/src/main/js/ecommerce/src/app/ecommerce/shopping-cart/shopping-cart.component.spec.ts similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/src/app/ecommerce/shopping-cart/shopping-cart.component.spec.ts rename to spring-boot-angular/src/main/js/ecommerce/src/app/ecommerce/shopping-cart/shopping-cart.component.spec.ts diff --git a/spring-boot-angular-ecommerce/src/main/frontend/src/app/ecommerce/shopping-cart/shopping-cart.component.ts b/spring-boot-angular/src/main/js/ecommerce/src/app/ecommerce/shopping-cart/shopping-cart.component.ts similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/src/app/ecommerce/shopping-cart/shopping-cart.component.ts rename to spring-boot-angular/src/main/js/ecommerce/src/app/ecommerce/shopping-cart/shopping-cart.component.ts diff --git a/spring-boot-angular/angularclient/src/assets/.gitkeep b/spring-boot-angular/src/main/js/ecommerce/src/assets/.gitkeep similarity index 100% rename from spring-boot-angular/angularclient/src/assets/.gitkeep rename to spring-boot-angular/src/main/js/ecommerce/src/assets/.gitkeep diff --git a/spring-boot-angular-ecommerce/src/main/frontend/src/browserslist b/spring-boot-angular/src/main/js/ecommerce/src/browserslist similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/src/browserslist rename to spring-boot-angular/src/main/js/ecommerce/src/browserslist diff --git a/spring-boot-angular/angularclient/src/environments/environment.prod.ts b/spring-boot-angular/src/main/js/ecommerce/src/environments/environment.prod.ts similarity index 100% rename from spring-boot-angular/angularclient/src/environments/environment.prod.ts rename to spring-boot-angular/src/main/js/ecommerce/src/environments/environment.prod.ts diff --git a/spring-boot-angular-ecommerce/src/main/frontend/src/environments/environment.ts b/spring-boot-angular/src/main/js/ecommerce/src/environments/environment.ts similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/src/environments/environment.ts rename to spring-boot-angular/src/main/js/ecommerce/src/environments/environment.ts diff --git a/spring-boot-angular/angularclient/src/favicon.ico b/spring-boot-angular/src/main/js/ecommerce/src/favicon.ico similarity index 100% rename from spring-boot-angular/angularclient/src/favicon.ico rename to spring-boot-angular/src/main/js/ecommerce/src/favicon.ico diff --git a/spring-boot-angular-ecommerce/src/main/frontend/src/index.html b/spring-boot-angular/src/main/js/ecommerce/src/index.html similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/src/index.html rename to spring-boot-angular/src/main/js/ecommerce/src/index.html diff --git a/spring-boot-angular-ecommerce/src/main/frontend/src/karma.conf.js b/spring-boot-angular/src/main/js/ecommerce/src/karma.conf.js similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/src/karma.conf.js rename to spring-boot-angular/src/main/js/ecommerce/src/karma.conf.js diff --git a/spring-boot-angular/angularclient/src/main.ts b/spring-boot-angular/src/main/js/ecommerce/src/main.ts similarity index 100% rename from spring-boot-angular/angularclient/src/main.ts rename to spring-boot-angular/src/main/js/ecommerce/src/main.ts diff --git a/spring-boot-angular-ecommerce/src/main/frontend/src/polyfills.ts b/spring-boot-angular/src/main/js/ecommerce/src/polyfills.ts similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/src/polyfills.ts rename to spring-boot-angular/src/main/js/ecommerce/src/polyfills.ts diff --git a/spring-boot-angular/angularclient/src/styles.css b/spring-boot-angular/src/main/js/ecommerce/src/styles.css similarity index 100% rename from spring-boot-angular/angularclient/src/styles.css rename to spring-boot-angular/src/main/js/ecommerce/src/styles.css diff --git a/spring-boot-angular-ecommerce/src/main/frontend/src/test.ts b/spring-boot-angular/src/main/js/ecommerce/src/test.ts similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/src/test.ts rename to spring-boot-angular/src/main/js/ecommerce/src/test.ts diff --git a/spring-boot-angular-ecommerce/src/main/frontend/src/tsconfig.app.json b/spring-boot-angular/src/main/js/ecommerce/src/tsconfig.app.json similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/src/tsconfig.app.json rename to spring-boot-angular/src/main/js/ecommerce/src/tsconfig.app.json diff --git a/spring-boot-angular-ecommerce/src/main/frontend/src/tsconfig.spec.json b/spring-boot-angular/src/main/js/ecommerce/src/tsconfig.spec.json similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/src/tsconfig.spec.json rename to spring-boot-angular/src/main/js/ecommerce/src/tsconfig.spec.json diff --git a/spring-boot-angular-ecommerce/src/main/frontend/src/tslint.json b/spring-boot-angular/src/main/js/ecommerce/src/tslint.json similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/src/tslint.json rename to spring-boot-angular/src/main/js/ecommerce/src/tslint.json diff --git a/spring-boot-angular-ecommerce/src/main/frontend/tsconfig.json b/spring-boot-angular/src/main/js/ecommerce/tsconfig.json similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/tsconfig.json rename to spring-boot-angular/src/main/js/ecommerce/tsconfig.json diff --git a/spring-boot-angular-ecommerce/src/main/frontend/tslint.json b/spring-boot-angular/src/main/js/ecommerce/tslint.json similarity index 100% rename from spring-boot-angular-ecommerce/src/main/frontend/tslint.json rename to spring-boot-angular/src/main/js/ecommerce/tslint.json diff --git a/spring-boot-angular-ecommerce/src/main/resources/application.properties b/spring-boot-angular/src/main/resources/application.properties similarity index 100% rename from spring-boot-angular-ecommerce/src/main/resources/application.properties rename to spring-boot-angular/src/main/resources/application.properties diff --git a/spring-boot-angular-ecommerce/src/main/resources/logback.xml b/spring-boot-angular/src/main/resources/logback.xml similarity index 100% rename from spring-boot-angular-ecommerce/src/main/resources/logback.xml rename to spring-boot-angular/src/main/resources/logback.xml diff --git a/spring-boot-angular-ecommerce/src/test/java/com/baeldung/ecommerce/EcommerceApplicationIntegrationTest.java b/spring-boot-angular/src/test/java/com/baeldung/ecommerce/EcommerceApplicationIntegrationTest.java similarity index 100% rename from spring-boot-angular-ecommerce/src/test/java/com/baeldung/ecommerce/EcommerceApplicationIntegrationTest.java rename to spring-boot-angular/src/test/java/com/baeldung/ecommerce/EcommerceApplicationIntegrationTest.java diff --git a/spring-boot-angular-ecommerce/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-boot-angular/src/test/java/org/baeldung/SpringContextIntegrationTest.java similarity index 100% rename from spring-boot-angular-ecommerce/src/test/java/org/baeldung/SpringContextIntegrationTest.java rename to spring-boot-angular/src/test/java/org/baeldung/SpringContextIntegrationTest.java diff --git a/spring-boot-angular-ecommerce/src/test/java/org/baeldung/SpringContextTest.java b/spring-boot-angular/src/test/java/org/baeldung/SpringContextTest.java similarity index 100% rename from spring-boot-angular-ecommerce/src/test/java/org/baeldung/SpringContextTest.java rename to spring-boot-angular/src/test/java/org/baeldung/SpringContextTest.java