Skip to content

Commit aed5a1a

Browse files
author
hari
committed
some cleaning done
1 parent 1209a3f commit aed5a1a

File tree

7 files changed

+133
-94
lines changed

7 files changed

+133
-94
lines changed

‎src/app/auth/auth.component.html

Lines changed: 56 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,46 @@
1-
<mat-sidenav-container class="container" fullscreen >
2-
<mat-sidenav [mode]="sideNavMode" class="sidenav" #sidenav [opened]="sideNavOpened" style="overflow: hidden;">
1+
<mat-sidenav-container class="container" fullscreen>
2+
<mat-sidenav [mode]="sideNavMode" class="sidenav" #sidenav [opened]="sideNavOpened" style="overflow: hidden;">
3+
34
<mat-toolbar color="primary" class="mat-elevation-z4">
4-
<img src="./assets/logo.codetok.png" width="36px">
5-
<h1 style="font-size: 26px;font-family: Roboto;color:white;margin-top: 8px" >
6-
CODETOK.<span style="font-size: 12px;">com</span>
5+
<img src="./assets/logo.codetok.png" width="36px">
6+
7+
<h1 class="logo">
8+
CODETOK.
9+
<span style="font-size: 12px;">com</span>
710
</h1>
811
</mat-toolbar>
12+
913
<cdk-sidemenu></cdk-sidemenu>
1014
</mat-sidenav>
11-
<mat-sidenav-content style="z-index: unset;overflow: hidden;">
12-
<mat-drawer-container fullscreen >
15+
<mat-sidenav-content>
16+
<cdk-toolbar [sidenav]="sidenav" [drawer]="drawer" [sidebar]="sidenav2" [matDrawerShow]="matDrawerShow" style="z-index: 500"></cdk-toolbar>
17+
<perfect-scrollbar>
18+
<router-outlet></router-outlet>
19+
</perfect-scrollbar>
20+
</mat-sidenav-content>
21+
<mat-sidenav #sidenav2 position="end" mode="over">
22+
<cdk-sidebar></cdk-sidebar>
23+
</mat-sidenav>
24+
</mat-sidenav-container>
25+
26+
27+
<!-- Below is another example of the home page that has a smaller menu that shows up when the main menu is hidden -->
28+
29+
<!-- <mat-sidenav-container class="container" fullscreen>
30+
<mat-sidenav [mode]="sideNavMode" class="sidenav" #sidenav [opened]="sideNavOpened" style="overflow: hidden;">
31+
<mat-toolbar color="primary" class="mat-elevation-z4">
32+
<img src="./assets/logo.codetok.png" width="36px">
33+
<h1 class="logo">
34+
CODETOK.
35+
<span style="font-size: 12px;">com</span>
36+
</h1>
37+
</mat-toolbar>
38+
<cdk-sidemenu></cdk-sidemenu>
39+
</mat-sidenav>
40+
<mat-sidenav-content style="z-index: unset;overflow: hidden;">
41+
<mat-drawer-container fullscreen>
1342
<mat-drawer mode="side" #drawer class="drawer" [opened]="matDrawerOpened" style="overflow: hidden;">
14-
<mat-toolbar color="primary" class="mat-elevation-z4">
43+
<mat-toolbar color="primary" class="mat-elevation-z4">
1544
<img src="./assets/logo.codetok.png" width="36px">
1645
</mat-toolbar>
1746
<cdk-sidemenu [iconOnly]="true"></cdk-sidemenu>
@@ -21,29 +50,31 @@ <h1 style="font-size: 26px;font-family: Roboto;color:white;margin-top: 8px" >
2150
<cdk-toolbar [sidenav]="sidenav" [drawer]="drawer" [sidebar]="sidenav2" [matDrawerShow]="matDrawerShow" style="z-index: 500"></cdk-toolbar>
2251
2352
24-
<perfect-scrollbar style="height: calc(100% - 33px);">
25-
<div style="height: 100%;">
26-
<router-outlet #route="outlet"></router-outlet>
27-
</div>
28-
53+
<perfect-scrollbar>
54+
<router-outlet></router-outlet>
2955
</perfect-scrollbar>
56+
57+
3058
</mat-drawer-content>
3159
</mat-drawer-container>
3260
</mat-sidenav-content>
3361
3462
<mat-sidenav #sidenav2 position="end" mode="over">
35-
<!-- <mat-tab-group>
36-
<mat-tab label="Overview">
37-
</mat-tab>
38-
<mat-tab label="Notifications">
39-
</mat-tab>
40-
</mat-tab-group> -->
41-
<cdk-sidebar></cdk-sidebar>
63+
<cdk-sidebar></cdk-sidebar>
4264
</mat-sidenav>
43-
44-
</mat-sidenav-container>
45-
65+
66+
</mat-sidenav-container> -->
67+
4668

