Update dependency @types/node to v24.2.0

Co-authored-by: soraefir
Co-authored-by: sora-ext
Reviewed-on: #163

.gitignore

@@ -6,6 +6,7 @@ db/
 .yarn/
 public/*.js
 public/*.map
+public/*.css
 .yarnrc.yml
 .pnp*
 build/

Dockerfile

@@ -5,8 +5,10 @@ WORKDIR /usr/src/app
 # Install app dependencies
 # A wildcard is used to ensure both package.json AND package-lock.json are copied
 # where available (npm@5+)
-COPY package*.json ./
+COPY *.json ./
+COPY src ./src
 RUN yarn
+RUN yarn build
 # If you are building your code for production
 # RUN npm ci --only=production
 # Bundle app source

package.json

@@ -4,11 +4,12 @@
     "description": "Open Travel Mapper",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",
-        "build": "yarn build-server && yarn build-client",
+        "build": "yarn build-server && yarn build-client && yarn build-style",
+        "build-style": "esbuild src/style/index.css --outfile=public/index.css --bundle --minify ",
         "build-client": "esbuild src/client/main.ts --outfile=public/main.js --tree-shaking=true  --bundle --minify --sourcemap --tsconfig=tsconfig-client.json",
         "build-server": "esbuild src/server/**/*.ts --outdir=build --platform=node --format=cjs",
         "start": "node build/main.js",
-        "demon": "nodemon -e ts,js,pug --watch src --watch template --watch router --exec \"yarn build && yarn start\""
+        "demon": "nodemon -e ts,js,css --watch src --watch template --watch router --exec \"yarn build && yarn start\""
     },
     "repository": {
         "type": "git",
@@ -19,20 +20,14 @@
     "dependencies": {
         "@fastify/leveldb": "^6.0.0",
         "@fastify/static": "^8.0.0",
-        "@fastify/view": "^10.0.0",
-        "@prettier/plugin-pug": "^3.0.0",
-        "@types/node": "^22.13.5",
+        "@fastify/view": "^11.0.0",
+        "@types/node": "^24.0.0",
         "esbuild": "^0.25.0",
         "fastify": "^5.2.1",
         "jsdom": "^26.0.0",
-        "leaflet": "^1.9.4",
         "nodemon": "^3.0.1",
         "prettier": "^3.5.2",
         "pug": "^3.0.2",
-        "undici": "^7.3.0",
-        "vue": "2",
-        "vue-multiselect": "2",
-        "vue-textarea-autosize": "^1.1.1",
-        "vue2-leaflet": "^2.7.1"
+        "undici": "^7.3.0"
     }
-}
+}

src/client/api.ts

@@ -1,4 +1,4 @@
-export const throttle = (func: () => void, wait: number) => {
+export const throttle = (func: (...args: any[]) => any, wait: number) => {
     var lastTime = 0;
     var timeoutId: ReturnType<typeof setTimeout> | undefined;
     var lastArgs: any[];
@@ -41,20 +41,25 @@ export const load = (id: string) =>
             return res;
         });
 
