Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Discussion updated #13

Open
wants to merge 14 commits into
base: release-3.8.0-widget-impl
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions projects/discussion-ui/assets/images/Buffer-512.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions projects/discussion-ui/assets/images/swap_vert.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions projects/discussion-ui/assets/images/trending_up.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion projects/discussion-ui/package.json
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -30,6 +32,7 @@ import { TrendingTagsComponent } from './trending-tags/trending-tags.component';
DiscussAllComponent,
TagAllDiscussionComponent,
TrendingTagsComponent,
LeaderBoardComponent,
],
imports: [
CommonModule,
Expand All @@ -39,7 +42,7 @@ import { TrendingTagsComponent } from './trending-tags/trending-tags.component';
ReactiveFormsModule,
TagInputModule,
PipesModule,
InfiniteScrollModule
InfiniteScrollModule,
],
exports: [
SidePannelComponent,
Expand All @@ -53,6 +56,7 @@ import { TrendingTagsComponent } from './trending-tags/trending-tags.component';
DiscussAllComponent,
TagAllDiscussionComponent,
TrendingTagsComponent,
LeaderBoardComponent,
],
providers: [
DiscussionService, ConfigService
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,20 @@

<div class="flex flex-1 custom discussion_outer_box">
<div class="flex flex-3 flex-column discussion_main_box">
<div class="flex flex-1 cursor-pointer margin-fix height-48" (click)="startDiscussion();logTelemetry($event)" data-toggle="modal"
data-target="#myModal" id="start-discussion">
<div class="flex flex-1 cursor-pointer margin-fix height-48" (click)="startDiscussion();logTelemetry($event)" data-toggle="modal" data-target="#myModal" id="start-discussion">
<a href="javascript:void(0)" class="flex flex-1 cursor-pointer margin-fix height-48" i18n-aria-label role="link">
<div
class="flex flex-1 items-center border discuss border-solid discuss-border ws-mat-primary-background-op100 ">
<div class="w-full discuss truncate">
<span class="overflow ml-4 start-btn-hint mb-0 mat-body-1">Ask a question or post an idea</span>
<div class="flex flex-1 items-center border discuss border-solid discuss-border ws-mat-primary-background-op100 ">
<div class="w-full discuss truncate">
<span class="overflow ml-4 start-btn-hint mb-0 mat-body-1">Ask a question or post an idea</span>
</div>
<div class="discuss-home text-white flex items-center justify-center cursor-pointer mat-subheading-2">
Start discussion
</div>
</div>
<div class="discuss-home text-white flex items-center justify-center cursor-pointer mat-subheading-2">
Start discussion
</div>
</div>
<!-- <div class="text-box">Ask a question or post an idea</div>
<!-- <div class="text-box">Ask a question or post an idea</div>
<div class="buton">start discussion</div> -->
</a>
</div>
</div>

<ng-container>
<div class="flex flex-1 flex-row margin-fix tab_margin">
Expand All @@ -30,7 +28,7 @@
' font-medium':currentFilter !== 'recent'}" mat-button (click)="filter('recent')" role="button">Recent</a>
<a href="javascript:void(0)" class="filter-option" [ngClass]="{'tabs-active' : currentFilter === 'popular',
' font-medium':currentFilter !== 'popular'}" mat-button (click)="filter('popular')" role="button">Popular</a>
<a href="javascript:void(0)" class="filter-option watching_link" mat-button role="button">Watching</a>
<a href="javascript:void(0)" class="filter-option watching_link" mat-button role="button">Watching</a>
</div>
<div class="flex items-center">
<a class="all_category_link mat-subheading-2 margin-remove">All categories </a>
Expand All @@ -41,8 +39,7 @@


<ng-container *ngIf="discussionList && discussionList.length > 0">
<div (click)="navigateToDiscussionDetails(data);logTelemetry($event)"
*ngFor="let data of discussionList" id="discuss-card">
<div (click)="navigateToDiscussionDetails(data);logTelemetry($event)" *ngFor="let data of discussionList" id="discuss-card">
<lib-discuss-card [discussionData]="data"></lib-discuss-card>
</div>
</ng-container>
Expand All @@ -59,7 +56,7 @@
<ws-app-pagination [pager]="pager" (changePage)="navigateWithPage($event)"></ws-app-pagination>
</div> -->
</div>
<div *ngIf="!isWidget" class="flex flex-1 right_tag_box" #stickyMenu [class.sticky]="sticky">
<div *ngIf="!isWidget" class="flex flex-1 right_tag_box margin-left-xl" #stickyMenu [class.sticky]="sticky">
<lib-discuss-trending-tags [tags]="trendingTags" (stateChange)="acceptData($event)"></lib-discuss-trending-tags>
</div>
</div>
Expand Down
Loading