47-
48-
69+
70+
71+
72+
73+
74+
75+
76+
77+
78+
79+
4980

‎src/app/auth/auth.component.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,9 @@
1919
.spacer {
2020
width: 100%;
2121
}
22+
23+
.logo{
24+
font-size: 26px;font-family: Roboto;color:white;margin-top: 8px;
25+
}
2226
}
2327

‎src/app/auth/auth.module.ts

Lines changed: 21 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { NgModule } from '@angular/core';
22
import { CommonModule } from '@angular/common';
33
import { AuthComponent } from './auth.component';
4-
import { RouterModule, Routes } from '@angular/router';
4+
import { RouterModule } from '@angular/router';
55

66
import { MatToolbarModule } from '@angular/material/toolbar';
77
import { MatButtonModule } from '@angular/material/button';
@@ -13,52 +13,33 @@ import { PerfectScrollbarModule } from 'ngx-perfect-scrollbar';
1313
import { PERFECT_SCROLLBAR_CONFIG } from 'ngx-perfect-scrollbar';
1414
import { PerfectScrollbarConfigInterface } from 'ngx-perfect-scrollbar';
1515

16-
// import { Ng2PageTransitionModule } from "ng2-page-transition";
16+
import { appRoutes } from './lazyloader.routes';
1717

1818
const DEFAULT_PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = {
19-
suppressScrollX: true
19+
suppressScrollX: true
2020
};
2121

2222
import { CoreModule } from '../core/core.module';
2323

24-
export const appRoutes: Routes = [{
25-
path:'',component: AuthComponent, children: [
26-
{path: 'dashboard', loadChildren: '../dashboard-crm/dashboard-crm.module#DashboardCrmModule'},
27-
{path: 'dashboard-account', loadChildren: '../dashboard-accounts/dashboard-accounts.module#DashboardAccountsModule'},
28-
{path: 'material-widgets', loadChildren: '../material-widgets/material-widgets.module#MaterialWidgetsModule'},
29-
{path: 'tables', loadChildren: '../tables/tables.module#TablesModule'},
30-
{path: 'maps', loadChildren: '../maps/maps.module#MapsModule'},
31-
{path: 'charts', loadChildren: '../charts/charts.module#ChartsModule'},
32-
{path: 'chats', loadChildren: '../chats/chat.module#ChatsModule'},
33-
{path: 'mail', loadChildren: '../mail/mail.module#MailModule'},
34-
{path: 'pages', loadChildren: '../pages/pages.module#PagesModule'},
35-
{path: 'forms',loadChildren:'../forms/forms.module#FormModule'},
36-
{path: 'guarded-routes',loadChildren:'../guarded-routes/guarded-routes.module#GuardedRoutesModule'},
37-
{path: 'editor', loadChildren: '../editor/editor.module#EditorModule'},
38-
{path: 'scrumboard', loadChildren: '../scrumboard/scrumboard.module#ScrumboardModule'},
39-
40-
]}
41-
]
4224

4325
@NgModule({
44-
imports: [
45-
CommonModule,
46-
RouterModule.forChild(appRoutes),
47-
MatToolbarModule,
48-
MatButtonModule,
49-
MatIconModule,
50-
MatTabsModule,
51-
CoreModule,
52-
MatSidenavModule,
53-
PerfectScrollbarModule,
54-
// Ng2PageTransitionModule
55-
],
56-
declarations: [AuthComponent],
57-
providers: [
58-
{
59-
provide: PERFECT_SCROLLBAR_CONFIG,
60-
useValue: DEFAULT_PERFECT_SCROLLBAR_CONFIG
61-
}
62-
]
26+
imports: [
27+
CommonModule,
28+
RouterModule.forChild(appRoutes),
29+
MatToolbarModule,
30+
MatButtonModule,
31+
MatIconModule,
32+
MatTabsModule,
33+
CoreModule,
34+
MatSidenavModule,
35+
PerfectScrollbarModule,
36+
],
37+
declarations: [AuthComponent],
38+
providers: [
39+
{
40+
provide: PERFECT_SCROLLBAR_CONFIG,
41+
useValue: DEFAULT_PERFECT_SCROLLBAR_CONFIG
42+
}
43+
]
6344
})
6445
export class AuthModule { }

‎src/app/auth/lazyloader.routes.ts

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
import { RouterModule, Routes } from '@angular/router';
2+
import { AuthComponent } from './auth.component';
3+
4+
export const appRoutes: Routes = [{
5+
path: '', component: AuthComponent, children: [
6+
{ path: 'dashboard', loadChildren: '../dashboard-crm/dashboard-crm.module#DashboardCrmModule' },
7+
{ path: 'dashboard-account', loadChildren: '../dashboard-accounts/dashboard-accounts.module#DashboardAccountsModule' },
8+
{ path: 'material-widgets', loadChildren: '../material-widgets/material-widgets.module#MaterialWidgetsModule' },
9+
{ path: 'tables', loadChildren: '../tables/tables.module#TablesModule' },
10+
{ path: 'maps', loadChildren: '../maps/maps.module#MapsModule' },
11+
{ path: 'charts', loadChildren: '../charts/charts.module#ChartsModule' },
12+
{ path: 'chats', loadChildren: '../chats/chat.module#ChatsModule' },
13+
{ path: 'mail', loadChildren: '../mail/mail.module#MailModule' },
14+
{ path: 'pages', loadChildren: '../pages/pages.module#PagesModule' },
15+
{ path: 'forms', loadChildren: '../forms/forms.module#FormModule' },
16+
{ path: 'guarded-routes', loadChildren: '../guarded-routes/guarded-routes.module#GuardedRoutesModule' },
17+
{ path: 'editor', loadChildren: '../editor/editor.module#EditorModule' },
18+
{ path: 'scrumboard', loadChildren: '../scrumboard/scrumboard.module#ScrumboardModule' },
19+
]
20+
}];

‎src/app/core/sidebar/sidebar.component.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,7 @@
2828
color: white;
2929
z-index: 2;
3030
}
31+
32+
.mat-nav-list{
33+
padding-top: 0px !important;
34+
}

‎src/app/dashboard-crm/dashboard-crm.component.html

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,37 @@
1-
21
<div fxLayout="row" fxLayoutWrap>
3-
<div *ngFor="let dash of dashCard" fxFlex.lt-sm="100" fxFlex.sm="50" fxFlex.md="25" >
4-
<cdk-dashcard [dashData]="dash" ></cdk-dashcard>
2+
<div *ngFor="let dash of dashCard" fxFlex.lt-sm="100" fxFlex.sm="50" fxFlex.md="25">
3+
<cdk-dashcard [dashData]="dash"></cdk-dashcard>
54
</div>
65
</div>
76
<div fxLayout="row" fxLayoutWrap>
8-
<cdk-bar-graph fxFlex="37.5" fxFlex.lt-sm="100" fxFlex.sm="50" ></cdk-bar-graph>
9-
<cdk-doughnut-graph fxFlex="37.5" fxFlex.lt-sm="100" fxFlex.sm="50" ></cdk-doughnut-graph>
10-
<cdk-weather fxFlex="25" fxFlex.lt-sm="100" fxFlex.sm="100" ></cdk-weather>
7+
<cdk-bar-graph fxFlex="37.5" fxFlex.lt-sm="100" fxFlex.sm="50"></cdk-bar-graph>
8+
<cdk-doughnut-graph fxFlex="37.5" fxFlex.lt-sm="100" fxFlex.sm="50"></cdk-doughnut-graph>
9+
<cdk-weather fxFlex="25" fxFlex.lt-sm="100" fxFlex.sm="100"></cdk-weather>
1110
</div>
1211
<div fxLayout="row" fxLayoutWrap>
13-
<cdk-line-graph fxFlex="75" fxFlex.lt-sm="100" fxFlex.sm="50" ></cdk-line-graph>
14-
<cdk-share-price fxFlex="25" fxFlex.lt-sm="100" fxFlex.sm="50" ></cdk-share-price>
12+
<cdk-line-graph fxFlex="75" fxFlex.lt-sm="100" fxFlex.sm="50"></cdk-line-graph>
13+
<cdk-share-price fxFlex="25" fxFlex.lt-sm="100" fxFlex.sm="50"></cdk-share-price>
1514
</div>
1615
<div fxLayout="row" fxLayoutWrap>
17-
<cdk-sales-list fxFlex="60" fxFlex.lt-sm="100" fxFlex.sm="100" fxFlex.md="70" ></cdk-sales-list>
18-
<cdk-profile-card fxFlex="40" fxFlex.lt-sm="100" fxFlex.sm="100" fxFlex.md="30" ></cdk-profile-card>
16+
<cdk-sales-list fxFlex="60" fxFlex.lt-sm="100" fxFlex.sm="100" fxFlex.md="70"></cdk-sales-list>
17+
<cdk-profile-card fxFlex="40" fxFlex.lt-sm="100" fxFlex.sm="100" fxFlex.md="30"></cdk-profile-card>
1918
</div>
2019

2120
<div fxLayout="row" fxLayoutWrap>
22-
<div fxFlex.lt-sm="100" fxFlex.sm="50" fxFlex.md="25" >
23-
<cdk-round-progressbar [title]="'SALES'" [current]="'23'" [max]="'100'" [background]="'#FFF968'" [color]="'#B1A7FF'" [boxcolor]="'#7986CB'" ></cdk-round-progressbar>
21+
<div fxFlex.lt-sm="100" fxFlex.sm="50" fxFlex.md="25">
22+
<cdk-round-progressbar [title]="'SALES'" [current]="'23'" [max]="'100'" [background]="'#FFF968'" [color]="'#B1A7FF'" [boxcolor]="'#7986CB'"></cdk-round-progressbar>
23+
</div>
24+
<div fxFlex.lt-sm="100" fxFlex.sm="50" fxFlex.md="25">
25+
<cdk-round-progressbar [title]="'LEADS'" [current]="'33'" [max]="'100'" [background]="'#FFE268'" [color]="'#A7C1FF'" [boxcolor]="'#42A5F5'"></cdk-round-progressbar>
2426
</div>
25-
<div fxFlex.lt-sm="100" fxFlex.sm="50" fxFlex.md="25" >
26-
<cdk-round-progressbar [title]="'LEADS'" [current]="'33'" [max]="'100'" [background]="'#FFE268'" [color]="'#A7C1FF'" [boxcolor]="'#42A5F5'" ></cdk-round-progressbar>
27+
<div fxFlex.lt-sm="100" fxFlex.sm="50" fxFlex.md="25">
28+
<cdk-round-progressbar [title]="'ASSETS'" [current]="'78'" [max]="'100'" [background]="'#FFC368'" [color]="'#A7F0FF'" [boxcolor]="'#26A69A'"></cdk-round-progressbar>
2729
</div>
28-
<div fxFlex.lt-sm="100" fxFlex.sm="50" fxFlex.md="25" >
29-
<cdk-round-progressbar [title]="'ASSETS'" [current]="'78'" [max]="'100'" [background]="'#FFC368'" [color]="'#A7F0FF'" [boxcolor]="'#26A69A'" ></cdk-round-progressbar>
30+
<div fxFlex.lt-sm="100" fxFlex.sm="50" fxFlex.md="25">
31+
<cdk-round-progressbar [title]="'BANKING'" [current]="'90'" [max]="'100'" [background]="'#FFCF68'" [color]="'#A7DEFF'" [boxcolor]="'#26C6DA'"></cdk-round-progressbar>
3032
</div>
31-
<div fxFlex.lt-sm="100" fxFlex.sm="50" fxFlex.md="25" >
32-
<cdk-round-progressbar [title]="'BANKING'" [current]="'90'" [max]="'100'" [background]="'#FFCF68'" [color]="'#A7DEFF'" [boxcolor]="'#26C6DA'" ></cdk-round-progressbar>
33-
</div>
3433
</div>
3534

3635
<div fxLayout="column" fxLayoutWrap style=" padding: 8px;">
3736
<cdk-world-map [tableData]="tableData"></cdk-world-map>
38-
</div>
39-
37+
</div>

‎src/app/dashboard-crm/dashboard-crm.component.ts

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
import { Component, OnInit } from '@angular/core';
22

33
@Component({
4-
selector: 'app-dashboard-crm',
5-
templateUrl: './dashboard-crm.component.html',
6-
styleUrls: ['./dashboard-crm.component.scss']
4+
selector: 'app-dashboard-crm',
5+
templateUrl: './dashboard-crm.component.html',
6+
styleUrls: ['./dashboard-crm.component.scss']
77
})
8+
89
export class DashboardCrmComponent implements OnInit {
910

1011
public dashCard = [
11-
{colorDark: '#5C6BC0',colorLight: '#7986CB', number: 1221, title: 'SALES',icon:'local_grocery_store'},
12-
{colorDark: '#42A5F5',colorLight: '#64B5F6', number: 1221, title: 'LEADS',icon:'new_releases'},
13-
{colorDark: '#26A69A',colorLight: '#4DB6AC', number: 1221, title: 'ASSETS',icon:'assignments'},
14-
{colorDark: '#66BB6A',colorLight: '#81C784', number: 1221, title: 'BANKING',icon:'account_balance'}
15-
]
12+
{ colorDark: '#5C6BC0', colorLight: '#7986CB', number: 1221, title: 'SALES', icon: 'local_grocery_store' },
13+
{ colorDark: '#42A5F5', colorLight: '#64B5F6', number: 1221, title: 'LEADS', icon: 'new_releases' },
14+
{ colorDark: '#26A69A', colorLight: '#4DB6AC', number: 1221, title: 'ASSETS', icon: 'assignments' },
15+
{ colorDark: '#66BB6A', colorLight: '#81C784', number: 1221, title: 'BANKING', icon: 'account_balance' }
16+
];
1617

1718
tableData = [
1819
{ country: 'India', sales: 5400, percentage: '40%' },

0 commit comments

Comments
 (0)