-export const save = (id: string, v: journey) =>
-    fetch("/api/" + id, { method: "post", body: JSON.stringify(v) })
+var version_add = 1
+export const save = async (id: string, v: journey) => {
+    let body = JSON.parse(JSON.stringify(v))
+    body.version +=version_add;
+    return fetch("/api/" + id, { method: "post", body: JSON.stringify(body) })
         .then((res) => {
             if (!res.ok) throw new Error("Error " + res.statusText);
             return res.json();
         })
         .then((_res) => {
+            version_add+=1;
             console.log("Saved...");
         });
+    }
 
 export const query_nominatim = (
     q: string,
     bb: any,
-    f: (v: string) => Boolean = () => true
+    f: (v: NominatimResult) => Boolean = () => true
 ) => {
     if (q.length == 0) return Promise.resolve([])
     let url = new URL("/api/place/" + q, window.location.origin);
@@ -124,7 +129,7 @@ export const icon_type = (item: string | NominatimResult): string => {
             "place_of_worship",
             "attraction",
             "information",
-            "university", "theatre", "opera"
+            "university", "science_park", "theatre", "opera"
         ],
         mountain: ["peak", "viewpoint"],
         parking: ["parking"],
@@ -141,7 +146,7 @@ export const icon_type = (item: string | NominatimResult): string => {
             "nature_reserve",
         ],
         "dice-five": ["water_park", "theme_park", "casino"],
-        "": ["?", "neighbourhood", "quarter", "highway"],
+        "": ["?", "neighbourhood", "quarter", "highway", "place"],
     };
 
     for (let k in types) {
@@ -150,3 +155,13 @@ export const icon_type = (item: string | NominatimResult): string => {
     console.log(item.display_name, item.category, item.type);
     return "question";
 };
+
+export const get_filter = function (f: string) {
+    switch (f) {
+        case "hotel": return is_hotel_type;
+        case "restaurant": return is_restauration_type;
+        case "place": return is_attraction_type;
+        case "other":
+        default: return () => true;
+    }
+}

src/client/helper/api.ts

@@ -0,0 +1,96 @@
+import { getGeoLine } from "../types/geom";
+import * as api from "../api";
+
+const filter_existing = function (
+    tpe: "nominatim" | "travel",
+    leg: leg,
+    r: geoloc[]
+) {
+    switch (tpe) {
+        case "nominatim":
+            return r.filter((e) => {
+                if (leg.hotel && leg.hotel.osm_id == e.osm_id) return false;
+                if (leg.places.restaurants.find((i) => i.osm_id == e.osm_id))
+                    return false;
+                if (leg.places.activities.find((i) => i.osm_id == e.osm_id))
+                    return false;
+                return true;
+            });
+        case "travel":
+            console.log(r);
+            return r.filter((e) => {
+                if (
+                    leg.travel.find(
+                        (i) =>
+                            `${(e as any).from}->${(e as any).to}` ==
+                            `${(i as any).from}->${(i as any).to}`
+                    )
+                )
+                    return false;
+                return true;
+            });
+    }
+};
+
+const process_results = function (tpe: "nominatim" | "travel", r: geoloc[]) {
+    switch (tpe) {
+        case "nominatim":
+            return r.map((rr) => {
+                rr.latlon = [
+                    parseFloat((rr as any).lat),
+                    parseFloat((rr as any).lon),
+                ];
+                rr.title = (rr as any).display_name.split(",")[0];
+                return rr;
+            });
+        case "travel":
+            console.log(r);
+            return r.map((el) => {
+                (el as any).path = getGeoLine(
+                    {
+                        lat: (el as any).from_geo.lat,
+                        lng: (el as any).from_geo.lon,
+                    },
+                    {
+                        lat: (el as any).to_geo.lat,
+                        lng: (el as any).to_geo.lon,
+                    },
+                    { dist: 2_500_000 }
+                ).map((v) => [v.lat, v.lng]);
+                (el as any).type = "flight";
+                return el;
+            });
+    }
+};
+
+var _search_set_results: (...arg: any[]) => any;
+export const set_search_set_results = function (f: (...arg: any[]) => any) {
+    _search_set_results = f;
+};
+export const search_nominatim = api.throttle(
+    (
+        f: string,
+        q: string,
+        bb: [[number, number], [number, number]],
+        leg: leg
+    ) =>
+        api
+            .query_nominatim(q, bb, api.get_filter(f))
+            .catch((_err) => console.log(_err))
+            .then((r) => {
+                r = process_results("nominatim", r);
+                r = filter_existing("nominatim", leg, r);
+                _search_set_results(r);
+            }),
+    1000
+);
+
+export const search_flight = api.throttle(
+    (f: string, q: string, leg: leg) =>
+        api.query_flight(q).then((r) => {
+            r = process_results("travel", r);
+            r = filter_existing("travel", leg, r);
+            _search_set_results(r);
+        }),
+    3000
+);

src/client/helper/journey.ts

@@ -0,0 +1,41 @@
+import journey_wrapper from './types/wrapper';
+
+/* LIST HELPERS */
+export const filter_selected = function (journey: journey_wrapper, list: geoloc[], step: boolean) {
+    return list.filter((e) =>
+        step ? e.step == journey.sel_day : e.step >= 0,
+    );
+}
+
+export const filter_unselected = function (list: geoloc[]) {
+    return list.filter((e) => e.step == undefined || e.step < 0);
+}
+
+export const remove_item = function (list: geoloc[], idx: number) {
+    list[idx].step = -1;
+    list.splice(idx, 1);
+}
+
+
+/* JOURNEY ADD/RM ITEM HELPER */
+export const journey_add_place = function (journey: journey_wrapper, tpe: String, item: geoloc) {
+    switch (tpe) {
+        case 'hotel': return journey.leg_get().hotel = item;
+        case 'restaurant': return journey.leg_get().places.restaurants.push(item);
+        case 'place': return journey.leg_get().places.activities.push(item);
+        case 'other': return;
+        case 'flight': return journey.leg_get().travel.push(item);
+    }
+}
+
+export const journey_del_place = function (journey: journey_wrapper, tpe: String, idx: number) {
+    console.log(tpe)
+    switch (tpe) {
+        case "hotel": return journey.leg_get().hotel = null;
+        case "restaurants": return journey.leg_get().places.restaurants.splice(idx, 1);
+        case "activities": return journey.leg_get().places.activities.splice(idx, 1);
+        case "other": return;
+        case "flight": return journey.leg_get().travel.splice(idx, 1);
+        default: return true;
+    }
+}

src/client/helper/nav.ts

@@ -0,0 +1,49 @@
+import journey_wrapper from "../types/wrapper";
+
+var nav = {
+    scrollInterval: 0,
+    scrollDir: 'none',
+};
+
+
+const sideScroll = function (element: Element, direction: 'left' | 'right' | 'none', speed: number, step: number) {
+    nav.scrollDir = direction
+    if (direction == 'none') return;
+    nav.scrollInterval = setInterval(() => {
+        element.scrollLeft += (direction == 'left') ? -step : step;
+    }, speed);
+}
+
+export const focus_leg = function (journey: journey_wrapper, idx: number | null = null) {
+    const c = document.querySelector('.scroll-content.nav-leg')!!
+    console.log(idx, c, journey)
+    const item = c.children[(idx != null ? idx : journey.sel_leg) + 1];
+    c.scrollLeft = (item as any).offsetLeft + ((item as any).offsetWidth / 2) - (c as any).offsetWidth / 2
+}
+
+export const focus_day = function (journey: journey_wrapper, idx: number | null = null) {
+    const c = document.querySelector('.scroll-content.nav-day')!!
+    console.log(idx, c, journey)
+    const item = c.children[(idx != null ? idx : journey.sel_day) + 1];
+    c.scrollLeft = (item as any).offsetLeft + ((item as any).offsetWidth / 2) - (c as any).offsetWidth / 2;
+    //focus_leg(journey) // We dont render both navs anymore
+}
+
+export const nav_mousemove = function (e: PointerEvent) {
+    if (e.pointerType != 'mouse') return;
+    const c = (e.target as any).closest('.scroll-content') || (e.target as any).firstChild;
+    const left = e.pageX - c.getBoundingClientRect().left;
+    const newDir =
+        left < c.offsetWidth * 0.1 ? 'left' :
+            (left > c.offsetWidth * 0.9 ? 'right' : 'none')
+    if (!nav.scrollInterval || nav.scrollDir != newDir) {
+        if (nav.scrollInterval) clearInterval(nav.scrollInterval)
+        sideScroll(c, newDir, 25, 10);
+    }
+}
+export const nav_mouseleave = function (_e: PointerEvent) {
+    clearInterval(nav.scrollInterval);
+    nav.scrollDir = 'none'
+    nav.scrollInterval = 0
+}
+

src/client/old.js

@@ -2,7 +2,10 @@
 import * as api from "./api";
 import journey_wrapper from "./types/wrapper";
 import { migrator } from "./types/migration";
-import { getGeoLine } from "./types/geom";
+import { journey_add_place, journey_del_place } from "./helper/journey";
+import { search_nominatim, search_flight } from "./helper/api";
+import { focus_day, focus_leg, nav_mouseleave, nav_mousemove } from "./helper/nav";
+import { set_search_set_results } from "./helper/api";
 
 Vue.component("l-map", window.Vue2Leaflet.LMap);
 Vue.component("l-tile-layer", window.Vue2Leaflet.LTileLayer);
@@ -12,10 +15,6 @@ Vue.component("l-popup", window.Vue2Leaflet.LPopup);
 Vue.component("l-tooltip", window.Vue2Leaflet.LTooltip);
 Vue.component("l-polyline", window.Vue2Leaflet.LPolyline);
 Vue.component("l-control-scale", window.Vue2Leaflet.LControlScale);
-// Vue.component("multiselect", window.VueMultiselect.default);
-Vue.use(window.VueTextareaAutosize);
-
-var first_boot = true
 
 const app = new Vue({
   el: "#app",
@@ -24,13 +23,18 @@ const app = new Vue({
     journey: new journey_wrapper(window.location.pathname.split("/").pop() || String.gen_id(16)),
     map_override: { active: false, elements: [] },
     query: {
-      type: "", res: [], load: false, sub: false,
+      type: "", query: "", res: [], load: false, sub: false, note: false, drawer: false, addmarker: false,
     },
-    leg_nav: {
-      scrollInterval: null,
-      scrollDir: null
+    useDay: false,
+    toast: {
+      show: false,
+      title: '',
+      desc: '',
+      special: '',
+      acceptText: '',
+      cancelText: '',
+      func: () => { },
     },
-    impexp: "",
     lang: {
       format: "ddd D MMM",
       formatLocale: {
@@ -43,6 +47,7 @@ const app = new Vue({
     start_journey: function () { window.location.href = "/" + this.journey.id },
 
     compute_bb: function () {
+      if (!this.$refs.map) return undefined
       const bounds = this.$refs.map.mapObject.getBounds();
       return [[bounds.getSouthWest().lng, bounds.getSouthWest().lat],
       [bounds.getNorthEast().lng, bounds.getNorthEast().lat]]
@@ -64,14 +69,13 @@ const app = new Vue({
               <polygon points="4,12 20,12 12,36" fill="${fcolor || item.color || "blue"}" /></svg>`
     },
     generate_icon: function (item, fcolor = "", styling = "", classes = "") {
-      return `<i class="fa fa-${api.icon_type(item) || "star"} fa-2x ${classes}"  style="${styling}; color:${fcolor || "white"}; text-align:center; align-content:center; width:32px; height:32px;"></i>`;
+      return `<i class="fa fa-${api.icon_type(item) || "star"} fa-2x ${classes}"  style="${styling}; color:${fcolor || "white"}; text-align:center; align-content:center;"></i>`;
     },
 
-
-    import_data: function () {
+    import_data: function (v) {
       this.journey.data = Object.assign(
         {},
-        JSON.parse(this.impexp.toDecoded()),
+        JSON.parse(v.toDecoded()),
       );
       this.journey.data.main.forEach((e) => {
         if (e.date_range) {
@@ -80,77 +84,47 @@ const app = new Vue({
         }
       });
     },
-    export_data: function () {
-      this.impexp = JSON.stringify(this.journey.data).toEncoded();
-    },
-    filter_selected: function (list, step) {
-      return list.filter((e) =>
-        step ? e.step == this.journey.sel_day : e.step >= 0,
-      );
-    },
-    filter_unselected: function (list) {
-      return list.filter((e) => e.step == undefined || e.step < 0);
-    },
-    remove_item: function (list, idx) {
-      list[idx].step = -1;
-      list.splice(idx, 1);
-    },
-    log: function (e) {
-      console.log(e);
-    },
-    place_delete: function (f, idx) {
-      switch (f) {
-        case "hotel": return this.journey.leg_get().hotel = null;
-        case "restaurant": return this.journey.leg_get().places.restaurants.splice(idx, 1);
-        case "activities": return this.journey.leg_get().places.activities.splice(idx, 1);
-        case "other": return;
-        case "flight": return this.journey.leg_get().travel.splice(idx, 1);
-        default: return true;
-      }
-    },
-    get_filter: function (f) {
-      switch (f) {
-        case "hotel": return api.is_hotel_type;
-        case "restaurant": return api.is_restauration_type;
-        case "place": return api.is_attraction_type;
-        case "other":
-        default: return () => true;
-      }
+
+    toast_reset: function () {
+      this.toast.show = false;
+      this.toast.title = '';
+      this.toast.desc = ''
+      this.toast.special = '';
+      this.toast.acceptText = ''
+      this.toast.cancelText = ''
+      this.toast.func = () => { }
     },
 
-    search_nominatim: function (f) {
-      return (q) => api.query_nominatim(q, this.compute_bb(), this.get_filter(f)).catch((_err) => []).then((r) => {
-        r.forEach((rr) => {
-          rr.latlon = [parseFloat(rr.lat), parseFloat(rr.lon)];
-          rr.sname = rr.display_name.split(",")[0];
-        });
-        r = r.filter(e => {
-          if (this.journey.leg_get().hotel && this.journey.leg_get().hotel.osm_id == e.osm_id) return false;
-          if (this.journey.leg_get().places.restaurants.find(i => i.osm_id == e.osm_id)) return false;
-          if (this.journey.leg_get().places.activities.find(i => i.osm_id == e.osm_id)) return false;
-          return true
-        })
-        this.query.load = false;
-        this.query.res = r;
-        return r
-      });
+    toast_impexp: function (is_import) {
+      this.toast.show = true;
+      this.toast.title = is_import ? 'Import' : 'Export';
+      this.toast.desc = ''
+      this.toast.special = JSON.stringify(this.journey.data).toEncoded();
+      this.toast.acceptText = is_import ? 'load' : ''
+      this.toast.cancelText = 'cancel'
+      this.toast.func = () => { this.import_data(this.toast.special); this.toast_reset(); }
     },
-    search_travel: function (f) {
-      return (q) => api.query_flight(q).then((r) => {
-        r.forEach(el => {
-          el.path = getGeoLine(
-            { lat: el.from_geo.lat, lng: el.from_geo.lon },
-            { lat: el.to_geo.lat, lng: el.to_geo.lon }, { dist: 2_500_000 }).map(v => [v.lat, v.lng])
-          el.type = "flight";
-        });
-        r = r.filter(e => {
-          if (this.journey.leg_get().travel.find(i => `${i.from}->${i.to}` == `${e.from}->${e.to}`)) return false;
-          return true
-        })
-        this.query.load = false;
-        this.query.res = r;
-        return r;
-      });
+
+    search_set_results(r) {
+      this.query.load = false;
+      this.query.res = r;
+      return r
+    },
+    search_set_clear(keep_drawer) {
+      this.query.res = [];
+      this.query.note = false;
+      this.query.type = null;
+      this.query.addmarker = false;
+      this.query.sub = false;
+      this.query.drawer = keep_drawer;
+      setTimeout(() => this.$refs.map.mapObject.invalidateSize(), 500);
+    },
+    search_set_active: function (is_notes, tpe) {
+      this.query.drawer = true;
+      this.query.note = is_notes;
+      this.query.type = !is_notes ? tpe : null;
+      this.query.load = !is_notes;
+      setTimeout(() => this.$refs.map.mapObject.invalidateSize(), 500);
     },
 
     drawer_hover_item: function (item) {
@@ -167,92 +141,80 @@ const app = new Vue({
     },
 
     drawer_click_item: function (item) {
-      const tpe = this.query.type;
-      this.query.res = [];
-      this.query.type = null;
-      this.query.sub = false;
-      this.drawer_hover_item()
+      const tpe = this.query.type
+      this.search_set_clear(item ? true : false);
+      this.drawer_hover_item();
       if (item) {
         item.step = -1;
-        switch (tpe) {
-          case 'hotel': return this.journey.leg_get().hotel = item;
-          case 'restaurant': return this.journey.leg_get().places.restaurants.push(item);
-          case 'place': return this.journey.leg_get().places.activities.push(item);
-          case 'other': return;
-          case 'flight': return this.journey.leg_get().travel.push(item);
-        }
+        journey_add_place(this.journey, tpe, item)
       }
     },
 
-    search_active: function (q) {
-      const txt = q.target.value
-      this.query.load = true;
-      switch (this.query.type) {
-        case 'hotel': return this.search_hotel(txt);
-        case 'restaurant': return this.search_restaurant(txt);
-        case 'place': return this.search_place(txt);
-        case 'other': return this.search_other(txt);
-        case 'flight': return this.search_flight(txt);
+    search_active: function (_e) {
+      const tpe = this.query.type;
+      const query = this.query.query;
+      switch (tpe) {
+        case 'hotel':
+        case 'restaurant': ;
+        case 'place':
+        case 'other':
+          return search_nominatim(tpe, query, this.compute_bb(), this.journey.leg_get())
+
+        case 'flight':
+          return search_flight(tpe, query, this.journey.leg_get());
       }
     },
 
     search_enable: function (f) {
-      this.query.type = f;
-      const query_in = document.getElementById('query_input')
-
-      query_in.focus()
-      this.search_active({ target: query_in })
+      const is_notes = f == 'notes';
+      this.search_set_active(is_notes, f)
+      setTimeout(() => document.getElementById(is_notes ? 'query_note' : 'query_input').focus(), 500);
+      if (!is_notes) this.search_active()
     },
 
-
-    sideScroll: function (element, direction, speed, step) {
-      this.leg_nav.scrollDir = direction
-      if (direction == 'none') return;
-      this.leg_nav.scrollInterval = setInterval(() => {
-        element.scrollLeft += (direction == 'left') ? -step : step;
-      }, speed);
+    refreshTextAreaHeight: function (e) {
+      e.target.style['height'] = 'auto';
+      e.target.style['height'] = e.target.scrollHeight + 'px';
+      e.target.style['max-height'] = "100%";
     },
 
-    keyboardEvent(e) {
-      if (e.which === 13) {
+    onMapClick(e) {
+      if (this.query.addmarker) {
+        const newMarker = {
+          latlon: [e.latlng.lat, e.latlng.lng],
+          sname: this.query.query,
+          type: this.query.type,
+        };
+        this.drawer_click_item(newMarker)
       }
     },
-    nav_mousemove(e) {
-      const c = document.querySelector('.scroll-content')
-      const newDir =
-        e.pageX < c.offsetWidth * 0.1 ? 'left' :
-          (e.pageX > c.offsetWidth * 0.9 ? 'right' : 'none')
-      if (!this.leg_nav.scrollInterval || this.leg_nav.scrollDir != newDir) {
-        if (this.leg_nav.scrollInterval) clearInterval(this.leg_nav.scrollInterval)
-        this.sideScroll(c, newDir, 25, 10);
-      }
-    },
-    nav_mouseleave(e) {
-      clearInterval(this.leg_nav.scrollInterval);
-      this.leg_nav.scrollDir = 'none'
-      this.leg_nav.scrollInterval = null
-    },
   },
   created: function () {
-    this.search_hotel = api.throttle(this.search_nominatim("hotel"), 1000)
-    this.search_restaurant = api.throttle(this.search_nominatim("restaurant"), 1000)
-    this.search_place = api.throttle(this.search_nominatim("place"), 1000)
+    set_search_set_results(this.search_set_results);
+    this.nav_mouseleave = nav_mouseleave;
+    this.nav_mousemove = nav_mousemove;
+    this.focus_day = focus_day;
+    this.focus_leg = focus_leg;
+    this.place_delete = (tpe, idx) => journey_del_place(this.journey, tpe, idx);
+
     this.save_data = api.throttle(() => {
-      this.impexp = JSON.stringify(this.journey.data).toEncoded();
       api.save(this.journey.id, this.journey.data);
     }, 1000);
-    this.search_flight = api.throttle(this.search_travel("flight"), 2000)
+
+    this.pressed_prev = api.throttle(() => {
+      if (this.useDay) this.journey.day_prev();
+      else this.journey.leg_prev();
+    }, 250)
+    this.pressed_next = api.throttle(() => {
+      if (this.useDay) this.journey.day_next();
+      else this.journey.leg_next();
+    }, 250)
 
     window.addEventListener("keydown", (e) => {
       switch (e.key) {
-        case "ArrowLeft":
-          this.journey.day_prev();
-          break;
-        case "ArrowRight":
-          this.journey.day_next();
-          break;
-        default:
-          console.log(e.key);
+        case "ArrowLeft": return this.pressed_prev()
+        case "ArrowRight": return this.pressed_next()
+        default: return console.log(e.key);
       }
     });
 
@@ -263,11 +225,9 @@ const app = new Vue({
   watch: {
     journey: {
       handler: function (ndata, odata) {
-        this.save_data();
+        if (this.edit_active) this.save_data();
       },
       deep: true,
     },
   },
 });
-
-

src/client/types/format.ts

@@ -6,6 +6,8 @@ declare global {
         lng: number
     }
     interface geoloc {
+        title: string
+        osm_id: number
         latlon: [number, number]
         notes: string
         step: -1
@@ -22,7 +24,7 @@ declare global {
         day_title: string[]
         date_range: [Date, Date] | null
         map: map
-        travel: unknown[]
+        travel: geoloc[]
         hotel: geoloc | null
         places: {
             restaurants: geoloc[]
@@ -33,19 +35,14 @@ declare global {
 
     interface journey {
         fmt_ver: number
+        version: number
         title: string
         main: leg[]
     }
 }
 
-const journey_template: journey = {
-    fmt_ver: 1,
-    title: "New Journey",
-    main: [],
-}
-
 const leg_template: leg = {
-    title: "New Leg",
+    title: "",
     day_title: [],
     map: { zoom: 2, center: { lng: 0, lat: 0 } },
     travel: [],
@@ -54,6 +51,13 @@ const leg_template: leg = {
     notes: "",
     date_range: null
 }
+const journey_template: journey = {
+    fmt_ver: 1,
+    version: 0,
+    title: "New Journey",
+    main: [leg_template],
+}
+
 
 export { map, geoloc, leg, journey }
 export { journey_template, leg_template }

src/client/types/migration.ts

@@ -8,7 +8,9 @@ function migrate_A_to_0(e: journey): journey {
         v.day_title = v.day_title || (v as any).step_title;
         v.places.activities = v.places.activities || (v as any).places.places;
         v.travel = v.travel || [];
+        v.day_title = typeof (v.day_title) == "string" ? [v.day_title] : []
     })
+    e.version = e.version || 0;
     console.log(e)
     return e;
 }

src/client/types/wrapper.ts

@@ -1,3 +1,4 @@
+import './ext.ts'
 import { journey_template, leg_template } from "./format"
 
 const date_day_diff = (d0: Date, d1: Date): number =>
@@ -29,6 +30,7 @@ class journey_wrapper {
     rm_leg(idx: number): void {
         this.data.main.splice(idx, 1);
         if (this.sel_leg == idx) this.leg_prev();
+        if (this.sel_leg > this.data.main.length - 1) this.leg_next();
     }
     tot_len(): number | "?" {
         if (this.leg_count() == 0) return 0;
@@ -55,6 +57,10 @@ class journey_wrapper {
         this.sel_leg = Math.max(this.sel_leg - 1, 0);
         this.sel_day = 0;
     }
+
+    day_sel(idx: number): void {
+        this.sel_day = idx;
+    }
     day_next() {
         this.sel_day += 1
         if (this.sel_day > this.leg_len() - 1) {
@@ -77,6 +83,13 @@ class journey_wrapper {
             }
         }
     }
+    day_cycle() {
+        if (this.sel_day >= this.leg_len() - 1) {
+            this.sel_day = 0;
+        } else {
+            this.day_next()
+        }
+    }
     date_sel(): string {
         if (this.sel_day < 0) return "?";
         let leg = this.leg_get()

src/server/api.ts

@@ -60,31 +60,27 @@ export default function (server, opts, done) {
     if (req.params.id == undefined)
       return reply.code(400).send({ error: "No ID query parameter" });
 
-    server.level.db.get(req.params.id, (err, val) => {
-      if (err) {
+    return server.level.db.get(req.params.id)
+    .then(r=> reply.send(JSON.parse(r)))
+    .catch(err=>{
         console.warn(err);
-        reply.code(500).send();
-      } else {
-        reply.send(JSON.parse(val));
-      }
-    });
-    return reply;
+        return reply.code(500).send({error: "Error with DB"});
+    })
   });
 
   server.post("/:id", async (req, reply) => {
     if (req.params.id == undefined)
       return reply.code(400).send({ error: "No ID query parameter" });
 
-    server.level.db.put(req.params.id, req.body, (err) => {
-      if (err) {
-        console.warn(err);
-        reply.code(500).send({ error: "Error with DB" });
-      } else {
-        reply.send({ content: "ok" });
-      }
-    });
-    return reply;
-  });
+    return server.level.db.get(req.params.id).then(r=>JSON.parse(r)).then(r=>r.version||-1).catch(_=>-1).then(db_version=>{
+      if(db_version+1 == req.body.version || db_version == -1)
+        return server.level.db.put(req.params.id, req.body)
+          .then(_=>reply.send({ content: "ok" }))
+          .catch(_=>reply.code(500).send({ error: "Error with DB" }))
+        
+      return reply.code(409).send({error:"Too old version, please refresh."});
+      })
+  })
 
   done();
 };

src/server/api_nominatim.ts

@@ -15,6 +15,7 @@ export function nominatim_get_data(id: string, bb: string[][] | null = null): Pr
     const url = new URL("https://nominatim.openstreetmap.org/search");
     url.searchParams.append('format', 'jsonv2')
     url.searchParams.append('q', id)
+    url.searchParams.append('limit', '20')
     if (bb) {
         url.searchParams.append('viewbox', `${bb[0][0]},${bb[0][1]},${bb[1][0]},${bb[1][1]}`)
         url.searchParams.append('bounded', `1`)

src/server/main.ts

@@ -25,10 +25,10 @@ server.register(fastify_view, {
 
 server.register(api, { prefix: "/api" });
 
-server.get("/", (req, reply) => reply.view("/template/home.pug"));
-server.get("/:id", (req, reply) => reply.view("/template/journey.pug"));
-server.get("/view/:id", (req, reply) => reply.view("/template/view.pug"));
-server.get("/short/:id", (req, reply) => reply.view("/template/short.pug"));
+server.get("/", (req, reply) => reply.view("/src/template/home.pug"));
+server.get("/:id", (req, reply) => reply.view("/src/template/journey.pug"));
+server.get("/view/:id", (req, reply) => reply.view("/src/template/view.pug"));
+server.get("/short/:id", (req, reply) => reply.view("/src/template/short.pug"));
 
 server.listen({ port: 8080, host: "0.0.0.0" }, (err, address) => {
   if (err) throw err;

src/style/custom.css

@@ -0,0 +1,366 @@
+body {
+    background: var(--darkdark);
+    min-height: 100vh;
+    display: flex;
+    flex-direction: column;
+}
+
+main {
+    flex: 1;
+}
+
+.leaflet-control-attribution,
+.leaflet-popup-close-button {
+    visibility: hidden;
+}
+
+.p-abs {
+    position: absolute;
+}
+
+.display-none {
+    display: none;
+}
+
+.col-0 {
+    flex: 0 0 0%;
+    max-width: 0%;
+    overflow: hidden;
+}
+
+.map-container,
+.drawer-container {
+    transition: flex 0.5s ease-in-out, max-width 0.5s ease-in-out;
+}
+
+.map-container {
+    min-width: 52px;
+    height: 100%;
+}
+
+.drawer-container {
+    height: 100%;
+    right: 0;
+    top: 0;
+    margin-left: 0;
+}
+
+.travel-path-icon {
+    margin-left: -12px;
+    margin-top: -32px;
+}
+
+.input {
+    max-height: 100%;
+}
+
+.ml-auto {
+    margin-left: auto;
+}
+
+.mr-auto {
+    margin-right: auto;
+}
+
+.input .mx-input {
+    height: 40px;
+}
+
+.h-100 {
+    height: 100%;
+}
+
+.h-0 {
+    height: 0%;
+    overflow: hidden;
+}
+
+.w-100 {
+    width: 100%;
+}
+
+.w-0 {
+    width: 0%;
+    overflow: hidden;
+}
+
+.map-menu {
+    position: absolute;
+    display: flex;
+    z-index: 1100;
+    right: 0;
+    flex-direction: column;
+    gap: 10px;
+    margin: 5px;
+}
+
+.map-menu-top {
+    top: 0;
+}
+
+.map-menu-bottom {
+    bottom: 0;
+}
+
+.map-menu-center {
+    top: 50%;
+}
+
+.padding-1 {
+    padding: 5px;
+}
+
+.map-menu-item {
+    background-color: var(--darkdark);
+    padding: 5px;
+    border-radius: 50%;
+    cursor: pointer;
+}
+
+.map-menu-item:hover {
+    background-color: var(--lightdark);
+}
+
+.map-menu-sub {
+    display: flex;
+    flex-direction: row-reverse;
+    gap: 5px;
+}
+
+.map-menu-item,
+.map-menu-sub-item {
+    background-color: var(--darkdark);
+    padding: 5px;
+    border-radius: 50%;
+    cursor: pointer;
+    float: right;
+    width: 42px;
+    height: 42px;
+    align-content: center;
+    text-align: center;
+}
+
+.vue2leaflet-map {
+    border-radius: var(--border-radius);
+}
+
+.leaflet-popup-content {
+    margin: 10px 20px !important;
+}
+
+.leaflet-popup>.leaflet-popup-content-wrapper {
+    border-radius: var(--border-radius);
+    width: 350px;
+}
+
+.leaflet-popup-button-group {
+    position: absolute;
+    top: 0;
+    right: 0;
+    display: flex;
+    flex-direction: row;
+    gap: 5px;
+    margin: 2px 6px;
+}
+
+.leaflet-popup-button-group>a {
+    cursor: pointer;
+}
+
+.leaflet-popup-button-group>a:hover {
+    cursor: pointer;
+    filter: brightness(150%);
+}
+
+.leaflet-popup-button-group>a>i {
+    font-size: 1em;
+}
+
+.query-result {
+    display: flex;
+    align-items: center;
+    border-radius: var(--border-radius);
+    cursor: pointer;
+}
+
+.query-result:hover {
+    filter: brightness(85%);
+}
+
+.scroll-content.list-group>.list-group-item {
+    display: none;
+}
+
+.list-group-item.placeholder-left.show.bg-dark,
+.list-group-item.placeholder-right.show.bg-dark {
+    background: var(--darkdark);
+}
+
+.list-group-item.placeholder-left.show {
+    margin-left: auto;
+    color: transparent;
+    cursor: default;
+    background: linear-gradient(to right, rgba(0, 0, 0, 0) 0%, var(--white) 50%);
+}
+
+.list-group-item.placeholder-right.show {
+    margin-right: auto;
+    color: transparent;
+    cursor: default;
+    background: linear-gradient(to left, rgba(0, 0, 0, 0) 0%, var(--white) 50%);
+}
+
+
+.scroll-content>.list-group-item.active,
+.scroll-content>.list-group-item.show {
+    display: inline-block;
+}
+
+.scroll-content>div:nth-child(2) {
+    border-top-left-radius: var(--border-radius);
+    border-bottom-left-radius: var(--border-radius);
+}
+
+.scroll-content>div:nth-last-child(3) {
+    border-top-right-radius: var(--border-radius);
+    border-bottom-right-radius: var(--border-radius);
+}
+
+.scroll-content>div:last-child {
+    border-radius: var(--border-radius);
+}
+
+.list-group-item.add {
+    position: absolute;
+    right: 0;
+}
+
+@media (min-width: 768px) {
+    .scroll-content.list-group>.list-group-item {
+        display: inline-block;
+    }
+
+    .scroll-content>.list-group-item.placeholder-left,
+    .scroll-content>.list-group-item.placeholder-right {
+        display: none;
+    }
+
+    .list-group-item.add {
+        position: relative;
+        right: 0;
+        margin-left: 1em;
+    }
+}
+
+.list-group {
+    display: flex;
+    overflow: auto;
+    white-space: nowrap;
+    scrollbar-width: none;
+    padding: 1rem 0rem;
+}
+
+.list-group-item>.text {
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+}
+
+.list-group-item.show {
+    min-width: 24px;
+}
+
+.list-group-item {
+    border: 1px solid var(--darkdark);
+    display: inline-block;
+    position: relative;
+    cursor: pointer;
+    text-align: center;
+    padding: .5rem .5rem;
+    max-width: calc(100% - 48px);
+    display: inline-block;
+}
+
+.list-group-item.bg-white:hover {
+    background: var(--blue);
+    /* filter: brightness(85%); */
+}
+
+.mx-datepicker {
+    width: 100% !important;
+}
+
+.overlay {
+    position: fixed;
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 0, 0, 0.5);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    z-index: 5000;
+}
+
+.popup {
+    padding: 20px;
+    border-radius: 10px;
+    box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+    z-index: 5001;
+}
+
+.button {
+    background-color: var(--lightlight);
+    border: 0;
+    border-radius: var(--border-radius);
+    color: var(--darkdark);
+    display: inline-block;
+    text-align: center;
+    text-decoration: none;
+    text-transform: uppercase;
+    font-weight: 600;
+    white-space: nowrap;
+    line-height: 1.2em;
+    padding: 8px 16px;
+    margin: 8px 16px;
+    font-weight: 600;
+    cursor: pointer;
+}
+
+.tooltip {
+    position: relative;
+    display: inline-block;
+    cursor: pointer;
+}
+
+.tooltip .tooltip-text {
+    visibility: hidden;
+    background-color: var(--white);
+    color: var(--darkdark);
+    text-align: center;
+    border-radius: var(--border-radius);
+    padding: 2px;
+    position: absolute;
+    z-index: 20;
+    bottom: 0%;
+    left: 0%;
+    margin-left: 0px;
+    opacity: 0;
+    transition: opacity 0.3s;
+    pointer-events: none;
+}
+
+.tooltip:hover .tooltip-text {
+    visibility: visible;
+    opacity: 1;
+}
+
+.smallbar {
+    z-index: 10;
+    position: absolute;
+    width: 100%;
+    top: 0;
+    display: flex;
+    flex-flow: row;
+    padding: 8px;
+    margin: 0 -12px;
+}

src/style/define.css

@@ -0,0 +1,19 @@
+:root {
+    --black: #030B12;
+    --darkdark: #0C1D2E;
+    --dark: #203A53;
+    --lightdark: #425F7C;
+    --light: #93A9BE;
+    --lightlight: #B6C5D5;
+    --white: #F0F3F7;
+    --orange: ##F5B97D;
+    --yellow: #F5F57D;
+    --green: #B9F57D;
+    --turquoise: #7DF5B9;
+    --blue: #7DB9F5;
+    --purple: #B97DF5;
+    --pink: #F57DB9;
+    --red: #F57D7D;
+
+    --border-radius: 3px;
+}

src/style/index.css

@@ -0,0 +1,13 @@
+@import './define.css';
+
+@import './module/input.css';
+@import './module/load_n_spin.css';
+@import './module/typography.css';
+@import './module/layout.css';
+@import './module/general.css';
+
+@import './custom.css';
+
+[v-cloak] {
+    display: none;
+}

src/style/module/general.css

@@ -0,0 +1,206 @@
+* {
+    box-sizing: border-box;
+}
+
+html,
+body,
+body,
+div,
+span,
+object,
+iframe,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p,
+blockquote,
+pre,
+abbr,
+address,
+cite,
+code,
+del,
+dfn,
+em,
+ins,
+kbd,
+q,
+samp,
+small,
+strong,
+sub,
+sup,
+var,
+b,
+i,
+dl,
+dt,
+dd,
+ol,
+ul,
+li,
+fieldset,
+form,
+label,
+legend,
+table,
+caption,
+tbody,
+tfoot,
+thead,
+tr,
+th,
+td,
+article,
+aside,
+figure,
+footer,
+header,
+hgroup,
+menu,
+nav,
+section,
+time,
+mark,
+audio,
+video {
+    background: transparent;
+    border: 0;
+    font-size: 100%;
+    margin: 0;
+    outline: 0;
+    padding: 0;
+    vertical-align: baseline;
+}
+
+article,
+aside,
+figure,
+footer,
+header,
+main,
+nav,
+section {
+    display: block;
+}
+
+*,
+*:before,
+*:after {
+    box-sizing: border-box;
+}
+
+
+*,
+*::after,
+*::before {
+    box-sizing: border-box;
+    outline: none;
+}
+
+body {
+    background-color: #fff;
+    min-height: 100%;
+    overflow-x: hidden;
+    position: relative;
+}
+
+p {
+    font-weight: normal;
+    margin-bottom: 1.5em;
+}
+
+img {
+    max-width: 100%;
+}
+
+strong {
+    font-weight: 600;
+}
+
+ul {
+    margin-bottom: 1em;
+}
+
+li {
+    list-style: none;
+    margin-bottom: 0.5em;
+}
+
+/**
+ *  BACKGROUND
+ */
+.bg-primary {
+    background-color: var(--blue);
+}
+
+.bg-dark {
+    background-color: var(--darkdark);
+}
+
+.bg-secondary {
+    background-color: var(--pink);
+}
+
+.bg-white {
+    background-color: var(--white);
+}
+
+.bg-success {
+    background-color: var(--green);
+}
+
+.bg-info {
+    background-color: var(--yellow);
+}
+
+.bg-warning {
+    background-color: var(--orange);
+}
+
+.bg-error {
+    background-color: var(--red);
+}
+
+.bg-gray {
+    background-color: var(--lightdark);
+}
+
+.bg-gray-light {
+    background-color: var(--lightlight);
+}
+
+
+.align {
+    align-items: center;
+    justify-content: center;
+}
+
+.fleft {
+    float: left;
+}
+
+.fright {
+    float: right;
+}
+
+.clearfix ::after {
+    clear: both;
+    content: "";
+    display: table;
+}
+
+.no-wrap {
+    white-space: nowrap;
+}
+
+.overflow-hidden {
+    overflow: hidden;
+}
+
+.rounded {
+    border-radius: var(--border-radius);
+}

src/style/module/input.css

@@ -0,0 +1,424 @@
+switch,
+input,
+textarea {
+    -webkit-appearance: none;
+    -moz-appearance: none;
+    appearance: none;
+    resize: none;
+}
+
+label {
+    display: block;
+    font-weight: normal;
+}
+
+input:-webkit-autofill {
+    box-shadow: 0 0 0 1000px #eceff1 inset;
+}
+
+.switch,
+.textarea,
+.input,
+.select {
+    border: 1px solid var(--white);
+    border-radius: var(--border-radius);
+    box-shadow: none;
+    display: inline-block;
+    font-weight: normal;
+    overflow: hidden;
+}
+
+.textarea :focus,
+.input :focus,
+.select :focus {
+    outline: none;
+}
+
+.textarea.has-error,
+.input.has-error,
+.select.has-error {
+    background: #eceff1;
+    border: 1px solid #e74c3c;
+    margin-bottom: 0;
+}
+
+.select {
+    background-color: #eceff1;
+    display: inline-block;
+    margin-right: 16px;
+    position: relative;
+}
+
+.select:last-child {
+    margin-right: 0;
+}
+
+.select-fullWidth {
+    display: block;
+    margin-left: 0;
+    margin-right: 0;
+    width: 100%;
+}
+
+.select select {
+    -webkit-appearance: none;
+    -moz-appearance: none;
+    appearance: none;
+    background-color: transparent;
+    border: 0;
+    border-radius: 0;
+    color: #272727;
+    display: block;
+    font-size: 16px;
+    line-height: 1.5em;
+    margin: 0;
+    padding: 8px 16px;
+    padding-right: 30px;
+    transition: background-color 0.2s ease-in-out;
+    width: 100%;
+}
+
+.select select:active,
+.select select:focus {
+    background-color: #fbfbfc;
+    border: 0;
+    outline: none;
+}
+
+.select select::-ms-expand {
+    display: none;
+}
+
+.select::after,
+.select::before {
+    background: #03a9f4;
+    content: "";
+    display: block;
+    height: 2px;
+    margin-top: 2px;
+    position: absolute;
+    right: 5px;
+    top: 50%;
+    -webkit-transform-origin: 1px;
+    transform-origin: 1px;
+    width: 10px;
+}
+
+.select::after {
+    -webkit-transform: rotate(-135deg);
+    transform: rotate(-135deg);
+}
+
+.select::before {
+    -webkit-transform: rotate(-45deg);
+    transform: rotate(-45deg);
+}
+
+.textarea {
+    background-color: #eceff1;
+    padding: 0;
+}
+
+.textarea-fullWidth {
+    display: block;
+    margin-left: 0;
+    margin-right: 0;
+    width: 100%;
+}
+
+.textarea textarea {
+    background: transparent;
+    border: 0;
+    color: #272727;
+    display: block;
+    font-family: "Lato", sans-serif;
+    font-size: 16px;
+    line-height: 1.5em;
+    margin: 0;
+    min-height: 120px;
+    padding: 8px 16px;
+    transition: background-color 0.2s ease-in-out;
+    width: 100%;
+}
+
+.textarea textarea::-webkit-input-placeholder {
+    color: #969da6;
+}
+
+.textarea textarea::-ms-input-placeholder {
+    color: #969da6;
+}
+
+.textarea textarea::placeholder {
+    color: #969da6;
+}
+
+.textarea textarea:focus,
+.textarea textarea:active {
+    background-color: #fbfbfc;
+    border: 0;
+    outline: none;
+}
+
+.checkbox {
+    margin-bottom: 8px;
+    position: relative;
+}
+
+.checkbox input[type="checkbox"] {
+    display: none;
+}
+
+.checkbox input[type="checkbox"]:checked::after {
+    -webkit-animation: checkboxAndRadioAnimation 0.25s;
+    animation: checkboxAndRadioAnimation 0.25s;
+    content: "";
+    -webkit-transform: scale(1) rotate(45deg);
+    transform: scale(1) rotate(45deg);
+}
+
+.checkbox input[type="checkbox"] {
+    display: block;
+    overflow: hidden;
+    padding-left: 30px;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.checkbox input[type="checkbox"]::before {
+    background-color: #eceff1;
+    border: 1px solid var(--white);
+    border-radius: var(--border-radius);
+    content: "";
+    display: inline-block;
+    height: 20px;
+    left: 0;
+    margin-top: -10px;
+    position: absolute;
+    top: 50%;
+    width: 20px;
+}
+
+.checkbox input[type="checkbox"]::after {
+    border-bottom: 3px solid #03a9f4;
+    border-right: 3px solid #03a9f4;
+    display: block;
+    height: 12px;
+    left: 11px;
+    margin-left: -4px;
+    margin-top: -7px;
+    position: absolute;
+    top: 50%;
+    width: 7px;
+    z-index: 1;
+}
+
+.radio {
+    margin-bottom: 8px;
+    position: relative;
+}
+
+.radio input[type="radio"] {
+    display: none;
+}
+
+.radio input[type="radio"]:checked::after {
+    -webkit-animation: checkboxAndRadioAnimation 0.25s;
+    animation: checkboxAndRadioAnimation 0.25s;
+    content: "";
+    -webkit-transform: scale(1) rotate(45deg);
+    transform: scale(1) rotate(45deg);
+}
+
+.radio input[type="radio"] {
+    display: block;
+    overflow: hidden;
+    padding-left: 30px;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.radio input[type="radio"]::before {
+    background-color: #eceff1;
+    border: 1px solid var(--white);
+    border-radius: 20px;
+    content: "";
+    display: inline-block;
+    height: 20px;
+    left: 0;
+    margin-top: -10px;
+    position: absolute;
+    top: 50%;
+    width: 20px;
+}
+
+.radio input[type="radio"]::after {
+    background-color: #03a9f4;
+    border-radius: 20px;
+    display: block;
+    height: 10px;
+    left: 11px;
+    margin-left: -6px;
+    margin-top: -6px;
+    position: absolute;
+    top: 13px;
+    width: 10px;
+    z-index: 1;
+}
+
+@-webkit-keyframes checkboxAndRadioAnimation {
+    0% {
+        -webkit-transform: scale(0) rotate(45deg);
+        transform: scale(0) rotate(45deg);
+    }
+
+    50% {
+        -webkit-transform: scale(1.5) rotate(45deg);
+        transform: scale(1.5) rotate(45deg);
+    }
+
+    100% {
+        -webkit-transform: scale(1) rotate(45deg);
+        transform: scale(1) rotate(45deg);
+    }
+}
+
+@keyframes checkboxAndRadioAnimation {
+    0% {
+        -webkit-transform: scale(0) rotate(45deg);
+        transform: scale(0) rotate(45deg);
+    }
+
+    50% {
+        -webkit-transform: scale(1.5) rotate(45deg);
+        transform: scale(1.5) rotate(45deg);
+    }
+
+    100% {
+        -webkit-transform: scale(1) rotate(45deg);
+        transform: scale(1) rotate(45deg);
+    }
+}
+
+.input-invis {
+    background-color: transparent !important;
+    margin: auto !important;
+    border: 0 !important;
+}
+
+.switch,
+.input {
+    background-color: var(--white);
+    padding: 0;
+    position: relative;
+}
+
+.input :focus,
+.input :active {
+    background-color: var(--white);
+    border-radius: var(--border-radius);
+}
+
+.switch .rocker,
+.input input,
+.input textarea {
+    background: transparent;
+    border: 0;
+    box-shadow: none;
+    color: #272727;
+    font-size: 16px;
+    line-height: 1.5em;
+    margin: 0;
+    outline: none;
+    padding: 8px 16px;
+    width: 100%;
+}
+
+.input input::-webkit-input-placeholder {
+    color: #969da6;
+}
+
+.input input::-ms-input-placeholder {
+    color: #969da6;
+}
+
+.input input::placeholder {
+    color: #969da6;
+}
+
+.input input.small {
+    line-height: 1em;
+    padding: 0;
+}
+
+.input-withIcon input {
+    padding-right: 32px;
+}
+
+.input-icon {
+    fill: #969da6;
+    height: 16px;
+    margin-top: -8px;
+    position: absolute;
+    right: 16px;
+    top: 50%;
+    width: 16px;
+}
+
+.switch {
+    overflow: hidden;
+    display: block;
+}
+
+.switch input[type="checkbox"] {
+    position: absolute;
+    height: 100%;
+    width: 100%;
+    margin: 0;
+    padding: 0;
+    z-index: 3;
+}
+
+.switch .rocker {
+    padding: 0;
+    display: flex;
+}
+
+.switch .rocker-left,
+.switch .rocker-right {
+    max-width: 50%;
+    font-weight: bold;
+    text-align: center;
+    font-size: 10px;
+    line-height: 1;
+    width: 50%;
+    color: var(--darkdark);
+    padding: 8px 16px;
+    -webkit-transition: background-position .25s;
+    -moz-transition: background-position .25s;
+    transition: background-position .25s;
+    background-size: 200% 100%;
+    background-image: linear-gradient(to right, transparent 50%, var(--blue) 50%);
+}
+
+.switch .rocker-left {
+    background-position-x: 100%;
+}
+
+.switch .rocker-bg {
+    position: relative;
+    border-radius: 50%;
+    transition: 0.4s cubic-bezier(0.18, 0.89, 0.35, 1.15) all;
+    left: 0;
+    width: 50%;
+    background-color: var(--blue);
+    z-index: 1;
+}
+
+.switch input:checked+.rocker .rocker-left {
+    background-position-x: 0%;
+}
+
+.switch input:checked+.rocker .rocker-right {
+    background-position-x: -100%;
+}

src/style/module/layout.css

@@ -0,0 +1,359 @@
+/**
+ * LAYOUT
+ */
+.section {
+    padding-bottom: 36px;
+    padding-top: 36px;
+}
+
+@media (min-width: 768px) {
+    .section {
+        padding-bottom: 72px;
+        padding-top: 72px;
+    }
+}
+
+.section+.section {
+    padding-top: 0;
+}
+
+.container {
+    margin: 0 auto;
+    max-width: 1380px;
+    padding-left: 12px;
+    padding-right: 12px;
+    width: 100%;
+}
+
+@media (min-width: 576px) {
+    .container {
+        max-width: 540px;
+    }
+}
+
+@media (min-width: 768px) {
+    .container {
+        max-width: 720px;
+    }
+}
+
+@media (min-width: 992px) {
+    .container {
+        max-width: 960px;
+    }
+}
+
+@media (min-width: 1200px) {
+    .container {
+        max-width: 1140px;
+    }
+}
+
+@media (min-width: 768px) {
+    .container {
+        padding-left: 24px;
+        padding-right: 24px;
+    }
+}
+
+.container-medium {
+    margin: 0 auto;
+    max-width: 944px;
+    padding-left: 12px;
+    padding-right: 12px;
+}
+
+@media (min-width: 768px) {
+    .container-medium {
+        padding-left: 24px;
+        padding-right: 24px;
+    }
+}
+
+.container {
+    width: 100%;
+    padding-right: 12px;
+    padding-left: 12px;
+    margin-right: auto;
+    margin-left: auto;
+}
+
+.container-fluid {
+    width: 100%;
+    padding-right: 12px;
+    padding-left: 12px;
+    margin-right: auto;
+    margin-left: auto;
+}
+
+.row {
+    display: flex;
+    flex-wrap: wrap;
+    margin-right: -12px;
+    margin-left: -12px;
+}
+
+.col-1,
+.col-2,
+.col-3,
+.col-4,
+.col-5,
+.col-6,
+.col-7,
+.col-8,
+.col-9,
+.col-10,
+.col-11,
+.col-12,
+.col,
+.col-auto,
+.col-sm-1,
+.col-sm-2,
+.col-sm-3,
+.col-sm-4,
+.col-sm-5,
+.col-sm-6,
+.col-sm-7,
+.col-sm-8,
+.col-sm-9,
+.col-sm-10,
+.col-sm-11,
+.col-sm-12,
+.col-md-1,
+.col-md-2,
+.col-md-3,
+.col-md-4,
+.col-md-5,
+.col-md-6,
+.col-md-7,
+.col-md-8,
+.col-md-9,
+.col-md-10,
+.col-md-11,
+.col-md-12 {
+    position: relative;
+    width: 100%;
+    min-height: 1px;
+    padding-right: 12px;
+    padding-left: 12px;
+}
+
+.col {
+    flex-basis: 0;
+    flex-grow: 1;
+    max-width: 100%;
+}
+
+.col-auto {
+    flex: 0 0 auto;
+    width: auto;
+    max-width: none;
+}
+
+.col-1 {
+    flex: 0 0 8.33333%;
+    max-width: 8.33333%;
+}
+
+.col-2 {
+    flex: 0 0 16.66667%;
+    max-width: 16.66667%;
+}
+
+.col-3 {
+    flex: 0 0 25%;
+    max-width: 25%;
+}
+
+.col-4 {
+    flex: 0 0 33.33333%;
+    max-width: 33.33333%;
+}
+
+.col-5 {
+    flex: 0 0 41.66667%;
+    max-width: 41.66667%;
+}
+
+.col-6 {
+    flex: 0 0 50%;
+    max-width: 50%;
+}
+
+.col-7 {
+    flex: 0 0 58.33333%;
+    max-width: 58.33333%;
+}
+
+.col-8 {
+    flex: 0 0 66.66667%;
+    max-width: 66.66667%;
+}
+
+.col-9 {
+    flex: 0 0 75%;
+    max-width: 75%;
+}
+
+.col-10 {
+    flex: 0 0 83.33333%;
+    max-width: 83.33333%;
+}
+
+.col-11 {
+    flex: 0 0 91.66667%;
+    max-width: 91.66667%;
+}
+
+.col-12 {
+    flex: 0 0 100%;
+    max-width: 100%;
+}
+
+@media (min-width: 576px) {
+    .col-sm {
+        flex-basis: 0;
+        flex-grow: 1;
+        max-width: 100%;
+    }
+
+    .col-sm-auto {
+        flex: 0 0 auto;
+        width: auto;
+        max-width: none;
+    }
+
+    .col-sm-1 {
+        flex: 0 0 8.33333%;
+        max-width: 8.33333%;
+    }
+
+    .col-sm-2 {
+        flex: 0 0 16.66667%;
+        max-width: 16.66667%;
+    }
+
+    .col-sm-3 {
+        flex: 0 0 25%;
+        max-width: 25%;
+    }
+
+    .col-sm-4 {
+        flex: 0 0 33.33333%;
+        max-width: 33.33333%;
+    }
+
+    .col-sm-5 {
+        flex: 0 0 41.66667%;
+        max-width: 41.66667%;
+    }
+
+    .col-sm-6 {
+        flex: 0 0 50%;
+        max-width: 50%;
+    }
+
+    .col-sm-7 {
+        flex: 0 0 58.33333%;
+        max-width: 58.33333%;
+    }
+
+    .col-sm-8 {
+        flex: 0 0 66.66667%;
+        max-width: 66.66667%;
+    }
+
+    .col-sm-9 {
+        flex: 0 0 75%;
+        max-width: 75%;
+    }
+
+    .col-sm-10 {
+        flex: 0 0 83.33333%;
+        max-width: 83.33333%;
+    }
+
+    .col-sm-11 {
+        flex: 0 0 91.66667%;
+        max-width: 91.66667%;
+    }
+
+    .col-sm-12 {
+        flex: 0 0 100%;
+        max-width: 100%;
+    }
+}
+
+@media (min-width: 768px) {
+    .col-md {
+        flex-basis: 0;
+        flex-grow: 1;
+        max-width: 100%;
+    }
+
+    .col-md-auto {
+        flex: 0 0 auto;
+        width: auto;
+        max-width: none;
+    }
+
+    .col-md-1 {
+        flex: 0 0 8.33333%;
+        max-width: 8.33333%;
+    }
+
+    .col-md-2 {
+        flex: 0 0 16.66667%;
+        max-width: 16.66667%;
+    }
+
+    .col-md-3 {
+        flex: 0 0 25%;
+        max-width: 25%;
+    }
+
+    .col-md-4 {
+        flex: 0 0 33.33333%;
+        max-width: 33.33333%;
+    }
+
+    .col-md-5 {
+        flex: 0 0 41.66667%;
+        max-width: 41.66667%;
+    }
+
+    .col-md-6 {
+        flex: 0 0 50%;
+        max-width: 50%;
+    }
+
+    .col-md-7 {
+        flex: 0 0 58.33333%;
+        max-width: 58.33333%;
+    }
+
+    .col-md-8 {
+        flex: 0 0 66.66667%;
+        max-width: 66.66667%;
+    }
+
+    .col-md-9 {
+        flex: 0 0 75%;
+        max-width: 75%;
+    }
+
+    .col-md-10 {
+        flex: 0 0 83.33333%;
+        max-width: 83.33333%;
+    }
+
+    .col-md-11 {
+        flex: 0 0 91.66667%;
+        max-width: 91.66667%;
+    }
+
+    .col-md-12 {
+        flex: 0 0 100%;
+        max-width: 100%;
+    }
+}

src/style/module/load_n_spin.css

@@ -0,0 +1,166 @@
+/**
+ *  LOADING BAR
+ *
+ *  Markup:
+ *  ---------
+ *  <div class="loadingBar"></div>
+ *
+ */
+.loadingBar {
+    height: 6px;
+    left: 0;
+    overflow: hidden;
+    position: fixed;
+    right: 0;
+    top: 0;
+    width: 100%;
+    z-index: 1000;
+}
+
+.loadingBar::before {
+    -webkit-animation: loading 2s linear infinite;
+    animation: loading 2s linear infinite;
+    background-color: #03a9f4;
+    content: "";
+    display: block;
+    height: 6px;
+    left: -300px;
+    position: absolute;
+    width: 300px;
+}
+
+@-webkit-keyframes loading {
+    from {
+        left: -300px;
+        width: 30%;
+    }
+
+    50% {
+        width: 30%;
+    }
+
+    70% {
+        width: 70%;
+    }
+
+    80% {
+        left: 50%;
+    }
+
+    95% {
+        left: 120%;
+    }
+
+    to {
+        left: 100%;
+    }
+}
+
+@keyframes loading {
+    from {
+        left: -300px;
+        width: 30%;
+    }
+
+    50% {
+        width: 30%;
+    }
+
+    70% {
+        width: 70%;
+    }
+
+    80% {
+        left: 50%;
+    }
+
+    95% {
+        left: 120%;
+    }
+
+    to {
+        left: 100%;
+    }
+}
+
+.spinner {
+    position: absolute;
+    right: 0;
+    top: 0;
+    width: 40px;
+    height: 40px;
+    display: block
+}
+
+.spinner:after,
+.spinner:before {
+    position: absolute;
+    content: "";
+    top: 50%;
+    left: 50%;
+    margin: -12px 0 0 -12px;
+    width: 24px;
+    height: 24px;
+    border-radius: 100%;
+    border: 3px solid transparent;
+    border-top-color: var(--blue);
+}
+
+.spinner:before {
+    -webkit-animation: spinning 2.4s cubic-bezier(.41, .26, .2, .62);
+    animation: spinning 2.4s cubic-bezier(.41, .26, .2, .62);
+    -webkit-animation-iteration-count: infinite;
+    animation-iteration-count: infinite
+}
+
+.spinner:after {
+    -webkit-animation: spinning 2.4s cubic-bezier(.51, .09, .21, .8);
+    animation: spinning 2.4s cubic-bezier(.51, .09, .21, .8);
+    -webkit-animation-iteration-count: infinite;
+    animation-iteration-count: infinite
+}
+
+@-webkit-keyframes spinning {
+    0% {
+        -webkit-transform: rotate(0);
+        transform: rotate(0);
+    }
+
+    25% {
+        -webkit-transform: rotate(90deg);
+        transform: rotate(90deg);
+    }
+
+    50% {
+        -webkit-transform: rotate(180deg);
+        transform: rotate(180deg);
+    }
+
+    75% {
+        -webkit-transform: rotate(270deg);
+        transform: rotate(270deg);
+    }
+
+    100% {
+        -webkit-transform: rotate(360deg);
+        transform: rotate(360deg);
+    }
+}
+
+@keyframes spinning {
+    0% {
+        -webkit-transform: rotate(0);
+        transform: rotate(0);
+    }
+
+    50% {
+        -webkit-transform: rotate(180deg);
+        transform: rotate(180deg);
+    }
+
+
+    100% {
+        -webkit-transform: rotate(360deg);
+        transform: rotate(360deg);
+    }
+}

src/style/module/typography.css

@@ -0,0 +1,143 @@
+/**
+ *  TYPOGRAPHY
+ */
+body {
+    color: #272727;
+    font-family: "Lato", sans-serif;
+    font-size: 16px;
+    font-weight: 400;
+    line-height: 1.5em;
+}
+
+a {
+    color: var(--blue);
+    text-decoration: none;
+}
+
+a:hover {
+    color: color-mix(in srgb, var(--color-primary), #FFF 15%);
+}
+
+a:focus {
+    color: var(--blue);
+}
+
+
+.text-huge {
+    font-size: 36px;
+    line-height: 1.3em;
+}
+
+.text-big {
+    font-size: 24px;
+    line-height: 1.3em;
+}
+
+.text-medium {
+    font-size: 16px;
+    line-height: 1.5em;
+}
+
+.text-small {
+    font-size: 12px;
+    line-height: 1.3em;
+}
+
+.text-body {
+    font-size: 16px;
+    line-height: 1.5em;
+}
+
+.text-primary {
+    color: #03a9f4;
+}
+
+.text-dark {
+    color: #18232f;
+}
+
+.text-secondary {
+    color: #e91e63;
+}
+
+.text-white {
+    color: #fff;
+}
+
+.text-success {
+    color: #4caf50;
+}
+
+.text-info {
+    color: #5bc0de;
+}
+
+.text-warning {
+    color: #f0ad4e;
+}
+
+.text-error {
+    color: #e74c3c;
+}
+
+.text-gray {
+    color: #969da6;
+}
+
+.text-gray-light {
+    color: #eceff1;
+}
+
+.text-light {
+    font-weight: 300;
+}
+
+.text-normal {
+    font-weight: 400;
+}
+
+.text-lineThrough {
+    text-decoration: line-through;
+}
+
+.text-italic {
+    font-style: italic;
+}
+
+.text-underline {
+    text-decoration: underline;
+}
+
+.text-uppercase {
+    text-transform: uppercase;
+}
+
+.text-withSubtitle {
+    margin-bottom: 0 !important;
+}
+
+.text-withSubtitle+.text-huge,
+.text-withSubtitle+.text-big,
+.text-withSubtitle+.text-medium,
+.text-withSubtitle+.text-small {
+    margin-top: 0.5em;
+}
+
+h1,
+h2,
+h3,
+h4 {
+    font-weight: 300;
+}
+
+.text-center {
+    text-align: center;
+}
+
+.text-right {
+    text-align: right;
+}
+
+.text-left {
+    text-align: left;
+}

src/template/home.pug

@@ -0,0 +1,32 @@
+doctype html
+
+include module/head.pug
+main#app
+  .bg-white.section.text-dark
+    .container.mb-big
+      .text-center
+        div
+          h1.text-huge.text-withSubtitle Open Tourism Map
+          h2.text-big.text-gray Collaborative Holiday Planner
+  .spacer
+  .section.bg-dark.text-white
+    .container-medium 
+      .row
+        .col-8
+          h2.text-big Your journey
+          p.text-gray
+            | Browse hotels, restaurants and attractions,....
+            br
+            |
+            | Select and plan the varying elements of your journey
+        .col-4
+          .row.align
+            .input
+              input#journey.id(v-model="journey.id", placeholder="ID", type="text")
+          p
+          .row.align
+            button.button.button--primary.button--mobileFull(
+              v-on:click="start_journey"
+            ) Start the journey
+
+include module/foot.pug

src/template/journey.pug

@@ -3,6 +3,6 @@ doctype html
 include module/head.pug
 
 main#app(v-cloak)
-  include module/nav.pug
-  include module/journey.pug
+  include module/view/toast.pug
+  include module/journey/main.pug
 include module/foot.pug

src/template/module/foot.pug

@@ -2,21 +2,12 @@ script(src="https://unpkg.com/leaflet")
 
 script(src="https://unpkg.com/vue@2")
 script(src="https://unpkg.com/vue2-datepicker")
-script(src="https://unpkg.com/vue-textarea-autosize")
 script(src="https://unpkg.com/vue2-leaflet")
 script(src="https://unpkg.com/sortablejs")
 script(src="https://unpkg.com/vuedraggable")
 script(src="/public/main.js", type="text/javascript", charset="utf-8")
-footer.bg-dark
-  .container
-    .section.text-center.text-small
-      p.text-white
-        img(src="/public/img/helcel.png", alt="helcel logo", width="100")
-        br
-        br
-        |
+footer.bg-dark.section
+  .container.text-center.text-small.text-white
         | Built with   ❤   by Helcel
         br
         span.text-small.text-gray v0.0.1
-      p.text-gray
-        a(href="https://git.helcel.net") Helcel Git

src/template/module/head.pug

@@ -8,7 +8,7 @@ head
     href="https://fonts.googleapis.com/css?family=IBM+Plex+Sans:400,700,300",
     type="text/css"
   )
-  link(rel="stylesheet", href="/public/css/index.css")
+  link(rel="stylesheet", href="/public/index.css")
 
   link(rel="stylesheet", href="https://unpkg.com/vue2-datepicker/index.css")
   link(rel="stylesheet", href="https://unpkg.com/leaflet/dist/leaflet.css")

src/template/module/journey/leg/drawer-notes.pug

@@ -0,0 +1,9 @@
+.w-100.input()
+    textarea.text-small#query_note(
+            v-model="journey.leg_get().notes"
+            rows="1"
+            @input="refreshTextAreaHeight"
+            @focus="refreshTextAreaHeight"
+            placeholder="...",
+    )
+    

src/template/module/journey/leg/drawer.pug

@@ -1,16 +1,19 @@
-.input.text-dark(style="width: 100%")
+
+.input.w-100.text-dark
     input#query_input(
         type="search"
         @input="search_active"
+        @focus="search_active"
         placeholder="Search ... "
         style="width:85%;"
+        :disabled="query.note"
+        v-model="query.query"
     )
     .spinner(v-if="query.load")
-div(style="width:100%" 
-    v-if="['hotel', 'restaurant', 'place','other', 'travel'].indexOf(query.type)>=0")
+
+div(v-if="['hotel', 'restaurant', 'place','other', 'travel'].indexOf(query.type)>=0")
     template(v-for="(item, idx) in query.res" )
-        .col-12.bg-white.text-dark(
-            style="display:flex;align-items:center; border-radius:3px;"
+        .query-result.col-12.bg-white.text-dark(
             :key="'q'+idx" 
             @mouseover="drawer_hover_item(item)" 
             @mouseleave="drawer_hover_item()"
@@ -20,20 +23,18 @@ div(style="width:100%"
                 | {{ item.name }}
         .bg-dark.divider(
             :key="'qdiv'+idx" style="height:1px" )
-    .col-12.bg-white.text-dark(
-        v-if="query.load==false && query.res.length==0"
-        style="display:flex;align-items:center; border-radius:3px;" )
+    .query-result.col-12.bg-white.text-dark(
+        v-if="query.load==false && query.res.length>=0 && query.query!=''"
+            @click="query.addmarker=true"  )
         div( v-html="generate_icon('star', 'var(--dark)')")
         .col-10()
             | Add custom
 
     .col-12.text-white.text-center(
         ) {{query.load? `Loading ...` : `Found ${query.res.length} results`}}
-div(style="width:100%" 
-    v-else-if="['flight'].indexOf(query.type)>=0")
+div(v-else-if="['flight'].indexOf(query.type)>=0")
     template(v-for="(item, idx) in query.res" )
-        .col-12.bg-white.text-dark(
-            style="display:flex;align-items:center; border-radius:3px;"
+        .query-result.col-12.bg-white.text-dark(
             :key="'q'+idx" 
             @mouseover="drawer_hover_item(item)" 
             @mouseleave="drawer_hover_item()"
@@ -43,8 +44,7 @@ div(style="width:100%"
                 | {{ item.from  }} => {{item.to}}  
         .bg-dark.divider(
             :key="'qdiv'+idx" style="height:1px" )
-div(style="width:100%" v-else)
+div(v-else)
     template()
-        .col-12.bg-white.text-dark(
-            style="display:flex;align-items:center; border-radius:3px;")
-        | Unsuppored Query type {{query.type}}
+        .query-result.col-12.bg-white.text-dark()
+        | Unsuppored Query type {{query.type}}

src/template/module/journey/leg/top_day.pug

@@ -0,0 +1,54 @@
+.row
+  .mr-auto.col-auto
+    .list-group.text-dark
+      .list-group-item.show.bg-white.rounded(v-on:click.prevent="journey.day_prev(); focus_day(journey);")
+        i.fas.fa-angle-left
+  .col-8.col-sm-8.col-md-10.scroll-handler(
+  @pointerleave="nav_mouseleave"
+  @pointermove="nav_mousemove")
+  
+    draggable.scroll-content.nav-day.list-group.bg-dark(
+      tag="div",
+      :list="journey.leg_get().day_title",
+      handle=".handle"
+    )
+      .list-group-item.bg-white.text-white.show.placeholder-left(
+        :class="journey.sel_day >0? '': 'bg-dark'"
+        slot="header"
+      )
+        .text {{'⋅'}}
+      .list-group-item.handle.text-dark(
+        v-for="(element, idx) in journey.leg_len()",
+        :key="idx",
+        @click="journey.day_sel(idx)",
+        :class="journey.sel_day == idx ? 'bg-primary active' : 'bg-white'"
+      )
+        .text {{ journey.leg_get().day_title[idx] || "Leg "+idx}}
+      .list-group-item.bg-white.text-white.show.placeholder-right(
+        :class="journey.sel_leg < journey.data.main.length-1? '': 'bg-dark'"
+        slot="footer"
+      )
+        .text {{'⋅'}}
+      .list-group-item.bg-dark.text-white(
+          style="display:none"
+          slot="footer"
+      )
+        .text {{'⋅'}}
+
+  .ml-auto.col-auto
+    .list-group.text-dark
+      .list-group-item.show.bg-white.rounded(v-on:click.prevent="journey.day_next(); focus_day(journey);")
+        i.fas.fa-angle-right
+.row
+  .col-8.col-sm-6.col-md-4
+    .input.w-100
+      input.col-8(
+      placeholder="Day"
+      v-model="journey.leg_get().day_title[journey.sel_day]"
+      )
+  .ml-auto.col-4.col-sm-4.col-md-3
+    .input.w-100
+      input.text-right(
+      disabled="",
+      :value="journey.date_sel() + ' (' + journey.sel_day + ')'"
+      )

src/template/module/journey/leg/top_leg.pug

@@ -0,0 +1,61 @@
+.row
+  .mr-auto.col-auto
+    .list-group.text-dark
+      .list-group-item.show.bg-white.rounded(v-on:click.prevent="journey.leg_prev(); focus_leg(journey);")
+        i.fas.fa-angle-left
+  .col-8.col-sm-8.col-md-10.scroll-handler(
+  @pointerleave="nav_mouseleave"
+  @pointermove="nav_mousemove")
+  
+    draggable.scroll-content.nav-leg.list-group.bg-dark(
+      tag="div",
+      :list="journey.data.main",
+      handle=".handle"
+    )
+      .list-group-item.bg-white.text-white.show.placeholder-left(
+        :class="journey.sel_leg >0? '': 'bg-dark'"
+        slot="header"
+      )
+        .text {{'⋅'}}
+      .list-group-item.handle.text-dark(
+        v-for="(element, idx) in journey.data.main",
+        :key="idx",
+        @click="journey.leg_sel(idx)",
+        :class="journey.sel_leg == idx ? 'bg-primary active' : 'bg-white'"
+      )
+        .text {{ element.title || "Leg "+idx}}
+        i.fa.fa-times.text-small.fright(
+          style="top: 2px; right: 2px; position: absolute",
+          @click="journey.rm_leg(idx); focus_leg(journey);"
+        )
+      .list-group-item.bg-white.text-white.show.placeholder-right(
+        :class="journey.sel_leg < journey.data.main.length-1? '': 'bg-dark'"
+        slot="footer"
+      )
+        .text {{'⋅'}}
+      .list-group-item.bg-white.text-dark.add(@click="journey.add_leg(); focus_leg(journey);"
+        slot="footer"
+        :class="journey.sel_leg >= journey.data.main.length-1? 'show': ''")
+        div 
+          i.fa.fa-plus()
+
+  .ml-auto.col-auto
+    .list-group.text-dark
+      .list-group-item.show.bg-white.rounded(v-on:click.prevent="journey.leg_next(); focus_leg(journey);")
+        i.fas.fa-angle-right
+.row.text-center
+    .col-6.col-sm-6.col-md-5.mr-auto
+      .input.w-100
+          input(
+          placeholder="Leg" 
+          v-model="journey.leg_get().title")
+    .col-6.col-sm-6.col-md-4
+        .input.w-100
+            date-picker(
+            :lang="lang",
+            v-model="journey.leg_get().date_range",
+            range="",
+            format="ddd D MMM",
+            placeholder="Date Range",
+            v-on:change="journey.date_update(journey.sel_leg)"
+        )

src/template/module/journey/main.pug

@@ -0,0 +1,25 @@
+include smallbar.pug
+
+.bg-dark.text-white(v-if="journey && journey.leg_get()")
+  .container
+    .row.align(style="padding-top:45px;position:relative")
+      .col-6.col-sm-4.col-md-3
+        .input.text-big
+          input.text-center(v-model="journey.data.name" placeholder="My Journey" type="text")
+      .col-6.col-sm-4.col-md-3( v-if="useDay" )
+        .input.text-small
+          input.text-center(v-model="journey.leg_get().title" placeholder="Leg" type="text")
+      //- input.small(type="text", :placeholder="journey.date_tot() + ' (' + journey.tot_len() + ')'" )
+
+    template(v-if="useDay")
+      include leg/top_day.pug
+    template(v-else)
+      include leg/top_leg.pug
+    .row(style="aspect-ratio:1.25;min-height:432px;max-height:calc(100vh - 125px);width:calc(100% + 24px);")
+      .map-container(:class=" { 'col-2 col-sm-5 col-md-8': query.type, 'col-2 col-sm-5 col-md-6': query.note , 'col-12': (!query.type  && !query.note) }" )
+        include map.pug
+      .row.drawer-container(:class="{ 'col-10 col-sm-7 col-md-4': query.type, 'col-10 col-sm-7 col-md-6': query.note, 'col-0': (!query.type  && !query.note) }")
+        .h-100(:class="{ 'w-100 ': query.type, 'w-0': !query.type }")
+          include leg/drawer.pug
+        .h-100(:class="{ 'w-100': query.note, 'w-0': !query.note }")
+          include leg/drawer-notes.pug

src/template/module/journey/map.pug

@@ -1,14 +1,17 @@
 l-map(
-  :zoom.sync="journey.leg_get().map.zoom",
-  :center.sync="journey.leg_get().map.center",
+  :zoom.sync="journey.leg_get().map.zoom"
+  :center.sync="journey.leg_get().map.center"
+  @click="onMapClick"
   style="height:100%"
   no-blocking-animations=true
+  :style="query.addmarker?'cursor:crosshair':''"
+  ref="map"
 )
   l-tile-layer(
     url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
     attribution="© <a href=\"http://osm.org/copyright\">OpenStreetMap</a> contributors"
   )
-  l-control-scale(position="bottomright", :imperial="false", :metric="true")
+  l-control-scale(position="bottomleft" :imperial="false" :metric="true")
   include map/override.pug
 
   include map/hotel.pug
@@ -16,5 +19,5 @@ l-map(
   include map/restaurants.pug
 
   include map/travel.pug
-
-  include map/right_menu.pug
+  template(v-if="edit_active")
+    include map/right_menu.pug

src/template/module/journey/map/mixin-marker.pug

@@ -15,27 +15,23 @@ mixin map_marker(place, color_sel_c, color_sel_o, color_else)
       v-else
       v-html="generate_marker(place, \""+color_else+"\")"
     )
-    l-popup()
+    l-popup(
+    :options="{maxWidth:400, minWidth:300}")
       h1.row.text-medium.text-center {{ place.sname }}
       span.row.text-small.text-gray {{ place.display_name }}
       span(v-if="edit_active")
-        .row.input(style="margin-bottom:0")
-          textarea-autosize.col-12.col-sm-12.text-small(
-            placeholder="Notes",
+        .row.input()
+          textarea.col-12.col-sm-12.text-small(
+            placeholder="",
             v-model="place.notes",
-            :min-height="30",
-            :max-height="350"
           )
-        a.leaflet-popup-close-button.text-gray(
-          style="right: 4px; visibility: visible",
-          href="#rm",
-          v-on:click.prevent="place_delete(\""+place+"\",index)"
-          v-html="generate_icon('trash', 'NA')"
-        ) 
-        a.leaflet-popup-close-button.text-gray(
-          style="right: 20px; visibility: visible",
-          href="#toggle_day",
+      .leaflet-popup-button-group(v-if="edit_active")
+        a.text-gray(
           v-on:click.prevent="place.step = ((place.step==journey.sel_day)?-1:journey.sel_day)"
           v-html="generate_icon(((place.step==journey.sel_day)?'calendar-xmark':'calendar-plus'), 'NA')"
         )
+        a.text-gray(
+          v-on:click.prevent="place_delete(\""+place+"\",index)"
+          v-html="generate_icon('trash', 'NA')"
+        ) 
       span.row.text-small.text-dark(v-else) {{ place.notes }}

src/template/module/journey/map/override.pug

@@ -0,0 +1,11 @@
+l-marker(
+    v-if="map_override.active",
+    v-for="(el, idx) in map_override.elements"
+    :key="'ovr'+idx"
+    :lat-lng="el"
+  )
+  l-icon(v-html="generate_marker('plus', 'darkgreen')")
+l-polyline(
+    v-if="map_override.active && map_override.elements.length>1"
+    :lat-lngs="map_override.elements" :color="'darkgreen'"
+)

src/template/module/journey/map/restaurants.pug

@@ -0,0 +1,6 @@
+include mixin-marker.pug
+div(
+    v-for="(place, index) in journey.leg_get().places.restaurants",
+    :key="'restaurants'+index",
+  )
+  +map_marker("restaurants", "var(--dark)", "var(--dark)", "var(--dark)")

src/template/module/journey/map/right_menu.pug

@@ -0,0 +1,21 @@
+.map-menu.map-menu-top
+    div(v-if="query.type" @click="drawer_click_item()" )
+        .map-menu-item(v-html="generate_icon('close')")
+    div(v-if="!query.type" @click="search_enable('hotel')")
+        .map-menu-item( v-html="generate_icon('bed')")
+    div(v-if="!query.type" @click="search_enable('restaurant')")
+        .map-menu-item( v-html="generate_icon('utensils')")
+    div(v-if="!query.type" @click="search_enable('place')")
+        .map-menu-item( v-html="generate_icon('star')")
+    .map-menu-sub(v-if="!query.type" @mouseenter="query.sub=true" @mouseleave="query.sub=false" )
+        .map-menu-item(v-html="generate_icon('route')")
+        .map-menu-item(v-if="query.sub" @click="search_enable('flight')" v-html="generate_icon('plane')")
+        .map-menu-item(v-if="query.sub" @click="search_enable('train')" v-html="generate_icon('train')")
+        .map-menu-item(v-if="query.sub" @click="search_enable('car')" v-html="generate_icon('car')")
+        .map-menu-item(v-if="query.sub" @click="search_enable('other')" v-html="generate_icon('person-biking')")
+
+.map-menu.map-menu-center
+    div(v-if="query.note" @click="drawer_click_item()" )
+        .map-menu-item(v-html="generate_icon('close')")
+    div(v-if="!query.note" @click="search_enable('notes')")
+        .map-menu-item( v-html="generate_icon('pencil')")

src/template/module/journey/map/travel.pug

@@ -0,0 +1,32 @@
+mixin flight_popup()
+  l-popup(
+    :options="{maxWidth:400, minWidth:300}"
+  )
+    h1.row.text-medium.text-center.text-uppercase {{ travel.id }}
+    span.row.text-small.text-gray {{ travel.from }} - {{travel.to}}
+    span(v-if="edit_active")
+      .row.input(style="margin-bottom:0")
+        textarea.col-12.col-sm-12.text-small(
+          placeholder="",
+          v-model="travel.notes",
+        )
+    span.row.text-small.text-dark(v-else) {{ travel.notes }}
+    span(v-if="edit_active")
+      .leaflet-popup-button-group(v-if="edit_active")
+        a.text-gray(
+          v-on:click.prevent="place_delete('flight',idx)"
+          v-html="generate_icon('trash', 'NA')"
+        ) 
+
+div(v-for= "(travel, idx) in journey.leg_get().travel")
+  l-polyline(:lat-lngs="travel.path" :color="travel.color || 'gray'")
+    +flight_popup()
+    
+  l-marker(
+      v-for="(place, index) in travel.path"
+      :key="'plane'+index"
+      :lat-lng="place"
+    )
+    l-icon(v-html="generate_icon('plane', travel.color || 'gray', generate_rotation(index,travel.path), 'travel-path-icon')"
+      )
+    +flight_popup()

src/template/module/journey/smallbar.pug

@@ -0,0 +1,30 @@
+.smallbar
+  .col-auto.mr-auto(style="display:flex; flex-flow: row")
+    .col-1
+      a.text-white.tooltip(:href="'/short/' + journey.id")
+        i.fas.fa-file-contract
+        .tooltip-text Summary
+    .col-1
+      a.text-white.tooltip(:href="'/view/' + journey.id")
+        i.fas.fa-camera
+        .tooltip-text Daily
+    .col-1
+      a.text-white.tooltip(href="#", v-on:click.prevent="first_step")
+        i.fas.fa-tools
+        .tooltip-text Editor
+    .col-1
+    .col-1
+      a.text-white.tooltip(v-on:click.prevent="toast_impexp(true)")
+        i.fas.fa-file-import
+        .tooltip-text Import
+    .col-1
+      a.text-white.tooltip(v-on:click.prevent="toast_impexp(false)")
+        i.fas.fa-file-export
+        .tooltip-text Export
+
+  .col-auto.ml-auto
+    .switch.legday-switch
+      input(type="checkbox" v-model="useDay")
+      .rocker
+        .rocker-left LEG 
+        .rocker-right DAY

src/template/module/view/nav.pug

@@ -0,0 +1,10 @@
+.row.fleft(style="position:absolute;right:0;")
+  .col-1
+    a(:href="'/short/' + journey.id")
+      i.fas.fa-file-contract
+  .col-1
+    a(:href="'/view/' + journey.id")
+      i.fas.fa-camera
+  //- .col-1
+  //-   a(:href="'/' + journey.id" v-on:click.prevent="first_step")
+  //-     i.fas.fa-tools

src/template/module/view/short_leg.pug

@@ -0,0 +1,39 @@
+.col-11.container.section
+  .row.text-center.align.padding-1
+    .input.col-5.col-sm-2
+      input(disabled="", placeholder="Unnamed" :value="item.title")
+    .col-sm-1
+    .input.col-6.col-sm-4
+      input(
+        disabled="",
+        placeholder="No Dates",
+        :value="item.date_range ? item.date_range[0].toLocal() + ' - ' + item.date_range[1].toLocal() : ''"
+      )
+    .col-1.col-sm-2
+    .input.col-5.col-sm-3.text-dark
+      .text(disabled="" placeholder="No Hotel" :value="item.hotel?item.hotel.sname:''") {{(item.hotel?item.hotel.sname:'') || 'No Hotel'}}
+  //- .row.text-center
+    .input.col-sm-3(v-if="item.travel")
+      div(v-for="(item, idx) in item.travel")
+        input(disabled="", placeholder="-" :value="item.map((v) => v.id).join(', ')")
+  .row.align.padding-1
+    .input.col-sm-10.text-dark
+      .text-small(
+        placeholder="No Restaurants",
+        :value="item.places.restaurants.map((v) => v.sname + (v.notes ? '(' + v.notes + ')' : '')).join(', ') || 'No Restaurants'",
+        disabled=""
+      ) {{item.places.restaurants.map((v) => v.sname + (v.notes ? '(' + v.notes + ')' : '')).join(', ') || 'No Restaurants'}}
+  .row.align.padding-1
+    .input.col-sm-10.text-dark
+      .text-small(
+        placeholder="No Activities",
+        :value="item.places.activities.map((v) => v.sname + (v.notes ? '(' + v.notes + ')' : '')).join(', ') || 'No Activites'",
+        disabled=""
+      ) {{item.places.activities.map((v) => v.sname + (v.notes ? '(' + v.notes + ')' : '')).join(', ') || 'No Activites'}}
+  .row.align.padding-1
+    .input.col-sm-10.text-dark
+      .text-small(
+        placeholder="No Notes",
+        :value="item.notes || 'No Notes'",
+        disabled=""
+      ) {{item.notes || 'No Notes'}}

src/template/module/view/toast.pug

@@ -0,0 +1,14 @@
+template
+  .overlay.text-dark(v-if="toast.show" @click="")
+    .popup.bg-white(@click.stop)
+      .row
+        .col-auto.text-huge {{ toast.title }}
+      .row(v-if="toast.desc")
+        .col-auto.text-medium {{ toast.desc }}
+      .row(v-if="toast.special")
+        .col-auto.text-medium 
+          .input
+            input(v-model="toast.special") 
+      .row.align
+        button.button.bg-white(@click="toast.func" v-if="toast.acceptText") {{ toast.acceptText }}
+        button.button.bg-white(@click="toast.show=false;" v-if="toast.cancelText") {{ toast.cancelText }}

src/template/module/view/view_day.pug

@@ -0,0 +1,19 @@
+div(v-for="(e, idx) in journey.data.main", :key="idx")
+  .bg-dark.text-white(v-if="journey.sel_leg == idx")
+    .container.section
+      .row
+        .col-3.fleft.text-center.text-white.text-huge
+          a(v-on:click.prevent="journey.day_prev()")
+            i.fas.fa-angle-left
+        .col-6.container.text-center.align
+          span.small {{ journey.data.main[idx].title }} {{ journey.sel_day }}
+          .text-big.text-gray {{ journey.data.main[idx].day_title[journey.sel_day] }}
+        .col-3.fright.text-center.text-white.text-huge
+          a(v-on:click.prevent="journey.day_next()")
+            i.fas.fa-angle-right
+      .row
+        .col-12.col-sm-12(style="aspect-ratio:1.25;")
+          include ../journey/map.pug
+      .row
+        .col-10
+          span.small.text-gray {{journey.data.main[idx].note || '...'}}

src/template/short.pug

@@ -0,0 +1,16 @@
+doctype html
+include module/head.pug
+main#app(v-cloak)
+  include module/view/nav.pug
+
+  .bg-dark.text-white(v-if="journey && journey.leg_get()")
+    .container
+      .row.align(style="padding:45px;")
+        .col-7.col-sm-5.col-md-4.input.text-big
+          input.text-center(v-model="journey.data.name" placeholder="My Journey" type="text" disabled)
+  div(
+    v-for="(item, idx) in journey.data.main",
+    :class="idx % 2 === 0 ? 'bg-white text-dark' : 'bg-dark text-white'"
+  )
+    include module/view/short_leg.pug
+include module/foot.pug

src/template/view.pug

@@ -1,6 +1,6 @@
 doctype html
 include module/head.pug
 main#app(v-cloak)
-  div(v-if="journey.data.main[journey.sel_leg] != undefined")
+  div(v-if="journey.leg_get()")
     include module/view/view_day.pug
 include module/foot.pug

template/home.pug

@@ -1,77 +0,0 @@
-doctype html
-
-include module/head.pug
-main#app
-  .container
-    section.mb-big
-      .text-center
-        img.main-logo.mb-medium(
-          src="/public/img/helcel.png",
-          alt="Helcel logo"
-        )
-        div
-          h1.text-huge.text-withSubtitle Open Tourism Map
-          h2.text-big.text-gray Collaborative Holiday Planner
-        p#js-header-waypoint.m-none
-          a.button.button--primary.button--mobileFull(href="#go") Get started
-  .bg-dark
-    .container
-      .row.text-center
-        .col-12.col-sm-3
-          .section
-            img(
-              src="/public/img/lightweight.png",
-              alt="Lightweight",
-              width="118"
-            )
-            br
-            h2.text-withSubtitle.text-big.text-white
-              | Lightweight
-              br
-              span.text-medium.text-gray
-                | Powered By
-                br
-                | Fastify & Sierra
-        .col-12.col-sm-4
-          .section
-            img(
-              src="/public/img/customizable.png",
-              alt="Customizable",
-              width="118"
-            )
-            br
-            h2.text-withSubtitle.text-big.text-white
-              | Customizable
-              br
-              span.text-medium.text-gray
-                | Many Templates
-                br
-                | to choose from
-        .col-12.col-sm-4
-          .section
-            h2.text-withSubtitle.text-big.text-white
-              img(
-                src="/public/img/opensource.png",
-                alt="Open Source",
-                width="118"
-              )
-              br
-              |
-              | FOSS
-              br
-              span.text-medium.text-gray :-)
-  #go.container-medium.section
-    h2.text-big Your journey
-    p
-      | Browse hotels, restaurants and attractions,....
-      br
-      |
-      | Select and plan the varying elements of your journey
-    .aligner.aligner--contentEnd
-      .input
-        input#journey.id(v-model="journey.id", placeholder="ID", type="text")
-      button.button.button--primary.button--mobileFull(
-        v-on:click="start_journey"
-      ) Start the journey
-
-include module/foot.pug

template/module/journey.pug

@@ -1,3 +0,0 @@
-.journey
-    include journey/leg.pug
-include journey/impexp.pug

template/module/journey/impexp.pug

@@ -1,13 +0,0 @@
-.impexp
-  .container-medium.section
-    .aligner
-      .input.col-sm-4
-        input(v-model="impexp", type="text")
-      .col-sm-2
-        button.button.button--primary.button--mobileFull(
-          v-on:click="import_data"
-        ) Import
-      .col-sm-2
-        button.button.button--primary.button--mobileFull(
-          v-on:click="export_data"
-        ) Export

template/module/journey/leg.pug

@@ -1,11 +0,0 @@
-include leg/nav.pug
-.bg-dark.text-white(v-if="journey && journey.leg_get()")
-  .container.section
-    include leg/top.pug
-    .row(style="aspect-ratio:1.25;")
-      .map-container(:class="{ 'col-9': query.type, 'col-12': !query.type }" )
-        include map.pug
-      .drawer-container(:class="{ 'col-3': query.type, 'col-0': !query.type }")
-        include leg/drawer.pug
-        
-    include leg/old_cfg.pug 

template/module/journey/leg/nav.pug

@@ -1,23 +0,0 @@
-.scroll-handler(
-  @mouseleave="nav_mouseleave"
-  @mousemove="nav_mousemove")
-  draggable.scroll-content.list-group.bg-dark(
-    tag="div",
-    :list="journey.data.main",
-    handle=".handle"
-  )
-    .list-group-item.handle(
-      v-for="(element, idx) in journey.data.main",
-      :key="idx",
-      @click="journey.leg_sel(idx)",
-      :class="journey.sel_leg == idx ? 'bg-primary' : 'bg-white'"
-    )
-      .text {{ element.title }}
-      i.fa.fa-times.close.fright(
-        style="top: 2px; right: 2px; position: absolute",
-        @click="journey.rm_leg(idx)"
-      )
-
-    .list-group-item.bg-white(@click="journey.add_leg()")
-      .text Add Leg
-      i.fa.fa-plus.add(style="top: 12px; right: 5px; position: absolute")

template/module/journey/leg/old_cfg.pug

@@ -1,12 +0,0 @@
-div
-  div
-    .row.text-center
-        div
-            label Notes
-            .input.text-dark(style="width: 100%")
-                textarea-autosize.text-small(
-              v-model="journey.leg_get().notes",
-              placeholder="Notes",
-              :min-height="30",
-              :max-height="350"
-            )

template/module/journey/leg/top.pug

@@ -1,29 +0,0 @@
-.row.text-center
-    .col-sm-2
-        .input
-            input(v-model="journey.leg_get().title")
-    .col-sm-2
-        .input
-            input(
-            placeholder="Day title",
-            v-model="journey.leg_get().day_title[journey.sel_day]"
-        )
-
-    .col-sm-4
-        .input
-            //- label Date Range ({{ journey.leg_len() }})
-            date-picker(
-            :lang="lang",
-            v-model="journey.leg_get().date_range",
-            range="",
-            format="ddd D MMM",
-            placeholder="Date Range",
-            v-on:change="journey.date_update(journey.sel_leg)"
-        )
-    .col-sm-2
-    .right.col-sm-2
-        .input
-            input(
-            disabled="",
-            :value="journey.date_sel() + ' (' + journey.sel_day + ')'"
-            )

template/module/journey/map/override.pug

@@ -1,5 +0,0 @@
-l-marker(
-    v-if="map_override.active",
-    :lat-lng="map_override.center"
-  )
-  l-icon(v-html="generate_marker('plus', 'darkgreen')")

template/module/journey/map/restaurants.pug

@@ -1,18 +0,0 @@
-l-marker(
-    v-for="(place, index) in journey.leg_get().places.restaurants",
-      :key="'restaurants'+index"
-    :lat-lng="place.latlon"
-  )
-  l-icon(v-html="generate_marker(place, 'cadetblue')")
-  l-popup
-    h1.row.text-medium.text-center {{ place.sname }}
-    span.row.text-small.text-gray {{ place.display_name }}
-    span(v-if="edit_active")
-      .row.input(style="margin-bottom:0")
-        textarea-autosize.col-12.col-sm-12.text-small(
-          placeholder="Notes"
-          v-model="place.notes"
-          :min-height="30"
-          :max-height="350"
-        )
-    span.row.text-small.text-dark(v-else) {{ place.notes }}

template/module/journey/map/right_menu.pug

@@ -1,6 +0,0 @@
-.map-menu
-    .map-menu-item( v-if="query.type" @click="query.type=''" v-html="generate_icon('close')")
-    .map-menu-item(v-if="!query.type" @click="query.type='hotel'" v-html="generate_icon('bed')")
-    .map-menu-item(v-if="!query.type" @click="query.type='restaurant'" v-html="generate_icon('utensils')")
-    .map-menu-item(v-if="!query.type" @click="query.type='place'" v-html="generate_icon('star')")
-    .map-menu-item(v-if="!query.type" @click="query.type='flight'" v-html="generate_icon('plane')")

template/module/journey/map/travel.pug

@@ -1,9 +0,0 @@
-div(v-for= "travel in journey.leg_get().travel")
-  l-polyline(:lat-lngs="travel.path" :color="travel.color || 'gray'")
-  l-marker(
-      v-for="(place, index) in travel.path"
-      :key="'plane'+index"
-      :lat-lng="place"
-    )
-    l-icon(v-html="generate_icon('plane', travel.color || 'gray', generate_rotation(index,travel.path), 'travel-path-icon')"
-      )

template/module/nav.pug

@@ -1,38 +0,0 @@
-header.header
-  .header-inner.container
-    a.header-logo.text-dark(href="/")
-      img.header-logoImage(
-        src="/public/img/helcel.png",
-        alt="Helcel logo",
-        width="40"
-      )
-      span.hide-small OTM
-    .input.input-invis.row
-      input.col-6.small(v-model="journey.data.name", type="text")
-      input.col-6.small(
-        disabled,
-        type="text",
-        :placeholder="journey.date_tot() + ' (' + journey.tot_len() + ')'"
-      )
-    .row.header-nav.text-big(style="margin-bottom: 0")
-      .col-sm-2
-        a(:href="'/short/' + journey.id")
-          i.fas.fa-file-contract
-      .col-sm-2
-        a(:href="'/view/' + journey.id")
-          i.fas.fa-camera
-      .col-sm-2
-        a(href="#main", v-on:click.prevent="first_step")
-          i.fas.fa-tools
-      .col-sm-1.text-small
-        a(href="#prevprev", v-on:click.prevent="journey.leg_prev()")
-          i.fas.fa-angle-double-left
-      .col-sm-1
-        a(href="#prev", v-on:click.prevent="journey.day_prev()")
-          i.fas.fa-angle-left
-      .col-sm-1
-        a(href="#next", v-on:click.prevent="journey.day_next()")
-          i.fas.fa-angle-right
-      .col-sm-1.text-small
-        a(href="#nextnext", v-on:click.prevent="journey.leg_next()")
-          i.fas.fa-angle-double-right

template/module/view/nav.pug

@@ -1,18 +0,0 @@
-header.header
-  .header-inner.container
-    a.header-logo.text-dark(href="/")
-      img.header-logoImage(
-        src="/public/img/helcel.png",
-        alt="Helcel logo",
-        width="40"
-      )
-      span.hide-small HOTM
-    .input.input-invis
-      input.small(:value="journey.data.name", type="text", disabled="")
-    .row.header-nav.text-big(style="margin-bottom: 0")
-      .col-sm-3
-        a(:href="'/short/' + journey.id")
-          i.fas.fa-file-contract
-      .col-sm-3
-        a(:href="'/view/' + journey.id")
-          i.fas.fa-camera

template/module/view/short_leg.pug

@@ -1,43 +0,0 @@
-.container.section
-  .row.text-center
-    .input.col-sm-2
-      input(disabled="", :value="item.title")
-    .input.col-sm-4
-      input(
-        disabled="",
-        placeholder="No Dates",
-        :value="item.date_range ? format_date(item.date_range[0]) + ' - ' + format_date(item.date_range[1]) : ''"
-      )
-    .input.col-sm-2
-      input(disabled="", placeholder="No Hotel", :value="item.hotel.sname")
-  .row.text-center
-    .input.col-sm-3(v-if="item.transit")
-      div(v-for="(item, idx) in item.transit")
-        input(disabled="", :value="item.map((v) => v.id).join(', ')")
-  .row.text-center
-    .input.col-sm-8(v-if="item.places && item.places.restaurants")
-      textarea-autosize.text-small(
-        placeholder="No Restaurants",
-        :value="item.places.restaurants.map((v) => v.sname + (v.notes ? '(' + v.notes + ')' : '')).join(', ')",
-        :min-height="30",
-        :max-height="350",
-        disabled=""
-      )
-  .row.text-center
-    .input.col-sm-8(v-if="item.places && item.places.activities")
-      textarea-autosize.text-small(
-        placeholder="No Activities",
-        :value="item.places.activities.map((v) => v.sname + (v.notes ? '(' + v.notes + ')' : '')).join(', ')",
-        :min-height="30",
-        :max-height="350",
-        disabled=""
-      )
-  .row.text-center
-    .input.col-sm-8(v-if="item.notes")
-      textarea-autosize.text-small(
-        placeholder="No Notes",
-        :value="item.notes",
-        :min-height="30",
-        :max-height="350",
-        disabled=""
-      )

template/module/view/view_day.pug

@@ -1,19 +0,0 @@
-div(v-for="(e, idx) in journey.data.main", :key="idx")
-  .bg-dark.text-white(v-if="journey.sel_leg == idx")
-    .container.section
-      .aligner.text-center.text-white.text-huge(style="margin-bottom: 5px")
-        .aligner--itemTop.fleft
-          a(href="#prev", v-on:click.prevent="journey.day_prev()")
-            i.fas.fa-angle-left
-        span.container
-          span.small {{ journey.data.main[idx].title }} {{ journey.sel_day }}
-          .text-big.text-gray {{ journey.data.main[idx].day_title[journey.sel_day] }}
-        .aligner--itemEnd.fright
-          a(href="#next", v-on:click.prevent="journey.day_next()")
-            i.fas.fa-angle-right
-      .row
-        .col-12.col-sm-12
-          include map.pug
-      .row
-        .col-12.col-sm-12
-          .container

template/short.pug

@@ -1,10 +0,0 @@
-doctype html
-include module/head.pug
-main#app(v-cloak)
-  include module/view/nav.pug
-  div(
-    v-for="(item, idx) in journey.data.main",
-    :class="idx % 2 === 0 ? 'bg-dark text-white' : ''"
-  )
-    include module/view/short_leg.pug
-include module/foot.pug