odn

src/app/leave-status/leave-status.component.scss

@@ -1,63 +1,84 @@
-@import '../../styles.scss';
-#leaveStatusPage{
-    background-color: #ffffff;  
+.page-container {
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    background-color: #b4e8fd;
+}
+.flex-row {
+    flex-direction: row;
+    display: flex;
+    width: 100%;
+}
+button {
+    border-radius: 10px;
+    font-size: 0.938rem;
+    width: 98%;
+    background: #0b5fa4 0 0 no-repeat padding-box !important;
+    margin: 2%;
+}
+.title {
+    text-align: center;
+    color: #0b5fa4;
+}
+#leaveStatusPage {
+    background-color: #fff;
     border-radius: 0% 2%;
     border-top-right-radius: 20px;
     border-bottom-right-radius: 20px;
-    .status-clr{
-        background-color: #354814A6;
-    }
-    .align-middle{
-        text-align: center;
-        padding: 2%;
-        .number-txt{
-            font-size: 25px;
-            padding-bottom: 10px;
-        }
-    }
-    .align-left{
-        text-align: left;
-        margin: auto;
-    }
-    .title-txt{
-        color: #0B5FA4;
-        text-align: end;
-        margin: auto;
-        padding-right: 1%;
-        .name-txt{
-            font-weight: bold;
-        }
-    }
-    .black-txt{
-        color: $clr-black !important;
-        font-size: 13px;
-    }
-    .success-status{
-        background-color: #354814A6;
-        text-align: center;
-        padding-right: 1%;
-    }
-    .leave-status{
-        color: #0B5FA4;
-        font-size: 12px;
-    }
-    .success{
-        background-color: #354814A6;
-        text-align: center;
-        padding-right: 1%;
-    }
-    .pending-status{
-        background-color: #DA6C6C;
-        text-align: center;
-        padding-right: 1%;
-    }
-    .active-status{
-        background-color: #0B5FA4;
-        text-align: center;
-        padding-right: 1%;
-    }
-    .black-txt{
-        color: #000000;
-        font-size: 13px;
-    }
+}
+#leaveStatusPage .status-clr {
+    background-color: #354814 A6;
+}
+#leaveStatusPage .align-middle {
+    text-align: center;
+    padding: 2%;
+}
+#leaveStatusPage .align-middle .number-txt {
+    font-size: 25px;
+    padding-bottom: 10px;
+}
+#leaveStatusPage .align-left {
+    text-align: left;
+    margin: auto;
+}
+#leaveStatusPage .title-txt {
+    color: #0b5fa4;
+    text-align: end;
+    margin: auto;
+    padding-right: 1%;
+}
+#leaveStatusPage .title-txt .name-txt {
+    font-weight: bold;
+}
+#leaveStatusPage .black-txt {
+    color: #181818 !important;
+    font-size: 13px;
+}
+#leaveStatusPage .success-status {
+    background-color: #354814 A6;
+    text-align: center;
+    padding-right: 1%;
+}
+#leaveStatusPage .leave-status {
+    color: #0b5fa4;
+    font-size: 12px;
+}
+#leaveStatusPage .success {
+    background-color: #354814 A6;
+    text-align: center;
+    padding-right: 1%;
+}
+#leaveStatusPage .pending-status {
+    background-color: #da6c6c;
+    text-align: center;
+    padding-right: 1%;
+}
+#leaveStatusPage .active-status {
+    background-color: #0b5fa4;
+    text-align: center;
+    padding-right: 1%;
+}
+#leaveStatusPage .black-txt {
+    color: #000;
+    font-size: 13px;
 }

src/app/odpnr/odpnr.component.html

@@ -1,12 +1,11 @@
 <div class="page-container" id="home-screen">
+    <form id="odpnrForm" class="add-leave-form" [formGroup]="odpnrForm">
     <main class="main-container">
         <section class="content">
             <div class="card">
                 <div class="flex-column">
-                    <div class="align-middle">
-                        <p class="txt-content font-body-xsmall-bold">{{languageConstants.month}}</p>
-                        <p class="txt-content font-body-xsmall-bold number-txt">2021</p>
-                        <p class="txt-content font-body-xsmall-bold">{{languageConstants.odpnr}}</p>
+                    <div class="align-middle title">
+                        <p class="txt-content font-body-xsmall-bold">{{languageConstants.month}}<br/>2021<br/>{{languageConstants.odpnr}}</p>
                     </div>
                 </div>
                 <div class="flex-row">
