Browse Source

hot fixes

IbrahimNour 1 year ago
parent
commit
f695526f09
31 changed files with 118 additions and 57 deletions
  1. 14 8
      src/app/authentication/auth-sign-in/auth-sign-in-theme.scss
  2. 5 3
      src/app/authentication/auth-sign-in/auth-sign-in.component.html
  3. 1 1
      src/app/authentication/auth-sign-in/verify-otp/verify-otp.component.scss
  4. 10 0
      src/app/authentication/auth-sign-up/auth-sign-up-routing.module.ts
  5. 1 0
      src/app/authentication/auth-sign-up/auth-sign-up.component.html
  6. 0 0
      src/app/authentication/auth-sign-up/auth-sign-up.component.scss
  7. 21 0
      src/app/authentication/auth-sign-up/auth-sign-up.component.spec.ts
  8. 10 0
      src/app/authentication/auth-sign-up/auth-sign-up.component.ts
  9. 17 0
      src/app/authentication/auth-sign-up/auth-sign-up.module.ts
  10. 8 8
      src/app/landing-page/benefits/benefits.component.html
  11. 14 20
      src/app/landing-page/landing-page-theme.scss
  12. BIN
      src/assets/fonts/Montserrat-Black.ttf
  13. BIN
      src/assets/fonts/Montserrat-BlackItalic.ttf
  14. BIN
      src/assets/fonts/Montserrat-Bold.ttf
  15. BIN
      src/assets/fonts/Montserrat-BoldItalic.ttf
  16. BIN
      src/assets/fonts/Montserrat-ExtraBold.ttf
  17. BIN
      src/assets/fonts/Montserrat-ExtraBoldItalic.ttf
  18. BIN
      src/assets/fonts/Montserrat-ExtraLight.ttf
  19. BIN
      src/assets/fonts/Montserrat-ExtraLightItalic.ttf
  20. BIN
      src/assets/fonts/Montserrat-Italic.ttf
  21. BIN
      src/assets/fonts/Montserrat-Light.ttf
  22. BIN
      src/assets/fonts/Montserrat-LightItalic.ttf
  23. BIN
      src/assets/fonts/Montserrat-Medium.ttf
  24. BIN
      src/assets/fonts/Montserrat-MediumItalic.ttf
  25. BIN
      src/assets/fonts/Montserrat-Regular.ttf
  26. BIN
      src/assets/fonts/Montserrat-SemiBold.ttf
  27. BIN
      src/assets/fonts/Montserrat-SemiBoldItalic.ttf
  28. BIN
      src/assets/fonts/Montserrat-Thin.ttf
  29. BIN
      src/assets/fonts/Montserrat-ThinItalic.ttf
  30. 0 15
      src/index.html
  31. 17 2
      src/styles.scss

+ 14 - 8
src/app/authentication/auth-sign-in/auth-sign-in-theme.scss

@@ -9,19 +9,28 @@
         center;
         center;
       background-size: cover;
       background-size: cover;
       position: relative;
       position: relative;
-      overflow: hidden;
       &__logo {
       &__logo {
-        padding: 0 3rem;
+        padding: 2rem 4rem;
       }
       }
     }
     }
 
 
+    .overlay {
+      position: absolute;
+      width: 100%;
+      height: 100%;
+      top: 0;
+      bottom: 0;
+      right: 0;
+      left: 0;
+      background-color: rgba($color: $main-color, $alpha: 0.3);
+    }
+
     .form {
     .form {
       width: 30%;
       width: 30%;
       background: $white-color 0% 0% no-repeat padding-box;
       background: $white-color 0% 0% no-repeat padding-box;
       border-radius: 12px;
       border-radius: 12px;
       padding: 40px;
       padding: 40px;
       margin: 0 auto;
       margin: 0 auto;
-      margin-top: 10%;
       @media (max-width: 767px) {
       @media (max-width: 767px) {
         width: 95%;
         width: 95%;
       }
       }
@@ -31,18 +40,17 @@
         h1 {
         h1 {
           color: $main-color;
           color: $main-color;
           font-size: 25px;
           font-size: 25px;
+          font-family: Montserrat-Bold;
         }
         }
         span {
         span {
           font-size: 17px;
           font-size: 17px;
           color: $main-color;
           color: $main-color;
           font-weight: 200;
           font-weight: 200;
-          font-family: "Roboto";
         }
         }
       }
       }
 
 
       p {
       p {
         font-size: 15px;
         font-size: 15px;
-        font-family: "Roboto";
         color: #009fe3;
         color: #009fe3;
         cursor: pointer;
         cursor: pointer;
         margin-top: 10px;
         margin-top: 10px;
@@ -58,7 +66,6 @@
       .label {
       .label {
         font-size: 10px;
         font-size: 10px;
         font-weight: 200;
         font-weight: 200;
-        font-family: "Roboto";
         font-size: 17px;
         font-size: 17px;
         color: $main-color;
         color: $main-color;
         margin-bottom: 0.4rem;
         margin-bottom: 0.4rem;
@@ -92,14 +99,13 @@
 
 
       h5 {
       h5 {
         text-align: center;
         text-align: center;
-        font-family: "Roboto";
         font-size: 14px;
         font-size: 14px;
         color: $white-blue;
         color: $white-blue;
         font-weight: 400;
         font-weight: 400;
         span {
         span {
           color: $main-color;
           color: $main-color;
           transition: all 0.5s;
           transition: all 0.5s;
-          font-weight: bold;
+          font-family: "Montserrat-Bold";
           cursor: pointer;
           cursor: pointer;
           &:hover {
           &:hover {
             color: $white-blue;
             color: $white-blue;

+ 5 - 3
src/app/authentication/auth-sign-in/auth-sign-in.component.html

@@ -1,6 +1,8 @@
 <section class="signIn">
 <section class="signIn">
-  <div class="signIn__logo">
-    <img src="../../../assets/images/logo.svg" alt="" title="" />
+  <div class="overlay">
+    <div class="signIn__logo">
+      <img src="../../../assets/images/logo.svg" alt="" title="" />
+    </div>
+    <router-outlet></router-outlet>
   </div>
   </div>
-  <router-outlet></router-outlet>
 </section>
 </section>

+ 1 - 1
src/app/authentication/auth-sign-in/verify-otp/verify-otp.component.scss

@@ -4,6 +4,6 @@
   text-align: center;
   text-align: center;
   span {
   span {
     color: #2e368f;
     color: #2e368f;
-    font-weight: bold;
+    font-weight: "Montserrat-Bold";
   }
   }
 }
 }

+ 10 - 0
src/app/authentication/auth-sign-up/auth-sign-up-routing.module.ts

@@ -0,0 +1,10 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+
+const routes: Routes = [];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class AuthSignUpRoutingModule { }

+ 1 - 0
src/app/authentication/auth-sign-up/auth-sign-up.component.html

@@ -0,0 +1 @@
+<p>auth-sign-up works!</p>

+ 0 - 0
src/app/authentication/auth-sign-up/auth-sign-up.component.scss


+ 21 - 0
src/app/authentication/auth-sign-up/auth-sign-up.component.spec.ts

@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AuthSignUpComponent } from './auth-sign-up.component';
+
+describe('AuthSignUpComponent', () => {
+  let component: AuthSignUpComponent;
+  let fixture: ComponentFixture<AuthSignUpComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      declarations: [AuthSignUpComponent]
+    });
+    fixture = TestBed.createComponent(AuthSignUpComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

+ 10 - 0
src/app/authentication/auth-sign-up/auth-sign-up.component.ts

@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-auth-sign-up',
+  templateUrl: './auth-sign-up.component.html',
+  styleUrls: ['./auth-sign-up.component.scss']
+})
+export class AuthSignUpComponent {
+
+}

+ 17 - 0
src/app/authentication/auth-sign-up/auth-sign-up.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { AuthSignUpRoutingModule } from './auth-sign-up-routing.module';
+import { AuthSignUpComponent } from './auth-sign-up.component';
+
+
+@NgModule({
+  declarations: [
+    AuthSignUpComponent
+  ],
+  imports: [
+    CommonModule,
+    AuthSignUpRoutingModule
+  ]
+})
+export class AuthSignUpModule { }

+ 8 - 8
src/app/landing-page/benefits/benefits.component.html

@@ -4,17 +4,17 @@
     <div
     <div
       class="gap-30"
       class="gap-30"
       fxLayout="column"
       fxLayout="column"
-      fxLayoutAlign="center center"
+      fxLayoutAlign="start center"
       fxFlex.gt-md="33"
       fxFlex.gt-md="33"
       fxFlex.lt-md="100"
       fxFlex.lt-md="100"
     >
     >
-      <p class="gap-10" fxLayout="row" fxLayoutAlign="start center">
+      <p class="gap-10 w-100" fxLayout="row" fxLayoutAlign="center center">
         <img src="../../../assets/images/correct.png" alt="" title="" />
         <img src="../../../assets/images/correct.png" alt="" title="" />
         <span>E-recruitment</span>
         <span>E-recruitment</span>
       </p>
       </p>
-      <p class="gap-10" fxLayout="row" fxLayoutAlign="start center">
+      <p class="gap-10 w-100" fxLayout="row" fxLayoutAlign="center center">
         <img src="../../../assets/images/correct.png" alt="" title="" />
         <img src="../../../assets/images/correct.png" alt="" title="" />
-        <span>E-recruitment</span>
+        <span>Managing remote workers</span>
       </p>
       </p>
     </div>
     </div>
     <img
     <img
@@ -30,13 +30,13 @@
       fxFlex.gt-md="33"
       fxFlex.gt-md="33"
       fxFlex.lt-md="100"
       fxFlex.lt-md="100"
     >
     >
-      <p class="gap-10" fxLayout="row" fxLayoutAlign="start center">
+      <p class="gap-10 w-100" fxLayout="row" fxLayoutAlign="center center">
         <img src="../../../assets/images/correct.png" alt="" title="" />
         <img src="../../../assets/images/correct.png" alt="" title="" />
-        <span>E-recruitment</span>
+        <span>Financial transactions</span>
       </p>
       </p>
-      <p class="gap-10" fxLayout="row" fxLayoutAlign="start center">
+      <p class="gap-10 w-100" fxLayout="row" fxLayoutAlign="center center">
         <img src="../../../assets/images/correct.png" alt="" title="" />
         <img src="../../../assets/images/correct.png" alt="" title="" />
-        <span>E-recruitment</span>
+        <span>training and development</span>
       </p>
       </p>
     </div>
     </div>
   </div>
   </div>

+ 14 - 20
src/app/landing-page/landing-page-theme.scss

@@ -14,15 +14,12 @@
         h1 {
         h1 {
           color: $main-color;
           color: $main-color;
           font-size: 50px;
           font-size: 50px;
-          font-weight: bold;
-          font-family: "Roboto";
+          font-family: Montserrat-Bold;
         }
         }
         p {
         p {
           color: $main-color;
           color: $main-color;
-          font-size: 20px;
-          font-weight: 400;
+          font-size: 18px;
           margin-top: 20px;
           margin-top: 20px;
-          font-family: "Roboto";
         }
         }
       }
       }
       &__btn {
       &__btn {
@@ -34,7 +31,7 @@
         border: 1px solid $main-color;
         border: 1px solid $main-color;
         cursor: pointer;
         cursor: pointer;
         transition: all 0.5s;
         transition: all 0.5s;
-        font-size: 15px;
+        font-size: 14px;
         &:hover {
         &:hover {
           background-color: $main-blue;
           background-color: $main-blue;
           border: 1px solid $main-blue;
           border: 1px solid $main-blue;
@@ -49,14 +46,13 @@
         span {
         span {
           font-size: 40px;
           font-size: 40px;
           color: $main-color;
           color: $main-color;
-          font-weight: 500;
+          font-family: Montserrat-Bold;
         }
         }
         p {
         p {
           color: $main-color;
           color: $main-color;
           font-size: 20px;
           font-size: 20px;
           font-weight: 200;
           font-weight: 200;
           margin-top: 20px;
           margin-top: 20px;
-          font-family: "Roboto";
         }
         }
       }
       }
     }
     }
@@ -72,13 +68,12 @@
           font-size: 17px;
           font-size: 17px;
           margin: 10px 0;
           margin: 10px 0;
           color: $main-color;
           color: $main-color;
-          font-weight: bold;
+          font-family: Montserrat-Bold;
         }
         }
         p {
         p {
           font-size: 13px;
           font-size: 13px;
           color: $main-color;
           color: $main-color;
           text-align: center;
           text-align: center;
-          font-family: "Roboto";
         }
         }
       }
       }
     }
     }
