Skip to content

Commit 7f169eb

Browse files
committed
fix load of renamed yamls
1 parent daa87de commit 7f169eb

6 files changed

Lines changed: 17 additions & 8 deletions

File tree

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ COPY . .
66
RUN npm run build
77

88
FROM bitnami/nginx:latest
9-
#COPY nginx.conf /etc/nginx/nginx.conf
10-
COPY --from=build /usr/src/app/dist/dsomm/ /app
9+
COPY nginx/location.conf /opt/bitnami/nginx/conf/server_blocks/location.conf
10+
COPY --from=build /usr/src/app/dist/dsomm/ /app

nginx/location.conf

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
server {
2+
listen 80 default_server;
3+
listen [::]:80 default_server;
4+
server_name _;
5+
root /app;
6+
index index.html;
7+
try_files $uri $uri/ /index.html =404;
8+
}
9+

src/app/component/circular-heatmap/circular-heatmap.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export class CircularHeatmapComponent implements OnInit {
3333
constructor(private yaml:ymlService) { }
3434

3535
ngOnInit(): void {
36-
this.yaml.setURI('./assets/YAML/sample.yaml');
36+
this.yaml.setURI('./assets/YAML/meta.yaml');
3737
// Function sets column header
3838
this.yaml.getJson().subscribe((data) => {
3939
this.YamlObject = data;
@@ -47,7 +47,7 @@ export class CircularHeatmapComponent implements OnInit {
4747

4848
});
4949

50-
this.yaml.setURI('./assets/YAML/generated/sample.yaml');
50+
this.yaml.setURI('./assets/YAML/generated/generated.yaml');
5151
// Function sets data
5252
this.yaml.getJson().subscribe((data) => {
5353
//console.log(this.radial_labels)

src/app/component/mapping/mapping.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ export class MappingComponent implements OnInit {
8181

8282
ngOnInit(): void {
8383
//gets value from generated folder
84-
this.yaml.setURI('./assets/YAML/generated/sample.yaml');
84+
this.yaml.setURI('./assets/YAML/generated/generated.yaml');
8585
// Function sets data
8686
this.yaml.getJson().subscribe((data) => {
8787
this.YamlObject = data;

src/app/component/task-description/task-description.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,15 @@ export class TaskDescriptionComponent implements OnInit {
5858
});
5959

6060
//gets value from sample file
61-
this.yaml.setURI('./assets/YAML/sample.yaml');
61+
this.yaml.setURI('./assets/YAML/meta.yaml');
6262
// Function sets label data
6363
this.yaml.getJson().subscribe((data) => {
6464
this.YamlObject = data;
6565
this.TimeAndResourceLabels=this.YamlObject['strings']['en']['labels']
6666
this.KnowledgeLabels=this.YamlObject['strings']['en']['KnowledgeLabels']
6767
})
6868
//gets value from generated folder
69-
this.yaml.setURI('./assets/YAML/generated/sample.yaml');
69+
this.yaml.setURI('./assets/YAML/generated/generated.yaml');
7070
// Function sets data
7171
this.yaml.getJson().subscribe((data) => {
7272
this.YamlObject = data;

src/assets/YAML/generated/generated.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1729,7 +1729,7 @@ Implementation:
17291729
evidence: ""
17301730
comments: ""
17311731
assessment: ""
1732-
Development & Source Control:
1732+
Development and Source Control:
17331733
Local development linting & style checks performed:
17341734
risk: Creating and developing code that contains code smells and quality issues.
17351735
measure: "Integration of quality and linting plugins with interactive development

0 commit comments

Comments
 (0)