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

#1656 group page indicators #1884

Merged
merged 18 commits into from
Feb 17, 2025
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,7 @@ <h4 class="title" translate="MODALS.PRIVACY_POLICY_HEADING"></h4>
<div class="dialog_content">
<div class="dialog_info_wrap">
<div class="dialog_info">
<a class="info_row" target="_blank" [href]="config.termsOfUse">
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M15 12V14L19 11.5L15 9V11H6V12H15Z" fill="#2C3B47" />
</svg>
<span translate="MODALS.PRIVACY_POLICY_LNK_TERMS_OF_USE"></span>
</a>
<a class="info_row" target="_blank" [href]="config.privacyPolicy">
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M15 12V14L19 11.5L15 9V11H6V12H15Z" fill="#2C3B47" />
</svg>

<span translate="MODALS.PRIVACY_POLICY_LNK_PRIVACY_POLICY"></span>
</a>
<terms-links [withStatutLink]="false" />
</div>
</div>
</div>
Expand Down
7 changes: 7 additions & 0 deletions src/app/account/components/profile/profile.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,13 @@
[model]="form.preferences?.showInSearch"
(click)="form.preferences.showInSearch = !form.preferences.showInSearch"></cos-toggle>
</div>

<div class="prefrence_box">
<div class="preference_title bold" translate="VIEWS.ACCOUNT.LBL_LINKS_TITLE"></div>
<div class="preference_description" translate="VIEWS.ACCOUNT.LBL_LINKS_DESCRIPTION"></div>
<terms-links />
</div>

<div class="prefrence_box">
<div class="preference_title bold" translate="VIEWS.ACCOUNT.LBL_DELETE_ACCOUNT"></div>
<div class="preference_description" translate="VIEWS.ACCOUNT.LBL_DELETE_ACCOUNT_DESCRIPTION">
Expand Down
7 changes: 7 additions & 0 deletions src/app/core/components/help/help.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
</svg>
</button>
</div>

<div id="mobile_tour_info_wrap" *ngIf="showTourBox">
<div class="title_wrap">
<div>
Expand All @@ -38,6 +39,7 @@
<div class="description" translate="HELP_WIDGET.EXTRA_INFO_TOUR_DESCRIPTION"></div>
<button (click)="startTour()" class="start_btn" translate="HELP_WIDGET.EXTRA_INFO_TOUR_BTN_START"></button>
</div>

<div class="help_content">
<form id="help_form" *ngIf="(app.showHelp| async)" [formGroup]="helpForm">
<div class="help_form_text_wrap">
Expand Down Expand Up @@ -84,6 +86,11 @@
<!--frame id="help_frame" #helpFrame name="help_frame" *ngIf="(app.showHelp| async)" frameborder="0" [src]="urlSafe"
width="100%"></!--frame-->
</div>

<div class="links_content">
<div class="bold links_content_title" translate="HELP_WIDGET.LINKS_TITLE"></div>
<terms-links />
</div>
</div>

<div id="help_bubble" (click)="toggleHelp();">
Expand Down
14 changes: 13 additions & 1 deletion src/app/core/components/help/help.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,8 @@
border-radius: 4px;
background: var(--color-surfaces);
box-shadow: 0 0 8px 0 #727c84;
overflow-y: auto;
overflow-x: hidden;

@include mixins.mobile {
width: 100%;
Expand Down Expand Up @@ -188,9 +190,19 @@
}
}

.links_content {
padding: 16px;
border-radius: 4px;
background: var(--color-background);
margin-top: 16px;

.links_content_title {
margin-bottom: 16px;
}
}

