Update/misc fe (#2463)

* update to use transparent icon; add icon to login

* update setup mocks to imitate reality

* update webmanifest version

* fix version in webmanifest

* reset icons with background; update login page style

* adjust login header

* cleanup + adjust icon size

* revert icon

* cleanup and reposition error message
This commit is contained in:
Lucy
2023-10-18 14:24:48 -04:00
committed by GitHub
parent 246727995d
commit bb6a4842bd
4 changed files with 91 additions and 108 deletions

View File

@@ -56,14 +56,14 @@ export class MockApiService extends ApiService {
await pauseFor(1000) await pauseFor(1000)
return [ return [
{ {
logicalname: 'abcd', logicalname: '/dev/nvme0n1p3',
vendor: 'Samsung', vendor: 'Unknown Vendor',
model: 'T5', model: 'Samsung SSD - 970 EVO Plus 2TB',
partitions: [ partitions: [
{ {
logicalname: 'pabcd', logicalname: 'pabcd',
label: null, label: null,
capacity: 73264762332, capacity: 1979120929996,
used: null, used: null,
'embassy-os': { 'embassy-os': {
version: '0.2.17', version: '0.2.17',
@@ -75,13 +75,13 @@ export class MockApiService extends ApiService {
guid: null, guid: null,
}, },
], ],
capacity: 123456789123, capacity: 1979120929996,
guid: 'uuid-uuid-uuid-uuid', guid: 'uuid-uuid-uuid-uuid',
}, },
{ {
logicalname: 'dcba', logicalname: 'dcba',
vendor: 'Crucial', vendor: 'CT1000MX',
model: 'MX500', model: '500SSD1',
partitions: [ partitions: [
{ {
logicalname: 'pbcba', logicalname: 'pbcba',
@@ -98,13 +98,13 @@ export class MockApiService extends ApiService {
guid: null, guid: null,
}, },
], ],
capacity: 124456789123, capacity: 1000190509056,
guid: null, guid: null,
}, },
{ {
logicalname: 'wxyz', logicalname: '/dev/sda',
vendor: 'SanDisk', vendor: 'ASMT',
model: 'Specialness', model: '2115',
partitions: [ partitions: [
{ {
logicalname: 'pbcba', logicalname: 'pbcba',
@@ -121,7 +121,7 @@ export class MockApiService extends ApiService {
guid: 'guid-guid-guid-guid', guid: 'guid-guid-guid-guid',
}, },
], ],
capacity: 123459789123, capacity: 1000190509056,
guid: null, guid: null,
}, },
] ]

View File

@@ -23,43 +23,51 @@
<ion-grid class="grid"> <ion-grid class="grid">
<ion-row class="row"> <ion-row class="row">
<ion-col> <ion-col>
<ion-card class="card"> <ion-card>
<img
alt="StartOS Icon"
class="header-icon"
src="assets/img/icon.png"
/>
<ion-card-header> <ion-card-header>
<ion-card-title class="title">StartOS Login</ion-card-title> <ion-card-title class="title">Login to StartOS</ion-card-title>
</ion-card-header> </ion-card-header>
<ion-card-content class="ion-margin"> <ion-card-content class="ion-margin">
<form class="form" (submit)="submit()"> <form (submit)="submit()">
<ion-item-group> <ion-item color="dark" fill="solid">
<ion-item color="dark" class="login-item"> <ion-icon
slot="start"
size="small"
color="base"
name="key-outline"
style="margin-right: 16px"
></ion-icon>
<ion-input
name="password"
placeholder="Password"
[type]="unmasked ? 'text' : 'password'"
[(ngModel)]="password"
(ionChange)="error = ''"
maxlength="64"
></ion-input>
<ion-button
slot="end"
fill="clear"
color="dark"
(click)="unmasked = !unmasked"
>
<ion-icon <ion-icon
slot="start" slot="icon-only"
name="key-outline" size="small"
style="margin-right: 16px" [name]="unmasked ? 'eye-off-outline' : 'eye-outline'"
></ion-icon> ></ion-icon>
<ion-input </ion-button>
name="password" </ion-item>
placeholder="Password" <p class="error ion-text-center">
[type]="unmasked ? 'text' : 'password'" <ion-text color="danger">{{ error }}</ion-text>
[(ngModel)]="password" </p>
(ionChange)="error = ''"
maxlength="64"
></ion-input>
<ion-button
fill="clear"
color="light"
(click)="unmasked = !unmasked"
>
<ion-icon
slot="icon-only"
size="small"
[name]="unmasked ? 'eye-off-outline' : 'eye-outline'"
></ion-icon>
</ion-button>
</ion-item>
</ion-item-group>
<ion-button <ion-button
class="login-button side-button" class="login-button"
type="submit" type="submit"
expand="block" expand="block"
color="tertiary" color="tertiary"
@@ -67,9 +75,6 @@
Login Login
</ion-button> </ion-button>
</form> </form>
<p class="error">
<ion-text color="danger">{{ error }}</ion-text>
</p>
</ion-card-content> </ion-card-content>
</ion-card> </ion-card>
</ion-col> </ion-col>

View File

@@ -1,15 +1,5 @@
.content { .content {
--background: #222428; --background: #333333;
}
.card {
background: #414141;
}
.title {
margin: 24px 0 16px;
color: #e0e0e0;
font-size: 1.8rem;
} }
.grid { .grid {
@@ -23,12 +13,6 @@
text-align: center; text-align: center;
} }
.error {
display: block;
text-align: left;
padding-top: 4px;
}
.banner { .banner {
position: absolute; position: absolute;
padding: 20px; padding: 20px;
@@ -41,58 +25,52 @@
} }
} }
.side-button {
--border-radius: 0 4px 4px 0;
}
.login-item {
--border-style: solid;
--border-color: var(--ion-color-light);
--border-radius: 4px 0 0 4px;
box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0, 0.14),
0 1px 5px 0 rgba(0, 0, 0, 0.12);
.side-button {
--border-radius: 4px;
}
}
ion-card { ion-card {
background: var(--ion-color-step-200); background: #414141;
box-shadow: 0 4px 4px rgba(0, 0, 0, 0.25); box-shadow: 0 4px 4px rgba(17, 17, 17, 0.144);
border-radius: 44px; border-radius: 35px;
min-height: 16rem; min-height: 16rem;
contain: unset;
overflow: unset;
position: relative;
}
ion-item {
--background: transparent;
--border-radius: 0px;
}
.title {
padding-top: 55px;
color: #e0e0e0;
font-size: 1.3rem;
}
.header {
&-icon {
width: 100px;
position: absolute;
left: 50%;
margin-left: -50px;
top: -17%;
z-index: 100;
}
} }
.login-button { .login-button {
margin-inline-start: 0; height: 45px;
margin-inline-end: 0; width: 120px;
height: 49px; --border-radius: 50px;
font-size: larger; margin: 0 auto;
font-weight: bold; margin-top: 27px;
} margin-bottom: 10px;
.form {
margin-bottom: 12px;
* {
display: inline-block;
vertical-align: middle;
}
} }
.item-interactive { .item-interactive {
--highlight-background: #5260ff !important; --highlight-background: #5260ff !important;
} }
.error {
@media (max-width: 500px) { display: block;
.side-button { padding-top: 4px;
--border-radius: 4px;
margin-top: 0.7rem;
}
.login-item {
--border-radius: 4px;
}
} }

View File

@@ -5,8 +5,8 @@
"background_color": "#1e1e1e", "background_color": "#1e1e1e",
"display": "standalone", "display": "standalone",
"scope": ".", "scope": ".",
"start_url": "/?version=0344", "start_url": "/?version=035",
"id": "/?version=0344", "id": "/?version=035",
"icons": [ "icons": [
{ {
"src": "assets/img/icon.png", "src": "assets/img/icon.png",