From c85602f6e89ac58be60de03da47a87ef0cea4d5f Mon Sep 17 00:00:00 2001
From: piratefinn <toyou1995@gmail.com>
Date: Tue, 14 Nov 2017 17:12:07 +0000
Subject: [PATCH] snazzy info added, logo added

---
 .angular-cli.json                          |   3 ++-
 package-lock.json                          |  26 ++++++++++++++-------
 package.json                               |   2 ++
 src/app/dashboard/dashboard.module.ts      |   2 ++
 src/app/dashboard/trail-map.component.html |  16 ++++++++-----
 src/app/dashboard/trail-map.component.ts   |   2 +-
 src/assets/img/map-pin-lis.png             | Bin 0 -> 1773 bytes
 7 files changed, 35 insertions(+), 16 deletions(-)
 create mode 100644 src/assets/img/map-pin-lis.png

diff --git a/.angular-cli.json b/.angular-cli.json
index f7b4f9c..6c77403 100644
--- a/.angular-cli.json
+++ b/.angular-cli.json
@@ -20,7 +20,8 @@
         "../node_modules/moment/min/moment.min.js"
       ],
       "styles": [
-        "scss/style.scss"
+        "scss/style.scss",
+        "../node_modules/snazzy-info-window/dist/snazzy-info-window.css"
       ],
       "environmentSource": "environments/environment.ts",
       "environments": {
diff --git a/package-lock.json b/package-lock.json
index b05c84c..23e529c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,6 +14,11 @@
       "resolved": "https://registry.npmjs.org/@agm/js-marker-clusterer/-/js-marker-clusterer-1.0.0-beta.2.tgz",
       "integrity": "sha512-sQzNo+2NwjgVAiy/AU3deYvemoH3CHtYvh+aH/3jq9yIK+2ZiuwhZ2oKmoBsVPEMzLjOqF07FhDLowrAAZfVRw=="
     },
+    "@agm/snazzy-info-window": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/@agm/snazzy-info-window/-/snazzy-info-window-1.0.0-beta.2.tgz",
+      "integrity": "sha512-YboKYJ2IzxY27XzGun4rHDw7I8BcHqfEgmzMR7bqSo1UH+JlgSNbuWfEQ2UvKqPlmW0bNm0o6xK8SfbE531QZA=="
+    },
     "@angular-devkit/build-optimizer": {
       "version": "0.0.13",
       "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.0.13.tgz",
@@ -7744,6 +7749,11 @@
         "debug": "2.6.8"
       }
     },
+    "snazzy-info-window": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/snazzy-info-window/-/snazzy-info-window-1.1.0.tgz",
+      "integrity": "sha1-ux4ws3r4/aj/kAZHQIWtVIbwbw8="
+    },
     "sntp": {
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
@@ -7989,14 +7999,6 @@
       "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
       "dev": true
     },
-    "string_decoder": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-      "requires": {
-        "safe-buffer": "5.1.1"
-      }
-    },
     "string-width": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
@@ -8007,6 +8009,14 @@
         "strip-ansi": "3.0.1"
       }
     },
+    "string_decoder": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
     "stringstream": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
diff --git a/package.json b/package.json
index 2a5c6eb..87c4fc1 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
   "dependencies": {
     "@agm/core": "^1.0.0-beta.1",
     "@agm/js-marker-clusterer": "^1.0.0-beta.2",
+    "@agm/snazzy-info-window": "^1.0.0-beta.2",
     "@angular/common": "4.0.3",
     "@angular/compiler": "4.0.3",
     "@angular/core": "4.0.3",
@@ -40,6 +41,7 @@
     "ngx-bootstrap": "1.6.6",
     "ngx-pagination": "^3.0.1",
     "rxjs": "5.4.2",
+    "snazzy-info-window": "^1.1.0",
     "ts-helpers": "1.1.2",
     "webpack": "3.5.4",
     "webpack-dev-server": "2.7.1",
diff --git a/src/app/dashboard/dashboard.module.ts b/src/app/dashboard/dashboard.module.ts
index 62efd93..b7ff4c3 100644
--- a/src/app/dashboard/dashboard.module.ts
+++ b/src/app/dashboard/dashboard.module.ts
@@ -6,6 +6,7 @@ import { BsDropdownModule } from 'ngx-bootstrap/dropdown';
 import { NgxPaginationModule } from 'ngx-pagination';
 import { AgmCoreModule, GoogleMapsAPIWrapper } from '@agm/core';
 import { AgmJsMarkerClustererModule } from '@agm/js-marker-clusterer';
+import { AgmSnazzyInfoWindowModule } from '@agm/snazzy-info-window';
 
 import { CurrencyPipe } from '@angular/common';
 
@@ -45,6 +46,7 @@ import { environment } from '../../environments/environment';
       apiKey: environment.mapApiKey
     }),
     AgmJsMarkerClustererModule,