.help_content {
width: 400px;
height: 100vh;

@include mixins.mobile {
width: 100%;
Expand Down
2 changes: 1 addition & 1 deletion src/app/directives/cos-disabled.directive.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { Directive, Input, ElementRef, SimpleChanges } from '@angular/core';
})
export class CosDisabledDirective {
@Input() cosDisabled!: any;
constructor(private ElementRef: ElementRef) {
constructor(private readonly ElementRef: ElementRef) {
}

ngAfterViewInit(): void {
Expand Down
6 changes: 3 additions & 3 deletions src/app/group/group.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -353,16 +353,16 @@
</div>
<div class="info_number">{{group.members.topics.count.inProgress || 0}}</div>
</div>
<!--div class="info_item">
<div class="info_item">
<div>
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd"
d="M14.0001 7.96667C13.6319 7.96667 13.3334 7.66819 13.3334 7.3C13.3334 6.93181 13.6319 6.63334 14.0001 6.63334H14.6668C15.0349 6.63334 15.3334 6.93181 15.3334 7.3C15.3334 7.66819 15.0349 7.96667 14.6668 7.96667H14.0001ZM13.1647 2.13798C12.9046 1.87789 12.4828 1.87848 12.2234 2.13929L11.9675 2.39667C11.7091 2.65646 11.7097 3.0763 11.9688 3.33536C12.2289 3.59544 12.6507 3.59486 12.9101 3.33405L13.166 3.07666C13.4244 2.81688 13.4238 2.39704 13.1647 2.13798ZM7.33342 1.3C7.33342 1.66819 7.63189 1.96667 8.00008 1.96667C8.36827 1.96667 8.66675 1.66819 8.66675 1.3V0.666667C8.66675 0.298477 8.36827 0 8.00008 0C7.63189 0 7.33342 0.298477 7.33342 0.666667V1.3ZM2.00008 6.63333C2.36827 6.63333 2.66675 6.93181 2.66675 7.3C2.66675 7.66819 2.36827 7.96667 2.00008 7.96667L1.33341 7.96667C0.965224 7.96667 0.666748 7.66819 0.666748 7.3C0.666748 6.93181 0.965225 6.63333 1.33341 6.63333L2.00008 6.63333ZM3.78211 2.13131C3.52347 1.87122 3.10278 1.87064 2.84342 2.13C2.58405 2.38936 2.58464 2.81005 2.84472 3.06869L3.10545 3.32797C3.36411 3.58519 3.78214 3.58461 4.04008 3.32667C4.29803 3.06872 4.29861 2.6507 4.04138 2.39204L3.78211 2.13131ZM3.8409 7.26117C3.8409 4.88191 5.8871 3.19987 8.00097 3.19987C10.1149 3.19987 12.1609 4.88207 12.1609 7.26117C12.1609 8.94158 11.4913 9.89858 10.8812 10.7705C10.4344 11.409 10.0195 12.0019 9.92309 12.7999H6.08309C5.98657 12.0018 5.57085 11.4088 5.1231 10.7702C4.51184 9.89839 3.8409 8.94144 3.8409 7.26117ZM6.08217 14.0819H9.92217V13.4401H6.08217V14.0819ZM6.08217 14.7201H9.92217C9.92217 15.427 9.34909 16.0001 8.64217 16.0001H7.36217C6.65525 16.0001 6.08217 15.427 6.08217 14.7201Z"
fill="#E4B722" />
</svg>
</div>
<div class="info_number">1234</div>
</!--div-->
<div class="info_number">{{group.members.topics.count.ideation || 0}}</div>
</div>
<div class="info_item">
<div>
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
Expand Down
10 changes: 8 additions & 2 deletions src/app/ideation/components/idea/idea-dialog.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -382,15 +382,21 @@
<div class="like_counter_wrap" [innerHTML]="idea.votes.up.count"></div>
</!--button-->
<div class="buttons_wrap">
<div class="tooltip_item" tooltip pos="top" [noIcon]="true" *ngIf="ideation.disableReplies">
<div class="content_description" translate="COMPONENTS.IDEA_DIALOG.TOOLTIP_REPLIES_DISABLED"></div>
</div>
<button class="btn_ghost_reply_idea" *ngIf="!idea.showReplies && idea.replies.count"
id="{{idea.id}}_replies"
[translate]="(wWidth > 560)? 'COMPONENTS.ARGUMENT.LNK_SHOW_REPLIES' : 'COMPONENTS.ARGUMENT.LNK_SHOW_REPLIES_MOBILE'"
[translateParams]="{count: (idea.replies.count)}" (click)="idea.showReplies = !idea.showReplies"></button>
<button class="btn_ghost_reply_idea" *ngIf="idea.showReplies && idea.replies.count"
(click)="idea.showReplies = !idea.showReplies" translate="COMPONENTS.ARGUMENT.LNK_HIDE_REPLIES">
</button>
<button *ngIf="!showReply" [ngClass]="{disabled: idea.deletedAt}" class="btn_small_submit bold"
(click)="showReply = true" translate="COMPONENTS.IDEA_DIALOG.BTN_REPLY"></button>

<button *ngIf="!showReply" [ngClass]="{disabled: idea.deletedAt || ideation.disableReplies}"
class="btn_small_submit bold" (click)="showReply = true">
<span translate="COMPONENTS.IDEA_DIALOG.BTN_REPLY"></span>
</button>
</div>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,7 @@
.buttons_wrap {
display: flex;
gap: 16px;
position: relative;

.btn_ghost_reply_idea {
display: flex;
Expand Down
43 changes: 23 additions & 20 deletions src/app/ideation/components/idea/idea.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import { TopicService } from '@services/topic.service';
import { Folder } from 'src/app/interfaces/folder';
import { DomSanitizer } from '@angular/platform-browser';
import { IdeaReplyComponent } from '../idea-reply/idea-reply.component';
import { TopicIdeationService } from '@services/topic-ideation.service';

@Component({
selector: 'app-idea',
Expand All @@ -24,32 +25,34 @@ export class IdeaComponent {
ideaId: string = '';
topicId: string = '';
ideationId: string = '';
constructor(dialog: DialogService, route: ActivatedRoute, TopicIdeaService: TopicIdeaService, router: Router, TopicService: TopicService) {
constructor(dialog: DialogService, route: ActivatedRoute, TopicIdeaService: TopicIdeaService, router: Router, TopicService: TopicService, TopicIdeationService: TopicIdeationService) {
route.params.pipe(take(1), switchMap((params) => {
this.ideaId = params['ideaId'];
this.topicId = params['topicId'];
this.ideationId = params['ideationId'];

return TopicIdeaService.get({ ideaId: this.ideaId, ideationId: this.ideationId, topicId: this.topicId })
})).subscribe((idea) => {
TopicService.get(this.topicId).pipe(take(1)).subscribe((topic) => {
dialog.closeAll();
const ideaDialog = dialog.open(IdeaDialogComponent, {
data: {
idea,
topic,
ideation: { id: this.ideationId },
route: route
}
});
return combineLatest([
TopicIdeaService.get({ ideaId: this.ideaId, ideationId: this.ideationId, topicId: this.topicId }),
TopicService.get(this.topicId),
TopicIdeationService.get({ topicId: this.topicId, ideationId: this.ideationId })
])
})).subscribe(([idea, topic, ideation]) => {
dialog.closeAll();
const ideaDialog = dialog.open(IdeaDialogComponent, {
data: {
idea,
topic,
ideation,
route: route
}
});

ideaDialog.afterClosed().subscribe((value) => {
if (value) {
TopicIdeaService.reload();
router.navigate(['/', 'topics', this.topicId], { fragment: 'ideation' })
}
});
})
ideaDialog.afterClosed().subscribe((value) => {
if (value) {
TopicIdeaService.reload();
router.navigate(['/', 'topics', this.topicId], { fragment: 'ideation' })
}
});
});
}
}
Expand Down
10 changes: 5 additions & 5 deletions src/app/ideation/components/ideabox/ideabox.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ import { AfterViewInit, Component, Input } from '@angular/core';
import { TranslateService } from '@ngx-translate/core';
import { Router } from '@angular/router';
import { take } from 'rxjs';
import { Idea } from 'src/app/interfaces/idea';
import { Idea } from '@interfaces/idea';
import { AuthService } from '@services/auth.service';
import { ConfigService } from '@services/config.service';
import { TopicIdeaService } from '@services/topic-idea.service';
import { ConfirmDialogComponent } from 'src/app/shared/components/confirm-dialog/confirm-dialog.component';
import { DialogService } from 'src/app/shared/dialog';
import { ConfirmDialogComponent } from '@shared/components/confirm-dialog/confirm-dialog.component';
import { DialogService } from '@shared/dialog';
import { IdeaReportComponent } from '../idea-report/idea-report.component';
import { AddIdeaFolderComponent } from '../add-idea-folder/add-idea-folder.component';
import { IdeaReportReasonComponent } from '../idea-report-reason/idea-report-reason.component';
import { Topic } from 'src/app/interfaces/topic';
import { Ideation } from 'src/app/interfaces/ideation';
import { Topic } from '@interfaces/topic';
import { Ideation } from '@interfaces/ideation';
import { IdeaReactionsComponent } from '../idea-reactions/idea-reactions.component';
import { TopicMemberUserService } from '@services/topic-member-user.service';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -983,6 +983,35 @@
</div>
</div>
</div>
<div class="create_content_section">
<div class="number_wrap mobile_hidden">
<div>3</div>
</div>
<div class="section_content_wrap">
<div class="header_wrap">
<div class="number_wrap mobile_show">
<div>3</div>
</div>
<div class="small_heading" translate="VIEWS.IDEATION_CREATE.SETTINGS_HEADING_ADVANCED_SETTINGS">
</div>
<div class="mobile_hidden" translate="VIEWS.IDEATION_CREATE.SETTINGS_HEADING_ADVANCED_SETTINGS_DESC">
</div>
</div>
<div class="mobile_show" translate="VIEWS.IDEATION_CREATE.SETTINGS_HEADING_IDEATION_DEADLINE_DESC">
</div>
<div class="radio_wrap ideation">
<div class="radio_text_wrap">
<div class="radio_lable_wrap setting_toggle">
<span class="bold" translate="VIEWS.IDEATION_CREATE.LBL_DISABLE_REPLIES" [translateParams]="{value: (ideation.disableReplies ? 'TOGGLE_OFF' : 'TOGGLE_ON') | translate}"></span>
<cos-toggle [(model)]="ideation.disableReplies"></cos-toggle>
</div>
<div class="radio_description">
<span translate="VIEWS.IDEATION_CREATE.LBL_DISABLE_REPLIES_DESC"></span>
</div>
</div>
</div>
</div>
</div>
</ng-container>
<ng-container *ngIf="tabSelected==='preview'">
<div class="topic_content_wrap">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -392,10 +392,19 @@
.radio_wrap {
padding: 16px;
border-radius: 8px;
width: 100%;

.radio_text_wrap {
width: 100%;
}
&.selected {
background-color: var(--color-dialog-ideation);
}
.setting_toggle {
width: 100%;
align-items: center;
justify-content: space-between;
}
}

.date_selector {
Expand Down
Loading