Merge branch 'julius-dev' of Software_Engineering_I/greenvironment-frontend into master

5 years ago · bc4233c30f
parent 5f75b3cb19 f11e6a3699
commit bc4233c30f
9 changed files with 218 additions and 168 deletions
--- 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'));
  }
 }
--- 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';
    }
  }
 }
--- 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));
--- 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));
--- a/src/assets/images/account_circle-24px.svg
+++ b/src/assets/images/account_circle-24px.svg
@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
-   viewBox="0 0 24 24"
-   version="1.1"
-   id="svg6"
-   sodipodi:docname="account_circle-24px.svg"
-   inkscape:version="0.92.4 5da689c313, 2019-01-14">
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1000"
-     id="namedview8"
-     showgrid="false"
-     inkscape:zoom="19.666667"
-     inkscape:cx="3.495666"
-     inkscape:cy="8.6464111"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="Layer 1"
-     style="display:inline">
-    <path
-       inkscape:connector-curvature="0"
-       style="opacity:0.98999999;fill:#f9f9f9;fill-opacity:0.99607843"
-       id="path2-3"
-       d="m 12.160208,1.9088359 c -5.5200001,0 -9.9999991,4.4800002 -9.9999991,10.0000001 0,5.520001 4.479999,10.000001 9.9999991,10.000001 5.52,0 10.000001,-4.48 10.000001,-10.000001 0,-5.5199999 -4.480001,-10.0000001 -10.000001,-10.0000001 z"
-       sodipodi:nodetypes="sssss" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Layer 2"
-     sodipodi:insensitive="true">
-    <a
-       transform="translate(0.16020778,-0.09116412)"
-       id="a822">
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:#000000;fill-opacity:1"
-         id="path2"
-         d="M 12,2 C 6.48,2 2,6.48 2,12 2,17.52 6.48,22 12,22 17.52,22 22,17.52 22,12 22,6.48 17.52,2 12,2 Z m 0,3 c 1.66,0 3,1.34 3,3 0,1.66 -1.34,3 -3,3 C 10.34,11 9,9.66 9,8 9,6.34 10.34,5 12,5 Z m 0,14.2 c -2.5,0 -4.71,-1.28 -6,-3.22 0.03,-1.99 4,-3.08 6,-3.08 1.99,0 5.97,1.09 6,3.08 -1.29,1.94 -3.5,3.22 -6,3.22 z" />
-    </a>
-  </g>
-  <path
-     d="M0 0h24v24H0z"
-     fill="none"
-     id="path4" />
-</svg>
--- a/src/assets/images/default-profilepic.svg
+++ b/src/assets/images/default-profilepic.svg
@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   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="256px"
+   height="256px"
+   viewBox="0 0 256 256"
+   version="1.1"
+   id="SVGRoot"
+   inkscape:version="0.92.4 5da689c313, 2019-01-14"
+   sodipodi:docname="default-profilepic.svg">
+  <defs
+     id="defs3721" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8284271"
+     inkscape:cx="118.92496"
+     inkscape:cy="134.69222"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer2"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1131"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:grid-bbox="true" />
+  <metadata
+     id="metadata3724">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:none;opacity:0.40200004">
+    <image
+       y="-7.7781744"
+       x="0.32620794"
+       id="image3742"
+       xlink:href="data:image/png;base64,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
+bxOuAAAAAElFTkSuQmCC
+"
+       style="image-rendering:optimizeSpeed"
+       preserveAspectRatio="none"
+       height="278.08777"
+       width="270.16949" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Layer 2"
+     style="display:inline">
+    <circle
+       style="fill:#8bc34a;fill-opacity:1;stroke:none;stroke-width:6.62765312;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4571"
+       cx="127.37563"
+       cy="65.066956"
+       r="55.672287" />
+    <ellipse
+       style="fill:#8bc34a;fill-opacity:1;stroke:none;stroke-width:5.33326387;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4620"
+       cx="127.37563"
+       cy="191.32233"
+       rx="90"
+       ry="43.803303" />
+  </g>
+</svg>
--- a/src/assets/images/gv-logo-flat.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">
  <defs