@@ -93,7 +88,6 @@
         position: relative;
         position: relative;
         width: 230px;
         width: 230px;
         height: 200px;
         height: 200px;
-        // background-color: aqua;
         border-radius: 20px;
         border-radius: 20px;
         img {
         img {
           width: 100%;
           width: 100%;
@@ -122,7 +116,7 @@
       h1 {
       h1 {
         text-align: center;
         text-align: center;
         color: $main-color;
         color: $main-color;
-        font-weight: 500;
+        font-family: Montserrat-Bold;
         font-size: 25px;
         font-size: 25px;
         margin-bottom: 2rem;
         margin-bottom: 2rem;
       }
       }
@@ -131,7 +125,6 @@
         margin: 30px 0;
         margin: 30px 0;
         color: $main-color;
         color: $main-color;
         font-size: 18px;
         font-size: 18px;
-        font-family: "Roboto";
       }
       }
     }
     }
 
 
@@ -145,11 +138,11 @@
         color: $main-color;
         color: $main-color;
         font-size: 25px;
         font-size: 25px;
         margin-bottom: 20px;
         margin-bottom: 20px;
+        font-family: Montserrat-Bold;
       }
       }
 
 
       p {
       p {
         font-size: 18px;
         font-size: 18px;
-        font-family: "Roboto";
         font-weight: 400;
         font-weight: 400;
         color: $main-color;
         color: $main-color;
         text-align: center;
         text-align: center;
@@ -167,16 +160,16 @@
             width: 100%;
             width: 100%;
           }
           }
           p {
           p {
-            font-size: 18px;
+            font-size: 16px;
             color: $main-color;
             color: $main-color;
             margin: 10px 0;
             margin: 10px 0;
             font-weight: 500;
             font-weight: 500;
+            font-family: Montserrat-Bold;
           }
           }
 
 
           span {
           span {
             color: $main-color;
             color: $main-color;
-            font-size: 17px;
-            font-family: "Roboto";
+            font-size: 16px;
             font-weight: 300;
             font-weight: 300;
           }
           }
         }
         }
