This repository has been archived by the owner on Jul 6, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 61
Modify the user profile to the current theme of EvalAI #162
Merged
Merged
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
dcf4467
Modify the user profile to the current theme of EvalAI
Sanji515 8bc3879
resolved conflicts and added styles for input type password
Sanji515 8ed1c16
Merge branch 'master' into profile-page
Sanji515 08d8c7c
Merge branch 'master' into profile-page
lunayach 0dbb682
Merge branch 'master' into profile-page
Sanji515 9c09da6
simplified the code in modal and input ts file and added missing div …
Sanji515 ce3948b
Merge branch 'profile-page' of https://github.com/Sanji515/EvalAI-ngx…
Sanji515 070ad4b
change the field from newPassword2 and simplify the conditions
Sanji515 c194d7f
resolved flake8 errors
Sanji515 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,77 +1,102 @@ | ||
<app-header-static></app-header-static> | ||
|
||
<div class="container-top profile-container"> | ||
<div class="card"> | ||
<div class="item"> | ||
<img class="profile-photo" src="assets/images/profile.png" /> | ||
</div> | ||
<div class="item"> | ||
<div class="dark"> | ||
{{user.username}} | ||
</div> | ||
<div> | ||
{{user.email}} | ||
</div> | ||
</div> | ||
<div class="item"> | ||
<div> | ||
First Name | ||
</div> | ||
<div class="dark"> | ||
{{user.first_name}} | ||
<div class="mid-container"> | ||
<div class="container-top profile-container"> | ||
<div class="align-center"> | ||
<img class="profile-photo" src="assets/images/profile.png" /> | ||
</div> | ||
</div> | ||
<div class="item"> | ||
<div> | ||
Last Name | ||
</div> | ||
<div class="dark"> | ||
{{user.last_name}} | ||
<div class="item"> | ||
<div class="content fw-regular"> | ||
{{user.username}} | ||
</div> | ||
<div class="fs-15"> | ||
{{user.email}} | ||
</div> | ||
</div> | ||
</div> | ||
<div class="item"> | ||
<div> | ||
Affiliated to | ||
<div class="user-details"> | ||
<div class="item"> | ||
<span class="text-light-black fw-semibold fs-12"> | ||
First Name<br> | ||
</span> | ||
<div class="content fw-regular"> | ||
{{user.first_name}} | ||
</div> | ||
</div> | ||
<div class="item"> | ||
<span class="text-light-black fw-semibold fs-12"> | ||
Last Name<br> | ||
</span> | ||
<div class="content fw-regular"> | ||
{{user.last_name}} | ||
</div> | ||
</div> | ||
<div class="item"> | ||
<span class="text-light-black fw-semibold fs-12"> | ||
Affiliated to<br> | ||
</span> | ||
<div class="content fw-regular"> | ||
{{user.affiliation}} | ||
</div> | ||
</div> | ||
</div> | ||
<div class="dark"> | ||
{{user.affiliation}} | ||
<div class="item"> | ||
<div class="highlight"> | ||
<span class="fw-regular fs-14">Profile Completed</span> | ||
<br> <span class="text-med-black">{{pcomp}}</span> | ||
<div> | ||
</div> | ||
<br> | ||
<br> | ||
<div class="item"> | ||
<button class="btn btn-waves-effect waves-dark grad-btn grad-btn-dark | ||
fs-16" (click)="isTokenModalVisible= true;">Get your Auth Token</button> | ||
</div> | ||
<div class="item change-password"> | ||
<a (click)="updatePassword()" class="dark-link pointer"> | ||
<strong class="fw-semibold fs-15 change-password-text">Change Password</strong> | ||
</a> | ||
<button (click)="updateUserDetails()" class="btn btn-waves-effect | ||
waves-dark grad-btn grad-btn-dark fs-16">Update Profile</button> | ||
</div> | ||
RishabhJain2018 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
<div class="modal-container" [class.hidden]="!isTokenModalVisible"> | ||
<div class="modal-card"> | ||
<div class="title"> | ||
API Authentication Token | ||
</div> | ||
<div class="form row"> | ||
<div class="col-lg-10 col-md-10 col-sm-10 col-xs-10"> | ||
<app-input [label]="'token'" [placeholder]="'Auth Token'" | ||
[type]="'password'" [theme]="'dark'" [value]="token" [readonly]="true" | ||
#formtoken></app-input> | ||
</div> | ||
<button class="col-lg-1 col-md-1 col-sm-1 col-xs-1 btn ev-btn-dark | ||
btn-waves-effect waves-dark grad-btn code-btn" | ||
(click)="copyToken()"> | ||
<i class="fa fa-clipboard" aria-hidden="true" alt="Copy to clipboard."></i> | ||
</button> | ||
</div> | ||
<ul class="inline-list"> | ||
<li> | ||
<a (click)="isTokenModalVisible= false;" class="dark-link pointer"> | ||
<strong class="fw-semibold fs-15">Cancel</strong> | ||
</a> | ||
</li> | ||
<li> | ||
<a (click)="downloadToken()" class="dark-link pointer"> | ||
<strong class="fw-semibold fs-15">Download JSON</strong> | ||
</a> | ||
</li> | ||
<li> | ||
<span class="btn btn-waves-effect waves-dark grad-btn grad-btn-dark | ||
fs-14" (click)="tokenModalButtonToggle()">{{tokenModalButton}}</span> | ||
</li> | ||
</ul> | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
<div class="item"> | ||
<div class="red">Profile Completed</div> | ||
<div class="dark">{{pcomp}}</div> | ||
</div> | ||
<div class="item"> | ||
<span class="btn btn-filter selected" (click) = "isTokenModalVisible = true;">Get your Auth Token</span> | ||
</div> | ||
<hr> | ||
<div class="item"> | ||
<span (click)="updatePassword()" class="btn btn-filter selected">Change Password</span> | ||
<span (click)="updateUserDetails()" class="btn btn-filter red">Update Profile</span> | ||
</div> | ||
</div> | ||
|
||
<div class="modal-container" [class.hidden]="!isTokenModalVisible"> | ||
<div class="modal-card"> | ||
<div class="title"> | ||
API Authentication Token | ||
</div> | ||
<div class="form row"> | ||
<div class="col-lg-10 col-md-10 col-sm-10 col-xs-10"> | ||
<app-input [label]="'token'" [placeholder]="'Auth Token'" [type]="'password'" [theme]="'dark'" [value]="token" [readonly]="true" #formtoken></app-input> | ||
</div> | ||
<div class="col-lg-1 col-md-1 col-sm-1 col-xs-1 btn btn-filter selected copy" (click)="copyToken()"> | ||
<i class="fas fa-copy"></i> | ||
</div> | ||
</div> | ||
<div class="buttons"> | ||
<span class="btn btn-filter" (click)="isTokenModalVisible = false;">Cancel</span> | ||
<span class="btn btn-filter" (click)="downloadToken()">Download JSON</span> | ||
<span class="btn btn-filter selected" (click)="tokenModalButtonToggle()">{{tokenModalButton}}</span> | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
|
||
|
||
<app-footer></app-footer> |
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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Profile page design can be improved.