Skip to content
Snippets Groups Projects
Commit a6e24850 authored by alec.schmidt's avatar alec.schmidt
Browse files

frontend refactor done

parent 8dd3a614
Branches
No related tags found
No related merge requests found
...@@ -2,7 +2,7 @@ export type User = { ...@@ -2,7 +2,7 @@ export type User = {
id: number; id: number;
username: string; username: string;
password: string; password: string;
type: string; admin: boolean;
}; };
export type QandA = { export type QandA = {
......
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
<table> <table>
<thead> <thead>
<th>Username</th> <th>Username</th>
<th>Type</th> <th>Admin</th>
</thead> </thead>
<tbody> <tbody>
<tr *ngFor="let user of users"> <tr *ngFor="let user of users">
<td>{{user.username}}</td> <td>{{user.username}}</td>
<td>{{user.type}}</td> <td>{{user.admin}}</td>
<td><button (click)="showUpdateModal(user)">UPDATE</button></td> <td><button (click)="showUpdateModal(user)">UPDATE</button></td>
<td><button (click)="deleteUser(user)">DELETE</button></td> <td><button (click)="deleteUser(user)">DELETE</button></td>
</tr> </tr>
......
...@@ -53,6 +53,7 @@ export class AdminComponent implements OnInit { ...@@ -53,6 +53,7 @@ export class AdminComponent implements OnInit {
} }
showUpdateModal(user: User){ showUpdateModal(user: User){
this.modalUpdate = false;
this.userToEdit = user; this.userToEdit = user;
this.modalUpdate = true; this.modalUpdate = true;
} }
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<br> <br>
<input type="password" placeholder="Password" formControlName="password"> <input type="password" placeholder="Password" formControlName="password">
<br> <br>
<input type="type" placeholder="player" formControlName="type"> <label>Admin</label><input type="checkbox" formControlName="admin">
<br> <br>
<button type="submit">Create</button><button (click)="closeModal.emit()">Close</button> <button type="submit">Create</button><button (click)="closeModal.emit()">Close</button>
</form> </form>
\ No newline at end of file
...@@ -19,20 +19,20 @@ export class CreateUserComponent { ...@@ -19,20 +19,20 @@ export class CreateUserComponent {
this.createUser = new FormGroup({ this.createUser = new FormGroup({
username: new FormControl('', Validators.required), username: new FormControl('', Validators.required),
password: new FormControl('', Validators.required), password: new FormControl('', Validators.required),
type: new FormControl('player', Validators.required) admin: new FormControl(false, Validators.required)
}); });
} }
onSubmit() { onSubmit() {
const username = this.createUser.get("username")!.value; const username = this.createUser.get("username")!.value;
const password = this.createUser.get("password")!.value; const password = this.createUser.get("password")!.value;
const type = this.createUser.get("type")!.value; const type = this.createUser.get("admin")!.value;
const user: User = { const user: User = {
id: undefined, id: undefined,
username : username, username : username,
password: password, password: password,
type: type admin: type
} }
this.userController.addUserAdmin(user); this.userController.addUserAdmin(user);
......
...@@ -59,7 +59,7 @@ export class AuthenticationService { ...@@ -59,7 +59,7 @@ export class AuthenticationService {
if (user === null) if (user === null)
return false; return false;
return user.type === 'admin'; return user.admin;
} }
getUsername(): string { getUsername(): string {
......
...@@ -30,7 +30,7 @@ export class SignupComponent { ...@@ -30,7 +30,7 @@ export class SignupComponent {
onSubmit(): void { onSubmit(): void {
const user: User = { const user: User = {
id: undefined, id: undefined,
type: undefined, admin: undefined,
username: this.signupForm.get('username')!.value, username: this.signupForm.get('username')!.value,
password: this.signupForm.get('password')!.value password: this.signupForm.get('password')!.value
} }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<form [formGroup]="updateUser" (ngSubmit)="onSubmit()"> <form [formGroup]="updateUser" (ngSubmit)="onSubmit()">
<input type="text" formControlName="username"> <input type="text" formControlName="username">
<br> <br>
<input type="text" formControlName="type"> <label>Admin</label><input type="checkbox" formControlName="admin">
<br> <br>
<button type="submit">Update</button><button (click)="closeModal.emit();">Close</button> <button type="submit">Update</button><button (click)="closeModal.emit();">Close</button>
</form> </form>
\ No newline at end of file
...@@ -20,19 +20,20 @@ export class UpdateUserComponent implements OnInit { ...@@ -20,19 +20,20 @@ export class UpdateUserComponent implements OnInit {
ngOnInit(): void { ngOnInit(): void {
this.updateUser = new FormGroup({ this.updateUser = new FormGroup({
username: new FormControl(this.user.username, Validators.required), username: new FormControl(this.user.username, Validators.required),
type: new FormControl(this.user.type, Validators.required) admin: new FormControl(this.user.admin, Validators.required)
}); });
} }
onSubmit() { onSubmit() {
const username = this.updateUser.get("username")!.value; const username = this.updateUser.get("username")!.value;
const type = this.updateUser.get("type")!.value;
const type = this.updateUser.get("admin")!.value;
const userToEdit: User = { const userToEdit: User = {
id: this.user.id, id: this.user.id,
username : username, username : username,
password: undefined, password: undefined,
type: type admin: type
} }
this.userController.updateUser(userToEdit); this.userController.updateUser(userToEdit);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment