-
-
{{data?.department}}
-
{{data?.location}}
-
{{data?.email || data?.username}}
-
-
-
+
+
+
+
{{data?.department}}
+
{{data?.location}}
+
{{data?.email || data?.username}}
+
+
+
+
+
+
+
{{data?.topiccount || 0 }}
Discussions
@@ -22,10 +34,19 @@
{{data?.postcount || 0 }}
Posts
+
+ 45
+ Profile views
+
+
+
+
+
Last online 4 minutes ago
+
diff --git a/projects/discussion-ui/src/lib/components/my-discussion/my-discussion.component.scss b/projects/discussion-ui/src/lib/components/my-discussion/my-discussion.component.scss
index 05f66c6b..09a58256 100644
--- a/projects/discussion-ui/src/lib/components/my-discussion/my-discussion.component.scss
+++ b/projects/discussion-ui/src/lib/components/my-discussion/my-discussion.component.scss
@@ -67,12 +67,23 @@
display: flex;
flex-direction: column;
align-items: baseline;
- justify-content: space-evenly;
+ // justify-content: space-evenly;
+ justify-content: space-between;
+ width: calc(100% - 180px);
}
+.bottom_info_box {
+ width: 100%;
+ display: flex;
+}
+.info-top-box {
+ flex-wrap: wrap;
+ width: 100%;
+}
.profile-data {
margin-top: 16px;
font-size: 14px;
+ width: 100%;
}
.post-count-area {
@@ -134,6 +145,23 @@
}
}
+a.karma_btn {
+ padding: 10px 40px;
+ box-sizing: border-box;
+ text-align: center;
+ font: 700 14px/21px Lato;
+ border-radius: 4px 4px;
+ background-color: rgba(0, 0, 0, .04);
+}
+.post-time-box {
+ p {
+ font-weight: 700;
+ }
+}
+// .karma_icon {
+// margin-right: 8px;
+// }
+
.discuss-card-content {
z-index: 1!important;
}
diff --git a/projects/discussion-ui/src/lib/components/side-pannel/side-pannel.component.html b/projects/discussion-ui/src/lib/components/side-pannel/side-pannel.component.html
index 0e734518..b286b323 100644
--- a/projects/discussion-ui/src/lib/components/side-pannel/side-pannel.component.html
+++ b/projects/discussion-ui/src/lib/components/side-pannel/side-pannel.component.html
@@ -20,4 +20,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/projects/discussion-ui/src/lib/elements/category-card/category-card.component.html b/projects/discussion-ui/src/lib/elements/category-card/category-card.component.html
index 68b2febf..48c345fc 100644
--- a/projects/discussion-ui/src/lib/elements/category-card/category-card.component.html
+++ b/projects/discussion-ui/src/lib/elements/category-card/category-card.component.html
@@ -3,12 +3,17 @@
-
+
-
{{category.totalTopicCount}} discussions
+
789 views
+
{{category.totalTopicCount}} discussions
{{category.totalPostCount}} posts
diff --git a/projects/discussion-ui/src/lib/elements/category-card/category-card.component.scss b/projects/discussion-ui/src/lib/elements/category-card/category-card.component.scss
index 1e4c5f3d..bae2e37b 100644
--- a/projects/discussion-ui/src/lib/elements/category-card/category-card.component.scss
+++ b/projects/discussion-ui/src/lib/elements/category-card/category-card.component.scss
@@ -91,6 +91,11 @@
font-size: 14px;
font-weight: 700 !important;
font-family: inherit;
+
+ // .trend_icon {
+ // margin-right: 4px;
+ // color: rgba(0, 0, 0, .6);
+ // }
}
}
From c9856a5f8fd4e973746a5b91dd746a75b10f96c9 Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <75484189+nitinraj-tarento@users.noreply.github.com>
Date: Thu, 21 Oct 2021 14:12:03 +0530
Subject: [PATCH 02/11] changes in discussion forum
---
.../src/lib/components/components.module.ts | 6 +-
.../discuss-category.component.css | 24 ++-
.../discuss-category.component.html | 19 +-
.../discuss-tags/discuss-tags.component.html | 2 +
.../discuss-tags/discuss-tags.component.scss | 3 +
.../components/leader-board/leader-board.html | 182 ++++++++++++++++++
.../components/leader-board/leader-board.scss | 129 +++++++++++++
.../leader-board/leaderboard-component.ts | 11 ++
.../lib-entry/lib-entry.component.scss | 3 +-
.../my-discussion.component.scss | 3 +-
.../side-pannel/side-pannel.component.html | 4 +-
.../discussion-routing.module.ts | 6 +
.../category-card.component.html | 8 +-
.../category-card.component.scss | 7 +-
14 files changed, 394 insertions(+), 13 deletions(-)
create mode 100644 projects/discussion-ui/src/lib/components/leader-board/leader-board.html
create mode 100644 projects/discussion-ui/src/lib/components/leader-board/leader-board.scss
create mode 100644 projects/discussion-ui/src/lib/components/leader-board/leaderboard-component.ts
diff --git a/projects/discussion-ui/src/lib/components/components.module.ts b/projects/discussion-ui/src/lib/components/components.module.ts
index 4c94038a..06225352 100644
--- a/projects/discussion-ui/src/lib/components/components.module.ts
+++ b/projects/discussion-ui/src/lib/components/components.module.ts
@@ -18,6 +18,8 @@ import { DiscussAllComponent } from './discuss-all/discuss-all.component';
import { TagAllDiscussionComponent } from './tag-all-discussion/tag-all-discussion.component';
import { InfiniteScrollModule } from 'ngx-infinite-scroll';
import { TrendingTagsComponent } from './trending-tags/trending-tags.component';
+import { LeaderBoardComponent } from './leader-board/leaderboard-component';
+
@NgModule({
declarations: [
SidePannelComponent,
@@ -30,6 +32,7 @@ import { TrendingTagsComponent } from './trending-tags/trending-tags.component';
DiscussAllComponent,
TagAllDiscussionComponent,
TrendingTagsComponent,
+ LeaderBoardComponent,
],
imports: [
CommonModule,
@@ -39,7 +42,7 @@ import { TrendingTagsComponent } from './trending-tags/trending-tags.component';
ReactiveFormsModule,
TagInputModule,
PipesModule,
- InfiniteScrollModule
+ InfiniteScrollModule,
],
exports: [
SidePannelComponent,
@@ -53,6 +56,7 @@ import { TrendingTagsComponent } from './trending-tags/trending-tags.component';
DiscussAllComponent,
TagAllDiscussionComponent,
TrendingTagsComponent,
+ LeaderBoardComponent,
],
providers: [
DiscussionService, ConfigService
diff --git a/projects/discussion-ui/src/lib/components/discuss-category/discuss-category.component.css b/projects/discussion-ui/src/lib/components/discuss-category/discuss-category.component.css
index 9e8fc300..b6579346 100644
--- a/projects/discussion-ui/src/lib/components/discuss-category/discuss-category.component.css
+++ b/projects/discussion-ui/src/lib/components/discuss-category/discuss-category.component.css
@@ -14,10 +14,32 @@
}
.card-comp {
- height: calc(100% - 24px);
+ height: calc(100% - 32px);
display: inline-block;
}
+.discuss-home {
+ background: no-repeat padding-box #0074b6;
+ border-radius: 4px 4px;
+ padding: 14px 15px;
+ box-sizing: border-box;
+ width: 140px;
+ height: 50px;
+
+}
+
+
+
+.recent-tabs {
+ padding: 0 0!important;
+}
+.filter-option {
+ border-bottom: 1px solid rgba(0, 0, 0, .3);
+}
+.filter-option.tabs-active {
+ border-bottom: 3px solid var(--blue);
+ }
+
@media (max-width: 700px) {
.discuss-category-cards {
grid-template-columns: 1fr;
diff --git a/projects/discussion-ui/src/lib/components/discuss-category/discuss-category.component.html b/projects/discussion-ui/src/lib/components/discuss-category/discuss-category.component.html
index 389a44a2..c37a126d 100644
--- a/projects/discussion-ui/src/lib/components/discuss-category/discuss-category.component.html
+++ b/projects/discussion-ui/src/lib/components/discuss-category/discuss-category.component.html
@@ -1,6 +1,23 @@
-
+
+
+
+
+
+
diff --git a/projects/discussion-ui/src/lib/components/discuss-tags/discuss-tags.component.scss b/projects/discussion-ui/src/lib/components/discuss-tags/discuss-tags.component.scss
index f058f78f..4284ccfd 100644
--- a/projects/discussion-ui/src/lib/components/discuss-tags/discuss-tags.component.scss
+++ b/projects/discussion-ui/src/lib/components/discuss-tags/discuss-tags.component.scss
@@ -72,3 +72,6 @@
}
}
+
+
+
diff --git a/projects/discussion-ui/src/lib/components/leader-board/leader-board.html b/projects/discussion-ui/src/lib/components/leader-board/leader-board.html
new file mode 100644
index 00000000..db035023
--- /dev/null
+++ b/projects/discussion-ui/src/lib/components/leader-board/leader-board.html
@@ -0,0 +1,182 @@
+
+
+
+
+
+
+
+
+
+
Top contributors of the month
+
+
+
+
+
+
+ DN
+
+
+
Devaprathap Nagendra
+
Joint Secretary at Tourism
+
+42 Karma
+
+
+
+
+
+
+
+
+
+
+ DN
+
+
+
Anand Bhairavi
+
Joint Secretary at Tourism
+
+37 Karma
+
+
+
+
+
+
+
+
+
+
+ DN
+
+
+
Munmunja Mukherjee
+
Under Secretary at Ministry of Ex..
+
+29 Karma
+
+
+
+
+
+
+
+
+
+
+
All users
+
+
+
+
+
+
+
+
+ DN
+
+
+
Somorjit Phuritshabam
+
Under Secretary at Ministry of Ext.
+
542 Karma
+
+
+
+
+
+
+
+
+
+
+ DN
+
+
+
Renuka Karmakar
+
Joint Secretary at AYUSH
+
538 Karma
+
+
+
+
+
+
+
+
+
+
+ DN
+
+
+
Manjunatha HS
+
Joint Secretary Finance
+
456 Karma
+
+
+
+
+
+
+
+
+
+
+ DN
+
+
+
Rakhi Mohapatra
+
Director at Civil Aviation
+
454 Karma
+
+
+
+
+
+
+
+
+
+
+ DN
+
+
+
Satyaki Roy
+
Additional Secretary at Urban Dev
+
508 Karma
+
+
+
+
+
+
+
+
+
+
+ DN
+
+
+
Joy Mathew
+
Joint Secretary at DoPT
+
412 Karma
+
+
+
+
+
+
+
+
+
diff --git a/projects/discussion-ui/src/lib/discussion-routing/discussion-routing.module.ts b/projects/discussion-ui/src/lib/discussion-routing/discussion-routing.module.ts
index 909531c8..e87c1088 100644
--- a/projects/discussion-ui/src/lib/discussion-routing/discussion-routing.module.ts
+++ b/projects/discussion-ui/src/lib/discussion-routing/discussion-routing.module.ts
@@ -9,6 +9,7 @@ import { RouterModule, Routes } from '@angular/router';
import { DiscussHomeComponent } from './../components/discuss-home/discuss-home.component';
import { DiscussAllComponent } from './../components/discuss-all/discuss-all.component';
import { TagAllDiscussionComponent } from './../components/tag-all-discussion/tag-all-discussion.component';
+import { LeaderBoardComponent } from '../components/leader-board/leaderboard-component';
const routes: Routes = [
@@ -56,6 +57,11 @@ const routes: Routes = [
path: 'topic/:topicId/:slug',
pathMatch: 'full',
component: DiscussionDetailsComponent
+ },
+ {
+ path: 'leaderboard',
+ pathMatch: 'full',
+ component: LeaderBoardComponent
}
]
},
diff --git a/projects/discussion-ui/src/lib/elements/category-card/category-card.component.html b/projects/discussion-ui/src/lib/elements/category-card/category-card.component.html
index 48c345fc..a61f5bbf 100644
--- a/projects/discussion-ui/src/lib/elements/category-card/category-card.component.html
+++ b/projects/discussion-ui/src/lib/elements/category-card/category-card.component.html
@@ -1,11 +1,11 @@
-
Related
-
+
+ 
+
+
+
{{ discussion.timestamp | pipeRelativeTime }}
From 1702ce9903ef29c4cd940144dc796b7b28e88f76 Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <75484189+nitinraj-tarento@users.noreply.github.com>
Date: Thu, 28 Oct 2021 11:08:36 +0530
Subject: [PATCH 04/11] related discussion image added
---
.../discussion-details/discussion-details.component.scss | 6 +++++-
.../related-discussion/related-discussion.component.html | 8 +++++---
.../related-discussion/related-discussion.component.scss | 9 +++++++++
3 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/projects/discussion-ui/src/lib/components/discussion-details/discussion-details.component.scss b/projects/discussion-ui/src/lib/components/discussion-details/discussion-details.component.scss
index 72df0a3e..5ecd4118 100644
--- a/projects/discussion-ui/src/lib/components/discussion-details/discussion-details.component.scss
+++ b/projects/discussion-ui/src/lib/components/discussion-details/discussion-details.component.scss
@@ -7,7 +7,7 @@
box-shadow: 0 2px 1px -1px rgba(0, 0, 0, .2), 0 1px 1px 0 rgba(0, 0, 0, .14), 0 1px 3px 0 rgba(0, 0, 0, .12);
background: var(--white);
color: rgba(0, 0, 0, .87);
- flex: 3;
+ // flex: 3;
height: auto;
transition: box-shadow 280ms cubic-bezier(.4, 0, .2, 1);
display: block;
@@ -19,12 +19,16 @@
margin-bottom: 1rem;
white-space: initial;
word-break: break-word;
+ width: 685px;
+ box-sizing: border-box;
}
.related-discuss-part {
padding: 0 0 1rem 1rem;
position: relative;
z-index: 2;
+ width: 295px;
+ box-sizing: border-box;
}
.discussion-card-title {
diff --git a/projects/discussion-ui/src/lib/elements/related-discussion/related-discussion.component.html b/projects/discussion-ui/src/lib/elements/related-discussion/related-discussion.component.html
index 2c55fd67..ff585f0c 100644
--- a/projects/discussion-ui/src/lib/elements/related-discussion/related-discussion.component.html
+++ b/projects/discussion-ui/src/lib/elements/related-discussion/related-discussion.component.html
@@ -6,11 +6,13 @@
Related
-
- 
-
+
+ 
+
+
+
{{ discussion.timestamp | pipeRelativeTime }}
diff --git a/projects/discussion-ui/src/lib/elements/related-discussion/related-discussion.component.scss b/projects/discussion-ui/src/lib/elements/related-discussion/related-discussion.component.scss
index de3bb292..13a3a877 100644
--- a/projects/discussion-ui/src/lib/elements/related-discussion/related-discussion.component.scss
+++ b/projects/discussion-ui/src/lib/elements/related-discussion/related-discussion.component.scss
@@ -54,3 +54,12 @@
.time {
color: rgba(0, 0, 0, 0.4);
}
+
+.category_text img.category_img {
+ width: 20px;
+ display: inline-block;
+ vertical-align: middle;
+}
+.category_text .category-name {
+ display: inline-block;
+}
\ No newline at end of file
From 6ec47fb644e98b09d1887f764e981ffa1211911b Mon Sep 17 00:00:00 2001
From: arunpilli21
Date: Tue, 2 Nov 2021 17:12:08 +0530
Subject: [PATCH 05/11] bug fixes
---
projects/discussion-ui/package.json | 2 +-
.../lib/components/discuss-home/discuss-home.component.ts | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/projects/discussion-ui/package.json b/projects/discussion-ui/package.json
index 6208e5ed..9a6cb31b 100644
--- a/projects/discussion-ui/package.json
+++ b/projects/discussion-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "@sunbird-cb/discussions-ui-v8",
- "version": "2.0.56",
+ "version": "2.0.62",
"repository": {
"type": "git",
"url": "git+https://github.com/Sunbird-Ed/discussions-UI.git"
diff --git a/projects/discussion-ui/src/lib/components/discuss-home/discuss-home.component.ts b/projects/discussion-ui/src/lib/components/discuss-home/discuss-home.component.ts
index 6e7af569..45b0c109 100644
--- a/projects/discussion-ui/src/lib/components/discuss-home/discuss-home.component.ts
+++ b/projects/discussion-ui/src/lib/components/discuss-home/discuss-home.component.ts
@@ -56,9 +56,9 @@ export class DiscussHomeComponent implements OnInit {
categoryIds = this.categoryId ? this.categoryId : categoryIds
this.getDiscussionList(categoryIds);
})
- // this.routeParams = params;
- // this.categoryId = this.discussionService.getContext(CONTEXT_PROPS.cid);
- // this.getDiscussionList(_.get(this.routeParams, 'slug'));
+ this.routeParams = params;
+ this.categoryId = this.discussionService.getContext(CONTEXT_PROPS.cid);
+ this.getDiscussionList(_.get(this.routeParams, 'slug'));
});
}
From 8c68ef2170c62d548dd7ff45bad95d5ba37cb84d Mon Sep 17 00:00:00 2001
From: nitin raj
Date: Wed, 3 Nov 2021 09:13:38 +0530
Subject: [PATCH 06/11] discussion tags, cards, fonts changed as per sketch
---
.../assets/images/Buffer-512.svg | 1 +
.../assets/images/Buffer-5121.webp | Bin 0 -> 4750 bytes
.../discussion-ui/assets/images/swap_vert.svg | 1 +
.../assets/images/trending_up.svg | 1 +
.../discuss-all/discuss-all.component.html | 29 +-
.../discuss-all/discuss-all.component.scss | 236 +++++-----
.../discuss-home/discuss-home.component.html | 25 +-
.../discuss-home/discuss-home.component.scss | 52 ++-
.../discuss-home/discuss-home.component.ts | 2 +
.../discuss-tags/discuss-tags.component.html | 37 +-
.../discuss-tags/discuss-tags.component.scss | 93 ++--
.../discussion-details.component.html | 436 +++++++++---------
.../discussion-details.component.scss | 52 +--
.../trending-tags.component.html | 72 +--
.../trending-tags.component.scss | 136 +++---
.../category-card.component.html | 34 +-
.../category-card.component.scss | 17 +-
.../discuss-card/discuss-card.component.html | 86 ++--
.../discuss-card/discuss-card.component.scss | 68 ++-
.../related-discussion.component.html | 9 +-
.../related-discussion.component.scss | 42 +-
21 files changed, 710 insertions(+), 719 deletions(-)
create mode 100644 projects/discussion-ui/assets/images/Buffer-512.svg
create mode 100644 projects/discussion-ui/assets/images/Buffer-5121.webp
create mode 100644 projects/discussion-ui/assets/images/swap_vert.svg
create mode 100644 projects/discussion-ui/assets/images/trending_up.svg
diff --git a/projects/discussion-ui/assets/images/Buffer-512.svg b/projects/discussion-ui/assets/images/Buffer-512.svg
new file mode 100644
index 00000000..94371fc2
--- /dev/null
+++ b/projects/discussion-ui/assets/images/Buffer-512.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/projects/discussion-ui/assets/images/Buffer-5121.webp b/projects/discussion-ui/assets/images/Buffer-5121.webp
new file mode 100644
index 0000000000000000000000000000000000000000..d6f8aa14626cdd78ff67784696a023515696faa1
GIT binary patch
literal 4750
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
literal 0
HcmV?d00001
diff --git a/projects/discussion-ui/assets/images/swap_vert.svg b/projects/discussion-ui/assets/images/swap_vert.svg
new file mode 100644
index 00000000..0b0359d2
--- /dev/null
+++ b/projects/discussion-ui/assets/images/swap_vert.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/projects/discussion-ui/assets/images/trending_up.svg b/projects/discussion-ui/assets/images/trending_up.svg
new file mode 100644
index 00000000..814cdc57
--- /dev/null
+++ b/projects/discussion-ui/assets/images/trending_up.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/projects/discussion-ui/src/lib/components/discuss-all/discuss-all.component.html b/projects/discussion-ui/src/lib/components/discuss-all/discuss-all.component.html
index 4fde9f0a..68326052 100644
--- a/projects/discussion-ui/src/lib/components/discuss-all/discuss-all.component.html
+++ b/projects/discussion-ui/src/lib/components/discuss-all/discuss-all.component.html
@@ -6,22 +6,20 @@
-
+
-
-
- Ask a question or post an idea
+
+
+ Ask a question or post an idea
+
+
+ Start discussion
+
-
- Start discussion
-
-
-
-
+
@@ -30,7 +28,7 @@
' font-medium':currentFilter !== 'recent'}" mat-button (click)="filter('recent')" role="button">Recent
Popular
- Watching
+ Watching
All categories
@@ -41,8 +39,7 @@
-
+
@@ -59,7 +56,7 @@
-->
-
+
diff --git a/projects/discussion-ui/src/lib/components/discuss-all/discuss-all.component.scss b/projects/discussion-ui/src/lib/components/discuss-all/discuss-all.component.scss
index 79a00185..2652574c 100644
--- a/projects/discussion-ui/src/lib/components/discuss-all/discuss-all.component.scss
+++ b/projects/discussion-ui/src/lib/components/discuss-all/discuss-all.component.scss
@@ -2,191 +2,197 @@
// @import 'ws-vars';
// @import 'ws-mixins';
// @import "node_modules/bootstrap/scss/bootstrap";
-
.fade:not(.show) {
- opacity: 1 !important;
+ opacity: 1 !important;
+}
+
+.discussion_main_box {
+ width: 685px;
+ @media screen and (max-width: 992px) {
+ width: 100%;
+ }
+}
+
+.right_tag_box {
+ width: 275px;
+ @media screen and (max-width: 992px) {
+ width: 100%;
+ }
}
.buton {
- display: flex;
- border: 1px solid;
- flex: 1;
- background: red;
- align-content: center;
- text-align: center;
+ display: flex;
+ border: 1px solid;
+ flex: 1;
+ background: red;
+ align-content: center;
+ text-align: center;
}
.sticky {
- position: fixed;
- top: 0;
- overflow: hidden;
- z-index: 10;
- width: 100%;
+ position: fixed;
+ top: 0;
+ overflow: hidden;
+ z-index: 10;
+ width: 100%;
}
.text-box {
- display: flex;
- border: 1px solid;
- flex: 3;
- align-content: center;
- text-align: center;
+ display: flex;
+ border: 1px solid;
+ flex: 3;
+ align-content: center;
+ text-align: center;
}
// .margin-fix {
// @include breakpoint-xs {
// margin: 0 $size-l 0 $size-l;
// }
-
// @include breakpoint-s {
// margin: 0 $size-l 0 $size-l;
// }
// }
-
.overflow {
- // @include breakpoint-xs {
- // width: 10em;
- // // outline: 1px solid #000;
- // margin: 0 0 2em 0;
- // text-overflow: ellipsis !important;
- // /**
- // * Required properties to achieve text-overflow
- // */
- // white-space: nowrap;
- // overflow: hidden;
- // }
- overflow: hidden;
+ // @include breakpoint-xs {
+ // width: 10em;
+ // // outline: 1px solid #000;
+ // margin: 0 0 2em 0;
+ // text-overflow: ellipsis !important;
+ // /**
+ // * Required properties to achieve text-overflow
+ // */
+ // white-space: nowrap;
+ // overflow: hidden;
+ // }
+ overflow: hidden;
}
// .custom {
-
// height: 48px;
// max-height: 48px;
// @include breakpoint-xs {
// flex-direction: column;
// }
-
// @include breakpoint-s {
// flex-direction: column;
// }
// }
-
// .pagination-container {
// // margin-top: $size-l;
-
// }
-
.font-medium {
- font-weight: 500 !important;
+ font-weight: 500 !important;
}
.discuss-border {
- border-radius: 4px;
- /*.75rem;*/
- border: 1px solid #DEDFE0;
- flex: 1;
- // max-width: 500px;
- /* border-color: #cecece;*/
+ border-radius: 4px;
+ /*.75rem;*/
+ border: 1px solid #DEDFE0;
+ flex: 1;
+ // max-width: 500px;
+ /* border-color: #cecece;*/
}
.discuss .mat-form-field-wrapper {
- padding-bottom: 0px;
-
- .mat-form-field-infix {
- border-top-width: 5px !important;
- padding: 0px;
- padding-bottom: 5px;
- }
-
+ padding-bottom: 0px;
+ .mat-form-field-infix {
+ border-top-width: 5px !important;
+ padding: 0px;
+ padding-bottom: 5px;
+ }
}
.discuss-card-content {
- z-index: 1!important;
+ z-index: 1!important;
}
-
.discuss-home {
- background: #0074B6 0% 0% no-repeat padding-box;
- border-radius: 0px 4px 4px 0px;
- padding: 13px 32px;
- // text-decoration: underline;
- /* flex: 1; */
- min-width: fit-content;
- margin: 0;
+ background: #0074B6 0% 0% no-repeat padding-box;
+ border-radius: 0px 4px 4px 0px;
+ padding: 13px 32px;
+ // text-decoration: underline;
+ /* flex: 1; */
+ min-width: fit-content;
+ margin: 0;
}
.flex-3 {
- flex: 3;
+ flex: 3;
}
.filter {
- .filter-option {
- // margin: $size-xs $size-m;
- /* border-bottom: darkslateblue; */
- border-radius: 0;
- border-bottom-width: 2px;
- border-top-width: 0;
- border-left-width: 0;
- border-right-width: 0;
- border-bottom: 1px solid rgba(0, 0, 0, 0.3);
- }
- .filter-option.tabs-active {
- border-bottom: 3px solid var(--blue);
- }
+ .filter-option {
+ // margin: $size-xs $size-m;
+ /* border-bottom: darkslateblue; */
+ border-radius: 0;
+ border-bottom-width: 2px;
+ border-top-width: 0;
+ border-left-width: 0;
+ border-right-width: 0;
+ border-bottom: 1px solid rgba(0, 0, 0, 0.3);
+ }
+ .filter-option.tabs-active {
+ border-bottom: 3px solid var(--blue);
+ }
}
.max-height-60 {
- max-height: 60px;
+ max-height: 60px;
}
.height-48 {
- max-height: 48px;
+ max-height: 48px;
}
.df-start-btn {
- height: 2rem;
- outline: none;
- font-weight: bold;
- border: none;
- border-radius: .25rem;
- background: var(--blue);
- color: var(--white);
- padding: 0.5rem 0.75rem;
- font-size: .75rem;
- display: flex;
- align-items: center;
- cursor: pointer;
- margin: 0 0 1rem 0;
-}
-.start-btn-hint{
- color: rgba(0, 0, 0, 0.54);
- display: block;
- margin-bottom: 0;
+ height: 2rem;
+ outline: none;
+ font-weight: bold;
+ border: none;
+ border-radius: .25rem;
+ background: var(--blue);
+ color: var(--white);
+ padding: 0.5rem 0.75rem;
+ font-size: .75rem;
+ display: flex;
+ align-items: center;
+ cursor: pointer;
+ margin: 0 0 1rem 0;
+}
+
+.start-btn-hint {
+ color: rgba(0, 0, 0, 0.54);
+ display: block;
+ margin-bottom: 0;
}
+
.tab_margin {
- margin-bottom: 15px!important;
+ margin-bottom: 15px!important;
}
+
a.all_category_link {
- color: #0074b6;
- display: none;
+ color: #0074b6;
+ display: none;
}
-.watching_link{
- display: none;
+.watching_link {
+ display: none;
}
@media (max-width: 768px) {
-
- .main-div {
- display: block!important;
- width:100%!important;
- padding: 0px 0px!important;
- }
- .discussion_outer_box {
- display: block!important;
- }
- .discussion_main_box, .right_tag_box {
- width: 100%;
- display: block!important;
- float: none;
- }
-}
+ .main-div {
+ display: block!important;
+ width: 100%!important;
+ padding: 0px 0px!important;
+ }
+ .discussion_outer_box {
+ display: block!important;
+ }
+ .discussion_main_box,
+ .right_tag_box {
+ width: 100%;
+ display: block!important;
+ float: none;
+ }
+}
\ No newline at end of file
diff --git a/projects/discussion-ui/src/lib/components/discuss-home/discuss-home.component.html b/projects/discussion-ui/src/lib/components/discuss-home/discuss-home.component.html
index f3332af3..da94cefe 100644
--- a/projects/discussion-ui/src/lib/components/discuss-home/discuss-home.component.html
+++ b/projects/discussion-ui/src/lib/components/discuss-home/discuss-home.component.html
@@ -1,18 +1,21 @@
-
+
+
+
+ 
+
+
+
+
+
+
+
-
-
-
-
-
+
-
+
diff --git a/projects/discussion-ui/src/lib/components/discuss-home/discuss-home.component.scss b/projects/discussion-ui/src/lib/components/discuss-home/discuss-home.component.scss
index 94331a81..648eda54 100644
--- a/projects/discussion-ui/src/lib/components/discuss-home/discuss-home.component.scss
+++ b/projects/discussion-ui/src/lib/components/discuss-home/discuss-home.component.scss
@@ -1,23 +1,35 @@
-.df-start-btn{
- height: 2rem;
- outline: none;
- font-weight: bold;
- border: none;
- border-radius: .25rem;
- background: var(--blue);
- color: var(--white);
- padding: 0.5rem 0.75rem;
- font-size: .75rem;
- display: flex;
- align-items: center;
- cursor: pointer;
- margin: 0 0 1rem 0;
- }
+.df-start-btn {
+ // height: 2rem;
+ outline: none;
+ // font-weight: bold;
+ border: none;
+ border-radius: .25rem;
+ background: var(--blue);
+ color: var(--white);
+ // padding: 0.5rem 0.75rem;
+ // font-size: .75rem;
+ padding: 14px 15px;
+ display: flex;
+ align-items: center;
+ cursor: pointer;
+ // margin: 0 0 1rem 0;
+}
- .infinite-scroll {
+.infinite-scroll {
overflow-y: scroll;
- }
+}
- .discuss-card-content {
- z-index: 1!important;
- }
\ No newline at end of file
+.discuss-card-content {
+ z-index: 1!important;
+}
+
+.category_title_div {
+ background-color: #fff;
+ padding: 1.5rem;
+ border-radius: 4px 4px;
+}
+
+.category_img {
+ height: 48px;
+ width: 48px;
+}
\ No newline at end of file
diff --git a/projects/discussion-ui/src/lib/components/discuss-home/discuss-home.component.ts b/projects/discussion-ui/src/lib/components/discuss-home/discuss-home.component.ts
index 6e7af569..5c7fbe21 100644
--- a/projects/discussion-ui/src/lib/components/discuss-home/discuss-home.component.ts
+++ b/projects/discussion-ui/src/lib/components/discuss-home/discuss-home.component.ts
@@ -21,6 +21,7 @@ export class DiscussHomeComponent implements OnInit {
@Input() categoryHomeAction;
@Output() stateChange: EventEmitter = new EventEmitter();
+
discussionList = [];
routeParams: any;
showStartDiscussionModal = false;
@@ -60,6 +61,7 @@ export class DiscussHomeComponent implements OnInit {
// this.categoryId = this.discussionService.getContext(CONTEXT_PROPS.cid);
// this.getDiscussionList(_.get(this.routeParams, 'slug'));
});
+
}
navigateToDiscussionDetails(discussionData) {
diff --git a/projects/discussion-ui/src/lib/components/discuss-tags/discuss-tags.component.html b/projects/discussion-ui/src/lib/components/discuss-tags/discuss-tags.component.html
index 7266d584..ef2cdb3c 100644
--- a/projects/discussion-ui/src/lib/components/discuss-tags/discuss-tags.component.html
+++ b/projects/discussion-ui/src/lib/components/discuss-tags/discuss-tags.component.html
@@ -1,24 +1,21 @@
-
-
-
+
+
+
-
-
-
-
-
+
+
+
- {{tag.value}}
- {{tag.score}}
-
-
-
-
-
-
-
-
+ {{tag.value}}
+
+
+
+
+
\ No newline at end of file
diff --git a/projects/discussion-ui/src/lib/components/discuss-tags/discuss-tags.component.scss b/projects/discussion-ui/src/lib/components/discuss-tags/discuss-tags.component.scss
index 4284ccfd..e7f87b44 100644
--- a/projects/discussion-ui/src/lib/components/discuss-tags/discuss-tags.component.scss
+++ b/projects/discussion-ui/src/lib/components/discuss-tags/discuss-tags.component.scss
@@ -1,57 +1,71 @@
.sb-search-box {
- display: flex;
- align-items: center;
- border: 0px;
+ display: flex;
+ align-items: center;
+ border: 0px;
}
.sb-search-box .sb-search-input {
- width: 100%;
- font-size: 14px;
- min-height: 2rem;
- outline: 0;
- border-radius: 0;
- line-height: normal;
- background: none;
- padding: 1em;
- border-radius: 5px;
- border: 0px;
+ width: 100%;
+ font-size: 14px;
+ min-height: 2rem;
+ outline: 0;
+ border-radius: 0;
+ line-height: normal;
+ background: none;
+ padding: 1em;
+ border-radius: 5px;
+ border: 0px;
}
.search-icon {
- width: 18px;
- height: 18px;
- margin: 16px 0px 16px 16px;
+ width: 18px;
+ height: 18px;
+ margin: 16px 0px 16px 16px;
}
.sb-search-box .input-div {
- border-radius: 24px;
- background: var(--white);
- display: flex;
- align-items: center;
- border: 1px solid #ddd;
- width: 100%;
+ border-radius: 24px;
+ background: var(--white);
+ display: flex;
+ align-items: center;
+ border: 1px solid #ddd;
+ width: 100%;
}
.sb-search-box .input-div:hover {
- border-color: var(--blue);
+ border-color: var(--blue);
}
.tags {
- z-index: 1!important;
+ z-index: 1!important;
}
.tag {
- cursor: pointer;
-
- .count {
- background-color: transparent!important;
- color: #fff!important;
- }
+ cursor: pointer;
+ background-color: #fff;
+ padding: 4px 4px 4px 0px;
+ margin: 0px 24px 16px 0px;
+ box-sizing: border-box;
+ max-height: 48px!important;
+ height: 48px;
+ border-radius: 100px 100px;
+ font-size: 16px;
+ font-family: 'Lato';
+ border: 1px solid rgba(0, 0, 0, 0.08);
+ .count {
+ background-color: #e9e8d9!important;
+ height: 40px;
+ width: 40px;
+ border-radius: 100%;
+ .tag_score {
+ font: 400 12px/40px Lato;
+ color: rgba(0, 0, 0, 0.87);
+ }
+ }
}
-
.search {
- border: 1px solid #dedfe0;
+ border: 1px solid #dedfe0;
height: 1.5rem;
padding: 12px;
font: inherit;
@@ -62,16 +76,11 @@
}
.theme-igot.day-mode .ws-mat-default-text {
- color:#fff;
+ color: #fff;
}
-
@media (max-width: 768px) {
- .discuss-tags {
- flex-direction: column;
- }
-}
-
-
-
-
+ .discuss-tags {
+ flex-direction: column;
+ }
+}
\ No newline at end of file
diff --git a/projects/discussion-ui/src/lib/components/discussion-details/discussion-details.component.html b/projects/discussion-ui/src/lib/components/discussion-details/discussion-details.component.html
index 22c8f715..09e25da3 100644
--- a/projects/discussion-ui/src/lib/components/discussion-details/discussion-details.component.html
+++ b/projects/discussion-ui/src/lib/components/discussion-details/discussion-details.component.html
@@ -1,39 +1,39 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ {{ post?.user?.username | splitInitials }}
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
- Edit
-
- Delete
+
+
+
+
+
+ Edit
+
+ Delete
+
+
+
-
-
-
-
-
-
-
+
+
-
-
-
+
-
-
-
-
-
+
+
+
+
+
Recent
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ {{ post?.user?.username | splitInitials }}
-
-
-
-
-
- {{ post?.timestamp | date: 'dd MMM yyyy hh:mm a'}}
-
-
-
-
-
-
-
- (edited)
-
-
-
-
+
+
+
+
+ (edited)
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
- 1 reply
-
+
+
+
+
+
+ 1 reply
+
-
-
-
+
+
+
-
-
-
-
- Last reply
+
+
+
+
+ Last reply
{{ post?.replies?.timestampISO | date: 'dd MMM yyyy hh:mm a' }}
-
-
-
-
-
-
-
-
-
-
-
-
+
-
- {{post?.replies?.count}} replies
-
-
+
+ {{post?.replies?.count}} replies
+
+
-
-
-
+
+
+
-
-
-
-
- Last reply
+
+
+
+
+ Last reply
{{ post.replies.timestampISO | date: 'dd MMM yyyy hh:mm a' }}
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
-
-
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ {{ post?.user?.username | splitInitials }}
-
-
-
- {{ post?.timestamp | date}}
-
-
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+
-
+
-
+
Trending tags
+
+
+
-
- {{tag.value}}
- {{tag.score}}
-
+ [ngStyle]="{'background-image':'linear-gradient(to right, #ECECEC, #ECECEC ' + ((tag.score / max) *100 ) + '%, #FFF 24px)'}" (click)="getAllDiscussions(tag)"> -->
+
+ {{tag.value}}
+
+
-
+
-
+
Updates
-
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
-
-
- ALL UPDATES
-
+
+ ALL UPDATES
+
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/projects/discussion-ui/src/lib/components/trending-tags/trending-tags.component.scss b/projects/discussion-ui/src/lib/components/trending-tags/trending-tags.component.scss
index ec9418ad..4d2c41b1 100644
--- a/projects/discussion-ui/src/lib/components/trending-tags/trending-tags.component.scss
+++ b/projects/discussion-ui/src/lib/components/trending-tags/trending-tags.component.scss
@@ -1,31 +1,49 @@
@import '../../../../assets/styles/global.scss';
+.tag_title_box {
+ width: 100%;
+ display: block;
+}
-.tag {
- display: flex;
- width: 276px;
- height: 32px;
- border-radius: 4px;
- justify-content: space-between;
- // margin: $size-m 0;
- margin:10px 0;
- // background-color: red;
- align-items: center;
- box-sizing: border-box;
-
- @include breakpoint-xs {
- width: auto;
+.right_tag_inner_box {
+ width: 100%;
+}
- }
+.tag_score_box {
+ height: 22px;
+ width: 22px;
+ border-radius: 100%;
+ background-color: #e9e8d9;
+ display: inline-block;
+ .tag_text {
+ font: 400 10px/22px Lato;
+ }
+}
- @include breakpoint-s {
+.tag {
+ // display: flex;
+ // width: 276px;
+ // height: 32px;
+ display: inline-block;
+ border-radius: 100px 4px 4px 100px;
+ padding: 4px 6px 4px 0px;
width: auto;
-
- }
+ justify-content: space-between;
+ // margin: $size-m 0;
+ margin: 0px 8px 8px 0px;
+ background-color: rgba(0, 0, 0, 0.04);
+ border: 1px solid rgba(0, 0, 0, 0.08);
+ box-sizing: border-box;
+ @include breakpoint-xs {
+ width: auto;
+ }
+ @include breakpoint-s {
+ width: auto;
+ }
}
.custom-margin {
- margin-top: auto !important;
- margin-bottom: auto !important;
+ margin-top: auto !important;
+ margin-bottom: auto !important;
}
// .progress {
@@ -34,7 +52,6 @@
// /* (height of inner div) / 2 + padding */
// // padding: 3px;
// }
-
// .progress::after {
// content: '';
// position: fixed;
@@ -43,56 +60,43 @@
// left: 50%;
// background: #116699
// }
-
-
@media (max-width: 768px) {
- .right_tag_inner_box {
- width: 100%;
- margin-left: 0!important;
- }
+ .right_tag_inner_box {
+ width: 100%;
+ margin-left: 0!important;
+ }
}
-
.update_box {
- box-sizing: border-box;
- margin-top: 32px;
- display: none;
-
- .update_inner_box {
box-sizing: border-box;
- margin-top: 16px;
-
- .update_card {
- box-sizing: border-box;
-
- .card_head {
-
- p.blue_heading {
- color: #0074b6;
- margin-bottom: 8px;
+ margin-top: 32px;
+ display: none;
+ .update_inner_box {
+ box-sizing: border-box;
+ margin-top: 16px;
+ .update_card {
+ box-sizing: border-box;
+ .card_head {
+ p.blue_heading {
+ color: #0074b6;
+ margin-bottom: 8px;
+ }
+ }
+ // .card_body {
+ // width: 100%;
+ // }
+ }
+ .update_btn_box {
+ width: 100%;
+ margin-top: 8px;
+ a.all_update_link {
+ width: 100%;
+ padding: 10px 0;
+ text-align: center;
+ color: #0074b6;
+ border-radius: 4px 4px;
+ border: 1px solid rgba(0, 0, 0, 0.16);
+ }
}
- }
-
- // .card_body {
- // width: 100%;
- // }
-
-
- }
-
- .update_btn_box {
- width: 100%;
- margin-top: 8px;
-
- a.all_update_link {
- width: 100%;
- padding: 10px 0;
- text-align: center;
- color: #0074b6;
- border-radius: 4px 4px;
- border: 1px solid rgba(0, 0, 0, 0.16);
- }
}
-
- }
}
\ No newline at end of file
diff --git a/projects/discussion-ui/src/lib/elements/category-card/category-card.component.html b/projects/discussion-ui/src/lib/elements/category-card/category-card.component.html
index a61f5bbf..ad0a386f 100644
--- a/projects/discussion-ui/src/lib/elements/category-card/category-card.component.html
+++ b/projects/discussion-ui/src/lib/elements/category-card/category-card.component.html
@@ -1,21 +1,21 @@
-
-
- 
+
+
+ 
+
+
+
+
+
-
-
-
+
+
+ {{category.totalTopicCount}} discussions
+ {{category.totalPostCount}} posts
+
+ 
-
-
-
-
-
- 789 views
- {{category.totalTopicCount}} discussions
- {{category.totalPostCount}} posts
-
- 
\ No newline at end of file
diff --git a/projects/discussion-ui/src/lib/elements/category-card/category-card.component.scss b/projects/discussion-ui/src/lib/elements/category-card/category-card.component.scss
index 2aa96490..d1e345d2 100644
--- a/projects/discussion-ui/src/lib/elements/category-card/category-card.component.scss
+++ b/projects/discussion-ui/src/lib/elements/category-card/category-card.component.scss
@@ -11,16 +11,13 @@
width: auto;
padding: 1rem;
z-index: 2;
-
@media (max-width: 768px) {
z-index: 1;
}
-
.category-card-header {
display: flex;
flex-direction: row;
align-items: center;
-
.catergory-card-header-image {
// border: 1px solid #fed7d7;
border-radius: 50%;
@@ -28,7 +25,6 @@
width: 100%;
height: 50px;
position: relative;
-
.category-card-img {
position: absolute;
top: 3px;
@@ -38,7 +34,6 @@
vertical-align: middle;
}
}
-
.category-card-text {
margin-left: 1rem;
}
@@ -57,7 +52,6 @@
font-weight: 700 !important;
}
}
-
.category-card-header-text {
color: #5f5f5f !important;
/* autoprefixer: off */
@@ -71,37 +65,36 @@
font-size: 14px;
margin: 0.5rem 0;
}
-
.category-card-main {
display: flex;
justify-content: space-between;
align-items: center;
-
.category-card-main-content {
display: flex;
justify-content: space-between;
align-items: center;
color: rgba(0, 0, 0, .6);
-
+ img.view_image {
+ height: 20px;
+ width: 20px;
+ margin-right: 10px;
+ }
.post-label {
margin-left: 16px;
font-size: 14px;
font-weight: 700 !important;
font-family: inherit;
}
-
.discussion-label {
font-size: 14px;
font-weight: 700 !important;
font-family: inherit;
-
// .trend_icon {
// margin-right: 4px;
// color: rgba(0, 0, 0, .6);
// }
}
}
-
.eye-icon {
background-repeat: no-repeat;
display: inline-block;
diff --git a/projects/discussion-ui/src/lib/elements/discuss-card/discuss-card.component.html b/projects/discussion-ui/src/lib/elements/discuss-card/discuss-card.component.html
index 92df9c9f..b19a90bf 100644
--- a/projects/discussion-ui/src/lib/elements/discuss-card/discuss-card.component.html
+++ b/projects/discussion-ui/src/lib/elements/discuss-card/discuss-card.component.html
@@ -1,58 +1,56 @@
-
-
-
-
+
+
+ {{ discussionData?.user?.username | splitInitials }}
-
- {{discussionData?.user?.username}}
- {{'Anonymous'}}
- {{discussionData.lastposttime | date}}
+
+ {{discussionData?.user?.username}}
+ {{'Anonymous'}}
+ {{discussionData.lastposttime | date}}
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
{{discussionData.category.name}}
-
-
+
+
-
-
-
-
- {{tag.value}}
-
-
-
-
-
-
- 
+
+
+
+
+ {{tag.value}}
+
+
+
+
+
+
+ 
{{(discussionData.upvotes + discussionData.downvotes) || 0 }} Votes
-
-
- 
+
+
+ 
{{discussionData.viewcount || 0}} Views
-
+
+
+ {{((discussionData.postcount || 1) -1) }} comment
+ {{((discussionData.postcount || 1) -1) }} comments
- {{((discussionData.postcount || 1) -1) }} comment
- {{((discussionData.postcount || 1) -1) }} comments
-
\ No newline at end of file
diff --git a/projects/discussion-ui/src/lib/elements/discuss-card/discuss-card.component.scss b/projects/discussion-ui/src/lib/elements/discuss-card/discuss-card.component.scss
index 744cb4ba..62d4ee5d 100644
--- a/projects/discussion-ui/src/lib/elements/discuss-card/discuss-card.component.scss
+++ b/projects/discussion-ui/src/lib/elements/discuss-card/discuss-card.component.scss
@@ -4,13 +4,11 @@
cursor: pointer;
font-size: 16px;
font-weight: 700;
-
}
.discuss-card-label {
color: #0074b6;
display: flex;
-
img {
width: 20px;
margin-right: 0.5rem;
@@ -29,46 +27,37 @@
justify-content: space-between;
font-size: 14px;
flex-wrap: wrap;
-
.discuss-comments-area {
display: -webkit-box;
font-weight: 700;
font-size: 0.75rem;
-
.views-content {
margin-left: 1.5rem;
display: flex;
align-items: center;
-
html[dir="rtl"] & {
margin-right: 1.5rem;
-
}
}
-
.votes-content {
display: flex;
align-items: center;
}
-
.votes-content img,
.views-content img {
// height: 24px;
// width: 24px;
- height: 15px;
+ height: 20px;
width: 20px;
}
-
.votes-content span,
.views-content span {
margin-left: 10px;
-
html[dir="rtl"] & {
margin-right: 0.5rem;
}
}
}
-
.comments-count {
// color: #0074b6;
font-weight: 700;
@@ -78,11 +67,11 @@
.discuss-card-header {
.user_name_div {
- margin-bottom: 10px;
+ margin-bottom: 12px;
.circle-text {
border-radius: 4px;
- width: 28px;
- height: 28px;
+ width: 24px;
+ height: 24px;
// display: flex;
display: inline-block;
justify-content: center;
@@ -91,24 +80,24 @@
color: #fff;
text-align: center;
font-weight: 600;
- line-height: 28px;
+ line-height: 20px;
vertical-align: middle;
+ .circle-label {
+ font: 400 10px/12px Lato;
+ }
}
-
.post_user_text_box {
margin-left: 10px;
display: inline-block;
vertical-align: middle;
width: calc(100% - 42px);
- .discuss-user-label{
-
- // color: rbga(0, 0, 0, 0.6)!important;
- color: rgba(0, 0, 0, 0.6)!important;
- }
+ font: 400 14px/21px Lato;
+ color: rgba(0, 0, 0, 0.6)!important;
+ // .discuss-user-label {
+ // color: rgba(0, 0, 0, 0.6)!important;
+ // }
}
-
}
-
.discuss_main_text_box {
white-space: inherit;
word-break: break-all;
@@ -119,7 +108,7 @@
.discuss-card-content {
z-index: 1!important;
- }
+}
.dot {
height: 6px;
@@ -130,14 +119,23 @@
margin: 0 1rem;
}
-.timing {
- color: #858181;
- margin-left: 1rem;
- font-size: 14px;
+.post_tag {
+ display: inline-block;
+ border-radius: 100px 4px 4px 100px;
+ padding: 4px 12px 4px 12px;
+ width: auto;
+ justify-content: space-between;
+ background-color: rgba(0, 0, 0, .04);
+ border: 1px solid rgba(0, 0, 0, .08);
+ box-sizing: border-box;
+}
+.timing {
+ // color: #858181;
+ margin-left: 10px;
+ // font-size: 14px;
html[dir="rtl"] & {
margin-right: 1rem;
-
}
}
@@ -145,9 +143,8 @@
.discuss-card-header {
.user_name_div {
.post_user_text_box {
-
- .discuss-user-label{
- margin-left: 0;
+ .discuss-user-label {
+ margin-left: 0;
vertical-align: top;
line-height: 1;
}
@@ -155,10 +152,9 @@
display: block;
margin: 0;
line-height: 1;
- padding:0;
+ padding: 0;
}
}
}
}
-
-}
+}
\ No newline at end of file
diff --git a/projects/discussion-ui/src/lib/elements/related-discussion/related-discussion.component.html b/projects/discussion-ui/src/lib/elements/related-discussion/related-discussion.component.html
index ff585f0c..04fbfbbb 100644
--- a/projects/discussion-ui/src/lib/elements/related-discussion/related-discussion.component.html
+++ b/projects/discussion-ui/src/lib/elements/related-discussion/related-discussion.component.html
@@ -1,8 +1,7 @@
-
-
+
+
@@ -11,8 +10,8 @@
-
-
+
+
{{ discussion.timestamp | pipeRelativeTime }}
diff --git a/projects/discussion-ui/src/lib/elements/related-discussion/related-discussion.component.scss b/projects/discussion-ui/src/lib/elements/related-discussion/related-discussion.component.scss
index 13a3a877..e6415087 100644
--- a/projects/discussion-ui/src/lib/elements/related-discussion/related-discussion.component.scss
+++ b/projects/discussion-ui/src/lib/elements/related-discussion/related-discussion.component.scss
@@ -1,30 +1,27 @@
.related-discuss-card {
- padding: 1rem;
- display: flex;
+ padding: 1.5rem;
border-radius: 4px;
- box-shadow: 0 2px 1px -1px rgba(0,0,0,.2), 0 1px 1px 0 rgba(0,0,0,.14), 0 1px 3px 0 rgba(0,0,0,.12);
+ box-shadow: 0 2px 1px -1px rgba(0, 0, 0, .2), 0 1px 1px 0 rgba(0, 0, 0, .14), 0 1px 3px 0 rgba(0, 0, 0, .12);
background: var(--white);
- margin-bottom: 16px;
- flex-direction: column;
- max-width: 300px;
- @media (max-width: 768px) {
- max-width: 100%;
- }
+ max-width: 300px;
+ @media (max-width: 768px) {
+ max-width: 100%;
+ }
}
-.related-discuss-label{
+.related-discuss-label {
font-weight: bold;
- margin: 0 0 1rem 0;
+ margin: 0 0 1rem 0;
color: #000;
font-size: .875rem;
font-weight: 700;
- @media (max-width: 768px) {
- margin: 1rem 0;
- }
+ @media (max-width: 768px) {
+ margin: 1rem 0;
+ }
}
.related-discuss-card-content {
- margin: 0;
+ margin: 0;
color: #000;
cursor: pointer;
font-size: 0.875rem;
@@ -34,32 +31,33 @@
}
.related-discuss-card-description {
- display: flex;
+ display: flex;
-webkit-box-align: center;
align-items: center;
font-size: 0.875rem;
- flex-wrap: wrap;
+ flex-wrap: wrap;
margin-top: 8px;
}
.separator-dot {
- display: inline-block;
+ display: inline-block;
height: 6px;
width: 6px;
border-radius: 50%;
- background-color: rgba(0,0,0,.4);
- margin:0 8px;
+ background-color: rgba(0, 0, 0, .4);
+ margin: 0 8px;
}
.time {
- color: rgba(0, 0, 0, 0.4);
+ color: rgba(0, 0, 0, 0.4);
}
.category_text img.category_img {
width: 20px;
display: inline-block;
vertical-align: middle;
-}
+}
+
.category_text .category-name {
display: inline-block;
}
\ No newline at end of file
From 498b400e50a387c0a5ee36757a7dd0b0b77bf660 Mon Sep 17 00:00:00 2001
From: arunpilli21
Date: Wed, 10 Nov 2021 14:52:01 +0530
Subject: [PATCH 07/11] fixes for df bug
---
.../src/lib/components/discuss-all/discuss-all.component.ts | 2 +-
.../discussion-details/discussion-details.component.html | 2 +-
.../discussion-details/discussion-details.component.ts | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/projects/discussion-ui/src/lib/components/discuss-all/discuss-all.component.ts b/projects/discussion-ui/src/lib/components/discuss-all/discuss-all.component.ts
index 1b034e07..bfc2a11d 100644
--- a/projects/discussion-ui/src/lib/components/discuss-all/discuss-all.component.ts
+++ b/projects/discussion-ui/src/lib/components/discuss-all/discuss-all.component.ts
@@ -124,7 +124,7 @@ export class DiscussAllComponent implements OnInit {
// tslint:disable-next-line: max-line-length
const input = { data: { url: `${this.configService.getRouterSlug()}${CONSTANTS.ROUTES.TOPIC}${slug}`, queryParams: {} }, action: CONSTANTS.CATEGORY_DETAILS, }
this.navigationService.navigate(input);
- this.stateChange.emit({ action: CONSTANTS.CATEGORY_DETAILS, title: discussionData.title, tid: discussionData.tid });
+ this.stateChange.emit({ action: CONSTANTS.CATEGORY_DETAILS, title: discussionData.title, tid: discussionData.tid, cId: this.cIds });
// this.router.navigate([`${this.configService.getRouterSlug()}${CONSTANTS.ROUTES.TOPIC}${slug}`], { queryParamsHandling: "merge" });
}
diff --git a/projects/discussion-ui/src/lib/components/discussion-details/discussion-details.component.html b/projects/discussion-ui/src/lib/components/discussion-details/discussion-details.component.html
index 86c134d6..4a198014 100644
--- a/projects/discussion-ui/src/lib/components/discussion-details/discussion-details.component.html
+++ b/projects/discussion-ui/src/lib/components/discussion-details/discussion-details.component.html
@@ -372,5 +372,5 @@
- = new EventEmitter();
From b542c92fa9accc3655a046b41dcc586008658750 Mon Sep 17 00:00:00 2001
From: nitin raj
Date: Fri, 12 Nov 2021 15:00:20 +0530
Subject: [PATCH 08/11] changes in discussion ui as per latest sketch
---
.../discuss-category.component.html | 44 +++++++++----------
.../discuss-home/discuss-home.component.scss | 3 ++
.../discuss-tags/discuss-tags.component.scss | 2 +-
.../my-discussion.component.scss | 28 +++++-------
.../trending-tags.component.html | 2 +
.../trending-tags.component.scss | 2 +-
.../discuss-card/discuss-card.component.scss | 2 +
7 files changed, 43 insertions(+), 40 deletions(-)
diff --git a/projects/discussion-ui/src/lib/components/discuss-category/discuss-category.component.html b/projects/discussion-ui/src/lib/components/discuss-category/discuss-category.component.html
index c37a126d..e526439b 100644
--- a/projects/discussion-ui/src/lib/components/discuss-category/discuss-category.component.html
+++ b/projects/discussion-ui/src/lib/components/discuss-category/discuss-category.component.html
@@ -1,28 +1,28 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
All
-
- Watching
-
-
+
+ Watching
+
+
+
-
- Start discussion
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
+
+
Updates
diff --git a/projects/discussion-ui/src/lib/components/trending-tags/trending-tags.component.scss b/projects/discussion-ui/src/lib/components/trending-tags/trending-tags.component.scss
index 4d2c41b1..ca3c3882 100644
--- a/projects/discussion-ui/src/lib/components/trending-tags/trending-tags.component.scss
+++ b/projects/discussion-ui/src/lib/components/trending-tags/trending-tags.component.scss
@@ -12,7 +12,7 @@
height: 22px;
width: 22px;
border-radius: 100%;
- background-color: #e9e8d9;
+ background-color: #E9D9CC;
display: inline-block;
.tag_text {
font: 400 10px/22px Lato;
diff --git a/projects/discussion-ui/src/lib/elements/discuss-card/discuss-card.component.scss b/projects/discussion-ui/src/lib/elements/discuss-card/discuss-card.component.scss
index 62d4ee5d..3f5e2d99 100644
--- a/projects/discussion-ui/src/lib/elements/discuss-card/discuss-card.component.scss
+++ b/projects/discussion-ui/src/lib/elements/discuss-card/discuss-card.component.scss
@@ -82,6 +82,7 @@
font-weight: 600;
line-height: 20px;
vertical-align: middle;
+ text-transform: uppercase;
.circle-label {
font: 400 10px/12px Lato;
}
@@ -93,6 +94,7 @@
width: calc(100% - 42px);
font: 400 14px/21px Lato;
color: rgba(0, 0, 0, 0.6)!important;
+ text-transform: capitalize;
// .discuss-user-label {
// color: rgba(0, 0, 0, 0.6)!important;
// }
From 71dbbe108db6acbc9c341d2b2cb7f41ecafbe811 Mon Sep 17 00:00:00 2001
From: nitin raj
Date: Mon, 15 Nov 2021 15:49:06 +0530
Subject: [PATCH 09/11] tranding tags fixed
---
.../discuss-category.component.ts | 14 ++
.../discuss-home/discuss-home.component.html | 63 +++++---
.../discuss-home/discuss-home.component.scss | 14 ++
.../discuss-home/discuss-home.component.ts | 17 ++
.../my-discussion.component.html | 146 +++++++++---------
.../my-discussion.component.scss | 6 +
.../side-pannel/side-pannel.component.html | 37 ++---
.../category-card.component.html | 2 +-
8 files changed, 178 insertions(+), 121 deletions(-)
diff --git a/projects/discussion-ui/src/lib/components/discuss-category/discuss-category.component.ts b/projects/discussion-ui/src/lib/components/discuss-category/discuss-category.component.ts
index 9bedf100..f0adb4f8 100644
--- a/projects/discussion-ui/src/lib/components/discuss-category/discuss-category.component.ts
+++ b/projects/discussion-ui/src/lib/components/discuss-category/discuss-category.component.ts
@@ -19,6 +19,8 @@ import { NavigationServiceService } from '../../navigation-service.service';
})
export class DiscussCategoryComponent implements OnInit, OnDestroy {
+
+
categories: NSDiscussData.ICategorie[] = [];
forumIds: any;
@@ -34,6 +36,8 @@ export class DiscussCategoryComponent implements OnInit, OnDestroy {
categoryId: any;
+ trendingTags: any;
+
paramsSubscription: Subscription;
showLoader = false;
@@ -45,13 +49,18 @@ export class DiscussCategoryComponent implements OnInit, OnDestroy {
public activatedRoute: ActivatedRoute,
private telemetryUtils: TelemetryUtilsService,
private navigationService: NavigationServiceService
+
) { }
ngOnInit() {
/** It will look for the queryParams, if back button is clicked,
* the queryParams will change and it will fetch the categories
* if there is no queryParams available, then it will fetch the default categories of the forumIds
+ *
+ *
*/
+
+
this.telemetryUtils.setContext([]);
this.telemetryUtils.logImpression(NSDiscussData.IPageName.CATEGORY);
this.forumIds = this.categoryIds ? this.categoryIds : this.discussService.forumIds;
@@ -67,6 +76,7 @@ export class DiscussCategoryComponent implements OnInit, OnDestroy {
}
}
});
+
}
fetchAllAvailableCategories(ids) {
@@ -99,6 +109,10 @@ export class DiscussCategoryComponent implements OnInit, OnDestroy {
return this.discussService.fetchSingleCategoryDetails(cid);
}
+
+
+
+
/**
* It will fetch the children for each category click.
* if there is no children available the it will redirect to the topic list page
diff --git a/projects/discussion-ui/src/lib/components/discuss-home/discuss-home.component.html b/projects/discussion-ui/src/lib/components/discuss-home/discuss-home.component.html
index da94cefe..d5277bf8 100644
--- a/projects/discussion-ui/src/lib/components/discuss-home/discuss-home.component.html
+++ b/projects/discussion-ui/src/lib/components/discuss-home/discuss-home.component.html
@@ -1,33 +1,46 @@
-
-
-
- 
-
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+ No Data
+
+
+
+
+
+
+
+
-
-
-
-
-
-
- No Data
-
-
-
+
+
-
-
-
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/projects/discussion-ui/src/lib/components/discuss-home/discuss-home.component.scss b/projects/discussion-ui/src/lib/components/discuss-home/discuss-home.component.scss
index 995a57f3..aa0e7ac0 100644
--- a/projects/discussion-ui/src/lib/components/discuss-home/discuss-home.component.scss
+++ b/projects/discussion-ui/src/lib/components/discuss-home/discuss-home.component.scss
@@ -19,6 +19,20 @@
overflow-y: scroll;
}
+.category_main_box {
+ width: 685px;
+ @media screen and (max-width: 992px) {
+ width: 100%;
+ }
+}
+
+.right_tag_box {
+ width: 275px;
+ @media screen and (max-width: 992px) {
+ width: 100%;
+ }
+}
+
.discuss-card-content {
z-index: 1!important;
}
diff --git a/projects/discussion-ui/src/lib/components/discuss-home/discuss-home.component.ts b/projects/discussion-ui/src/lib/components/discuss-home/discuss-home.component.ts
index 5c7fbe21..3cf45f18 100644
--- a/projects/discussion-ui/src/lib/components/discuss-home/discuss-home.component.ts
+++ b/projects/discussion-ui/src/lib/components/discuss-home/discuss-home.component.ts
@@ -39,6 +39,7 @@ export class DiscussHomeComponent implements OnInit {
pageSize: number;
totalTopics: number;
title: any;
+ trendingTags: any;
constructor(
public router: Router,
@@ -62,6 +63,8 @@ export class DiscussHomeComponent implements OnInit {
// this.getDiscussionList(_.get(this.routeParams, 'slug'));
});
+ this.fetchAllTags();
+
}
navigateToDiscussionDetails(discussionData) {
@@ -85,6 +88,7 @@ export class DiscussHomeComponent implements OnInit {
*/
getDiscussionList(slug: string) {
this.showLoader = true;
+
// TODO : this.currentActivePage shoulb be dynamic when pagination will be implemented
this.discussionService.getContextBasedTopic(slug, this.currentActivePage).subscribe(data => {
this.showLoader = false;
@@ -119,6 +123,19 @@ export class DiscussHomeComponent implements OnInit {
this.showStartDiscussionModal = false;
}
+ fetchAllTags() {
+ this.showLoader = true;
+ this.discussionService.fetchAllTag().subscribe(data => {
+ this.showLoader = false;
+ this.trendingTags = _.get(data, 'tags');
+ }, error => {
+ this.showLoader = false;
+ // TODO: toaster
+ console.log('error fetching tags');
+ });
+ }
+
+
/**
* @description - call the topic get api when scrolled down
*/
diff --git a/projects/discussion-ui/src/lib/components/my-discussion/my-discussion.component.html b/projects/discussion-ui/src/lib/components/my-discussion/my-discussion.component.html
index 47b910b8..7663d5f6 100644
--- a/projects/discussion-ui/src/lib/components/my-discussion/my-discussion.component.html
+++ b/projects/discussion-ui/src/lib/components/my-discussion/my-discussion.component.html
@@ -2,98 +2,94 @@
-
-
- {{ data?.username | splitInitials }}
-
-
-
-
-
-
- {{data?.department}}
- {{data?.location}}
- {{data?.email || data?.username}}
-
-
-
-
-
-
-
-
-
-
+
+
+ {{ data?.username | splitInitials }}
+
+
+
+
+
+
+ {{data?.department}}
+ {{data?.location}}
+ {{data?.email || data?.username}}
+
+
+
+
+
+
+
+
+
+
{{data?.topiccount || 0 }}
- Discussions
-
-
+ Discussions
+
+
{{data?.postcount || 0 }}
- Posts
-
-
+ Posts
+
+
45
- Profile views
-
-
+ Profile views
+
+
-
-
+
+
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
Recent posts
-
- Best posts
-
+ Best posts
+
Saved posts
-
-
+
Upvoted
-
+
Downvoted
+
+
-
-
-
-
-
-
-
-
-
-
- No Data
-
-
-
+
+
+
+
+
-
+
+
+ No Data
+
+
+
+
+
\ No newline at end of file
diff --git a/projects/discussion-ui/src/lib/components/my-discussion/my-discussion.component.scss b/projects/discussion-ui/src/lib/components/my-discussion/my-discussion.component.scss
index 86666492..738ccc9a 100644
--- a/projects/discussion-ui/src/lib/components/my-discussion/my-discussion.component.scss
+++ b/projects/discussion-ui/src/lib/components/my-discussion/my-discussion.component.scss
@@ -13,6 +13,12 @@
width: 96.5%;
}
+img.karma_img {
+ height: 21px;
+ width: 21px;
+ vertical-align: bottom;
+}
+
.profilecard-content {
display: flex;
flex-wrap: wrap;
diff --git a/projects/discussion-ui/src/lib/components/side-pannel/side-pannel.component.html b/projects/discussion-ui/src/lib/components/side-pannel/side-pannel.component.html
index 17d53c96..65a78939 100644
--- a/projects/discussion-ui/src/lib/components/side-pannel/side-pannel.component.html
+++ b/projects/discussion-ui/src/lib/components/side-pannel/side-pannel.component.html
@@ -1,25 +1,22 @@
-
- ×
-
-
-
-
-
-
+
+ ×
+
+
+
+
\ No newline at end of file
diff --git a/projects/discussion-ui/src/lib/elements/category-card/category-card.component.html b/projects/discussion-ui/src/lib/elements/category-card/category-card.component.html
index ad0a386f..3e4b8037 100644
--- a/projects/discussion-ui/src/lib/elements/category-card/category-card.component.html
+++ b/projects/discussion-ui/src/lib/elements/category-card/category-card.component.html
@@ -16,6 +16,6 @@
{{category.totalTopicCount}} discussions
{{category.totalPostCount}} posts
- 
\ No newline at end of file
From a305a66a9fcfcff25dbad7fe59d7f4d3d68263b3 Mon Sep 17 00:00:00 2001
From: arunpilli21
Date: Wed, 17 Nov 2021 16:16:54 +0530
Subject: [PATCH 10/11] telemtry changes
---
.../discussion-routing/discussion-routing.module.ts | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/projects/discussion-ui/src/lib/discussion-routing/discussion-routing.module.ts b/projects/discussion-ui/src/lib/discussion-routing/discussion-routing.module.ts
index 909531c8..b8878e18 100644
--- a/projects/discussion-ui/src/lib/discussion-routing/discussion-routing.module.ts
+++ b/projects/discussion-ui/src/lib/discussion-routing/discussion-routing.module.ts
@@ -50,12 +50,20 @@ const routes: Routes = [
{
path: 'category/:slug',
pathMatch: 'full',
- component: DiscussHomeComponent
+ component: DiscussHomeComponent,
+ data: {
+ pageId: 'catergory/:categoryId',
+ module: 'Discuss',
+ }
},
{
path: 'topic/:topicId/:slug',
pathMatch: 'full',
- component: DiscussionDetailsComponent
+ component: DiscussionDetailsComponent,
+ data: {
+ pageId: 'topic/:topicId/:topicSlug',
+ module: 'Discuss',
+ }
}
]
},
From e770500e8c5d4ebf087faa0a3b5ef3cb417ba100 Mon Sep 17 00:00:00 2001
From: nitin raj
Date: Tue, 21 Dec 2021 11:16:13 +0530
Subject: [PATCH 11/11] changes in discussion hub as per UI
---
.../discuss-home/discuss-home.component.scss | 2 +-
.../lib-entry/lib-entry.component.scss | 5 +
.../my-discussion.component.html | 16 +--
.../side-pannel/side-pannel.component.html | 2 +-
.../tag-all-discussion.component.html | 40 ++++++-
.../tag-all-discussion.component.scss | 34 +++++-
.../tag-all-discussion.component.ts | 100 ++++++++++++++++++
7 files changed, 185 insertions(+), 14 deletions(-)
diff --git a/projects/discussion-ui/src/lib/components/discuss-home/discuss-home.component.scss b/projects/discussion-ui/src/lib/components/discuss-home/discuss-home.component.scss
index 6152a33b..e1bfc39f 100644
--- a/projects/discussion-ui/src/lib/components/discuss-home/discuss-home.component.scss
+++ b/projects/discussion-ui/src/lib/components/discuss-home/discuss-home.component.scss
@@ -4,7 +4,7 @@
// font-weight: bold;
border: none;
border-radius: .25rem;
- background: var(--blue);
+ background: #0074B6;
color: var(--white);
// padding: 0.5rem 0.75rem;
// font-size: .75rem;
diff --git a/projects/discussion-ui/src/lib/components/lib-entry/lib-entry.component.scss b/projects/discussion-ui/src/lib/components/lib-entry/lib-entry.component.scss
index ead7657b..d0d77e32 100644
--- a/projects/discussion-ui/src/lib/components/lib-entry/lib-entry.component.scss
+++ b/projects/discussion-ui/src/lib/components/lib-entry/lib-entry.component.scss
@@ -91,6 +91,11 @@ s
width:100%;
}
+lib-lib-entry {
+ overflow: hidden!important;
+ width:100%;
+}
+
@media (max-width: 992px) {
.discussion-forum {
padding: 0 0px;
diff --git a/projects/discussion-ui/src/lib/components/my-discussion/my-discussion.component.html b/projects/discussion-ui/src/lib/components/my-discussion/my-discussion.component.html
index 7663d5f6..c6af8d12 100644
--- a/projects/discussion-ui/src/lib/components/my-discussion/my-discussion.component.html
+++ b/projects/discussion-ui/src/lib/components/my-discussion/my-discussion.component.html
@@ -16,9 +16,9 @@
{{data?.email || data?.username}}
-
+
@@ -34,15 +34,15 @@
{{data?.postcount || 0 }}
Posts
-
- 45
- Profile views
-
+
-
+
diff --git a/projects/discussion-ui/src/lib/components/side-pannel/side-pannel.component.html b/projects/discussion-ui/src/lib/components/side-pannel/side-pannel.component.html
index 65a78939..d3a4c37c 100644
--- a/projects/discussion-ui/src/lib/components/side-pannel/side-pannel.component.html
+++ b/projects/discussion-ui/src/lib/components/side-pannel/side-pannel.component.html
@@ -14,7 +14,7 @@
All discussions
Categories
Tags
- Leaderboard
+
My discussions
diff --git a/projects/discussion-ui/src/lib/components/tag-all-discussion/tag-all-discussion.component.html b/projects/discussion-ui/src/lib/components/tag-all-discussion/tag-all-discussion.component.html
index 5a3a43da..b962f637 100644
--- a/projects/discussion-ui/src/lib/components/tag-all-discussion/tag-all-discussion.component.html
+++ b/projects/discussion-ui/src/lib/components/tag-all-discussion/tag-all-discussion.component.html
@@ -1,11 +1,45 @@
+
+
+
+
+
+
-
-
+
+
-
+
+
+
diff --git a/projects/discussion-ui/src/lib/components/tag-all-discussion/tag-all-discussion.component.scss b/projects/discussion-ui/src/lib/components/tag-all-discussion/tag-all-discussion.component.scss
index 3a0d631a..a543c991 100644
--- a/projects/discussion-ui/src/lib/components/tag-all-discussion/tag-all-discussion.component.scss
+++ b/projects/discussion-ui/src/lib/components/tag-all-discussion/tag-all-discussion.component.scss
@@ -12,4 +12,36 @@
.discuss-card-content {
z-index: 1!important;
- }
\ No newline at end of file
+ }
+
+.tag_header_box {
+ width: 100%;
+ height: 180px;
+ background-color: #fff;
+ padding: 1.5rem;
+ border-radius: 4px;
+ background-image: url(assets/images/banners/category_header.svg);
+ background-position: center;
+ background-size: cover;
+ box-sizing: border-box;
+}
+
+.df-start-btn {
+ outline: 0;
+ border: none;
+ border-radius: 0.25rem;
+ background: #0074b6;
+ color: var(--white);
+ padding: 14px 15px;
+ display: flex;
+ align-items: center;
+ cursor: pointer;
+ margin:0;
+}
+.filter {
+ height: 48px;
+}
+.filter-option {
+ margin:0;
+ margin-right: 8px;
+}
\ No newline at end of file
diff --git a/projects/discussion-ui/src/lib/components/tag-all-discussion/tag-all-discussion.component.ts b/projects/discussion-ui/src/lib/components/tag-all-discussion/tag-all-discussion.component.ts
index f26c2214..e0d4e0bf 100644
--- a/projects/discussion-ui/src/lib/components/tag-all-discussion/tag-all-discussion.component.ts
+++ b/projects/discussion-ui/src/lib/components/tag-all-discussion/tag-all-discussion.component.ts
@@ -35,6 +35,11 @@ export class TagAllDiscussionComponent implements OnInit {
paramsSubscription: Subscription;
getParams: any;
cIds: any;
+ currentFilter = 'recent'
+ showLoader = false;
+ discussionList: any[];
+ allTopics: any;
+ showStartDiscussionModal = false;
constructor(
private route: ActivatedRoute,
@@ -189,4 +194,99 @@ export class TagAllDiscussionComponent implements OnInit {
return { color, 'background-color': bgColor };
}
+ fillrecent(_page?: any) {
+ this.getRecentData(_page)
+ }
+
+ fillPopular(page?: any) {
+ this.showLoader = true;
+ return this.discussService.fetchPopularD(page).subscribe((response: any) => {
+ this.showLoader = false;
+ this.discussionList = [];
+ _.filter(response.topics, (topic) => {
+ if (topic.user.uid !== 0 && topic.cid !== 1 ) {
+ this.discussionList.push(topic);
+ }
+ });
+ // this.discussionList = _.get(response, 'topics')
+ }, error => {
+ this.showLoader = false;
+ // TODO: Toaster
+ console.log('error fetching topic list', error);
+ });
+ }
+
+ filter(key: string | 'recent' | 'popular') {
+ if (key) {
+ this.currentFilter = key;
+ switch (key) {
+ case 'recent':
+ this.cIds.length ? this.getContextData(this.cIds.result) : this.fillrecent()
+ break;
+ case 'popular':
+ this.cIds.length ? this.getContextData(this.cIds.result) : this.fillPopular()
+ break;
+ default:
+ break;
+ }
+ }
+ }
+
+ getContextBasedDiscussion(cid: any) {
+ this.currentFilter === 'recent' ? this.getContextData(cid) : this.getContextData(cid)
+ }
+
+ refreshData(page?: any) {
+ this.currentFilter === 'recent' ? this.getRecentData(page) : this.fillPopular(page)
+ }
+
+
+ getRecentData(page: any) {
+ this.showLoader = true;
+ return this.discussService.fetchRecentD(page).subscribe(
+ (data: any) => {
+ this.showLoader = false;
+ this.discussionList = [];
+ _.filter(data.topics, (topic) => {
+ if (topic.user.uid !== 0 && topic.cid !== 1) {
+ this.discussionList.push(topic);
+ }
+ });
+ }, error => {
+ this.showLoader = false;
+ // TODO: Toaster
+ console.log('error fetching topic list', error);
+ });
+ }
+
+ getContextData(cid: any) {
+ this.showLoader = true;
+ const req = {
+ // request: {
+ cids: cid
+ // }
+ };
+ return this.discussService.getContextBasedDiscussion(req).subscribe(
+ (data: any) => {
+ this.showLoader = false;
+ let result = data.result
+ let res = result.filter((elem) => {
+ return (elem.statusCode !== 404)
+ })
+ this.allTopics = _.map(res, (topic) => topic.topics);
+ this.discussionList = _.flatten(this.allTopics)
+ }, error => {
+ this.showLoader = false;
+ // TODO: Toaster
+ console.log('error fetching topic list', error);
+ });
+ }
+
+
+
+
+
+
+
+
}
{{tag.score}}
+ +{{tag.score}}
+ +1 Upvote on your question
-What is the most reliable and useful source for COVID related ..
+1 Upvote on your question
+What is the most reliable and useful source for COVID related ..
+@sundaramraj answered your question
+@sundaramraj answered your question
+I think the solution to such a problem would be to extensively..
+I think the solution to such a problem would be to extensively..
-1 Upvote on your question
-What is the most reliable and useful source for COVID related ..
+1 Upvote on your question
+What is the most reliable and useful source for COVID related ..
+{{category.description}}
+{{category.description}}
+ +Related discussions
Related
56 Karma
- - -
56 Karma
+ + +Last online 4 minutes ago
+Last online 4 minutes ago
+- -- {{d.label}}
- - Leaderboard
+
+ - {{d.label}}
+
- +-- All discussions
- - Categories
- - Tags
- - Leaderboard
- - My discussions
-
-+- All discussions
+ - Categories
+ - Tags
+ - Leaderboard
+ - My discussions
+
+{{tagName}}
+{{tagName}}