From 94c2879cc06039f4020dda752a884660a5b8fc26 Mon Sep 17 00:00:00 2001
From: Niggl <info@nicolai-ort.com>
Date: Sat, 6 Jun 2020 22:23:54 +0200
Subject: [PATCH 01/22] Added env to dockerfile and docker-compose

---
 Dockerfile         | 1 +
 docker-compose.yml | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 5a0fa3e..863edab 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,5 +14,6 @@ RUN npm run build
 
 # Stage 2: Package up with the webserver
 FROM nginx:alpine AS final
+ENV API_URL "https://localhost:5001"
 COPY --from=build /build/dist/frontend /usr/share/nginx/html
 CMD ["/bin/sh",  "-c",  "envsubst < /usr/share/nginx/html/assets/env.template.js > /usr/share/nginx/html/assets/env.js && exec nginx -g 'daemon off;'"]
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index d542488..5da458c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,4 +8,6 @@ services:
     networks:
       - default
     ports:
-      - "8080:80"
\ No newline at end of file
+      - "8080:80"
+    environment:
+      API_URL: http://localhost:5001
\ No newline at end of file

From 3c73414288fa87802955c1ef0f844af16a71e1dc Mon Sep 17 00:00:00 2001
From: Niggl <info@nicolai-ort.com>
Date: Sat, 6 Jun 2020 22:25:04 +0200
Subject: [PATCH 02/22] Added build pipeline

---
 .gitlab-ci.yml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..2c8fece
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,25 @@
+image: docker:dind
+
+services:
+  - name: docker:dind
+    entrypoint: ["env", "-u", "DOCKER_HOST"]
+    command: ["dockerd-entrypoint.sh"]
+variables:
+  DOCKER_HOST: tcp://docker:2375/
+  DOCKER_DRIVER: overlay2
+  DOCKER_TLS_CERTDIR: ""
+
+before_script:
+  - echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY
+
+
+build:
+  stage: build
+  script:
+    - docker build . -t frontend:$CI_COMMIT_SHORT_SHA
+    - docker tag frontend:$CI_COMMIT_SHORT_SHA $CI_REGISTRY/taskboard/frontend:$CI_COMMIT_SHORT_SHA
+    - docker push $CI_REGISTRY/taskboard/frontend:$CI_COMMIT_SHORT_SHA
+    - docker tag frontend:$CI_COMMIT_SHORT_SHA $CI_REGISTRY/taskboard/frontend:latest
+    - docker push $CI_REGISTRY/taskboard/frontend:latest
+  tags:
+    - frontend
\ No newline at end of file

From ff6399fe5f810b94e624d4e8298be09bd4be488f Mon Sep 17 00:00:00 2001
From: Niggl <info@nicolai-ort.com>
Date: Sat, 6 Jun 2020 22:37:01 +0200
Subject: [PATCH 03/22] Updated compose to use the prebuild version

---
 docker-compose.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 5da458c..5ea3353 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,8 +2,7 @@ version: "3"
 
 services:
   app:
-    build:
-      context: .
+    image: scrumdev.azurecr.io/taskboard/frontend:latest
     restart: unless-stopped
     networks:
       - default

From 57ad2efcfb2d2afae33fa0f61b716712999120bf Mon Sep 17 00:00:00 2001
From: Niggl <info@nicolai-ort.com>
Date: Sat, 6 Jun 2020 22:37:21 +0200
Subject: [PATCH 04/22] Added the private registry to the readme

---
 README.md | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 2a8d22d..cf08cb1 100644
