diff options
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/components/feed/feed.component.css | 6 | ||||
| -rw-r--r-- | src/app/components/feed/feed.component.html | 64 |
2 files changed, 31 insertions, 39 deletions
diff --git a/src/app/components/feed/feed.component.css b/src/app/components/feed/feed.component.css index cb155c6..23a70d5 100644 --- a/src/app/components/feed/feed.component.css +++ b/src/app/components/feed/feed.component.css @@ -77,7 +77,7 @@ #top-bar { display: flex; - flex-direction: column; + flex-direction: row; width: 98%; margin: 0 auto; margin-bottom: .5em; @@ -100,10 +100,6 @@ display: none; } -#main-content { - display: flex; -} - /* Create post */ #create-post-form { diff --git a/src/app/components/feed/feed.component.html b/src/app/components/feed/feed.component.html index 1a03dcc..2fece23 100644 --- a/src/app/components/feed/feed.component.html +++ b/src/app/components/feed/feed.component.html @@ -1,8 +1,8 @@ <app-loading *ngIf="!dataArrived"></app-loading> -<div id="feed-page" *ngIf="dataArrived"> - <nav id="profile-bar" class="round-image rounded-border"> - <div id="profile-info" (click)="goToProfile()"> +<main id="feed-page" *ngIf="dataArrived"> + <aside id="profile-bar" class="round-image rounded-border"> + <summary id="profile-info" (click)="goToProfile()"> <img id="profile-bar-profile-pic" class="round-image" [src]="user.profilePictureURL" alt=""/> <div id="profile-bar-name"> {{ user.firstName }} {{ user.lastName }} @@ -10,43 +10,39 @@ <div id="profile-bar-username"> @{{ user.userName }} </div> - </div> + </summary> <button class="submit-btn" (click)="goToSettings()">Settings</button> <button class="submit-btn" (click)="logout()">Logout</button> - </nav> - <div id="feed-content"> + </aside> + <section id="feed-content"> <nav id="top-bar"> - <div id="main-content"> - <img id="top-bar-profile-pic" class="round-image" [src]="user.profilePictureURL" alt="" (click)="goToProfile()"> - <form id="create-post-form" class="rounded-border" [formGroup]="createPostFormGroup" (ngSubmit)="createPost()"> - <div id="form-inputs"> - <input id="top-bar-create-post" type="text" formControlName="newPostMessage" placeholder="What's on your mind?"/> - <input type="submit" style="display: none" /> <!-- You need this element, so when you press enter the request is sent --> - <img id="attachment-img" src="assets/images/paper-clip.png"> - <input id="file-upload" type="file" formControlName="fileUpload" (change)="onFileUpload($event)" multiple> - </div> - <div class="form-attachments"> - <div *ngFor="let file of files" class="form-attachment"> - {{ file.name ? file.name : 'Attachment' }} - <div class="remove-form-attachment" (click)="removeAttachment(file.name)"> - ☒ - </div> + <img id="top-bar-profile-pic" class="round-image" [src]="user.profilePictureURL" alt="" (click)="goToProfile()"> + <form id="create-post-form" class="rounded-border" [formGroup]="createPostFormGroup" (ngSubmit)="createPost()"> + <section id="form-inputs"> + <input id="top-bar-create-post" type="text" formControlName="newPostMessage" placeholder="What's on your mind?"/> + <input type="submit" style="display: none" /> <!-- You need this element, so when you press enter the request is sent --> + <img id="attachment-img" src="assets/images/paper-clip.png"> + <input id="file-upload" type="file" formControlName="fileUpload" (change)="onFileUpload($event)" multiple> + </section> + <section class="form-attachments"> + <div *ngFor="let file of files" class="form-attachment"> + {{ file.name ? file.name : 'Attachment' }} + <div class="remove-form-attachment" (click)="removeAttachment(file.name)"> + ☒ </div> </div> - </form> - <a id="top-bar-open-chat" href=""> - <img src="assets/images/feed/chat-pic.png" alt=""/> - </a> - </div> + </section> + </form> + <img id="top-bar-open-chat" src="assets/images/feed/chat-pic.png" alt=""/> </nav> - <div id="posts" class="scroll-standalone" (scroll)="onScroll($event)"> - <div id="no-posts-msg" *ngIf="posts.length === 0"> + <section id="posts" class="scroll-standalone" (scroll)="onScroll($event)"> + <mark id="no-posts-msg" *ngIf="posts.length === 0"> None of your friends have posted anything yet!<br> Try refreshing your page! - </div> - <div *ngFor="let friendPost of posts" class="post"> + </mark> + <article *ngFor="let friendPost of posts" class="post"> <app-post [paramId]="friendPost.postId.toString()"></app-post> - </div> - </div> - </div> -</div> + </article> + </section> + </section> +</main> |