Develop (#73)

Merge from Develop to Master 
- Lot's of small and some bigger fixes
- New advanced search (still in beta)
- Layout changes

Dockerfile

@@ -3,7 +3,7 @@ FROM node:10-alpine
 RUN apk update
 RUN apk add --no-cache g++ gcc libgcc libstdc++ linux-headers make python git
 
-RUN git clone --depth 1 -b master https://github.com/slsfi/digital_edition_web.git
+RUN git clone --depth 1 -b develop https://github.com/slsfi/digital_edition_web.git
 
 WORKDIR /digital_edition_web
 
@@ -20,7 +20,7 @@ RUN mkdir www
 RUN npm install
 RUN npm install cheerio
 RUN npm install rev-hash
-RUN npm install -g ionic
+RUN npm i -g @ionic/cli
 RUN npm i -g cordova
 RUN npm i -g native-run
 RUN npm i -g @sentry/browser

package.json

@@ -6,6 +6,7 @@
     "scripts": {
         "build": "ionic-app-scripts build",
         "watch": "ionic-app-scripts watch",
+        "start": "ionic-app-scripts serve --wwwDir",
         "serve:before": "watch",
         "emulate:before": "build",
         "deploy:before": "build",
@@ -53,8 +54,9 @@
         "ionic-plugin-deeplinks": "1.0.19",
         "ionicons": "~3.0.0",
         "leaflet": "^1.4.0",
+        "lodash": "^4.17.15",
         "ngx-drag-scroll": "1.7.9",
-        "ngx-pinch-zoom": "^1.2.3",
+        "ngx-pinch-zoom": "^2.4.4",
         "ngx-sharebuttons": "^3.0.0",
         "rev-hash": "^3.0.0",
         "rxjs": "5.5.11",