Skip to content

Commit a3c8583

Browse files
committed
common updates
1 parent 5ad8fdf commit a3c8583

17 files changed

Lines changed: 83 additions & 49 deletions

angular/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "mist-extension",
3-
"version": "4.3.1",
3+
"version": "5.0.0",
44
"description": "Generated with @larscom/ng-mist-extension",
55
"scripts": {
66
"start": "npm run watch",

angular/src/app/pages/account/account.component.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ <h3 class="title-cloud">API Usage</h3>
4848
<div class="box-cloud-token-buttons">
4949
<button class="box-cloud-token-button tooltip" (click)="openManageTokens(session.domain, 'user')" [disabled]="!session.two_factor_passed">
5050
<img class="icon"src="assets/list.svg">
51-
<span class="tooltiptext">Manage</span>
51+
<span *ngIf="session.two_factor_passed" class="tooltiptext">Manage</span>
5252
</button>
5353
<button class="box-cloud-token-button stroked tooltip" (click)="openCreateToken(session.domain, 'user')" [disabled]="!session.two_factor_passed">
5454
<img class="icon" src="assets/add.svg">
55-
<span class="tooltiptext">Create</span>
55+
<span *ngIf="session.two_factor_passed" class="tooltiptext">Create</span>
5656
</button>
5757
</div>
5858
</div>
@@ -67,11 +67,11 @@ <h3 class="title-cloud">API Usage</h3>
6767
<div class="box-cloud-token-buttons">
6868
<button class="box-cloud-token-button tooltip" (click)="openManageTokens(session.domain, 'org')" [disabled]="!session.two_factor_passed">
6969
<img class="icon"src="assets/list.svg">
70-
<span class="tooltiptext">Manage</span>
70+
<span *ngIf="session.two_factor_passed" class="tooltiptext">Manage</span>
7171
</button>
7272
<button class="box-cloud-token-button stroked tooltip" (click)="openCreateToken(session.domain, 'org')" [disabled]="!session.two_factor_passed">
7373
<img class="icon" src="assets/add.svg">
74-
<span class="tooltiptext">Create</span>
74+
<span *ngIf="session.two_factor_passed" class="tooltiptext">Create</span>
7575
</button>
7676
</div>
7777
</div>

angular/src/app/pages/account/create_org/create_org.component.html

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@
77
<div class="org_select token_opt">
88
<input type="text" [(ngModel)]="token_name" placeholder="Token Name (optional)"/>
99
<div *ngIf="displayed_msps.length > 0" >
10-
<select name=msp_id [(ngModel)]="msp_id" (change)="mspSelected()">
11-
<option class="none" value="none">
12-
<div style="width: 100%; text-align: center;">-- MSP Account --</div>
13-
</option>
14-
<option *ngFor="let msp of displayed_msps" [value]="msp.msp_id">
15-
<div>{{msp.name}}</div>
16-
</option>
17-
</select>
10+
<select name=msp_id [(ngModel)]="msp_id" (change)="mspSelected()">
11+
<option class="none" value="none">
12+
<div style="width: 100%; text-align: center;">-- MSP Account --</div>
13+
</option>
14+
<option *ngFor="let msp of displayed_msps" [value]="msp.msp_id">
15+
<div>{{msp.name}}</div>
16+
</option>
17+
</select>
18+
</div>
1819
<select name=org_id [(ngModel)]="org_id">
1920
<option class="none" value="none">
2021
<div style="width: 100%; text-align: center;">-- Please Select an Org --</div>
@@ -33,7 +34,6 @@
3334
<option value="site" disabled>Site</option>
3435
<option value="sitegroup" disabled>SiteGroup</option>
3536
</select>
36-
</div>
3737

3838
<select *ngIf="scope=='site'" name="site_id" [(ngModel)]="site_id">
3939
<option class="none" value="none">

angular/src/app/pages/account/manage/manage.component.scss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ button.close:hover {
3232
}
3333

3434
.token-container {
35-
margin: 0.7em;
35+
margin: 0.5em 0;
3636
display: flex;
3737
flex-direction: row;
3838
align-items: center;
@@ -41,13 +41,13 @@ button.close:hover {
4141
border: 1px solid #4f5560;
4242
box-shadow: rgba(99, 99, 99, 0.2) 0px 2px 8px 0px;
4343
border-radius: 15px;
44-
height: 7em;
44+
height: 8em;
4545
}
4646

4747
.token {
4848
display: flex;
4949
flex-direction: column;
50-
padding: 1em;
50+
padding: .5em;
5151
}
5252

5353
.token-info {
@@ -94,11 +94,11 @@ div.token table tr td div.name {
9494
text-align: left;
9595
}
9696
.token table tr td {
97-
width: 130px;
97+
width: 140px;
9898
text-overflow: ellipsis;
9999
overflow: hidden;
100100
white-space: nowrap;
101-
max-width: 130px;
101+
max-width: 140px;
102102
}
103103

104104
.token table tr td:hover {

angular/src/app/pages/api/django/api.django.component.scss

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,6 @@
7575
border: 1px solid #ff0000;
7676
}
7777

78-
79-
.parameters {
80-
margin: 1em;
81-
}
82-
8378
////// INPUT
8479
.help.icon {
8580
filter: invert(100%) sepia(0) saturate(1352%) hue-rotate(0deg) brightness(10%) contrast(0);

angular/src/app/pages/api/django/django.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ <h2>API Documentation</h2>
4343
</button>
4444
</div>
4545
</div>
46-
<div class="parameters">
46+
<div class="content no-border no-grow">
4747
<h2>Query Parameters</h2>
4848
<div *ngIf="query_params.length > 0">
4949
<button class="xlarge" (click)="updateUrl()">

angular/src/app/pages/api/manage/manage.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ <h2>Page Info</h2>
7070
</div>
7171
</div>
7272
</div>
73-
<div *ngIf="quick_links.length > 0" class="content no-grow">
73+
<div *ngIf="quick_links.length > 0" class="content no-border no-grow">
7474
<h2>Quick API Access</h2>
7575
<div class="box-apitab">
7676
<button *ngFor="let quick_link of quick_links" (click)="openApiTab(quick_link.url)" class="xlarge">

angular/src/app/pages/tools/tools.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ <h2>API Token</h2>
1313
<app-tools-token-info
1414
class="popup transparent"
1515
[ngClass]="{ hidden: view != 'token-info' }"
16-
(closeManageTokens)="closePopup('token-info')"
16+
(closePopup)="closePopup('token-info')"
1717
></app-tools-token-info>
1818
<app-tools-token-usage
1919
class="popup transparent"
2020
[ngClass]="{ hidden: view != 'token-usage' }"
21-
(closeManageTokens)="closePopup('token-usage')"
21+
(closePopup)="closePopup('token-usage')"
2222
></app-tools-token-usage>

angular/src/app/scss/button.component.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ button.Stroked:disabled:hover img {
3333
button:enabled {
3434
background-color: #161c26;
3535
color: #fff;
36-
border: 2px solid #63b4ee;
36+
border: 1px solid #63b4ee;
3737
border-radius: 15px;
3838
padding: 1.5em 1em;
3939
// background-color: #1964a3;
@@ -50,7 +50,7 @@ button:enabled:hover {
5050
button.stroked:enabled {
5151
background-color: unset;
5252
color: white;
53-
border: 2px solid #18c956;
53+
border: 1px solid #18c956;
5454
}
5555

5656
button.stroked:enabled:hover {

angular/src/app/scss/popup.component.scss

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
.content {
2-
padding: 1em;
32
display: flex;
43
align-items: stretch;
54
flex-direction: column;
65
background-color: #202836;
76
margin: 1em;
8-
padding: 1em;
7+
padding: 0 1em;
98
border: 1px solid #bbb;
109
border-radius: 15px;
11-
max-height: 90vh;
10+
max-height: 95vh;
1211
}
12+
13+
.content.no-border {
14+
border: none;
15+
}
16+
1317
.content.full-height {
1418
min-height: 90vh;
1519
}
@@ -23,9 +27,9 @@
2327

2428
.popup {
2529
position: absolute;
26-
top: 50px;
30+
top: 0;
2731
left: 0;
28-
height: 455px;
32+
height: 100vh;
2933
width: 100%;
3034
display: flex;
3135
flex-direction: column;
@@ -40,8 +44,8 @@
4044

4145

4246
.popup.transparent {
43-
backdrop-filter: blur(2px);
44-
background: rgb(0 0 0 / 0%);
47+
backdrop-filter: blur(5px);
48+
background: rgb(0 0 0 / 25%);
4549
display: flex;
4650
flex-direction: column;
4751
justify-content: center;

0 commit comments

Comments
 (0)