--- a/README.md
+++ b/README.md
@@ -31,15 +31,14 @@ To get more help on the Angular CLI use `ng help` or go check out the [Angular C
 > Prerequisite: Docker and/or Docker Compose have to be installed on your system </br>
 > The Docker installation instructions for most operation systems can be found here: [https://docs.docker.com/get-docker/](https://docs.docker.com/get-docker/) </br>
 > The Docker Compose installation instructions for most operation systems can be found here: [https://docs.docker.com/compose/install/](https://docs.docker.com/compose/install/)
+> To use the prebuild images log into the private registry: docker login -u testuser -p LpH2v1mShPpC8Xeimkd2AISA03zaC+vq scrumdev.azurecr.io
 
 ### Quick Deployment with Docker Compose
 1. Clone the git repo
 2. Open the cloned repo's folder in a shell of your choice (as long as it supports Docker)
-3. Tell Docker Compose to build - if it hasn't already been built - and run the app with `docker-compose up`
+3. Tell Docker Compose to run the app alongside a database with `docker-compose up`
 
 Other useful commands:
-* Just build: `docker-compose build`
-* Build before running: `docker-compose up --build`
 * Run attached (in the background): `docker-compose up -d`
 * Stop: `docker-compose down`
 * Restart: `docker-compose restart`
@@ -47,9 +46,9 @@ Other useful commands:
 ### Build the Container yourself (and run it)
 1. Clone the git repo
 2. Open the cloned repo's folder in a shell of your choice (as long as it supports Docker)
-3. Tell Docker to build the app under the name "frontend" with `docker build -t taskboard_frontend .`
-4. Tell Docker to run the app on port 8080 with `docker run -p 8080:80 taskboard_frontend`
+3. Tell Docker to build the app under the name "taskboard/frontend" with `docker build -t taskboard/frontend .`
+4. Tell Docker to run the app on port 8080 with `docker run -p 8080:80 taskboard/frontend`
 
 Other useful commands:
-* Run detached: `docker run -d -p 8080:80 taskboard_frontend`
-* Run under specified name: `docker run -p 8080:80 --name frontend taskboard_frontend`
\ No newline at end of file
+* Run detached: `docker run -d -p 8080:80 taskboard/frontend`
+* Run under specified name: `docker run -p 8080:80 --name frontend taskboard/frontend`
\ No newline at end of file

From 7baf6a73969facfdf5ac591dcdd4b21cc70819b3 Mon Sep 17 00:00:00 2001
From: Niggl <info@nicolai-ort.com>
Date: Mon, 8 Jun 2020 09:28:37 +0200
Subject: [PATCH 05/22] updated env var to not use ssl by default

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 863edab..c29977f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,6 +14,6 @@ RUN npm run build
 
 # Stage 2: Package up with the webserver
 FROM nginx:alpine AS final
-ENV API_URL "https://localhost:5001"
+ENV API_URL "http://localhost:5001"
 COPY --from=build /build/dist/frontend /usr/share/nginx/html
 CMD ["/bin/sh",  "-c",  "envsubst < /usr/share/nginx/html/assets/env.template.js > /usr/share/nginx/html/assets/env.js && exec nginx -g 'daemon off;'"]
\ No newline at end of file

From 8da9d76acf499afb6102c4ce313949daa45becb9 Mon Sep 17 00:00:00 2001
From: Niggl <info@nicolai-ort.com>
Date: Wed, 10 Jun 2020 13:04:56 +0200
Subject: [PATCH 06/22] Added Workaround for the routing problem

---
 Dockerfile | 1 +
 nginx.conf | 8 ++++++++
 2 files changed, 9 insertions(+)
 create mode 100644 nginx.conf

diff --git a/Dockerfile b/Dockerfile
index c29977f..2bccf44 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,4 +16,5 @@ RUN npm run build
 FROM nginx:alpine AS final
 ENV API_URL "http://localhost:5001"
 COPY --from=build /build/dist/frontend /usr/share/nginx/html
+COPY nginx.conf /etc/nginx/nginx.conf
 CMD ["/bin/sh",  "-c",  "envsubst < /usr/share/nginx/html/assets/env.template.js > /usr/share/nginx/html/assets/env.js && exec nginx -g 'daemon off;'"]
\ No newline at end of file
diff --git a/nginx.conf b/nginx.conf
new file mode 100644
index 0000000..519e56f
--- /dev/null
+++ b/nginx.conf
@@ -0,0 +1,8 @@
+server {
+  listen 80;
+  location / {
+    root /usr/share/nginx/html;
+    index index.html index.htm;
+    try_files $uri $uri/ /index.html =404;
+  }
+}

From 5e0161cb7cceed9fa159c2f8ddfe078f967064e7 Mon Sep 17 00:00:00 2001
From: Niggl <info@nicolai-ort.com>
Date: Wed, 10 Jun 2020 13:12:45 +0200
Subject: [PATCH 07/22] Added Fix for nginx

---
 nginx.conf | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/nginx.conf b/nginx.conf
index 519e56f..54d595a 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -1,8 +1,14 @@
-server {
+worker_processes 1;
+
+events { worker_connections 1024; }
+
+http {
+  server {
   listen 80;
   location / {
     root /usr/share/nginx/html;
     index index.html index.htm;
     try_files $uri $uri/ /index.html =404;
   }
-}
+  }
+}
\ No newline at end of file

From f25806507a0153b3eab82195b5fc1255e7938ded Mon Sep 17 00:00:00 2001
From: Niggl <info@nicolai-ort.com>
Date: Wed, 10 Jun 2020 13:25:26 +0200
Subject: [PATCH 08/22] Another nginx-angular related update

---
 nginx.conf | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/nginx.conf b/nginx.conf
index 54d595a..6679ffa 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -3,12 +3,13 @@ worker_processes 1;
 events { worker_connections 1024; }
 
 http {
-  server {
-  listen 80;
-  location / {
-    root /usr/share/nginx/html;
-    index index.html index.htm;
-    try_files $uri $uri/ /index.html =404;
-  }
-  }
+    server {
+        listen 80;
+        root  /usr/share/nginx/html;
+        include /etc/nginx/mime.types;
+
+        location / {
+            try_files $uri /index.html;
+        }
+    }
 }
\ No newline at end of file

From aa223ffa1016c32593b0d12805a3bcda5a26cca5 Mon Sep 17 00:00:00 2001
From: test <stieglerda78912@th-nuernberg.de>
Date: Thu, 18 Jun 2020 10:45:31 +0200
Subject: [PATCH 09/22] styling userstory-form modal

---
 .../userstory-form.component.css              | 12 +++
 .../userstory-form.component.html             | 87 +++++++++++++------
 2 files changed, 71 insertions(+), 28 deletions(-)

diff --git a/src/app/userstory-form/userstory-form.component.css b/src/app/userstory-form/userstory-form.component.css
index e69de29..cb7d33d 100644
--- a/src/app/userstory-form/userstory-form.component.css
+++ b/src/app/userstory-form/userstory-form.component.css
@@ -0,0 +1,12 @@
+.modal-footer{
+    border-top: 0px solid;
+    padding-top: 5%;
+}
+.modal-lg{
+    width: 1040px;
+}
+
+  .modal{
+      margin: 0 auto;
+
+  }
\ No newline at end of file
diff --git a/src/app/userstory-form/userstory-form.component.html b/src/app/userstory-form/userstory-form.component.html
index 70f3d0b..416f3df 100644
--- a/src/app/userstory-form/userstory-form.component.html
+++ b/src/app/userstory-form/userstory-form.component.html
@@ -1,30 +1,61 @@
-<div class="modal-content p-3">
-    <div>
-        <button (click) ="onClose()" type="button" class="close" aria-label="Close">
-            <span aria-hidden="true">&times;</span>
-        </button>
+<div class="modal-lg">
+    <div class="modal-content p-3">
+        <div class="modal-header">
+            <h4 class="modal-title">Neue Userstory anlegen</h4>
+            <button (click)="onClose()" type="button" class="close" aria-label="Close">
+                <span aria-hidden="true">&times;</span>
+            </button>
+        </div>
+        <div class="modal-body">
+            <form (ngSubmit)="onSubmit()">
+
+                <div class="row">
+                    <div class="col-md-9">
+                        <div class="form-group">
+                            <label for="Title">Titel</label>
+                            <input type="text" class="form-control" id="Title" required name="title"
+                                [(ngModel)]="userstory.title">
+                        </div>
+                    </div>
+                    <div class="col-md-2">
+                        <div class="form-group">
+                            <label for="Prio">Prio</label>
+                            <select class="form-control" id="prio" required name="prio"
+                                [(ngModel)]="userstory.priority">
+                                <option value="low">Low</option>
+                                <option value="medium">Medium</option>
+                                <option value="high">High</option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-md-9">
+                        <div class="form-group">
+                            <label for="Inhalt">Story</label>
+                            <textarea type="text" class="form-control" id="Story" required name="story" rows="5"
+                                [(ngModel)]="userstory.content"></textarea>
+                        </div>
+                    </div>
+                    <div class="col-md-2">
+                        <div class="form-group">
+                            <label for="Inhalt">Status</label>
+                            <input type="text" class="form-control" id="Status" required name="status"
+                                [(ngModel)]="userstory.status">
+                        </div>
+                        <div class="form-group">
+                            <label for="Inhalt">Autor</label>
+                            <input type="text" class="form-control" id="Author" required name="author"
+                                [(ngModel)]="userstory.createdby">
+                        </div>
+                    </div>
+                </div>
+            </form>
+            <div class="modal-footer">
+                <button (click)="onClose()" type="dismiss" class="btn btn-secondary"
+                    data-dismiss="modal">Abbrechen</button>
+                <button type="submit" class="btn btn-primary">Erstellen</button>
+            </div>
+        </div>
     </div>
-    <form (ngSubmit)="onSubmit()">
-        <div class="form-group">
-            <label for="Title">Titel</label>
-            <input type="text" class="form-control" id="Title" required name="title" [(ngModel)]="userstory.title">
-        </div>
-
-        <div class="form-group">
-            <label for="Inhalt">Inhalt</label>
-            <input type="text" class="form-control" id="Content" required name="content" [(ngModel)]="userstory.content">
-        </div>
-
-        <div class="form-group">
-            <label for="Prio">Prio</label>
-            <select class="form-control" id="prio" required name="prio" [(ngModel)]="userstory.priority">
-                <option value="low">Low</option>
-                <option value="medium">Medium</option>
-                <option value="high">High</option>
-             </select>
-        </div>
-
-        <button type="submit" class="btn btn-success">Submit</button>
-
-    </form>
 </div>
\ No newline at end of file

From 53dd69ed563811566607686842422d6139a9fa0e Mon Sep 17 00:00:00 2001
From: Michael <reinertmi78855@th-nuernberg.de>
Date: Sun, 21 Jun 2020 18:00:09 +0200
Subject: [PATCH 10/22] better positioning for userstory modal

---
 package.json                                  | 10 ++-
 src/app/app-routing.module.ts                 | 13 ++--
 src/app/task-form/task-form.component.html    |  2 +-
 .../userstory-form.component.css              | 18 ++---
 .../userstory-form.component.html             |  4 +-
 .../userstory-form.component.ts               | 72 +++++++++----------
 6 files changed, 60 insertions(+), 59 deletions(-)

diff --git a/package.json b/package.json
index 22bbf00..f1353ed 100644
--- a/package.json
+++ b/package.json
@@ -45,5 +45,13 @@
     "ts-node": "~8.3.0",
     "tslint": "~6.1.0",
     "typescript": "~3.8.3"
-  }
+  },
+  "description": "This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 9.1.7.",
+  "main": "karma.conf.js",
+  "repository": {
+    "type": "git",
+    "url": "https://git.informatik.fh-nuernberg.de/scrum-taskboard/frontend.git"
+  },
+  "author": "",
+  "license": "ISC"
 }
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 7e0c37c..a59d88d 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -4,15 +4,14 @@ import { Routes, RouterModule } from '@angular/router';
 import { TaskListComponent } from './task-list/task-list.component';
 import { UserstoryListComponent } from './userstory-list/userstory-list.component';
 
-
 const routes: Routes = [
-  { path: 'tasks', component: TaskListComponent },
-  { path: 'userstories', component: UserstoryListComponent },
-  { path: '', redirectTo: '/tasks', pathMatch: 'full' },
+	{ path: 'tasks', component: TaskListComponent },
+	{ path: 'userstories', component: UserstoryListComponent },
+	{ path: '', redirectTo: '/tasks', pathMatch: 'full' }
 ];
 
 @NgModule({
-  imports: [RouterModule.forRoot(routes)],
-  exports: [RouterModule]
+	imports: [ RouterModule.forRoot(routes) ],
+	exports: [ RouterModule ]
 })
-export class AppRoutingModule { }
+export class AppRoutingModule {}
diff --git a/src/app/task-form/task-form.component.html b/src/app/task-form/task-form.component.html
index b0a5f4e..f61d287 100644
--- a/src/app/task-form/task-form.component.html
+++ b/src/app/task-form/task-form.component.html
@@ -21,7 +21,7 @@
                 <option value="low">Low</option>
                 <option value="medium">Medium</option>
                 <option value="high">High</option>
-             </select>
+            </select>
         </div>
 
         <button type="submit" class="btn btn-success">Submit</button>
diff --git a/src/app/userstory-form/userstory-form.component.css b/src/app/userstory-form/userstory-form.component.css
index cb7d33d..cc04e06 100644
--- a/src/app/userstory-form/userstory-form.component.css
+++ b/src/app/userstory-form/userstory-form.component.css
@@ -1,12 +1,12 @@
-.modal-footer{
-    border-top: 0px solid;
-    padding-top: 5%;
+.modal-footer {
+	border-top: 0px solid;
+	padding-top: 5%;
 }
-.modal-lg{
-    width: 1040px;
+.modal-content {
+	width: 1040px;
+	right: 55%;
 }
 
-  .modal{
-      margin: 0 auto;
-
-  }
\ No newline at end of file
+.modal {
+	margin: 0 auto;
+}
diff --git a/src/app/userstory-form/userstory-form.component.html b/src/app/userstory-form/userstory-form.component.html
index 416f3df..4773281 100644
--- a/src/app/userstory-form/userstory-form.component.html
+++ b/src/app/userstory-form/userstory-form.component.html
@@ -1,4 +1,4 @@
-<div class="modal-lg">
+<!-- <div class="modal-lg"> -->
     <div class="modal-content p-3">
         <div class="modal-header">
             <h4 class="modal-title">Neue Userstory anlegen</h4>
@@ -58,4 +58,4 @@
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+<!-- </div> -->
\ No newline at end of file
diff --git a/src/app/userstory-form/userstory-form.component.ts b/src/app/userstory-form/userstory-form.component.ts
index 28f605f..0312338 100644
--- a/src/app/userstory-form/userstory-form.component.ts
+++ b/src/app/userstory-form/userstory-form.component.ts
@@ -3,48 +3,42 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { BackendService, ScrumUserstory, Priority } from '../services/backend.service';
 
 @Component({
-    selector: 'app-userstory-form',
-    templateUrl: './userstory-form.component.html',
-    styleUrls: ['./userstory-form.component.css']
+	selector: 'app-userstory-form',
+	templateUrl: './userstory-form.component.html',
+	styleUrls: [ './userstory-form.component.css' ]
 })
 export class UserstoryFormComponent implements OnInit {
+	@Input() public userstory: ScrumUserstory;
+	private editing: boolean;
 
+	constructor(private backendService: BackendService, private activeModalService: NgbActiveModal) {}
 
-    @Input()
-    public userstory: ScrumUserstory;
-    private editing: boolean;
+	ngOnInit(): void {
+		if (this.userstory === null || this.userstory === undefined) {
+			this.userstory = { title: '' };
+			this.editing = false;
+		} else {
+			this.editing = true;
+		}
+	}
 
-    constructor(private backendService: BackendService, private activeModalService: NgbActiveModal) { }
-
-    ngOnInit(): void {
-        if (this.userstory === null || this.userstory === undefined) {
-            this.userstory = {title: ""};
-            this.editing = false;
-        }
-        else
-        {
-            this.editing = true;
-        }
-    }
-
-    onSubmit() {
-        if (this.editing) {
-            this.backendService.putUserstory(this.userstory).subscribe(response => {
-                if (response.status > 399) {
-                  alert('Fehler');
-                }
-              });
-        }
-        else {
-            this.backendService.postUserstory(this.userstory).subscribe(response => {
-                if (response.status > 399) {
-                  alert('Fehler');
-                }
-              });
-        }
-        this.activeModalService.close(this.userstory);
-    }
-    onClose(){
-        this.activeModalService.dismiss(this.userstory);
-    }
+	onSubmit() {
+		if (this.editing) {
+			this.backendService.putUserstory(this.userstory).subscribe((response) => {
+				if (response.status > 399) {
+					alert('Fehler');
+				}
+			});
+		} else {
+			this.backendService.postUserstory(this.userstory).subscribe((response) => {
+				if (response.status > 399) {
+					alert('Fehler');
+				}
+			});
+		}
+		this.activeModalService.close(this.userstory);
+	}
+	onClose() {
+		this.activeModalService.dismiss(this.userstory);
+	}
 }

From 07dba527944139e298720b95e7284e77d89e21bb Mon Sep 17 00:00:00 2001
From: Michael <reinertmi78855@th-nuernberg.de>
Date: Mon, 22 Jun 2020 12:02:11 +0200
Subject: [PATCH 11/22] edited taskform

---
 src/app/task-form/task-form.component.css  | 12 +++
 src/app/task-form/task-form.component.html | 90 +++++++++++++++-------
 src/app/task-form/task-form.component.ts   | 81 +++++++++----------
 3 files changed, 115 insertions(+), 68 deletions(-)

diff --git a/src/app/task-form/task-form.component.css b/src/app/task-form/task-form.component.css
index e69de29..cc04e06 100644
--- a/src/app/task-form/task-form.component.css
+++ b/src/app/task-form/task-form.component.css
@@ -0,0 +1,12 @@
+.modal-footer {
+	border-top: 0px solid;
+	padding-top: 5%;
+}
+.modal-content {
+	width: 1040px;
+	right: 55%;
+}
+
+.modal {
+	margin: 0 auto;
+}
diff --git a/src/app/task-form/task-form.component.html b/src/app/task-form/task-form.component.html
index f61d287..e1abec3 100644
--- a/src/app/task-form/task-form.component.html
+++ b/src/app/task-form/task-form.component.html
@@ -1,30 +1,62 @@
-<div class="modal-content p-3">
-    <div>
-        <button (click) ="onClose()" type="button" class="close" aria-label="Close">
-            <span aria-hidden="true">&times;</span>
-        </button>
+<!-- <div class="modal-lg"> -->
+    <div class="modal-content p-3">
+        <div class="modal-header">
+            <h4 class="modal-title">Neuen Task anlegen</h4>
+            <h6 class="modal-caption">Userstory: </h6>
+            <button (click)="onClose()" type="button" class="close" aria-label="Close">
+                <span aria-hidden="true">&times;</span>
+            </button>
+        </div>
+        <div class="modal-body">
+            <form (ngSubmit)="onSubmit()">
+
+                <div class="row">
+                    <div class="col-md-9">
+                        <div class="form-group">
+                            <label for="Title">Titel</label>
+                            <input type="text" class="form-control" id="Title" required name="title"
+                                [(ngModel)]="task.title">
+                        </div>
+                    </div>
+                    <div class="col-md-2">
+                        <div class="form-group">
+                            <label for="Prio">Prio</label>
+                            <select class="form-control" id="prio" required name="prio"
+                                [(ngModel)]="task.priority">
+                                <option value="low">Low</option>
+                                <option value="medium">Medium</option>
+                                <option value="high">High</option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-md-9">
+                        <div class="form-group">
+                            <label for="Inhalt">What to do?</label>
+                            <textarea type="text" class="form-control" id="Story" required name="story" rows="5"
+                                [(ngModel)]="task.content"></textarea>
+                        </div>
+                    </div>
+                    <div class="col-md-2">
+                        <div class="form-group">
+                            <label for="Inhalt">Status</label>
+                            <input type="text" class="form-control" id="Status" required name="status"
+                                [(ngModel)]="task.status">
+                        </div>
+                        <div class="form-group">
+                            <label for="Inhalt">Assigned User</label>
+                            <input type="text" class="form-control" id="Author" required name="author"
+                                >
+                        </div>
+                    </div>
+                </div>
+            </form>
+            <div class="modal-footer">
+                <button (click)="onClose()" type="dismiss" class="btn btn-secondary"
+                    data-dismiss="modal">Abbrechen</button>
+                <button type="submit" class="btn btn-primary">Erstellen</button>
+            </div>
+        </div>
     </div>
-    <form (ngSubmit)="onSubmit()">
-        <div class="form-group">
-            <label for="Title">Titel</label>
-            <input type="text" class="form-control" id="Title" required name="title" [(ngModel)]="task.title">
-        </div>
-
-        <div class="form-group">
-            <label for="Inhalt">Inhalt</label>
-            <input type="text" class="form-control" id="Content" required name="content" [(ngModel)]="task.content">
-        </div>
-
-        <div class="form-group">
-            <label for="Prio">Prio</label>
-            <select class="form-control" id="prio" required name="prio" [(ngModel)]="task.priority">
-                <option value="low">Low</option>
-                <option value="medium">Medium</option>
-                <option value="high">High</option>
-            </select>
-        </div>
-
-        <button type="submit" class="btn btn-success">Submit</button>
-
-    </form>
-</div>
\ No newline at end of file
+<!-- </div> -->
\ No newline at end of file
diff --git a/src/app/task-form/task-form.component.ts b/src/app/task-form/task-form.component.ts
index 154e22f..60dd90b 100644
--- a/src/app/task-form/task-form.component.ts
+++ b/src/app/task-form/task-form.component.ts
@@ -1,50 +1,53 @@
 import { Component, OnInit, Input } from '@angular/core';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { BackendService, ScrumTask, Priority, ScrumStatus, ScrumCategory, ScrumUser, ScrumProject } from '../services/backend.service';
+import {
+	BackendService,
+	ScrumTask,
+	Priority,
+	ScrumStatus,
+	ScrumCategory,
+	ScrumUser,
+	ScrumProject
+} from '../services/backend.service';
 
 @Component({
-    selector: 'app-task-form',
-    templateUrl: './task-form.component.html',
-    styleUrls: ['./task-form.component.css']
+	selector: 'app-task-form',
+	templateUrl: './task-form.component.html',
+	styleUrls: [ './task-form.component.css' ]
 })
 export class TaskFormComponent implements OnInit {
+	@Input() public task: ScrumTask;
+	public editing: Boolean;
 
-    @Input()
-    public task: ScrumTask;
-    public editing: Boolean;
+	constructor(private backendService: BackendService, private activeModalService: NgbActiveModal) {}
 
-    constructor(private backendService: BackendService, private activeModalService: NgbActiveModal) { }
+	ngOnInit(): void {
+		if (this.task === null || this.task === undefined) {
+			this.task = { title: '' };
+			this.editing = false;
+		} else {
+			this.editing = true;
+		}
+	}
 
-    ngOnInit(): void {
-        if (this.task === null || this.task === undefined) {
-            this.task = {title: ""};
-            this.editing = false;
-        }
-        else
-        {
-            this.editing = true;
-        }
-    }
+	onSubmit() {
+		if (this.editing) {
+			this.backendService.putTask(this.task).subscribe((response) => {
+				if (response.status > 399) {
+					alert('Fehler');
+				}
+			});
+		} else {
+			this.backendService.postTask(this.task).subscribe((response) => {
+				if (response.status > 399) {
+					alert('Fehler');
+				}
+			});
+		}
+		this.activeModalService.close(this.task);
+	}
 
-    onSubmit() {
-        if (this.editing) {
-            this.backendService.putTask(this.task).subscribe(response => {
-                if (response.status > 399) {
-                  alert('Fehler');
-                }
-              });
-        }
-        else {
-            this.backendService.postTask(this.task).subscribe(response => {
-                if (response.status > 399) {
-                  alert('Fehler');
-                }
-              });
-        }
-        this.activeModalService.close(this.task);
-    }
-
-    onClose(){
-        this.activeModalService.dismiss(this.task);
-    }
+	onClose() {
+		this.activeModalService.dismiss(this.task);
+	}
 }

From 68e4362fe232eb4a795e3354eb48916798e2b22b Mon Sep 17 00:00:00 2001
From: test <stieglerda78912@th-nuernberg.de>
Date: Mon, 22 Jun 2020 13:56:30 +0200
Subject: [PATCH 12/22] styling changes dropdown, color, linebreak...

---
 src/app/task-form/task-form.component.html    | 111 ++++++++++--------
 .../userstory-form.component.html             |   7 +-
 2 files changed, 64 insertions(+), 54 deletions(-)

diff --git a/src/app/task-form/task-form.component.html b/src/app/task-form/task-form.component.html
index e1abec3..4b01472 100644
--- a/src/app/task-form/task-form.component.html
+++ b/src/app/task-form/task-form.component.html
@@ -1,62 +1,69 @@
 <!-- <div class="modal-lg"> -->
-    <div class="modal-content p-3">
-        <div class="modal-header">
-            <h4 class="modal-title">Neuen Task anlegen</h4>
-            <h6 class="modal-caption">Userstory: </h6>
-            <button (click)="onClose()" type="button" class="close" aria-label="Close">
-                <span aria-hidden="true">&times;</span>
-            </button>
-        </div>
-        <div class="modal-body">
-            <form (ngSubmit)="onSubmit()">
+<div class="modal-content p-3">
+    <div class="modal-header">
+        <table>
+            <tr>
+                <h4 class="modal-title">Neuen Task anlegen</h4>
+            </tr>
+            <tr>
+                <h6 class="modal-caption text-muted"> Gehört zu Story: <a href="#"></a></h6>
+            </tr>
+            <!--getUserstory fehlt noch-->
+        </table>
+        <button (click)="onClose()" type="button" class="close" aria-label="Close">
+            <span aria-hidden="true">&times;</span>
+        </button>
+    </div>
+    <div class="modal-body">
+        <form (ngSubmit)="onSubmit()">
 
-                <div class="row">
-                    <div class="col-md-9">
-                        <div class="form-group">
-                            <label for="Title">Titel</label>
-                            <input type="text" class="form-control" id="Title" required name="title"
-                                [(ngModel)]="task.title">
-                        </div>
-                    </div>
-                    <div class="col-md-2">
-                        <div class="form-group">
-                            <label for="Prio">Prio</label>
-                            <select class="form-control" id="prio" required name="prio"
-                                [(ngModel)]="task.priority">
-                                <option value="low">Low</option>
-                                <option value="medium">Medium</option>
-                                <option value="high">High</option>
-                            </select>
-                        </div>
+            <div class="row">
+                <div class="col-md-9">
+                    <div class="form-group">
+                        <label for="Title">Titel</label>
+                        <input type="text" class="form-control" id="Title" required name="title"
+                            [(ngModel)]="task.title">
                     </div>
                 </div>
-                <div class="row">
-                    <div class="col-md-9">
-                        <div class="form-group">
-                            <label for="Inhalt">What to do?</label>
-                            <textarea type="text" class="form-control" id="Story" required name="story" rows="5"
-                                [(ngModel)]="task.content"></textarea>
-                        </div>
-                    </div>
-                    <div class="col-md-2">
-                        <div class="form-group">
-                            <label for="Inhalt">Status</label>
-                            <input type="text" class="form-control" id="Status" required name="status"
-                                [(ngModel)]="task.status">
-                        </div>
-                        <div class="form-group">
-                            <label for="Inhalt">Assigned User</label>
-                            <input type="text" class="form-control" id="Author" required name="author"
-                                >
-                        </div>
+                <div class="col-md-1"></div>
+                <div class="col-md-2">
+                    <div class="form-group">
+                        <label for="Prio">Prio</label>
+                        <select class="form-control custom-select mr-sm-2" id="prio" required name="prio"
+                            [(ngModel)]="task.priority">
+                            <option value="low">Low</option>
+                            <option value="medium">Medium</option>
+                            <option value="high">High</option>
+                        </select>
                     </div>
                 </div>
-            </form>
-            <div class="modal-footer">
-                <button (click)="onClose()" type="dismiss" class="btn btn-secondary"
-                    data-dismiss="modal">Abbrechen</button>
-                <button type="submit" class="btn btn-primary">Erstellen</button>
             </div>
+            <div class="row">
+                <div class="col-md-9">
+                    <div class="form-group">
+                        <label for="Inhalt">What to do?</label>
+                        <textarea type="text" class="form-control" id="Story" required name="story" rows="5"
+                            [(ngModel)]="task.content"></textarea>
+                    </div>
+                </div>
+                <div class="col-md-1"></div>
+                <div class="col-md-2">
+                    <div class="form-group">
+                        <label for="Inhalt">Status</label>
+                        <input type="text" class="form-control" id="Status" required name="status"
+                            [(ngModel)]="task.status">
+                    </div>
+                    <div class="form-group">
+                        <label for="Inhalt">Assigned User</label>
+                        <input type="text" class="form-control" id="Author" required name="author">
+                    </div>
+                </div>
+            </div>
+        </form>
+        <div class="modal-footer">
+            <button (click)="onClose()" type="dismiss" class="btn btn-secondary" data-dismiss="modal">Abbrechen</button>
+            <button type="submit" class="btn btn-primary">Erstellen</button>
         </div>
     </div>
+</div>
 <!-- </div> -->
\ No newline at end of file
diff --git a/src/app/userstory-form/userstory-form.component.html b/src/app/userstory-form/userstory-form.component.html
index 4773281..7701d59 100644
--- a/src/app/userstory-form/userstory-form.component.html
+++ b/src/app/userstory-form/userstory-form.component.html
@@ -1,5 +1,5 @@
 <!-- <div class="modal-lg"> -->
-    <div class="modal-content p-3">
+    <div class="modal-content p-3 text-dark">
         <div class="modal-header">
             <h4 class="modal-title">Neue Userstory anlegen</h4>
             <button (click)="onClose()" type="button" class="close" aria-label="Close">
@@ -17,10 +17,11 @@
                                 [(ngModel)]="userstory.title">
                         </div>
                     </div>
+                    <div class="col-md-1"></div>
                     <div class="col-md-2">
                         <div class="form-group">
                             <label for="Prio">Prio</label>
-                            <select class="form-control" id="prio" required name="prio"
+                            <select class="custom-select mr-sm-2" id="prio" required name="prio"
                                 [(ngModel)]="userstory.priority">
                                 <option value="low">Low</option>
                                 <option value="medium">Medium</option>
@@ -36,7 +37,9 @@
                             <textarea type="text" class="form-control" id="Story" required name="story" rows="5"
                                 [(ngModel)]="userstory.content"></textarea>
                         </div>
+
                     </div>
+                    <div class="col-md-1"></div>
                     <div class="col-md-2">
                         <div class="form-group">
                             <label for="Inhalt">Status</label>

From 80fd5c4f096b6f92900691df9ddd318aecb6c35e Mon Sep 17 00:00:00 2001
From: Michael <reinertmi78855@th-nuernberg.de>
Date: Mon, 22 Jun 2020 14:40:00 +0200
Subject: [PATCH 13/22] added autofocus

---
 src/app/userstory-form/userstory-form.component.html | 4 ++--
 src/app/userstory-form/userstory-form.component.ts   | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/app/userstory-form/userstory-form.component.html b/src/app/userstory-form/userstory-form.component.html
index 7701d59..1d86b8b 100644
--- a/src/app/userstory-form/userstory-form.component.html
+++ b/src/app/userstory-form/userstory-form.component.html
@@ -13,8 +13,8 @@
                     <div class="col-md-9">
                         <div class="form-group">
                             <label for="Title">Titel</label>
-                            <input type="text" class="form-control" id="Title" required name="title"
-                                [(ngModel)]="userstory.title">
+                            <input type="text" class="form-control" id="Title" required autofocus name="title"
+                                [(ngModel)]="userstory.title" id="titleField">
                         </div>
                     </div>
                     <div class="col-md-1"></div>
diff --git a/src/app/userstory-form/userstory-form.component.ts b/src/app/userstory-form/userstory-form.component.ts
index 0312338..8ff39bb 100644
--- a/src/app/userstory-form/userstory-form.component.ts
+++ b/src/app/userstory-form/userstory-form.component.ts
@@ -20,6 +20,7 @@ export class UserstoryFormComponent implements OnInit {
 		} else {
 			this.editing = true;
 		}
+		this.focusTitleField();
 	}
 
 	onSubmit() {
@@ -41,4 +42,8 @@ export class UserstoryFormComponent implements OnInit {
 	onClose() {
 		this.activeModalService.dismiss(this.userstory);
 	}
+
+	focusTitleField() {
+		document.getElementById('titleField').focus();
+	}
 }

From bac2e90d23713b1eac3a08b204ebf0ba7c97629a Mon Sep 17 00:00:00 2001
From: Michael <reinertmi78855@th-nuernberg.de>
Date: Mon, 22 Jun 2020 14:58:14 +0200
Subject: [PATCH 14/22] added right focus for tasks

---
 src/app/task-form/task-form.component.html           | 2 +-
 src/app/task-form/task-form.component.ts             | 1 +
 src/app/userstory-form/userstory-form.component.html | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app/task-form/task-form.component.html b/src/app/task-form/task-form.component.html
index 4b01472..6bb32ef 100644
--- a/src/app/task-form/task-form.component.html
+++ b/src/app/task-form/task-form.component.html
@@ -22,7 +22,7 @@
                     <div class="form-group">
                         <label for="Title">Titel</label>
                         <input type="text" class="form-control" id="Title" required name="title"
-                            [(ngModel)]="task.title">
+                            [(ngModel)]="task.title" id="titleField">
                     </div>
                 </div>
                 <div class="col-md-1"></div>
diff --git a/src/app/task-form/task-form.component.ts b/src/app/task-form/task-form.component.ts
index 60dd90b..8a9fab7 100644
--- a/src/app/task-form/task-form.component.ts
+++ b/src/app/task-form/task-form.component.ts
@@ -28,6 +28,7 @@ export class TaskFormComponent implements OnInit {
 		} else {
 			this.editing = true;
 		}
+		document.getElementById('titleField').focus();
 	}
 
 	onSubmit() {
diff --git a/src/app/userstory-form/userstory-form.component.html b/src/app/userstory-form/userstory-form.component.html
index 1d86b8b..e23e626 100644
--- a/src/app/userstory-form/userstory-form.component.html
+++ b/src/app/userstory-form/userstory-form.component.html
@@ -13,7 +13,7 @@
                     <div class="col-md-9">
                         <div class="form-group">
                             <label for="Title">Titel</label>
-                            <input type="text" class="form-control" id="Title" required autofocus name="title"
+                            <input type="text" class="form-control" id="Title" required name="title"
                                 [(ngModel)]="userstory.title" id="titleField">
                         </div>
                     </div>

From aba077cc14f2c5d22a52c8d0d74c6635c33cc9fa Mon Sep 17 00:00:00 2001
From: test <stieglerda78912@th-nuernberg.de>
Date: Mon, 22 Jun 2020 16:28:40 +0200
Subject: [PATCH 15/22] minor changes

---
 src/app/task-form/task-form.component.css          |  1 +
 src/app/task-form/task-form.component.ts           | 14 +++++++++++++-
 src/app/userstory-form/userstory-form.component.ts |  8 ++++----
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/app/task-form/task-form.component.css b/src/app/task-form/task-form.component.css
index cc04e06..2b8a6fe 100644
--- a/src/app/task-form/task-form.component.css
+++ b/src/app/task-form/task-form.component.css
@@ -5,6 +5,7 @@
 .modal-content {
 	width: 1040px;
 	right: 55%;
+	border: 0px;
 }
 
 .modal {
diff --git a/src/app/task-form/task-form.component.ts b/src/app/task-form/task-form.component.ts
index 8a9fab7..07abbe5 100644
--- a/src/app/task-form/task-form.component.ts
+++ b/src/app/task-form/task-form.component.ts
@@ -7,8 +7,11 @@ import {
 	ScrumStatus,
 	ScrumCategory,
 	ScrumUser,
-	ScrumProject
+	ScrumProject,
+	ScrumUserstory
 } from '../services/backend.service';
+import { Observable } from 'rxjs';
+import { HttpResponse } from '@angular/common/http';
 
 @Component({
 	selector: 'app-task-form',
@@ -29,6 +32,8 @@ export class TaskFormComponent implements OnInit {
 			this.editing = true;
 		}
 		document.getElementById('titleField').focus();
+
+		this.getRelatedStory();
 	}
 
 	onSubmit() {
@@ -51,4 +56,11 @@ export class TaskFormComponent implements OnInit {
 	onClose() {
 		this.activeModalService.dismiss(this.task);
 	}
+
+	getRelatedStory(): any{
+
+		console.log(this.backendService.getUserstory(1));
+
+	}
+
 }
diff --git a/src/app/userstory-form/userstory-form.component.ts b/src/app/userstory-form/userstory-form.component.ts
index 8ff39bb..c3ca4c5 100644
--- a/src/app/userstory-form/userstory-form.component.ts
+++ b/src/app/userstory-form/userstory-form.component.ts
@@ -20,7 +20,7 @@ export class UserstoryFormComponent implements OnInit {
 		} else {
 			this.editing = true;
 		}
-		this.focusTitleField();
+		document.getElementById('titleField').focus();
 	}
 
 	onSubmit() {
@@ -43,7 +43,7 @@ export class UserstoryFormComponent implements OnInit {
 		this.activeModalService.dismiss(this.userstory);
 	}
 
-	focusTitleField() {
-		document.getElementById('titleField').focus();
-	}
+	//focusTitleField() {
+	//	document.getElementById('titleField').focus();
+	//}
 }

From 34611039302b43523e299fc99a75a06fd8c59fbf Mon Sep 17 00:00:00 2001
From: Niggl <info@nicolai-ort.com>
Date: Mon, 22 Jun 2020 16:34:57 +0200
Subject: [PATCH 16/22] Get Userstory by ID

---
 src/app/task-form/task-form.component.ts | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/app/task-form/task-form.component.ts b/src/app/task-form/task-form.component.ts
index 07abbe5..635191e 100644
--- a/src/app/task-form/task-form.component.ts
+++ b/src/app/task-form/task-form.component.ts
@@ -58,9 +58,13 @@ export class TaskFormComponent implements OnInit {
 	}
 
 	getRelatedStory(): any{
-
-		console.log(this.backendService.getUserstory(1));
-
+		this.backendService.getUserstory(1).subscribe(response => {
+			if (response.status > 399) {
+				alert('Fehler');
+			}
+			else {
+				console.log(response);
+			}
+		});
 	}
-
 }

From 834680107474580e30d080cd3ff015dc26ad91d1 Mon Sep 17 00:00:00 2001
From: Michael <reinertmi78855@th-nuernberg.de>
Date: Mon, 22 Jun 2020 17:12:09 +0200
Subject: [PATCH 17/22] added related user story

---
 src/app/task-form/task-form.component.html |   9 +-
 src/app/task-form/task-form.component.ts   | 110 +++++++++++----------
 src/assets/env.js                          |  12 +--
 3 files changed, 66 insertions(+), 65 deletions(-)

diff --git a/src/app/task-form/task-form.component.html b/src/app/task-form/task-form.component.html
index 6bb32ef..d63239f 100644
--- a/src/app/task-form/task-form.component.html
+++ b/src/app/task-form/task-form.component.html
@@ -1,4 +1,3 @@
-<!-- <div class="modal-lg"> -->
 <div class="modal-content p-3">
     <div class="modal-header">
         <table>
@@ -6,7 +5,7 @@
                 <h4 class="modal-title">Neuen Task anlegen</h4>
             </tr>
             <tr>
-                <h6 class="modal-caption text-muted"> Gehört zu Story: <a href="#"></a></h6>
+                <h6 class="modal-caption text-muted"> Gehört zu Story: <a href="#" id="userstoryTitle">{{this.userstoryId}}</a></h6>
             </tr>
             <!--getUserstory fehlt noch-->
         </table>
@@ -59,11 +58,11 @@
                     </div>
                 </div>
             </div>
-        </form>
+        
         <div class="modal-footer">
             <button (click)="onClose()" type="dismiss" class="btn btn-secondary" data-dismiss="modal">Abbrechen</button>
             <button type="submit" class="btn btn-primary">Erstellen</button>
         </div>
+        </form>
     </div>
-</div>
-<!-- </div> -->
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/src/app/task-form/task-form.component.ts b/src/app/task-form/task-form.component.ts
index 635191e..4c4ca34 100644
--- a/src/app/task-form/task-form.component.ts
+++ b/src/app/task-form/task-form.component.ts
@@ -1,70 +1,72 @@
 import { Component, OnInit, Input } from '@angular/core';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import {
-	BackendService,
-	ScrumTask,
-	Priority,
-	ScrumStatus,
-	ScrumCategory,
-	ScrumUser,
-	ScrumProject,
-	ScrumUserstory
+  BackendService,
+  ScrumTask,
+  Priority,
+  ScrumStatus,
+  ScrumCategory,
+  ScrumUser,
+  ScrumProject,
+  ScrumUserstory,
 } from '../services/backend.service';
 import { Observable } from 'rxjs';
 import { HttpResponse } from '@angular/common/http';
 
 @Component({
-	selector: 'app-task-form',
-	templateUrl: './task-form.component.html',
-	styleUrls: [ './task-form.component.css' ]
+  selector: 'app-task-form',
+  templateUrl: './task-form.component.html',
+  styleUrls: ['./task-form.component.css'],
 })
 export class TaskFormComponent implements OnInit {
-	@Input() public task: ScrumTask;
-	public editing: Boolean;
+  @Input() public task: ScrumTask;
+  public editing: Boolean;
+  public userstoryId: string;
 
-	constructor(private backendService: BackendService, private activeModalService: NgbActiveModal) {}
+  constructor(
+    private backendService: BackendService,
+    private activeModalService: NgbActiveModal
+  ) {}
 
-	ngOnInit(): void {
-		if (this.task === null || this.task === undefined) {
-			this.task = { title: '' };
-			this.editing = false;
-		} else {
-			this.editing = true;
-		}
-		document.getElementById('titleField').focus();
+  ngOnInit(): void {
+    if (this.task === null || this.task === undefined) {
+      this.task = { title: '' };
+      this.editing = false;
+    } else {
+      this.editing = true;
+    }
+    document.getElementById('titleField').focus();
+    this.getRelatedStory();
+  }
 
-		this.getRelatedStory();
-	}
+  onSubmit() {
+    if (this.editing) {
+      this.backendService.putTask(this.task).subscribe((response) => {
+        if (response.status > 399) {
+          alert('Fehler');
+        }
+      });
+    } else {
+      this.backendService.postTask(this.task).subscribe((response) => {
+        if (response.status > 399) {
+          alert('Fehler');
+        }
+      });
+    }
+    this.activeModalService.close(this.task);
+  }
 
-	onSubmit() {
-		if (this.editing) {
-			this.backendService.putTask(this.task).subscribe((response) => {
-				if (response.status > 399) {
-					alert('Fehler');
-				}
-			});
-		} else {
-			this.backendService.postTask(this.task).subscribe((response) => {
-				if (response.status > 399) {
-					alert('Fehler');
-				}
-			});
-		}
-		this.activeModalService.close(this.task);
-	}
+  onClose() {
+    this.activeModalService.dismiss(this.task);
+  }
 
-	onClose() {
-		this.activeModalService.dismiss(this.task);
-	}
-
-	getRelatedStory(): any{
-		this.backendService.getUserstory(1).subscribe(response => {
-			if (response.status > 399) {
-				alert('Fehler');
-			}
-			else {
-				console.log(response);
-			}
-		});
-	}
+  getRelatedStory() {
+    this.backendService.getUserstory(2).subscribe((response) => {
+      if (response.status > 399) {
+        alert('Fehler');
+      } else {
+        this.userstoryId = response.body.title;
+      }
+    });
+  }
 }
diff --git a/src/assets/env.js b/src/assets/env.js
index 5b334ef..38fc952 100644
--- a/src/assets/env.js
+++ b/src/assets/env.js
@@ -1,7 +1,7 @@
 (function(window) {
-    window["env"] = window["env"] || {};
-  
-    // Environment variables
-    window["env"]["apiUrl"] = "http://localhost:5001";
-    window["env"]["debug"] = false;
-  })(this);
\ No newline at end of file
+	window['env'] = window['env'] || {};
+
+	// Environment variables
+	window['env']['apiUrl'] = 'http://taskboard.dev.nig.gl/api';
+	window['env']['debug'] = false;
+})(this);

From 39e403a8a78bead3e41b538d1c3513661c52cf80 Mon Sep 17 00:00:00 2001
From: Michael <reinertmi78855@th-nuernberg.de>
Date: Tue, 23 Jun 2020 11:16:02 +0200
Subject: [PATCH 18/22] added submit button to form

---
 src/app/userstory-form/userstory-form.component.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/app/userstory-form/userstory-form.component.html b/src/app/userstory-form/userstory-form.component.html
index e23e626..0b2ddc8 100644
--- a/src/app/userstory-form/userstory-form.component.html
+++ b/src/app/userstory-form/userstory-form.component.html
@@ -53,12 +53,12 @@
                         </div>
                     </div>
                 </div>
+                <div class="modal-footer">
+                    <button (click)="onClose()" type="dismiss" class="btn btn-secondary"
+                        data-dismiss="modal">Abbrechen</button>
+                    <button type="submit" class="btn btn-primary">Erstellen</button>
+                </div>
             </form>
-            <div class="modal-footer">
-                <button (click)="onClose()" type="dismiss" class="btn btn-secondary"
-                    data-dismiss="modal">Abbrechen</button>
-                <button type="submit" class="btn btn-primary">Erstellen</button>
-            </div>
         </div>
     </div>
 <!-- </div> -->
\ No newline at end of file

From bb50b6c6cdd897f668da92fdfa49f93599ce6143 Mon Sep 17 00:00:00 2001
From: Niggl <info@nicolai-ort.com>
Date: Tue, 23 Jun 2020 17:50:21 +0200
Subject: [PATCH 19/22] Filter for only triggering builds on master and tags

---
 .gitlab-ci.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2c8fece..bb7c22f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,4 +22,8 @@ build:
     - docker tag frontend:$CI_COMMIT_SHORT_SHA $CI_REGISTRY/taskboard/frontend:latest
     - docker push $CI_REGISTRY/taskboard/frontend:latest
   tags:
-    - frontend
\ No newline at end of file
+    - frontend
+  only:
+    refs:
+      - tags
+      - master

From 7c26e91b2a6b480126d75df16974c11c615b1432 Mon Sep 17 00:00:00 2001
From: test <stieglerda78912@th-nuernberg.de>
Date: Fri, 26 Jun 2020 13:26:00 +0200
Subject: [PATCH 20/22] created new sprint form component draft

---
 src/app/app.module.ts                         |  4 +-
 src/app/services/backend.service.ts           |  2 +-
 src/app/sprint-component/sprint.component.css |  0
 .../sprint-component/sprint.component.html    |  1 +
 src/app/sprint-component/sprint.component.ts  | 54 ++++++++++++++++
 src/app/sprint-form/sprint-form.component.css |  4 ++
 .../sprint-form/sprint-form.component.html    | 33 ++++++++++
 src/app/sprint-form/sprint-form.component.ts  | 62 +++++++++++++++++++
 8 files changed, 158 insertions(+), 2 deletions(-)
 create mode 100644 src/app/sprint-component/sprint.component.css
 create mode 100644 src/app/sprint-component/sprint.component.html
 create mode 100644 src/app/sprint-component/sprint.component.ts
 create mode 100644 src/app/sprint-form/sprint-form.component.css
 create mode 100644 src/app/sprint-form/sprint-form.component.html
 create mode 100644 src/app/sprint-form/sprint-form.component.ts

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index e6c683f..a724a81 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -11,6 +11,7 @@ import { TaskListComponent } from './task-list/task-list.component';
 import { TaskFormComponent } from './task-form/task-form.component';
 import { UserstoryListComponent } from './userstory-list/userstory-list.component';
 import { UserstoryFormComponent } from './userstory-form/userstory-form.component';
+import { SprintFormComponent } from './sprint-form/sprint-form.component';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 
 @NgModule({
@@ -19,7 +20,8 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
     TaskListComponent,
     TaskFormComponent,
     UserstoryListComponent,
-    UserstoryFormComponent
+    UserstoryFormComponent,
+    SprintFormComponent
   ],
   imports: [
     BrowserModule,
diff --git a/src/app/services/backend.service.ts b/src/app/services/backend.service.ts
index 239f82a..8682de8 100644
--- a/src/app/services/backend.service.ts
+++ b/src/app/services/backend.service.ts
@@ -232,7 +232,7 @@ export interface ScrumUserstory {
 export interface ScrumSprint{
     id?: number;
     title: string;
-    description: string;
+    description?: string;
     startDate: Date;
     endDate: Date;
     project: number;
diff --git a/src/app/sprint-component/sprint.component.css b/src/app/sprint-component/sprint.component.css
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/sprint-component/sprint.component.html b/src/app/sprint-component/sprint.component.html
new file mode 100644
index 0000000..9190d3a
--- /dev/null
+++ b/src/app/sprint-component/sprint.component.html
@@ -0,0 +1 @@
+<button class="btn btn-dark m-3" (click)="openUserstoryForm(null)">Neuer Sprint</button>
\ No newline at end of file
diff --git a/src/app/sprint-component/sprint.component.ts b/src/app/sprint-component/sprint.component.ts
new file mode 100644
index 0000000..d47b86b
--- /dev/null
+++ b/src/app/sprint-component/sprint.component.ts
@@ -0,0 +1,54 @@
+import { Component, OnInit } from '@angular/core';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { BackendService, ScrumSprint } from '../services/backend.service';
+import { SprintFormComponent } from '../sprint-form/sprint-form.component';
+
+@Component({
+  selector: 'app-sprint',
+  templateUrl: './sprint.component.html',
+  styleUrls: ['./sprint.component.css']
+})
+export class SprintComponent implements OnInit {
+
+  public sprints: ScrumSprint[] = [];
+
+  constructor(private backendService: BackendService, private modalService: NgbModal) { 
+      backendService.getSprints().subscribe(response => {
+          if (response.status > 399) {
+              alert('Fehler');
+          }
+          else {
+              this.sprints.push(...response.body);
+          }
+      });
+  }
+
+  ngOnInit(): void {
+  }
+
+  public deleteSprint(sprint: ScrumSprint) {
+    this.backendService.deleteSprint(sprint).subscribe(response => {
+      if (response.status > 399) {
+        alert('Fehler');
+      }
+    });
+    const index = this.sprints.indexOf(sprint);
+    if (index !== -1) {
+      this.sprints.splice(index, 1);
+    }    
+  }
+
+  public openSprintForm(editSprint: ScrumSprint) {
+    const modalRef = this.modalService.open(SprintFormComponent, {
+      backdrop: 'static',
+      keyboard: true,
+    });
+    if (editSprint === null) {
+      modalRef.result.then(result => {
+        this.sprints.push(result);
+      });
+    }
+    modalRef.componentInstance.userstory = editSprint;
+  }
+
+}
diff --git a/src/app/sprint-form/sprint-form.component.css b/src/app/sprint-form/sprint-form.component.css
new file mode 100644
index 0000000..717de4c
--- /dev/null
+++ b/src/app/sprint-form/sprint-form.component.css
@@ -0,0 +1,4 @@
+.modal-footer {
+	border-top: 0px solid;
+	padding-top: 5%;
+}
\ No newline at end of file
diff --git a/src/app/sprint-form/sprint-form.component.html b/src/app/sprint-form/sprint-form.component.html
new file mode 100644
index 0000000..641a485
--- /dev/null
+++ b/src/app/sprint-form/sprint-form.component.html
@@ -0,0 +1,33 @@
+    <div class="modal-content p-3">
+    <div class="modal-header">
+        <h4 class="modal-title">Neuen Sprint anlegen</h4>
+        <button (click)="onClose()" type="button" class="close" aria-label="Close">
+            <span aria-hidden="true">&times;</span>
+        </button>
+    </div>
+    <div class="modal-body">
+        <form (ngSubmit)="onSubmit()">
+            <div class="form-group">
+                <label for="Title">Titel</label>
+                <input type="text" class="form-control" id="Title" required name="title" [(ngModel)]="sprint.title"
+                    id="titleField">
+            </div>
+            <div class="form-group">
+                <label for="Title">Startdatum</label>
+                <input type="date" class="form-control" id="Title" required name="title" [(ngModel)]="sprint.startDate"
+                    id="titleField">
+            </div>
+            <div class="form-group">
+                <label for="Title">Enddatum</label>
+                <input type="date" class="form-control" id="Title" required name="title" [(ngModel)]="sprint.endDate"
+                    id="titleField">
+            </div>
+            
+            <div class="modal-footer">
+                <button (click)="onClose()" type="dismiss" class="btn btn-secondary"
+                    data-dismiss="modal">Abbrechen</button>
+                <button type="submit" class="btn btn-primary">Sprint starten</button>
+            </div>
+        </form>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/app/sprint-form/sprint-form.component.ts b/src/app/sprint-form/sprint-form.component.ts
new file mode 100644
index 0000000..f19c1bb
--- /dev/null
+++ b/src/app/sprint-form/sprint-form.component.ts
@@ -0,0 +1,62 @@
+import { Component, OnInit, Input } from '@angular/core';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import {
+  BackendService,
+  ScrumTask,
+  Priority,
+  ScrumStatus,
+  ScrumCategory,
+  ScrumUser,
+  ScrumProject,
+  ScrumUserstory,
+  ScrumSprint
+} from '../services/backend.service';
+import { Observable } from 'rxjs';
+import { HttpResponse } from '@angular/common/http';
+
+@Component({
+  selector: 'app-task-form',
+  templateUrl: './sprint-form.component.html',
+  styleUrls: ['./sprint-form.component.css'],
+})
+export class SprintFormComponent implements OnInit {
+  @Input() public sprint: ScrumSprint;
+  public editing: Boolean;
+  public sprintid: string;
+
+  constructor(
+    private backendService: BackendService,
+    private activeModalService: NgbActiveModal
+  ) { }
+
+  ngOnInit(): void {
+    if (this.sprint === null || this.sprint === undefined) {
+      this.sprint = { title: '', startDate: new Date(), endDate: new Date(), project: 0 }; //project id: static counter?
+      this.editing = false;
+    } else {
+      this.editing = true;
+    }
+    document.getElementById('titleField').focus();
+  }
+
+  onSubmit() {
+    if (this.editing) {
+      this.backendService.putSprint(this.sprint).subscribe((response) => {
+        if (response.status > 399) {
+          alert('Fehler');
+        }
+      });
+    } else {
+      this.backendService.postSprint(this.sprint).subscribe((response) => {
+        if (response.status > 399) {
+          alert('Fehler');
+        }
+      });
+    }
+    this.activeModalService.close(this.sprint);
+  }
+
+  onClose() {
+    this.activeModalService.dismiss(this.sprint);
+  }
+}

From 9c14fc4bd5dd419754fd1b82b9f42e31f39d652a Mon Sep 17 00:00:00 2001
From: test <stieglerda78912@th-nuernberg.de>
Date: Sun, 28 Jun 2020 12:07:30 +0200
Subject: [PATCH 21/22] modified task-list to "enable" sprint-form.

---
 src/app/task-list/task-list.component.html |  2 ++
 src/app/task-list/task-list.component.ts   | 19 ++++++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/app/task-list/task-list.component.html b/src/app/task-list/task-list.component.html
index 1f501a3..58e444a 100644
--- a/src/app/task-list/task-list.component.html
+++ b/src/app/task-list/task-list.component.html
@@ -1,4 +1,6 @@
 <button class="btn btn-dark m-3" (click)="openTaskForm(null)">Neu</button>
+<button class="btn btn-dark m-3" (click)="openSprintForm(null)">Neuer Sprint</button>
+
 
 <ul class="list-group m-3">
     <li *ngFor="let task of tasks" class="list-group-item">
diff --git a/src/app/task-list/task-list.component.ts b/src/app/task-list/task-list.component.ts
index b8daf28..598f5ce 100644
--- a/src/app/task-list/task-list.component.ts
+++ b/src/app/task-list/task-list.component.ts
@@ -1,7 +1,9 @@
 import { Component, OnInit } from '@angular/core';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { BackendService, ScrumTask } from '../services/backend.service';
+import { BackendService, ScrumTask, ScrumSprint } from '../services/backend.service';
 import { TaskFormComponent } from '../task-form/task-form.component';
+import { SprintFormComponent } from '../sprint-form/sprint-form.component';
+
 
 @Component({
   selector: 'app-task-list',
@@ -11,6 +13,8 @@ import { TaskFormComponent } from '../task-form/task-form.component';
 export class TaskListComponent implements OnInit {
 
   public tasks: ScrumTask[] = [];
+  public sprints: ScrumSprint[] = [];
+
 
   constructor(private backendService: BackendService, private modalService: NgbModal) { 
       backendService.getTasks().subscribe(response => {
@@ -51,4 +55,17 @@ export class TaskListComponent implements OnInit {
     modalRef.componentInstance.task = editTask;
   }
 
+  public openSprintForm(editSprint: ScrumSprint) {
+    const modalRef = this.modalService.open(SprintFormComponent, {
+      backdrop: 'static',
+      keyboard: true,
+    });
+    if (editSprint === null) {
+      modalRef.result.then(result => {
+        this.sprints.push(result);
+      });
+    }
+    modalRef.componentInstance.userstory = editSprint;
+  }
+
 }

From 75b964402a9f3d8e03c427837a25886dc1ae5c45 Mon Sep 17 00:00:00 2001
From: test <stieglerda78912@th-nuernberg.de>
Date: Sun, 28 Jun 2020 12:13:45 +0200
Subject: [PATCH 22/22] .

---
 src/app/sprint-form/sprint-form.component.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/sprint-form/sprint-form.component.html b/src/app/sprint-form/sprint-form.component.html
index 641a485..d8b7ecd 100644
--- a/src/app/sprint-form/sprint-form.component.html
+++ b/src/app/sprint-form/sprint-form.component.html
@@ -13,13 +13,13 @@
                     id="titleField">
             </div>
             <div class="form-group">
-                <label for="Title">Startdatum</label>
-                <input type="date" class="form-control" id="Title" required name="title" [(ngModel)]="sprint.startDate"
+                <label for="date">Startdatum</label>
+                <input type="Date" class="form-control" id="Date" required name="date" [(ngModel)]="sprint.startDate"
                     id="titleField">
             </div>
             <div class="form-group">
-                <label for="Title">Enddatum</label>
-                <input type="date" class="form-control" id="Title" required name="title" [(ngModel)]="sprint.endDate"
+                <label for="Date">Enddatum</label>
+                <input type="date" class="form-control" id="Date" required name="date" [(ngModel)]="sprint.endDate"
                     id="titleField">
             </div>