From b5e766ed4b2bc60592e25034c20005369ca3a2f5 Mon Sep 17 00:00:00 2001 From: Diabltica Date: Tue, 21 Sep 2021 10:45:56 +0200 Subject: [PATCH] cleanup display --- src/app/app.module.ts | 70 ++++++++++--------- .../quickstart/quickstart.component.html | 45 ++++++------ .../quickstart/quickstart.component.scss | 24 +++++-- .../pages/quickstart/quickstart.component.ts | 38 ++++++---- src/styles.scss | 7 ++ 5 files changed, 112 insertions(+), 72 deletions(-) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 435fe30..c4ebc24 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -52,6 +52,7 @@ import { DatetimeInterceptorService } from "./services/datetime-interceptor.serv import { MatDatepickerModule } from "@angular/material/datepicker"; import { QuickstartComponent } from './pages/quickstart/quickstart.component'; import {MatStepperModule} from "@angular/material/stepper"; +import {MatListModule} from "@angular/material/list"; @NgModule({ @@ -78,40 +79,41 @@ import {MatStepperModule} from "@angular/material/stepper"; LongPressDirective, QuickstartComponent ], - imports: [ - BrowserModule, - HttpClientModule, - AuthRoutingModule, - AppRoutingModule, - BrowserAnimationsModule, - MatSnackBarModule, - MatProgressBarModule, - MatButtonModule, - MatIconModule, - MatSelectModule, - MatMenuModule, - MatSliderModule, - MatTooltipModule, - MatRippleModule, - MatCardModule, - ReactiveFormsModule, - MatInputModule, - MatFormFieldModule, - MatDialogModule, - FormsModule, - MatTabsModule, - MatCheckboxModule, - AuthModule, - MatChipsModule, - MatAutocompleteModule, - MatExpansionModule, - InfiniteScrollModule, - MatBadgeModule, - HammerModule, - MatDatepickerModule, - MatNativeDateModule, - MatStepperModule - ], + imports: [ + BrowserModule, + HttpClientModule, + AuthRoutingModule, + AppRoutingModule, + BrowserAnimationsModule, + MatSnackBarModule, + MatProgressBarModule, + MatButtonModule, + MatIconModule, + MatSelectModule, + MatMenuModule, + MatSliderModule, + MatTooltipModule, + MatRippleModule, + MatCardModule, + ReactiveFormsModule, + MatInputModule, + MatFormFieldModule, + MatDialogModule, + FormsModule, + MatTabsModule, + MatCheckboxModule, + AuthModule, + MatChipsModule, + MatAutocompleteModule, + MatExpansionModule, + InfiniteScrollModule, + MatBadgeModule, + HammerModule, + MatDatepickerModule, + MatNativeDateModule, + MatStepperModule, + MatListModule + ], bootstrap: [AppComponent], exports: [ FallbackDirective diff --git a/src/app/pages/quickstart/quickstart.component.html b/src/app/pages/quickstart/quickstart.component.html index b574376..1eabd91 100644 --- a/src/app/pages/quickstart/quickstart.component.html +++ b/src/app/pages/quickstart/quickstart.component.html @@ -1,41 +1,43 @@ -

Welcome in Quickstart

- - - - +
+ +
+
+

Thanks for installing Kyoo

+
+ +
+
- +
- - Name - - +
+ +
- +
- - Address - - +
- +
- - Phone number - - +
+ +
@@ -47,6 +49,7 @@

You are now done.

+
diff --git a/src/app/pages/quickstart/quickstart.component.scss b/src/app/pages/quickstart/quickstart.component.scss index b61cfe5..86ccfea 100644 --- a/src/app/pages/quickstart/quickstart.component.scss +++ b/src/app/pages/quickstart/quickstart.component.scss @@ -1,8 +1,3 @@ -.logo{ - display: block; - margin-left: auto; - margin-right: auto; -} .stepper { margin-top: 8px; background-color: #0a1128; @@ -11,3 +6,22 @@ .mat-form-field { margin-top: 16px; } + +.content{ + padding-top: 1.5%; +} + +.welcome{ + padding-top: 1.5%; + >.logo{ + display: block; + margin-left: auto; + margin-right: auto; + } + >.text_box{ + text-align: center; + } +} +.mr-xl-5{ + margin-right: 0 !important; +} diff --git a/src/app/pages/quickstart/quickstart.component.ts b/src/app/pages/quickstart/quickstart.component.ts index e6d8cd3..2c8d56c 100644 --- a/src/app/pages/quickstart/quickstart.component.ts +++ b/src/app/pages/quickstart/quickstart.component.ts @@ -9,6 +9,7 @@ import { BreakpointObserver } from "@angular/cdk/layout"; import { StepperOrientation } from "@angular/material/stepper"; import { Observable } from "rxjs"; import { map } from "rxjs/operators"; +import { AuthService } from "../../auth/auth.service"; @Component({ @@ -18,6 +19,23 @@ import { map } from "rxjs/operators"; }) export class QuickstartComponent implements OnDestroy, AfterViewInit { + + constructor(private route: ActivatedRoute, + public authManager: AuthService, + private snackBar: MatSnackBar, + private sanitizer: DomSanitizer, + private title: Title, + private router: Router, + private dialog: MatDialog, + private http: HttpClient, + private _formBuilder: FormBuilder, + breakpointObserver: BreakpointObserver) + { + this.title.setTitle("Quickstart"); + this.stepperOrientation = breakpointObserver.observe("(min-width: 800px)") + .pipe(map(({matches}) => matches ? "horizontal" : "vertical")); + } + private scrollZone: HTMLElement; private toolbar: HTMLElement; @@ -34,23 +52,19 @@ export class QuickstartComponent implements OnDestroy, AfterViewInit { isShowDivIf = true; + + + // tslint:disable-next-line:typedef toggleDisplayDivIf() { this.isShowDivIf = !this.isShowDivIf; } - constructor(private route: ActivatedRoute, - private snackBar: MatSnackBar, - private sanitizer: DomSanitizer, - private title: Title, - private router: Router, - private dialog: MatDialog, - private http: HttpClient, - private _formBuilder: FormBuilder, - breakpointObserver: BreakpointObserver) { - this.title.setTitle("Quickstart"); - this.stepperOrientation = breakpointObserver.observe("(min-width: 800px)") - .pipe(map(({matches}) => matches ? "horizontal" : "vertical")); + + + Register(): void + { + this.authManager.login(); } ngOnDestroy(): void { diff --git a/src/styles.scss b/src/styles.scss index 5e808a3..55bff2a 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -118,3 +118,10 @@ mat-icon -o-user-drag: none; user-drag: none; } + +.mat-step-header .mat-step-icon-selected { + background-color: #e23c00; + color: #fff; +} + +