@@ -40,4 +39,5 @@
             </div>
         </section>
     </main>
+</form>
 </div>

src/app/odpnr/odpnr.component.scss

@@ -1,173 +1,209 @@
-@import '../../styles.scss';
+.page-container {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  background-color: #b4e8fd;
+}
+.flex-row {
+  flex-direction: row;
+  display: flex;
+  width: 100%;
+}
+button {
+  border-radius: 10px;
+  font-size: 0.938rem;
+  width: 98%;
+  background: #0b5fa4 0 0 no-repeat padding-box !important;
+  margin: 2%;
+}
+.title {
+  text-align: center;
+  color: #0b5fa4;
+}
+.font-body-xxsmall-bold {
+  font-size: 0.625;
+  line-height: 1.125rem;
+  letter-spacing: 1px;
+  font-family: "Raleway VariableFont";
+  text-transform: uppercase;
+}
+.font-body-xsmall {
+  font-size: 0.812rem;
+  line-height: 1.125rem;
+  letter-spacing: 1px;
+  font-family: "Raleway VariableFont";
+}
 .main-container {
   background: #b4e8fd;
   padding: 0%;
   margin-bottom: 20%;
   height: 100%;
-  .content {
-    background: #b4e8fd;
-    width: 100%;
-    @include flex-box(column, center, center);
-    .clear-content{
-      width: 90%;
-      align-items: left;
-
-      &.margin-top5{
-        margin-top: 5%;
-       }
-    }
-    .card {
-      width: 100%;
-      background: #b4e8fd;
-      float: left;
-      min-height: 250px;
-      .user-input{
-        border-radius: 10px;
-        border: 2px solid #707070;
-      }
-      
-      ul{
-        display: flex;  
-        height: auto;
-        flex-wrap: wrap;
-        padding-top: 10%;
-
-        li {
-             @include flex-box(row, center, right);
-            margin-bottom:10%;
-            flex: 1 1 50%;
-            .icon{
-                width: 150px;
-                height: 150px;
-            }
-        }
-      }
-      
-      .input-left-align {
-        padding: 1%;
-        margin-bottom: 1%;
-        .input-wrapper {
-          margin: 2% 3%;
-          width: 94%;
-          .clickIcon {
-            position: absolute;
-            right: 2%;
-          }
-        }
-      }
-      &.card-noborder {
-        border-radius: 0px;
-        box-shadow: 0px 2px 8px rgba(96, 97, 112, 0.16);
-      }
-      .tab-counter{
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        border-radius: 50%;
-        height: 40px;
-        color: $clr-white;
-        margin-left: 10px;
-        width: 40px;
-        font-size: 14px;
-
-        &.hot{
-            background-color: #ff4081;
-        }
-    }
-    .align-middle{
-      @include flex-box(column, top);
-      text-align: center;
-      padding-bottom: 5px;
-
-      .number-txt{
-        font-size: 1.2rem;
-        padding-top:1%;
-        padding-bottom:1%;
-      }
-        .footer-icons{
-          width: 40%;
-          height: 40%;
-          padding-bottom: 5px;
-        }
-        .icons-position{
-          position: relative;
-          top: -3.4rem;
-          left: 30%;
-        }
-        .txtFld-icons{
-          width: 10%;
-          height: 10%;
-        }
-        .txtFld-icons:first-child{
-          margin-right: 1%;
-        }
-        .txtFld-icons2{
-          width: 10%;
-          height: 10%;
-        }
-        .txt-content{
-          color: #0B5FA4;
-          font-weight: bold;
-        }
-      }
-    }
-   .leave-status{
-     background-color: #b4e8fd;
-    //   .width-90{
-    //     width: 100%;
-    //     margin: 5% auto;
-    //   }
-   }
-
-    .onRoadPriceContainer{
-      width: 98%;
-    }
-
-    .card-accordion {
-      @include flex-box(row, left, center);
-      font-size: 1rem;
-      margin: 3%;
-      .icon-align {
-        flex: 1;
-        justify-content: flex-end;
-        font-size: 1.875em;
-      }
-    }
-    .card > div {
-      padding: 5%;
-      flex: 9;
-      justify-content: space-between;
-    }
-  }
-  button {
-    margin: 5% 0%;
-    width: 90%;
-    box-sizing: border-box;
-  }
-  .bottom-section {
-    @include flex-box(column, center, center);
-    padding: 5% 5% 7% 5%;
-    .details {
-      color: #5d5d5d;
-      .contact {
-        color: #006ad0;
-      }
-    }
-    .disclaimer {
-      color: #5d5d5d;
-      text-align: center;
-    }
-    p {
-      padding: 3%;
-    }
-  }
-  .click-icon{
-    width: 90%;
-    .txtFld-icons{
-      width: 50px;
-      height: 50px;
-      margin-left: 10%;
-    }
-  }
-  
+}
+.main-container .content {
+  background: #b4e8fd;
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}
+.main-container .content .clear-content {
+  width: 90%;
+  align-items: left;
+}
+.main-container .content .clear-content.margin-top5 {
+  margin-top: 5%;
+}
+.main-container .content .card {
+  width: 100%;
+  background: #b4e8fd;
+  float: left;
+  min-height: 250px;
+}
+.main-container .content .card .user-input {
+  border-radius: 10px;
+  border: 2px solid #707070;
+}
+.main-container .content .card ul {
+  display: flex;
+  height: auto;
+  flex-wrap: wrap;
+  padding-top: 10%;
+}
+.main-container .content .card ul li {
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: right;
+  margin-bottom: 10%;
+  flex: 1 1 50%;
+}
+.main-container .content .card ul li .icon {
+  width: 150px;
+  height: 150px;
+}
+.main-container .content .card .input-left-align {
+  padding: 1%;
+  margin-bottom: 1%;
+}
+.main-container .content .card .input-left-align .input-wrapper {
+  margin: 2% 3%;
+  width: 94%;
+}
+.main-container .content .card .input-left-align .input-wrapper .clickIcon {
+  position: absolute;
+  right: 2%;
+}
+.main-container .content .card.card-noborder {
+  border-radius: 0px;
+  box-shadow: 0px 2px 8px rgba(96, 97, 112, 0.16);
+}
+.main-container .content .card .tab-counter {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border-radius: 50%;
+  height: 40px;
+  color: #fff;
+  margin-left: 10px;
+  width: 40px;
+  font-size: 14px;
+}
+.main-container .content .card .tab-counter.hot {
+  background-color: #ff4081;
+}
+.main-container .content .card .align-middle {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  text-align: center;
+  padding-bottom: 5px;
+}
+.main-container .content .card .align-middle .number-txt {
+  font-size: 1.2rem;
+  padding-top: 1%;
+  padding-bottom: 1%;
+}
+.main-container .content .card .align-middle .footer-icons {
+  width: 40%;
+  height: 40%;
+  padding-bottom: 5px;
+}
+.main-container .content .card .align-middle .icons-position {
+  position: relative;
+  top: -3.4rem;
+  left: 30%;
+}
+.main-container .content .card .align-middle .txtFld-icons {
+  width: 10%;
+  height: 10%;
+}
+.main-container .content .card .align-middle .txtFld-icons:first-child {
+  margin-right: 1%;
+}
+.main-container .content .card .align-middle .txtFld-icons2 {
+  width: 10%;
+  height: 10%;
+}
+.main-container .content .card .align-middle .txt-content {
+  color: #0b5fa4;
+  font-weight: bold;
+}
+.main-container .content .leave-status {
+  background-color: #b4e8fd;
+}
+.main-container .content .onRoadPriceContainer {
+  width: 98%;
+}
+.main-container .content .card-accordion {
+  display: flex;
+  flex-direction: row;
+  justify-content: left;
+  align-items: center;
+  font-size: 1rem;
+  margin: 3%;
+}
+.main-container .content .card-accordion .icon-align {
+  flex: 1;
+  justify-content: flex-end;
+  font-size: 1.875em;
+}
+.main-container .content .card > div {
+  padding: 5%;
+  flex: 9;
+  justify-content: space-between;
+}
+.main-container button {
+  margin: 5% 0%;
+  width: 90%;
+  box-sizing: border-box;
+}
+.main-container .bottom-section {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  padding: 5% 5% 7% 5%;
+}
+.main-container .bottom-section .details {
+  color: #5d5d5d;
+}
+.main-container .bottom-section .details .contact {
+  color: #006ad0;
+}
+.main-container .bottom-section .disclaimer {
+  color: #5d5d5d;
+  text-align: center;
+}
+.main-container .bottom-section p {
+  padding: 3%;
+}
+.main-container .click-icon {
+  width: 90%;
+}
+.main-container .click-icon .txtFld-icons {
+  width: 50px;
+  height: 50px;
+  margin-left: 10%;
 }

src/app/odpnr/odpnr.component.ts

@@ -1,4 +1,5 @@
 import { Component, OnInit } from '@angular/core';
+import { FormBuilder, FormGroup } from '@angular/forms';
 import { Router } from '@angular/router';
 import { TranslationContentService } from 'src/constants/language/TranslationContentService';
 import { RouterService } from '../shared/services/routerService';
@@ -14,7 +15,11 @@ export class OdpnrComponent implements OnInit {
   public success:string = 'success';
   public pending:string = 'pending';
   public odpnrStatus:string = 'odpnrStatus';
-  constructor(private translationContentService:TranslationContentService, private routerService: RouterService, private router: Router) { }
+  public odpnrForm!:FormGroup;
+
+  constructor(private formBuilder: FormBuilder, private translationContentService:TranslationContentService, private routerService: RouterService, private router: Router) { 
+    this.createNewForm();
+  }
 
   ngOnInit(): void {
     this.translationContentService.getContent().subscribe((content: any) => {
@@ -22,6 +27,12 @@ export class OdpnrComponent implements OnInit {
     });
   }
 
+  createNewForm(): void {
+    this.odpnrForm = this.formBuilder.group({
+      mobileNumber: ['']
+    });
+  }
+
   applyLeave(): void{
     this.router.navigate(['applyLeave']);
   }

src/app/shared/footer/footer.component.scss

@@ -5,7 +5,7 @@
     width: 100%;
     padding: 2% 3.5%;
     box-sizing: border-box;
-    background-color: $clr-white;
+    background-color: #ffffff;
     filter: drop-shadow(0px -12px 20px rgba(178, 178, 178, 0.25));
 
     ul{

src/app/shared/header/header.component.scss

@@ -16,7 +16,7 @@
         white-space: nowrap;
 
         .title{
-            color: $clr-black;
+            color: #181818;
         }
 
         .tab-counter{
@@ -25,7 +25,7 @@
             align-items: center;
             border-radius: 50%;
             height: 40px;
-            color: $clr-white;
+            color: #ffffff;
             margin-left: 10px;
             width: 40px;
             font-size: 14px;

src/styles/common.scss

@@ -56,7 +56,7 @@ label {
   align-items: center;
   box-sizing: border-box;
   padding: 3.5%;
-  background: $clr-white;
+  background: #ffffff;
   width: 100%;
 }
 
@@ -67,7 +67,7 @@ label {
   align-items: center;
   box-sizing: border-box;
   padding: 3.5%;
-  background: $clr-white;
+  background: #ffffff;
   width: 100%;
 }
 
@@ -111,7 +111,7 @@ label {
   &.active,
   &.p-highlight {
     background-color: #006ad0;
-    color: $clr-white;
+    color: #ffffff;
     border: 1px solid #006ad0;
   }
 }
@@ -140,7 +140,7 @@ label {
 
 .hot-status {
   background-color: $clr-red;
-  color: $clr-white;
+  color: #ffffff;
   padding: 2%;
   border-radius: 5px;
 }
@@ -236,7 +236,7 @@ label {
   width: 94%;
   position: absolute;
   z-index: 200;
-  background-color: $clr-white;
+  background-color: #ffffff;
   align-items: flex-start;
   justify-content: flex-start;
   margin-left: 2%;

src/styles/css-reset.scss

@@ -1,6 +1,6 @@
 html,body, app-root{
     font-family: Trade Gothic LT Com Bold;
-    background-color: $clr-white;
+    background-color: #ffffff;
     margin: 0;
     padding: 0;
     height: 100%;

src/styles/fonts.scss

@@ -144,7 +144,7 @@
 }
 
 .text-black{
-    color: $clr-black;
+    color: #181818;
     @include font-body-common;
 }
 

src/styles/form-inputs.scss

@@ -17,7 +17,7 @@ select {
   height: 50px;
   width: 100%;
   color:#444444;
-  background: $clr-white;
+  background: #ffffff;
   border: 1px solid #e0e0e0;
   border-radius: 5px;
   font-size: 0.87rem;
@@ -129,12 +129,12 @@ button {
   font-size: 1rem;
   line-height: 50px;
   letter-spacing: 1px;
-  color: $clr-white;
+  color: #ffffff;
   font-weight: bold;
   font-family: Blender Pro Bold;
 
   &.modify-state {
-    background: $clr-white;
+    background: #ffffff;
     border: 1px solid #006ad0;
     color: #006ad0;
   }