-     id="defs3412">
-    <linearGradient
-       id="linearGradient4054"
-       inkscape:collect="always">
-      <stop
-         id="stop4050"
-         offset="0"
-         style="stop-color:#00c088;stop-opacity:1" />
-      <stop
-         id="stop4052"
-         offset="1"
-         style="stop-color:#08ff21;stop-opacity:0.97468352" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4048"
-       inkscape:collect="always">
-      <stop
-         id="stop4044"
-         offset="0"
-         style="stop-color:#00c088;stop-opacity:1" />
-      <stop
-         id="stop4046"
-         offset="1"
-         style="stop-color:#08ff21;stop-opacity:0.97468352" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4005">
-      <stop
-         style="stop-color:#00c088;stop-opacity:1"
-         offset="0"
-         id="stop4001" />
-      <stop
-         style="stop-color:#08ff21;stop-opacity:0.95358652"
-         offset="1"
-         id="stop4003" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4054"
-       id="linearGradient4007"
-       x1="13.48775"
-       y1="12.73616"
-       x2="52.052452"
-       y2="47.384392"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4048"
-       id="linearGradient4017"
-       x1="14.551315"
-       y1="10.077048"
-       x2="51.051678"
-       y2="51.531181"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4005"
-       id="linearGradient4025"
-       x1="13.637479"
-       y1="15.156103"
-       x2="52.776852"
-       y2="46.975906"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs3412" />
  <sodipodi:namedview
     id="base"
     pagecolor="#ffffff"
@ -91,13 +26,13 @@
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
     inkscape:zoom="8"
-     inkscape:cx="-4.045925"
-     inkscape:cy="41.653992"
+     inkscape:cx="-2.5119393"
+     inkscape:cy="36.206241"
     inkscape:document-units="px"
     inkscape:current-layer="layer2"
     showgrid="false"
     inkscape:window-width="1920"
-     inkscape:window-height="1003"
+     inkscape:window-height="1131"
     inkscape:window-x="0"
     inkscape:window-y="0"
     inkscape:window-maximized="1"
@ -110,7 +45,7 @@
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
      </cc:Work>
    </rdf:RDF>
  </metadata>
@ -120,19 +55,19 @@
     inkscape:label="Layer 2"
     style="display:inline">
    <path
-       style="fill:none;stroke:url(#linearGradient4007);stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:none;stroke:#8bc34a;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
       d="m 59.638425,10.982918 c -2.598034,1.65974 -5.164767,1.536797 -6.79245,1.598268 -1.627684,0.06147 -7.89147,-0.248912 -10.548644,-0.307359 -2.031158,-0.04467 -10.408921,-0.634292 -18.029729,3.227272 -6.189793,3.136452 -10.030686,7.78418 -11.299883,11.09567 -1.095556,2.858442 -1.721588,5.317315 -1.095556,9.896969 0.334798,2.449172 0.916715,4.631314 0.829032,5.615672 -0.07744,0.869314 0.04741,1.638006 -2.331509,4.035408 -2.3789231,2.397403 -7.5630585,6.702992 -7.5630585,6.702992"
       id="path3986"
       inkscape:connector-curvature="0"
       sodipodi:nodetypes="csssssssc" />
    <path
-       style="fill:none;stroke:url(#linearGradient4017);stroke-width:2.81999993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:none;stroke:#8bc34a;stroke-width:2.81999993;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
       d="m 17.040936,45.75125 c 0,0 5.71124,1.10058 9.863991,0.923511 4.152753,-0.177069 10.503177,-1.963537 14.640251,-4.074381 2.654809,-1.354554 8.010685,-4.452479 10.623857,-9.671077 1.545586,-3.086589 2.392221,-6.933871 2.615983,-8.836099 0.374688,-3.185266 0.215574,-5.492636 0.858958,-6.968217"
       id="path3988"
       inkscape:connector-curvature="0"
       sodipodi:nodetypes="cssssc" />
    <path
-       style="fill:none;stroke:url(#linearGradient4025);stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:none;stroke:#8bc34a;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
       d="m 16.515165,41.68934 c 0,0 3.942744,-4.483925 8.75,-9 3.732038,-3.505984 5.757466,-5.519577 10.967068,-8.580806 3.85598,-2.265823 12.426015,-6.277728 15.87316,-7.736136"
       id="path3990"
       inkscape:connector-curvature="0"
--- a/src/assets/images/gv-logo-white.svg
+++ b/src/assets/images/gv-logo-white.svg
--- a/src/favicon.ico
+++ b/src/favicon.ico