@@ -193,6 +186,7 @@
         color: $main-color;
         color: $main-color;
         font-size: 25px;
         font-size: 25px;
         margin-bottom: 40px;
         margin-bottom: 40px;
+        font-family: Montserrat-Bold;
       }
       }
       button {
       button {
         background-color: $main-color;
         background-color: $main-color;
@@ -215,10 +209,13 @@
       width: 100%;
       width: 100%;
       background-color: $off-white;
       background-color: $off-white;
       padding: 40px 40px;
       padding: 40px 40px;
+
       h1 {
       h1 {
         color: $main-color;
         color: $main-color;
         font-size: 25px;
         font-size: 25px;
         margin-bottom: 20px;
         margin-bottom: 20px;
+        font-family: Montserrat-Bold;
+
         img {
         img {
           width: 100px;
           width: 100px;
           margin: 0 5px;
           margin: 0 5px;
@@ -232,7 +229,6 @@
         li {
         li {
           span {
           span {
             color: $main-color;
             color: $main-color;
-            font-family: "Roboto";
             font-size: 17px;
             font-size: 17px;
           }
           }
         }
         }
@@ -271,7 +267,6 @@
           list-style: none;
           list-style: none;
           li {
           li {
             color: $white-color;
             color: $white-color;
-            font-family: "Roboto";
             font-weight: 300;
             font-weight: 300;
             font-size: 14px;
             font-size: 14px;
             margin-bottom: 10px;
             margin-bottom: 10px;
@@ -285,7 +280,6 @@
           color: $white-color;
           color: $white-color;
           font-size: 18px;
           font-size: 18px;
           font-weight: 300;
           font-weight: 300;
-          font-family: "Roboto";
           @media (max-width: 767px) {
           @media (max-width: 767px) {
             font-size: 15px;
             font-size: 15px;
             margin-bottom: 20px;
             margin-bottom: 20px;

BIN
src/assets/fonts/Montserrat-Black.ttf


BIN
src/assets/fonts/Montserrat-BlackItalic.ttf


BIN
src/assets/fonts/Montserrat-Bold.ttf


BIN
src/assets/fonts/Montserrat-BoldItalic.ttf


BIN
src/assets/fonts/Montserrat-ExtraBold.ttf


BIN
src/assets/fonts/Montserrat-ExtraBoldItalic.ttf


BIN
src/assets/fonts/Montserrat-ExtraLight.ttf


BIN
src/assets/fonts/Montserrat-ExtraLightItalic.ttf


BIN
src/assets/fonts/Montserrat-Italic.ttf


BIN
src/assets/fonts/Montserrat-Light.ttf


BIN
src/assets/fonts/Montserrat-LightItalic.ttf


BIN
src/assets/fonts/Montserrat-Medium.ttf


BIN
src/assets/fonts/Montserrat-MediumItalic.ttf


BIN
src/assets/fonts/Montserrat-Regular.ttf


BIN
src/assets/fonts/Montserrat-SemiBold.ttf


BIN
src/assets/fonts/Montserrat-SemiBoldItalic.ttf


BIN
src/assets/fonts/Montserrat-Thin.ttf


BIN
src/assets/fonts/Montserrat-ThinItalic.ttf


+ 0 - 15
src/index.html

@@ -6,21 +6,6 @@
     <base href="/" />
     <base href="/" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <link rel="icon" type="image/x-icon" href="favicon.ico" />
     <link rel="icon" type="image/x-icon" href="favicon.ico" />
-    <link rel="preconnect" href="https://fonts.gstatic.com" />
-    <link
-      href="https://fonts.googleapis.com/css2?family=Roboto:wght@300;400;500&display=swap"
-      rel="stylesheet"
-    />
-    <link
-      href="https://fonts.googleapis.com/icon?family=Material+Icons"
-      rel="stylesheet"
-    />
-    <link rel="preconnect" href="https://fonts.googleapis.com" />
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
-    <link
-      href="https://fonts.googleapis.com/css2?family=Maven+Pro:wght@600&family=Montserrat:ital,wght@0,600;1,500&family=Poppins:ital,wght@0,300;0,500;1,500&display=swap"
-      rel="stylesheet"
-    />
   </head>
   </head>
   <body>
   <body>
     <app-root></app-root>
     <app-root></app-root>

+ 17 - 2
src/styles.scss

@@ -2,6 +2,20 @@
 
 
 @import "./assets/scss/variables.scss";
 @import "./assets/scss/variables.scss";
 
 
+@font-face {
+  font-family: "Montserrat-Bold";
+  src: url("./assets/fonts/Montserrat-Bold.ttf") format("truetype");
+  font-weight: 100;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: "Montserrat-Regular";
+  src: url("./assets/fonts/Montserrat-Regular.ttf") format("truetype");
+  font-weight: 100;
+  font-style: normal;
+}
+
 * {
 * {
   margin: 0;
   margin: 0;
   padding: 0;
   padding: 0;
@@ -13,9 +27,10 @@ body {
 }
 }
 body {
 body {
   margin: 0;
   margin: 0;
-  font-family: Roboto, "Helvetica Neue", sans-serif;
+  font-family: "Montserrat-Regular";
+  // font-family: Roboto, "Helvetica Neue", sans-serif;
   // font-family: "Montserrat", sans-serif;
   // font-family: "Montserrat", sans-serif;
-  font-family: "Roboto";
+  // font-family: "Roboto";
 }
 }
 
 
 .mt-2 {
 .mt-2 {