+    AgmSnazzyInfoWindowModule,
     BsDropdownModule,
     NgxPaginationModule,
     DashboardRoutingModule,
diff --git a/src/app/dashboard/trail-map.component.html b/src/app/dashboard/trail-map.component.html
index bcff523..590a6ef 100644
--- a/src/app/dashboard/trail-map.component.html
+++ b/src/app/dashboard/trail-map.component.html
@@ -25,13 +25,17 @@
               <agm-marker-cluster maxZoom="13" imagePath="https://raw.githubusercontent.com/googlemaps/v3-utility-library/master/markerclustererplus/images/m">
                 <agm-marker
                     *ngFor="let m of markers"
+                    [iconUrl]="'/assets/img/map-pin-lis.png'"
                     [latitude]="m.latitude"
-                    [longitude]="m.longitude"
-                    [label]="m.name[0]">
-
-                  <agm-info-window>
-                    <strong>{{m.name}}</strong>
-                  </agm-info-window>
+                    [longitude]="m.longitude">
+                  <agm-snazzy-info-window
+                  [maxWidth]="500"
+                  [closeWhenOthersOpen]="true">
+                    <ng-template>
+                      <h4><strong>{{m.name}}</strong></h4>
+                      <img src="assets/img/avatars/default.png" class="img-avatar" alt="avatar-image">
+                    </ng-template>
+                  </agm-snazzy-info-window>
                 </agm-marker>
               </agm-marker-cluster>
             </agm-map>
