Commit 9e656ae5 authored by Rajkumar-D's avatar Rajkumar-D
Browse files

Merge branch 'K8-master' of https://github.com/enasequence/webin-portal into K8-master

parents 689bab58 ce1fbda7
......@@ -17,7 +17,7 @@ spec:
image: %DOCKER_IMAGE%
ports:
- containerPort: 80
- containerPort: 443
# - containerPort: 443
imagePullSecrets:
- name: gitlab
---
......@@ -34,8 +34,8 @@ spec:
targetPort: 80
protocol: TCP
name: http
- port: 443
protocol: TCP
name: https
# - port: 443
# protocol: TCP
# name: https
selector:
run: webin-portal
......@@ -17,7 +17,7 @@ spec:
image: %DOCKER_IMAGE%
ports:
- containerPort: 80
- containerPort: 443
# - containerPort: 443
imagePullSecrets:
- name: gitlab
---
......@@ -34,8 +34,8 @@ spec:
targetPort: 80
protocol: TCP
name: http
- port: 443
protocol: TCP
name: https
# - port: 443
# protocol: TCP
# name: https
selector:
run: webin-portal
......@@ -17,7 +17,7 @@ spec:
image: %DOCKER_IMAGE%
ports:
- containerPort: 80
- containerPort: 443
# - containerPort: 443
imagePullSecrets:
- name: gitlab
---
......@@ -34,8 +34,8 @@ spec:
targetPort: 80
protocol: TCP
name: http
- port: 443
protocol: TCP
name: https
# - port: 443
# protocol: TCP
# name: https
selector:
run: webin-portal
......@@ -2199,6 +2199,11 @@
"negotiator": "0.6.2"
}
},
"ace-builds": {
"version": "1.4.12",
"resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.4.12.tgz",
"integrity": "sha512-G+chJctFPiiLGvs3+/Mly3apXTcfgE45dT5yp12BcWZ1kUs+gm0qd3/fv4gsz6fVag4mM0moHVpjHDIgph6Psg=="
},
"acorn": {
"version": "6.4.2",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
......@@ -2850,6 +2855,11 @@
"multicast-dns-service-types": "^1.1.0"
}
},
"brace": {
"version": "0.11.1",
"resolved": "https://registry.npmjs.org/brace/-/brace-0.11.1.tgz",
"integrity": "sha1-SJb8ydVE7vRfS7dmDbMg07N5/lg="
},
"brace-expansion": {
"version": "1.1.11",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
......@@ -7833,6 +7843,15 @@
"integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
"dev": true
},
"ng2-ace-editor": {
"version": "0.3.9",
"resolved": "https://registry.npmjs.org/ng2-ace-editor/-/ng2-ace-editor-0.3.9.tgz",
"integrity": "sha512-e8Q4YCirlL/OEiekewmzupG+zV3prYsiYmQnRzQzd0wNgsPjOLOdb0it7cCbzFfIXKGyIIHKTW5584WxPr2LnQ==",
"requires": {
"ace-builds": "^1.4.2",
"brace": "^0.11.1"
}
},
"nice-try": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
......
<<<<<<< HEAD
<form (ngSubmit)="submitDac(f)" #f="ngForm">
<div class="body">
<div>
......@@ -24,6 +25,33 @@
<th mat-header-cell *matHeaderCellDef>Email</th>
<td mat-cell *matCellDef="let element">{{ element.emailAddress }}</td>
</ng-container>
=======
<div class="body">
<div>
<div class="mat-h3 mat-tittle">Register Data access committee (DAC)</div>
</div>
<mat-divider></mat-divider>
<div class="container">
<mat-card>
<mat-card-subtitle>DAC Details</mat-card-subtitle>
<div style="width: 100%;">
<mat-form-field class="app-field-padding">
<textarea rows="3" matInput placeholder="Short descriptive title for the DAC" required
[(ngModel)]="title" name="title"></textarea>
</mat-form-field>
</div>
</mat-card>
<mat-card>
<mat-card-subtitle>Contact Information</mat-card-subtitle>
<a (click)="openDialog('Add', { submissionAccountId: id })">Add At Least One Contact
<mat-icon>add_circle</mat-icon>
</a>
<table mat-table *ngIf="dataSource" #table [dataSource]="dataSource" class="mat-elevation-z8">
<ng-container matColumnDef="emailAddress">
<th mat-header-cell *matHeaderCellDef>Email</th>
<td mat-cell *matCellDef="let element">{{ element.emailAddress }}</td>
</ng-container>
>>>>>>> ce1fbda77b9f9784fc30557a25c78dc4178bbaa2
<ng-container matColumnDef="name">
<th mat-header-cell *matHeaderCellDef>Name</th>
......@@ -78,5 +106,9 @@
</mat-spinner>
</div>
</div>
<<<<<<< HEAD
</form>
\ No newline at end of file
</form>
=======
</div>
>>>>>>> ce1fbda77b9f9784fc30557a25c78dc4178bbaa2
......@@ -36,7 +36,7 @@
<mat-icon class="note_add">add_box</mat-icon>
<p class="mat-small mat-caption">Register taxonomy</p>
</span>
<span *ngIf="isEga()" [routerLink]="['/dac']">
<!-- <span *ngIf="isEga()" [routerLink]="['/dac']">
<mat-icon class="note_add">add_box</mat-icon>
<p class="mat-small mat-caption">Register data access committee</p>
</span>
......@@ -48,7 +48,7 @@
<mat-icon class="note_add">add_box</mat-icon>
<p class="mat-small mat-caption">Submit dataset</p>
</span>
-->
</div>
</mat-card>
</ng-container>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment