Commit 20249b7f authored by Sandeep Sagar Panjala's avatar Sandeep Sagar Panjala

changes

parent b86c5d4f
*.png filter=lfs diff=lfs merge=lfs -text
{
"workbench.colorCustomizations": {
"activityBar.background": "#25128A",
"titleBar.activeBackground": "#341AC1",
"titleBar.activeForeground": "#FBFAFE"
}
}
\ No newline at end of file
{
"workbench.colorCustomizations": {
"activityBar.background": "#213304",
"titleBar.activeBackground": "#2F4705",
"titleBar.activeForeground": "#F5FDE9"
}
}
\ No newline at end of file
...@@ -9,6 +9,8 @@ import { AppConfig, AppData } from "@shared/services"; ...@@ -9,6 +9,8 @@ import { AppConfig, AppData } from "@shared/services";
import { SharedModule } from "@shared/shared.module"; import { SharedModule } from "@shared/shared.module";
import { OTPWidget } from "@shared/widgets"; import { OTPWidget } from "@shared/widgets";
import { LayoutComponent } from './areas/layout/layout.component'; import { LayoutComponent } from './areas/layout/layout.component';
import { MastersPage } from './areas/admin/masters/masters.page';
import { CubiclePage } from './areas/admin/masters/pages/cubicle/cubicle.page';
const widgets = [OTPWidget]; const widgets = [OTPWidget];
const components = [AvatarImageComponent, SymptomsViewComponent]; const components = [AvatarImageComponent, SymptomsViewComponent];
...@@ -21,11 +23,13 @@ const components = [AvatarImageComponent, SymptomsViewComponent]; ...@@ -21,11 +23,13 @@ const components = [AvatarImageComponent, SymptomsViewComponent];
AppRoutingModule AppRoutingModule
], ],
declarations: [ declarations: [
LayoutComponent,
AppComponent, AppComponent,
LayoutComponent,
MastersPage,
CubiclePage,
widgets, widgets,
components, components,
routePages routePages,
], ],
providers: [ providers: [
AppData, AppData,
......
...@@ -2,11 +2,13 @@ import { ForgotPasswordPage } from "@account/forgot-password/forgot-password.pag ...@@ -2,11 +2,13 @@ import { ForgotPasswordPage } from "@account/forgot-password/forgot-password.pag
import { LoginPage } from "@account/login/login.page"; import { LoginPage } from "@account/login/login.page";
import { AccountsPage } from "@admin/accounts/accounts.page"; import { AccountsPage } from "@admin/accounts/accounts.page";
import { NgModule } from "@angular/core"; import { NgModule } from "@angular/core";
import { RouterModule, Routes } from "@angular/router"; import { Route, RouterModule, Routes } from "@angular/router";
import { NotFoundPage } from "@error/not-found/not-found.page"; import { NotFoundPage } from "@error/not-found/not-found.page";
import { ServerErrorPage } from "@error/server-error/server-error.page"; import { ServerErrorPage } from "@error/server-error/server-error.page";
import { AccessGuard, AuthGuard, DeactivateGuard, TelemedicineGuard } from "@shared/guards"; import { AccessGuard, AuthGuard, DeactivateGuard, TelemedicineGuard } from "@shared/guards";
import { LayoutComponent } from "./areas/layout/layout.component"; import { LayoutComponent } from "./areas/layout/layout.component";
import { MastersPage } from "./areas/admin/masters/masters.page";
import { CubiclePage } from "./areas/admin/masters/pages/cubicle/cubicle.page";
// STARTING PAGES // STARTING PAGES
const startingRoutes = [ const startingRoutes = [
...@@ -22,6 +24,20 @@ const errorRoutes = [ ...@@ -22,6 +24,20 @@ const errorRoutes = [
] ]
const errorRouteComponents = [NotFoundPage, ServerErrorPage]; const errorRouteComponents = [NotFoundPage, ServerErrorPage];
// MASTERS
const masterPages = {
path: "masters",
data: { title: "Masters" },
canActivate: [AuthGuard],
canActivateChild: [AuthGuard],
component: MastersPage,
children: [
{ path: "", redirectTo: "accounts", pathMatch: "full" },
{ path: "cubicle", component: CubiclePage, data: { title: "cubicle" } },
{ path: "**", redirectTo: "accounts" },
]
}
// HIDDEN PAGES // HIDDEN PAGES
const hiddenPages = [ const hiddenPages = [
{ path: "accounts", component: AccountsPage, data: { title: "Accounts", } } { path: "accounts", component: AccountsPage, data: { title: "Accounts", } }
...@@ -39,7 +55,8 @@ const routes: Routes = [ ...@@ -39,7 +55,8 @@ const routes: Routes = [
canActivateChild: [AuthGuard], canActivateChild: [AuthGuard],
children: [ children: [
{ path: "", redirectTo: "dashboard", pathMatch: "full" }, { path: "", redirectTo: "dashboard", pathMatch: "full" },
...hiddenPages ...hiddenPages,
masterPages as Route
] ]
}, },
{ path: "**", redirectTo: "not-found" }, { path: "**", redirectTo: "not-found" },
...@@ -56,6 +73,6 @@ export class AppRoutingModule { } ...@@ -56,6 +73,6 @@ export class AppRoutingModule { }
export const routePages = [ export const routePages = [
...startingRouteComponents, ...startingRouteComponents,
...errorRouteComponents, ...errorRouteComponents,
...hiddenPagesComponents ...hiddenPagesComponents,
]; ];
export const routeGuards = [AccessGuard, AuthGuard, DeactivateGuard, TelemedicineGuard]; export const routeGuards = [AccessGuard, AuthGuard, DeactivateGuard, TelemedicineGuard];
\ No newline at end of file
<router-outlet></router-outlet>
\ No newline at end of file
import { Component } from "@angular/core";
@Component({
templateUrl: "./masters.html",
})
export class MastersPage {
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment