From e0cb0e172960addf217faff5d94cd774722543f2 Mon Sep 17 00:00:00 2001
From: Jesly_Joseph <jesly.joseph@tarento.com>
Date: Fri, 21 Jul 2023 11:39:13 +0530
Subject: [PATCH] Adding exam-cycle
---
.../manage-exams-module-routing.module.ts | 3 ++-
.../manage-exams-module.module.ts | 15 +++++++++++++--
.../components/header/header.component.html | 19 ++++++++++---------
.../components/header/header.component.scss | 14 +++++---------
src/app/modules/shared/shared.module.ts | 3 ++-
5 files changed, 32 insertions(+), 22 deletions(-)
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 476618f..7540155 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 565f297..b1414df 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 2a25263..8ab65b4 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 5f7da6b..a78a2e9 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 d8960ae..cff0f3f 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 :
[
--
GitLab