-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
47 changed files
with
449 additions
and
444 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
|
|
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 @@ | ||
|
|
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,17 +1,17 @@ | ||
| <div class="container mt-5"> | ||
| <div style="text-align: center" *ngIf="!registerMode"> | ||
| <h1>Find your friend</h1> | ||
| <p class="lead">Come on in to view your friends... All you need to do is sign up!</p> | ||
| <div class="text-center"> | ||
| <button class="btn btn-primary btn-lg mr-2" (click)="startRegisterMode()">Register</button> | ||
| <button class="btn btn-default btn-lg">Learn more</button> | ||
| <div style="text-align: center" *ngIf="!registerMode"> | ||
| <h1>Find your friend</h1> | ||
| <p class="lead">Come on in to view your friends... All you need to do is sign up!</p> | ||
| <div class="text-center"> | ||
| <button class="btn btn-primary btn-lg mr-2" (click)="startRegisterMode()">Register</button> | ||
| <button class="btn btn-default btn-lg">Learn more</button> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div class="container" *ngIf="registerMode"> | ||
| <div class="row justify-content-center"> | ||
| <div class="col-4"> | ||
| <app-register (cancelRegister)="cancelRegisterMode($event)"></app-register> | ||
| </div> | ||
| <div class="container" *ngIf="registerMode"> | ||
| <div class="row justify-content-center"> | ||
| <div class="col-4"> | ||
| <app-register (cancelRegister)="cancelRegisterMode($event)"></app-register> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
|
|
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,3 +1,3 @@ | ||
| <p> | ||
| lists works! | ||
| lists works! | ||
| </p> |
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
40 changes: 20 additions & 20 deletions
40
Client/src/app/components/members/member-card/member-card.component.css
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,37 +1,37 @@ | ||
| .card:hover img { | ||
| transform: scale(1.2, 1.2); | ||
| transition-duration: 500ms; | ||
| transition-timing-function: ease-out; | ||
| opacity: 0.8; | ||
| transform: scale(1.2, 1.2); | ||
| transition-duration: 500ms; | ||
| transition-timing-function: ease-out; | ||
| opacity: 0.8; | ||
| } | ||
|
|
||
| .card img { | ||
| transform: scale(1.0, 1.0); | ||
| transition-duration: 500ms; | ||
| transition-timing-function: ease-out; | ||
| opacity: 1; | ||
| transform: scale(1.0, 1.0); | ||
| transition-duration: 500ms; | ||
| transition-timing-function: ease-out; | ||
| opacity: 1; | ||
| } | ||
|
|
||
| .card-img-wrapper { | ||
| overflow: hidden; | ||
| position: relative; | ||
| overflow: hidden; | ||
| position: relative; | ||
| } | ||
|
|
||
| .member-icons { | ||
| position: absolute; | ||
| bottom: -30%; | ||
| left: 0; | ||
| right: 0; | ||
| margin-left: auto; | ||
| margin-right: auto; | ||
| opacity: 0; | ||
| position: absolute; | ||
| bottom: -30%; | ||
| left: 0; | ||
| right: 0; | ||
| margin-left: auto; | ||
| margin-right: auto; | ||
| opacity: 0; | ||
| } | ||
|
|
||
| .card-img-wrapper:hover .member-icons { | ||
| bottom: 0; | ||
| opacity: 1; | ||
| bottom: 0; | ||
| opacity: 1; | ||
| } | ||
|
|
||
| .animate { | ||
| transition: all 0.3s ease-in-out; | ||
| transition: all 0.3s ease-in-out; | ||
| } |
44 changes: 22 additions & 22 deletions
44
Client/src/app/components/members/member-card/member-card.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 |
|---|---|---|
| @@ -1,24 +1,24 @@ | ||
| <div class="card mb-4"> | ||
| <div class="card-img-wrapper"> | ||
| <img class="card-img-top" src="{{user.photoUrl || '../../../assets/placeholder.png'}}" alt="{{user.knownAs}}" /> | ||
| <ul class="list-inline member-icons animate text-center"> | ||
| <li class="list-inline-item"> | ||
| <button class="btn btn-primary" [routerLink]="['/members/', user.id]"><i class="fa fa-user"></i> </button> | ||
| </li> | ||
| <li class="list-inline-item"> | ||
| <button class="btn btn-danger"><i class="fa fa-heart"></i> </button> | ||
| </li> | ||
| <li class="list-inline-item"> | ||
| <button class="btn btn-warning"><i class="fa fa-envelope"></i> </button> | ||
| </li> | ||
| </ul> | ||
| </div> | ||
| <div class="card-body p-1"> | ||
| <h6 class="card-title text-center mb-1"> | ||
| <i class="fa fa-user"></i> {{user.knownAs}}, {{user.age}} | ||
| </h6> | ||
| <p class="card-text text-muted text-center"> | ||
| {{user.city}} | ||
| </p> | ||
| </div> | ||
| <div class="card-img-wrapper"> | ||
| <img class="card-img-top" src="{{user.photoUrl || '../../../assets/placeholder.png'}}" alt="{{user.knownAs}}" /> | ||
| <ul class="list-inline member-icons animate text-center"> | ||
| <li class="list-inline-item"> | ||
| <button class="btn btn-primary" [routerLink]="['/members/', user.id]"><i class="fa fa-user"></i> </button> | ||
| </li> | ||
| <li class="list-inline-item"> | ||
| <button class="btn btn-danger"><i class="fa fa-heart"></i> </button> | ||
| </li> | ||
| <li class="list-inline-item"> | ||
| <button class="btn btn-warning"><i class="fa fa-envelope"></i> </button> | ||
| </li> | ||
| </ul> | ||
| </div> | ||
| <div class="card-body p-1"> | ||
| <h6 class="card-title text-center mb-1"> | ||
| <i class="fa fa-user"></i> {{user.knownAs}}, {{user.age}} | ||
| </h6> | ||
| <p class="card-text text-muted text-center"> | ||
| {{user.city}} | ||
| </p> | ||
| </div> | ||
| </div> |
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
14 changes: 7 additions & 7 deletions
14
Client/src/app/components/members/member-detail/member-detail.component.css
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,15 +1,15 @@ | ||
| .img-thumbnail { | ||
| margin: 25px; | ||
| width: 85%; | ||
| height: 85%; | ||
| margin: 25px; | ||
| width: 85%; | ||
| height: 85%; | ||
| } | ||
|
|
||
| .card-body { | ||
| padding: 0 25px; | ||
| padding: 0 25px; | ||
| } | ||
|
|
||
| .card-footer { | ||
| padding: 10px 15px; | ||
| background-color: #fff; | ||
| border-top: none; | ||
| padding: 10px 15px; | ||
| background-color: #fff; | ||
| border-top: none; | ||
| } |
100 changes: 50 additions & 50 deletions
100
Client/src/app/components/members/member-detail/member-detail.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 |
|---|---|---|
| @@ -1,55 +1,55 @@ | ||
| <div class="container mt-4"> | ||
| <div class="row"> | ||
| <div class="col-sm-4"> | ||
| <div class="card"> | ||
| <img class="card-img-top img-thumbnail" src="{{user.photoUrl || '../../../assets/placeholder.png'}}" alt="{{user.knownAs}}" /> | ||
| <div class="card-body"> | ||
| <div> | ||
| <strong>Location:</strong> | ||
| <p>{{user.city}}, {{user.country}}</p> | ||
| </div> | ||
| <div> | ||
| <strong>Age:</strong> | ||
| <p>{{user.age}}</p> | ||
| </div> | ||
| <div> | ||
| <strong>Last Active:</strong> | ||
| <p>{{user.lastActive | timeAgo}}</p> | ||
| </div> | ||
| <div> | ||
| <strong>Member Since:</strong> | ||
| <p>{{user.dateCreated | date: 'mediumDate'}}</p> | ||
| </div> | ||
| <div class="row"> | ||
| <div class="col-sm-4"> | ||
| <div class="card"> | ||
| <img class="card-img-top img-thumbnail" src="{{user.photoUrl || '../../../assets/placeholder.png'}}" alt="{{user.knownAs}}" /> | ||
| <div class="card-body"> | ||
| <div> | ||
| <strong>Location:</strong> | ||
| <p>{{user.city}}, {{user.country}}</p> | ||
| </div> | ||
| <div> | ||
| <strong>Age:</strong> | ||
| <p>{{user.age}}</p> | ||
| </div> | ||
| <div> | ||
| <strong>Last Active:</strong> | ||
| <p>{{user.lastActive | timeAgo}}</p> | ||
| </div> | ||
| <div> | ||
| <strong>Member Since:</strong> | ||
| <p>{{user.dateCreated | date: 'mediumDate'}}</p> | ||
| </div> | ||
| </div> | ||
| <div class="card-footer"> | ||
| <div class="btn-group d-flex"> | ||
| <button class="btn btn-danger w-100">Like</button> | ||
| <button class="btn btn-warning w-100">Message</button> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div class="card-footer"> | ||
| <div class="btn-group d-flex"> | ||
| <button class="btn btn-danger w-100">Like</button> | ||
| <button class="btn btn-warning w-100">Message</button> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div class="col-sm-8"> | ||
| <div class="tab-panel"> | ||
| <tabset class="member-tabset"> | ||
| <tab heading="About {{user.knownAs}}"> | ||
| <h4>Description</h4> | ||
| <p>{{user.introduction}}</p> | ||
| <h4>Interested In</h4> | ||
| <p>{{user.lookingFor}}</p> | ||
| </tab> | ||
| <tab heading="Interests"> | ||
| <h4>Interests</h4> | ||
| <p>{{user.interests}}</p> | ||
| </tab> | ||
| <tab heading="Photos"> | ||
| <ngx-gallery [options]="galleryOptions" [images]="galleryImages"></ngx-gallery> | ||
| </tab> | ||
| <tab heading="Messages"> | ||
| <div class="col-sm-8"> | ||
| <div class="tab-panel"> | ||
| <tabset class="member-tabset"> | ||
| <tab heading="About {{user.knownAs}}"> | ||
| <h4>Description</h4> | ||
| <p>{{user.introduction}}</p> | ||
| <h4>Interested In</h4> | ||
| <p>{{user.lookingFor}}</p> | ||
| </tab> | ||
| <tab heading="Interests"> | ||
| <h4>Interests</h4> | ||
| <p>{{user.interests}}</p> | ||
| </tab> | ||
| <tab heading="Photos"> | ||
| <ngx-gallery [options]="galleryOptions" [images]="galleryImages"></ngx-gallery> | ||
| </tab> | ||
| <tab heading="Messages"> | ||
|
|
||
| </tab> | ||
| </tabset> | ||
| </div> | ||
| </tab> | ||
| </tabset> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
|
|
Oops, something went wrong.