CD

.github/workflows/cd.yml

@@ -0,0 +1,44 @@
+name: CD
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+  workflow_dispatch:
+
+jobs:
+  buildndeploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Set up JDK 15
+        uses: actions/setup-java@v1
+        with:
+          java-version: 15
+      - name: Build Backend and push to Heroku
+        env:
+          HEROKU_API_KEY: ${{ secrets.HEROKU_API_KEY }}
+        run: |
+          heroku container:login
+          cd isabackend
+          mvn --batch-mode --update-snapshots verify
+          heroku plugins:install heroku-cli-deploy
+          heroku war:deploy target/isabackend-0.0.1-SNAPSHOT.war --app isa-eu-backend
+          cd ..
+      - name: Build Frontend and push to Heroku
+        env:
+          HEROKU_API_KEY: ${{ secrets.HEROKU_API_KEY }}
+          ISA_BACKEND_HOST: isa-eu-backend.herokuapp.com
+        run: |
+          heroku container:login
+          cd isafrontend/frontend
+          npm install
+          npm run dockerbuild
+          docker build . -t registry.heroku.com/isa-frontend/web
+          docker push registry.heroku.com/isa-frontend/web
+          heroku container:release web --app isa-frontend
+          cd ../..

.github/workflows/prval.yml

@@ -19,4 +19,4 @@ jobs:
       run: |
         cd isafrontend/frontend
         npm install
-        npm run lint
+        npm run build

.gitignore

@@ -38,4 +38,7 @@
 ### npm/node ###
 **/node_modules/
 **/.cache/
-**/dist/
+**/dist/
+
+# parametrization 
+**/configuration/communication.js

isabackend/Dockerfile

@@ -0,0 +1,2 @@
+FROM tomcat:10.0.2-jdk15-openjdk-buster
+ADD target/isabackend-0.0.1-SNAPSHOT.war /usr/local/tomcat/webapps/

isabackend/src/main/java/rs/ac/uns/ftn/isa/onee2team/isabackend/controller/AuthenticationController.java

@@ -88,7 +88,7 @@ public ResponseEntity<User> addUser(@RequestBody UserRequestDTO userRequest, Uri
 		User user = this.userService.createPatient(userRequest);
 		HttpHeaders headers = new HttpHeaders();
 		headers.setLocation(ucBuilder.path("/api/user/{userId}").buildAndExpand(user.getId()).toUri());
-		this.emailNotificationService.sendNotificationAsync(user.getEmail(), "Account Validation", "Visit this link and validate your account: http://localhost:8083/api/auth/validate/" + user.getId() + "/");
+		this.emailNotificationService.sendNotificationAsync(user.getEmail(), "Account Validation", "Visit this link and validate your account: http://" + System.getenv("ISA_SPRING_HOST") + ":" + (System.getenv("PORT") != null ? System.getenv("PORT") : System.getenv("ISA_SPRING_PORT")) + "/api/auth/validate/" + user.getId() + "/");
 		return new ResponseEntity<>(user, HttpStatus.CREATED);
 	}