From 6e92f01317bcf1d88323b0a3f14921c55cc1303b Mon Sep 17 00:00:00 2001 From: Billy Porter Date: Thu, 6 May 2021 19:09:12 -0400 Subject: [PATCH] Cleans up things --- .../src/app/modules/auth/auth.guard.ts | 6 +- .../app/modules/auth/login/login.component.ts | 4 +- .../auth/register/register.component.html | 44 ++-- .../auth/register/register.component.scss | 22 +- .../auth/register/register.component.ts | 6 +- .../modules/auth/services/handler.service.ts | 8 +- .../modules/auth/services/register.service.ts | 18 +- .../home/enter-game/enter-game.component.ts | 80 +++--- .../home/indiv-game/indiv-game.component.ts | 32 +-- .../src/app/modules/home/nav/nav.component.ts | 2 +- .../modules/home/search/search.component.ts | 6 +- .../modules/home/services/comment.service.ts | 4 +- .../home/services/current-user.service.ts | 6 +- .../app/modules/home/services/feed.service.ts | 30 +-- .../modules/home/services/profile.service.ts | 6 +- .../home/services/search-fetcher.service.ts | 2 +- .../home/services/submit-game.service.ts | 8 +- .../home/settings/settings.component.ts | 235 +++++++++--------- .../home/spec-game/spec-game.component.ts | 22 +- .../app/modules/material/material.module.ts | 2 + 20 files changed, 290 insertions(+), 253 deletions(-) diff --git a/frontend/ruski-app/src/app/modules/auth/auth.guard.ts b/frontend/ruski-app/src/app/modules/auth/auth.guard.ts index 32f4c05..a91e99d 100644 --- a/frontend/ruski-app/src/app/modules/auth/auth.guard.ts +++ b/frontend/ruski-app/src/app/modules/auth/auth.guard.ts @@ -29,13 +29,13 @@ export class AuthGuard implements CanActivate { | boolean | UrlTree { const url: string = state.url; - console.log('here'); + // console.log('here'); if (this.hundler.getStatus()) { return true; } return this.hundler.checkUserExistsByEmail().pipe( map((response: any) => { - console.log(response); + // console.log(response); if (response.length > 0) { return true; } @@ -43,7 +43,7 @@ export class AuthGuard implements CanActivate { return false; }), catchError((error: any) => { - console.log(error); + // console.log(error); return of(null); }) ); diff --git a/frontend/ruski-app/src/app/modules/auth/login/login.component.ts b/frontend/ruski-app/src/app/modules/auth/login/login.component.ts index 4da5c10..f309706 100644 --- a/frontend/ruski-app/src/app/modules/auth/login/login.component.ts +++ b/frontend/ruski-app/src/app/modules/auth/login/login.component.ts @@ -19,10 +19,10 @@ export class LoginComponent implements OnInit, OnChanges { ngOnInit() { this.auth.user$.subscribe((response) => { - // console.log(response); + // // console.log(response); }); this.checkIfLoggedIn().subscribe((response) => { - // console.log(response); + // // console.log(response); if (response) { this.router.navigate(['/main']); } diff --git a/frontend/ruski-app/src/app/modules/auth/register/register.component.html b/frontend/ruski-app/src/app/modules/auth/register/register.component.html index a0d2077..0bfa31a 100644 --- a/frontend/ruski-app/src/app/modules/auth/register/register.component.html +++ b/frontend/ruski-app/src/app/modules/auth/register/register.component.html @@ -1,12 +1,13 @@ -

register works!

-
-

This is your first time registering!

-

Please select a name from the dropdown

-

If your name is not in the dropdown, enter your name

-
-
-
-
+Registration + + + Fill out name +
+ The dropdown contains names of people already in the database who + are not yet registered.

If your name is not in dropdown, + enter your own! +
+
Your name: This is your first time registering!
-
+ + + + + Fill out handle +
Desired Handle: @   @@ -35,13 +41,19 @@

This is your first time registering!

/>
-
+ + + Fill out handle + +
+ +
+ + +

{{ errorMessage }}

-
- -
diff --git a/frontend/ruski-app/src/app/modules/auth/register/register.component.scss b/frontend/ruski-app/src/app/modules/auth/register/register.component.scss index 7c1dc9d..621d4a0 100644 --- a/frontend/ruski-app/src/app/modules/auth/register/register.component.scss +++ b/frontend/ruski-app/src/app/modules/auth/register/register.component.scss @@ -13,16 +13,20 @@ } } -.submit { - width: 550px; - margin: auto; +// .submit { +// width: 550px; +// margin: auto; - button { - font-size: 25px; - height: 50px; - width: 200px; - margin-left: 175px; - } +// button { +// font-size: 25px; +// height: 50px; +// width: 200px; +// margin-left: 175px; +// } +// } + +.submit { + margin-top: 40px; } .error { diff --git a/frontend/ruski-app/src/app/modules/auth/register/register.component.ts b/frontend/ruski-app/src/app/modules/auth/register/register.component.ts index 887e787..b3770ca 100644 --- a/frontend/ruski-app/src/app/modules/auth/register/register.component.ts +++ b/frontend/ruski-app/src/app/modules/auth/register/register.component.ts @@ -29,7 +29,7 @@ export class RegisterComponent implements OnInit { ngOnInit(): void { this.reg.fetchUnregUsers().subscribe((response) => { - // console.log(response); + // // console.log(response); this.namesOptions = response.map((user) => user.name); for (const user of response) { this.nameIdMap.set(user.name, user.id); @@ -86,11 +86,11 @@ export class RegisterComponent implements OnInit { }); } else { this.reg.genUser(userName).subscribe((response) => { - // console.log('HERE'); + // // console.log('HERE'); const userId = response; this.reg.submitHandle(userId, userHandle); this.reg.submitEmail(userId).subscribe((response) => { - // console.log(response); + // // console.log(response); this.router.navigate(['/main']); }); }); diff --git a/frontend/ruski-app/src/app/modules/auth/services/handler.service.ts b/frontend/ruski-app/src/app/modules/auth/services/handler.service.ts index d11911e..6d80d9e 100644 --- a/frontend/ruski-app/src/app/modules/auth/services/handler.service.ts +++ b/frontend/ruski-app/src/app/modules/auth/services/handler.service.ts @@ -12,12 +12,12 @@ export class HandlerService { constructor(private apollo: Apollo, public auth: AuthService) {} changeRegistered() { - // console.log('here'); + // // console.log('here'); this.isRegistered = true; } getStatus() { - // console.log(this.isRegistered); + // // console.log(this.isRegistered); return this.isRegistered; } @@ -32,7 +32,7 @@ export class HandlerService { return this.auth.user$.pipe( switchMap((response: any) => { const email = response.email; - // console.log(response); + // // console.log(response); return this.apollo .query({ query: GET_USER, @@ -43,7 +43,7 @@ export class HandlerService { }) .pipe( map((response) => { - // console.log(response); + // // console.log(response); return response.data.userByEmail; }) ); diff --git a/frontend/ruski-app/src/app/modules/auth/services/register.service.ts b/frontend/ruski-app/src/app/modules/auth/services/register.service.ts index 438167f..5f9e26a 100644 --- a/frontend/ruski-app/src/app/modules/auth/services/register.service.ts +++ b/frontend/ruski-app/src/app/modules/auth/services/register.service.ts @@ -11,7 +11,7 @@ export class RegisterService { constructor(private apollo: Apollo, public auth: AuthService) {} fetchUnregUsers() { - console.log('here'); + // console.log('here'); return this.apollo .watchQuery({ query: gql` @@ -62,7 +62,7 @@ export class RegisterService { } submitHandle(id: string, handle: string) { - console.log(id, handle); + // console.log(id, handle); const ADD_HANDLE = gql` mutation ModifyHandle($id: ID!, $handle: String!) { modifyHandle(id: $id, handle: $handle) { @@ -72,7 +72,7 @@ export class RegisterService { } } `; - console.log('here'); + // console.log('here'); this.apollo .mutate({ mutation: ADD_HANDLE, @@ -82,13 +82,13 @@ export class RegisterService { }, }) .subscribe((response) => { - console.log(response); + // console.log(response); }); } submitEmail(id: string) { - console.log('here'); - console.log(id); + // console.log('here'); + // console.log(id); const ADD_EMAIL = gql` mutation ModifyEmail($id: ID!, $email: String!) { modifyEmail(id: $id, email: $email) { @@ -101,7 +101,7 @@ export class RegisterService { return this.auth.user$.pipe( switchMap((response: any) => { const email = response.email; - console.log(email); + // console.log(email); return this.apollo.mutate({ mutation: ADD_EMAIL, @@ -115,7 +115,7 @@ export class RegisterService { } genUser(name: string) { - console.log(name); + // console.log(name); const ADD_USER = gql` mutation AddUser( $email: String! @@ -137,7 +137,7 @@ export class RegisterService { `; return this.auth.user$.pipe( switchMap((response: any) => { - console.log(response); + // console.log(response); let profile_pic = 'https://d26n5v24zcmg6e.cloudfront.net/profiles/default.jpeg'; if (response.hasOwnProperty('picture')) { diff --git a/frontend/ruski-app/src/app/modules/home/enter-game/enter-game.component.ts b/frontend/ruski-app/src/app/modules/home/enter-game/enter-game.component.ts index 9b09ca0..0f9ba55 100644 --- a/frontend/ruski-app/src/app/modules/home/enter-game/enter-game.component.ts +++ b/frontend/ruski-app/src/app/modules/home/enter-game/enter-game.component.ts @@ -2,7 +2,13 @@ import { SubmitGameService } from './../services/submit-game.service'; import { CurrentUserService } from './../services/current-user.service'; import { Game } from './../game-template'; import { Component, OnInit } from '@angular/core'; -import { AbstractControl, FormControl, Validators, FormBuilder,FormGroup } from '@angular/forms'; +import { + AbstractControl, + FormControl, + Validators, + FormBuilder, + FormGroup, +} from '@angular/forms'; import { Observable } from 'rxjs'; import { map, startWith } from 'rxjs/operators'; import { Router } from '@angular/router'; @@ -33,14 +39,18 @@ export class EnterGameComponent implements OnInit { errorFlag: boolean = false; errorMessage: string = ''; - // properties for current user display userPro: string = ''; userName: string = ''; userHandle: string = ''; usered: boolean; - constructor(private gameSubmitter: SubmitGameService, private _formBuilder: FormBuilder, private current:CurrentUserService, private router:Router) {} + constructor( + private gameSubmitter: SubmitGameService, + private _formBuilder: FormBuilder, + private current: CurrentUserService, + private router: Router + ) {} ngOnInit(): void { this.gameSubmitter.fetchUsers().valueChanges.subscribe((response) => { @@ -51,28 +61,27 @@ export class EnterGameComponent implements OnInit { }); this.formGroup = this._formBuilder.group({ formArray: this._formBuilder.array([ - this._formBuilder.group({ - myName : this.myName, - myCups: this.myCups, - myPenalties : this.myPenalties, - partnerName : this.partnerName, - partnerCups : this.partnerCups, - partnerPenalties : this.partnerPenalties, - - }), - this._formBuilder.group({ - oneName : this.oneName, - oneCups : this.oneCups, - onePenalties : this.onePenalties, - twoName : this.twoName, - twoCups : this.twoCups, - twoPenalties : this.twoPenalties - }), - this._formBuilder.group({ - descriptionControl : this.descriptionControl, - }), - ]) - }); + this._formBuilder.group({ + myName: this.myName, + myCups: this.myCups, + myPenalties: this.myPenalties, + partnerName: this.partnerName, + partnerCups: this.partnerCups, + partnerPenalties: this.partnerPenalties, + }), + this._formBuilder.group({ + oneName: this.oneName, + oneCups: this.oneCups, + onePenalties: this.onePenalties, + twoName: this.twoName, + twoCups: this.twoCups, + twoPenalties: this.twoPenalties, + }), + this._formBuilder.group({ + descriptionControl: this.descriptionControl, + }), + ]), + }); this.fillUser(); } get formArray(): AbstractControl | null { @@ -87,10 +96,10 @@ export class EnterGameComponent implements OnInit { } watchValue(formy: FormControl, flag: number) { - console.log(flag); + // console.log(flag); formy.valueChanges.subscribe((response) => { if (response > 10) { - console.log(response); + // console.log(response); if (flag === 1) { this.myCups = new FormControl(10, [ Validators.min(1), @@ -217,20 +226,17 @@ export class EnterGameComponent implements OnInit { return returnValue; } - fillUser(){ - this.current.fetchUser() - .subscribe(response => { + fillUser() { + this.current.fetchUser().subscribe((response) => { const user = response; - this.userPro= user.profile_url; - this.userName= user.name; - this.userHandle= user.handle; - this.usered=true; + this.userPro = user.profile_url; + this.userName = user.name; + this.userHandle = user.handle; + this.usered = true; }); - } goToProfile(handle: string): void { - this.router.navigate([`/main/user/${handle}`]) + this.router.navigate([`/main/user/${handle}`]); } - } diff --git a/frontend/ruski-app/src/app/modules/home/indiv-game/indiv-game.component.ts b/frontend/ruski-app/src/app/modules/home/indiv-game/indiv-game.component.ts index a370523..d9c3e52 100644 --- a/frontend/ruski-app/src/app/modules/home/indiv-game/indiv-game.component.ts +++ b/frontend/ruski-app/src/app/modules/home/indiv-game/indiv-game.component.ts @@ -24,41 +24,41 @@ export class IndivGameComponent implements OnInit, OnChanges { ngOnInit(): void { this.winning_score = 10; - console.log(this.game.likes); + // console.log(this.game.likes); this.losing_score = this.game.l1Cups + this.game.l2Cups; if (this.losing_score > 9) { this.losing_score = this.getRandomInt(5, 9); } - this.game.description = - 'Dennis is very cool. Everyone else sucks. Dennis is very cool. Everyone else sucks. Dennis is very cool. Everyone else sucks. Dennis is very cool. Everyone else sucks. Dennis is very cool. Everyone else sucks. Dennis is very cool. Everyone else sucks.'; + // this.game.description = + // 'Dennis is very cool. Everyone else sucks. Dennis is very cool. Everyone else sucks. Dennis is very cool. Everyone else sucks. Dennis is very cool. Everyone else sucks. Dennis is very cool. Everyone else sucks. Dennis is very cool. Everyone else sucks.'; this.feedFetcher.getGameLikes(this.game.id).subscribe((response) => { if (response.includes(this.userID)) { this.alreadyLiked = true; - // console.log(this.game.id); + // // console.log(this.game.id); } else { - // console.log('nosir'); + // // console.log('nosir'); this.alreadyLiked = false; } if (this.alreadyLiked) { - // console.log(this.game.id); + // // console.log(this.game.id); } }); - // console.log(this.userID); + // // console.log(this.userID); } ngOnChanges() { // this.feedFetcher.getGameLikes(this.game.id).subscribe((response) => { // if (response.includes(this.userID)) { - // // console.log('yessir'); + // // // console.log('yessir'); // this.alreadyLiked = true; - // // console.log(this.game.id); - // // console.log(this.game.likes); + // // // console.log(this.game.id); + // // // console.log(this.game.likes); // } else { - // // console.log('nosir'); + // // // console.log('nosir'); // this.alreadyLiked = false; // } // if (this.alreadyLiked) { - // // console.log(this.game.id); + // // // console.log(this.game.id); // } // }); } @@ -72,7 +72,7 @@ export class IndivGameComponent implements OnInit, OnChanges { navToGame(e: any) { const srcClasses = e.srcElement.className.split(' '); if (srcClasses.includes('likeClick')) { - console.log('yo'); + // console.log('yo'); } else { this.router.navigate(['/main/feed', this.game.id]); } @@ -80,13 +80,13 @@ export class IndivGameComponent implements OnInit, OnChanges { } changeLikeCount(e: any) { - // console.log('here'); - // console.log(e.srcElement.className); + // // console.log('here'); + // // console.log(e.srcElement.className); if (this.alreadyLiked) { this.feedFetcher.decLike(this.game.id, this.userID); this.game.likes -= 1; if (this.game.likes < 0) { - // console.log(this.game.id); + // // console.log(this.game.id); } this.alreadyLiked = false; } else { diff --git a/frontend/ruski-app/src/app/modules/home/nav/nav.component.ts b/frontend/ruski-app/src/app/modules/home/nav/nav.component.ts index 03e0d9f..5d1df07 100644 --- a/frontend/ruski-app/src/app/modules/home/nav/nav.component.ts +++ b/frontend/ruski-app/src/app/modules/home/nav/nav.component.ts @@ -31,7 +31,7 @@ export class NavComponent implements OnInit { showProfile() { this.user.getHandle().subscribe((response) => { - console.log(response); + // console.log(response); const handle = response; this.router.navigate([`/main/user/${handle}`]); }); diff --git a/frontend/ruski-app/src/app/modules/home/search/search.component.ts b/frontend/ruski-app/src/app/modules/home/search/search.component.ts index a2d1d69..d24a958 100644 --- a/frontend/ruski-app/src/app/modules/home/search/search.component.ts +++ b/frontend/ruski-app/src/app/modules/home/search/search.component.ts @@ -22,7 +22,7 @@ export class SearchComponent implements OnInit { ngOnInit(): void { this.searchFetcher.fetchAllUsersAndHandles().subscribe((response) => { - // console.log(response); + // // console.log(response); for (const user of response) { this.namesOptions.push(user.name); this.handleOptions.push(user.handle); @@ -31,7 +31,7 @@ export class SearchComponent implements OnInit { this.nameUrlMap.set(user.name, user.profile_url); this.nameEloMap.set(user.name, user.elo); } - // console.log(this.nameUrlMap.get('Abby')); + // // console.log(this.nameUrlMap.get('Abby')); }); this.filteredOptions = this.searchControl.valueChanges.pipe( startWith(''), @@ -42,7 +42,7 @@ export class SearchComponent implements OnInit { private _filter(value: string): string[] { const filterValue = value.toLowerCase(); - // console.log(this.handleToName); + // // console.log(this.handleToName); let returnName = this.namesOptions .filter((option) => option.toLowerCase().indexOf(filterValue) === 0) diff --git a/frontend/ruski-app/src/app/modules/home/services/comment.service.ts b/frontend/ruski-app/src/app/modules/home/services/comment.service.ts index 163e70d..29a689e 100644 --- a/frontend/ruski-app/src/app/modules/home/services/comment.service.ts +++ b/frontend/ruski-app/src/app/modules/home/services/comment.service.ts @@ -24,7 +24,7 @@ export class CommentService { } } `; - console.log('here'); + // console.log('here'); return this.apollo .mutate({ mutation: ADD_COMMENT, @@ -35,7 +35,7 @@ export class CommentService { }) .pipe( switchMap((response: any) => { - console.log(response.data.addComment.id); + // console.log(response.data.addComment.id); return this.apollo.mutate({ mutation: ADD_COMMENT_TO_GAME, variables: { diff --git a/frontend/ruski-app/src/app/modules/home/services/current-user.service.ts b/frontend/ruski-app/src/app/modules/home/services/current-user.service.ts index a9ac1fa..b1109cb 100644 --- a/frontend/ruski-app/src/app/modules/home/services/current-user.service.ts +++ b/frontend/ruski-app/src/app/modules/home/services/current-user.service.ts @@ -63,7 +63,7 @@ export class CurrentUserService { }) .pipe( map((response) => { - console.log(response); + // console.log(response); if (!response.data.userByEmail.length) { return { profile_url: @@ -86,7 +86,7 @@ export class CurrentUserService { return this.auth.user$.pipe( switchMap((response) => { // query to get logged in user - console.log(response.email); + // console.log(response.email); const GET_USER = gql` query GetUser { userByEmail(email: "${response.email}") { @@ -101,7 +101,7 @@ export class CurrentUserService { }) .pipe( map((response) => { - console.log(response); + // console.log(response); if (!response.data.userByEmail.length) { return { handle: 'yourhandle', diff --git a/frontend/ruski-app/src/app/modules/home/services/feed.service.ts b/frontend/ruski-app/src/app/modules/home/services/feed.service.ts index 44a95a1..cd8dfd2 100644 --- a/frontend/ruski-app/src/app/modules/home/services/feed.service.ts +++ b/frontend/ruski-app/src/app/modules/home/services/feed.service.ts @@ -14,8 +14,8 @@ export class FeedService { fetchGlobal() {} fetchSpecGame(id: string) { - // console.log('here'); - // console.log(id); + // // console.log('here'); + // // console.log(id); const GET_GAME = gql` query GetGameByID($id: ID!) { game(id: $id) { @@ -62,7 +62,7 @@ export class FeedService { }) .pipe( map((response) => { - // console.log(response); + // // console.log(response); const gamesList = []; const game = response.data.game; const tempGame = { @@ -131,7 +131,7 @@ export class FeedService { }) .pipe( map((response) => { - // console.log(response); + // // console.log(response); const gamesList = []; for (const game of response.data.games) { const tempGame = { @@ -165,7 +165,7 @@ export class FeedService { } incLike(gameId: string, userId: string) { - // console.log(gameId, userId); + // // console.log(gameId, userId); const INC_LIKE = gql` mutation IncrementGameLike($id: ID!, $liked_by_id: ID!) { incrementGameLike(id: $id, liked_by_id: $liked_by_id) { @@ -189,12 +189,12 @@ export class FeedService { }) ) .subscribe((response) => { - // console.log(response); + // // console.log(response); }); } decLike(gameId: string, userId: string) { - // console.log(gameId, userId); + // // console.log(gameId, userId); const DEC_LIKE = gql` mutation DecrementGameLike($id: ID!, $liked_by_id: ID!) { decrementGameLike(id: $id, liked_by_id: $liked_by_id) { @@ -218,13 +218,13 @@ export class FeedService { }) ) .subscribe((response) => { - // console.log(response); + // // console.log(response); }); } getGameLikes(id: string) { // return of(['Billy', '606d262479a35ad0d582ec9c']); - // console.log(id); + // // console.log(id); const GET_GAME = gql` query GetGameLikes($id: ID!) { game(id: $id) { @@ -247,7 +247,7 @@ export class FeedService { .pipe( map((response) => { const liked_by = []; - // console.log(response.data.game.liked_by); + // // console.log(response.data.game.liked_by); for (const user of response.data.game.liked_by) { liked_by.push(user.id); } @@ -257,8 +257,8 @@ export class FeedService { } incCommentLike(commentId: string, userId: string) { - // console.log(gameId, userId); - console.log(userId); + // // console.log(gameId, userId); + // console.log(userId); const INC_LIKE = gql` mutation IncrementCommentLike($id: ID!, $liked_by_id: ID!) { incrementCommentLike(id: $id, liked_by_id: $liked_by_id) { @@ -282,12 +282,12 @@ export class FeedService { }) ) .subscribe((response) => { - console.log(response); + // console.log(response); }); } decCommentLike(commentId: string, userId: string) { - // console.log(gameId, userId); + // // console.log(gameId, userId); const DEC_LIKE = gql` mutation DecrementCommentLike($id: ID!, $liked_by_id: ID!) { decrementCommentLike(id: $id, liked_by_id: $liked_by_id) { @@ -311,7 +311,7 @@ export class FeedService { }) ) .subscribe((response) => { - // console.log(response); + // // console.log(response); }); } } diff --git a/frontend/ruski-app/src/app/modules/home/services/profile.service.ts b/frontend/ruski-app/src/app/modules/home/services/profile.service.ts index 96ce204..bad06b6 100644 --- a/frontend/ruski-app/src/app/modules/home/services/profile.service.ts +++ b/frontend/ruski-app/src/app/modules/home/services/profile.service.ts @@ -116,10 +116,10 @@ export class ProfileService { .get(`http://localhost:4000/get_presigned_url_${type}/${id}`) .pipe( switchMap((response: any) => { - console.log(response); + // console.log(response); // const data = response.json(); const signedUrl = response.presigned_url; - console.log(signedUrl); + // console.log(signedUrl); return this.http .request('POST', signedUrl, { headers: { @@ -130,7 +130,7 @@ export class ProfileService { }) .pipe( map((response) => { - console.log(response); + // console.log(response); return response; }) ); diff --git a/frontend/ruski-app/src/app/modules/home/services/search-fetcher.service.ts b/frontend/ruski-app/src/app/modules/home/services/search-fetcher.service.ts index 9c83f1f..155d753 100644 --- a/frontend/ruski-app/src/app/modules/home/services/search-fetcher.service.ts +++ b/frontend/ruski-app/src/app/modules/home/services/search-fetcher.service.ts @@ -10,7 +10,7 @@ export class SearchFetcherService { constructor(private apollo: Apollo) {} fetchAllUsersAndHandles() { - // console.log('here'); + // // console.log('here'); return this.apollo .watchQuery({ query: gql` diff --git a/frontend/ruski-app/src/app/modules/home/services/submit-game.service.ts b/frontend/ruski-app/src/app/modules/home/services/submit-game.service.ts index bd1d5e2..3d45f66 100644 --- a/frontend/ruski-app/src/app/modules/home/services/submit-game.service.ts +++ b/frontend/ruski-app/src/app/modules/home/services/submit-game.service.ts @@ -107,9 +107,9 @@ export class SubmitGameService { winning_ids.push(playerArray[2]); winning_ids.push(playerArray[3]); } - console.log(losing_ids); - console.log(winning_ids); - console.log(game.description); + // console.log(losing_ids); + // console.log(winning_ids); + // console.log(game.description); return this.apollo.mutate({ mutation: ADD_GAME, variables: { @@ -121,7 +121,7 @@ export class SubmitGameService { }) ) .subscribe((response) => { - // console.log(response); + // // console.log(response); }); } diff --git a/frontend/ruski-app/src/app/modules/home/settings/settings.component.ts b/frontend/ruski-app/src/app/modules/home/settings/settings.component.ts index 76438ac..55ee076 100644 --- a/frontend/ruski-app/src/app/modules/home/settings/settings.component.ts +++ b/frontend/ruski-app/src/app/modules/home/settings/settings.component.ts @@ -1,5 +1,12 @@ import { Component, OnInit } from '@angular/core'; -import { AbstractControl, FormControl, Validators, FormBuilder,FormGroup, Form } from '@angular/forms'; +import { + AbstractControl, + FormControl, + Validators, + FormBuilder, + FormGroup, + Form, +} from '@angular/forms'; import { ImageCroppedEvent } from 'ngx-image-cropper'; import { Router } from '@angular/router'; @@ -8,125 +15,131 @@ import { ProfileService } from './../services/profile.service'; import { combineLatest } from 'rxjs'; @Component({ - selector: 'app-settings', - templateUrl: './settings.component.html', - styleUrls: ['./settings.component.scss'] + selector: 'app-settings', + templateUrl: './settings.component.html', + styleUrls: ['./settings.component.scss'], }) export class SettingsComponent implements OnInit { - - // form properties - nameControl = new FormControl(null, {validators: [Validators.maxLength(20)]}); - handleControl = new FormControl(null, {validators: [Validators.maxLength(20)]}); - imageControl = new FormControl(null); - - formGroup = this._formBuilder.group({}); - - // values for html - name:string; - handle:string; - pic:string; - - // values for comparison - oldName:string; - oldHandle:string; - oldPic: string; - - // identify user - id:string; - - // cropper properties - imageChangedEvent; - croppedImage; - - // error properties - errorFlag: boolean; - errorMessage: string; - - constructor(private currentUser: CurrentUserService, private _formBuilder: FormBuilder, private router: Router, private profile:ProfileService) { } - - ngOnInit(): void { - this.compareHandles(); - this.formGroup = this._formBuilder.group({ - name: this.nameControl, - handle: this.handleControl, - image: this.imageControl, - }) - } - - compareHandles(): void { - this.currentUser.fetchUser().subscribe(response => { - this.oldHandle = response.handle; - this.oldName = response.name; - this.oldPic = response.profile_url; - this.id = response.id; - - this.name = this.oldName; - this.handle = this.oldHandle; - this.pic = this.oldPic; + // form properties + nameControl = new FormControl(null, { + validators: [Validators.maxLength(20)], }); - } - - submitChanges(): void { - const handle = this.handleControl.value; - const name = this.nameControl.value; - const pic = this.imageControl.value; + handleControl = new FormControl(null, { + validators: [Validators.maxLength(20)], + }); + imageControl = new FormControl(null); + + formGroup = this._formBuilder.group({}); + + // values for html + name: string; + handle: string; + pic: string; + + // values for comparison + oldName: string; + oldHandle: string; + oldPic: string; + + // identify user + id: string; + + // cropper properties + imageChangedEvent; + croppedImage; + + // error properties + errorFlag: boolean; + errorMessage: string; + + constructor( + private currentUser: CurrentUserService, + private _formBuilder: FormBuilder, + private router: Router, + private profile: ProfileService + ) {} + + ngOnInit(): void { + this.compareHandles(); + this.formGroup = this._formBuilder.group({ + name: this.nameControl, + handle: this.handleControl, + image: this.imageControl, + }); + } - if(name && name.length > 20) { - this.errorFlag = true; - this.errorMessage = 'Error: Name must be less than 20 characters.'; - return; + compareHandles(): void { + this.currentUser.fetchUser().subscribe((response) => { + this.oldHandle = response.handle; + this.oldName = response.name; + this.oldPic = response.profile_url; + this.id = response.id; + + this.name = this.oldName; + this.handle = this.oldHandle; + this.pic = this.oldPic; + }); } - if(handle && handle.length > 20) { - this.errorFlag = true; - this.errorMessage = 'Error: Handle must be less than 20 characters.'; - return; + + submitChanges(): void { + const handle = this.handleControl.value; + const name = this.nameControl.value; + const pic = this.imageControl.value; + + if (name && name.length > 20) { + this.errorFlag = true; + this.errorMessage = 'Error: Name must be less than 20 characters.'; + return; + } + if (handle && handle.length > 20) { + this.errorFlag = true; + this.errorMessage = + 'Error: Handle must be less than 20 characters.'; + return; + } + this.errorFlag = false; + + let observables = []; + if (handle && handle !== this.oldHandle) { + this.handle = handle; + observables.push(this.profile.updateHandle(this.id, this.handle)); + } + if (name && name !== this.oldName) { + this.name = name; + observables.push(this.profile.updateName(this.id, this.name)); + } + if (pic) { + observables.push(this.profile.updatePic(this.id, pic)); + } + + if (!observables.length) { + this.router.navigate([`/main/user/${this.handle}`]); + } + + combineLatest(observables).subscribe((response) => { + // console.log(response); + this.router.navigate([`/main/user/${this.handle}`]); + }); } - this.errorFlag = false; - let observables = []; - if(handle && handle !== this.oldHandle){ - this.handle = handle; - observables.push(this.profile.updateHandle(this.id, this.handle)); + onSelect(event: Event) { + const file = (event.target as HTMLInputElement).files[0]; + this.formGroup.patchValue({ image: file }); + this.formGroup.get('image').updateValueAndValidity(); + const reader = new FileReader(); + reader.readAsDataURL(file); + this.imageChangedEvent = event; } - if(name && name !== this.oldName){ - this.name = name; - observables.push(this.profile.updateName(this.id, this.name)); + + imageCropped(event: ImageCroppedEvent) { + this.croppedImage = event.base64; + this.pic = this.croppedImage; + this.formGroup.patchValue({ image: this.croppedImage }); } - if(pic){ - observables.push(this.profile.updatePic(this.id, pic)); + imageLoaded(image: HTMLImageElement) { + // show cropper } - - if(!observables.length){ - this.router.navigate([`/main/user/${this.handle}`]); + cropperReady() { + // cropper ready } - - combineLatest(observables).subscribe(response => { - console.log(response); - this.router.navigate([`/main/user/${this.handle}`]); - }); - - - } - - onSelect(event: Event) { - const file = (event.target as HTMLInputElement).files[0]; - this.formGroup.patchValue({image: file}); - this.formGroup.get('image').updateValueAndValidity(); - const reader = new FileReader(); - reader.readAsDataURL(file); - this.imageChangedEvent = event; - } - - imageCropped(event: ImageCroppedEvent) { - this.croppedImage = event.base64; - this.pic = this.croppedImage; - this.formGroup.patchValue({image: this.croppedImage}); - } - imageLoaded(image: HTMLImageElement) { - // show cropper - } - cropperReady() { - // cropper ready - } - } diff --git a/frontend/ruski-app/src/app/modules/home/spec-game/spec-game.component.ts b/frontend/ruski-app/src/app/modules/home/spec-game/spec-game.component.ts index 2d87419..dc772b7 100644 --- a/frontend/ruski-app/src/app/modules/home/spec-game/spec-game.component.ts +++ b/frontend/ruski-app/src/app/modules/home/spec-game/spec-game.component.ts @@ -48,21 +48,21 @@ export class SpecGameComponent implements OnInit { } this.game.description = 'Dennis is very cool. Everyone else sucks. Dennis is very cool. Everyone else sucks. Dennis is very cool. Everyone else sucks. Dennis is very cool. Everyone else sucks. Dennis is very cool. Everyone else sucks. Dennis is very cool. Everyone else sucks.'; - // console.log(this.game); + // // console.log(this.game); this.gameFetcher .getGameLikes(this.game.id) .subscribe((response) => { if (response.includes(this.userID)) { - // console.log('yessir'); + // // console.log('yessir'); this.alreadyLiked = true; - // console.log(this.game.id); - // console.log(this.game.likes); + // // console.log(this.game.id); + // // console.log(this.game.likes); } else { - // console.log('nosir'); + // // console.log('nosir'); this.alreadyLiked = false; } }); - // console.log(this.game.comments); + // // console.log(this.game.comments); for (const comment of this.game.comments) { this.alreadyLikedComment.push(false); this.commentLikeMirror.push(comment['likes']); @@ -91,9 +91,9 @@ export class SpecGameComponent implements OnInit { changeCommentLikeCount(e: any, i: number) { let id = this.commentIDMirror[i]; - console.log(this.userID); - console.log(id); - console.log('here'); + // console.log(this.userID); + // console.log(id); + // console.log('here'); if (this.alreadyLikedComment[i]) { this.gameFetcher.decCommentLike(id, this.userID); this.commentLikeMirror[i] -= 1; @@ -117,7 +117,7 @@ export class SpecGameComponent implements OnInit { this.commentService .addComment(this.userID, commentText, this.game.id) .subscribe((response) => { - console.log(response); + // console.log(response); this.commentIDMirror.push(response.data['addCommentToGame'].id); }); this.commentDBMirror.push(true); @@ -126,7 +126,7 @@ export class SpecGameComponent implements OnInit { this.commentTextMirror = [...cloneText]; this.commentLikeMirror.push(0); this.alreadyLikedComment.push(false); - console.log(this.commentTextMirror); + // console.log(this.commentTextMirror); } goBack() { diff --git a/frontend/ruski-app/src/app/modules/material/material.module.ts b/frontend/ruski-app/src/app/modules/material/material.module.ts index 28be89e..d998ed2 100644 --- a/frontend/ruski-app/src/app/modules/material/material.module.ts +++ b/frontend/ruski-app/src/app/modules/material/material.module.ts @@ -11,6 +11,7 @@ import { MatTableModule } from '@angular/material/table'; import { MatCardModule } from '@angular/material/card'; import { MatDividerModule } from '@angular/material/divider'; import { ScrollingModule } from '@angular/cdk/scrolling'; +import { MatStepperModule } from '@angular/material/stepper'; const material = [ MatToolbarModule, @@ -24,6 +25,7 @@ const material = [ MatTableModule, MatCardModule, MatDividerModule, + MatStepperModule, ScrollingModule, ];