From 67c4664fe58d6062979b16df4ba5b72e2dabe32c Mon Sep 17 00:00:00 2001 From: Trivernis Date: Thu, 16 Jan 2020 15:29:10 +0100 Subject: [PATCH 01/13] Fix typos & stuff --- src/app/components/about/about.component.ts | 2 +- src/app/components/feed/feed.component.ts | 2 +- src/app/services/activity/activity.service.ts | 2 +- src/app/services/feed/feed.service.ts | 28 +++++++++---------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/app/components/about/about.component.ts b/src/app/components/about/about.component.ts index d2907cd..c891813 100644 --- a/src/app/components/about/about.component.ts +++ b/src/app/components/about/about.component.ts @@ -23,7 +23,7 @@ export class AboutComponent implements OnInit { @ViewChild(MatSort, {static: true}) sort: MatSort; ngOnInit() { - this.activityService.getActivitys(); + this.activityService.getActivities(); this.activityService.activitylist.subscribe(response => { this.actionlist = response; this.dataSource = new MatTableDataSource(this.actionlist.Actions); diff --git a/src/app/components/feed/feed.component.ts b/src/app/components/feed/feed.component.ts index 64efd5d..491b80d 100644 --- a/src/app/components/feed/feed.component.ts +++ b/src/app/components/feed/feed.component.ts @@ -38,7 +38,7 @@ export class FeedComponent implements OnInit { this.user = user; this.loggedIn = user.loggedIn; }); - this.activityService.getActivitys(); + this.activityService.getActivities(); this.activityService.activitylist.subscribe(response => { this.actionlist = response; }); diff --git a/src/app/services/activity/activity.service.ts b/src/app/services/activity/activity.service.ts index 4e4f43f..526bfd0 100644 --- a/src/app/services/activity/activity.service.ts +++ b/src/app/services/activity/activity.service.ts @@ -18,7 +18,7 @@ export class ActivityService { this.activitylist.next(pActivitylist); } - public getActivitys() { + public getActivities() { if (this.activitylist.getValue().Actions.length < 1) { const headers = new Headers(); headers.set('Content-Type', 'application/json'); diff --git a/src/app/services/feed/feed.service.ts b/src/app/services/feed/feed.service.ts index 1f39cdc..9f990b9 100644 --- a/src/app/services/feed/feed.service.ts +++ b/src/app/services/feed/feed.service.ts @@ -14,9 +14,9 @@ export class FeedService { public newPostsAvailable = new BehaviorSubject(true); public topPostsAvailable = new BehaviorSubject(true); - public posts: BehaviorSubject = new BehaviorSubject(new Array()); - public newPosts: BehaviorSubject = new BehaviorSubject(new Array()); - public mostLikedPosts: BehaviorSubject = new BehaviorSubject(new Array()); + public posts: BehaviorSubject = new BehaviorSubject([]); + public newPosts: BehaviorSubject = new BehaviorSubject([]); + public mostLikedPosts: BehaviorSubject = new BehaviorSubject([]); private activePostList = 'NEW'; private mostLikedOffset = 0; private newOffset = 0; @@ -52,9 +52,9 @@ export class FeedService { content: pContent }}; return this.http.post(environment.graphQLUrl, body).subscribe(response => { - const updatedposts = this.newPosts.getValue(); - updatedposts.unshift(this.renderPost(response.json())); - this.newPosts.next(updatedposts); + const updatedPosts = this.newPosts.getValue(); + updatedPosts.unshift(this.renderPost(response.json())); + this.newPosts.next(updatedPosts); this.setPost('NEW'); }); } @@ -89,14 +89,14 @@ export class FeedService { id: activityId }}; return this.http.post(environment.graphQLUrl, body).subscribe(response => { - const updatedposts = this.newPosts.getValue(); - updatedposts.unshift(this.renderPost(response.json())); - this.newPosts.next(updatedposts); + const updatedPosts = this.newPosts.getValue(); + updatedPosts.unshift(this.renderPost(response.json())); + this.newPosts.next(updatedPosts); this.setPost('NEW'); }); } - public upvote(pPostID: number): any { + public upvote(postId: number): any { const headers = new Headers(); headers.set('Content-Type', 'application/json'); @@ -105,7 +105,7 @@ export class FeedService { post{userVote upvotes downvotes} } }`, variables: { - postId: pPostID + postId }}; return this.http.post(environment.graphQLUrl, body); @@ -163,12 +163,12 @@ export class FeedService { headers.set('Content-Type', 'application/json'); this.http.post(environment.graphQLUrl, this.buildJson(this.activePostList, this.newOffset)) .subscribe(response => { - let updatedposts = this.newPosts.getValue(); - updatedposts = updatedposts.concat(this.renderAllPosts(response.json())); + let updatedPosts = this.newPosts.getValue(); + updatedPosts = updatedPosts.concat(this.renderAllPosts(response.json())); if (this.renderAllPosts(response.json()).length < 1) { this.newPostsAvailable.next(false); } - this.newPosts.next(updatedposts); + this.newPosts.next(updatedPosts); this.setPost('NEW'); }); } else if (this.activePostList === 'TOP' && this.topPostsAvailable) { From 279c7cec323ec09db738a8a21b9df9fd70dcb983 Mon Sep 17 00:00:00 2001 From: Trivernis Date: Thu, 16 Jan 2020 15:29:10 +0100 Subject: [PATCH 02/13] Fix typos & stuff --- src/app/components/about/about.component.ts | 2 +- src/app/components/feed/feed.component.ts | 2 +- src/app/services/activity/activity.service.ts | 2 +- src/app/services/feed/feed.service.ts | 12 ++++++------ 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/app/components/about/about.component.ts b/src/app/components/about/about.component.ts index d2907cd..c891813 100644 --- a/src/app/components/about/about.component.ts +++ b/src/app/components/about/about.component.ts @@ -23,7 +23,7 @@ export class AboutComponent implements OnInit { @ViewChild(MatSort, {static: true}) sort: MatSort; ngOnInit() { - this.activityService.getActivitys(); + this.activityService.getActivities(); this.activityService.activitylist.subscribe(response => { this.actionlist = response; this.dataSource = new MatTableDataSource(this.actionlist.Actions); diff --git a/src/app/components/feed/feed.component.ts b/src/app/components/feed/feed.component.ts index 64efd5d..491b80d 100644 --- a/src/app/components/feed/feed.component.ts +++ b/src/app/components/feed/feed.component.ts @@ -38,7 +38,7 @@ export class FeedComponent implements OnInit { this.user = user; this.loggedIn = user.loggedIn; }); - this.activityService.getActivitys(); + this.activityService.getActivities(); this.activityService.activitylist.subscribe(response => { this.actionlist = response; }); diff --git a/src/app/services/activity/activity.service.ts b/src/app/services/activity/activity.service.ts index 4e4f43f..526bfd0 100644 --- a/src/app/services/activity/activity.service.ts +++ b/src/app/services/activity/activity.service.ts @@ -18,7 +18,7 @@ export class ActivityService { this.activitylist.next(pActivitylist); } - public getActivitys() { + public getActivities() { if (this.activitylist.getValue().Actions.length < 1) { const headers = new Headers(); headers.set('Content-Type', 'application/json'); diff --git a/src/app/services/feed/feed.service.ts b/src/app/services/feed/feed.service.ts index a516eb3..955cf2d 100644 --- a/src/app/services/feed/feed.service.ts +++ b/src/app/services/feed/feed.service.ts @@ -14,9 +14,9 @@ export class FeedService { public newPostsAvailable = new BehaviorSubject(true); public topPostsAvailable = new BehaviorSubject(true); - public posts: BehaviorSubject = new BehaviorSubject(new Array()); - public newPosts: BehaviorSubject = new BehaviorSubject(new Array()); - public mostLikedPosts: BehaviorSubject = new BehaviorSubject(new Array()); + public posts: BehaviorSubject = new BehaviorSubject([]); + public newPosts: BehaviorSubject = new BehaviorSubject([]); + public mostLikedPosts: BehaviorSubject = new BehaviorSubject([]); private activePostList = 'NEW'; private mostLikedOffset = 0; private newOffset = 0; @@ -96,7 +96,7 @@ export class FeedService { }); } - public upvote(pPostID: number): any { + public upvote(postId: number): any { const headers = new Headers(); headers.set('Content-Type', 'application/json'); @@ -105,7 +105,7 @@ export class FeedService { post{userVote upvotes downvotes} } }`, variables: { - postId: pPostID + postId }}; return this.http.post(environment.graphQLUrl, body); @@ -168,7 +168,7 @@ export class FeedService { if (this.renderAllPosts(response).length < 1) { this.newPostsAvailable.next(false); } - this.newPosts.next(updatedposts); + this.newPosts.next(updatedPosts); this.setPost('NEW'); }); } else if (this.activePostList === 'TOP' && this.topPostsAvailable) { From b15dc8e16b542c45c91676089118276c44f27484 Mon Sep 17 00:00:00 2001 From: trivernis Date: Thu, 16 Jan 2020 23:20:14 +0100 Subject: [PATCH 03/13] Revert "Merge remote-tracking branch 'origin/julius-dev' into julius-dev" This reverts commit da971a1f135d6baefa33eb759c3c8f2102f2e64a. --- src/app/services/feed/feed.service.ts | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/src/app/services/feed/feed.service.ts b/src/app/services/feed/feed.service.ts index bf0952b..955cf2d 100644 --- a/src/app/services/feed/feed.service.ts +++ b/src/app/services/feed/feed.service.ts @@ -52,15 +52,9 @@ export class FeedService { content: pContent }}; return this.http.post(environment.graphQLUrl, body).subscribe(response => { -<<<<<<< HEAD const updatedposts = this.newPosts.getValue(); updatedposts.unshift(this.renderPost(response)); this.newPosts.next(updatedposts); -======= - const updatedPosts = this.newPosts.getValue(); - updatedPosts.unshift(this.renderPost(response.json())); - this.newPosts.next(updatedPosts); ->>>>>>> julius-dev this.setPost('NEW'); }); } @@ -95,15 +89,9 @@ export class FeedService { id: activityId }}; return this.http.post(environment.graphQLUrl, body).subscribe(response => { -<<<<<<< HEAD const updatedposts = this.newPosts.getValue(); updatedposts.unshift(this.renderPost(response)); this.newPosts.next(updatedposts); -======= - const updatedPosts = this.newPosts.getValue(); - updatedPosts.unshift(this.renderPost(response.json())); - this.newPosts.next(updatedPosts); ->>>>>>> julius-dev this.setPost('NEW'); }); } @@ -175,15 +163,9 @@ export class FeedService { headers.set('Content-Type', 'application/json'); this.http.post(environment.graphQLUrl, this.buildJson(this.activePostList, this.newOffset)) .subscribe(response => { -<<<<<<< HEAD let updatedposts = this.newPosts.getValue(); updatedposts = updatedposts.concat(this.renderAllPosts(response)); if (this.renderAllPosts(response).length < 1) { -======= - let updatedPosts = this.newPosts.getValue(); - updatedPosts = updatedPosts.concat(this.renderAllPosts(response.json())); - if (this.renderAllPosts(response.json()).length < 1) { ->>>>>>> julius-dev this.newPostsAvailable.next(false); } this.newPosts.next(updatedPosts); From 59994f369746e6e37ababbceb6819bd654eac9ce Mon Sep 17 00:00:00 2001 From: trivernis Date: Thu, 16 Jan 2020 23:28:57 +0100 Subject: [PATCH 04/13] Fix votes not getting refreshed --- .../components/feed/postlist/postlist.component.ts | 12 ++++++------ src/app/services/feed/feed.service.ts | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/app/components/feed/postlist/postlist.component.ts b/src/app/components/feed/postlist/postlist.component.ts index ec2e5f1..b16794d 100644 --- a/src/app/components/feed/postlist/postlist.component.ts +++ b/src/app/components/feed/postlist/postlist.component.ts @@ -22,18 +22,18 @@ export class PostlistComponent implements OnInit { voteUp(pPost: Post) { this.feedService.upvote(pPost.id).subscribe(response => { // this.voteEvent.emit(true); - pPost.userVote = response.json().data.vote.post.userVote; - pPost.upvotes = response.json().data.vote.post.upvotes; - pPost.downvotes = response.json().data.vote.post.downvotes; + pPost.userVote = response.data.vote.post.userVote; + pPost.upvotes = response.data.vote.post.upvotes; + pPost.downvotes = response.data.vote.post.downvotes; }); } voteDown(pPost: Post) { this.feedService.downvote(pPost.id).subscribe(response => { // this.voteEvent.emit(true); - pPost.userVote = response.json().data.vote.post.userVote; - pPost.upvotes = response.json().data.vote.post.upvotes; - pPost.downvotes = response.json().data.vote.post.downvotes; + pPost.userVote = response.data.vote.post.userVote; + pPost.upvotes = response.data.vote.post.upvotes; + pPost.downvotes = response.data.vote.post.downvotes; }); } diff --git a/src/app/services/feed/feed.service.ts b/src/app/services/feed/feed.service.ts index 955cf2d..99217fe 100644 --- a/src/app/services/feed/feed.service.ts +++ b/src/app/services/feed/feed.service.ts @@ -168,7 +168,7 @@ export class FeedService { if (this.renderAllPosts(response).length < 1) { this.newPostsAvailable.next(false); } - this.newPosts.next(updatedPosts); + this.newPosts.next(updatedposts); this.setPost('NEW'); }); } else if (this.activePostList === 'TOP' && this.topPostsAvailable) { From b6d578fdb6a450fb06742edfa5d1471bc5a99022 Mon Sep 17 00:00:00 2001 From: trivernis Date: Fri, 17 Jan 2020 13:32:37 +0100 Subject: [PATCH 05/13] Add the correct favicon --- src/favicon.ico | Bin 5430 -> 27088 bytes 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 src/favicon.ico diff --git a/src/favicon.ico b/src/favicon.ico old mode 100644 new mode 100755 index 8081c7ceaf2be08bf59010158c586170d9d2d517..279b7a9a0e7c0ad03aeb0e032b142888f1b57708 GIT binary patch literal 27088 zcmeFY^;cWn6E7Ts2X`ngMGJ(sxH~Py-L=p{v7!Nj7BAXT(&A7ocyagA(%|kCXb3LB z_2&8Bb$@*SgZE@*t+SG|=Iq%s^BLU$02b!+--QKW1GK&c0BAAyak|>-B%nti%q__a z4HbRNzo-9w3Ggt#{Fzye2Vfq4p`vIQkhQlA$+9q7mOmQ3SaST*IEnivKkAE;MQPZP z!XM)`X9~wuRRw&-@AbS1L_?&4M-oGvGDD<5&@W>#i*fZ7ttsQE2_-#6P4PU1KirxZ ze%vh=!J(m!ja=eiGnX=7J-uqT5q|yt;Kj-Qt2CX1j;$;ra*F@|`v2YmJ-5^qp|IH4 zQkQlwR9-+=>jsuAJvsN`tXH_9b3BOAZ8J;#%xpwQDXX6aO25_!fZ zfjt(Iy`RkoUk(a|$M0JCFAvjS^&;P=|5D)L;22W1cy-%{yBao>9_Id)cIn=3Wxuo4 zl#PccTE4Dy>UD9tvWkj|)jBIv3#*|!(5Ko^6U%O8T<8bh4)doaWHMUQ(8=!w<`JAJ zsOOZs@mUN|7B5?Jn-0ma|JBXvPR`4gr@{ShP@Gdplmt6FHkLqPIYxc2%0(z*nu@(F z-<^*kKimIMMgSqbfP5Uo>_(Y`sh9gGfqc=VpU1pZBl5aEy zl#4Pqp2q{oK@0~4-zF~)>^MJBN^2QvM~;un<`Cg4ML}+cL%EwEeuo@GBp<@HRa8Xt zy{1zaTatnajg#KkWV&y*u3DZkpyER4SB5_O9c$GJBqf-*`jMMAdl) zcjV~nsnUMSK97#mou`YC#hNO*zit_cx{-tFbSd@9sM}zv9DfZSWx~Tq7j%*Ajo;^` zF2zwuEk#-O;8p@xR&{g*C>uPumTNBegoDQJL(7WK$-1X>?Q!d6Q?Nt8P7Sy_Ta&Z? z!diIsO(fwIG+iNS_jP{S(gy+hi}yu^vf73KEvTd(R#p-=(NAm{vVc2kfCg|5fO5hz zH<0g(vK6JS0_u8$i}B_&Em7v8N2z>v`#qqgQGc*W?~xVw6t94j=0`T5Fi#4U_6`Uz(jscD0`IzL zx}mlSv59$i-VjkETXO1R$dG%1^}Dr0;5VRHY8M#6lsz(IMGvK|c8@P}F%0cQGjSz%4Zz(!Dk^D=dicj(d)1%Mn9S#Im_b?wSBf zWAZx7Z3Z*K_tdFXbGpPQIz2D%r6)&%>mL}4?$Te6xfS}6b&YhTh8k^;9t!`W`1-N2 zyS)2M_mhr%czf=KqOwCC)pSHx?z88#3Hx@_%T(PtVe=$#2lmpY<*na%vi$_7HM2WB zjxc!rc53{Kq}-1w zb+!o?BC7u$p1GKvJ1O&RIix1V&My6SyRkH$G>vV9zzSmlj9XFfN7gLjE4_}h|GzKD z;6g;Qn3G<6Ada6e_sMu@DfY?CdPftY5rads;_qN|mqm|tVRYw3MW=QL7Xh*|PO#Yu z4!)$@?^{ao7(|5|F4!L>`{s)7Fyo}Y0FXx5ThL&sG`tI{%!ZyU$s5A9^c4U&Zv}o| zZL)-Tq>GJJ*Cjs~IGzda_$X~bF`#NWbX!z3*m!=<^q`GZrS>^Wll#cE%OxQPBr1U(@1Ds@vvB_$Z{3V_w z0hX3&ChomZjIWFyAzL05kb1KkQ6VJ_$M`-i-L*E*(I9yhF{~7TN5{Fl4G5c#xqfXt zw$X=$Ya6UPx`)Z0qsh=5eFDy1OQX3>f`~al*Y;akIdO9LK=agx^VpvXn^$d3d`BCbV}c=| zului8g#(Fw3iJ&KtUEnfIRk-Vh56SEu;8uF-obBR2%S1gJS+CQlVAw%<*MmOkKI2T z+^TX-j}MTtF4&pGY&-RTvTMmHSFurmUK1YGv-w$L+?e%Y{({CalawCcn}nV}yF3h$ zg?X2tJcnSZqI)Vc80TioK#g6_O4AycY>I3=OGoIcSEQv^20=m473x4HN;4shSS{tJ zOX5?7{oyaYSp8l3AoFZ6GJ_gBo0lKd^M{VfmW@aG><^fJrnaa0Sy)(5rG7NUzM?$+ zvxP|F2!WkQ5%pC#f%iiv4Kp(PE)Zq0Zg#hdqk=^r}ntgC5cXWKXJI`!C^9*cQ& z;w{QIEtGhhiHya?AFrz}(y#4;VL+67k%UY_9_K>27-Dge0lDmoc(BYK9Rv$k*^oi8 zyPRHkl&+-L9J_*V%aY&wJdq}i=LESJ*F`cn%Fhvu06dxUj;EqsNYE8q2m=Gr50Ipi zZ5AZN6?E;7ILor@l|k2@oV|u!ER7x>1Ld4X#1vFkV}`8a#L&+^1|uhPa+}*Rwl8bu zd9Te)ds7V00ikBfekO?r!^j4ihG>y?=W3DB5FuO~g_OoLV$$8e7qqC)FUZb(b-?BY!sT?}Dlxb~*H1u?DrWxGNrerlm%B>-~%B>vj- zl%#l#Xb>l;eQlIk6^0K*=*HwdJEfjb6=vGt34l4v8%p-cATqvKb|rsYbym0dTtXGL zay7AzKBVrsarvhg_s1$uFxTw!A%g(!Xg-y%c<9fWlz#C6*fT8Vd0CuzBDDLyY?Ojg zHIVMi+O-?NYX+n9B51Y99Bq=vNZ04{<8lv2JJJt~RV4h*>U}1AsK6}Ty{KEEWTA-sNi&Lw^4XU184-Np?CU2ApjlAC zb|L{IaJm+hwYmb~>urzC8+y0F?>T>0K#FF=W)<+JX*L2Nd)9PBX79bwvGSc%d%p!( z$yyBd%>ta5{Koh=-m`>_o}d0j-PjqPgVnKOIQvd_XINgtoX`636iftav~hNAeP!8p zZG9R_tLjpG$?HKrZabZ=j{yBru768uX5GVT&0>^4sfj7Q0s__xA}8VG9^^72Rz@$V zJ|;G-mPWdSiav^bNoDv^M2bADH1E#K$8!f9&rA@7Z41Eh!n(#P#jdANzz)MBc!a)} z3*5(O1vCMKW=b~0D(@!TbO2NaZ_8`C+ok)0wN+SX>RN(>#s5vDbH{HXKKUH>fXX9-F7^bJo~i{C(@=W!!$|u zV5e@2F78?iPwGri*eb9TFspc0H$coEFNE+u-OmQEvUTf63E^$N-rZiUExUjHsx^PM z3Z$wszL6)f!)V=pNgi&AJKcdrEvnSq3?6-~0>gJh-$+&I#&+TjcynC0m$Z`SE(c1I zK`76lOUflX=Mx{7KL(ocjxEg_&w$ASN;`bYyIX(|RiiD!O-bQ-F*>TlO9}N_m8lpn zvTXRIX2!uA!z%rT;kOi~wF2K?%bAXWM}O$yhSH$CXBM`=Zzg-+zrx}y7#fuIfeWEW zT%R9bCm4CXxHe>w&0eNJEKRm}=oCkr zM5siqdrK6-Q&}?F-8kIWFP#=e+{4MS&h8JlthSt6<+7)P+e_*HvF3oQ8u2^QG|#eK zyY7B7gL!V)=i+m4fIfz6r>nCEcwJLdSY~(jT0FI#~6;O_fYT40`m3v2%Y&)8nakH8l%gcl(WfW~TOsbZ2 z*GYdzfpa$@PRoE~xEpE*E%E5eI96uI5sG*1p}SR}e+rPTtv!rM_=w+O_jF+}V0BNb zdYXktJL^;N-SNSz{cG>2$~i-G_|fXJKG=PT ze_~GxQS18ggbCX;YD9$NnXLb0AuM39n2GG=lz)5Z<`~R*1RU{}=wWF(TIV*TS}#vp!7f-0Un?Iwm~|KpUiDcC;k!Br zl}nBjrh}GU&q)t56>~Jj+xqN?+;!IY%am~CpKrZz5E_gfbY1@=ik%%e*sgi;8P-As z4+8Sqeh>Wjgo!gH11l)OSzP{OoImv)yQ-mR{d`$a*BQOh9cdo^l@IEA{E(>b*Zl9l zIx7~JXeImdP9NN`KkVNEH{0!U{Lrf+UP;UC`-jG~x9vvJ;oAQiN{dF`y=l{D-@@Jj zls1A_34V1LpNVOU7JjQ;Z|*q`c+aoWiEDeKgkR_Tax_bblX87*)4qSM-@JZ z9%;4j@pv%{yLQ8YmG*jR`UBA)-77?a97KUauQvGwP=b~*DrclUOE zmSGUx+y2Gf>(z^Caap}@s>9gpkrrL>!_Hu#Ft4%;MXUtA*JppGeC4q_s#7MYB?RDL zkFL>?W3nU|tbbCNMqjxT6wj|4u{@(YYCH7Y9iTP68 z?C9?^gbH*>eK0AuVY`XFa@BBPEy?NOu-0xt>aN)B@|g~fpz!@lE!FhS!M;s>q^!<8 zSm&-QJrWC(J_nwzzvfi^R9An)-ln~S9zoC`qo83J2#cS^IZ^iLJ*$ICk)KKW3M4OE zg&(>qWn!u-U7{cvI8FO1_V2`#Y^9z099gZ8)V`fEI?Uv$Rzzim-@s#hQs|OUJ;OtM zpM<@{5W9oIcjeu`rGXtoLEh8CUhD6K6<(`MYqHl~B*{|4x6Id4&Kvi%ndQ}}kSsXK zWj(_OGdf+mZ#s~&lH7;h{&ZjjmI97kt_~C%JG<9_06E%h8pew45`6R7lSX1Sq(%OX zT=cqBTjw@+l6i@oaKo#exRa_Ze3bjL8q~=*@d-k8CUzl+so!H&=JvRtikJRj4b_45 zE)(4{nIrtbety~+7Iiv*A&a4I28L=v#$^D7F?8qA3EYSvYl-4Xwb)w(H>HU~m&ME# z-ODNUCoU}HtgtLl@DUVOt+*@sws*;Y$jSZQ?j8@PiD#e#zwe=@b}Vg@W#yZ&3z=w% z6fG^X>|u_qcgpxTMhn{^8T*{^X5`H2bvi9{NxzxW%WJ^Rvr%#KX%*;M`MgNspj8Qcb=T#I zI&7TJ6L9yRE{xKS-@MqUW5xb(wOkoVOj+tjrdL{*V< z-r%lok(unGS=Ge&iXKIcz<6`s83^&1RqLZdQZzzt`(l(1$#FtA8o1im&v-wL#-=i2 z$CPl}s#*AEGD&}}ke@-QuA(5Zik@&`dYJ2?nheGK)iDdiPacNod;hnOiJx(SGBbz7 z%t{sGCP#B}JG)G;1oQe@A1M=mkMpBxZqTg{2qJ05ov`E+@A=kFfB#1pv;?%z5OTzs0J zd3z&t-ujR8!9Esl&=?vVTRMx(hzc?=aqAbSKs@5#y8-TPCth}Qb_ReK&S#nTHQ zTSw?A62P4E(8I!`rMcp+7@?Y8kukpItS@-m8NnJx$(pN}fV`04?L){m25#C4&YyT3 z?&h2de<+oj?zk(mGDJjGmD@!51arp_dUv6b+47|XIX_6NyqZD^YR;zrD5&^d{H@yZrP%`{DJGkZ*!&cB!0^t~V#<5?uGdnmZ-Jq8)K~n9PRkH#?~&^Xpr(VbCHz|09+6Zl zDpmC4m;+$)l{5Fb_GN?e_{tW`3fn=23{62U1TJ~GM|5T7Bk&kuz~6~+Ao{tj|4ue| zw39C)DrXnUd}D1xwOUb@Y!Hh+C$yn1%uuNHNREj|lScfJ?WkLfP6pg0d@paZzu_^? z@Oca)h_m-u;UrbW>$*BMalilX15IX+}|Ry|Cy1_GBp{8{ISn4S?wY7^ogX( zrjEr&^m$iOM$;LHKyFghj%$tGXBCb7buc@9Uaa7*xo~Y`zqvQ8YP{^KQscYBYPqR# z&U9yVtaiD>&x+mgWjMFCty_j@F8?1PI)^qXHGO8mpmx+ZblB>-9*t>;BUENa!e|w8 z1_Uh9`O3A|D0&K)4fwA7B1|^g2Wl?ZpLS$4p5EOOP#^*1k<;7q$d=wx z*f)Wwk&27)mblvCk~`d;(Rc1U*|>tS1vR(7t^?YS4HcYteHJSuH`(!;{-G`+l&a1e zgZAR4_6HOA+c?@qJOoY?UOVd_rS2_XmozoGYqzuhXoYtxRI6s&RrU0>JC=9H0WZrs zuV((WKYe6W`FK!l;L*+q@YE7F8n4TNB63Y7t-!C*Gze-xMfD&AUjZ44v&p@38{?~H z24*|hEY4;G?_lyQwAmS0CbCBYgnE!ZlCv%IV3*JWuZ zq(N{x`*R)Mn3~+hQm_;6XeIrs)#h_icj}&G6W{gTKmBJSW3Im=1kTA_b4gf`ynp#U zPsqyMpPhH)bF1a*v({Z+3OXc?G+_nfkFjqHpOMFm-Hl`ti2<5NE0e7f^1HU{Vv-Vn z&164ZmiEdNIcaZT=ndR5wE0IvbRV1JYTF+C*u8<0;Wth7+ktnKzlf714xGIMYyqTr z+myfC-4m*K_&4l}{a1Uk*Q}xiEmNj>(1z&*rEs$K%KGeR=5z&rRLDIbM)RuI(@`VW z`A&h^my?-6rLfW;!JfA@rsZg;LKjJ1ZfMDyUdu2tBd-L;x+c5+jZ7s&E2Ak}jU5yH zC5`i}3%#;Mo7OFJwb)O$*kNt}Ora)fzo*)yhY#kte~6}gWvIB~%0lBh>0QgP z8kU#usvPD^3t}D@GG*s);$9Z@pB`eXI#3y=O|g7-5Krt4us_{MDKa9#3$zg{d0o?= zrURH`ztlJ@?PCHsMwxp*IluZ{z{1ZBCm<2fezf0v$Fgvm3D`-<)TjLbj4+`IENpVS z<4k#!v&}9w7pk0Zmm{ZYY-Ai$QQ?AFC_GB=uHTmxzeXL>D^sWAyh``{t4uihPuZiX zuH)(KirPu502|x|VVFJ~vKg_JcUji9e0ZNC`=jHW025Z(C^dsUJnZufXeb22GfFyFB*#M23{0?vKKzFEm5K%YMIl#4~c+~w@fS_ zG=-9y`Q;YyD^JMV1oukTF-tDAorxC^`@r=V>=8i!Vx?qW-v5Yh+)t1?z$iHs@#Bz?OopCHsMOvRjbogbUJ2kBjX z_8&>7@Ee1u9C{%H6elN#8@^*zN>$y)-d#v}79TC%)d-zvrVGOKY}(uM4w-QX7+v#E z>J>siFWvh;@V2f!V(Yd|lt5s0OJI5n@UeD=5`oiOXz`rG|CU*qDJIag{83m>6XP$`85m49akFE||tgIE?)9yPH1 zTWdUR`~av+3@~X(46Yaz95sJ>$UI4=;ipCPkr#nwTQ`}Dse!5Hv;{khT$0%C0#|v4 zjMl=YU6vhcM$gbdd3im__MnMhrsc9^go`YjEgwkHVl>&?4Bn!RH^cCCqAIP#98xdo ziP9ACA!Mtl@(b;jU7kr>l%PdXamoBtSlW+jAkQIu4g9J(#A|ebGW|E)pfRE0@u+&{ z9p0-8T)VLK(U_a6qecqai`Ep^nmdo1J*nLy^7N5KMx7EfGp@wJp%(i(ZO;OH2 z2Yf?uQKo>7T2BOj`sS9%UpyA`??W{^pZA$&J4`7Lo)ZKonbJsupSzM?nU}5{xchnZ zj3mz@UOE=pGc!yyXjneCBL%=4oknu8iBI89?fK#Yr)$>cxbErkXvnMPXglo=kK<#D zpF0~{oPR^`6&!kE#)94{4{lUO4loNXR1KW#OiiuW@JZ5Id_QS##^Bf?XG2{nF$NT^ zg)RN!`A2q&jMf(VZbKQ6Q*A46Sg4=97qT4*cQJt1;w1E9N`|P!1MWjQ`iHsen%4$W z0#E55*)m`B_A==!m-k~4pYA+Aj314kvpJpM_aye-fhK(0T~Bn1hu;JE`#?4yxolwx zA;5uscYCxJ{l!$PuBd_gf*c-ikn(IYZnPwz^oU8y=*O0jJ7r-Pu--U+|Sl_@{?bU$TJ}8E5Sd1&k9#PHYTRJfy-ulAQe$UA<8{;xlyjwz5mf zNQJwnJ6MN0janwJE!wb)irS`zTWir;`Vr<0riaoUuM)_Uqogw+H+%cown!y^U{&I6fs#<Q4 z9r8OiK746(^(c?>34+LyTCD~vKDTWS!B)-2F{dA{fmzVUL4}f+Pal2=3;4KTk}SP7 z{XOWuFt+gv!*)z6Zhv-+9&-`a*HCWmag$W)uE)Q^YawkLxqt36OwAmH!k+_jcZjTF zoU%R+x#lmPIL~P#8oa>AK~=9muw9|w$F#&QRZ@ipYIXC+#Xoa?|3uCu(*r(46Go~f z>URL~4bqF2+NmcjXli9doDrXZ&JNfu*j8i{K(aPDH*%Tnj#_ua45;*%>_6BbJSt6y zrIg1QT=;l9Ep~e2m-i?xo;qmbyK>(9M1H?N3vYnYkbB7Hi>Q^Yo_jL2hiE#jGFx8} zhVir61R+FzE2%WXjl{sB0Rs&1tI5&man4Cb%??o3lksLrmbS*J2|a%P!d4ody-T3erk@ff^@-QhjDO)p?`t^v3_?fN)qZTXC+8La&xVKUJ%4(7 z9dDfeOsfW7#I;^Oesya@N?m{wl!cU=zH%}pTLn)2K3JneM!out1Gt?p?cl22D6Eby z{XF!lp8@Oa{X0P^1lHOz#*;GR1>#cD$w%6HnrN1pgexmehcMh&HMNI5jSFl%f`!!f zV0U8wdaO%~xH5kdsL}?EfO!6U@4r{ERmk^k=tZSChb!*t)R(DH5FxsrGxfx}v=>f} z-7(P)zQZ9%I&|SZXARS!D9lyZ@+|d{AO&ku77NUOUiK)dvG_o2!em&&HY!B=*8tl z71qbKKk&`_rCEOD8g2R7OOKoRt{1E%I@21e(IpQIkvf`xW>=LkMfISMFRUx!i~shi z=lMMWIGSz(Bm8+P1xvb$dk ziugIZW2bafF$uW$&bTL8cHnUPpL4x(XWtG9%@z<7peN8sk`({m2Z~|w%5&xNTJOy? zBaL5>2GaQ*42=Zfuo7+#ZI(nH{KQm;#|>Z6I0n?)<*cT6Rq&;1v){Os>mvqmCh&C z$?LsL0H(yQ-DshjR?MdLMEv=N<s`)}20uL$?I;9Y^JL z_*5b##<2m|G%L>AzK4P0Ci=fX_aA!JXpMr4cZ=v9AH5FRx{X}3j+oX=%Zf0jvYcgh z{bBr=KuS>X5ISRrLW}xKrG~F8&O9E8?16cfcmE6Y9Nyc2+w-5h&l}pNt8}~CupUfp z8^JFh)!&p0q4NDUnQ(Zz`HAkroBAs7CEs`W(X0O~?lK0k-hSDT^N21hHy0TTnzSh) zqv6Z|&Nw@;mv`e5g*04a?|Ba=;Lg5ia2wf#F|_PAshr`L4cN63K~^klu=vHfi~c^s z^sclj+q3``N&Brs=9qpY{nRFh8S$yL<0AyIku-0R=J)b$Uzr*2fZhFET2qec=GK2D z`#U`yRQyzRHm>ZwmQzLp9oCUcy45c1q?aOld-A*A6+flHaow!59$ z59hb?gH>xRQt7GVbE+UW!~*$#uLyt|aS2eY%RuIpsnufZF2QX{V5FHl?%Df%Ec4roLs3MrDs3-o}=JGe$URgckP zi0-?cfNBnq5w71C>W&c249(k?qYJbO>t#Qe>{tTGv$~@OgwuX&$#-84y0~wOTqVS{ zwLN@M>XUIhss<`#2Y5`aXQ<%?3WL>zr`)~$u~g({+dGDhYFGPls;X441~Rf+tG{Xa zJ8G%^(O-jj_jv!DJmmR#zq3k_@yba1fgoe zw(|7Q{I+m^Xusc`K?C5eY6R7;eMdj>2u#_Br8y8ofJr0pR zFJ_olO1~3I1@b z7XxYgCfm`cAY2mNPY7t#T8<5-X&w>7Zb$7ymz7ngHK69fS9~{R%fY$)egy3SdO9%+ zxaF#6@ta8-hY|Icm1!!Ux$kS|na85-ONxp@qWzXTEZPDw{j>?HNRN_`_z;@rgBTTA zR8&JCY25oUr@<#4F!yi<@_r7Gx6%05oU>vFCc2n>Ai??BD)~Eeb7uo2)bQPeRJE$E zosoTB#-D_YJa7c<^Bbz zFK6i6a7*Jz27G#kFj74{S!kEFik76&e0DL0&K4$ngaoME)2KqGy+Ran$!DjjJX^&zLg22*cVT3O(wKK$l^(&*%SHnom1S@U| z)8e!)YORUsf&x(U5S!NvA5ajE38@@Z080cZ&tc@Z{2{>jUuc40>UGlPZi$v|W>#7E z+^Jwxw)mmnA{@265`C#U=YagFkx=w)V~XcObxWWEmAc1pXR!FunO4Q%wJ&DN!efJ% zw=9!&2JQQp!ccv%fZ>UPgzq~g9Waw+mi5FNV8~PUvQ2#C-ZG$VcU)*bsG8&-Kfc6%YElT{^ zw*ru&m#yExh%9;CJ@3l9p%5K=C*F)Qb{))uussDwRAYQ=4~Vnc{Es}Gn;eO)&K2T+6GJMb_X** zRyNaQvTx|B+XMpwYc#{vY4TRXrNW-+pS8U`Vz$j)wGL#7w0&IIT-m%+3g_#8B7OGM zcheuzCxc>>P^9cmKlp}qBZ4TSUeC4X2rI5vQ$&IB0Rp90G@zCk>zC+~Lm=wIRN@=s zaP(KT(`fP9?XT+z-{JMQpTkGqZ)E^FKf4f6Awd-FkBy7D24zjrL6U}2aHsbR-%L~! z9Y>F&>VM+*V=XBQ^Er6B?3AF4!~g6!pV3*m*Zq8wEhSexf{x`yum_B}X&wxKOZ1-^ z^Z2jCK1JlaQdx{x(W)j+e+)tu6_7(Icy11&=-NP*#_}%~OxHVgef5pJtmV(RN;|A* z?l2(=6VjDkVvzA>jFaMv#-<0xi4F~xp|>caCG&KDX_8OfCXrxw7+SabaHy!OHvdP5 z21*&U+$&n|+LQIWcFwObq?DGf$b;ZL|DgZgPoOaJRS)W`KmmU$Z|>Y!@;TObn_6$g zoi9t-X8lX>nC8z|rjl>RQ6f|Po(y+5U}M%JrI{B-Yn9bx{**`xBgc=VLiQ?c-887_ z1K6ffO3dX+{?n(Q*q7y~h`u@;l$S5Z-#+$%KmphtDpLy^*tvasLe4PfQ@x6FJf2Y2 z0u?y0_HhYw9wC&V`{-0~AWMAKALsoy>GS+8PQf%@fQaAw*+e#P1R5&2->D_mViEiU z>2!78_=s${&ZBaxar*36Eu?MB7B|bdwlV*_B+VN zG+aV_ObYj^*RqBp;xNF0C6ITWKMq))EDl`(?Sz9PSA!b~0p&7FD@ozjK#up8vx!GU zgN_${yK`tYZIPV>T2V63FQO|YDGtC~&QS^^u-)BO`_;#l3=wrSwr2yYtmLF{j>c!T56dxc9Vi3}k_fI39 z-r%sjPlnM;ax^%z^zeJWWvt(juRd0K0!^s%89Fv@56VN)@gr2_DO^jMH&{X%pQlsO z^t7t~v$iGTl|i(TFd?td&zF>wC$hfK<9sSG!zH~J4sZye`tcIZ<~0A=8vv1@L1Jv{ z;WX>={y>}98~y|+xl~eXb&RPJ%*@Hh@K%ogWeNOz?XiMCR=h`|T0xt!k1wHBpN>ZOp=ikFD~XO~F_uE&kf9c49$Y z_%#+L4isC%xU7!^Y+fV<#A$oleSi>TXR;LEhhF;k!+ZNn7Sf?MT2 zIflxcy57EhBe(6T;}NGr56Y(qn$};>&bv3YpJDX4MZdg{nUD=pUvGKw*45j=TgiBC z3p`f%!)~Kf;ikJd1w$Z!A~a%lb>m025r3!8kR0jhC_t^)jW>AomTZQL+hH(fC8_ge z0cvVm97>_^;5j+*epwx9k7;Q9<=+d!sE)`9Wc8e5>lf`9W#re8hH z6?RzVgcx;a#je%LkkOzWVy|J`Si=w$Xzyj0MvK-Bc&1SuqxaNp^iJDZ#$BI*~6IY=`*5t^sU>Hga zXTjoZb>7kx?&tS3gGyiXku{k_nP~4Hayg2HDc}9iPu*pksn42jk2ZcnXxsL zO*BQk5#GVp{KhR7h>fB`?={I&0^YHZmZ@`#eUK%tP)FsBxc=@ii5W-wLb(m&`g2$b z))^T(%+202Q`~RK1fw$@-&=OK3Xrgpi^CNmsZ4bN?+unfF2^Q>Km`q^c+=E)DjoWv z!^8Yhl^lPWszH;8mkic`b5NH0N{3*fV&20>5_D}SZA!xs?@mtYO>_BW#9``?5`Nbe zW?7DYbB}JG;su(bM;2)du-n9G>OfhcFahcSNkgcixkre@jp;;?IgNwThZg)E|79<- z+aFw_l<9E-PLEU^iU_;`9*^;5M@Rc)0)EL>m<9*$#JnjkdEH3(L3r(DgU?O?&)+-M zaFKgv;D;7l&Z(Op;_lpiS@29HHW+5y89&TSW+{jDVyurcxY!Vb7X?G*yzB3 zYhD_IJ07YZ-_Ql~dnWt)hg?SKV|dUe$$cf)|Hxyo{%1jTP)>)|^pR%}89j=fVLY3< zh|n8w^zqK58N}yOJ1{BdoG1s%yED`ro8-5`x&Gpc7^g=c{rE-1wS#Ni?(toeTK01I zLe7IbMrP18_aZE2Nm(D2G#&-{f;023wg9!x`+mf=gt4vxIqs+y1QJcG2;-7PWd5skdxwk=nVRjF zlRZ)(XdOPs9GPIJ^^f7NiT2dBq_3Uh?e<$1a`_9hbcG}UPqgPK`Ea88zvy(B(`-4r z|4Q>PGwESonG;!!te;!Tj)i{;4;DW&K)roCzaKFphEGOkW94R-7qb@2eDLu8BL@OY zGJb*c8kX5^}FicT~naE+HtLM;C6TeJPL&aR$3 zIyn+Odo2u^0%d8NeD;zO-^LfSRXNTrF)ISJqO+2x0Bhh!)>V zE;tU$W?NbM-&<;lw2q*lpitMSm_?#)1u{i;3t+4mVzTPV_rvJQR8aj9B1HSim4E`- zVT*ST*rcQT;I@0TKscpTDcDEh6G8D=z~>*o!1y&w%rb`_s z7(eZ@nsGLoFBx>2To#%AbMpa9iZ95aThS9p*KOukg75StPpKeYkF`&nS_)GH@QPf0 zdXuouk^|=_R&R;nz#K;+VMPAIw4$y>Y!I(chsyf0)F5I3u$%k03jpu5{~646<3IJ8 z@}ZV_#sWfb-X+ssXx=5zl?r1x4Ak~C%}H`0cBH&=geH%0&#&uKYq@faQO&k7_)zSS z$bidu>HALkjQv~$T)sP3*l!FXn zp}-_am7BlK*~34Ddz{q25W1-C z&v)Wfb4@a5q}m_blK<%IyNwZgVF`J3h1ZX^zv*QHw%`JVdJS=Ml*tqYubs8b1Z@Ap zZtrUN93h{TgOA@*RSZ$-zN5Hhf;f>uhs*m?>F>sF9`mJ@0;j9pWt4HHRh|nDS3k6h z&91N(^nd#)dkV%$EMw&$^9Bql2#3$Dzs;>%m%)tn50FFz^)v?JJDg%;f*xj8rWqUD zj4zlurs=lYe?aT@QVrr$&sVh=hn~JOLtFKHh}uGC-%~Vzcnk}3D9Bv?>+byA_}pFo z^kad~n3qp`w33gxNijxPUq62X!_Em`VZpq9P=QR<8z;t#vBI?{U&Tlw7V|s-o0knpRvaD<@ivFU zHUep{e{yiyS{*V8f&v>{@_CK(Cj~m(F^H|H(UfLPzNQ)@2{_1$aiZ0cChFeLwqpsN zZmMF%oo(JYXiNEXq_6egG)*{W{NyDqQrDE=VuTZ8xayPllUA4+-Q}N!JnXQ6Ng?VU zK~!)eom_!czWn>ajuJLGH11(_@p2{s9g1n9SMZ}2X%zoL(ERH^)Gk)i6lD28a zB>iD26tDB}i^!dSPi2OE1Pi|-w**EQba-9dH9l9RG>VCy{?ypSAy{TnMC1+V(j@)X zm3IW2@0qI!_2RH=h|u#Ocx?4z_#YWuz}8v&j+xaD7REEEANHcn5`=?|^Rv z0V6{Tw81Jj=2%I-{+)+Wl!h9HMvshHPbG zzoX#SQc)6`Iu8ta&Oik{&IJ-<#$D#@rR|=Kmxhn^&H^6t@{RZI!ldq*3kcDMb$23o z9k*V8RrPf+piW=$!UL1Zm_g}LA@u_i39Fq{1qOgT%sdVrt5ktHw_nK7Y7qu0;(5Qj zXZwp&_j&sQ$hBa~bWJ4n?FHs>M@)hA@MWQVvoTC{q`%r~rv~F%RA*=ChF$!!iab^c z!$V>C(o>y7R6(Bhd#|D;DZ;KrKaIq!dp=YSV0r-z$QhusvNclb>Em9EpBk%;u|C3N zY-DNZd*2Z;IYyVs3a7#O!fl~a%=9ME>hHh?zQZ1Nbw-tL!OnP%Q+=%$mjF8c5vUw8GGC_rixBl)8b;iNuMEd#UIIaNmx@|#A+WY%cr&?`SeelEDw znd=2}37AajsZNI)#_+utZ(cO*6 zPctl{QKW{z?29bk?T;F;jtAA6Z?(w1WVEE7bW~Y_DHRt(Vj5&)+k2q%@M5h}B_sMi0>W0lOt8M9i zY`y82pm}L%wKKzV)TJ9N(jmHfb+V2b-)*QhUB*?Vd5McLN0EasVt}&LgMneui^JJt zZoOqO72j!BE}_>UC(sUspfU3{0|PP36;*H5({4=9km$P<{fhTQ}aUKK5S5+>?=4~i5je>OR`*DSUwOG%h`L`3Lq8<+Xq#ui59yZw;c(d0$7@=RfnRPk+bkuOiT z3(r9|qG2J3th$jlt^6d3PY;G27SGHG?*`FY1P3PY3+=lQKD}q-L|91@x2VI^Xq<|nOAvvUb!VnZBWC+qBf`lLwkggAnfTA#@CJ2ln-QA(YMt4Yz5i(_j zfWY_m`QiK9^B+7vZ?AKo`#RTkUnk!0b2^z!-tJueXtxqsADv)MGOGLV`gYK{lQ^4_ z3w(Wuzy_1h0aD8jLJH;NtA&aHy_G&PCsF)sb*9jSlqrC*Pe(?rssvpv=&TX{8SFxV z4=nhU^BfMK-koXTQ&!g=Nsox3EE0Ih)W632-zI5Y2xv)-b_y;ua$-fi5wb!Sd)^?f8= z(Vz_W7BWE*#KwhFKm3?HP`{3hkm|K$A6}clu=L5>NJcY60tc^Q`JD7*IKEl#<-EVD zv_Kd+HZ-C9%f$FRzZFTJ6^*-5^sp~oNyft{APQ!Y5P!|y=%LJkV3Bk9of)!r7d`rZ zqC=q5_bE?g>?zO7f*u{GxaJZ&*%wI}-k0?D23t29M5RM^blFJ1vg2jA{@hLZU`9=uy;~-q-`qRHt8_1-1H^UX zqPA8o2p1k*XSzTsWo@a~2D79;q>k$p!IJTYVmyXe&XQS6cOqVmu9b*@*7$J|lwI3m zoX6ftZ7$Bqj8OSvha(ayx;8%Oo4I;P6Nw#dgGuF_O{8_e^FpBo1?DDFLZv$^N+nO36U&-lbiWxodH zN0MzTxm&~Uc6;zn168pi{YykknxWfhKK>h6Sc8I$6|6nWP1MKIvdW?SEbzvBa!;iW zPh`5mCXiW+10^=E3|>hphgsc6kbxY1Z-{G})i>+7?72ziM)+ATl|-$?`K_4jyC=!$ ziu8~E^?w0eKvE3ujEhxLFm(Ps@$b+xQR*|4o``n2-WKix_3nDnyyz$XGkd@{9P;HQpuJpO;KNE&0 zY88LUX&2wr^Senz%?XnchRUMsaGZN$-Rg&^Jrz}wsm(c_ZXmV0z6X%849m;fp8x(J z`KWdODf^M#-=ZzB5h(Eed1la7IvSeqX43I|9MLR%ngvL;{H`v^0IK{3F?96|3@{9T zUlIw%-YUFaPz?})M+bJ7YgpD}VbdRHICAGOV}HDKCS5vn3E>UH8hrGICw}c$C67Po z!XE9+{0x%|=LFUAzZEw{6fZopPx0~${EZ1nEKKNyq)eCEXmVV`1u)k6uPd?3@rMA# zjR{N^1O9T3hYX0#xh|3w_cd&_GXY;Rd8$l(mA38xMH;ohV|sPxsL*J_Qx3b{=wjOj z*!bG5iZ7wG_1*@SD}3F&#&NUi2~tuIfvmv*eJc~T$0v045S(wrp7CaVzoX?f;NQ0Q zk5DC}?XrS7(B?>@DROvX{ILS}YU6ZKG@Qs`zz*c^1f&HjaEwG!sxErI3p~!q;6Mj~? zwMK4M^YZ?$GUom#MGYJHDgmCGF!pY-`Auo;(v4K+?S(Ml10T)$B7C? zt${;Ih(T9)hv#RHm&}%I)R$yeFvLI9zJ_KO;hC3)W;t*-#qjZ%fD{e>Z9cc06KUpQ z{}5Tr+JMr)by}u zrxPMA6hT|5;p;@x-CDfD^2TZGULX5YrBcsJd9j0AGl~U;`b_Y#D?K^63#HVxI5gx9 zCdpK={(=_TzFZ?eBYC{q&5I^zIY0Ru{@n1@#K!zseE z0fhP+s`TeEG$T@U?fYLHJUoUsLKY zolTE`a_xL^lojZ8tocKPi#Pw+{ygS=^@t9W7sCHNT7w!{55U)(=eG^y9CyB3ggaj| z%l@^$J)nC$*_z!dHlyd}o@byR1qoy237lN9KSYPT)GgS-Z3n*lTV>m^;|mc!w^0)I zLWul?+X4XF4D#T4X zrg1R;`^)mA$H~tyRYtgz(pzZ7`@1uX8-BNU`2YB%+ka)X_c_QAVt|8Gs0SwBlBGH? z{kitEWtCdB$cPm9O4;m)b1Et)!!>%cDc{d8$v(d>(?JQ=7+5cnAm#nW7%Y}<%~BS$ zDRYv8>R6RLvH!xDB>og3lH$B@JeiLk+I*`+72SPyJ6tB9Xxy2fy!b3sFcL1~+;<)^ zr3bqgv-hW4;N6n!rzAu%C<(JSrt45XODn8L}5`(pmsP)Id=u$q5-CVrUSAD4py9A4ID!}t9{!zU-Kuj9I+e?RE3 zu{xNK6Ek>p{=#njxVPgT_<@6U;L%)dt!jbxuzx|dRPH)-lIb_CI<@KkEbYA@45bmk zGCp~9USvi$x1w%~+8BDWAF-A=H#%b)yBl|mPzrqDI9|=EZ^>yAUE-N1BQ>tEZcD)z zg?JF)Qu*ilH(L)xDU{-%2ah#xX9)P{paGJ>My1lXm-`oNH9tyk7YGBKQ!dYNDXF=R z9Ccs3^ykLTpTPm?zVek|MVWv((?WDCYRyCQmG?8u3q>yc6-Y&dV5YDdW@%~SkX(ii zeDd0rSf)%{5Skpp$L0AOs7+IzY&%9(zFa`9?da3ijdZXGnzu}+x-e&Jg>J}6*gQ?J zj1x=N68ve0V7(4&;Y;8FP2$?VQ+`()u;xp7fhYcUsAygDyUoq@hhF_A?XK^)GmjDC zVQuz;mVA)_iHCTrR_8LwLz)@Y`$nOEZJ0s;EoeB`%`ee*y3kk8m*ykkfwHu z#`SOe5a(AOu0%}J*Si36x6>j$z*P2N5#XL}yTF7&Z;G&Id()>|+I1pHA<3?sT@^X; z`d4*WBC8pCu(;Uhe)lO2vPPcJIc>WzbR8FYBYlTG=cqz$x1EeZj{Y$Gwn~}ePdx%u zT6kFYDYjs-e;UUc>hxplt&G36&?$is#=NK=A5-uLC%0ox={u~_{aUzurV%bAkzuxc z_k+W2)l?4L!2njn<=#M7g-;pP!!8KZ_gA+Xkj_COUv@LCOdN8j%|T|e)yU>~4nuHq z02{>Sz@nY1OMS;JWd0Kvj zgQweS??ZglTBKm&TiWGgz(7UAU?Vb3eW%{XHP<@hHmZUdBUwX6<5zvMPd&O% zn&QPqlBH*+g4Kx4pPC0LMa#*?d(<#%(va&t)(bbMlkixa)oE+?;xAft2UuzUe5|4XmObP?Sa9!^#+c?C`$t+hwQrtVLQ~rI>W=@Jw z3OYHxDd4|h^ELjrzxP6zQX@_+nmY>g0ld%ZRR})P2u|NWL=W$BNng`)`D?=yl9z}| znX1QdZ2@X^s)3?{+KeWc+$ZYM2B?fN)M_ zz@9z7gp)GgM&fpV$3LBDZE17{%`l>yY$4k-^R5E6q=reZ**s%P0mTlLr@fUU6qNdJs-ie}@f)e77NV zcb~kcdIfx76L^5bk$$S7VUjr&;{E-zJU^yYYJA@#d{8nd9mFtF5 zjPgg)3M|=|geX}Jh}u`uErDUPn?ZCX-!dCF3|o%Aw=tgzk++4e8h2``!pddSxNxw! z?w_(omGm6F6f2Nr&Z5^PU*GNRPT{Aj9Na&_*|aw3$kg=&V^99}uNx8gy46lqFHqR( z>^u5|o=-X{vq$kns0@R#iM~~~#lSkExf;pO7Dw8!`{4{Mm_fZEh6**b=`cSo?FDDF zkrF5Hsm)=r-VwrLl9Yj!{eD;I{~Q=ekfKUh5|GH!*bflX%~O7pKH8ruPR$ImMiiW6 zsNL(Lmfyil!Iq!2UfGGVo!Q;+m44~Jkci@wB9psBc@GJP9r1vDG- zfy}v2d8?l-kTQr4r?qeaWKX&u$C)CXRqXUSKqmDI?2z>d(FIq)b{^! zQMEUV40OdkOo-qE?WUe^pj@?|C+0;vtpeNIUbk}es#QM!yK&9dA*H;}9eSzQu~*7@ ziRPvVGNX6|fB()*>$`ObG{PR4VL8+g8^_)zP}2qE8(t85CQdTis;X{CMyKmda=Q6r zRKBBZNv9I0x?W|HWO}Be^sVZD-UGabc}?fMw~p)0t~Rn;X{LD&$PC2W(JavQ%;u>R zK+whb$;|V?hqg%5KAu|lX_os(?%~5S=m`?`6inXILbWHM;Kd8lIU0OLzP4sNMYYVQ z^qu9 zKF@_e1I+2#!ri7kKNlc=zx-T6_cPQP06l)3!SQ_s>!*52HVXErHRWd=8FcwxqqteU zyLSiT$ar(hUCRh>3!BFfy^Jm<=7A{ak-RX(^o^bC@8x&WA&3IK{AxgkAM(AH9a$^^6SV6aQ%rMP&HiZs9^{h~_629F2J4X5XPOGT6jtUKZX}=u2%t z(AFoHf^aQXL2=rWv_ZujcG?iv9FIAinpt*6_$e>w;|ImGGX^3$GaUzcr77`u#o}V8 zo>!H{j9!{>DaiTbh-i3MAb_%SHMgwrsgkg}T_16@x2T4;G+ne~{#ZK2cP+k#B%1-x zDG&(pcbb`T`_|p+2xQsogjU`$$F7D(Tqc=sz&zhX+oF!(x>>1eNs-;bVOc3a48G9Z z=kgJ%%&>e~XhOrPY3iv=*EwgXwoHtHJfNAdb=W_UxB2MMt~n?qh90`@xH74XFZ73J zhoc;S)3!11mh-*TaSY?=t5WBovsUVNN6^{&^(&4HTYDFgPfO6oGJ51mC9qC)>!D&m zFU%J_DyIU}k4N_#yoK$KX89-gHQbX}d$yUg8SRCkDWmgaMhNp>y<=NXjc#l57MQp0 zo4ivDhB3fdH#v$Gpe#4rxpOeo?`DgDhVgTFczFQ9cvSJAtu!Sr`yE%uUZ2)OzoRGX zU7u4gnNyoU_cu^?XpxVgGo`mAE1f;_S<4WO2W{`CwF?Uq%LWH9kDd&uu&0lPue}E8 z9`B@vbku?|VTtMkRbu{@^TH;lC$28KtXuC)!@3|R1%)z>L)h4xK8Be4c@DWA7|og1 zlPb0pCDu<;Vqcyq9vA6LvEV(Kc@g8QF0ZTYnb^FYm~(JQ?2oet9vyp1DYxUrg|}T= zab1|$Ay9yeU7VhFFIM$wXiQgrsS8Kf(0Vp+1VX}+4t10+q63b9K9GSZXpP*bR-oPR zjBdR#KD&_Phv7ldJ8z4>%t^06Ed(v^tKFd=ze-KAn2D@E9ojMJ&E|wKyhQk#C{ym}u0Cuyc|7 z-~}=(o>lR$iyy--&4;gav<)vk0&Uh7f_dk~37^k9qI>nw}s zrDzY9zI5Z+`SH_NZ&ZuQlbW&{13hyzMDI3+@?M*_Cr^X=(!xZv!8GH$D|F$-R=Dfm zS#Tf0?``OjVQd3`g;iQlX_lW9NBkF&o2aGbNqqU_o%;mO-8Z@J`=?QoFT1iiynw!b zdGFygZ4-ZPhR?m&`u!xW__A%@$40p+I-s3+GE0LuWZC;~Ed<1Wr_vO<(g5@0_Vt@r z@O$089B-21w;@^|Tp#A^{b*LXd#qPaUuIr3nGHV{o*Xr(1d1)*Uk&T6KldkssNqvT znI-B3E#{T+nET#93drLAYMXY>g<%(dE8x)gbF_Do5^f@{HUu;VyAUThmUE}`r^>AS6k zaIW7QU6`iHpuGi(1VpDo?iNkrRN{OC+0ScVLT^4qPqhI8-9iS6hW7}dn0(I6w!0U5 zWRHWlL}zN{ba=5My$GSPA5OU&v-I5f#!3T)6UBMI1?+;^vzKn#0YJi`bojr~ydY^M z&4KAe5RK@tx(1mf5Gp}#ko%td?~Mw{80*cf=$YS~w|SJ0SASZ1&MVk^Tuj9n5R{ET{Pou_g6f@k%mVBG#YNtB(etpSKaJw2OvQfrl0Lc6UKo9-$yTSvq= zdj(0)-|B1JP(=fY=$Gc3Hl7qQPo|;+#%|RU_e{%x)Rs}Md!A^xW>-4%zp^ z)H5j)92on2WF7jXTiLBaP8v&B)Jt`_A3jyrIxp<|TUr7;b~#smSpC2B3^>dkVLo14 z`yq;*cp`WoDNXu^U@UPNR9<2T>=*uo92Am3 zVTgzuc=rz9xSY5PlFs;mb4qp`)<4H}&C#Gmein0gic?@5@lV||rC~arZ~OVATH-Sr z6!f&i0hh~S#Hr$BExXDjHODDozInwrM+zA^@hDI^KkJ3^Ntc5LvZ(L@73}Iux*BiB?7DU2 zM^Pm*S?r87!eikLX?}q$PfZA(f(6ITYQZVYovyxFg1c6!XcwFTxl*X%K%&6XftK74 zxo{yYmI0$HK|y_w^oQV~b{A=$qYuKvZPh)ZZc`v z`?GJ1PiVU`Yyipvy=p?lG=?`>Q5t1}M$ok!BcEp~CM!JPh?fnc9n7ggH!aiVcI1a! z&Nx_bv`zg6uFXqUQ(cuSnea@DMmntCF<;1a9G}+EkTTlW@)H5D?SXqW30ZIv4tU0XHF9w5))8uqki;HL1DoLp?<{> z4E$%vkFvz%O84Ohf<6-TMP1!;TuD)f&81y0UId)^*O~Rz%E^S+qjrdn-{{`Cu1N>! zwjX}B5`w}`&s>llaObim2gQ5OlDC**R}QC71?g>{cE7M5Nnc1~t#JIViGTSz zliC^KB%$wIUC(sAqRro>_Y3^^@jJd>CJp-a0jU8@KJBIwH)I~73S7fBo^!D8ddI*e zI%;wUKFt1#+EV9N0*j4ga-E98+MFW#Aoii)!PhW~z=e;x(Q=24q^u;3nq6r z%{GRWVW{E+<{wt=e2hwUe#D_a;HEVY|F#OPVtA8Pz;b4ys=KGvvZ%16UtpHH&z-at z$86*g0s_(4{F@PAG3_3YQL*d6o1I%58bU8%9W;l7&Emz%pRrCLMygfGVd9ZEc-YLh zDzox$9?@Jq9Pj9kEizAun?V%xRVQ;qRk>}mfVs%%3O;jDm}L0V{Ry$nEi9WaF1*7_ zy=>xIDl|?z_5@;=!q70^7)QrKa&a50&BKvh$jBFt zJ4J7gktfG|9Gts)bV}nEN?P>Eu(7dxF0ywf;mIK5Hi!M6`#l539+9h_Bnl)&kF>`* zyap(fLh2_jR-tlOvk>HhBwag6R}QEfbfz#o6})0#{VJ=t`&);+NDS4Dz*&KKYR1O{ zyuzJb;mUfwDh8jaXf~M5ZqRgfff!?48(p@pF@+BOi=Dl zr_nAa`}Zn34BPo_Dao+BD@8NDE_Lpz6KuSGe#NU39bmrF-MvV1h;FwW{b=o>zSTKj z$q4tjUQR<_LwsJh@%e z>0+aQw$C!QblxlPl?zW%ni@E&${G+9`~*IzmkeXW?fs)D&KM!iH}2#n+>xE{y7TBlTE(>BMW4? z|1roHF3%h8z&>B$4JOz7y?JXhNDZlbr`3u+P zm7j6I5`8Sf=r&nNCYDF|t`I|Nmgcaj#nr10}FiivcO z5j!z(4A37c%CPs0_J5SInIm0#X{9s(3M2JKxfkCpClyJx%89AUaNHXowN?it zpzr-^SY&sslWev{YVIrNVN#FhF+<%l=w#Z^XTowzpIW>DOYN|DARFZFd+>UzlA9lT zNcbZBkB&HSIhC)=Cn|%TlhOYq8G1)7-@StHOowTE-^cWa_wWwNTfEG$IG(w-p3%Bt zD+j!mFYR-_vojstSSY`V{bNkOAY}`C6Kys`QTSSXh2z5stCzZhfGM5}@w0JSHvFPr zm^RDpZdEJoybxkx3L`PycR;YRm~@zpLmI3&hNqZw$-((9?sny*u~a$t&PRJDTQrWn z6#$LVW}hJDdMM{E&3hY$pm)m*b1E55>`El>C&uqrEM^o3{`-&lUu0vt7gH6B9b?zt zWQ+#T_2&m_E$I1p_0{lGML=E6$BW3u=~E|(x0>W#RV56YmK0L! zU2p{2i!#Eb=rf(X{{qr4C>p0S!F~$=>`bX*hryP)9=3?7%$XvnnrX9dgW42i9OiD6 z_g!OQVYs>M)l~76t)6Q8IraS_g%1IMa6XnMIT?p-e)T87XpTujK)V(bgF+44V|#>) z$*eVTq~3WXSzhABkvAoTmodES5?D@&5mugtQ+Ws@?0c&yXw`W-Qc`D;GuW_FuevLd}dnW z4Yyzrg8p2t*AK4fTaj5euKNfVNiCURn*iNJqX;heZ7oUSb5vm%)2cP~-sJRt_zKlK zDi6A=?-`}Q}`90e12m8T*36WoeDLA&SD_hw{H^wM!cl_RWcVA!I+x87ee975; z@4kD^=bYPn&pmG@(+JZ`rqQEKxW<}RzhW}I!|ulN=fmjVi@x{p$cC`)5$a!)X&U+blKNvN5tg=uLvuLnuqRM;Yc*swiexsoh#XPNu{9F#c`G zQLe{yWA(Y6(;>y|-efAy11k<09(@Oo1B2@0`PtZSkqK&${ zgEY}`W@t{%?9u5rF?}Y7OL{338l*JY#P!%MVQY@oqnItpZ}?s z!r?*kwuR{A@jg2Chlf0^{q*>8n5Ir~YWf*wmsh7B5&EpHfd5@xVaj&gqsdui^spyL zB|kUoblGoO7G(MuKTfa9?pGH0@QP^b#!lM1yHWLh*2iq#`C1TdrnO-d#?Oh@XV2HK zKA{`eo{--^K&MW66Lgsktfvn#cCAc*(}qsfhrvOjMGLE?`dHVipu1J3Kgr%g?cNa8 z)pkmC8DGH~fG+dlrp(5^-QBeEvkOvv#q7MBVLtm2oD^$lJZx--_=K&Ttd=-krx(Bb zcEoKJda@S!%%@`P-##$>*u%T*mh+QjV@)Qa=Mk1?#zLk+M4tIt%}wagT{5J%!tXAE;r{@=bb%nNVxvI+C+$t?!VJ@0d@HIyMJTI{vEw0Ul ze(ha!e&qANbTL1ZneNl45t=#Ot??C0MHjjgY8%*mGisN|S6%g3;Hlx#fMNcL<87MW zZ>6moo1YD?P!fJ#Jb(4)_cc50X5n0KoDYfdPoL^iV`k&o{LPyaoqMqk92wVM#_O0l z09$(A-D+gVIlq4TA&{1T@BsUH`Bm=r#l$Z51J-U&F32+hfUP-iLo=jg7Xmy+WLq6_tWv&`wDlz#`&)Jp~iQf zZP)tu>}pIIJKuw+$&t}GQuqMd%Z>0?t%&BM&Wo^4P^Y z)c6h^f2R>X8*}q|bblAF?@;%?2>$y+cMQbN{X$)^R>vtNq_5AB|0N5U*d^T?X9{xQnJYeU{ zoZL#obI;~Pp95f1`%X3D$Mh*4^?O?IT~7HqlWguezmg?Ybq|7>qQ(@pPHbE9V?f|( z+0xo!#m@Np9PljsyxBY-UA*{U*la#8Wz2sO|48_-5t8%_!n?S$zlGe+NA%?vmxjS- zHE5O3ZarU=X}$7>;Okp(UWXJxI%G_J-@IH;%5#Rt$(WUX?6*Ux!IRd$dLP6+SmPn= z8zjm4jGjN772R{FGkXwcNv8GBcZI#@Y2m{RNF_w8(Z%^A*!bS*!}s6sh*NnURytky humW;*g7R+&|Ledvc- Date: Sat, 18 Jan 2020 11:53:57 +0100 Subject: [PATCH 06/13] Change icons - Change default profile picture - Change dark mode icon to flat one that matches the color schmee - Move icons to assets/images --- src/app/app.module.ts | 12 +- src/app/models/user.ts | 2 +- src/app/services/feed/feed.service.ts | 4 +- src/app/services/profile/profile.service.ts | 4 +- src/assets/images/account_circle-24px.svg | 81 ------- src/assets/images/default-profilepic.svg | 200 ++++++++++++++++++ .../images/gv-logo-flat.svg} | 83 +------- .../images/gv-logo-white.svg} | 0 8 files changed, 218 insertions(+), 168 deletions(-) delete mode 100644 src/assets/images/account_circle-24px.svg create mode 100755 src/assets/images/default-profilepic.svg rename src/{app/gv-new-logo.svg => assets/images/gv-logo-flat.svg} (52%) mode change 100644 => 100755 rename src/{app/gv-new-logo-white.svg => assets/images/gv-logo-white.svg} (100%) mode change 100644 => 100755 diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 99d543d..e696687 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -68,10 +68,6 @@ import {MatDatepickerModule} from '@angular/material/datepicker'; import {MatNativeDateModule} from '@angular/material/'; import {MatSnackBarModule} from '@angular/material/snack-bar'; -// import logo from 'src/assets/gv-new-logo.svg'; -import logo from '!!raw-loader!./gv-new-logo-white.svg'; -import logo_green from '!!raw-loader!./gv-new-logo.svg'; - const config: SocketIoConfig = { url: 'http://localhost:4444', options: {} }; @@ -162,9 +158,9 @@ const appRoutes: Routes = [ }) export class AppModule { constructor(iconRegistry: MatIconRegistry, sanitizer: DomSanitizer) { - iconRegistry.addSvgIconLiteral( - 'logo', sanitizer.bypassSecurityTrustHtml(logo)); - iconRegistry.addSvgIconLiteral( - 'logo_green', sanitizer.bypassSecurityTrustHtml(logo_green)); + iconRegistry.addSvgIcon( + 'logo', sanitizer.bypassSecurityTrustResourceUrl('assets/images/gv-logo-white.svg')); + iconRegistry.addSvgIcon( + 'logo_green', sanitizer.bypassSecurityTrustResourceUrl('assets/images/gv-logo-flat.svg')); } } diff --git a/src/app/models/user.ts b/src/app/models/user.ts index 2c26c05..25c1773 100644 --- a/src/app/models/user.ts +++ b/src/app/models/user.ts @@ -65,7 +65,7 @@ export class User { if (path) { return environment.greenvironmentUrl + path; } else { - return 'assets/images/account_circle-24px.svg'; + return 'assets/images/default-profilepic.svg'; } } } diff --git a/src/app/services/feed/feed.service.ts b/src/app/services/feed/feed.service.ts index 99217fe..f912f11 100644 --- a/src/app/services/feed/feed.service.ts +++ b/src/app/services/feed/feed.service.ts @@ -239,7 +239,7 @@ export class FeedService { if (post.author.profilePicture) { profilePicture = environment.greenvironmentUrl + post.author.profilePicture; } else { - profilePicture = 'assets/images/account_circle-24px.svg'; + profilePicture = 'assets/images/default-profilepic.svg'; } const author = new Author(post.author.id, post.author.name, post.author.handle, profilePicture); const temp = new Date(Number(post.createdAt)); @@ -271,7 +271,7 @@ export class FeedService { if (post.author.profilePicture) { profilePicture = environment.greenvironmentUrl + post.author.profilePicture; } else { - profilePicture = 'assets/images/account_circle-24px.svg'; + profilePicture = 'assets/images/default-profilepic.svg'; } const author = new Author(post.author.id, post.author.name, post.author.handle, profilePicture); const temp = new Date(Number(post.createdAt)); diff --git a/src/app/services/profile/profile.service.ts b/src/app/services/profile/profile.service.ts index 1a28185..1eecb07 100644 --- a/src/app/services/profile/profile.service.ts +++ b/src/app/services/profile/profile.service.ts @@ -85,7 +85,7 @@ export class ProfileService { if (response.data.getUser.profilePicture) { profile.profilePicture = environment.greenvironmentUrl + response.data.getUser.profilePicture; } else { - profile.profilePicture = 'assets/images/account_circle-24px.svg'; + profile.profilePicture = 'assets/images/default-profilepic.svg'; } const temp = new Date(Number(response.data.getUser.joinedAt)); const date = temp.toLocaleString('en-GB'); @@ -102,7 +102,7 @@ export class ProfileService { if (post.author.profilePicture) { profilePicture = environment.greenvironmentUrl + post.author.profilePicture; } else { - profilePicture = 'assets/images/account_circle-24px.svg'; + profilePicture = 'assets/images/default-profilepic.svg'; } const author = new Author(post.author.id, post.author.name, post.author.handle, profilePicture); const ptemp = new Date(Number(post.createdAt)); diff --git a/src/assets/images/account_circle-24px.svg b/src/assets/images/account_circle-24px.svg deleted file mode 100644 index 6b911ac..0000000 --- a/src/assets/images/account_circle-24px.svg +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff --git a/src/assets/images/default-profilepic.svg b/src/assets/images/default-profilepic.svg new file mode 100755 index 0000000..fa37d4d --- /dev/null +++ b/src/assets/images/default-profilepic.svg @@ -0,0 +1,200 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/src/app/gv-new-logo.svg b/src/assets/images/gv-logo-flat.svg old mode 100644 new mode 100755 similarity index 52% rename from src/app/gv-new-logo.svg rename to src/assets/images/gv-logo-flat.svg index b1cb0cb..b23d0b4 --- a/src/app/gv-new-logo.svg +++ b/src/assets/images/gv-logo-flat.svg @@ -7,7 +7,6 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="64px" @@ -16,73 +15,9 @@ version="1.1" id="SVGRoot" inkscape:version="0.92.4 5da689c313, 2019-01-14" - sodipodi:docname="gv-new-logo.svg"> + sodipodi:docname="gv-flat-logo.svg"> - - - - - - - - - - - - - - - - + id="defs3412" /> image/svg+xml - + @@ -120,19 +55,19 @@ inkscape:label="Layer 2" style="display:inline"> Date: Sat, 18 Jan 2020 17:12:12 +0100 Subject: [PATCH 07/13] Add error messages when posting failed --- src/app/components/feed/feed.component.html | 11 ++-- src/app/components/feed/feed.component.ts | 58 ++++++++++++++------- src/app/services/feed/feed.service.ts | 10 ++-- 3 files changed, 50 insertions(+), 29 deletions(-) diff --git a/src/app/components/feed/feed.component.html b/src/app/components/feed/feed.component.html index 8dd1575..dac9442 100644 --- a/src/app/components/feed/feed.component.html +++ b/src/app/components/feed/feed.component.html @@ -4,10 +4,10 @@ infinite-scroll [scrollWindow]="false" (scrolled)="onScroll()">
- + - + @@ -24,14 +24,15 @@ infinite-scroll -
- + You need to login to post something. @@ -55,4 +56,4 @@ infinite-scroll
- \ No newline at end of file + diff --git a/src/app/components/feed/feed.component.ts b/src/app/components/feed/feed.component.ts index 491b80d..ff21e52 100644 --- a/src/app/components/feed/feed.component.ts +++ b/src/app/components/feed/feed.component.ts @@ -1,10 +1,11 @@ -import { Component, OnInit } from '@angular/core'; -import { Post } from 'src/app/models/post'; -import { FeedService } from 'src/app/services/feed/feed.service'; -import { Activitylist } from 'src/app/models/activity'; -import { DatasharingService } from '../../services/datasharing.service'; -import { ActivityService } from 'src/app/services/activity/activity.service'; -import { User } from 'src/app/models/user'; +import {Component, OnInit} from '@angular/core'; +import {Post} from 'src/app/models/post'; +import {FeedService} from 'src/app/services/feed/feed.service'; +import {Activitylist} from 'src/app/models/activity'; +import {DatasharingService} from '../../services/datasharing.service'; +import {ActivityService} from 'src/app/services/activity/activity.service'; +import {User} from 'src/app/models/user'; +import {IErrorResponse} from '../../models/interfaces/IErrorResponse'; @Component({ selector: 'home-feed', @@ -17,21 +18,25 @@ export class FeedComponent implements OnInit { checked = false; // if the "I protected the environment."-box is checked view = 'new'; - empty: any; - // id of the green activity + textInputValue: string; + // id of the green activity value: any; - parentSelectedPostList: Array; + parentSelectedPostList: Post[]; actionlist: Activitylist = new Activitylist(); loggedIn = false; user: User; + errorOccurred: boolean; + + private errorMessage: string; constructor( private feedService: FeedService, private data: DatasharingService, private activityService: ActivityService - ) { } + ) { + } ngOnInit() { this.data.currentUserInfo.subscribe(user => { @@ -60,15 +65,23 @@ export class FeedComponent implements OnInit { createPost(pElement, activityId: string) { if (pElement && activityId && this.checked) { - this.feedService.createPostActivity(pElement.value, activityId); - pElement.value = ''; - this.empty = ''; - this.view = 'new'; + this.feedService.createPostActivity(pElement.value, activityId).subscribe(() => { + pElement.value = ''; + this.textInputValue = ''; + this.view = 'new'; + }, (error: IErrorResponse) => { + this.errorOccurred = true; + this.errorMessage = error.error.errors[0].message; + }); } else if (pElement) { - this.feedService.createPost(pElement.value); - pElement.value = ''; - this.empty = ''; - this.view = 'new'; + this.feedService.createPost(pElement.value).subscribe(() => { + pElement.value = ''; + this.textInputValue = ''; + this.view = 'new'; + }, (error: IErrorResponse) => { + this.errorOccurred = true; + this.errorMessage = error.error.errors[0].message; + }); } } @@ -84,4 +97,11 @@ export class FeedComponent implements OnInit { showMostLiked() { this.feedService.getPosts('TOP'); } + + /** + * Returns the error message if one exists + */ + getErrorMessage() { + return this.errorMessage; + } } diff --git a/src/app/services/feed/feed.service.ts b/src/app/services/feed/feed.service.ts index f912f11..dc10fd5 100644 --- a/src/app/services/feed/feed.service.ts +++ b/src/app/services/feed/feed.service.ts @@ -5,7 +5,7 @@ import { Author } from 'src/app/models/author'; import { environment } from 'src/environments/environment'; import { Activity } from 'src/app/models/activity'; import { BehaviorSubject } from 'rxjs'; -import { User } from 'src/app/models/user'; +import {tap} from 'rxjs/operators'; @Injectable({ providedIn: 'root' @@ -51,12 +51,12 @@ export class FeedService { }`, variables: { content: pContent }}; - return this.http.post(environment.graphQLUrl, body).subscribe(response => { + return this.http.post(environment.graphQLUrl, body).pipe(tap(response => { const updatedposts = this.newPosts.getValue(); updatedposts.unshift(this.renderPost(response)); this.newPosts.next(updatedposts); this.setPost('NEW'); - }); + })); } public createPostActivity(pContent: String, activityId: String) { @@ -88,12 +88,12 @@ export class FeedService { content: pContent, id: activityId }}; - return this.http.post(environment.graphQLUrl, body).subscribe(response => { + return this.http.post(environment.graphQLUrl, body).pipe(tap(response => { const updatedposts = this.newPosts.getValue(); updatedposts.unshift(this.renderPost(response)); this.newPosts.next(updatedposts); this.setPost('NEW'); - }); + })); } public upvote(postId: number): any { From f9ef6c2669916448ab86bad7b245b880b8b51e36 Mon Sep 17 00:00:00 2001 From: trivernis Date: Sat, 18 Jan 2020 18:19:26 +0100 Subject: [PATCH 08/13] Refactor profile and self service --- src/app/app.component.ts | 2 +- .../components/profile/profile.component.ts | 4 +- src/app/models/user.ts | 36 +++-- src/app/services/profile/profile.service.ts | 149 +++++++++--------- src/app/services/selfservice/self.service.ts | 110 +++++++------ 5 files changed, 164 insertions(+), 137 deletions(-) diff --git a/src/app/app.component.ts b/src/app/app.component.ts index f332f7b..df671f7 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -15,7 +15,7 @@ export class AppComponent implements OnInit { ngOnInit() { this.data.currentUserInfo.subscribe(user => { if (user.loggedIn !== true) { - this.selfservice.checkIfLoggedIn(); + this.selfservice.checkIfLoggedIn().subscribe(); } }); } diff --git a/src/app/components/profile/profile.component.ts b/src/app/components/profile/profile.component.ts index b1a9aba..948e830 100644 --- a/src/app/components/profile/profile.component.ts +++ b/src/app/components/profile/profile.component.ts @@ -58,9 +58,7 @@ export class ProfileComponent implements OnInit { this.userProfile = response; // tslint:disable-next-line:max-line-length this.userProfile.allowedToSendRequest = this.requestService.isAllowedToSendRequest(this.userProfile.userID, this.self); - if (this.userProfile.userID === this.self.userID) { - this.ownProfile = true; - } else {this.ownProfile = false; } + this.ownProfile = this.userProfile.userID === this.self.userID; this.rankname = this.levellist.getLevelName(this.userProfile.level); } else { this.profileNotFound = true; } this.loading = false; diff --git a/src/app/models/user.ts b/src/app/models/user.ts index 25c1773..c4658ca 100644 --- a/src/app/models/user.ts +++ b/src/app/models/user.ts @@ -46,19 +46,29 @@ export class User { } catch (err) { console.error(err); } - this.friends = userDataResponse.friends - .map(friend => new FriendInfo( - friend.id, friend.name, - friend.level, - this.buildProfilePictureUrl(friend.profilePicture) - )); - this.groups = userDataResponse.groups - .map(group => new GroupInfo(group.id, group.name)); - this.chatIDs = userDataResponse.chats.map(chat => chat.id); - this.sentRequestUserIDs = userDataResponse.sentRequests - .map(request => request.receiver.id); - this.receivedRequests = userDataResponse.receivedRequests - .map(request => new FriendRequest(request.id, request.sender.id, request.sender.handle, request.sender.name)); + if (userDataResponse.friends) { + this.friends = userDataResponse.friends + .map(friend => new FriendInfo( + friend.id, friend.name, + friend.level, + this.buildProfilePictureUrl(friend.profilePicture) + )); + } + if (userDataResponse.groups) { + this.groups = userDataResponse.groups + .map(group => new GroupInfo(group.id, group.name)); + } + if (userDataResponse.chats) { + this.chatIDs = userDataResponse.chats.map(chat => chat.id); + } + if (userDataResponse.sentRequests) { + this.sentRequestUserIDs = userDataResponse.sentRequests + .map(request => request.receiver.id); + } + if (userDataResponse.receivedRequests) { + this.receivedRequests = userDataResponse.receivedRequests + .map(request => new FriendRequest(request.id, request.sender.id, request.sender.handle, request.sender.name)); + } } buildProfilePictureUrl(path: string): string { diff --git a/src/app/services/profile/profile.service.ts b/src/app/services/profile/profile.service.ts index 1eecb07..b1df34f 100644 --- a/src/app/services/profile/profile.service.ts +++ b/src/app/services/profile/profile.service.ts @@ -1,92 +1,97 @@ -import { Injectable } from '@angular/core'; -import { Http } from '@angular/http'; -import { Post } from 'src/app/models/post'; -import { Author } from 'src/app/models/author'; -import { environment } from 'src/environments/environment'; -import { User } from 'src/app/models/user'; -import { Observable, Subject } from 'rxjs'; -import { Activity } from 'src/app/models/activity'; +import {Injectable} from '@angular/core'; +import {HttpClient} from '@angular/common/http'; +import {Post} from 'src/app/models/post'; +import {Author} from 'src/app/models/author'; +import {environment} from 'src/environments/environment'; +import {User} from 'src/app/models/user'; +import {Subject} from 'rxjs'; +import {Activity} from 'src/app/models/activity'; +import {BaseService} from '../base.service'; + +const graphqlGetProfileQuery = `query($userId: ID) { + getUser(userId:$userId){ + id + handle + name + profilePicture + points + level + friendCount + groupCount + joinedAt + friends{ + id + } + posts{ + id, + content, + htmlContent, + upvotes, + downvotes, + userVote, + deletable, + activity{ + id + name + description + points + }, + author{ + name, + handle, + profilePicture + id}, + createdAt + } + } +}`; @Injectable({ providedIn: 'root' }) -export class ProfileService { +export class ProfileService extends BaseService { + + constructor(private http: HttpClient) { + super(); + } public proflile: Subject = new Subject(); - constructor(private http: Http) { } + /** + * Builds the request body of a getProfile request + * @param id + */ + private static buildGetProfileBody(id: string): any { + return { + query: graphqlGetProfileQuery, + variables: { + userId: id, + } + }; + } + /** + * Returns the data for the specified user. + * @param userId + */ public getUserData(userId: string) { const headers = new Headers(); headers.set('Content-Type', 'application/json'); - // return this.renderProfile(this.http.post(environment.graphQLUrl, this.buildGetProfileJson(userId))); - this.http.post(environment.graphQLUrl, this.buildGetProfileJson(userId)).subscribe(result => { - // push onto subject - this.proflile.next(this.renderProfile(result.json())); + this.http.post(environment.graphQLUrl, ProfileService.buildGetProfileBody(userId)).subscribe(result => { + this.proflile.next(this.getProfileData(result)); return this.proflile; }); } - public buildGetProfileJson(id: string): any { - const body = {query: `query($userId: ID) { - getUser(userId:$userId){ - id - handle - name - profilePicture - points - level - friendCount - groupCount - joinedAt - friends{ - id - } - posts{ - id, - content, - htmlContent, - upvotes, - downvotes, - userVote, - deletable, - activity{ - id - name - description - points - }, - author{ - name, - handle, - profilePicture - id}, - createdAt - } - } - }`, variables: { - userId: id, - }}; - return body; - } - - public renderProfile(response: any): User { + /** + * Returns a userinstance filled with profile data + * @param response + */ + public getProfileData(response: any): User { const posts = new Array(); const profile = new User(); - if (response.data.getUser != null) { - - profile.userID = response.data.getUser.id; - profile.username = response.data.getUser.name; - profile.handle = response.data.getUser.handle; - profile.points = response.data.getUser.points; - profile.level = response.data.getUser.level; - profile.friendCount = response.data.getUser.friendCount; - profile.groupCount = response.data.getUser.groupCount; - if (response.data.getUser.profilePicture) { - profile.profilePicture = environment.greenvironmentUrl + response.data.getUser.profilePicture; - } else { - profile.profilePicture = 'assets/images/default-profilepic.svg'; - } + if (response.data.getUser) { + profile.assignFromResponse(response.data.getUser); const temp = new Date(Number(response.data.getUser.joinedAt)); const date = temp.toLocaleString('en-GB'); profile.joinedAt = date; diff --git a/src/app/services/selfservice/self.service.ts b/src/app/services/selfservice/self.service.ts index efb8fb6..133f8ad 100644 --- a/src/app/services/selfservice/self.service.ts +++ b/src/app/services/selfservice/self.service.ts @@ -1,41 +1,87 @@ -import { Injectable, EventEmitter, Output } from '@angular/core'; -import {Http, URLSearchParams, Headers} from '@angular/http'; -import { User } from 'src/app/models/user'; -import { DatasharingService } from '../datasharing.service'; +import {Injectable} from '@angular/core'; +import {User} from 'src/app/models/user'; +import {DatasharingService} from '../datasharing.service'; import {Router} from '@angular/router'; -import { environment } from 'src/environments/environment'; -import { FriendRequest } from 'src/app/models/friendRequest'; -import { FriendInfo } from 'src/app/models/friendinfo'; -import { GroupInfo } from 'src/app/models/groupinfo'; +import {environment} from 'src/environments/environment'; +import {FriendRequest} from 'src/app/models/friendRequest'; +import {FriendInfo} from 'src/app/models/friendinfo'; +import {HttpClient} from '@angular/common/http'; +import {tap} from 'rxjs/operators'; +import {BaseService} from '../base.service'; + +const getSelfGraphqlQuery = `{ + getSelf{ + id, + name, + email, + handle, + points, + level, + profilePicture, + receivedRequests{id, sender{name, handle, id}}, + sentRequests{receiver{id}}, + friends { + id, + name, + level, + profilePicture, + }, + groups { + id, + name + }, + chats{ + id + }, + settings + } +}`; @Injectable({ providedIn: 'root' }) -export class SelfService { +export class SelfService extends BaseService { + + constructor(private http: HttpClient, private data: DatasharingService) { + super(); + } - constructor(private http: Http, private data: DatasharingService, private router: Router) { } + /** + * Builds the getself request body + */ + private static buildGetSelfBody(): any { + return { + query: getSelfGraphqlQuery, variables: {} + }; + } + /** + * Checks if the user is still logged in + */ public checkIfLoggedIn() { const url = environment.graphQLUrl; const headers = new Headers(); headers.set('Content-Type', 'application/json'); - return this.http.post(url, this.buildJson()) - .subscribe(response => { + return this.http.post(url, SelfService.buildGetSelfBody(), {headers: this.headers}) + .pipe(tap(response => { this.stillLoggedIn(); - this.updateUserInfo(response.json()); + this.updateUserInfo(response); }, error => { this.notLoggedIn(); - // this.fakeLogin(); - } - ); + })); } + public stillLoggedIn() { } public notLoggedIn() { } + /** + * Updates the info on a user + * @param response + */ public updateUserInfo(response: any) { const user = new User(); user.assignFromResponse(response.data.getSelf); @@ -63,36 +109,4 @@ export class SelfService { this.data.changeUserInfo(user); } - - public buildJson(): any { - const body = {query: `{ - getSelf{ - id, - name, - email, - handle, - points, - level, - profilePicture, - receivedRequests{id, sender{name, handle, id}}, - sentRequests{receiver{id}}, - friends { - id, - name, - level, - profilePicture, - }, - groups { - id, - name - }, - chats{ - id - }, - settings - } - }`, variables: { - }}; - return body; - } } From 454917efdd46265bfec13a98a7a2b560ee7d403b Mon Sep 17 00:00:00 2001 From: trivernis Date: Sat, 18 Jan 2020 18:28:54 +0100 Subject: [PATCH 09/13] Change error clearing to occur on input change --- src/app/components/feed/feed.component.html | 2 +- src/app/components/feed/feed.component.ts | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/app/components/feed/feed.component.html b/src/app/components/feed/feed.component.html index dac9442..c8339e5 100644 --- a/src/app/components/feed/feed.component.html +++ b/src/app/components/feed/feed.component.html @@ -7,7 +7,7 @@ infinite-scroll - + diff --git a/src/app/components/feed/feed.component.ts b/src/app/components/feed/feed.component.ts index ff21e52..599c45e 100644 --- a/src/app/components/feed/feed.component.ts +++ b/src/app/components/feed/feed.component.ts @@ -49,9 +49,6 @@ export class FeedComponent implements OnInit { }); this.feedService.getPosts('NEW'); this.feedService.posts.subscribe(response => { - if (response.length > 0) { - // this.loading = false; - } this.parentSelectedPostList = response; }); this.feedService.newPostsAvailable.subscribe(response => { @@ -104,4 +101,14 @@ export class FeedComponent implements OnInit { getErrorMessage() { return this.errorMessage; } + + /** + * Executed when the text in the input field changes. + */ + private onTextInputChange() { + if (this.errorOccurred) { + this.errorOccurred = false; + this.errorMessage = ''; + } + } } From f4a456ace47c041b3559399f163df6555a002b3e Mon Sep 17 00:00:00 2001 From: trivernis Date: Sat, 18 Jan 2020 18:33:11 +0100 Subject: [PATCH 10/13] Fix event callback being private --- src/app/components/feed/feed.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/components/feed/feed.component.ts b/src/app/components/feed/feed.component.ts index 599c45e..baf1aa8 100644 --- a/src/app/components/feed/feed.component.ts +++ b/src/app/components/feed/feed.component.ts @@ -105,7 +105,7 @@ export class FeedComponent implements OnInit { /** * Executed when the text in the input field changes. */ - private onTextInputChange() { + onTextInputChange() { if (this.errorOccurred) { this.errorOccurred = false; this.errorMessage = ''; From 168c737665539d4f53d186c4213c6cdb7cf02f4a Mon Sep 17 00:00:00 2001 From: trivernis Date: Sat, 18 Jan 2020 19:38:01 +0100 Subject: [PATCH 11/13] Move file upload handling to self service --- .../components/profile/profile.component.ts | 18 ++++----- .../models/interfaces/IFileUploadResult.ts | 5 +++ src/app/services/selfservice/self.service.ts | 38 +++++-------------- 3 files changed, 21 insertions(+), 40 deletions(-) create mode 100644 src/app/models/interfaces/IFileUploadResult.ts diff --git a/src/app/components/profile/profile.component.ts b/src/app/components/profile/profile.component.ts index 948e830..e73df0b 100644 --- a/src/app/components/profile/profile.component.ts +++ b/src/app/components/profile/profile.component.ts @@ -8,7 +8,7 @@ import { ProfileService } from 'src/app/services/profile/profile.service'; import { HttpClient } from '@angular/common/http'; import { environment } from 'src/environments/environment'; import {MatSnackBar} from '@angular/material/snack-bar'; -import { reduce } from 'rxjs/operators'; +import {SelfService} from '../../services/selfservice/self.service'; @Component({ selector: 'app-profile', @@ -33,7 +33,8 @@ export class ProfileComponent implements OnInit { private router: Router, private requestService: RequestService, private data: DatasharingService, - private profileService: ProfileService) { + private profileService: ProfileService, + private selfService: SelfService) { router.events.forEach((event) => { // check if the user is on the profile page (of userY) and routes to the page of userY (e.g. his own page) if (event instanceof NavigationEnd) { @@ -69,18 +70,13 @@ export class ProfileComponent implements OnInit { user.allowedToSendRequest = false; this.requestService.sendFriendRequest(user); } - onFileInput(event) { - console.log(event.target.files[0]); - const formData: any = new FormData(); - formData.append('profilePicture', event.target.files[0]); - this.http.post(environment.greenvironmentUrl + '/upload', formData).subscribe( - (response: any) => { + onFileInput(event) { + this.selfService.changeProfilePicture(event.target.files[0]).subscribe((response) => { this.userProfile.profilePicture = environment.greenvironmentUrl + response.fileName; - }, - (error) => { + }, (error) => { this._snackBar.open('failed to upload picture', 'okay', { - duration: 3000 + duration: 3000 }); }); } diff --git a/src/app/models/interfaces/IFileUploadResult.ts b/src/app/models/interfaces/IFileUploadResult.ts new file mode 100644 index 0000000..fe564c6 --- /dev/null +++ b/src/app/models/interfaces/IFileUploadResult.ts @@ -0,0 +1,5 @@ +export interface IFileUploadResult { + success: boolean; + fileName?: string; + error?: string; +} diff --git a/src/app/services/selfservice/self.service.ts b/src/app/services/selfservice/self.service.ts index 133f8ad..d2c4a22 100644 --- a/src/app/services/selfservice/self.service.ts +++ b/src/app/services/selfservice/self.service.ts @@ -8,6 +8,7 @@ import {FriendInfo} from 'src/app/models/friendinfo'; import {HttpClient} from '@angular/common/http'; import {tap} from 'rxjs/operators'; import {BaseService} from '../base.service'; +import {IFileUploadResult} from '../../models/interfaces/IFileUploadResult'; const getSelfGraphqlQuery = `{ getSelf{ @@ -65,17 +66,18 @@ export class SelfService extends BaseService { return this.http.post(url, SelfService.buildGetSelfBody(), {headers: this.headers}) .pipe(tap(response => { - this.stillLoggedIn(); this.updateUserInfo(response); - }, error => { - this.notLoggedIn(); })); } - public stillLoggedIn() { - } - - public notLoggedIn() { + /** + * Uploads a file as a profile picture + * @param file + */ + public changeProfilePicture(file: any) { + const formData: any = new FormData(); + formData.append('profilePicture', file); + return this.http.post(environment.greenvironmentUrl + '/upload', formData); } /** @@ -87,26 +89,4 @@ export class SelfService extends BaseService { user.assignFromResponse(response.data.getSelf); this.data.changeUserInfo(user); } - - public fakeLogin() { - const user: User = new User(); - let friendRequest: FriendRequest = new FriendRequest(); - user.loggedIn = true; - user.userID = 1; - user.username = 'Rapier'; - user.handle = 'rapier123'; - user.email = 'r@r.com'; - user.points = 100; - user.level = 3; - user.friends.push(new FriendInfo(1, 'Freund77', 4, 'lalala')); - - friendRequest = new FriendRequest(); - friendRequest.id = 10; - friendRequest.senderUserID = 99; - friendRequest.senderUsername = 'Löwe'; - friendRequest.senderHandle = 'loewe123'; - user.receivedRequests.push(friendRequest); - - this.data.changeUserInfo(user); - } } From d99310c9b64499600fa64b37327a3097b3a5159a Mon Sep 17 00:00:00 2001 From: trivernis Date: Sat, 18 Jan 2020 22:11:02 +0100 Subject: [PATCH 12/13] Add File upload dialog --- src/app/app.module.ts | 13 ++- .../fileUpload/fileUpload.component.sass | 23 ++++++ .../fileUpload/fileUpload.component.ts | 79 +++++++++++++++++++ .../fileUploadDialog.component.html | 16 ++++ .../components/profile/profile.component.html | 44 ++++------- .../components/profile/profile.component.sass | 10 +-- .../components/profile/profile.component.ts | 24 +++--- 7 files changed, 162 insertions(+), 47 deletions(-) create mode 100644 src/app/components/profile/fileUpload/fileUpload.component.sass create mode 100644 src/app/components/profile/fileUpload/fileUpload.component.ts create mode 100644 src/app/components/profile/fileUpload/fileUploadDialog.component.html diff --git a/src/app/app.module.ts b/src/app/app.module.ts index e696687..33487a8 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -65,8 +65,9 @@ import {MatDialogModule} from '@angular/material/dialog'; import {MatTooltipModule} from '@angular/material/tooltip'; import {MatExpansionModule} from '@angular/material/expansion'; import {MatDatepickerModule} from '@angular/material/datepicker'; -import {MatNativeDateModule} from '@angular/material/'; +import {MatNativeDateModule, MatProgressBarModule} from '@angular/material/'; import {MatSnackBarModule} from '@angular/material/snack-bar'; +import {DialogFileUploadComponent} from './components/profile/fileUpload/fileUpload.component'; const config: SocketIoConfig = { url: 'http://localhost:4444', options: {} }; @@ -107,6 +108,7 @@ const appRoutes: Routes = [ GroupComponent, DialogCreateEventComponent, UserlistComponent, + DialogFileUploadComponent, ], imports: [ BrowserModule, @@ -124,7 +126,7 @@ const appRoutes: Routes = [ MatIconModule, BrowserAnimationsModule, MatSliderModule, - MatFormFieldModule , + MatFormFieldModule, MatInputModule, ReactiveFormsModule, MatToolbarModule, @@ -151,8 +153,13 @@ const appRoutes: Routes = [ MatExpansionModule, MatDatepickerModule, MatSnackBarModule, + MatProgressBarModule, + ], + entryComponents: [ + DialogCreateGroupComponent, + DialogCreateEventComponent, + DialogFileUploadComponent ], - entryComponents: [ DialogCreateGroupComponent, DialogCreateEventComponent ], providers: [], bootstrap: [AppComponent] }) diff --git a/src/app/components/profile/fileUpload/fileUpload.component.sass b/src/app/components/profile/fileUpload/fileUpload.component.sass new file mode 100644 index 0000000..a515920 --- /dev/null +++ b/src/app/components/profile/fileUpload/fileUpload.component.sass @@ -0,0 +1,23 @@ +@import '../../../../styles/greenvironment-material-theme' + +.dialogFormField + width: 100% + +.confirmationButton + background-color: $primary-color + +.uploadDialogContent + overflow: hidden + text-align: center + +#inputPreview + max-width: 75% + max-height: 100% + width: auto + clip-path: circle() + mask-mode: luminance + +#inputPreviewWrapper + margin: auto + text-align: center + max-height: 512px diff --git a/src/app/components/profile/fileUpload/fileUpload.component.ts b/src/app/components/profile/fileUpload/fileUpload.component.ts new file mode 100644 index 0000000..fe24bb1 --- /dev/null +++ b/src/app/components/profile/fileUpload/fileUpload.component.ts @@ -0,0 +1,79 @@ +import {Component, EventEmitter} from '@angular/core'; +import {MatDialogRef} from '@angular/material/dialog'; +import {SelfService} from '../../../services/selfservice/self.service'; +import {environment} from '../../../../environments/environment'; +import {BehaviorSubject} from 'rxjs'; + +@Component({ + selector: 'file-upload-dialog', + templateUrl: 'fileUploadDialog.component.html', + styleUrls: ['./fileUpload.component.sass'], +}) +export class DialogFileUploadComponent { + public errorOccurred = false; + public uploading = false; + private errorMessage: string; + public profilePictureUrl: BehaviorSubject; + private file; + public localFileUrl; + + constructor(public dialogRef: MatDialogRef, private selfService: SelfService) { + this.profilePictureUrl = new BehaviorSubject(null); + } + + /** + * Getter for the error message + */ + getErrorMessage() { + return this.errorMessage; + } + + /** + * Fired when the cancel button of the dialog is pressed + */ + onCancelClicked() { + this.dialogRef.close(); + } + + /** + * Fired when the ok button was pressed + */ + onOkClicked() { + this.errorOccurred = false; + this.uploading = true; + this.selfService.changeProfilePicture(this.file).subscribe((response) => { + this.uploading = false; + if (response.success) { + this.profilePictureUrl.next(environment.greenvironmentUrl + response.fileName); + this.dialogRef.close(); + } else { + this.errorMessage = response.error; + this.errorOccurred = true; + } + }, (error) => { + this.uploading = false; + this.errorOccurred = true; + console.log(error); + if (error.error) { + this.errorMessage = error.error.error; + } else { + this.errorMessage = 'Failed to upload the profile picture.'; + } + }); + } + + /** + * Fired when the input of the file select changes. + * @param event + */ + onFileInputChange(event) { + this.errorOccurred = false; + this.errorMessage = ''; + this.file = event.target.files[0]; + const reader = new FileReader(); + reader.onload = (e: any) => { + this.localFileUrl = e.target.result; + }; + reader.readAsDataURL(this.file); + } +} diff --git a/src/app/components/profile/fileUpload/fileUploadDialog.component.html b/src/app/components/profile/fileUpload/fileUploadDialog.component.html new file mode 100644 index 0000000..7edfd5c --- /dev/null +++ b/src/app/components/profile/fileUpload/fileUploadDialog.component.html @@ -0,0 +1,16 @@ +
+

Upload a new Profile picture!

+
+ +
+

Preview:

+ +
+ +
+ {{getErrorMessage()}} +
+ + +
+
diff --git a/src/app/components/profile/profile.component.html b/src/app/components/profile/profile.component.html index cc5263c..75bbfb7 100644 --- a/src/app/components/profile/profile.component.html +++ b/src/app/components/profile/profile.component.html @@ -3,27 +3,26 @@ -
- +
+ camera_alt -
- + {{userProfile.username}} - - -
+ +
@{{userProfile.handle}} -
+
@@ -45,19 +44,18 @@ -
- +
+ camera_alt -
{{userProfile.username}} @{{userProfile.handle}} - @@ -72,20 +70,9 @@
- +
- -
@@ -94,4 +81,3 @@
- \ No newline at end of file diff --git a/src/app/components/profile/profile.component.sass b/src/app/components/profile/profile.component.sass index c6f8e7e..91a0d65 100644 --- a/src/app/components/profile/profile.component.sass +++ b/src/app/components/profile/profile.component.sass @@ -8,7 +8,7 @@ overflow: scroll overflow-x: hidden -#profile +#profile padding: 2em max-width: 1200px margin: 0 auto @@ -32,14 +32,14 @@ font-size: 14px margin-left: calc(100px + 0.5em) .info - margin-right: 1em + margin-right: 1em font-size: 14px #username margin: 0 0.5em #handle font-size: 14px -#icon +#icon display: none position: absolute z-index: 11 @@ -71,9 +71,7 @@ $mat-card-header-size: 100px !default z-index: 10 object-fit: cover - - #postlist margin: 0.5em auto padding: 0 - max-width: 690px \ No newline at end of file + max-width: 690px diff --git a/src/app/components/profile/profile.component.ts b/src/app/components/profile/profile.component.ts index e73df0b..17a7a62 100644 --- a/src/app/components/profile/profile.component.ts +++ b/src/app/components/profile/profile.component.ts @@ -9,13 +9,14 @@ import { HttpClient } from '@angular/common/http'; import { environment } from 'src/environments/environment'; import {MatSnackBar} from '@angular/material/snack-bar'; import {SelfService} from '../../services/selfservice/self.service'; +import {MatDialog} from '@angular/material'; +import {DialogFileUploadComponent} from './fileUpload/fileUpload.component'; @Component({ selector: 'app-profile', templateUrl: './profile.component.html', styleUrls: ['./profile.component.sass'] }) - export class ProfileComponent implements OnInit { levellist: Levellist = new Levellist(); ownProfile = false; @@ -34,7 +35,8 @@ export class ProfileComponent implements OnInit { private requestService: RequestService, private data: DatasharingService, private profileService: ProfileService, - private selfService: SelfService) { + private selfService: SelfService, + public dialog: MatDialog) { router.events.forEach((event) => { // check if the user is on the profile page (of userY) and routes to the page of userY (e.g. his own page) if (event instanceof NavigationEnd) { @@ -71,13 +73,17 @@ export class ProfileComponent implements OnInit { this.requestService.sendFriendRequest(user); } - onFileInput(event) { - this.selfService.changeProfilePicture(event.target.files[0]).subscribe((response) => { - this.userProfile.profilePicture = environment.greenvironmentUrl + response.fileName; - }, (error) => { - this._snackBar.open('failed to upload picture', 'okay', { - duration: 3000 - }); + /** + * Opens the file upload dialog + */ + openFileUploadDialog() { + const dialogRef = this.dialog.open(DialogFileUploadComponent, { + width: '400px' + }); + dialogRef.componentInstance.profilePictureUrl.subscribe((profilePictureUrl) => { + if (profilePictureUrl) { + this.userProfile.profilePicture = profilePictureUrl; + } }); } } From 5a19cc0dc4dafc7ac3de0e1ba85c61a1ef223aad Mon Sep 17 00:00:00 2001 From: trivernis Date: Sat, 18 Jan 2020 22:14:56 +0100 Subject: [PATCH 13/13] Cleanup code --- src/app/app.component.spec.ts | 4 +- src/app/app.component.ts | 10 +- src/app/app.module.ts | 101 ++++---- src/app/components/about/about.component.html | 136 +++++------ src/app/components/about/about.component.sass | 3 +- .../components/about/about.component.spec.ts | 8 +- src/app/components/about/about.component.ts | 12 +- .../components/chat/chat.component.spec.ts | 8 +- src/app/components/chat/chat.component.ts | 24 +- .../chatlist/chatlist.component.html | 6 +- .../chatlist/chatlist.component.spec.ts | 8 +- .../components/chatlist/chatlist.component.ts | 10 +- .../chatcontacts/chatcontacts.component.html | 25 +- .../chatcontacts.component.spec.ts | 8 +- .../chatcontacts/chatcontacts.component.ts | 9 +- .../chatmanager/chatmanager.component.sass | 6 +- .../chatmanager/chatmanager.component.spec.ts | 8 +- .../chatmanager/chatmanager.component.ts | 15 +- .../document-list.component.html | 3 +- .../document-list.component.scss | 46 ++-- .../document-list.component.spec.ts | 8 +- .../document-list/document-list.component.ts | 9 +- .../document/document.component.scss | 20 +- .../document/document.component.spec.ts | 8 +- .../components/document/document.component.ts | 16 +- src/app/components/feed/feed.component.html | 47 ++-- src/app/components/feed/feed.component.sass | 49 ++-- .../components/feed/feed.component.spec.ts | 8 +- .../feed/postlist/postlist.component.html | 8 +- .../feed/postlist/postlist.component.sass | 77 +++--- .../feed/postlist/postlist.component.spec.ts | 8 +- .../feed/postlist/postlist.component.ts | 11 +- src/app/components/group/group.component.html | 225 +++++++++--------- src/app/components/group/group.component.sass | 17 ++ .../components/group/group.component.spec.ts | 8 +- src/app/components/group/group.component.ts | 45 ++-- src/app/components/home/home.component.html | 70 +++--- .../components/home/home.component.spec.ts | 8 +- src/app/components/home/home.component.ts | 9 +- .../components/imprint/imprint.component.sass | 4 +- .../imprint/imprint.component.spec.ts | 8 +- .../components/imprint/imprint.component.ts | 5 +- src/app/components/login/login.component.html | 45 ++-- src/app/components/login/login.component.sass | 12 +- .../components/login/login.component.spec.ts | 8 +- src/app/components/login/login.component.ts | 12 +- .../main-navigation.component.html | 77 +++--- .../main-navigation.component.sass | 11 +- .../main-navigation.component.spec.ts | 18 +- .../main-navigation.component.ts | 85 ++++--- .../fileUpload/fileUpload.component.ts | 6 +- .../components/profile/profile.component.html | 144 +++++------ .../components/profile/profile.component.sass | 30 ++- .../profile/profile.component.spec.ts | 8 +- .../components/profile/profile.component.ts | 55 ++--- .../register/register.component.html | 33 +-- .../register/register.component.sass | 14 +- .../register/register.component.spec.ts | 8 +- .../components/register/register.component.ts | 10 +- .../components/search/search.component.html | 27 ++- .../components/search/search.component.sass | 6 + .../search/search.component.spec.ts | 8 +- src/app/components/search/search.component.ts | 20 +- .../social/friends/friends.component.html | 24 +- .../social/friends/friends.component.sass | 22 +- .../social/friends/friends.component.spec.ts | 8 +- .../social/friends/friends.component.ts | 17 +- .../social/groups/groups.component.html | 19 +- .../social/groups/groups.component.sass | 3 +- .../social/groups/groups.component.spec.ts | 8 +- .../social/groups/groups.component.ts | 2 - .../components/social/social.component.html | 38 +-- .../social/social.component.spec.ts | 8 +- src/app/components/social/social.component.ts | 5 +- .../userlist/userlist.component.html | 27 ++- .../userlist/userlist.component.sass | 20 +- .../userlist/userlist.component.spec.ts | 8 +- .../components/userlist/userlist.component.ts | 11 +- src/app/graphql.module.ts | 8 +- src/app/models/activity.ts | 3 +- src/app/models/author.ts | 20 +- src/app/models/chat.ts | 22 +- src/app/models/chatinfo.ts | 12 +- src/app/models/chatmessage.ts | 16 +- src/app/models/document.ts | 4 +- src/app/models/event.ts | 20 +- src/app/models/friendRequest.ts | 22 +- src/app/models/friendinfo.ts | 24 +- src/app/models/group.ts | 10 +- src/app/models/groupinfo.ts | 14 +- src/app/models/interfaces/IGraphqlError.ts | 2 +- src/app/models/interfaces/IUser.ts | 1 - src/app/models/levellist.ts | 18 +- src/app/models/login.ts | 8 +- src/app/models/post.ts | 72 +++--- src/app/models/registration.ts | 8 +- src/app/models/user.ts | 10 +- .../activity/activity.service.spec.ts | 4 +- src/app/services/activity/activity.service.ts | 21 +- src/app/services/chat/chat.service.spec.ts | 4 +- src/app/services/chat/chat.service.ts | 105 ++++---- src/app/services/datasharing.service.spec.ts | 4 +- src/app/services/datasharing.service.ts | 9 +- src/app/services/document.service.spec.ts | 4 +- src/app/services/document.service.ts | 11 +- src/app/services/feed/feed.service.spec.ts | 4 +- src/app/services/feed/feed.service.ts | 176 ++++++++------ src/app/services/group/group.service.spec.ts | 4 +- src/app/services/group/group.service.ts | 48 ++-- src/app/services/login/login.service.spec.ts | 4 +- .../services/profile/profile.service.spec.ts | 4 +- src/app/services/profile/profile.service.ts | 12 +- .../register/register.service.spec.ts | 4 +- src/app/services/register/register.service.ts | 33 +-- .../services/request/request.service.spec.ts | 4 +- src/app/services/request/request.service.ts | 8 +- .../services/search/search.service.spec.ts | 4 +- src/app/services/search/search.service.ts | 35 ++- .../services/selfservice/self.service.spec.ts | 4 +- src/app/services/selfservice/self.service.ts | 3 - .../settings/settings.service.spec.ts | 4 +- src/app/services/settings/settings.service.ts | 10 +- .../services/social/social.service.spec.ts | 4 +- src/app/services/social/social.service.ts | 2 +- src/assets/images/default-profilepic.svg | 127 +++++----- src/assets/images/gv-logo-flat.svg | 109 +++++---- src/assets/images/gv-logo-white.svg | 111 +++++---- src/index.html | 2 +- src/main.ts | 8 +- src/polyfills.ts | 16 +- src/styles/greenvironment-material-theme.scss | 76 +++--- src/test.ts | 7 +- src/tslint.json | 32 +-- src/typings.d.ts | 5 +- 134 files changed, 1723 insertions(+), 1568 deletions(-) diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts index 89617e1..c38ca0a 100644 --- a/src/app/app.component.spec.ts +++ b/src/app/app.component.spec.ts @@ -1,5 +1,5 @@ -import { TestBed, async } from '@angular/core/testing'; -import { AppComponent } from './app.component'; +import {async, TestBed} from '@angular/core/testing'; +import {AppComponent} from './app.component'; describe('AppComponent', () => { beforeEach(async(() => { diff --git a/src/app/app.component.ts b/src/app/app.component.ts index df671f7..5e15e30 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,7 +1,6 @@ -import { Component, OnInit } from '@angular/core'; -import { User } from './models/user'; -import { DatasharingService } from './services/datasharing.service'; -import { SelfService } from './services/selfservice/self.service'; +import {Component, OnInit} from '@angular/core'; +import {DatasharingService} from './services/datasharing.service'; +import {SelfService} from './services/selfservice/self.service'; @Component({ selector: 'app-root', @@ -10,7 +9,8 @@ import { SelfService } from './services/selfservice/self.service'; }) export class AppComponent implements OnInit { - constructor(private data: DatasharingService, private selfservice: SelfService) { } + constructor(private data: DatasharingService, private selfservice: SelfService) { + } ngOnInit() { this.data.currentUserInfo.subscribe(user => { diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 33487a8..6a32cee 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,43 +1,40 @@ -import { BrowserModule } from '@angular/platform-browser'; -import { NgModule } from '@angular/core'; -import { FormsModule } from '@angular/forms'; -import { RouterModule, Routes } from '@angular/router'; -import { SocketIoModule, SocketIoConfig } from 'ngx-socket-io'; -import { HttpModule } from '@angular/http'; +import {BrowserModule, DomSanitizer} from '@angular/platform-browser'; +import {NgModule} from '@angular/core'; +import {FormsModule, ReactiveFormsModule} from '@angular/forms'; +import {RouterModule, Routes} from '@angular/router'; +import {SocketIoConfig, SocketIoModule} from 'ngx-socket-io'; +import {HttpModule} from '@angular/http'; -import { AppComponent } from './app.component'; -import { DocumentListComponent } from './components/document-list/document-list.component'; -import { DocumentComponent } from './components/document/document.component'; -import { RegisterComponent } from './components/register/register.component'; -import { LoginComponent } from './components/login/login.component'; -import { ChatComponent } from './components/chat/chat.component'; -import { FriendsComponent } from './components/social/friends/friends.component'; -import { FeedComponent } from './components/feed/feed.component'; -import { HomeComponent } from './components/home/home.component'; -import { SocialComponent } from './components/social/social.component'; -import { GroupsComponent } from './components/social/groups/groups.component'; -import { DialogCreateGroupComponent } from './components/social/groups/groups.component'; -import { DialogCreateEventComponent } from './components/group/group.component'; -import { ChatmanagerComponent } from './components/chatmanager/chatmanager.component'; -import { ChatlistComponent } from './components/chatlist/chatlist.component'; -import { PostlistComponent } from './components/feed/postlist/postlist.component'; -import { GraphQLModule } from './graphql.module'; -import { HttpClientModule } from '@angular/common/http'; -import { ProfileComponent } from './components/profile/profile.component'; -import { GroupComponent } from './components/group/group.component'; -import { ImprintComponent } from './components/imprint/imprint.component'; -import { AboutComponent } from './components/about/about.component'; -import { ChatcontactsComponent } from './components/chatmanager/chatcontacts/chatcontacts.component'; -import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import {AppComponent} from './app.component'; +import {DocumentListComponent} from './components/document-list/document-list.component'; +import {DocumentComponent} from './components/document/document.component'; +import {RegisterComponent} from './components/register/register.component'; +import {LoginComponent} from './components/login/login.component'; +import {ChatComponent} from './components/chat/chat.component'; +import {FriendsComponent} from './components/social/friends/friends.component'; +import {FeedComponent} from './components/feed/feed.component'; +import {HomeComponent} from './components/home/home.component'; +import {SocialComponent} from './components/social/social.component'; +import {DialogCreateGroupComponent, GroupsComponent} from './components/social/groups/groups.component'; +import {DialogCreateEventComponent, GroupComponent} from './components/group/group.component'; +import {ChatmanagerComponent} from './components/chatmanager/chatmanager.component'; +import {ChatlistComponent} from './components/chatlist/chatlist.component'; +import {PostlistComponent} from './components/feed/postlist/postlist.component'; +import {GraphQLModule} from './graphql.module'; +import {HttpClientModule} from '@angular/common/http'; +import {ProfileComponent} from './components/profile/profile.component'; +import {ImprintComponent} from './components/imprint/imprint.component'; +import {AboutComponent} from './components/about/about.component'; +import {ChatcontactsComponent} from './components/chatmanager/chatcontacts/chatcontacts.component'; +import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; import {MatTableModule} from '@angular/material/table'; -import { InfiniteScrollModule } from 'ngx-infinite-scroll'; +import {InfiniteScrollModule} from 'ngx-infinite-scroll'; import {UserlistComponent} from './components/userlist/userlist.component'; -import { MatSliderModule } from '@angular/material/slider'; -import { MatFormFieldModule } from '@angular/material/form-field'; +import {MatSliderModule} from '@angular/material/slider'; +import {MatFormFieldModule} from '@angular/material/form-field'; import {MatInputModule} from '@angular/material/input'; -import { ReactiveFormsModule} from '@angular/forms'; -import {MatIconModule} from '@angular/material/icon'; +import {MatIconModule, MatIconRegistry} from '@angular/material/icon'; import {MatToolbarModule} from '@angular/material/toolbar'; import {MatSidenavModule} from '@angular/material/sidenav'; import {MatTabsModule} from '@angular/material/tabs'; @@ -45,22 +42,20 @@ import {MatCardModule} from '@angular/material/card'; import {MatButtonToggleModule} from '@angular/material/button-toggle'; import {MatSelectModule} from '@angular/material/select'; import {MatCheckboxModule} from '@angular/material/checkbox'; -import { OverlayModule} from '@angular/cdk/overlay'; +import {OverlayModule} from '@angular/cdk/overlay'; import {MatSlideToggleModule} from '@angular/material/slide-toggle'; import {MatMenuModule} from '@angular/material/menu'; import {MatRippleModule} from '@angular/material/core'; import {MatBadgeModule} from '@angular/material/badge'; import {MatProgressSpinnerModule} from '@angular/material/progress-spinner'; -import { FlexLayoutModule } from '@angular/flex-layout'; -import { MainNavigationComponent } from './components/main-navigation/main-navigation.component'; -import { LayoutModule } from '@angular/cdk/layout'; -import { MatButtonModule } from '@angular/material/button'; -import { MatListModule } from '@angular/material/list'; +import {FlexLayoutModule} from '@angular/flex-layout'; +import {MainNavigationComponent} from './components/main-navigation/main-navigation.component'; +import {LayoutModule} from '@angular/cdk/layout'; +import {MatButtonModule} from '@angular/material/button'; +import {MatListModule} from '@angular/material/list'; import {MatSortModule} from '@angular/material/sort'; -import { SearchComponent } from './components/search/search.component'; -import {DomSanitizer} from '@angular/platform-browser'; -import {MatIconRegistry} from '@angular/material/icon'; +import {SearchComponent} from './components/search/search.component'; import {MatDialogModule} from '@angular/material/dialog'; import {MatTooltipModule} from '@angular/material/tooltip'; import {MatExpansionModule} from '@angular/material/expansion'; @@ -70,16 +65,16 @@ import {MatSnackBarModule} from '@angular/material/snack-bar'; import {DialogFileUploadComponent} from './components/profile/fileUpload/fileUpload.component'; -const config: SocketIoConfig = { url: 'http://localhost:4444', options: {} }; +const config: SocketIoConfig = {url: 'http://localhost:4444', options: {}}; const appRoutes: Routes = [ - { path: '', component: HomeComponent }, - { path: 'profile/:id', component: ProfileComponent }, - { path: 'group/:id', component: GroupComponent }, - { path: 'login', component: LoginComponent }, - { path: 'register', component: RegisterComponent }, - { path: 'about', component: AboutComponent }, - { path: 'imprint', component: ImprintComponent }, + {path: '', component: HomeComponent}, + {path: 'profile/:id', component: ProfileComponent}, + {path: 'group/:id', component: GroupComponent}, + {path: 'login', component: LoginComponent}, + {path: 'register', component: RegisterComponent}, + {path: 'about', component: AboutComponent}, + {path: 'imprint', component: ImprintComponent}, ]; @NgModule({ @@ -170,4 +165,4 @@ export class AppModule { iconRegistry.addSvgIcon( 'logo_green', sanitizer.bypassSecurityTrustResourceUrl('assets/images/gv-logo-flat.svg')); } - } +} diff --git a/src/app/components/about/about.component.html b/src/app/components/about/about.component.html index 13f59fa..5bf352e 100644 --- a/src/app/components/about/about.component.html +++ b/src/app/components/about/about.component.html @@ -1,72 +1,74 @@
-
- -

Greenvironment

-




-

Keep it clean and green!

- -
-
-

What's Greenvironment?

-

We, the greenviroment team want to create a network for environmentalists who care for our nature and our planet as much as we do.

-
-

What does the level mean?

-

There are different levels you can reach through green behaviour. - Collect 100 points to level up! The levels are called: -

- - - - - - - - - - - -
level {{level.level}} level name {{level.name}}
-
-

How to level up?

-

There is an always growing list of things you can do, - to support your environment - and earn points to level up at the same time. - You can get a different amount of points - for differnet actions you can see in the list below: -

- - - - - - - - +
- - -
- - +

Greenvironment

+




+

Keep it clean and green!

+ + +
+

What's Greenvironment?

+

We, the greenviroment team want to create a network for environmentalists who care for our nature and our planet + as much as we do.

+
+

What does the level mean?

+

There are different levels you can reach through green behaviour. + Collect 100 points to level up! The levels are called: +

+
points {{action.points}} action {{action.name}}
+ + + + + + + + + + +
level {{level.level}} level name {{level.name}}
+
+

How to level up?

+

There is an always growing list of things you can do, + to support your environment + and earn points to level up at the same time. + You can get a different amount of points + for differnet actions you can see in the list below: +

+ + - - - - - + + + + + - - -
description {{action.description}} points {{action.points}}
-
-
-

We believe, that together we can do amazing things to protect our environment and keep it clean and green.

-

You aren't part of greenvironment yet? - join us now!

- Register -
- Login + + + action + {{action.name}} + + + + + description + {{action.description}} + + + + + +
+
+

We believe, that together we can do amazing things to protect our environment and keep it + clean and green.

+

You aren't part of greenvironment yet? - join us now!

+ Register +
+ Login +
-
\ No newline at end of file diff --git a/src/app/components/about/about.component.sass b/src/app/components/about/about.component.sass index d8cea49..699ab55 100644 --- a/src/app/components/about/about.component.sass +++ b/src/app/components/about/about.component.sass @@ -16,7 +16,7 @@ padding: 2em min-height: 50% max-width: 100% - + .big-icon //color: white transform: scale(2) @@ -31,5 +31,6 @@ max-width: 690px margin: 0 auto text-align: left + .mat-header-cell padding-right: 0.5em diff --git a/src/app/components/about/about.component.spec.ts b/src/app/components/about/about.component.spec.ts index 6b77344..3035231 100644 --- a/src/app/components/about/about.component.spec.ts +++ b/src/app/components/about/about.component.spec.ts @@ -1,6 +1,6 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import {async, ComponentFixture, TestBed} from '@angular/core/testing'; -import { AboutComponent } from './about.component'; +import {AboutComponent} from './about.component'; describe('AboutComponent', () => { let component: AboutComponent; @@ -8,9 +8,9 @@ describe('AboutComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ AboutComponent ] + declarations: [AboutComponent] }) - .compileComponents(); + .compileComponents(); })); beforeEach(() => { diff --git a/src/app/components/about/about.component.ts b/src/app/components/about/about.component.ts index c891813..3983dc3 100644 --- a/src/app/components/about/about.component.ts +++ b/src/app/components/about/about.component.ts @@ -1,9 +1,9 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; -import { Activitylist } from 'src/app/models/activity'; -import { Levellist } from 'src/app/models/levellist'; +import {Component, OnInit, ViewChild} from '@angular/core'; +import {Activitylist} from 'src/app/models/activity'; +import {Levellist} from 'src/app/models/levellist'; import {MatSort} from '@angular/material/sort'; import {MatTableDataSource} from '@angular/material/table'; -import { ActivityService } from 'src/app/services/activity/activity.service'; +import {ActivityService} from 'src/app/services/activity/activity.service'; @Component({ selector: 'app-about', @@ -19,9 +19,11 @@ export class AboutComponent implements OnInit { displayedLevelColumns = ['level', 'name']; levelSource = this.levellist.levels; - constructor(private activityService: ActivityService) { } + constructor(private activityService: ActivityService) { + } @ViewChild(MatSort, {static: true}) sort: MatSort; + ngOnInit() { this.activityService.getActivities(); this.activityService.activitylist.subscribe(response => { diff --git a/src/app/components/chat/chat.component.spec.ts b/src/app/components/chat/chat.component.spec.ts index 1f642f2..bfbbddf 100644 --- a/src/app/components/chat/chat.component.spec.ts +++ b/src/app/components/chat/chat.component.spec.ts @@ -1,6 +1,6 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import {async, ComponentFixture, TestBed} from '@angular/core/testing'; -import { ChatComponent } from './chat.component'; +import {ChatComponent} from './chat.component'; describe('ChatComponent', () => { let component: ChatComponent; @@ -8,9 +8,9 @@ describe('ChatComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ ChatComponent ] + declarations: [ChatComponent] }) - .compileComponents(); + .compileComponents(); })); beforeEach(() => { diff --git a/src/app/components/chat/chat.component.ts b/src/app/components/chat/chat.component.ts index 7727629..e39259d 100644 --- a/src/app/components/chat/chat.component.ts +++ b/src/app/components/chat/chat.component.ts @@ -1,8 +1,7 @@ -import { Component, OnInit, EventEmitter, Output, Input } from '@angular/core'; -import { Chatmessage } from 'src/app/models/chatmessage'; -import { Chatinfo } from 'src/app/models/chatinfo'; -import { ChatService } from 'src/app/services/chat/chat.service'; -import { Chat } from 'src/app/models/chat'; +import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; +import {Chatmessage} from 'src/app/models/chatmessage'; +import {ChatService} from 'src/app/services/chat/chat.service'; +import {Chat} from 'src/app/models/chat'; @Component({ selector: 'chatmanager-chat', @@ -16,7 +15,8 @@ export class ChatComponent implements OnInit { @Output() goBackEvent = new EventEmitter(); @Input() childChat: Chat; - constructor(private chatService: ChatService) { } + constructor(private chatService: ChatService) { + } ngOnInit() { this.refresh(); @@ -28,16 +28,16 @@ export class ChatComponent implements OnInit { sendMessage(pElement) { this.chatService.sendMessage(this.childChat.id, pElement.value) - .subscribe(response => { - console.log('Message sent'); - pElement.value = ''; - this.refresh(); - }); + .subscribe(response => { + console.log('Message sent'); + pElement.value = ''; + this.refresh(); + }); } refresh() { this.chatService.getMessagesRaw(this.childChat.id) - .subscribe(response => { + .subscribe(response => { console.log('Downloading messages ...'); this.messages = this.chatService.renderMessages(response.json()); }); diff --git a/src/app/components/chatlist/chatlist.component.html b/src/app/components/chatlist/chatlist.component.html index 793c220..eab8653 100644 --- a/src/app/components/chatlist/chatlist.component.html +++ b/src/app/components/chatlist/chatlist.component.html @@ -5,11 +5,11 @@
--> Chat
-
+
Pic
{{chat.memberName}}
-
Date of last message
+
Date of last message
diff --git a/src/app/components/chatlist/chatlist.component.spec.ts b/src/app/components/chatlist/chatlist.component.spec.ts index 19e8849..ff3de58 100644 --- a/src/app/components/chatlist/chatlist.component.spec.ts +++ b/src/app/components/chatlist/chatlist.component.spec.ts @@ -1,6 +1,6 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import {async, ComponentFixture, TestBed} from '@angular/core/testing'; -import { ChatlistComponent } from './chatlist.component'; +import {ChatlistComponent} from './chatlist.component'; describe('ChatlistComponent', () => { let component: ChatlistComponent; @@ -8,9 +8,9 @@ describe('ChatlistComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ ChatlistComponent ] + declarations: [ChatlistComponent] }) - .compileComponents(); + .compileComponents(); })); beforeEach(() => { diff --git a/src/app/components/chatlist/chatlist.component.ts b/src/app/components/chatlist/chatlist.component.ts index f648e12..138346f 100644 --- a/src/app/components/chatlist/chatlist.component.ts +++ b/src/app/components/chatlist/chatlist.component.ts @@ -1,7 +1,6 @@ -import { Component, OnInit, Output, EventEmitter, Input } from '@angular/core'; -import { Chatinfo } from 'src/app/models/chatinfo'; -import { Chat } from 'src/app/models/chat'; -import { ChatService } from 'src/app/services/chat/chat.service'; +import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; +import {Chat} from 'src/app/models/chat'; +import {ChatService} from 'src/app/services/chat/chat.service'; @Component({ selector: 'chatmanager-chatlist', @@ -15,7 +14,8 @@ export class ChatlistComponent implements OnInit { @Output() showCreateChatEvent = new EventEmitter(); selectedChat: Chat; - constructor(private chatService: ChatService) { } + constructor(private chatService: ChatService) { + } ngOnInit() { diff --git a/src/app/components/chatmanager/chatcontacts/chatcontacts.component.html b/src/app/components/chatmanager/chatcontacts/chatcontacts.component.html index a55f166..2fb7dc5 100644 --- a/src/app/components/chatmanager/chatcontacts/chatcontacts.component.html +++ b/src/app/components/chatmanager/chatcontacts/chatcontacts.component.html @@ -1,15 +1,16 @@
- -
-
-
-
-
Pic
-
{{contact.name}}
-
+ +
+
+
+
+
Pic
+
{{contact.name}}
+
diff --git a/src/app/components/chatmanager/chatcontacts/chatcontacts.component.spec.ts b/src/app/components/chatmanager/chatcontacts/chatcontacts.component.spec.ts index f94d884..a7a9415 100644 --- a/src/app/components/chatmanager/chatcontacts/chatcontacts.component.spec.ts +++ b/src/app/components/chatmanager/chatcontacts/chatcontacts.component.spec.ts @@ -1,6 +1,6 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import {async, ComponentFixture, TestBed} from '@angular/core/testing'; -import { ChatcontactsComponent } from './chatcontacts.component'; +import {ChatcontactsComponent} from './chatcontacts.component'; describe('ChatcontactsComponent', () => { let component: ChatcontactsComponent; @@ -8,9 +8,9 @@ describe('ChatcontactsComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ ChatcontactsComponent ] + declarations: [ChatcontactsComponent] }) - .compileComponents(); + .compileComponents(); })); beforeEach(() => { diff --git a/src/app/components/chatmanager/chatcontacts/chatcontacts.component.ts b/src/app/components/chatmanager/chatcontacts/chatcontacts.component.ts index 2ccfa3b..006a5b6 100644 --- a/src/app/components/chatmanager/chatcontacts/chatcontacts.component.ts +++ b/src/app/components/chatmanager/chatcontacts/chatcontacts.component.ts @@ -1,6 +1,6 @@ -import { Component, OnInit, Output, EventEmitter } from '@angular/core'; -import { FriendInfo } from 'src/app/models/friendinfo'; -import { ChatService } from 'src/app/services/chat/chat.service'; +import {Component, EventEmitter, OnInit, Output} from '@angular/core'; +import {FriendInfo} from 'src/app/models/friendinfo'; +import {ChatService} from 'src/app/services/chat/chat.service'; @Component({ selector: 'chatmanager-chatcontacts', @@ -12,7 +12,8 @@ export class ChatcontactsComponent implements OnInit { @Output() goBackEvent = new EventEmitter(); selectedContact: FriendInfo; - constructor(private chatService: ChatService) { } + constructor(private chatService: ChatService) { + } ngOnInit() { } diff --git a/src/app/components/chatmanager/chatmanager.component.sass b/src/app/components/chatmanager/chatmanager.component.sass index f74a631..6694562 100644 --- a/src/app/components/chatmanager/chatmanager.component.sass +++ b/src/app/components/chatmanager/chatmanager.component.sass @@ -1,6 +1,6 @@ @import '../../../styles/mixins.sass' @import '../../../styles/vars.sass' -div - width: 100% - height: 100% \ No newline at end of file +div + width: 100% + height: 100% diff --git a/src/app/components/chatmanager/chatmanager.component.spec.ts b/src/app/components/chatmanager/chatmanager.component.spec.ts index d222640..4518c76 100644 --- a/src/app/components/chatmanager/chatmanager.component.spec.ts +++ b/src/app/components/chatmanager/chatmanager.component.spec.ts @@ -1,6 +1,6 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import {async, ComponentFixture, TestBed} from '@angular/core/testing'; -import { ChatmanagerComponent } from './chatmanager.component'; +import {ChatmanagerComponent} from './chatmanager.component'; describe('ChatmanagerComponent', () => { let component: ChatmanagerComponent; @@ -8,9 +8,9 @@ describe('ChatmanagerComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ ChatmanagerComponent ] + declarations: [ChatmanagerComponent] }) - .compileComponents(); + .compileComponents(); })); beforeEach(() => { diff --git a/src/app/components/chatmanager/chatmanager.component.ts b/src/app/components/chatmanager/chatmanager.component.ts index db1550a..45216f2 100644 --- a/src/app/components/chatmanager/chatmanager.component.ts +++ b/src/app/components/chatmanager/chatmanager.component.ts @@ -1,9 +1,7 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; -import { ChatService } from '../../services/chat/chat.service'; -import { ChatComponent } from '../chat/chat.component'; -import { Chatinfo } from 'src/app/models/chatinfo'; -import { DatasharingService } from 'src/app/services/datasharing.service'; -import { Chat } from 'src/app/models/chat'; +import {Component, OnInit} from '@angular/core'; +import {ChatService} from '../../services/chat/chat.service'; +import {DatasharingService} from 'src/app/services/datasharing.service'; +import {Chat} from 'src/app/models/chat'; @Component({ selector: 'home-chatmanager', @@ -19,7 +17,8 @@ export class ChatmanagerComponent implements OnInit { parentSelectedChat: Chat; parentChats: Array; - constructor(private data: DatasharingService, private chatService: ChatService) { } + constructor(private data: DatasharingService, private chatService: ChatService) { + } ngOnInit() { /*this.data.currentChatIDs.subscribe(chatIDs => { @@ -51,7 +50,7 @@ export class ChatmanagerComponent implements OnInit { refresh() { this.chatService.getAllChatsRaw() - .subscribe(response => { + .subscribe(response => { console.log(response); this.parentChats = this.chatService.renderAllChats(response.json()); }); diff --git a/src/app/components/document-list/document-list.component.html b/src/app/components/document-list/document-list.component.html index 6a57b17..d99fd52 100644 --- a/src/app/components/document-list/document-list.component.html +++ b/src/app/components/document-list/document-list.component.html @@ -1,4 +1,5 @@
New Document - {{ docId }} + {{ docId }}
diff --git a/src/app/components/document-list/document-list.component.scss b/src/app/components/document-list/document-list.component.scss index 506aa38..10001b7 100644 --- a/src/app/components/document-list/document-list.component.scss +++ b/src/app/components/document-list/document-list.component.scss @@ -1,24 +1,28 @@ .sidenav { - position: fixed; - height: 100%; - width: 220px; - top: 0; - left: 0; - background-color: #111111; - overflow-x: hidden; - padding-top: 20px; + position: fixed; + height: 100%; + width: 220px; + top: 0; + left: 0; + background-color: #111111; + overflow-x: hidden; + padding-top: 20px; - span { - padding: 6px 8px 6px 16px; - text-decoration: none; - font-size: 25px; - font-family: 'Roboto', Tahoma, Geneva, Verdana, sans-serif; - color: #818181; - display: block; - }.selected { - color: #e1e1e1; - }:hover { - color: #f1f1f1; - cursor: pointer; - } + span { + padding: 6px 8px 6px 16px; + text-decoration: none; + font-size: 25px; + font-family: 'Roboto', Tahoma, Geneva, Verdana, sans-serif; + color: #818181; + display: block; + } + + .selected { + color: #e1e1e1; + } + + :hover { + color: #f1f1f1; + cursor: pointer; + } } diff --git a/src/app/components/document-list/document-list.component.spec.ts b/src/app/components/document-list/document-list.component.spec.ts index f8c7635..2ba5f52 100644 --- a/src/app/components/document-list/document-list.component.spec.ts +++ b/src/app/components/document-list/document-list.component.spec.ts @@ -1,6 +1,6 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import {async, ComponentFixture, TestBed} from '@angular/core/testing'; -import { DocumentListComponent } from './document-list.component'; +import {DocumentListComponent} from './document-list.component'; describe('DocumentListComponent', () => { let component: DocumentListComponent; @@ -8,9 +8,9 @@ describe('DocumentListComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ DocumentListComponent ] + declarations: [DocumentListComponent] }) - .compileComponents(); + .compileComponents(); })); beforeEach(() => { diff --git a/src/app/components/document-list/document-list.component.ts b/src/app/components/document-list/document-list.component.ts index 10faac9..6a68c2f 100644 --- a/src/app/components/document-list/document-list.component.ts +++ b/src/app/components/document-list/document-list.component.ts @@ -1,7 +1,7 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; -import { Observable, Subscription } from 'rxjs'; +import {Component, OnDestroy, OnInit} from '@angular/core'; +import {Observable, Subscription} from 'rxjs'; -import { DocumentService } from 'src/app/services/document.service'; +import {DocumentService} from 'src/app/services/document.service'; @Component({ selector: 'app-document-list', @@ -13,7 +13,8 @@ export class DocumentListComponent implements OnInit, OnDestroy { currentDoc: string; private _docSub: Subscription; - constructor(private documentService: DocumentService) { } + constructor(private documentService: DocumentService) { + } ngOnInit() { this.documents = this.documentService.documents; diff --git a/src/app/components/document/document.component.scss b/src/app/components/document/document.component.scss index 67d5275..f97544b 100644 --- a/src/app/components/document/document.component.scss +++ b/src/app/components/document/document.component.scss @@ -1,12 +1,12 @@ textarea { - position: fixed; - width: calc(100% - 235px); - height: 100%; - right: 0; - top: 0; - font-size: 18pt; - padding-top: 20px; - resize: none; - border: none; - padding: 20px 0px 20px 15px; + position: fixed; + width: calc(100% - 235px); + height: 100%; + right: 0; + top: 0; + font-size: 18pt; + padding-top: 20px; + resize: none; + border: none; + padding: 20px 0px 20px 15px; } diff --git a/src/app/components/document/document.component.spec.ts b/src/app/components/document/document.component.spec.ts index 6780d19..5f113c4 100644 --- a/src/app/components/document/document.component.spec.ts +++ b/src/app/components/document/document.component.spec.ts @@ -1,6 +1,6 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import {async, ComponentFixture, TestBed} from '@angular/core/testing'; -import { DocumentComponent } from './document.component'; +import {DocumentComponent} from './document.component'; describe('DocumentComponent', () => { let component: DocumentComponent; @@ -8,9 +8,9 @@ describe('DocumentComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ DocumentComponent ] + declarations: [DocumentComponent] }) - .compileComponents(); + .compileComponents(); })); beforeEach(() => { diff --git a/src/app/components/document/document.component.ts b/src/app/components/document/document.component.ts index a5c4c04..8bb37ba 100644 --- a/src/app/components/document/document.component.ts +++ b/src/app/components/document/document.component.ts @@ -1,8 +1,8 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; -import { DocumentService } from 'src/app/services/document.service'; -import { Subscription } from 'rxjs'; -import { Document } from 'src/app/models/document'; -import { startWith } from 'rxjs/operators'; +import {Component, OnDestroy, OnInit} from '@angular/core'; +import {DocumentService} from 'src/app/services/document.service'; +import {Subscription} from 'rxjs'; +import {Document} from 'src/app/models/document'; +import {startWith} from 'rxjs/operators'; @Component({ selector: 'app-document', @@ -12,11 +12,13 @@ import { startWith } from 'rxjs/operators'; export class DocumentComponent implements OnInit, OnDestroy { document: Document; private _docSub: Subscription; - constructor(private documentService: DocumentService) { } + + constructor(private documentService: DocumentService) { + } ngOnInit() { this._docSub = this.documentService.currentDocument.pipe( - startWith({ id: '', doc: 'Select an existing document or create a new one to get started'}) + startWith({id: '', doc: 'Select an existing document or create a new one to get started'}) ).subscribe(document => this.document = document); } diff --git a/src/app/components/feed/feed.component.html b/src/app/components/feed/feed.component.html index c8339e5..3f7bb97 100644 --- a/src/app/components/feed/feed.component.html +++ b/src/app/components/feed/feed.component.html @@ -1,31 +1,35 @@
+ infinite-scroll + [infiniteScrollDistance]="0.5" + [scrollWindow]="false" + (scrolled)="onScroll()">
- + - +

- I protected the environment. + I protected the environment. +

What did you do? nothing ;) - + {{action.name}} ({{action.description}}) {{getErrorMessage()}} - @@ -34,26 +38,27 @@ infinite-scroll
- + You need to login to post something.
-
+
- New - Most Liked - -
-
-
- -
- + New + Most Liked + +
+
+
+ +
+ +
-
diff --git a/src/app/components/feed/feed.component.sass b/src/app/components/feed/feed.component.sass index c3d660c..40e1094 100644 --- a/src/app/components/feed/feed.component.sass +++ b/src/app/components/feed/feed.component.sass @@ -3,43 +3,44 @@ .primary-color - color: $primary-color + color: $primary-color -#home - width: 100% - height: 100% - overflow-y: scroll +#home + width: 100% + height: 100% + overflow-y: scroll #complete-feed - box-sizing: border-box - display: flex - width: 100% - padding: 0.5em + box-sizing: border-box + display: flex + width: 100% + padding: 0.5em + #info - ::ng-deep .mat-card-header-text - margin: 0px + ::ng-deep .mat-card-header-text + margin: 0px #feedlist - width: 100% + width: 100% #input - width: 100% - padding-left: 0.5em - padding-right: 0.5em + width: 100% + padding-left: 0.5em + padding-right: 0.5em #action-chooser - width: 100% - padding-left: 0.5em - padding-right: 0.5em + width: 100% + padding-left: 0.5em + padding-right: 0.5em #check - margin: 0 - padding-left: 0.5em + margin: 0 + padding-left: 0.5em #post-button - width: 100% - padding-left: 0.5em - padding-right: 0.5em - margin-top: 0.5em + width: 100% + padding-left: 0.5em + padding-right: 0.5em + margin-top: 0.5em diff --git a/src/app/components/feed/feed.component.spec.ts b/src/app/components/feed/feed.component.spec.ts index 4101160..322f1ef 100644 --- a/src/app/components/feed/feed.component.spec.ts +++ b/src/app/components/feed/feed.component.spec.ts @@ -1,6 +1,6 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import {async, ComponentFixture, TestBed} from '@angular/core/testing'; -import { FeedComponent } from './feed.component'; +import {FeedComponent} from './feed.component'; describe('FeedComponent', () => { let component: FeedComponent; @@ -8,9 +8,9 @@ describe('FeedComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ FeedComponent ] + declarations: [FeedComponent] }) - .compileComponents(); + .compileComponents(); })); beforeEach(() => { diff --git a/src/app/components/feed/postlist/postlist.component.html b/src/app/components/feed/postlist/postlist.component.html index 6b0db0d..fcf28eb 100644 --- a/src/app/components/feed/postlist/postlist.component.html +++ b/src/app/components/feed/postlist/postlist.component.html @@ -19,10 +19,10 @@
--> - +
- +
- + {{post.author.name}} @@ -46,7 +46,7 @@ -

+

+ +
+ + +
+ created by {{groupProfile.creator.username}} + @{{groupProfile.creator.handle}} +
+ + +
+ {{groupProfile.members.length}} member(s) +
+ + + + + +
+ {{groupProfile.name}} + created by {{groupProfile.creator.username}} + @{{groupProfile.creator.handle}} +
+ + +
+ + +
+ {{groupProfile.members.length}} member(s) +
+ + +
+ + + + + Events + + +
+ + + {{event.name}} + {{event.date}}
- - + +
- - -
- created by {{groupProfile.creator.username}} @{{groupProfile.creator.handle}} -
- - -
- {{groupProfile.members.length}} member(s) -
- - - - - -
- {{groupProfile.name}} - created by {{groupProfile.creator.username}} @{{groupProfile.creator.handle}} -
- - -
- - -
- {{groupProfile.members.length}} member(s) -
- - -
- - - - - Events - - -
- - - {{event.name}} - {{event.date}} -
- - -
- - -
- - - - - Members - - -
- -
- - + +
+ + + + + Members + + +
+ +
+ +
-
-

Group not found :(

-
- +
+
+

Group not found :(

+
+
- \ No newline at end of file diff --git a/src/app/components/group/group.component.sass b/src/app/components/group/group.component.sass index 0de5d38..d153814 100644 --- a/src/app/components/group/group.component.sass +++ b/src/app/components/group/group.component.sass @@ -26,22 +26,30 @@ $mat-card-header-size: 100px !default .button-box text-align: right margin-left: auto + .request-button margin: auto 0 + #toolbar margin-top: 32px + .mat-toolbar-row max-height: 40px + .info-box font-size: 14px margin-left: calc(100px + 0.5em) + .info margin-right: 3em + #username margin: 0 0.5em overflow: auto + #handle font-size: 14px + .profile-picture background-image: url(https://material.angular.io/assets/img/examples/shiba1.jpg) height: $mat-card-header-size @@ -49,6 +57,7 @@ $mat-card-header-size: 100px !default border-radius: 50% flex-shrink: 0 background-size: cover + &:hover height: 200 // Makes `` tags behave like `background-size: cover`. Not supported @@ -61,27 +70,35 @@ $mat-card-header-size: 100px !default margin-top: 0.5em outline: none user-select: none + ::ng-deep .mat-card-header-text margin: 0 margin-left: 16px + .mat-card-subtitle margin: 0 word-break: break-all + .mat-card-title margin: 0 word-break: break-all + .request-button margin-top: 0.5em margin-bottom: 0.5em + .profile-picture background-image: url(https://material.angular.io/assets/img/examples/shiba1.jpg) background-size: cover + .profile-picture:hover cursor: pointer + .pointer cursor: pointer ::ng-deep .mat-expansion-panel background: #e6e6e6 + ::ng-deep.dark-theme .mat-expansion-panel background: #121212 diff --git a/src/app/components/group/group.component.spec.ts b/src/app/components/group/group.component.spec.ts index 50601d0..8d9ff1d 100644 --- a/src/app/components/group/group.component.spec.ts +++ b/src/app/components/group/group.component.spec.ts @@ -1,6 +1,6 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import {async, ComponentFixture, TestBed} from '@angular/core/testing'; -import { GroupComponent } from './group.component'; +import {GroupComponent} from './group.component'; describe('GroupComponent', () => { let component: GroupComponent; @@ -8,9 +8,9 @@ describe('GroupComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ GroupComponent ] + declarations: [GroupComponent] }) - .compileComponents(); + .compileComponents(); })); beforeEach(() => { diff --git a/src/app/components/group/group.component.ts b/src/app/components/group/group.component.ts index 6e5af39..de4ad53 100644 --- a/src/app/components/group/group.component.ts +++ b/src/app/components/group/group.component.ts @@ -1,12 +1,12 @@ -import { Component, OnInit, ViewChild} from '@angular/core'; -import {Router, NavigationEnd} from '@angular/router'; -import { User } from 'src/app/models/user'; +import {Component, OnInit, ViewChild} from '@angular/core'; +import {NavigationEnd, Router} from '@angular/router'; +import {User} from 'src/app/models/user'; import {MatSort} from '@angular/material/sort'; -import { RequestService } from 'src/app/services/request/request.service'; -import { DatasharingService } from '../../services/datasharing.service'; -import { GroupService } from 'src/app/services/group/group.service'; -import { Group } from 'src/app/models/group'; -import { Event } from 'src/app/models/event'; +import {RequestService} from 'src/app/services/request/request.service'; +import {DatasharingService} from '../../services/datasharing.service'; +import {GroupService} from 'src/app/services/group/group.service'; +import {Group} from 'src/app/models/group'; +import {Event} from 'src/app/models/event'; import {MatDialog, MatDialogRef} from '@angular/material/dialog'; // DIALOG COMPONENT to create events @@ -21,8 +21,8 @@ export class DialogCreateEventComponent { public dialogRef: MatDialogRef, private group: GroupService, private router: Router) { - this.groupId = this.router.url.substr(this.router.url.lastIndexOf('/') + 1); - } + this.groupId = this.router.url.substr(this.router.url.lastIndexOf('/') + 1); + } onNoClick(): void { this.dialogRef.close(); @@ -63,20 +63,21 @@ export class GroupComponent implements OnInit { private requestService: RequestService, private data: DatasharingService, private groupService: GroupService) { - router.events.forEach((event) => { - // check if url changes - if (event instanceof NavigationEnd) { - const possibleID = this.router.url.substr(this.router.url.lastIndexOf('/') + 1); - if (this.id !== possibleID && this.id && this.router.url.includes('group/')) { - // reload the group - console.log('search for group id: ' + this.router.url.substr(this.router.url.lastIndexOf('/') + 1)); - this.ngOnInit(); - } + router.events.forEach((event) => { + // check if url changes + if (event instanceof NavigationEnd) { + const possibleID = this.router.url.substr(this.router.url.lastIndexOf('/') + 1); + if (this.id !== possibleID && this.id && this.router.url.includes('group/')) { + // reload the group + console.log('search for group id: ' + this.router.url.substr(this.router.url.lastIndexOf('/') + 1)); + this.ngOnInit(); } - }); + } + }); } @ViewChild(MatSort, {static: true}) sort: MatSort; + ngOnInit() { this.loading = true; this.id = this.router.url.substr(this.router.url.lastIndexOf('/') + 1); @@ -98,7 +99,9 @@ export class GroupComponent implements OnInit { for (const member of this.groupProfile.members) { member.allowedToSendRequest = this.requestService.isAllowedToSendRequest(member.userID, this.self); } - } else { this.groupNotFound = true; } + } else { + this.groupNotFound = true; + } this.loading = false; }); } diff --git a/src/app/components/home/home.component.html b/src/app/components/home/home.component.html index e274fc6..cee7549 100644 --- a/src/app/components/home/home.component.html +++ b/src/app/components/home/home.component.html @@ -1,8 +1,16 @@
-
-
- - +
+ +
+
+ +
+ +
-
- - - - chat - - - - - - home - - - - - - people - - - - - - search - - - - +
+ + + + chat + + + + + + home + + + + + + people + + + + + + search + + + +
diff --git a/src/app/components/home/home.component.spec.ts b/src/app/components/home/home.component.spec.ts index 490e81b..482c23c 100644 --- a/src/app/components/home/home.component.spec.ts +++ b/src/app/components/home/home.component.spec.ts @@ -1,6 +1,6 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import {async, ComponentFixture, TestBed} from '@angular/core/testing'; -import { HomeComponent } from './home.component'; +import {HomeComponent} from './home.component'; describe('HomeComponent', () => { let component: HomeComponent; @@ -8,9 +8,9 @@ describe('HomeComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ HomeComponent ] + declarations: [HomeComponent] }) - .compileComponents(); + .compileComponents(); })); beforeEach(() => { diff --git a/src/app/components/home/home.component.ts b/src/app/components/home/home.component.ts index 22abaab..7df509d 100644 --- a/src/app/components/home/home.component.ts +++ b/src/app/components/home/home.component.ts @@ -1,6 +1,6 @@ -import { Component, OnInit } from '@angular/core'; -import { DatasharingService } from 'src/app/services/datasharing.service'; -import { FeedService } from 'src/app/services/feed/feed.service'; +import {Component, OnInit} from '@angular/core'; +import {DatasharingService} from 'src/app/services/datasharing.service'; +import {FeedService} from 'src/app/services/feed/feed.service'; @Component({ selector: 'app-home', @@ -11,7 +11,8 @@ export class HomeComponent implements OnInit { loggedIn: boolean; - constructor(private data: DatasharingService, private feedService: FeedService) { } + constructor(private data: DatasharingService, private feedService: FeedService) { + } ngOnInit() { this.data.currentUserInfo.subscribe(user => { diff --git a/src/app/components/imprint/imprint.component.sass b/src/app/components/imprint/imprint.component.sass index 6d771cc..571666b 100644 --- a/src/app/components/imprint/imprint.component.sass +++ b/src/app/components/imprint/imprint.component.sass @@ -8,8 +8,8 @@ margin: 0 auto h1.mat-display-1 - margin: 0 + margin: 0 + - diff --git a/src/app/components/imprint/imprint.component.spec.ts b/src/app/components/imprint/imprint.component.spec.ts index 49b68ae..79721d0 100644 --- a/src/app/components/imprint/imprint.component.spec.ts +++ b/src/app/components/imprint/imprint.component.spec.ts @@ -1,6 +1,6 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import {async, ComponentFixture, TestBed} from '@angular/core/testing'; -import { ImprintComponent } from './imprint.component'; +import {ImprintComponent} from './imprint.component'; describe('ImprintComponent', () => { let component: ImprintComponent; @@ -8,9 +8,9 @@ describe('ImprintComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ ImprintComponent ] + declarations: [ImprintComponent] }) - .compileComponents(); + .compileComponents(); })); beforeEach(() => { diff --git a/src/app/components/imprint/imprint.component.ts b/src/app/components/imprint/imprint.component.ts index ba755c1..aa45e45 100644 --- a/src/app/components/imprint/imprint.component.ts +++ b/src/app/components/imprint/imprint.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import {Component, OnInit} from '@angular/core'; @Component({ selector: 'app-imprint', @@ -7,7 +7,8 @@ import { Component, OnInit } from '@angular/core'; }) export class ImprintComponent implements OnInit { - constructor() { } + constructor() { + } ngOnInit() { } diff --git a/src/app/components/login/login.component.html b/src/app/components/login/login.component.html index 0d2f145..d0de276 100644 --- a/src/app/components/login/login.component.html +++ b/src/app/components/login/login.component.html @@ -1,24 +1,25 @@
- - - Login - - -
- {{getErrorMessage()}} - - - - - - - -
- -

You aren't part of greenvironment yet?

- Register - - + + + Login + + +
+ {{getErrorMessage()}} + + + + + + + +
+ +

You aren't part of greenvironment yet?

+ Register + +
diff --git a/src/app/components/login/login.component.sass b/src/app/components/login/login.component.sass index 131accc..d4f5c5c 100644 --- a/src/app/components/login/login.component.sass +++ b/src/app/components/login/login.component.sass @@ -6,21 +6,21 @@ max-width: 35em margin: 0 auto -.example-container +.example-container display: flex flex-direction: column -.example-container > * +.example-container > * width: 100% -.example-right-align +.example-right-align text-align: right input.example-right-align::-webkit-outer-spin-button, -input.example-right-align::-webkit-inner-spin-button +input.example-right-align::-webkit-inner-spin-button display: none -input.example-right-align +input.example-right-align -moz-appearance: textfield .mat-error @@ -35,7 +35,7 @@ input.example-right-align .mat-stroked-button width: 100% - + diff --git a/src/app/components/login/login.component.spec.ts b/src/app/components/login/login.component.spec.ts index d6d85a8..28a5704 100644 --- a/src/app/components/login/login.component.spec.ts +++ b/src/app/components/login/login.component.spec.ts @@ -1,6 +1,6 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import {async, ComponentFixture, TestBed} from '@angular/core/testing'; -import { LoginComponent } from './login.component'; +import {LoginComponent} from './login.component'; describe('LoginComponent', () => { let component: LoginComponent; @@ -8,9 +8,9 @@ describe('LoginComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ LoginComponent ] + declarations: [LoginComponent] }) - .compileComponents(); + .compileComponents(); })); beforeEach(() => { diff --git a/src/app/components/login/login.component.ts b/src/app/components/login/login.component.ts index 6c26301..bb6313d 100644 --- a/src/app/components/login/login.component.ts +++ b/src/app/components/login/login.component.ts @@ -1,7 +1,7 @@ -import { Component, OnInit } from '@angular/core'; +import {Component, OnInit} from '@angular/core'; import {FormControl, Validators} from '@angular/forms'; -import { Login } from 'src/app/models/login'; -import { LoginService } from 'src/app/services/login/login.service'; +import {Login} from 'src/app/models/login'; +import {LoginService} from 'src/app/services/login/login.service'; import {Router} from '@angular/router'; import * as sha512 from 'js-sha512'; import {IErrorResponse} from '../../models/interfaces/IErrorResponse'; @@ -16,6 +16,7 @@ export class LoginComponent implements OnInit { constructor(private loginService: LoginService, private router: Router) { this.login = {passwordHash: null, email: null}; } + login: Login; hide = true; errorOccurred = false; @@ -43,7 +44,7 @@ export class LoginComponent implements OnInit { this.errorMessage = ' '; this.login.email = pEmail.trim().toLowerCase(); this.login.passwordHash = sha512.sha512(pPasswordHash); - this.loginService.login(this.login).subscribe( () => { + this.loginService.login(this.login).subscribe(() => { this.router.navigateByUrl('').catch((error) => { this.errorMessage = error.message; this.errorOccurred = true; @@ -55,6 +56,7 @@ export class LoginComponent implements OnInit { }); } - ngOnInit() {} + ngOnInit() { + } } diff --git a/src/app/components/main-navigation/main-navigation.component.html b/src/app/components/main-navigation/main-navigation.component.html index 80caa1f..acc8103 100644 --- a/src/app/components/main-navigation/main-navigation.component.html +++ b/src/app/components/main-navigation/main-navigation.component.html @@ -1,20 +1,22 @@ - - + + - + Menu -
- -
-
- Hello, {{user.username}} -
+
+ +
+
+ Hello, {{user.username}} +
Home @@ -24,8 +26,10 @@ @@ -46,26 +50,27 @@ Greenvironment -