-
-
Notifications
You must be signed in to change notification settings - Fork 34
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #44 from NicolasConstant/develop
Merge for 0.2
- Loading branch information
Showing
23 changed files
with
654 additions
and
290 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
63 changes: 34 additions & 29 deletions
63
src/app/components/floating-column/search/search.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,39 +1,44 @@ | ||
| <div class="panel"> | ||
| <h3 class="panel__title">search</h3> | ||
|
|
||
| <form class="form-section" (ngSubmit)="onSubmit()"> | ||
| <input type="text" class="form-control form-control-sm form-with-button" [(ngModel)]="searchHandle" name="searchHandle" | ||
| placeholder="Search" autocomplete="off" /> | ||
| <button class="form-button" type="submit" title="search">GO</button> | ||
| </form> | ||
| <div class="search-result-form"> | ||
| <h3 class="panel__title">search</h3> | ||
|
|
||
| <app-waiting-animation *ngIf="isLoading" class="waiting-icon"></app-waiting-animation> | ||
|
|
||
| <div *ngIf="accounts.length > 0" class="search-results"> | ||
| <h3 class="search-results__title">Accounts</h3> | ||
| <a href *ngFor="let account of accounts" class="account" title="open account" | ||
| (click)="browseAccount(account.acct)"> | ||
| <img src="{{account.avatar}}" class="account__avatar" /> | ||
| <div class="account__name">{{ account.username }}</div> | ||
| <div class="account__fullhandle">@{{ account.acct }}</div> | ||
| </a> | ||
| <form class="form-section" (ngSubmit)="onSubmit()"> | ||
| <input type="text" class="form-control form-control-sm form-with-button" [(ngModel)]="searchHandle" | ||
| name="searchHandle" placeholder="Search" autocomplete="off" /> | ||
| <button class="form-button" type="submit" title="search">GO</button> | ||
| </form> | ||
| </div> | ||
|
|
||
| <div *ngIf="hashtags.length > 0" class="search-results"> | ||
| <h3 class="search-results__title">Hashtags</h3> | ||
| <a (click)="browseHashtag(hashtag)" href *ngFor="let hashtag of hashtags" class="search-results__hashtag" title="browse hashtag"> | ||
| #{{ hashtag }} | ||
| </a> | ||
| </div> | ||
| <div class="search-result-display flexcroll"> | ||
| <app-waiting-animation *ngIf="isLoading" class="waiting-icon"></app-waiting-animation> | ||
|
|
||
| <div *ngIf="accounts.length > 0" class="search-results"> | ||
| <h3 class="search-results__title">Accounts</h3> | ||
| <a href *ngFor="let account of accounts" class="account" title="open account" | ||
| (click)="browseAccount(account.acct)"> | ||
| <img src="{{account.avatar}}" class="account__avatar" /> | ||
| <div class="account__name">{{ account.username }}</div> | ||
| <div class="account__fullhandle">@{{ account.acct }}</div> | ||
| </a> | ||
| </div> | ||
|
|
||
| <div *ngIf="hashtags.length > 0" class="search-results"> | ||
| <h3 class="search-results__title">Hashtags</h3> | ||
| <a (click)="browseHashtag(hashtag)" href *ngFor="let hashtag of hashtags" class="search-results__hashtag" | ||
| title="browse hashtag"> | ||
| #{{ hashtag }} | ||
| </a> | ||
| </div> | ||
|
|
||
| <div *ngIf="statuses.length > 0" class="search-results"> | ||
| <h3 class="search-results__title">Statuses</h3> | ||
| <div *ngIf="statuses.length > 0" class="search-results"> | ||
| <h3 class="search-results__title">Statuses</h3> | ||
|
|
||
| <div class="search-results__status" *ngFor="let statusWrapper of statuses"> | ||
| <app-status [statusWrapper]="statusWrapper" | ||
| (browseAccountEvent)="browseAccount($event)" | ||
| (browseHashtagEvent)="browseHashtag($event)" | ||
| (browseThreadEvent)="browseThread($event)"></app-status> | ||
| <div class="search-results__status" *ngFor="let statusWrapper of statuses"> | ||
| <app-status [statusWrapper]="statusWrapper" (browseAccountEvent)="browseAccount($event)" | ||
| (browseHashtagEvent)="browseHashtag($event)" (browseThreadEvent)="browseThread($event)"> | ||
| </app-status> | ||
| </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
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
37 changes: 24 additions & 13 deletions
37
src/app/components/stream/stream-overlay/stream-overlay.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,21 +1,32 @@ | ||
| <div class="stream-overlay"> | ||
| <div class="stream-overlay__header"> | ||
| <a href class="overlay-close" (click)="close()">CLOSE</a> | ||
| <button class="overlay__button overlay-close" title="close" (click)="close()"> | ||
| <fa-icon [icon]="faTimes"></fa-icon> | ||
| </button> | ||
|
|
||
| <button class="overlay__button overlay-previous" [ngClass]="{'overlay__button--focus': previousElements.length > 0 }" title="previous" (click)="previous()"> | ||
| <fa-icon [icon]="faAngleLeft"></fa-icon> | ||
| </button> | ||
| <button class="overlay__button overlay-refresh" [ngClass]="{'overlay__button--focus': refreshFocused }" title="refresh" (click)="refresh()"> | ||
| <fa-icon [icon]="faRedoAlt"></fa-icon> | ||
| </button> | ||
| <button class="overlay__button overlay-next" [ngClass]="{'overlay__button--focus': nextElements.length > 0 }" title="next" (click)="next()"> | ||
| <fa-icon [icon]="faAngleRight"></fa-icon> | ||
| </button> | ||
|
|
||
| <!-- <a href class="overlay-close" (click)="close()">CLOSE</a> | ||
| <a href class="overlay-previous" (click)="previous()">PREV</a> | ||
| <a href class="overlay-refresh" *ngIf="canRefresh" (click)="refresh()">REFRESH</a> | ||
| <a href class="overlay-next" *ngIf="canGoForward" (click)="next()">NEXT</a> | ||
| <a href class="overlay-refresh" *ngIf="canRefresh" (click)="refresh()">REFRESH</a> | ||
| <a href class="overlay-next" *ngIf="canGoForward" (click)="next()">NEXT</a> --> | ||
| </div> | ||
|
|
||
| <app-user-profile #appUserProfile *ngIf="accountName" [currentAccount]="accountName" | ||
| (browseAccountEvent)="browseAccount($event)" | ||
| (browseHashtagEvent)="browseHashtag($event)" | ||
|
|
||
| <app-user-profile #appUserProfile *ngIf="accountName" [currentAccount]="accountName" class="stream-overlay__content" | ||
| (browseAccountEvent)="browseAccount($event)" (browseHashtagEvent)="browseHashtag($event)" | ||
| (browseThreadEvent)="browseThread($event)"></app-user-profile> | ||
| <app-hashtag #appHashtag *ngIf="hashtagElement" [hashtagElement]="hashtagElement" | ||
| (browseAccountEvent)="browseAccount($event)" | ||
| (browseHashtagEvent)="browseHashtag($event)" | ||
| <app-hashtag #appHashtag *ngIf="hashtagElement" [hashtagElement]="hashtagElement" class="stream-overlay__content" | ||
| (browseAccountEvent)="browseAccount($event)" (browseHashtagEvent)="browseHashtag($event)" | ||
| (browseThreadEvent)="browseThread($event)"></app-hashtag> | ||
| <app-thread #appThread *ngIf="browseThread" [currentThread]="thread" | ||
| (browseAccountEvent)="browseAccount($event)" | ||
| (browseHashtagEvent)="browseHashtag($event)" | ||
| <app-thread #appThread *ngIf="browseThread" [currentThread]="thread" class="stream-overlay__content" | ||
| (browseAccountEvent)="browseAccount($event)" (browseHashtagEvent)="browseHashtag($event)" | ||
| (browseThreadEvent)="browseThread($event)"></app-thread> | ||
| </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
Oops, something went wrong.