diff --git a/angular.json b/angular.json index 2ceac64..718930c 100644 --- a/angular.json +++ b/angular.json @@ -70,6 +70,30 @@ "with": "src/environments/environment.development.ts" } ] + }, + "swDevelopment": { + "buildOptimizer": false, + "optimization": false, + "vendorChunk": true, + "extractLicenses": false, + "sourceMap": true, + "namedChunks": true, + "outputHashing": "all", + "fileReplacements": [ + { + "replace": "src/environments/environment.ts", + "with": "src/environments/environment.swdev.ts" + } + ], + "assets": [ + { + "glob": "ngsw-worker.js", + "input": "node_modules/@angular/servce-worker", + "output": "." + }, + "src/ngsw.json", + "src/manifest.webmanifest" + ] } }, "defaultConfiguration": "production" diff --git a/ngsw-config.json b/ngsw-config.json index 07fb61d..f25973d 100644 --- a/ngsw-config.json +++ b/ngsw-config.json @@ -1,16 +1,16 @@ { "$schema": "./node_modules/@angular/service-worker/config/schema.json", - "index": "./index.html", + "index": "/ipwa/index.html", "assetGroups": [ { "name": "app", "installMode": "prefetch", "resources": { "files": [ - "/favicon.ico", - "/manifest.webmanifest", - "/*.css", - "/*.js" + "/ipwa/favicon.ico", + "/ipwa/manifest.webmanifest", + "/ipwa/*.css", + "/ipwa/*.js" ] } }, @@ -20,8 +20,8 @@ "updateMode": "prefetch", "resources": { "files": [ - "./assets/**", - "/**/*.(svg|cur|jpg|jpeg|png|apng|webp|avif|gif|otf|ttf|woff|woff2)" + "/ipwa/assets/**", + "/ipwa/**/*.(svg|cur|jpg|jpeg|png|apng|webp|avif|gif|otf|ttf|woff|woff2)" ] } } diff --git a/package-lock.json b/package-lock.json index fe0dadb..d59fc2c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "ipwa", - "version": "1.0.1", + "version": "1.1.0", "lockfileVersion": 3, "requires": true, "packages": { diff --git a/package.json b/package.json index 47c1f11..04086e4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ipwa", - "version": "1.0.1", + "version": "1.1.0", "license": "GPL-3.0-or-later", "scripts": { "ng": "ng", diff --git a/src/app/admin-view/account-mgmt/account-mgmt.component.html b/src/app/admin-view/account-mgmt/account-mgmt.component.html index cba85bc..27dad79 100644 --- a/src/app/admin-view/account-mgmt/account-mgmt.component.html +++ b/src/app/admin-view/account-mgmt/account-mgmt.component.html @@ -3,7 +3,7 @@ Wyszukaj - + @@ -24,17 +24,9 @@
-
+ diff --git a/src/app/admin-view/account-mgmt/account-mgmt.component.ts b/src/app/admin-view/account-mgmt/account-mgmt.component.ts index 8d6be8c..274e87a 100644 --- a/src/app/admin-view/account-mgmt/account-mgmt.component.ts +++ b/src/app/admin-view/account-mgmt/account-mgmt.component.ts @@ -4,10 +4,7 @@ import { MatDialog } from '@angular/material/dialog'; import { MatTableDataSource } from '@angular/material/table'; import { MatPaginator } from '@angular/material/paginator'; import { MatSnackBar } from '@angular/material/snack-bar'; -import { UserDeleteComponent } from './user-delete/user-delete.component'; import { UserEditComponent } from './user-edit/user-edit.component'; -import { catchError, throwError } from 'rxjs'; -import { UserResetComponent } from './user-reset/user-reset.component'; import { LocalStorageService } from 'src/app/services/local-storage.service'; import { Group } from 'src/app/types/group'; import User from 'src/app/types/user'; @@ -57,75 +54,9 @@ export class AccountMgmtComponent implements OnInit, AfterViewInit { this.users.filter = value.toLowerCase().trim() } - edit(item: any) { - this.dialog.open(UserEditComponent, {data: {user: item, groups: this.groups}}).afterClosed().subscribe(reply => { - if (reply) { - this.ac.accs.putAcc(item._id, reply).pipe(catchError((err)=>{ - this.sb.open("Wystąpił błąd. Skontaktuj się z obsługą programu.") - return throwError(()=> new Error(err.message)) - })).subscribe((data)=> { - if (data.status == 200) { - this.sb.open("Użytkownik został zmodyfikowany.", undefined, {duration: 2500}) - this.ngOnInit() - } else { - this.sb.open("Wystąpił błąd. Skontaktuj się z obsługą programu.") - } - }) - } - }) - } - - new() { - this.dialog.open(UserEditComponent, {data: {groups: this.groups}}).afterClosed().subscribe(reply => { - if (reply) { - this.ac.accs.postAcc(reply).pipe(catchError((err)=>{ - this.sb.open("Wystąpił błąd. Skontaktuj się z obsługą programu.") - return throwError(()=> new Error(err.message)) - })).subscribe((data)=> { - if (data.status == 201) { - this.sb.open("Użytkownik został utworzony.", undefined, {duration: 2500}) - this.ngOnInit() - } else { - this.sb.open("Wystąpił błąd. Skontaktuj się z obsługą programu.") - } - }) - } - }) - } - - delete(id: string) { - this.dialog.open(UserDeleteComponent).afterClosed().subscribe(reply => { - if (reply) { - this.ac.accs.deleteAcc(id).subscribe((res) => { - if (res.status == 200) { - this.sb.open("Użytkownik został usunięty.", undefined, {duration: 2500}) - this.ngOnInit() - } else { - this.sb.open("Wystąpił błąd. Skontaktuj się z obsługą programu.") - console.error(res); - } - }) - } - }) - } - - resetPass(id: string) { - this.dialog.open(UserResetComponent).afterClosed().subscribe((res) => { - if (res == true) { - this.ac.accs.resetPass(id).subscribe((patch)=>{ - if (patch.status == 200) { - this.sb.open("Hasło zostało zresetowane", undefined, {duration: 2500}) - } - }) - } - }) - } - - toggleLock(item: any) { - this.ac.accs.putAcc(item._id, {locked: !item.locked}).subscribe((res) => { - if (res.status == 200) { - item.locked = !item.locked - } + openUserCard(id?: string) { + this.dialog.open(UserEditComponent, {data: {id: id, type: id ? "edit" : "new", groups: this.groups}}).afterClosed().subscribe(r => { + if (r) this.ngOnInit() }) } diff --git a/src/app/admin-view/account-mgmt/user-edit/user-edit.component.html b/src/app/admin-view/account-mgmt/user-edit/user-edit.component.html index 0d278b4..baad3aa 100644 --- a/src/app/admin-view/account-mgmt/user-edit/user-edit.component.html +++ b/src/app/admin-view/account-mgmt/user-edit/user-edit.component.html @@ -1,39 +1,67 @@ -
- - Imię - - - - Nazwisko - - - - Pokój - - - - Nazwa użytkownika - - - - Grupy - - @for (item of groups; track $index) { - {{item.name}} +

Karta użytkownika

+ + +
+ + Imię + + + + Nazwisko + + + + Pokój + + + + Grupy + + @for (item of groups; track $index) { + {{item.name}} + } + + + Data rejestracji:
{{regDate?.format('DD.MM.YYYY')}} +
+
+ + Nazwa użytkownika + + + @if (data.type == "edit") { + + @if (locked) { + + } @else { + + } + @if (lockout) { + + } @else { + + } + + Uprawnienia + + Wiadomości + Jadłospis + Powiadomienia + Grupy + Konta + Klucze + Czystość + + } - - - - Uprawnienia - - Wiadomości - Jadłospis - Powiadomienia - Grupy - Konta - Klucze - Czystość - - - - \ No newline at end of file +
+ + + + @if (data.type == "edit") { + + } + + + + \ No newline at end of file diff --git a/src/app/admin-view/account-mgmt/user-edit/user-edit.component.scss b/src/app/admin-view/account-mgmt/user-edit/user-edit.component.scss index e269236..9290470 100644 --- a/src/app/admin-view/account-mgmt/user-edit/user-edit.component.scss +++ b/src/app/admin-view/account-mgmt/user-edit/user-edit.component.scss @@ -4,7 +4,29 @@ } form { + margin-top: 1ch !important; display: flex; - flex-direction: column; + grid-auto-flow: column; + flex-direction: row; + flex-wrap: wrap; align-items: center; + justify-content: center; + column-gap: 3ch; + div { + display: grid; + grid-template-columns: 1fr; + grid-template-rows: repeat(5, 1fr); + align-items: center; + button { + align-self: stretch; + justify-self: stretch; + height: auto; + margin-bottom: 1lh; + } + } +} + +mat-dialog-actions { + display: flex; + justify-content: flex-end; } \ No newline at end of file diff --git a/src/app/admin-view/account-mgmt/user-edit/user-edit.component.ts b/src/app/admin-view/account-mgmt/user-edit/user-edit.component.ts index 76bdc20..64d05a3 100644 --- a/src/app/admin-view/account-mgmt/user-edit/user-edit.component.ts +++ b/src/app/admin-view/account-mgmt/user-edit/user-edit.component.ts @@ -1,52 +1,126 @@ import { Component, Inject } from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material/dialog'; import { FormControl, FormGroup } from '@angular/forms'; import { LocalStorageService } from 'src/app/services/local-storage.service'; import { Group } from 'src/app/types/group'; +import { AdminCommService } from '../../admin-comm.service'; +import { UserDeleteComponent } from '../user-delete/user-delete.component'; +import { MatSnackBar } from '@angular/material/snack-bar'; +import { UserResetComponent } from '../user-reset/user-reset.component'; +import { catchError, throwError } from 'rxjs'; +import { Moment } from 'moment'; +import * as moment from 'moment'; + +export namespace UserEditComponent { + export type InputData = {type: "new" | "edit", id?: string, groups: Group[]} + export type ReturnData = true | undefined +} @Component({ selector: 'app-user-edit', templateUrl: './user-edit.component.html', styleUrls: ['./user-edit.component.scss'] }) -export class UserEditComponent { - form: FormGroup +export class UserEditComponent { + lockout = false; + locked = false; + loading = false; + form: FormGroup = new FormGroup({ + fname: new FormControl(""), + surname: new FormControl(""), + room: new FormControl(""), + uname: new FormControl(""), + groups: new FormControl>([]), + flags: new FormControl>([]), + }) groups: Group[] - constructor (public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data: any, readonly ls: LocalStorageService) { - if (data.user == null) { - data.user = { - fname: "", - surname: "", - room: "", - uname: "", - groups: [], - admin: 0 + id?: string + regDate?: Moment; + constructor ( + public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: UserEditComponent.InputData, + readonly ls: LocalStorageService, + readonly acu: AdminCommService, + private dialog: MatDialog, + private sb: MatSnackBar + ) { + this.groups = data.groups + if (data.type == "edit") { + this.id = data.id + this.acu.accs.getUser(data.id!).subscribe((r) => { + this.regDate = moment(r.regDate) + var flags: Array = [] + if (r.admin) { + if ((r.admin & 1) == 1) flags.push(1) + if ((r.admin & 2) == 2) flags.push(2) + if ((r.admin & 4) == 4) flags.push(4) + if ((r.admin & 8) == 8) flags.push(8) + if ((r.admin & 16) == 16) flags.push(16) + if ((r.admin & 32) == 32) flags.push(32) + if ((r.admin & 64) == 64) flags.push(64) + if ((r.admin & 128) == 128) flags.push(128) + } + this.locked = r.locked ? true : false + this.lockout = r.lockout + this.form.get("fname")?.setValue(r.fname) + this.form.get("surname")?.setValue(r.surname) + this.form.get("room")?.setValue(r.room) + this.form.get("uname")?.setValue(r.uname) + this.form.get("groups")?.setValue(r.groups) + this.form.get("flags")?.setValue(flags) + }) + } + } + + protected submit() { + this.loading = true + if (this.data.type == "edit") { + this.acu.accs.putAcc(this.id!, this.getForm()).pipe(catchError((err)=>{ + this.sb.open("Wystąpił błąd. Skontaktuj się z obsługą programu.") + return throwError(()=> new Error(err.message)) + })).subscribe((data)=> { + if (data.status == 200) { + this.sb.open("Użytkownik został zmodyfikowany.", undefined, {duration: 2500}) + this.dialogRef.close(true) + } else { + this.sb.open("Wystąpił błąd. Skontaktuj się z obsługą programu.") + this.loading = false + } + }) + } else { + this.acu.accs.postAcc(this.getForm()).pipe(catchError((err)=>{ + this.sb.open("Wystąpił błąd. Skontaktuj się z obsługą programu.") + return throwError(()=> new Error(err.message)) + })).subscribe((data)=> { + if (data.status == 201) { + this.sb.open("Użytkownik został utworzony.", undefined, {duration: 2500}) + this.dialogRef.close(true) + } else { + this.sb.open("Wystąpił błąd. Skontaktuj się z obsługą programu.") + this.loading = false + } + }) + } + } + + protected disableLockout() { + this.loading = true + this.acu.accs.clearLockout(this.id!).pipe(catchError((err)=>{ + this.sb.open("Wystąpił błąd. Skontaktuj się z obsługą programu.") + return throwError(()=> new Error(err.message)) + })).subscribe((s) => { + if (s.status == 200) { + this.loading = false + this.lockout = false + } else { + this.sb.open("Wystąpił błąd. Skontaktuj się z obsługą programu.") + this.loading = false } - } - this.groups = data.groups ? data.groups : [] - var flags: Array = [] - if (data.user.admin) { - if ((data.user.admin & 1) == 1) flags.push(1) - if ((data.user.admin & 2) == 2) flags.push(2) - if ((data.user.admin & 4) == 4) flags.push(4) - if ((data.user.admin & 8) == 8) flags.push(8) - if ((data.user.admin & 16) == 16) flags.push(16) - if ((data.user.admin & 32) == 32) flags.push(32) - if ((data.user.admin & 64) == 64) flags.push(64) - if ((data.user.admin & 128) == 128) flags.push(128) - } - this.form = new FormGroup({ - fname: new FormControl(data.user.fname), - surname: new FormControl(data.user.surname), - room: new FormControl(data.user.room), - uname: new FormControl(data.user.uname), - groups: new FormControl>(data.user.groups), - flags: new FormControl>(flags), }) } - protected editUser() { - this.dialogRef.close({ + protected getForm() { + return { fname: this.form.get('fname')?.value, surname: this.form.get('surname')?.value, room: this.form.get('room')?.value, @@ -60,6 +134,44 @@ export class UserEditComponent { return undefined } })() + } + } + + protected delete() { + this.dialog.open(UserDeleteComponent).afterClosed().subscribe(reply => { + if (reply) { + this.acu.accs.deleteAcc(this.id!).subscribe((res) => { + if (res.status == 200) { + this.sb.open("Użytkownik został usunięty.", undefined, {duration: 2500}) + this.dialogRef.close() + } else { + this.sb.open("Wystąpił błąd. Skontaktuj się z obsługą programu.") + console.error(res); + } + }) + } + }) + } + + protected resetPass() { + this.loading = true + this.dialog.open(UserResetComponent).afterClosed().subscribe((res) => { + if (res == true) { + this.acu.accs.resetPass(this.id!).subscribe((patch)=>{ + if (patch.status == 200) { + this.sb.open("Hasło zostało zresetowane", undefined, {duration: 2500}) + this.loading = false + } + }) + } + }) + } + + protected toggleLock(state: boolean) { + this.acu.accs.putAcc(this.id!, {locked: state}).subscribe((res) => { + if (res.status == 200) { + this.locked = state + } }) } } diff --git a/src/app/admin-view/admin-comm.service.ts b/src/app/admin-view/admin-comm.service.ts index f81e9c2..775dddf 100644 --- a/src/app/admin-view/admin-comm.service.ts +++ b/src/app/admin-view/admin-comm.service.ts @@ -131,7 +131,7 @@ export class AdminCommService { return this.http.post(environment.apiEndpoint+`/admin/accs`, item, {withCredentials: true}) }, - putAcc: (id: string, update: object) => { + putAcc: (id: string, update: Partial) => { return this.http.put(environment.apiEndpoint+`/admin/accs/${id}`, update, {withCredentials: true}) }, @@ -141,6 +141,14 @@ export class AdminCommService { deleteAcc: (id: string) => { return this.http.delete(environment.apiEndpoint+`/admin/accs/${id}`, {withCredentials: true}) + }, + + getUser: (id: string) => { + return this.http.get & {lockout: boolean}>(environment.apiEndpoint+`/admin/accs/${id}`, {withCredentials: true}) + }, + + clearLockout: (id: string) => { + return this.http.delete(environment.apiEndpoint+`/admin/accs/${id}/lockout`, {withCredentials: true}) } } //#endregion @@ -174,6 +182,17 @@ export class AdminCommService { }, getGroups: () => { return this.http.get(environment.apiEndpoint+"/admin/notif/groups", {withCredentials: true}) + }, + outbox: { + getSent: () => { + return this.http.get<{_id: string, sentDate: moment.Moment, title: string}[]>(environment.apiEndpoint+"/admin/notif/outbox", {withCredentials: true}) + }, + getBody: (id: string) => { + return this.http.get(environment.apiEndpoint+`/admin/notif/outbox/${id}/message`, {withCredentials: true, responseType: "text"}) + }, + getRcpts: (id: string) => { + return this.http.get<{_id: string, uname: string, room?: string, fname?: string, surname?: string}[]>(environment.apiEndpoint+`/admin/notif/outbox/${id}/rcpts`, {withCredentials: true}) + } } } //#endregion @@ -233,7 +252,7 @@ export class AdminCommService { return this.http.post(environment.apiEndpoint+`/admin/clean/attendence/${room}`, attendence, {withCredentials: true}) }, getSummary: () => { - return this.http.get<{room: string, hours: string[], notes: string}[]>(environment.apiEndpoint+`/admin/clean/attendenceSummary`, {withCredentials: true}) + return this.http.get<{room: string, hours: string[], notes: string, auto: boolean}[]>(environment.apiEndpoint+`/admin/clean/attendenceSummary`, {withCredentials: true}) }, deleteRoom: (room: string) => { return this.http.delete(environment.apiEndpoint+`/admin/clean/attendence/${room}`, {withCredentials: true}) diff --git a/src/app/admin-view/admin-view.component.html b/src/app/admin-view/admin-view.component.html index e8cfc0b..60b4a15 100644 --- a/src/app/admin-view/admin-view.component.html +++ b/src/app/admin-view/admin-view.component.html @@ -1,17 +1,4 @@ - - - {{title.getTitle()}} - - - - - @for (item of toolbar.menu; track $index) { - - } - + diff --git a/src/app/admin-view/admin-view.component.ts b/src/app/admin-view/admin-view.component.ts index 38fe929..717b90d 100644 --- a/src/app/admin-view/admin-view.component.ts +++ b/src/app/admin-view/admin-view.component.ts @@ -1,9 +1,7 @@ import { Component } from '@angular/core'; -import { Title } from '@angular/platform-browser'; import { Router } from '@angular/router'; import { LocalStorageService } from '../services/local-storage.service'; import { Link } from '../types/link'; -import { ToolbarService } from './toolbar.service'; @Component({ selector: 'app-admin-view', @@ -26,7 +24,7 @@ export class AdminViewComponent { public get LINKS(): Link[] { return this._LINKS.filter(v => v.enabled); } - constructor(readonly title: Title, readonly router: Router, readonly ls: LocalStorageService, protected toolbar: ToolbarService) { } + constructor(readonly router: Router, readonly ls: LocalStorageService) { } goNormal() { this.router.navigateByUrl('app') } diff --git a/src/app/admin-view/grades/attendence-summary/attendence-summary.component.html b/src/app/admin-view/grades/attendence-summary/attendence-summary.component.html index 760c99b..7d08dbf 100644 --- a/src/app/admin-view/grades/attendence-summary/attendence-summary.component.html +++ b/src/app/admin-view/grades/attendence-summary/attendence-summary.component.html @@ -18,7 +18,7 @@
- + diff --git a/src/app/admin-view/grades/attendence-summary/attendence-summary.component.ts b/src/app/admin-view/grades/attendence-summary/attendence-summary.component.ts index 900ab29..c2d5e25 100644 --- a/src/app/admin-view/grades/attendence-summary/attendence-summary.component.ts +++ b/src/app/admin-view/grades/attendence-summary/attendence-summary.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { ToolbarService } from '../../toolbar.service'; +import { ToolbarService } from '../../toolbar/toolbar.service'; import { Router, ActivatedRoute } from '@angular/router'; import { MatTableDataSource } from '@angular/material/table'; import { AdminCommService } from '../../admin-comm.service'; @@ -11,7 +11,7 @@ import { AdminCommService } from '../../admin-comm.service'; }) export class AttendenceSummaryComponent implements OnInit { - data: MatTableDataSource<{room: string, hours: string[], notes: string}> = new MatTableDataSource<{room: string, hours: string[], notes: string}>(); + data: MatTableDataSource<{room: string, hours: string[], notes: string, auto: boolean}> = new MatTableDataSource<{room: string, hours: string[], notes: string, auto: boolean}>(); collumns = ['room', 'hours', 'actions'] constructor (private toolbar: ToolbarService, private router: Router, private route: ActivatedRoute, private ac: AdminCommService) { diff --git a/src/app/admin-view/grades/grades.component.ts b/src/app/admin-view/grades/grades.component.ts index 5c75ce1..24078f9 100644 --- a/src/app/admin-view/grades/grades.component.ts +++ b/src/app/admin-view/grades/grades.component.ts @@ -4,7 +4,7 @@ import * as moment from 'moment'; import { FormArray, FormBuilder } from '@angular/forms'; import { weekendFilter } from 'src/app/fd.da'; import { MatSnackBar } from '@angular/material/snack-bar'; -import { ToolbarService } from '../toolbar.service'; +import { ToolbarService } from '../toolbar/toolbar.service'; import { ActivatedRoute, Router } from '@angular/router'; import { MatDialog } from '@angular/material/dialog'; import { AttendenceComponent } from './attendence/attendence.component'; @@ -49,8 +49,8 @@ export class GradesComponent implements OnInit, OnDestroy { if (!this.filter(this.date)) this.date.isoWeekday(8); this.toolbar.comp = this this.toolbar.menu = [ + { title: "Pokoje do sprawdzenia", check: true, fn: "attendenceSummary", icon: "overview"}, { title: "Podsumowanie", check: true, fn: "summary", icon: "analytics" }, - { title: "Obecność", check: true, fn: "attendenceSummary", icon: "overview"} ] this.form.valueChanges.subscribe((v) => { this.calculate() diff --git a/src/app/admin-view/grades/summary/summary.component.ts b/src/app/admin-view/grades/summary/summary.component.ts index 5f8b10d..1a0859d 100644 --- a/src/app/admin-view/grades/summary/summary.component.ts +++ b/src/app/admin-view/grades/summary/summary.component.ts @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; -import { ToolbarService } from '../../toolbar.service'; +import { ToolbarService } from '../../toolbar/toolbar.service'; import { ActivatedRoute, Router } from '@angular/router'; import { AdminCommService } from '../../admin-comm.service'; import * as moment from 'moment'; diff --git a/src/app/admin-view/key/key.component.html b/src/app/admin-view/key/key.component.html index 85fb7aa..200618d 100644 --- a/src/app/admin-view/key/key.component.html +++ b/src/app/admin-view/key/key.component.html @@ -8,7 +8,7 @@ - +
{{element.uname}} AkcjeKarta użytkownika - - - - +
Usuń
diff --git a/src/app/admin-view/key/new-key/new-key.component.html b/src/app/admin-view/key/new-key/new-key.component.html index 56d3310..c1ef8ad 100644 --- a/src/app/admin-view/key/new-key/new-key.component.html +++ b/src/app/admin-view/key/new-key/new-key.component.html @@ -1,6 +1,6 @@
- + Sala @for (item of rooms; track $index) { @@ -9,17 +9,9 @@ Wymagane - + Wypożyczający - - - - Zła nazwa użytkownika + Wymagane diff --git a/src/app/admin-view/key/new-key/new-key.component.ts b/src/app/admin-view/key/new-key/new-key.component.ts index 4d02e89..f9969fb 100644 --- a/src/app/admin-view/key/new-key/new-key.component.ts +++ b/src/app/admin-view/key/new-key/new-key.component.ts @@ -1,8 +1,8 @@ -import { Component, ElementRef, OnInit, ViewChild } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; import { AdminCommService } from '../../admin-comm.service'; import { MatDialogRef } from '@angular/material/dialog'; import { FormControl, FormGroup } from '@angular/forms'; -import { startWith } from 'rxjs'; +import { UserSearchResult } from 'src/app/commonComponents/user-search/user-search.component'; @Component({ selector: 'app-new-key', @@ -10,11 +10,10 @@ import { startWith } from 'rxjs'; styleUrl: './new-key.component.scss' }) export class NewKeyComponent implements OnInit { - // @ViewChild('input') input!: ElementRef rooms: string[] = [] form = new FormGroup({ room: new FormControl(""), - user: new FormControl("") + user: new FormControl(null) }) unames: any[] = [] constructor ( private ac: AdminCommService, public dialogRef: MatDialogRef ) {} @@ -24,26 +23,11 @@ export class NewKeyComponent implements OnInit { this.rooms = v }) } - - // filter() { - // const v = this.input.nativeElement.value - // console.log(v); - - // if (v) { - // this.ac.userFilter(v.toLowerCase()).subscribe((v) => { - // this.unames = v - // }) - // } else { - // this.unames = [] - // } - // } send() { if (this.form.valid) { this.dialogRef.close(this.form.value) - } else { - this.form.controls['user'].setErrors({unf: true}) - } + } } } diff --git a/src/app/admin-view/menu-new/menu-add/menu-add.component.ts b/src/app/admin-view/menu-new/menu-add/menu-add.component.ts index d320ab8..ff9c0fc 100644 --- a/src/app/admin-view/menu-new/menu-add/menu-add.component.ts +++ b/src/app/admin-view/menu-new/menu-add/menu-add.component.ts @@ -31,7 +31,7 @@ export class MenuAddComponent { submit() { switch (this.type) { case "day": - this.dialogRef.close({type: "day", value: this.day.utc()}) + this.dialogRef.close({type: "day", value: this.day.utc().startOf('day')}) break; case "week": this.dialogRef.close({type: "week", value: {start: this.range.value.start?.utc().hours(24), count: 5}}) diff --git a/src/app/admin-view/menu-new/menu-new.component.ts b/src/app/admin-view/menu-new/menu-new.component.ts index 41361c0..41a2e49 100644 --- a/src/app/admin-view/menu-new/menu-new.component.ts +++ b/src/app/admin-view/menu-new/menu-new.component.ts @@ -101,11 +101,11 @@ export class MenuNewComponent { } editSn(id: string) { - this.ac.menu.editSn(id, this.dataSource.data.find(v => v._id == id)?.sn).subscribe(s => this.refreshIfGood(s)) + this.ac.menu.editSn(id, this.dataSource.data.find(v => v._id == id)!.sn).subscribe(s => this.refreshIfGood(s)) } editOb(id: string) { - this.ac.menu.editOb(id, this.dataSource.data.find(v => v._id == id)?.ob).subscribe(s => this.refreshIfGood(s)) + this.ac.menu.editOb(id, this.dataSource.data.find(v => v._id == id)!.ob).subscribe(s => this.refreshIfGood(s)) } editKol(id: string) { diff --git a/src/app/admin-view/news-edit/news-edit.component.html b/src/app/admin-view/news-edit/news-edit.component.html index 6ad5dfc..b2525c3 100644 --- a/src/app/admin-view/news-edit/news-edit.component.html +++ b/src/app/admin-view/news-edit/news-edit.component.html @@ -22,4 +22,9 @@

{{item.date | date:'d-LL-yyyy HH:mm'}}

 + + +

+ Brak wiadomości. +

\ No newline at end of file diff --git a/src/app/admin-view/news-edit/news-edit.component.scss b/src/app/admin-view/news-edit/news-edit.component.scss index 616c118..efcf568 100644 --- a/src/app/admin-view/news-edit/news-edit.component.scss +++ b/src/app/admin-view/news-edit/news-edit.component.scss @@ -22,6 +22,10 @@ mat-card-content p { white-space: pre-line; } +mat-card p { + margin: 15px; +} + button { margin-right: 4pt; } diff --git a/src/app/admin-view/notifications/notifications.component.html b/src/app/admin-view/notifications/notifications.component.html index 0be7e21..c5fec6a 100644 --- a/src/app/admin-view/notifications/notifications.component.html +++ b/src/app/admin-view/notifications/notifications.component.html @@ -1,11 +1,10 @@ -
- + - Nazwa użytkownika - + Użytkownik + diff --git a/src/app/admin-view/notifications/notifications.component.ts b/src/app/admin-view/notifications/notifications.component.ts index 9b5de2e..9bc99f9 100644 --- a/src/app/admin-view/notifications/notifications.component.ts +++ b/src/app/admin-view/notifications/notifications.component.ts @@ -1,20 +1,32 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { FormControl, FormGroup } from '@angular/forms'; import { AdminCommService } from '../admin-comm.service'; import { Notification } from 'src/app/types/notification'; import { Group } from 'src/app/types/group'; import { LocalStorageService } from 'src/app/services/local-storage.service'; +import { ToolbarService } from '../toolbar/toolbar.service'; +import { ActivatedRoute, Router } from '@angular/router'; +import { UserSearchResult } from 'src/app/commonComponents/user-search/user-search.component'; @Component({ selector: 'app-notifications', templateUrl: './notifications.component.html', styleUrls: ['./notifications.component.scss'] }) -export class NotificationsComponent implements OnInit { +export class NotificationsComponent implements OnInit, OnDestroy { groups!: Group[] - constructor (private readonly acs: AdminCommService, readonly ls: LocalStorageService) { } + constructor (private readonly acs: AdminCommService, readonly ls: LocalStorageService, private toolbar: ToolbarService, private router: Router, private route: ActivatedRoute ) { + this.toolbar.comp = this + this.toolbar.menu = [ + { title: "Wysłane", fn: "outbox", icon: "outbox" } + ] + } + + outbox() { + this.router.navigate(["outbox"], { relativeTo: this.route }) + } ngOnInit(): void { this.acs.notif.getGroups().subscribe((v) => { @@ -22,11 +34,20 @@ export class NotificationsComponent implements OnInit { }) } + ngOnDestroy(): void { + this.toolbar.comp = undefined + this.toolbar.menu = undefined + } + + public inbox() { + + } + success?: { sent: number; possible: number; }; - form = new FormGroup({ + form = new FormGroup({ recp: new FormGroup({ - uname: new FormControl(''), + uid: new FormControl(null), room: new FormControl(null), group: new FormControl(''), type: new FormControl<"room" | "uname" | "group">('uname', {nonNullable: true}) @@ -36,19 +57,8 @@ export class NotificationsComponent implements OnInit { }) submit() { - this.acs.notif.send(this.form.value as Notification).subscribe((data) => { + this.acs.notif.send({...this.form.value, recp: {...this.form.get("recp")?.value, uid: this.form.controls['recp'].controls['uid'].value?._id}} as Notification).subscribe((data) => { this.success = data }) } } - -interface NotificationForm { - body: FormControl; - title: FormControl; - recp: FormGroup<{ - uname: FormControl; - room: FormControl; - group: FormControl; - type: FormControl<"room" | "uname" | "group">; - }> -} \ No newline at end of file diff --git a/src/app/admin-view/notifications/outbox/message/message.component.html b/src/app/admin-view/notifications/outbox/message/message.component.html new file mode 100644 index 0000000..02eec4f --- /dev/null +++ b/src/app/admin-view/notifications/outbox/message/message.component.html @@ -0,0 +1,31 @@ + + + + + {{item.title}} + + {{item.sentDate.format('[Wysłano] dddd DD MMMM YYYYr. o HH:mm')}} + + + +

+ {{body}} +

+
+
    + @for (user of rcpts; track $index) { +
  • + {{user.room}}: {{user.fname}} {{user.surname}} ({{user.uname}}) +
    • + } +
+ + + + + + + + + \ No newline at end of file diff --git a/src/app/admin-view/notifications/outbox/message/message.component.scss b/src/app/admin-view/notifications/outbox/message/message.component.scss new file mode 100644 index 0000000..68af8c3 --- /dev/null +++ b/src/app/admin-view/notifications/outbox/message/message.component.scss @@ -0,0 +1,3 @@ +mat-card-title { + font-size: 24pt; +} \ No newline at end of file diff --git a/src/app/admin-view/notifications/outbox/message/message.component.spec.ts b/src/app/admin-view/notifications/outbox/message/message.component.spec.ts new file mode 100644 index 0000000..d4bdb50 --- /dev/null +++ b/src/app/admin-view/notifications/outbox/message/message.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { MessageComponent } from './message.component'; + +describe('MessageComponent', () => { + let component: MessageComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [MessageComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(MessageComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/admin-view/notifications/outbox/message/message.component.ts b/src/app/admin-view/notifications/outbox/message/message.component.ts new file mode 100644 index 0000000..f84cd56 --- /dev/null +++ b/src/app/admin-view/notifications/outbox/message/message.component.ts @@ -0,0 +1,31 @@ +import { Component, Input } from '@angular/core'; +import { AdminCommService } from 'src/app/admin-view/admin-comm.service'; + +@Component({ + selector: 'app-message', + templateUrl: './message.component.html', + styleUrl: './message.component.scss' +}) +export class MessageComponent { + @Input() item!: {_id: string, sentDate: moment.Moment, title: string} + body?: string + rcpts?: {_id: string, uname: string, room?: string, fname?: string, surname?: string}[] + loading: boolean = false + constructor (readonly acu: AdminCommService) {} + + getMessage() { + this.loading = true + this.acu.notif.outbox.getBody(this.item._id).subscribe(v => { + this.body = v + this.loading = false + }) + } + + getRcpts() { + this.loading = true + this.acu.notif.outbox.getRcpts(this.item._id).subscribe(v => { + this.rcpts = v + this.loading = false + }) + } +} diff --git a/src/app/admin-view/notifications/outbox/outbox.component.html b/src/app/admin-view/notifications/outbox/outbox.component.html new file mode 100644 index 0000000..9b36659 --- /dev/null +++ b/src/app/admin-view/notifications/outbox/outbox.component.html @@ -0,0 +1,6 @@ +

Wysłane wiadomości:

+
+ @for (item of messages; track $index) { + + } +
\ No newline at end of file diff --git a/src/app/admin-view/notifications/outbox/outbox.component.scss b/src/app/admin-view/notifications/outbox/outbox.component.scss new file mode 100644 index 0000000..0702771 --- /dev/null +++ b/src/app/admin-view/notifications/outbox/outbox.component.scss @@ -0,0 +1,6 @@ +.cardContainer { + display: flex; + flex-wrap: wrap; + gap: 1ch; + margin: 1ch; +} \ No newline at end of file diff --git a/src/app/admin-view/notifications/outbox/outbox.component.spec.ts b/src/app/admin-view/notifications/outbox/outbox.component.spec.ts new file mode 100644 index 0000000..8802dca --- /dev/null +++ b/src/app/admin-view/notifications/outbox/outbox.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { OutboxComponent } from './outbox.component'; + +describe('OutboxComponent', () => { + let component: OutboxComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [OutboxComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(OutboxComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/admin-view/notifications/outbox/outbox.component.ts b/src/app/admin-view/notifications/outbox/outbox.component.ts new file mode 100644 index 0000000..b1e2fc2 --- /dev/null +++ b/src/app/admin-view/notifications/outbox/outbox.component.ts @@ -0,0 +1,42 @@ +import { Component, OnInit } from '@angular/core'; +import { AdminCommService } from '../../admin-comm.service'; +import { Router, ActivatedRoute } from '@angular/router'; +import { ToolbarService } from '../../toolbar/toolbar.service'; +import * as moment from 'moment'; + +@Component({ + selector: 'app-outbox', + templateUrl: './outbox.component.html', + styleUrl: './outbox.component.scss' +}) +export class OutboxComponent implements OnInit { + + messages!: { + _id: string; + sentDate: moment.Moment; + title: string; + }[] + + constructor (private readonly acs: AdminCommService, private toolbar: ToolbarService, private router: Router, private route: ActivatedRoute ) { + this.toolbar.comp = this + this.toolbar.menu = [ + { title: "Powiadomienia", fn: "goBack", icon: "arrow_back" } + ] + } + + goBack() { + this.router.navigate(['../'], {relativeTo: this.route}) + } + + ngOnInit(): void { + this.acs.notif.outbox.getSent().subscribe((v) => { + this.messages = v.map(i => { + return { + ...i, + sentDate: moment(i.sentDate) + } + }) + }) + } + +} diff --git a/src/app/admin-view/settings/settings.component.html b/src/app/admin-view/settings/settings.component.html index 65b3708..9c4f03e 100644 --- a/src/app/admin-view/settings/settings.component.html +++ b/src/app/admin-view/settings/settings.component.html @@ -1,4 +1,5 @@ + @@ -8,6 +9,8 @@

Kliknij listę aby edytować

 + + Powody nieczystości @@ -16,6 +19,8 @@

Kliknij listę aby edytować

 + + Sale z kluczami @@ -23,6 +28,68 @@ + + + + + Domyślne wpisy jadłospisu + + +
Sala
+ + + + + + + + + + + + + +
Domyślne wpisy w jadłospisie dla danych pozycji
ŚniadanieKolacja
+ + + +
+ + + + + + Bezpieczeństwo + + + +

+ Domyślne hasło użytkownika po wygenerowaniu konto to pierwszelogowanie
+ Reset hasła powoduje zmianę na reset +

+ +

Ograniczenia logowania

+ + Dozwolone próby logowania + +
+ + Okres liczenia prób + + Podaj w minutach +
+ + Czas blokady konta + + Podaj w minutach +
+ + + + + + + Sterowanie programem @@ -41,4 +108,5 @@ Wyloguj wszystkich użytkowników --> + \ No newline at end of file diff --git a/src/app/admin-view/settings/settings.component.ts b/src/app/admin-view/settings/settings.component.ts index c16c921..11b2d36 100644 --- a/src/app/admin-view/settings/settings.component.ts +++ b/src/app/admin-view/settings/settings.component.ts @@ -1,6 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { AdminCommService } from '../admin-comm.service'; import { MatSnackBar } from '@angular/material/snack-bar'; +import { FormBuilder } from '@angular/forms'; @Component({ selector: 'app-settings', @@ -11,10 +12,18 @@ export class SettingsComponent implements OnInit { usettings!: IUSettings reloadTimeout: boolean = false; - constructor (private readonly acu: AdminCommService, private readonly sb: MatSnackBar) { } + constructor (private readonly acu: AdminCommService, private readonly sb: MatSnackBar, private readonly fb: FormBuilder) { } + + accSec = this.fb.nonNullable.group({ + attempts: this.fb.nonNullable.control(1), + time: this.fb.nonNullable.control(1), + lockout: this.fb.nonNullable.control(1), + }) + ngOnInit(): void { this.acu.settings.getAll().subscribe((r) => { this.usettings = r + this.accSecTimeouts = r.security.loginTimeout }) } @@ -31,10 +40,39 @@ export class SettingsComponent implements OnInit { this.send() } + saveSn(event: string[]) { + this.usettings.menu.defaultItems.sn = event + this.send() + } + saveKol(event: string[]) { + this.usettings.menu.defaultItems.kol = event + this.send() + } + + saveAccSecTimeouts() { + this.usettings.security.loginTimeout = this.accSecTimeouts + this.send() + } + + set accSecTimeouts(value: IUSettings['security']['loginTimeout']) { + this.accSec.setValue({ + attempts: value.attempts, + lockout: value.lockout / 60, + time: value.time / 60 + }) + } + get accSecTimeouts(): IUSettings['security']['loginTimeout'] { + return { + attempts: this.accSec.controls['attempts'].value, + lockout: this.accSec.controls['lockout'].value * 60, + time: this.accSec.controls['time'].value * 60 + } + } + send() { this.acu.settings.post(this.usettings).subscribe((s) => { if (s.status == 200) { - this.sb.open("Zapisano!", undefined, {duration: 1000}) + this.sb.open("Zapisano!", undefined, { duration: 1000 }) } else { console.error(s); } @@ -51,7 +89,7 @@ export class SettingsComponent implements OnInit { }, 5000); this.acu.settings.reload().subscribe((s) => { if (s.status == 200) { - this.sb.open("Przeładowano ustawienia!", undefined, {duration: 3000}) + this.sb.open("Przeładowano ustawienia!", undefined, { duration: 3000 }) } else { console.error(s); } @@ -63,4 +101,17 @@ export interface IUSettings { keyrooms: string[]; rooms: string[]; cleanThings: string[]; + menu: { + defaultItems: { + sn: string[]; + kol: string[]; + } + }; + security: { + loginTimeout: { + attempts: number; + time: number; + lockout: number; + } + } } \ No newline at end of file diff --git a/src/app/admin-view/start/start.component.html b/src/app/admin-view/start/start.component.html new file mode 100644 index 0000000..8c6c0fe --- /dev/null +++ b/src/app/admin-view/start/start.component.html @@ -0,0 +1 @@ +arrow_upwardWybierz zakładkę w menu \ No newline at end of file diff --git a/src/app/admin-view/start/start.component.scss b/src/app/admin-view/start/start.component.scss new file mode 100644 index 0000000..8e24cb3 --- /dev/null +++ b/src/app/admin-view/start/start.component.scss @@ -0,0 +1,13 @@ +.main { + margin-top: 8px; + margin-left: 16px; + display: flex; + align-items: center; + gap: 1ch; +} + +.icon { + width: fit-content; + height: fit-content; + font-size: 32pt; +} \ No newline at end of file diff --git a/src/app/admin-view/start/start.component.spec.ts b/src/app/admin-view/start/start.component.spec.ts new file mode 100644 index 0000000..2865fd0 --- /dev/null +++ b/src/app/admin-view/start/start.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { StartAdminComponent } from './start.component'; + +describe('StartComponent', () => { + let component: StartAdminComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [StartAdminComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(StartAdminComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/admin-view/start/start.component.ts b/src/app/admin-view/start/start.component.ts new file mode 100644 index 0000000..49e9e98 --- /dev/null +++ b/src/app/admin-view/start/start.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-start', + templateUrl: './start.component.html', + styleUrl: './start.component.scss' +}) +export class StartAdminComponent { + +} diff --git a/src/app/admin-view/toolbar/toolbar.component.html b/src/app/admin-view/toolbar/toolbar.component.html new file mode 100644 index 0000000..24706ab --- /dev/null +++ b/src/app/admin-view/toolbar/toolbar.component.html @@ -0,0 +1,14 @@ + + + {{title.getTitle()}} + + + + + @for (item of _menu; track $index) { + + } + \ No newline at end of file diff --git a/src/app/admin-view/toolbar/toolbar.component.scss b/src/app/admin-view/toolbar/toolbar.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/admin-view/toolbar/toolbar.component.spec.ts b/src/app/admin-view/toolbar/toolbar.component.spec.ts new file mode 100644 index 0000000..a699881 --- /dev/null +++ b/src/app/admin-view/toolbar/toolbar.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ToolbarComponent } from './toolbar.component'; + +describe('ToolbarComponent', () => { + let component: ToolbarComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ToolbarComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(ToolbarComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/admin-view/toolbar/toolbar.component.ts b/src/app/admin-view/toolbar/toolbar.component.ts new file mode 100644 index 0000000..137863c --- /dev/null +++ b/src/app/admin-view/toolbar/toolbar.component.ts @@ -0,0 +1,26 @@ +import { Component, Input, ViewChild } from '@angular/core'; +import { MatDrawer } from '@angular/material/sidenav'; +import { Title } from '@angular/platform-browser'; +import { ToolbarService } from './toolbar.service'; +import { MatMenuTrigger } from '@angular/material/menu'; + +@Component({ + selector: 'app-toolbar', + templateUrl: './toolbar.component.html', + styleUrl: './toolbar.component.scss' +}) +export class ToolbarComponent { + @Input() drawer!: MatDrawer; + @ViewChild(MatMenuTrigger) trigger!: MatMenuTrigger; + + protected _menu?: typeof this.toolbar.menu + + constructor(readonly title: Title, protected toolbar: ToolbarService) { + + } + + openMenu () { + this._menu = this.toolbar.menu + this.trigger.openMenu() + } +} diff --git a/src/app/admin-view/toolbar.service.spec.ts b/src/app/admin-view/toolbar/toolbar.service.spec.ts similarity index 100% rename from src/app/admin-view/toolbar.service.spec.ts rename to src/app/admin-view/toolbar/toolbar.service.spec.ts diff --git a/src/app/admin-view/toolbar.service.ts b/src/app/admin-view/toolbar/toolbar.service.ts similarity index 57% rename from src/app/admin-view/toolbar.service.ts rename to src/app/admin-view/toolbar/toolbar.service.ts index 80c69ff..6bd02da 100644 --- a/src/app/admin-view/toolbar.service.ts +++ b/src/app/admin-view/toolbar/toolbar.service.ts @@ -6,9 +6,6 @@ import { Injectable } from '@angular/core'; export class ToolbarService { public comp?: any; - public menu?: {title: string, check: boolean, icon?: string, fn: string}[] - - constructor() { } - - + public menu?: {title: string, check?: boolean, icon?: string, fn: string}[] + } diff --git a/src/app/admin.guard.ts b/src/app/admin.guard.ts index 1c35f29..047b1e1 100644 --- a/src/app/admin.guard.ts +++ b/src/app/admin.guard.ts @@ -4,6 +4,6 @@ import { LocalStorageService } from './services/local-storage.service'; export const adminGuard: CanActivateChildFn = (childRoute, state) => { const router = inject(Router) - if (inject(LocalStorageService).admin == false) return router.parseUrl('/') + if (inject(LocalStorageService).admin == undefined) return router.parseUrl('/') return true }; diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index c27adbb..664ec13 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -19,6 +19,8 @@ import { SummaryComponent } from './admin-view/grades/summary/summary.component' import { SettingsComponent } from './admin-view/settings/settings.component'; import { AttendenceSummaryComponent } from './admin-view/grades/attendence-summary/attendence-summary.component'; import { NotificationsComponent } from './admin-view/notifications/notifications.component'; +import { OutboxComponent } from './admin-view/notifications/outbox/outbox.component'; +import { StartAdminComponent } from './admin-view/start/start.component'; const routes: Routes = [ {path: "", redirectTo: "login", pathMatch: "full"}, @@ -30,10 +32,14 @@ const routes: Routes = [ {path: "grades", component: PersonalComponent, title: "Konto"} ]}, {path: "admin", component: AdminViewComponent, title: "Panel administracyjny", canActivateChild: [authGuard, adminGuard], children: [ + {path: "", pathMatch: "full", component: StartAdminComponent}, {path: "news", title: "Edytowanie wiadomości", component: NewsEditComponent}, {path: "menu", title: "Edytowanie jadłospisu", component: MenuNewComponent}, {path: "accounts", title: "Użytkownicy", component: AccountMgmtComponent}, - {path: "notifications", title: "Powiadomienia", component: NotificationsComponent}, + {path: "notifications", children: [ + {path: "", pathMatch: "full", title: "Powiadomienia", component: NotificationsComponent}, + {path: "outbox", title: "Wysłane", component: OutboxComponent} + ]}, {path: "groups", title: "Grupy", component: GroupsComponent}, {path: "keys", title: "Klucze", component: AdminKeyComponent}, {path: "grades", children: [ diff --git a/src/app/app-view/app-view.component.ts b/src/app/app-view/app-view.component.ts index a2bbe43..509833c 100644 --- a/src/app/app-view/app-view.component.ts +++ b/src/app/app-view/app-view.component.ts @@ -6,6 +6,8 @@ import { Link } from '../types/link'; import { LocalStorageService } from '../services/local-storage.service'; import { interval } from 'rxjs'; import { MatSnackBar } from '@angular/material/snack-bar'; +import { MatDialog } from '@angular/material/dialog'; +import { NotifDialogComponent } from './notif-dialog/notif-dialog.component'; @Component({ selector: 'app-app-view', @@ -25,7 +27,14 @@ export class AppViewComponent implements OnInit { }); } - constructor (private ac: AuthClient, readonly swPush: SwPush, private us: UpdatesService, private ls: LocalStorageService, private sb: MatSnackBar) {} + constructor ( + private ac: AuthClient, + readonly swPush: SwPush, + private us: UpdatesService, + private ls: LocalStorageService, + private sb: MatSnackBar, + private dialog: MatDialog + ) {} subscribeToNotif() { if (this.swPush.isEnabled && this.ls.capCheck(4)) { @@ -45,6 +54,13 @@ export class AppViewComponent implements OnInit { } newsCheck() { + if (this.ls.capCheck(4)) { + this.us.getNotifCheck().subscribe((s) => { + s.forEach(v => { + this.dialog.open(NotifDialogComponent, {data: v}) + }) + }) + } if (this.ls.newsflag) return; this.us.newsCheck().subscribe((s) => { if (s.hash != this.ls.newsCheck.hash) { diff --git a/src/app/app-view/menu/menu.component.html b/src/app/app-view/menu/menu.component.html index 269bcda..8810f42 100644 --- a/src/app/app-view/menu/menu.component.html +++ b/src/app/app-view/menu/menu.component.html @@ -13,8 +13,8 @@
  • {{i}}
    • -
  • {{i.charAt(0).toUpperCase()+i.substring(1)}}
    • -
  • {{getsn.second.charAt(0).toUpperCase()+getsn.second.substring(1)}}
    • +
  • {{capitalize(i)}}
    • +
  • {{capitalize(getsn.second)}}
 @@ -51,7 +51,7 @@ - + Brak danych, wybierz inny dzień. diff --git a/src/app/app-view/menu/menu.component.ts b/src/app/app-view/menu/menu.component.ts index d7fa30c..ca0eb09 100644 --- a/src/app/app-view/menu/menu.component.ts +++ b/src/app/app-view/menu/menu.component.ts @@ -32,17 +32,34 @@ export class MenuComponent { } menu?: Menu; - get getsn() {return (this.menu && this.menu.sn) ? this.menu.sn : null} - get getob() {return (this.menu && this.menu.ob) ? this.menu.ob : null} + get getsn() {return (this.menu && this.checkIfAnyProperty(this.menu.sn)) ? this.menu.sn : null} + get getob() {return (this.menu && this.checkIfAnyProperty(this.menu.ob)) ? this.menu.ob : null} get getkol() {return (this.menu && this.menu.kol) ? this.menu.kol : null} get gettitle() {return (this.menu && this.menu.dayTitle && this.menu.dayTitle != "") ? this.menu.dayTitle : null} + private checkIfAnyProperty(obj: { [x: string]: string | string[];}) { + for (let i in obj) { + if (Array.isArray(obj[i])) { + if (obj[i].length > 0) return true + } else { + if (!!obj[i]) return true + } + } + return false + } + + capitalize(str: string) { + return str.charAt(0).toUpperCase()+str.substring(1) + } + updateMenu(silent?: boolean) { this.loading = !silent if (!silent) this.menu = undefined this.uc.getMenu(this.day).subscribe(m => { this.loading = false this.menu = m + console.log(m); + }) } diff --git a/src/app/app-view/news/news.component.html b/src/app/app-view/news/news.component.html index 85fa33f..1caebb4 100644 --- a/src/app/app-view/news/news.component.html +++ b/src/app/app-view/news/news.component.html @@ -9,4 +9,9 @@

{{item.date | date:'d-LL-yyyy HH:mm'}}

 + + +

+ Brak wiadomości. +

\ No newline at end of file diff --git a/src/app/app-view/news/news.component.scss b/src/app/app-view/news/news.component.scss index 6a81a9f..df4b130 100644 --- a/src/app/app-view/news/news.component.scss +++ b/src/app/app-view/news/news.component.scss @@ -29,3 +29,7 @@ mat-card-footer p { mat-card-content p { white-space: pre-line; } + +mat-card p { + margin: 15px; +} \ No newline at end of file diff --git a/src/app/app-view/notif-dialog/notif-dialog.component.html b/src/app/app-view/notif-dialog/notif-dialog.component.html new file mode 100644 index 0000000..9dc65ef --- /dev/null +++ b/src/app/app-view/notif-dialog/notif-dialog.component.html @@ -0,0 +1,10 @@ +

{{data.message.title}}

+ +

+ {{data.message.body}} +

+
{{data.sentDate.format("[Wysłano] dddd DD MMMM YYYYr. o HH:mm")}}
+ + + + \ No newline at end of file diff --git a/src/app/app-view/notif-dialog/notif-dialog.component.scss b/src/app/app-view/notif-dialog/notif-dialog.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/app-view/notif-dialog/notif-dialog.component.spec.ts b/src/app/app-view/notif-dialog/notif-dialog.component.spec.ts new file mode 100644 index 0000000..168d201 --- /dev/null +++ b/src/app/app-view/notif-dialog/notif-dialog.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { NotifDialogComponent } from './notif-dialog.component'; + +describe('NotifDialogComponent', () => { + let component: NotifDialogComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [NotifDialogComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(NotifDialogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/app-view/notif-dialog/notif-dialog.component.ts b/src/app/app-view/notif-dialog/notif-dialog.component.ts new file mode 100644 index 0000000..2b86f52 --- /dev/null +++ b/src/app/app-view/notif-dialog/notif-dialog.component.ts @@ -0,0 +1,27 @@ +import { Component, Inject } from '@angular/core'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import * as moment from 'moment'; +import { UpdatesService } from 'src/app/services/updates.service'; + +@Component({ + selector: 'app-notif-dialog', + templateUrl: './notif-dialog.component.html', + styleUrl: './notif-dialog.component.scss' +}) +export class NotifDialogComponent { + + constructor ( + @Inject(MAT_DIALOG_DATA) public data: {_id: string, message: {title: string, body: string}, sentDate: moment.Moment}, + public dialogRef: MatDialogRef, + private uc: UpdatesService + ) { + data.sentDate = moment(data.sentDate) + } + + ack () { + this.uc.postInfoAck(this.data._id).subscribe((v) => { + this.dialogRef.close() + }) + } + +} diff --git a/src/app/app-view/personal/extra/extra.component.html b/src/app/app-view/personal/extra/extra.component.html new file mode 100644 index 0000000..252f579 --- /dev/null +++ b/src/app/app-view/personal/extra/extra.component.html @@ -0,0 +1,14 @@ +

Dodatkowe ustawienia

+ + + @for (link of LINKS; track link) { + + } + + + + + \ No newline at end of file diff --git a/src/app/app-view/personal/extra/extra.component.scss b/src/app/app-view/personal/extra/extra.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/app-view/personal/extra/extra.component.spec.ts b/src/app/app-view/personal/extra/extra.component.spec.ts new file mode 100644 index 0000000..f89f871 --- /dev/null +++ b/src/app/app-view/personal/extra/extra.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ExtraComponent } from './extra.component'; + +describe('ExtraComponent', () => { + let component: ExtraComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ExtraComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(ExtraComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/app-view/personal/extra/extra.component.ts b/src/app/app-view/personal/extra/extra.component.ts new file mode 100644 index 0000000..e36a40a --- /dev/null +++ b/src/app/app-view/personal/extra/extra.component.ts @@ -0,0 +1,29 @@ +import { ComponentType } from '@angular/cdk/portal'; +import { Component } from '@angular/core'; +import { Link } from 'src/app/types/link'; +import { RedirectComponent } from './redirect/redirect.component'; +import { MatDialog } from '@angular/material/dialog'; + +@Component({ + selector: 'app-extra', + templateUrl: './extra.component.html', + styleUrl: './extra.component.scss' +}) +export class ExtraComponent { + + constructor (private dialog: MatDialog) {} + + private readonly _LINKS: (Omit & {component: ComponentType})[] = [ + { title: "Domyślna strona po logowaniu", component: RedirectComponent, enabled: true, icon: "home" } + ] + + public get LINKS() { + return this._LINKS.filter((v) => { + return v.enabled + }); + } + + open(component: ComponentType) { + this.dialog.open(component) + } +} diff --git a/src/app/app-view/personal/extra/redirect/redirect.component.html b/src/app/app-view/personal/extra/redirect/redirect.component.html new file mode 100644 index 0000000..caed671 --- /dev/null +++ b/src/app/app-view/personal/extra/redirect/redirect.component.html @@ -0,0 +1,14 @@ +

Domyślna strona po logowaniu

+ +

Wpisz link względem /ipwa/ w poniższym polu.

+

Przykład: /app/menu

+

Jeśli nie wiesz co tu wpisać, najlepiej nie zmieniaj tego ustawienia

+ + + Link + + + + + + \ No newline at end of file diff --git a/src/app/app-view/personal/extra/redirect/redirect.component.scss b/src/app/app-view/personal/extra/redirect/redirect.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/app-view/personal/extra/redirect/redirect.component.spec.ts b/src/app/app-view/personal/extra/redirect/redirect.component.spec.ts new file mode 100644 index 0000000..af6541a --- /dev/null +++ b/src/app/app-view/personal/extra/redirect/redirect.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { RedirectComponent } from './redirect.component'; + +describe('RedirectComponent', () => { + let component: RedirectComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [RedirectComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(RedirectComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/app-view/personal/extra/redirect/redirect.component.ts b/src/app/app-view/personal/extra/redirect/redirect.component.ts new file mode 100644 index 0000000..81d0eb4 --- /dev/null +++ b/src/app/app-view/personal/extra/redirect/redirect.component.ts @@ -0,0 +1,20 @@ +import { Component } from '@angular/core'; +import { MatDialogRef } from '@angular/material/dialog'; +import { AuthClient } from 'src/app/services/auth.client'; + +@Component({ + selector: 'app-redirect', + templateUrl: './redirect.component.html', + styleUrl: './redirect.component.scss' +}) +export class RedirectComponent { + protected redirect = "" + constructor (public dialogRef: MatDialogRef, private ac: AuthClient) { + this.redirect = ac.redirect + } + + protected save() { + this.ac.redirect = this.redirect + this.dialogRef.close() + } +} diff --git a/src/app/app-view/personal/personal.component.html b/src/app/app-view/personal/personal.component.html index c4ab40d..b3d43b1 100644 --- a/src/app/app-view/personal/personal.component.html +++ b/src/app/app-view/personal/personal.component.html @@ -30,6 +30,10 @@
Panel administracyjny
Poprzednio Tryb edycji
+