浏览代码

Forum UI enchancements

master
kj1352 5 年前
父节点
当前提交
1b931f4e4a
共有 5 个文件被更改,包括 54 次插入26 次删除
  1. +22
    -17
      src/app/reusable-components/forum/forum.component.html
  2. +23
    -6
      src/app/reusable-components/forum/forum.component.scss
  3. +6
    -1
      src/app/reusable-components/forum/forum.component.ts
  4. +1
    -1
      src/app/tabs/courses/details/details.component.html
  5. +2
    -1
      src/app/tabs/courses/details/details.component.ts

+ 22
- 17
src/app/reusable-components/forum/forum.component.html 查看文件

@@ -1,23 +1,28 @@
<section class="forum-details"> <section class="forum-details">
<section class="add-post">
<textarea placeholder="Start a discussion"></textarea>
<div class="input-holder">
<svg-icon [applyClass]="true" class="icon" src="assets/custom-icons/hashtag.svg"></svg-icon>
<input type="text" placeholder="Hashtag">
</div>
<div class="input-holder">
<svg-icon [applyClass]="true" class="icon" src="assets/custom-icons/add-person.svg"></svg-icon>
<input type="text" placeholder="Tag person">
</div>
<div class="input-holder">
<svg-icon [applyClass]="true" class="icon" src="assets/custom-icons/link.svg"></svg-icon>
<input type="text" placeholder="URL">
<section class="add-post" *ngIf="!isSubSegment">
<div *ngIf="showAddPostInputs">
<textarea placeholder="Start a discussion"></textarea>
<div class="input-holder">
<svg-icon [applyClass]="true" class="icon" src="assets/custom-icons/hashtag.svg"></svg-icon>
<input type="text" placeholder="Hashtag">
</div>
<div class="input-holder">
<svg-icon [applyClass]="true" class="icon" src="assets/custom-icons/add-person.svg"></svg-icon>
<input type="text" placeholder="Tag person">
</div>
<div class="input-holder">
<svg-icon [applyClass]="true" class="icon" src="assets/custom-icons/link.svg"></svg-icon>
<input type="text" placeholder="URL">
</div>
<div class="input-holder">
<svg-icon [applyClass]="true" class="icon" src="assets/custom-icons/document.svg"></svg-icon>
<input type="file">
</div>
</div> </div>
<div class="input-holder">
<svg-icon [applyClass]="true" class="icon" src="assets/custom-icons/document.svg"></svg-icon>
<input type="file">
<div class="action-buttons">
<button class="cancel-post-button" *ngIf="showAddPostInputs" (click)="showAddPostInputs = false"> Cancel </button>
<button class="add-post-button" (click)="showAddPostInputs = true"> Add Post </button>
</div> </div>
<button class="add-post-button"> Add Post </button>
</section> </section>


<ul class="forum-post-list"> <ul class="forum-post-list">


+ 23
- 6
src/app/reusable-components/forum/forum.component.scss 查看文件

@@ -1,7 +1,7 @@
.forum-details { .forum-details {
.add-post { .add-post {
width: 90%; width: 90%;
margin: 10px auto;
margin: 10px auto 20px;
textarea { textarea {
border: 0px; border: 0px;
height: 70px; height: 70px;
@@ -49,17 +49,34 @@
} }
} }


.add-post-button {
.action-buttons {
display: flex;
width: 100%;
margin-top: 20px; margin-top: 20px;
justify-content: space-between;
}

.add-post-button {
display: block; display: block;
width: 100px;
margin-left: auto;
flex-grow: 1;
height: 40px; height: 40px;
font-size: 14px; font-size: 14px;
background-color: var(--teal-green); background-color: var(--teal-green);
color: white; color: white;
border: 0px; border: 0px;
border-radius: 7px;
border-radius: 5px;
}

.cancel-post-button {
display: block;
width: 100px;
height: 40px;
font-size: 14px;
background-color: var(--dark-grey);
color: white;
border: 0px;
border-radius: 5px;
margin-right: 20px;
} }


.more-options-slideup { .more-options-slideup {
@@ -153,7 +170,7 @@
.forum-post-list { .forum-post-list {
list-style: none; list-style: none;
width: 100%; width: 100%;
margin: 20px auto 0;
margin: 0 auto;
overflow: hidden; overflow: hidden;


.post { .post {


+ 6
- 1
src/app/reusable-components/forum/forum.component.ts 查看文件

@@ -1,4 +1,4 @@
import { Component, OnInit } from '@angular/core';
import { Component, OnInit, Input } from '@angular/core';


@Component({ @Component({
selector: 'app-forum', selector: 'app-forum',
@@ -10,9 +10,14 @@ export class ForumComponent implements OnInit {
selectedPost: number; selectedPost: number;
showAddCommentToPost: boolean = false; showAddCommentToPost: boolean = false;


showAddPostInputs: boolean = false;

@Input() isSubSegment: boolean = false;

constructor() { } constructor() { }


ngOnInit(): void { ngOnInit(): void {

} }


} }

+ 1
- 1
src/app/tabs/courses/details/details.component.html 查看文件

@@ -206,7 +206,7 @@




<section *ngIf="selectedSegment === 'forum'"> <section *ngIf="selectedSegment === 'forum'">
<app-forum></app-forum>
<app-forum [isSubSegment]="isSubSegment"></app-forum>
</section> </section>
</div> </div>




+ 2
- 1
src/app/tabs/courses/details/details.component.ts 查看文件

@@ -14,6 +14,7 @@ export class DetailsComponent implements OnInit {
routeSubscription: Subscription; routeSubscription: Subscription;
selectedChapter: number = 1; selectedChapter: number = 1;
showDeletePopup: boolean = false; showDeletePopup: boolean = false;
isSubSegment: boolean = true;


constructor( constructor(
private route: ActivatedRoute, private route: ActivatedRoute,
@@ -36,7 +37,7 @@ export class DetailsComponent implements OnInit {


getPopupDecision(e : boolean) { getPopupDecision(e : boolean) {
if (e) { if (e) {
this.showDeletePopup = false;
this.showDeletePopup = false;
} }
} }