v1.2.0 (#29)

* better translations * updated apollo-angular * updated angular to v10 * updated angular material * updated deps * updated major deps * removed custom-webpack * better translations * #14 - close button is overlapped by some elements * #24 - tweaks to the detail card sidebar * v1.1.1 * pointing dev www to dev api * first implementation of openstreetmap nodes * first implementation of osmPois shown on the map, first implementation of getPhotos, added sessionId to the request headers * better format for current location * photos and todos * tweaks to the OSM data handling, added map loader * minor tweaks; using nearby POis for populating the sidebar * minor tweaks * added drinking-water pin * POI detail card * fixed bug due to missing check on FB SDK * fixed distance pipe * slicing items in sidebar * less prominent text * loading osm nodes only under a certain threshold * responsive detail card for osm items * increased poi detail card title's dimension * minor improvements, list of items on cluster click (#11) * added call link to shelters (#22) * v1.2.0
WeClimb-it · Aug 14, 2020 · 2306951 · 2306951
1 parent faefcdd
commit 2306951
Show file tree

Hide file tree

Showing 49 changed files with 1,060 additions and 218 deletions.
diff --git a/design/svg/drinking-water/drinking-water-pin.svg b/design/svg/drinking-water/drinking-water-pin.svg
diff --git a/design/svg/pins/crag-pin.svg b/design/svg/pins/crag-pin.svg
diff --git a/design/svg/pins/default-pin.svg b/design/svg/pins/default-pin.svg
diff --git a/design/svg/pins/event-pin.svg b/design/svg/pins/event-pin.svg
diff --git a/design/svg/pins/place-pin.svg b/design/svg/pins/place-pin.svg
diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wci-frontend",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",

diff --git a/frontend/src/_colors.scss b/frontend/src/_colors.scss
@@ -13,3 +13,4 @@ $cragPinColor: #3c40c6;
 $shelterPinColor: #bb6328;
 $placePinColor: #f53b57;
 $eventPinColor: #ffcd03;
+$drinkingWaterPinColor: #14c0ff;
diff --git a/frontend/src/_common.scss b/frontend/src/_common.scss
@@ -9,3 +9,4 @@ $headerHeight: 160px;
 $mobileBreakpointWidth: 1020px;
 $smallScreenBreakpointWidth: 1200px;
 $hugeScreenBreakpointWidth: 1670px;
+$detailCardSmallWidth: 313px;
diff --git a/frontend/src/_mixins.scss b/frontend/src/_mixins.scss
@@ -114,3 +114,37 @@
     }
   }
 }
+
+@mixin poiCategoryBadge {
+  position: relative;
+  float: left;
+  color: white;
+  width: 14px;
+  height: 20px;
+  line-height: 20px;
+  text-align: center;
+  font-size: 13px;
+  font-weight: 700;
+  padding: 3px 6px 3px 6px;
+  border-radius: 90px;
+
+  &.crag {
+    background: $cragPinColor;
+  }
+  &.hike {
+    background: $hikePinColor;
+  }
+  &.shelter {
+    background: $shelterPinColor;
+  }
+  &.event,
+  &.competition {
+    background: $eventPinColor;
+  }
+  &.place {
+    background: $placePinColor;
+  }
+  &.drinking-water {
+    background: $drinkingWaterPinColor;
+  }
+}
diff --git a/frontend/src/app/app-routing.module.ts b/frontend/src/app/app-routing.module.ts
@@ -41,6 +41,8 @@ const routes: Routes = [
   // Not supported yet
   // { path: 'news/:slug', component: DetailComponent, data: { type: ContentType.ONE_NEWS, isFloatingContent: true } },
 
+  { path: 'pois/:nodeId', component: DetailComponent, data: { type: ContentType.OSM_NODE, isFloatingContent: true } },
+
   { path: 'search/:query', component: EntitiesListComponent, data: { type: ContentType.SEARCH } },
   { path: 'search/:query/page/:page', component: EntitiesListComponent, data: { type: ContentType.SEARCH } },
 

diff --git a/frontend/src/app/app.component.html b/frontend/src/app/app.component.html
@@ -36,8 +36,8 @@
         Privacy
       </button>
       <script type="text/javascript">
-        (function(w, d) {
-          var loader = function() {
+        (function (w, d) {
+          var loader = function () {
             var s = d.createElement('script'),
               tag = d.getElementsByTagName('script')[0];
             s.src = 'https://cdn.iubenda.com/iubenda.js';
@@ -83,6 +83,8 @@
       </ng-container>
     </mat-menu>
   </div>
+
+  <!-- The map -->
   <div class="map">
     <div class="header-container">
       <wci-header
@@ -94,29 +96,39 @@
       ></wci-header>
     </div>
     <wci-map
+      *ngIf="currentLocation && userLocation"
       [zoom]="zoom"
       [centerLocation]="currentLocation"
       [userLocation]="userLocation"
       [pois]="nearbyPois"
+      [osmPois]="nearbyOsmPois"
+      [loadingOsmData]="isOsmNearbyLoading"
+      [loadingWciData]="isNearbyLoading"
       (ready)="onMapReadyOrUpdate($event)"
       (update)="onMapReadyOrUpdate($event)"
     ></wci-map>
   </div>
+
+  <!-- The sidenav -->
   <div class="sidenav" fxShow="false" fxShow.gt-sm>
     <wci-sidebar
-      [loading]="isLatestLoading"
+      [loading]="isNearbyLoading"
       [currentLocation]="currentLocation"
-      [pois]="latestPois"
+      [pois]="nearbyPois"
       (sectionSelected)="onSectionSelected($event)"
       (poiSelected)="onPoiSelected($event)"
     ></wci-sidebar>
   </div>
+
+  <!-- The content container -->
   <div class="content" *ngIf="showContent && !isFloatingContent">
     <div class="section">
       <router-outlet></router-outlet>
     </div>
   </div>
 </div>
+
+<!-- The floating content container -->
 <ng-container *ngIf="showContent && isFloatingContent">
   <router-outlet></router-outlet>
 </ng-container>