Compare commits
15 Commits
a5f4c18eb5
...
feature/ta
| Author | SHA1 | Date | |
|---|---|---|---|
| 3ebb1560ae | |||
| e845bfb27f | |||
| 863caeccf3 | |||
| 9b56dddab9 | |||
| ba11f17531 | |||
| a08f92c84c | |||
| c027357cfe | |||
| 0fbc8b1392 | |||
| 54108bc7e5 | |||
| 6de8a4f0fa | |||
| 7283e4f1aa | |||
| 8d3b7fa1c4 | |||
| b8e4d34456 | |||
| 1037d74620 | |||
| 4cfed23613 |
@@ -24,7 +24,7 @@
|
||||
padding: 0 3rem;
|
||||
border-radius: .1rem;
|
||||
border-style: none;
|
||||
background-color: #444;
|
||||
background-color: var(--secondary);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,19 +16,17 @@
|
||||
<label for="description">
|
||||
Description
|
||||
</label>
|
||||
<textarea id="description"></textarea>
|
||||
<textarea id="description" [formControl]="descriptionControl"></textarea>
|
||||
</div>
|
||||
<div class="actions">
|
||||
<div class="row">
|
||||
<button class="icon raised" matRipple matTooltip="Définir une alerte dans X minutes">
|
||||
<button class="stroked secondary" [disabled]="true" matRipple matTooltip="Définir une alerte dans X minutes">
|
||||
<mat-icon>update</mat-icon>
|
||||
</button>
|
||||
<button class="icon raised alert" matRipple>
|
||||
<mat-icon>delete</mat-icon>
|
||||
Rappel
|
||||
</button>
|
||||
</div>
|
||||
<div class="row">
|
||||
<button class="raised alert" [disabled]="!task" (click)="delete()">
|
||||
<button class="stroked alert" [disabled]="!task" (click)="delete()">
|
||||
<mat-icon>delete</mat-icon>
|
||||
Supprimer
|
||||
</button>
|
||||
|
||||
@@ -5,10 +5,10 @@
|
||||
align-items: center;
|
||||
margin-bottom: .5rem;
|
||||
flex-direction: column;
|
||||
background-color: #444;
|
||||
background-color: var(--secondary);
|
||||
border-radius: .2rem;
|
||||
|
||||
.header {
|
||||
border-radius: .1rem;
|
||||
height: 2.5rem;
|
||||
width: 100%;
|
||||
display: flex;
|
||||
@@ -21,10 +21,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
mat-checkbox {
|
||||
// padding: 0 .5rem;
|
||||
}
|
||||
|
||||
.input-container {
|
||||
display: flex;
|
||||
flex-grow: 1;
|
||||
@@ -34,7 +30,7 @@
|
||||
height: 1.8rem;
|
||||
padding: 0 .8rem;
|
||||
margin: 0 .8rem;
|
||||
background-color: #444;
|
||||
background-color: inherit;
|
||||
border-style: solid;
|
||||
border-width: .1rem;
|
||||
border-color: rgba(0,0,0, 0);
|
||||
@@ -46,7 +42,7 @@
|
||||
border-color .2s ease-out;
|
||||
|
||||
&:hover {
|
||||
border-color: rgb(53, 53, 53);
|
||||
border-color: var(--secondary-border);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -61,6 +57,7 @@
|
||||
visibility: hidden;
|
||||
transition: height .1s ease-in-out;
|
||||
display: flex;
|
||||
border-top: .1rem solid var(--primary-border);
|
||||
|
||||
&.expanded {
|
||||
height: 20rem;
|
||||
@@ -82,10 +79,11 @@
|
||||
|
||||
textarea {
|
||||
flex-grow: 1;
|
||||
border: 1px solid #444;
|
||||
border: 1px solid var(--secondary-border);
|
||||
border-radius: .2rem;
|
||||
background-color: #4a4a4a;
|
||||
background-color: #ddd;
|
||||
resize: none;
|
||||
padding: .5rem;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -94,17 +92,25 @@
|
||||
flex-direction: column;
|
||||
flex-grow: 1;
|
||||
height: 100%;
|
||||
|
||||
max-width: 20%;
|
||||
|
||||
|
||||
.row {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
flex-wrap: wrap;
|
||||
justify-content: space-around;
|
||||
align-items: flex-start;
|
||||
padding: 1rem;
|
||||
padding: .5rem 0 .5rem 1rem;
|
||||
|
||||
button {
|
||||
display: flex;
|
||||
justify-content: left;
|
||||
flex-grow: 1;
|
||||
|
||||
mat-icon {
|
||||
margin-right: .5rem;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
import { AfterViewInit, Component, ElementRef, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
|
||||
import { AfterViewInit, Component, ElementRef, EventEmitter, Input, OnDestroy, OnInit, Output, ViewChild } from '@angular/core';
|
||||
import { FormControl } from '@angular/forms';
|
||||
import { MatDialog } from '@angular/material/dialog';
|
||||
import { Subscription } from 'rxjs';
|
||||
import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
|
||||
import { ConfirmDialogComponent, ConfirmDialogModel } from 'src/app/core/components/confirm-dialog/confirm-dialog.component';
|
||||
import { Task } from 'src/app/core/entity/task';
|
||||
import { TaskListService } from 'src/app/core/service/task-list.service';
|
||||
|
||||
@@ -9,18 +13,53 @@ import { TaskListService } from 'src/app/core/service/task-list.service';
|
||||
templateUrl: './task-display.component.html',
|
||||
styleUrls: ['./task-display.component.scss']
|
||||
})
|
||||
export class TaskDisplayComponent implements AfterViewInit {
|
||||
export class TaskDisplayComponent implements AfterViewInit, OnDestroy {
|
||||
@Input() task?: Task;
|
||||
titleControl = new FormControl(this.task?.title);
|
||||
isExpanded = false;
|
||||
@ViewChild('titleInput', {static: true}) titleInput?: ElementRef<HTMLInputElement>;
|
||||
@ViewChild('descriptionInput', {static: true}) descriptionInput?: ElementRef<HTMLTextAreaElement>;
|
||||
titleControl = new FormControl();
|
||||
descriptionControl = new FormControl();
|
||||
isExpanded = false;
|
||||
private _subscriptions: Subscription[] = [];
|
||||
|
||||
constructor(
|
||||
private _dialog: MatDialog,
|
||||
private _taskListService: TaskListService
|
||||
) {}
|
||||
|
||||
ngAfterViewInit(): void {
|
||||
this.titleControl.setValue(this?.task?.title);
|
||||
this.descriptionControl.setValue(this?.task?.description);
|
||||
|
||||
const titleControlSubscription = this.titleControl.valueChanges
|
||||
.pipe(
|
||||
distinctUntilChanged(),
|
||||
debounceTime(500)
|
||||
)
|
||||
.subscribe(newTitle => {
|
||||
if (this.task) {
|
||||
this.task.title = newTitle;
|
||||
this._taskListService.updateTask(this.task);
|
||||
}
|
||||
});
|
||||
this._subscriptions.push(titleControlSubscription);
|
||||
|
||||
const descriptionControlSubscription = this.descriptionControl.valueChanges
|
||||
.pipe(
|
||||
distinctUntilChanged(),
|
||||
debounceTime(500)
|
||||
)
|
||||
.subscribe(description => {
|
||||
if (this.task) {
|
||||
this.task.description = description;
|
||||
this._taskListService.updateTask(this.task);
|
||||
}
|
||||
});
|
||||
this._subscriptions.push(descriptionControlSubscription);
|
||||
}
|
||||
|
||||
ngOnDestroy(): void {
|
||||
this._subscriptions.forEach(subscription => subscription.unsubscribe());
|
||||
}
|
||||
|
||||
expand(): void {
|
||||
@@ -38,7 +77,27 @@ export class TaskDisplayComponent implements AfterViewInit {
|
||||
|
||||
delete(): void {
|
||||
if (this.task) {
|
||||
this._taskListService.delete(this.task);
|
||||
const confirmData = {
|
||||
title: `Supprimer la tâche ${this.task.title} ?`,
|
||||
description: 'Une fois supprimé, sa description sera perdue définitivement.',
|
||||
confirmButtonLabel: 'Supprimer la tâche',
|
||||
confirmButtonType: 'alert'
|
||||
} as ConfirmDialogModel;
|
||||
|
||||
const dialogRef = this._dialog.open(
|
||||
ConfirmDialogComponent,
|
||||
{
|
||||
width: '30rem',
|
||||
data: confirmData
|
||||
}
|
||||
);
|
||||
|
||||
const afterDialogCloseSubscription = dialogRef.afterClosed().subscribe(result => {
|
||||
if (result && this.task) {
|
||||
this._taskListService.delete(this.task);
|
||||
}
|
||||
})
|
||||
this._subscriptions.push(afterDialogCloseSubscription);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -24,6 +24,8 @@ import { TaskListService } from './core/service/task-list.service';
|
||||
import { StorePersistenceService } from './core/service/store-persistence.service';
|
||||
import {MatTooltipModule} from '@angular/material/tooltip';
|
||||
import {MatRippleModule} from '@angular/material/core';
|
||||
import { RenameTaskListComponent } from './task-lists/rename-task-list/rename-task-list.component';
|
||||
import { ConfirmDialogComponent } from './core/components/confirm-dialog/confirm-dialog.component';
|
||||
|
||||
@NgModule({
|
||||
declarations: [
|
||||
@@ -35,7 +37,9 @@ import {MatRippleModule} from '@angular/material/core';
|
||||
AddTaskListComponent,
|
||||
HeaderComponent,
|
||||
ActiveListTasksComponent,
|
||||
TaskDisplayComponent
|
||||
TaskDisplayComponent,
|
||||
RenameTaskListComponent,
|
||||
ConfirmDialogComponent
|
||||
],
|
||||
imports: [
|
||||
BrowserModule,
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
<div class="container">
|
||||
<div class="body">
|
||||
<mat-icon>help_outline</mat-icon>
|
||||
<div class="message">
|
||||
<div class="title">{{data.title}}</div>
|
||||
<div class="description">{{data.description}}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="dialog-actions">
|
||||
<button class="stroked" (click)="cancel()">Annuler</button>
|
||||
<button class="stroked"
|
||||
(click)="confirm()"
|
||||
[ngClass]="data.confirmButtonType">
|
||||
{{data.confirmButtonLabel}}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
@@ -0,0 +1,35 @@
|
||||
.container {
|
||||
.body {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
flex-grow: 1;
|
||||
align-items: center;
|
||||
|
||||
mat-icon {
|
||||
$iconSize: 4rem;
|
||||
font-size: $iconSize;
|
||||
width: $iconSize;
|
||||
height: $iconSize;
|
||||
margin: 0 1rem;
|
||||
}
|
||||
|
||||
.message {
|
||||
.title {
|
||||
display: flex;
|
||||
flex-grow: 1;
|
||||
justify-content: center;
|
||||
text-align: center;
|
||||
font-size: 1.5rem;
|
||||
margin: .5rem;
|
||||
}
|
||||
|
||||
.description {
|
||||
display: flex;
|
||||
flex-grow: 1;
|
||||
justify-content: center;
|
||||
text-align: center;
|
||||
font-size: 1.2rem;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,20 +1,20 @@
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { TaskDisplayComponent } from './task-display.component';
|
||||
import { ConfirmDialogComponent } from './confirm-dialog.component';
|
||||
|
||||
describe('TaskDisplayComponent', () => {
|
||||
let component: TaskDisplayComponent;
|
||||
let fixture: ComponentFixture<TaskDisplayComponent>;
|
||||
describe('ConfirmDialogComponent', () => {
|
||||
let component: ConfirmDialogComponent;
|
||||
let fixture: ComponentFixture<ConfirmDialogComponent>;
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
declarations: [ TaskDisplayComponent ]
|
||||
declarations: [ ConfirmDialogComponent ]
|
||||
})
|
||||
.compileComponents();
|
||||
});
|
||||
|
||||
beforeEach(() => {
|
||||
fixture = TestBed.createComponent(TaskDisplayComponent);
|
||||
fixture = TestBed.createComponent(ConfirmDialogComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
@@ -0,0 +1,31 @@
|
||||
import { Component, Inject } from '@angular/core';
|
||||
import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
|
||||
|
||||
export interface ConfirmDialogModel {
|
||||
title: string;
|
||||
description: string;
|
||||
confirmButtonLabel: string;
|
||||
confirmButtonType: '' | 'alert';
|
||||
}
|
||||
|
||||
@Component({
|
||||
selector: 'app-confirm-dialog',
|
||||
templateUrl: './confirm-dialog.component.html',
|
||||
styleUrls: ['./confirm-dialog.component.scss']
|
||||
})
|
||||
export class ConfirmDialogComponent {
|
||||
|
||||
constructor(
|
||||
@Inject(MAT_DIALOG_DATA) public data: ConfirmDialogModel,
|
||||
private _dialogRef: MatDialogRef<ConfirmDialogModel>
|
||||
) {}
|
||||
|
||||
cancel(): void {
|
||||
this._dialogRef.close();
|
||||
}
|
||||
|
||||
confirm(): void {
|
||||
this._dialogRef.close(true);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,24 +1,35 @@
|
||||
<nav *ngIf="!selectionMode">
|
||||
<span class="title">
|
||||
<img src="../../assets/images/to-do.png" />
|
||||
To Do
|
||||
</span>
|
||||
<button *ngIf="!activeTaskList"
|
||||
(click)="openNewListForm()"
|
||||
class="raised"
|
||||
matRipple>
|
||||
Nouvelle liste
|
||||
</button>
|
||||
<button *ngIf="activeTaskList"
|
||||
(click)="goTaskListsPane()"
|
||||
class="icon raised"
|
||||
matRipple
|
||||
matTooltip="Retourner aux task-lists">
|
||||
<mat-icon>chevron_left</mat-icon>
|
||||
</button>
|
||||
<!-- <div *ngIf="activeTaskList">
|
||||
Liste active : {{activeTaskList.name}}
|
||||
</div> -->
|
||||
<div class="left">
|
||||
<span class="title">
|
||||
<img src="../../assets/images/to-do.png" />
|
||||
To Do
|
||||
</span>
|
||||
<button *ngIf="!activeTaskList"
|
||||
(click)="openNewListForm()"
|
||||
class="stroked primary"
|
||||
matRipple>
|
||||
Nouvelle liste
|
||||
</button>
|
||||
<button *ngIf="activeTaskList"
|
||||
(click)="goTaskListsPane()"
|
||||
class="icon stroked primary"
|
||||
matRipple
|
||||
matTooltip="Retourner aux task-lists">
|
||||
<mat-icon>chevron_left</mat-icon>
|
||||
</button>
|
||||
</div>
|
||||
<div class="middle" *ngIf="activeTaskList">
|
||||
{{activeTaskList.name}}
|
||||
</div>
|
||||
<div class="right">
|
||||
<button class="icon stroked primary"
|
||||
(click)="enableSelectionMode()"
|
||||
[disabled]="isNoAnyTaskList()"
|
||||
matTooltip="Activer la sélection des task-lists"
|
||||
matTooltipPosition="left">
|
||||
<mat-icon>checklist_rtl</mat-icon>
|
||||
</button>
|
||||
</div>
|
||||
</nav>
|
||||
<nav *ngIf="selectionMode" class="selectionMode">
|
||||
<div></div>
|
||||
@@ -26,6 +37,6 @@
|
||||
Cliquez sur une liste pour la sélectionner
|
||||
</div>
|
||||
<div class="actions">
|
||||
<button mat-raised-button (click)="disableSelectionMode()">Annuler</button>
|
||||
<button class="stroked primary" (click)="disableSelectionMode()">Annuler</button>
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
@@ -6,11 +6,36 @@ nav {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
height: 3.2rem;
|
||||
background-color: #666;
|
||||
background-color: #eee;
|
||||
|
||||
.left {
|
||||
position: absolute;
|
||||
left: 1rem;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
|
||||
.title {
|
||||
font-size: 1.5rem;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-right: 1rem;
|
||||
}
|
||||
}
|
||||
|
||||
.middle {
|
||||
display: flex;
|
||||
margin: auto;
|
||||
}
|
||||
|
||||
.right {
|
||||
position: absolute;
|
||||
right: 1rem;
|
||||
}
|
||||
|
||||
&.selectionMode {
|
||||
font-weight: bold;
|
||||
background-color: #185eb4;
|
||||
background-color: var(--selection);
|
||||
color: white;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
@@ -21,11 +46,4 @@ nav {
|
||||
margin: 0 1rem;
|
||||
}
|
||||
}
|
||||
|
||||
.title {
|
||||
font-size: 1.5rem;
|
||||
margin: 0 1rem;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
}
|
||||
@@ -13,18 +13,15 @@ import { TaskListService } from '../../service/task-list.service';
|
||||
})
|
||||
export class HeaderComponent implements OnInit, OnDestroy {
|
||||
private _storeSubscription?: Subscription;
|
||||
activeTaskList?: TaskList;
|
||||
selectionMode = false;
|
||||
|
||||
constructor(
|
||||
private _dialog: MatDialog,
|
||||
private _router: Router,
|
||||
private _taskListService: TaskListService
|
||||
) {}
|
||||
|
||||
ngOnInit(): void {
|
||||
this._storeSubscription = this._taskListService.store$.subscribe(store => {
|
||||
this.activeTaskList = store.taskLists.find(taskList => store.activeTaskListId === taskList.id);
|
||||
this.selectionMode = store.selectionMode;
|
||||
});
|
||||
}
|
||||
@@ -34,14 +31,31 @@ export class HeaderComponent implements OnInit, OnDestroy {
|
||||
}
|
||||
|
||||
openNewListForm(): void {
|
||||
this._dialog.open(AddTaskListComponent);
|
||||
this._dialog.open(
|
||||
AddTaskListComponent,
|
||||
{
|
||||
width: '20rem'
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
goTaskListsPane(): void {
|
||||
this._taskListService.removeActiveTaskList();
|
||||
}
|
||||
|
||||
enableSelectionMode(): void {
|
||||
this._taskListService.enableSelectionMode();
|
||||
}
|
||||
|
||||
disableSelectionMode(): void {
|
||||
this._taskListService.disableSelectionMode();
|
||||
}
|
||||
|
||||
isNoAnyTaskList(): boolean {
|
||||
return this._taskListService.isNoAnyTaskList();
|
||||
}
|
||||
|
||||
get activeTaskList(): TaskList | undefined {
|
||||
return this._taskListService.activeTaskList;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,143 +7,217 @@ import { v4 as uuidv4 } from 'uuid';
|
||||
import { filter } from 'rxjs/operators';
|
||||
import { Store } from "../entity/store";
|
||||
import { Router } from "@angular/router";
|
||||
import { MatSnackBar } from "@angular/material/snack-bar";
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root'
|
||||
providedIn: 'root'
|
||||
})
|
||||
export class TaskListService {
|
||||
private _store: BehaviorSubject<Store> = new BehaviorSubject<Store>(undefined as unknown as Store);
|
||||
private _store: BehaviorSubject<Store> = new BehaviorSubject<Store>(undefined as unknown as Store);
|
||||
|
||||
constructor(
|
||||
private _router: Router,
|
||||
private _storePersistenceService: StorePersistenceService
|
||||
) {
|
||||
this.store$.subscribe(store => {
|
||||
this._storePersistenceService.save(store);
|
||||
});
|
||||
}
|
||||
constructor(
|
||||
private _router: Router,
|
||||
private _snackBar: MatSnackBar,
|
||||
private _storePersistenceService: StorePersistenceService
|
||||
) {
|
||||
this.store$.subscribe(store => {
|
||||
this.saveStore(store, true);
|
||||
});
|
||||
}
|
||||
|
||||
get store$(): Observable<Store> {
|
||||
return this._store.asObservable()
|
||||
.pipe(filter(store => !!store));
|
||||
}
|
||||
get store$(): Observable<Store> {
|
||||
return this._store.asObservable()
|
||||
.pipe(filter(store => !!store));
|
||||
}
|
||||
|
||||
private get store(): Store {
|
||||
return this._storePersistenceService.load();
|
||||
}
|
||||
private get store(): Store {
|
||||
let result = this._store.value;
|
||||
|
||||
addTask(taskTitle: string): void {
|
||||
const store = this.store;
|
||||
const activeTaskList = store.taskLists.find(taskList => taskList.id === store.activeTaskListId);
|
||||
if (!activeTaskList) {
|
||||
throw new Error("No active tasklist");
|
||||
}
|
||||
if (!result) {
|
||||
result = this._storePersistenceService.load();
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
if (!activeTaskList.tasks) {
|
||||
activeTaskList.tasks = [];
|
||||
}
|
||||
private saveStore(store: Store, silent: boolean = false): void {
|
||||
if (silent) {
|
||||
this._storePersistenceService.save(store);
|
||||
} else {
|
||||
// We send the store into the subject because there is an observable on in, that saves the store at every single value.
|
||||
this._store.next(store);
|
||||
}
|
||||
}
|
||||
|
||||
const newTask = {
|
||||
id: uuidv4(),
|
||||
title: taskTitle,
|
||||
creationDate: new Date(),
|
||||
description: undefined as unknown as string
|
||||
} as Task;
|
||||
addTask(taskTitle: string): void {
|
||||
const store = this.store;
|
||||
const activeTaskList = store.taskLists.find(taskList => taskList.id === store.activeTaskListId);
|
||||
if (!activeTaskList) {
|
||||
throw new Error("No active tasklist");
|
||||
}
|
||||
|
||||
if (!activeTaskList.tasks) {
|
||||
activeTaskList.tasks = [];
|
||||
}
|
||||
|
||||
const newTask = {
|
||||
id: uuidv4(),
|
||||
title: taskTitle,
|
||||
creationDate: new Date(),
|
||||
description: undefined as unknown as string
|
||||
} as Task;
|
||||
|
||||
|
||||
activeTaskList?.tasks.push(newTask);
|
||||
this._store.next(store);
|
||||
}
|
||||
activeTaskList?.tasks.push(newTask);
|
||||
this.saveStore(store);
|
||||
this._snackBar.open('Tâche ajoutée.', 'Fermer', {duration: 2000});
|
||||
}
|
||||
|
||||
delete(taskToDelete: Task) {
|
||||
const store = this.store;
|
||||
const activeTaskList = store.taskLists.find(taskList => taskList.id === store.activeTaskListId);
|
||||
if (!activeTaskList) {
|
||||
throw new Error("No active tasklist");
|
||||
}
|
||||
updateTask(taskToUpdate: Task) {
|
||||
const store = this.store;
|
||||
const activeTaskList = store.taskLists.find(taskList => taskList.id === store.activeTaskListId);
|
||||
if (!activeTaskList) {
|
||||
throw new Error("No active tasklist");
|
||||
}
|
||||
|
||||
const taskIndex = activeTaskList?.tasks.findIndex(task => task.id === taskToDelete.id);
|
||||
if (!taskIndex && taskIndex !== 0) {
|
||||
throw new Error('Unknown task to delete');
|
||||
}
|
||||
const task = activeTaskList?.tasks.find(task => task.id === taskToUpdate.id);
|
||||
if (!task) {
|
||||
throw new Error('Unknown task to update');
|
||||
}
|
||||
|
||||
activeTaskList?.tasks.splice(taskIndex, 1);
|
||||
this._store.next(store);
|
||||
}
|
||||
task.title = taskToUpdate.title;
|
||||
task.description = taskToUpdate.description;
|
||||
|
||||
createTaskList(taskListName: string): void {
|
||||
const newTaskList = {
|
||||
id: uuidv4(),
|
||||
name: taskListName,
|
||||
tasks: []
|
||||
} as TaskList;
|
||||
// If the store is saved loudly, all views will be refreshed and the user will lose the focus of its input,
|
||||
// so we save the store silently here.
|
||||
this.saveStore(store, true);
|
||||
}
|
||||
|
||||
const store = this.store;
|
||||
store.taskLists.push(newTaskList);
|
||||
this._store.next(store);
|
||||
}
|
||||
delete(taskToDelete: Task) {
|
||||
const store = this.store;
|
||||
const activeTaskList = store.taskLists.find(taskList => taskList.id === store.activeTaskListId);
|
||||
if (!activeTaskList) {
|
||||
throw new Error("No active tasklist");
|
||||
}
|
||||
|
||||
getAll(): TaskList[] {
|
||||
return this.store.taskLists ?? [];
|
||||
}
|
||||
const taskIndex = activeTaskList?.tasks.findIndex(task => task.id === taskToDelete.id);
|
||||
if (!taskIndex && taskIndex !== 0) {
|
||||
throw new Error('Unknown task to delete');
|
||||
}
|
||||
|
||||
setActive(taskList: TaskList): void {
|
||||
const store = this.store;
|
||||
store.activeTaskListId = taskList.id;
|
||||
this._store.next(store);
|
||||
this._router.navigate(['/task-lists/active']);
|
||||
}
|
||||
activeTaskList?.tasks.splice(taskIndex, 1);
|
||||
this.saveStore(store);
|
||||
this._snackBar.open('Tâche supprimée.', 'Fermer', {duration: 2000});
|
||||
}
|
||||
|
||||
removeActiveTaskList(): void {
|
||||
const store = this.store;
|
||||
delete store.activeTaskListId;
|
||||
this._store.next(store);
|
||||
this._router.navigate(['/']);
|
||||
}
|
||||
createTaskList(taskListName: string): void {
|
||||
const newTaskList = {
|
||||
id: uuidv4(),
|
||||
name: taskListName,
|
||||
tasks: []
|
||||
} as TaskList;
|
||||
|
||||
selectTaskList(taskList: TaskList): void {
|
||||
this.enableSelectionMode();
|
||||
const store = this.store;
|
||||
store.taskLists.push(newTaskList);
|
||||
this.saveStore(store);
|
||||
}
|
||||
|
||||
const store = this.store;
|
||||
updateTaskListName(taskListToUpdate: TaskList): void {
|
||||
const store = this.store;
|
||||
const matchingTaskList = store.taskLists.find(taskList => taskList.id === taskListToUpdate.id);
|
||||
if (matchingTaskList) {
|
||||
matchingTaskList.name = taskListToUpdate.name;
|
||||
this.saveStore(store);
|
||||
this.disableSelectionMode();
|
||||
}
|
||||
}
|
||||
|
||||
if (!store.selectedTaskLists) {
|
||||
store.selectedTaskLists = [];
|
||||
}
|
||||
deleteSelectedTaskLists(): void {
|
||||
const store = this.store;
|
||||
const nonSelectedTaskLists = store.taskLists.filter(taskList => !store.selectedTaskLists.some(selectedTaskList => selectedTaskList.id === taskList.id));
|
||||
store.taskLists = nonSelectedTaskLists;
|
||||
this.saveStore(store);
|
||||
this.disableSelectionMode();
|
||||
}
|
||||
|
||||
if (store.selectedTaskLists.some(tl => tl.id === taskList.id)) {
|
||||
const selectedTaskListIndex = store.selectedTaskLists.findIndex(tl => tl.id === taskList.id);
|
||||
store.selectedTaskLists.splice(selectedTaskListIndex, 1);
|
||||
getAll(): TaskList[] {
|
||||
return this.store.taskLists ?? [];
|
||||
}
|
||||
|
||||
if (!store.selectedTaskLists.length) {
|
||||
store.selectionMode = false;
|
||||
}
|
||||
setActive(taskList: TaskList): void {
|
||||
const store = this.store;
|
||||
store.activeTaskListId = taskList.id;
|
||||
this.saveStore(store);
|
||||
this._router.navigate(['/task-lists/active']);
|
||||
}
|
||||
|
||||
this._store.next(store);
|
||||
} else {
|
||||
store.selectedTaskLists.push(taskList);
|
||||
this._store.next(store);
|
||||
}
|
||||
}
|
||||
removeActiveTaskList(): void {
|
||||
const store = this.store;
|
||||
delete store.activeTaskListId;
|
||||
this.saveStore(store);
|
||||
this._router.navigate(['/']);
|
||||
}
|
||||
|
||||
isSelected(taskList: TaskList): boolean {
|
||||
const store = this.store;
|
||||
return store.selectedTaskLists && store.selectedTaskLists.some(tl => tl.id === taskList.id);
|
||||
}
|
||||
selectTaskList(taskList: TaskList): void {
|
||||
this.enableSelectionMode();
|
||||
|
||||
isSelectionModeEnabled(): boolean {
|
||||
return this.store.selectionMode;
|
||||
}
|
||||
const store = this.store;
|
||||
|
||||
enableSelectionMode(): void {
|
||||
const store = this.store;
|
||||
store.selectionMode = true;
|
||||
this._store.next(store);
|
||||
}
|
||||
if (!store.selectedTaskLists) {
|
||||
store.selectedTaskLists = [];
|
||||
}
|
||||
|
||||
disableSelectionMode(): void {
|
||||
const store = this.store;
|
||||
store.selectionMode = false;
|
||||
store.selectedTaskLists = [];
|
||||
this._store.next(store);
|
||||
}
|
||||
if (store.selectedTaskLists.some(tl => tl.id === taskList.id)) {
|
||||
const selectedTaskListIndex = store.selectedTaskLists.findIndex(tl => tl.id === taskList.id);
|
||||
store.selectedTaskLists.splice(selectedTaskListIndex, 1);
|
||||
|
||||
if (!store.selectedTaskLists.length) {
|
||||
store.selectionMode = false;
|
||||
}
|
||||
|
||||
this.saveStore(store);
|
||||
} else {
|
||||
store.selectedTaskLists.push(taskList);
|
||||
this.saveStore(store);
|
||||
}
|
||||
}
|
||||
|
||||
isSelected(taskList: TaskList): boolean {
|
||||
const store = this.store;
|
||||
return store.selectedTaskLists && store.selectedTaskLists.some(tl => tl.id === taskList.id);
|
||||
}
|
||||
|
||||
isSelectionModeEnabled(): boolean {
|
||||
return this.store.selectionMode;
|
||||
}
|
||||
|
||||
enableSelectionMode(): void {
|
||||
const store = this.store;
|
||||
store.selectionMode = true;
|
||||
this.saveStore(store);
|
||||
}
|
||||
|
||||
disableSelectionMode(): void {
|
||||
const store = this.store;
|
||||
store.selectionMode = false;
|
||||
store.selectedTaskLists = [];
|
||||
this.saveStore(store);
|
||||
}
|
||||
|
||||
isThereMultipleTaskListsSelected(): boolean {
|
||||
const store = this.store;
|
||||
return (store.selectedTaskLists?.length ?? 0) > 1;
|
||||
}
|
||||
|
||||
get selectedTaskList(): TaskList {
|
||||
return this._store.value?.selectedTaskLists[0];
|
||||
}
|
||||
|
||||
isNoAnyTaskList(): boolean {
|
||||
return !this.store?.taskLists?.length;
|
||||
}
|
||||
|
||||
get activeTaskList(): TaskList | undefined {
|
||||
const store = this.store;
|
||||
return store.taskLists.find(taskList => taskList.id === store.activeTaskListId);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
<h2>Création d'une task-list</h2>
|
||||
<form [formGroup]="addTaskListFormGroup" (submit)="onSubmit()" ngNativeValidate>
|
||||
<p>
|
||||
<mat-form-field>
|
||||
@@ -8,8 +9,8 @@
|
||||
</mat-error>
|
||||
</mat-form-field>
|
||||
</p>
|
||||
<div>
|
||||
<button mat-raised-button type="button" (click)="close()">Annuler</button>
|
||||
<button mat-raised-button type="submit">Créer une liste</button>
|
||||
<div class="dialog-actions">
|
||||
<button class="stroked primary" type="button" (click)="close()">Annuler</button>
|
||||
<button class="stroked primary" type="submit">Créer une liste</button>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
form {
|
||||
p {
|
||||
mat-form-field {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
<h2>Renommage d'une task-list</h2>
|
||||
<form [formGroup]="renameTaskListFormGroup" (submit)="onSubmit()" ngNativeValidate>
|
||||
<p>
|
||||
<mat-form-field>
|
||||
<mat-label>Nom de la liste</mat-label>
|
||||
<input matInput autofocus id="task-name-input" name="task-name-input" formControlName="name" />
|
||||
<mat-error *ngIf="form.name.invalid">
|
||||
Veuillez saisir le nom de la task-list.
|
||||
</mat-error>
|
||||
</mat-form-field>
|
||||
</p>
|
||||
<div class="dialog-actions">
|
||||
<button class="stroked" type="button" (click)="close()">Annuler</button>
|
||||
<button class="stroked" type="submit">Renommer la liste</button>
|
||||
</div>
|
||||
</form>
|
||||
@@ -0,0 +1,7 @@
|
||||
form {
|
||||
p {
|
||||
mat-form-field {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,59 @@
|
||||
import { Component, OnInit } from '@angular/core';
|
||||
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
|
||||
import { MatDialogRef } from '@angular/material/dialog';
|
||||
import { MatSnackBar } from '@angular/material/snack-bar';
|
||||
import { TaskList } from 'src/app/core/entity/task-list';
|
||||
import { TaskListService } from 'src/app/core/service/task-list.service';
|
||||
|
||||
@Component({
|
||||
selector: 'app-rename-task-list',
|
||||
templateUrl: './rename-task-list.component.html',
|
||||
styleUrls: ['./rename-task-list.component.scss']
|
||||
})
|
||||
export class RenameTaskListComponent implements OnInit {
|
||||
renameTaskListFormGroup: FormGroup = this._formBuilder.group({
|
||||
name: [undefined, Validators.required]
|
||||
});
|
||||
|
||||
selectedTaskList?: TaskList;
|
||||
|
||||
constructor(
|
||||
private _dialogRef: MatDialogRef<RenameTaskListComponent>,
|
||||
private _formBuilder: FormBuilder,
|
||||
private _snackBar: MatSnackBar,
|
||||
private _taskListService: TaskListService
|
||||
) {}
|
||||
|
||||
ngOnInit(): void {
|
||||
this.selectedTaskList = this._taskListService.selectedTaskList;
|
||||
|
||||
if (this.selectedTaskList) {
|
||||
this.renameTaskListFormGroup.controls.name.setValue(this.selectedTaskList.name);
|
||||
} else {
|
||||
this._snackBar.open('Impossible de renommer la task-list : aucune task-list n\'est sélectionnée.', 'Fermer', {duration: 5000});
|
||||
this._dialogRef.close();
|
||||
}
|
||||
}
|
||||
|
||||
get form(): any {
|
||||
return this.renameTaskListFormGroup.controls;
|
||||
}
|
||||
|
||||
onSubmit(): void {
|
||||
if (this.selectedTaskList) {
|
||||
if (this.renameTaskListFormGroup.valid) {
|
||||
this.selectedTaskList.name = this.renameTaskListFormGroup.controls.name.value;
|
||||
this._taskListService.updateTaskListName(this.selectedTaskList);
|
||||
this._snackBar.open('La task-list a été renommée.', 'Fermer', {duration: 5000});
|
||||
this.close();
|
||||
} else {
|
||||
this._snackBar.open('Veuillez vérifier les informations saisies.', 'Fermer', {duration: 5000});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
close(): void {
|
||||
this._dialogRef.close();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,4 +1,7 @@
|
||||
<div class="task-lists">
|
||||
<div *ngIf="!taskLists?.length" class="no-task-list">
|
||||
Aucune task-list.
|
||||
</div>
|
||||
<div *ngFor="let taskList of taskLists" class="task-list-container">
|
||||
<div class="task-list shadowed"
|
||||
(click)="selectActiveTaskList(taskList)"
|
||||
@@ -15,10 +18,18 @@
|
||||
{{taskList.tasks?.length}} tâches
|
||||
</ng-template>
|
||||
</ng-container>
|
||||
|
||||
<mat-icon *ngIf="isSelectionModeEnabled() && isSelected(taskList)" class="selection-icon">done</mat-icon>
|
||||
</div>
|
||||
{{taskList.name}}
|
||||
<ng-container *ngIf="isSelectionModeEnabled() && isSelected(taskList)">
|
||||
SELECTED
|
||||
</ng-container>
|
||||
</div>
|
||||
</div>
|
||||
<div class="selection-actions" *ngIf="isSelectionModeEnabled()">
|
||||
<button class="stroked"
|
||||
[disabled]="isThereMultipleTaskListsSelected()"
|
||||
(click)="renameSelectedTaskList()">
|
||||
Renommer
|
||||
</button>
|
||||
<button class="stroked alert"
|
||||
(click)="deleteSelectedTaskLists()">Supprimer</button>
|
||||
</div>
|
||||
@@ -1,3 +1,10 @@
|
||||
.no-task-list {
|
||||
display: flex;
|
||||
margin: auto;
|
||||
margin-top: 3rem;
|
||||
font-size: 1.5rem;
|
||||
}
|
||||
|
||||
.task-lists {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
@@ -21,6 +28,28 @@
|
||||
border-radius: .5rem;
|
||||
background-color: aliceblue;
|
||||
margin-bottom: .5rem;
|
||||
position: relative;
|
||||
|
||||
.selection-icon {
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
right: 0;
|
||||
font-size: 3rem;
|
||||
width: 3rem;
|
||||
height: 3rem;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.selection-actions {
|
||||
padding: .5rem;
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
display: flex;
|
||||
flex-grow: 1;
|
||||
justify-content: space-between;
|
||||
border-top: 1px solid #444;
|
||||
}
|
||||
@@ -1,9 +1,11 @@
|
||||
import { Component, OnDestroy, OnInit } from '@angular/core';
|
||||
import { Component, NgZone, OnDestroy, OnInit } from '@angular/core';
|
||||
import { MatDialog } from '@angular/material/dialog';
|
||||
import { Subscription } from 'rxjs';
|
||||
import { ConfirmDialogComponent, ConfirmDialogModel } from '../core/components/confirm-dialog/confirm-dialog.component';
|
||||
import { TaskList } from '../core/entity/task-list';
|
||||
import { TaskListService } from '../core/service/task-list.service';
|
||||
import { AddTaskListComponent } from './add-task-list/add-task-list.component';
|
||||
import { RenameTaskListComponent } from './rename-task-list/rename-task-list.component';
|
||||
|
||||
@Component({
|
||||
selector: 'app-task-lists',
|
||||
@@ -13,25 +15,23 @@ import { AddTaskListComponent } from './add-task-list/add-task-list.component';
|
||||
export class TaskListsComponent implements OnInit, OnDestroy {
|
||||
taskLists: TaskList[] = [];
|
||||
private _storeSubscription?: Subscription;
|
||||
private _subscriptions: Subscription[] = [];
|
||||
|
||||
constructor(
|
||||
private _dialog: MatDialog,
|
||||
private _taskListService: TaskListService,
|
||||
private _taskListService: TaskListService
|
||||
) {}
|
||||
|
||||
ngOnInit(): void {
|
||||
this.taskLists = this._taskListService.getAll();
|
||||
this._storeSubscription = this._taskListService.store$.subscribe(store => {
|
||||
const storeSubscription = this._taskListService.store$.subscribe(store => {
|
||||
this.taskLists = store.taskLists;
|
||||
});
|
||||
this._subscriptions.push(storeSubscription);
|
||||
}
|
||||
|
||||
ngOnDestroy(): void {
|
||||
this._storeSubscription?.unsubscribe();
|
||||
}
|
||||
|
||||
openNewListForm(): void {
|
||||
this._dialog.open(AddTaskListComponent);
|
||||
this._subscriptions.forEach(subscription => subscription.unsubscribe());
|
||||
}
|
||||
|
||||
selectActiveTaskList(taskList: TaskList): void {
|
||||
@@ -53,4 +53,41 @@ export class TaskListsComponent implements OnInit, OnDestroy {
|
||||
isSelectionModeEnabled(): boolean {
|
||||
return this._taskListService.isSelectionModeEnabled();
|
||||
}
|
||||
|
||||
isThereMultipleTaskListsSelected(): boolean {
|
||||
return this._taskListService.isThereMultipleTaskListsSelected();
|
||||
}
|
||||
|
||||
renameSelectedTaskList(): void {
|
||||
this._dialog.open(
|
||||
RenameTaskListComponent,
|
||||
{
|
||||
width: '25rem'
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
deleteSelectedTaskLists(): void {
|
||||
const confirmData = {
|
||||
title: 'Supprimer les task-lists sélectionnées ?',
|
||||
description: 'Une fois supprimées, les task-lists seront perdues définitivement.',
|
||||
confirmButtonLabel: 'Supprimer les task-lists',
|
||||
confirmButtonType: 'alert'
|
||||
} as ConfirmDialogModel;
|
||||
|
||||
const dialogRef = this._dialog.open(
|
||||
ConfirmDialogComponent,
|
||||
{
|
||||
width: '30rem',
|
||||
data: confirmData
|
||||
}
|
||||
);
|
||||
|
||||
const afterDialogCloseSubscription = dialogRef.afterClosed().subscribe(result => {
|
||||
if (result) {
|
||||
this._taskListService.deleteSelectedTaskLists();
|
||||
}
|
||||
})
|
||||
this._subscriptions.push(afterDialogCloseSubscription);
|
||||
}
|
||||
}
|
||||
|
||||
106
src/styles.scss
106
src/styles.scss
@@ -1,23 +1,50 @@
|
||||
/* You can add global styles to this file, and also import other style files */
|
||||
:root {
|
||||
--primary: #fff;
|
||||
--primary-text: #444444;
|
||||
--primary-border: #ccc;
|
||||
--primary-hover: #eee;
|
||||
--secondary: #eee;
|
||||
--secondary-hover: #c9c9c9;
|
||||
--secondary-border: #bbb;
|
||||
|
||||
--disabled: #eee;
|
||||
--disabled-text: #aaa;
|
||||
|
||||
--transparent: rgba(0,0,0, 0);
|
||||
|
||||
--shadow-1: rgba(0, 0, 0, 0.2);
|
||||
--shadow-2: rgba(0, 0, 0, 0.14);
|
||||
--shadow-3: rgba(0, 0, 0, 0.12);
|
||||
--shadow-hover: #777;
|
||||
|
||||
--alert: #eb1d3f;
|
||||
--alert-text: #fff;
|
||||
--alert-hover: #c20d2b;
|
||||
--alert-border: #b91b35;
|
||||
|
||||
--selection: #185eb4;
|
||||
}
|
||||
|
||||
html {
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
html, body { height: 100%; }
|
||||
body {
|
||||
margin: 0;
|
||||
font-family: Roboto, "Helvetica Neue", sans-serif;
|
||||
padding-top: 3.2rem;
|
||||
background-color: #555;
|
||||
background-color: var(--primary);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
.shadowed {
|
||||
box-shadow: 0px 2px 1px -1px rgba(0, 0, 0, 0.2),0px 1px 1px 0px rgba(0, 0, 0, 0.14),0px 1px 3px 0px rgba(0, 0, 0, 0.12);
|
||||
box-shadow: 0px 2px 1px -1px var(--shadow-1),
|
||||
0px 1px 1px 0px var(--shadow-2),
|
||||
0px 1px 3px 0px var(--shadow-3);
|
||||
transition: box-shadow .2s ease-out;
|
||||
|
||||
&:hover {
|
||||
box-shadow: 0 .2em .5em #777;
|
||||
box-shadow: 0 .2em .5em var(--shadow-hover);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -26,23 +53,32 @@ a.no-style {
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
|
||||
button {
|
||||
border-style: solid;
|
||||
border-width: .1rem;
|
||||
border-color: rgba(0,0,0, 0);
|
||||
border-color: var(--transparent);
|
||||
border-radius: .2rem;
|
||||
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
|
||||
padding: .5rem;
|
||||
background-color: var(--transparent);
|
||||
color: var(--primary-text);
|
||||
|
||||
transition: background-color .2s ease-out,
|
||||
border-color .2s ease-out;
|
||||
|
||||
&:hover {
|
||||
background-color: #666;
|
||||
border-color: rgb(53, 53, 53);
|
||||
background-color: var(--primary-hover);
|
||||
border-color: var(--primary-border);
|
||||
}
|
||||
|
||||
&:disabled {
|
||||
background-color: var(--disabled);
|
||||
color: var(--disabled-text);
|
||||
cursor: not-allowed;
|
||||
}
|
||||
|
||||
&.icon {
|
||||
@@ -51,15 +87,53 @@ button {
|
||||
min-width: 1rem;
|
||||
min-height: 1rem;
|
||||
padding: 0;
|
||||
background-color: inherit;
|
||||
}
|
||||
|
||||
&.raised {
|
||||
background-color: #4a4a4a;
|
||||
background-color: var(--primary); //#4a4a4a;
|
||||
box-shadow: 0px 2px 1px -1px var(--shadow-1),
|
||||
0px 1px 1px 0px var(--shadow-2),
|
||||
0px 1px 3px 0px var(--shadow-3);
|
||||
}
|
||||
|
||||
&.stroked {
|
||||
border-color: var(--primary-border);
|
||||
|
||||
&.primary {
|
||||
background-color: var(--primary);
|
||||
|
||||
&:hover {
|
||||
background-color: var(--primary-hover);
|
||||
}
|
||||
}
|
||||
|
||||
&.secondary {
|
||||
background-color: var(--secondary);
|
||||
|
||||
&:hover {
|
||||
background-color: var(--secondary-hover)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
&.alert {
|
||||
background: #F93154;
|
||||
color: #fff;
|
||||
background-color: var(--alert);
|
||||
color: var(--alert-text);
|
||||
|
||||
&:hover {
|
||||
background-color: var(--alert-hover);
|
||||
border-color: var(--alert-border);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.dialog-actions {
|
||||
margin-top: 1rem;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
|
||||
> * {
|
||||
flex: 1 1 45%;
|
||||
max-width: 45%;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user