diff --git a/src/app/dashboard/trail-map.component.ts b/src/app/dashboard/trail-map.component.ts
index 2b6df1f..eaa409a 100644
--- a/src/app/dashboard/trail-map.component.ts
+++ b/src/app/dashboard/trail-map.component.ts
@@ -5,7 +5,7 @@ import { AgmCoreModule } from '@agm/core';
 import 'rxjs/add/operator/map';
 
 @Component({
-  templateUrl: 'map.component.html',
+  templateUrl: 'trail-map.component.html',
 })
 export class TrailMapComponent implements OnInit {
 
diff --git a/src/assets/img/map-pin-lis.png b/src/assets/img/map-pin-lis.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd48a4ac0678a919c69fd62ab4f0d34f66063d83
GIT binary patch
literal 1773
zcmV<J1`_#+P)<h;3K|Lk000e1NJLTq000yK001%w1^@s6TzvZ`00004b3#c}2nYxW
zd<bNS00009a7bBm000*f000*f0cW4mQUCw|8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H125Lz}K~zYIot9f{Tvru_|Gm$dGjnEQduHtMy&h+jIhUF71Stst
zTG6N~MN~rVL#v`bKvaaF!W0S;kElhoNc4eAnl=at1ffFEmWBdt@k^}&4=GTU$d{N*
zn%J(KF`n^dCTA|^ws^3|crM3ox}^PZ)?WKNYp=ET+MB^cNZ0Q!6MbD^><*c+?yBpS
zZQ$*0Q9Os4nLjYV>9mfufzs(iTekgT9r)xAi$(cO!(eNUgFZpP?ZF_v7L6Kxg0R>n
z2oJK^**PzVwqe<9XiL*BKRYy34KPLk+6DvYOOc3M(zKGLY4>=;09I7hH=gY8uXX~p
zj-!D96;ySLQmK<2fpuNK|FyBPE%pImjd3gxprWSbX<{PM2E3stm*YNP$AuDOr2GAJ
z*ykhOGB+8Cn5&BN%jWG)Oe9{9$5&fH0zgm1VwRz4bxYUlwyxWGRW(kB!*0Wd1GI4D
zNP%=cz6;#aw8=-pVXGB*eq^M)rK)dHI(>8}&I0NBr%IZ3<*7ZfexSSCzM&{*cY#-v
z$=@d>sR?!}6mr)T<szLrCAK9nn++9Jb?y_vAORqeF<ML}mv#-VC6n(+EoJh`=;$ix
zdZuFr0Z=BB{mY&(y*xU)N~)@I05DxQXc9FoP$bD<^Yb%aKsGaTNs**-<9o_5A|_+U
zH~`okPK>~q=>=<uOSIa>IRId$Uial4=LE;L&uu^(kPiYffZIDeD>@D=V2}fVe>;9n
za;a7elBRw90A_D(2UvGq0Pu4F;EXK|iOtFU(fWE{f#_VPECbt3WZiK>4NqdC2mx5-
z0C0%0zug%OHnpR-t5v*QDkU~=+?b|xI@$^}9Or>o%H?q5`-|alc~}&uw*QvRj{ZB5
zXget!pdSnj)GC@*a?<HZ8Xpfd0E@}w#Su}Y<FZT_Zo93rp{kb%5O$NXq9{|3<@0yF
zR4NIr-kg+W{A6&@$OHnG1UxPJe9skXwRbsVBO%UhB6>C;2v4)w*_;25iK2`YRkfhD
zoS41ij$n|c<8h;^>m@stIzyUvr&o*t0G6)bT~yWbNm<^vZJm^5`s?`k&9bJwPwDjS
zo<IPgOy*Qc(>5QCM4W?q<NaM-w63b<x~4t6KU7uKlBUi4<M82|y5GMq^oS(U`-)Ps
zb^YG`p@2}+v~Sfkt@5jpk?NR7^94W&NuvKMN}kf`L;FGjfU?<sL)V|H>3Z#_!^8E2
zN7BCC*H<kn%HwS%(kf5HVkdlz#YJF!LXw2Z-rn%BK%l;0n!dbk@7i6i*TvJ3NPk;X
z*!3)(mO%7t01vj#IYhNO;C^Lg#dm&d%h%9fN+hl~0SREx_0Jf<7dX*JWX_d+oL|3g
zn&#nLZm^;FS0b^zTa=W|j+RXGLfN+Ua~m773$RC{QH+Y7bsOc374|9ujJezWFq1iM
znC9&F*Vc~4uUrX!uTWq?#xU#+g9{*Mnvp#)$c&XlN~fiwWxaae@^bgzD-{61peW+Y
zkqEd4i~tmE8;`84>?ZZTt}Z9Y`JcJrx}W>m#zt2I1^}P$>9N8d-njruj)S`v7qMtr
z0005Nll}c$13usLe9f{>KfkfjRFEfv!D=U5l?c~N6Cb;N9W(X%uKughs2LT63v70F
ziCe(<($1e6@=mShH(VDE5e(Nwg$NstgJ+6GWUgMt<vp;J-;eLaVw*9?c^m-5vg@`L
z_cMipf6cOxkR&Wy78XnsZ&fO=Tdvw(LBJbhW2GL(9%8v%2>|eJBC&*9cyTqxkSNl7
z$)r=(w8^Hwyq8SQ3AYIQs4P=nQOMNwf41(92Y~5^dwM#)ms=&oIi8Be@Mb)Yeo=&v
z^B3EILz48}9}f<0-h0Tq^MnNf-|X$hax#f;^z|Xg`S#0zv5T#?4A?m-w*C5lOfzty
zTn=3`O%~uB!=i|LLLnTNW!OXr@}^QZV4A%wm#en{0f0tFW%TqsWH`>JZK4DNOh02M
z{G9tcx=r*aHb4K_jvjgmrBW{d@VYM^V{>z7T9sbMwIQ#0&N$9gC-we7)BGcVN{5+w
zwy>~p%RrXPmB84mZ4*Q<c&#~T%Yf^iZ(qfK`{98D15*I<do&l>>}>8s1KISn4dCZ{
zRKM8I{$LLQz;Vt3umF@{n!ou#YYq}hrG7{0^x1>#yl<g)IRnSpJjm#OOa=xlVeW57
P00000NkvXXu0mjf;dfYQ

literal 0
HcmV?d00001