ui changes
This commit is contained in:
parent
feb08070b5
commit
897da4601c
@ -2,7 +2,7 @@ import { Component, OnInit, ViewChild } from '@angular/core';
|
|||||||
import { MatDialog } from '@angular/material/dialog';
|
import { MatDialog } from '@angular/material/dialog';
|
||||||
import { MatPaginator } from '@angular/material/paginator';
|
import { MatPaginator } from '@angular/material/paginator';
|
||||||
import { MatTable, MatTableDataSource } from '@angular/material/table';
|
import { MatTable, MatTableDataSource } from '@angular/material/table';
|
||||||
import Swal from 'sweetalert2/dist/sweetalert2.js';
|
import Swal from 'sweetalert2';
|
||||||
import { DialogBoxComponent } from '../dialog-box/dialog-box.component';
|
import { DialogBoxComponent } from '../dialog-box/dialog-box.component';
|
||||||
export interface UsersData {
|
export interface UsersData {
|
||||||
id: number;
|
id: number;
|
||||||
|
|||||||
@ -1,8 +1,9 @@
|
|||||||
<h3>
|
<h3>
|
||||||
|
|
||||||
<button class="btn btn-primary pull-right" (click)="addEvent()">
|
<!-- <button class="btn btn-primary pull-right" (click)="addEvent()">
|
||||||
Add new
|
Add new
|
||||||
</button>
|
</button> -->
|
||||||
|
<button class="btn btn-primary pull-right" mat-raised-button color="primary">Add Appoinment</button>
|
||||||
<div class="clearfix"></div>
|
<div class="clearfix"></div>
|
||||||
</h3>
|
</h3>
|
||||||
<mat-toolbar color="primary">
|
<mat-toolbar color="primary">
|
||||||
|
|||||||
@ -112,6 +112,7 @@ export class CalendarListComponent implements OnInit {
|
|||||||
private initializeYesterday() {
|
private initializeYesterday() {
|
||||||
this.yesterday = new Date();
|
this.yesterday = new Date();
|
||||||
this.yesterday.setDate(this.yesterday.getDate() - 1);
|
this.yesterday.setDate(this.yesterday.getDate() - 1);
|
||||||
|
console.log( this.yesterday )
|
||||||
}
|
}
|
||||||
private initializeEvents() {
|
private initializeEvents() {
|
||||||
this.events = [
|
this.events = [
|
||||||
@ -148,6 +149,7 @@ export class CalendarListComponent implements OnInit {
|
|||||||
start: this.yesterday,
|
start: this.yesterday,
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
console.log( this.events )
|
||||||
}
|
}
|
||||||
|
|
||||||
dayClicked({date, events}: {date: Date, events: CalendarEvent[]}): void {
|
dayClicked({date, events}: {date: Date, events: CalendarEvent[]}): void {
|
||||||
|
|||||||
@ -8,14 +8,17 @@
|
|||||||
<div class="opt-side relative ">
|
<div class="opt-side relative ">
|
||||||
<div class="sidebar-container ">
|
<div class="sidebar-container ">
|
||||||
<div class="branding text-center">
|
<div class="branding text-center">
|
||||||
<h2><i class="fa fa-superpowers" aria-hidden="true"></i> <span> Appointment</span>
|
<!-- <h2><i class="fa fa-superpowers" aria-hidden="true"></i> <span> Appointment</span>
|
||||||
|
</h2> -->
|
||||||
|
<h2><i class="fa fa-calendar" aria-hidden="true"></i> <span> Appointment</span>
|
||||||
</h2>
|
</h2>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="main-nav">
|
<div class="main-nav">
|
||||||
<div class="user-pro-wrap">
|
<div class="user-pro-wrap">
|
||||||
<div class="user-profile-thumb text-center">
|
<div class="user-profile-thumb text-center">
|
||||||
<div class="user-i">
|
<div class="user-i">
|
||||||
<img src="assets/images/userpic.jpg" class="rad-full mb-1" width="100" height="100" alt="">
|
<img src="assets/images/userpic.png" class="rad-full mb-1" width="100" height="100" alt="">
|
||||||
<div> <span>Super Admin</span></div>
|
<div> <span>Super Admin</span></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -390,9 +393,9 @@
|
|||||||
</mat-sidenav>
|
</mat-sidenav>
|
||||||
</mat-sidenav-container>
|
</mat-sidenav-container>
|
||||||
<!-- Demo Purposes Only -->
|
<!-- Demo Purposes Only -->
|
||||||
<!-- <button mat-fab color="warn" class="mat-fab-bottom-right" (click)="showSettings = true">
|
<button mat-fab color="warn" class="mat-fab-bottom-right" (click)="showSettings = true">
|
||||||
<mat-icon class="mat-24">settings</mat-icon>
|
<mat-icon class="mat-24">settings</mat-icon>
|
||||||
</button> -->
|
</button>
|
||||||
<mat-card class="settings-panel" *ngIf="showSettings">
|
<mat-card class="settings-panel" *ngIf="showSettings">
|
||||||
<mat-toolbar color="warn">
|
<mat-toolbar color="warn">
|
||||||
<span fxFlex>Options</span>
|
<span fxFlex>Options</span>
|
||||||
|
|||||||
@ -36,7 +36,9 @@ export class AdminLayoutComponent implements OnInit, OnDestroy {
|
|||||||
//
|
//
|
||||||
menuLayout : any = 'vertical-menu';
|
menuLayout : any = 'vertical-menu';
|
||||||
selectedSidebarImage : any = 'bg-1';
|
selectedSidebarImage : any = 'bg-1';
|
||||||
selectedSidebarColor : any = 'sidebar-default';
|
// selectedSidebarColor : any = 'sidebar-default';
|
||||||
|
selectedSidebarColor : any = 'sidebar-green';
|
||||||
|
|
||||||
selectedHeaderColor : any = 'header-default';
|
selectedHeaderColor : any = 'header-default';
|
||||||
collapsedClass : any = 'side-panel-opened';
|
collapsedClass : any = 'side-panel-opened';
|
||||||
|
|
||||||
|
|||||||
@ -27,7 +27,8 @@
|
|||||||
Password is required
|
Password is required
|
||||||
</mat-error>
|
</mat-error>
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
<button class="mt-2 mb-1" [disabled]="!loginForm.valid" mat-raised-button color="primary" mat-button>Sign In</button>
|
<!-- <button class="mt-2 mb-1" [disabled]="!loginForm.valid" mat-raised-button color="primary" mat-button>Sign In</button> -->
|
||||||
|
<button class="mt-2 mb-1" mat-raised-button color="primary" mat-button>Sign In</button>
|
||||||
<a class="mat-text-warn mb-0" (click)="openDialog()">Forgot password?</a>
|
<a class="mat-text-warn mb-0" (click)="openDialog()">Forgot password?</a>
|
||||||
<p class="mb-0">Don't have an account? <a [routerLink]="['/authentication/register']" class="mat-text-primary">Register Here</a></p>
|
<p class="mb-0">Don't have an account? <a [routerLink]="['/authentication/register']" class="mat-text-primary">Register Here</a></p>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -24,9 +24,10 @@ export class LoginComponent {
|
|||||||
email: new FormControl('', [Validators.required, Validators.email,Validators.pattern(
|
email: new FormControl('', [Validators.required, Validators.email,Validators.pattern(
|
||||||
'[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+.[a-zA-Z]{2,63}$',
|
'[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+.[a-zA-Z]{2,63}$',
|
||||||
),]),
|
),]),
|
||||||
password: new FormControl('', [Validators.required,Validators.pattern(
|
password: new FormControl('', null)
|
||||||
'^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[!@#$%^&*_=+-]).{8,12}$'
|
// password: new FormControl('', [Validators.required,Validators.pattern(
|
||||||
)])
|
// '^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[!@#$%^&*_=+-]).{8,12}$'
|
||||||
|
// )])
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -43,7 +43,7 @@ const MENUITEMS : Menu[] = [
|
|||||||
icon: 'security',
|
icon: 'security',
|
||||||
children: [
|
children: [
|
||||||
{state: 'business-list', name: 'Business List'},
|
{state: 'business-list', name: 'Business List'},
|
||||||
// {state: 'add-business-list', name: 'Add Business '},
|
{state: 'add-business-list', name: 'Add Business '},
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
// {
|
// {
|
||||||
@ -71,7 +71,7 @@ const MENUITEMS : Menu[] = [
|
|||||||
icon: 'security',
|
icon: 'security',
|
||||||
children: [
|
children: [
|
||||||
{state: 'user-list', name: 'Users List'},
|
{state: 'user-list', name: 'Users List'},
|
||||||
// {state: 'add-user-list', name: 'Add Users '},
|
{state: 'add-user-list', name: 'Add Users '},
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
BIN
ng-seed/src/assets/images/userpic.png
Normal file
BIN
ng-seed/src/assets/images/userpic.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 551 KiB |
|
Before Width: | Height: | Size: 42 KiB After Width: | Height: | Size: 42 KiB |
@ -6,7 +6,7 @@
|
|||||||
<meta charset="utf-8">
|
<meta charset="utf-8">
|
||||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
<title>Optima - 10 Material Admin Template</title>
|
<title>Appointments</title>
|
||||||
<style>
|
<style>
|
||||||
|
|
||||||
.pre-loader {
|
.pre-loader {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user