-
Notifications
You must be signed in to change notification settings - Fork 22
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Logout and user read v2=>v5 <> *revert* # lintFIX#1 * logout Fix #3 * logout Fix #4 * logout Fix #5 * logout Fix #6 * logout Fix #7
- Loading branch information
1 parent
18a161f
commit b614cd3
Showing
20 changed files
with
261 additions
and
82 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 25 additions & 0 deletions
25
src/app/routes/public/public-logout/public-logout.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| <div class="main_container flex flex-row"> | ||
| <div class="left_container flex flex-col items-center justify-center"> | ||
| <div class="logo_box flex items-center"> | ||
| <img src="/assets/instances/eagle/app_logos/KarmayogiBharat_Logo_Horizontal.svg" alt="logo"> | ||
| </div> | ||
| <div class="slider_box items-center flex"> | ||
| <img class="width-1-1" src="/assets/instances/eagle/banners/home/1/s.jpg" alt="slider1"> | ||
| </div> | ||
| </div> | ||
| <div class=" right_container flex flex-col items-center justify-center"> | ||
| <div class="right_inner_container"> | ||
| <div class="right_logo_box"> | ||
| <img src="/assets/instances/eagle/app_logos/KarmayogiBharat_Logo_Horizontal.svg" alt="logo"> | ||
| </div> | ||
| <div class="text_box flex items-center justify-center"> | ||
| <h1 class="text-3xl"> You are logged out!</h1> | ||
| </div> | ||
| <div class="button_box flex flex-col items-center justify-center"> | ||
| <button class="button m_b_2" (click)="login()">Login to portal</button> | ||
| <!-- <button class="button m_b_2">Login to MDO portal</button> --> | ||
| </div> | ||
| </div> | ||
|
|
||
| </div> | ||
| </div> |
57 changes: 57 additions & 0 deletions
57
src/app/routes/public/public-logout/public-logout.component.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| body { | ||
| font-family: 'Poppins', sans-serif; | ||
| position: relative; | ||
| letter-spacing: 0.2px; | ||
| // background: url(images/Login_background.png) no-repeat center center fixed; | ||
| background-size: cover; | ||
| } | ||
|
|
||
| .right_container { | ||
| background-color: #fff; | ||
| width: 45%; | ||
| height: 100vh; | ||
| box-sizing: border-box; | ||
| box-shadow: 0px 20px 60px #3e3e3e29; | ||
| } | ||
|
|
||
| .left_container { | ||
| padding: 4.5rem 6rem; | ||
| box-sizing: border-box; | ||
| width: 55%; | ||
| height: 100vh; | ||
| } | ||
|
|
||
| .logo_box { | ||
| width: 320px; | ||
| } | ||
|
|
||
| .slider_box { | ||
| padding: 5rem 0 2rem 0; | ||
| width: 320px; | ||
| box-sizing: border-box; | ||
| box-sizing: border-box; | ||
| } | ||
|
|
||
| .text_box { | ||
| margin: 3rem 0; | ||
| } | ||
|
|
||
| .right_inner_container { | ||
| width: 320px; | ||
| } | ||
|
|
||
| .m_b_2 { | ||
| margin-bottom: 1rem; | ||
| } | ||
|
|
||
| .button { | ||
| font-family: 'Poppins', sans-serif; | ||
| color: #F9F9F9; | ||
| font-size: 14px; | ||
| line-height: 19px; | ||
| height: 40px; | ||
| background-color: rgb(0, 116, 182, 1); | ||
| border-radius: 8px; | ||
| transition: all .25s ease-in; | ||
| width: 100%; | ||
| } |
45 changes: 45 additions & 0 deletions
45
src/app/routes/public/public-logout/public-logout.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| import { Component, OnInit, OnDestroy } from '@angular/core' | ||
| import { ConfigurationsService, NsPage } from '@sunbird-cb/utils' | ||
| import { Subscription } from 'rxjs' | ||
| import { ActivatedRoute } from '@angular/router' | ||
|
|
||
| @Component({ | ||
| selector: 'ws-public-logout', | ||
| templateUrl: './public-logout.component.html', | ||
| styleUrls: ['./public-logout.component.scss'], | ||
| }) | ||
| export class PublicLogoutComponent implements OnInit, OnDestroy { | ||
| contactUsMail = '' | ||
| contactPage: any | ||
| platform = 'Learner' | ||
| panelOpenState = false | ||
| pageNavbar: Partial<NsPage.INavBackground> = this.configSvc.pageNavBar | ||
| private subscriptionContact: Subscription | null = null | ||
|
|
||
| constructor( | ||
| private configSvc: ConfigurationsService, | ||
| private activateRoute: ActivatedRoute, | ||
| // private authSvc: AuthKeycloakService, | ||
| ) { } | ||
|
|
||
| ngOnInit() { | ||
| this.subscriptionContact = this.activateRoute.data.subscribe(data => { | ||
| this.contactPage = data.pageData.data | ||
| }) | ||
| if (this.configSvc.instanceConfig) { | ||
| this.contactUsMail = this.configSvc.instanceConfig.mailIds.contactUs | ||
| } | ||
| // this.authSvc.force_logout().then(() => { }) | ||
| } | ||
|
|
||
| ngOnDestroy() { | ||
| if (this.subscriptionContact) { | ||
| this.subscriptionContact.unsubscribe() | ||
| } | ||
| } | ||
| login() { | ||
| const host = window.location.origin | ||
| window.location.href = `${host}/protected/v8/resource` | ||
| // window.location.reload() | ||
| } | ||
| } |
28 changes: 28 additions & 0 deletions
28
src/app/routes/public/public-logout/public-logout.module.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| import { NgModule } from '@angular/core' | ||
| import { CommonModule } from '@angular/common' | ||
| import { PublicLogoutComponent } from './public-logout.component' | ||
| import { | ||
| MatToolbarModule, | ||
| MatCardModule, | ||
| MatDividerModule, | ||
| MatIconModule, | ||
| MatExpansionModule, | ||
| } from '@angular/material' | ||
| import { BtnPageBackModule } from '@sunbird-cb/collection' | ||
| import { PipeSafeSanitizerModule } from '@sunbird-cb/utils' | ||
|
|
||
| @NgModule({ | ||
| declarations: [PublicLogoutComponent], | ||
| imports: [ | ||
| CommonModule, | ||
| MatToolbarModule, | ||
| MatCardModule, | ||
| BtnPageBackModule, | ||
| MatDividerModule, | ||
| MatIconModule, | ||
| MatExpansionModule, | ||
| PipeSafeSanitizerModule, | ||
| ], | ||
| exports: [PublicLogoutComponent], | ||
| }) | ||
| export class PublicLogoutModule { } |
Oops, something went wrong.