Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue 144- added graphics and updated login page #156

Merged
merged 1 commit into from
Dec 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/app/adf-user-management/df-login/df-login.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<mat-divider></mat-divider>
<mat-card-content>
<form name="login-form" [formGroup]="loginForm" (ngSubmit)="login()">
<mat-form-field appearance="fill" *ngIf="ldapServices.length">
<mat-form-field appearance="outline" *ngIf="ldapServices.length">
<mat-label>
{{
'userManagement.controls.services.label' | transloco
Expand All @@ -37,7 +37,9 @@
</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field appearance="fill" *ngIf="loginAttribute === 'email'">
<mat-form-field
appearance="outline"
*ngIf="loginAttribute === 'email'">
<mat-label>
{{ 'userManagement.controls.email.label' | transloco }}</mat-label
>
Expand All @@ -59,7 +61,7 @@
</mat-form-field>

<mat-form-field
appearance="fill"
appearance="outline"
*ngIf="loginAttribute === 'username'">
<mat-label>{{
'userManagement.controls.username.altLabel' | transloco
Expand All @@ -72,7 +74,7 @@
</mat-error>
</mat-form-field>

<mat-form-field appearance="fill">
<mat-form-field appearance="outline">
<mat-label>{{
'userManagement.controls.password.label' | transloco
}}</mat-label>
Expand Down
23 changes: 23 additions & 0 deletions src/app/shared/components/df-side-nav/df-side-nav.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,29 @@
[opened]="(isSmallScreen | async) === false"
class="sidenav"
[mode]="(isSmallScreen | async) ? 'over' : 'side'">
<ng-container *ngIf="(isLoggedIn$ | async) === false">
<div class="login-side-container">
<div class="image-wrapper">
<img src="assets/img/Server-Stack.gif" alt="Self Hosted" />
<h3>Self Hosted</h3>
</div>
<div class="image-wrapper">
<img src="assets/img/API.gif" alt="API Generation" />
<h3>
Database & Network<br />
API Generation
</h3>
</div>
<div class="image-wrapper">
<img src="assets/img/Browser.gif" alt="Api Security" />
<h3>API Security</h3>
</div>
<div class="image-wrapper">
<img src="assets/img/Tools.gif" alt="API Scripting" />
<h3>API Scripting</h3>
</div>
</div>
</ng-container>
<mat-nav-list *ngIf="isLoggedIn$ | async">
<button class="search-btn" mat-button (click)="handleSearchClick()">
{{ 'Search Features' | transloco }}
Expand Down
27 changes: 27 additions & 0 deletions src/app/shared/components/df-side-nav/df-side-nav.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,33 @@ $red-palette: mat.define-palette(mat.$red-palette);
min-width: 40%;
border: none;
transition: min-width 0.3s ease-out;
max-width: 450px;

.login-side-container {
display: flex;
justify-content: center;
align-items: center; // Vertically centers the content
flex-wrap: wrap;
text-align: center;
height: 40%;
gap: 8px;
width: 100%;
margin-top: 15%;
.image-wrapper {
width: calc(45% - 8px); // 2 columns, so each takes up 50% of the width
padding: 10px; // Optional, for spacing

img {
width: 80%; // Makes the image responsive within its wrapper
height: auto;
}

h3 {
color: #fff;
}
}
}

.small & {
min-width: 0;
}
Expand Down
Binary file added src/assets/img/API.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/Browser.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/Server-Stack.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/Tools.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.