diff --git a/src/app/modules/manage-exams-module/manage-exams-module-routing.module.ts b/src/app/modules/manage-exams-module/manage-exams-module-routing.module.ts index 476618ff51bdae97f1d44c9fc3b3c50711b10d77..75401554ec30031604c50d818d7b9c4186a88b54 100644 --- a/src/app/modules/manage-exams-module/manage-exams-module-routing.module.ts +++ b/src/app/modules/manage-exams-module/manage-exams-module-routing.module.ts @@ -3,6 +3,7 @@ import { RouterModule, Routes } from '@angular/router'; import { ExamsTableComponent } from './components/exams-table/exams-table.component'; import { HeaderComponent } from '../shared/components/header/header.component'; +import { ExamCycleComponent } from './components/exam-cycle/exam-cycle.component'; const routes: Routes = [ @@ -10,7 +11,7 @@ const routes: Routes = [ path: 'manage-exams', component: ExamsTableComponent, pathMatch: 'full', }, { - path: 'header', component: HeaderComponent, pathMatch: 'full', + path: 'exam-cycle', component: ExamCycleComponent, pathMatch: 'full', }, ]; diff --git a/src/app/modules/manage-exams-module/manage-exams-module.module.ts b/src/app/modules/manage-exams-module/manage-exams-module.module.ts index 565f29720dd4ee4636fac57b82c1e4de4eb25d3e..b1414dfcaf88f2b2f6331e163a0e8c0f3279416e 100644 --- a/src/app/modules/manage-exams-module/manage-exams-module.module.ts +++ b/src/app/modules/manage-exams-module/manage-exams-module.module.ts @@ -4,15 +4,26 @@ import { CommonModule } from '@angular/common'; import { ManageExamsModuleRoutingModule } from './manage-exams-module-routing.module'; import { ExamsTableComponent } from './components/exams-table/exams-table.component'; import { SharedModule } from '../shared/shared.module'; +import { ExamCycleComponent } from './components/exam-cycle/exam-cycle.component'; +import { MaterialModule } from 'src/material/material.module'; +import { MatTimepickerModule } from 'mat-timepicker'; + + + @NgModule({ declarations: [ - ExamsTableComponent + ExamsTableComponent, + ExamCycleComponent ], imports: [ CommonModule, ManageExamsModuleRoutingModule, - SharedModule + SharedModule, + MaterialModule, + MatTimepickerModule, + + ] }) diff --git a/src/app/modules/shared/components/header/header.component.html b/src/app/modules/shared/components/header/header.component.html index 2a25263f6fa153d3daa0ef6281b9e2f14b33084d..8ab65b49b1057cf57fc866a7dffc504d0fedfeed 100644 --- a/src/app/modules/shared/components/header/header.component.html +++ b/src/app/modules/shared/components/header/header.component.html @@ -1,10 +1,11 @@ -<nav class="navbar navbar-expand-lg navbar-light bg-light"> - <div class="header-container"> - <div> - <img src="../../assets/images/sunbird_logo.png" alt="UPSMF logo"> - </div> - <div> - <button>GJ</button> - </div> + +<div class="header-container bg-white"> + <div class="flex flex-row justify-content-between" style="justify-content: space-between;" > + <div class="flex flex-column"> + <img style="width: 17rem;" src="../../assets/images/sunbird_logo.png" alt="UPSMF logo"> </div> - </nav> \ No newline at end of file + <div class="flex flex-column"> + <button>GJ</button> + </div> + </div> +</div> diff --git a/src/app/modules/shared/components/header/header.component.scss b/src/app/modules/shared/components/header/header.component.scss index 5f7da6b87fb9bb86438e093886e43c4818f7eb57..a78a2e9975947a4956d173d3b8c087d45fc52d13 100644 --- a/src/app/modules/shared/components/header/header.component.scss +++ b/src/app/modules/shared/components/header/header.component.scss @@ -1,18 +1,14 @@ -.header-container { - display: flex; - justify-content: space-between; - align-items: center; - } -img{ +.header-container{ margin-left: 12rem; - width: 17rem; + margin-right: 12rem; } + button{ - - margin-left: 72rem; background-color: forestgreen; border-radius: 8px; border: none; color: white; + height: 26px; + margin-top: 1rem; } \ No newline at end of file diff --git a/src/app/modules/shared/shared.module.ts b/src/app/modules/shared/shared.module.ts index d8960aea0baf6f6b16a5521c6c53a1471ae0d87d..cff0f3fcd362461b6115cab11de15b2bc0e23b96 100644 --- a/src/app/modules/shared/shared.module.ts +++ b/src/app/modules/shared/shared.module.ts @@ -9,6 +9,7 @@ import {MaterialModule} from '../../../material/material.module'; import { HeaderComponent } from './components/header/header.component'; + @NgModule({ declarations: [ SharedTableComponent, @@ -17,7 +18,7 @@ import { HeaderComponent } from './components/header/header.component'; imports: [ CommonModule, //TableModule, - MaterialModule + MaterialModule, ], exports : [