sora/OTM
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

cleanup
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
choelzl 2021-07-16 16:54:31 +02:00
parent d64c4ad26f
commit a7b21906ba
Signed by: sora
GPG Key ID: A362EA0491E2EEA0
3 changed files with 324 additions and 244 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/js/main.js
View File

@ -76,7 +76,7 @@ Vue.component('multiselect', window.VueMultiselect.default)
const app = new Vue({ const app = new Vue({
el: '#app', el: '#app',
data: { data: {
journey_id : window.location.pathname.slice(1) || gen_id(16), journey_id : window.location.pathname.split('/').at(-1) || gen_id(16),
journey_step: window.location.hash.slice(1)==""?-1:parseInt(window.location.hash.slice(1)), journey_step: window.location.hash.slice(1)==""?-1:parseInt(window.location.hash.slice(1)),
journey_step_data: {day:-1, section:-1}, journey_step_data: {day:-1, section:-1},
journey_data : { journey_data : {
@ -84,6 +84,7 @@ const app = new Vue({
main:[], main:[],
step_title:[], step_title:[],
}, },
view: window.location.pathname.split('/').at(1),
query:{hotel:[],flight:[],nominatim:[]}, query:{hotel:[],flight:[],nominatim:[]},
querying:{hotel:false,flight:false,place:false,food:false}, querying:{hotel:false,flight:false,place:false,food:false},
impexp:"", impexp:"",
@ -106,6 +107,7 @@ const app = new Vue({
prev_step: function(){ prev_step: function(){
this.journey_step-=1; this.journey_step-=1;
if(this.journey_step<-1) this.journey_step=-1; if(this.journey_step<-1) this.journey_step=-1;
if(this.journey_step==-1 && this.view) this.journey_step=0;
this.journey_step_data = this.step_convert(this.journey_step); this.journey_step_data = this.step_convert(this.journey_step);
window.location.hash = '#' + this.journey_step; window.location.hash = '#' + this.journey_step;

87
public/template/journey.html
View File

@ -33,6 +33,7 @@
</head> </head>
<body> <body>
<main id="app"> <main id="app">
<div v-if="!view">
<header class="header"> <header class="header">
<div class="header-inner container"> <div class="header-inner container">
<a href="/" class="header-logo text-dark"> <a href="/" class="header-logo text-dark">
@ -292,6 +293,7 @@
</l-popup> </l-popup>
</div> </div>
</l-marker>
</l-map> </l-map>
</div> </div>
</div> </div>
@ -300,10 +302,10 @@
<div class="container text-center" v-if="journey_step_data.start || journey_step_data.end"> <div class="container text-center" v-if="journey_step_data.start || journey_step_data.end">
<b>Flights</b> <b>Flights</b>
<div v-if="journey_step_data.start"> <div v-if="journey_step_data.start">
<div v-for="element in journey_data.main[journey_step_data.section].flightA"><a :href="'https://www.flightradar24.com/data/flights/'+element.id">{{ element.label }}</a></div> <div v-for="element in journey_data.main[journey_step_data.section].flightA"><a href="#fligh" v-on:click.prevent="window.open('https://www.flightradar24.com/data/flights/'+element.id,'_blank')">{{ element.label }}</a></div>
</div> </div>
<div v-if="journey_step_data.end"> <div v-if="journey_step_data.end">
<div v-for="element in journey_data.main[journey_step_data.section].flightB"><a :href="'https://www.flightradar24.com/data/flights/'+element.id">{{ element.label }}</a></div> <div v-for="element in journey_data.main[journey_step_data.section].flightB"><a href="#fligh" v-on:click.prevent="window.open('https://www.flightradar24.com/data/flights/'+element.id,'_blank')">{{ element.label }}</a></div>
</div> </div>
</div> </div>
<div class="container"></div> <div class="container"></div>
@ -330,6 +332,85 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<div v-else>
<div class="bg-dark text-white" v-cloak>
<div class="container section">
<div class="row text-center">
<span class="col-10 text-huge text-white" style="margin-bottom:10px"><div class="row">{{journey_data.main[journey_step_data.section].title + ': Day ' + journey_step_data.day}}</div><div class="row text-big text-gray">{{journey_data.step_title[journey_step]}}</div></span>
<div class="col-2 text-white text-huge">
<div class="row">
<div class="col-6"><a href="#prev" v-on:click.prevent="prev_step"><</a></div>
<div class="col-6"><a href="#next" v-on:click.prevent="next_step">></a></div>
</div>
</div>
</div>
<div class="row">
<div class="col-12 col-sm-12">
<l-map
:zoom=" journey_data.main[journey_step_data.section].map.zoom"
:center="journey_data.main[journey_step_data.section].map.center"
style="padding-top: 100%;"
>
<l-tile-layer
url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
attribution='&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
></l-tile-layer>
<l-control-scale position="topright" :imperial="false" :metric="true"></l-control-scale>
<l-marker v-if="journey_data.main[journey_step_data.section].hotel &&
journey_data.main[journey_step_data.section].hotel.icon"
:lat-lng="journey_data.main[journey_step_data.section].hotel.latlon">
<l-icon>
<div v-html="generate_icon(journey_data.main[journey_step_data.section].hotel,'darkblue')"></div>
</l-icon>
<l-popup>
<h1 class="row text-medium text-center">{{journey_data.main[journey_step_data.section].hotel.sname}}</h1>
<span class="row text-small text-gray">{{journey_data.main[journey_step_data.section].hotel.display_name}}</span>
<span class="row text-small text-white">{{journey_data.main[journey_step_data.section].hotel.notes}}</span>
</l-popup>
</l-marker>
<l-marker v-for="place in journey_data.main[journey_step_data.section].places.activities" :lat-lng="place.latlon" v-if="place.step==journey_step" >
<l-icon>
<div v-html="generate_icon(place)"></div>
</l-icon>
<l-popup>
<h1 class="row text-medium text-center">{{place.sname}}</h1>
<span class="row text-small text-gray">{{place.display_name}}</span>
<span class="row text-small text-white">{{place.notes}}</span>
</l-popup>
</l-marker>
<l-marker v-for="place in journey_data.main[journey_step_data.section].places.restaurants" :lat-lng.sync="place.latlon">
<l-icon>
<div v-html="generate_icon(place,'cadetblue')"></div>
</l-icon>
<l-popup>
<h1 class="row text-medium text-center">{{place.sname}}</h1>
<span class="row text-small text-gray">{{place.display_name}}</span>
<span class="row text-small text-white">{{place.notes}}</span>
</l-popup>
</l-marker>
</l-map>
</div>
</div>
<div class="row">
<div class="col-12 col-sm-12">
<div class="container text-center" v-if="journey_step_data.start || journey_step_data.end">
<b>Flights</b>
<div v-if="journey_step_data.start">
<div v-for="element in journey_data.main[journey_step_data.section].flightA"><a href="#fligh" v-on:click.prevent="window.open('https://www.flightradar24.com/data/flights/'+element.id,'_blank')">{{ element.label }}</a></div>
</div>
<div v-if="journey_step_data.end">
<div v-for="element in journey_data.main[journey_step_data.section].flightB"><a href="#fligh" v-on:click.prevent="window.open('https://www.flightradar24.com/data/flights/'+element.id,'_blank')">{{ element.label }}</a></div>
</div>
</div>
<div class="container"></div>
</div>
</div>
</div>
</div>
</div>
</main> </main>
<script src="/public/js/main.js" type="text/javascript" charset="utf-8"></script> <script src="/public/js/main.js" type="text/javascript" charset="utf-8"></script>
@ -340,8 +421,6 @@
<img src="/public/img/helcel.png" alt="helcel logo" width="100"><br><br> <img src="/public/img/helcel.png" alt="helcel logo" width="100"><br><br>
Built with &nbsp; ❤ &nbsp; by Helcel <br><span class="text-small text-gray">v0.0.1</span> Built with &nbsp; ❤ &nbsp; by Helcel <br><span class="text-small text-gray">v0.0.1</span>
</p> </p>
<p class="text-gray"><a href="https://git.helcel.net">Helcel Git</a></p>
</div> </div>
</div> </div>
</footer> </footer>

5
server.js
View File

@ -16,9 +16,7 @@ fastify.register(require('fastify-leveldb'), {
fastify.get('/', (req, reply) => { fastify.get('/', (req, reply) => reply.sendFile('/template/home.html'));
reply.sendFile('/template/home.html');
});
fastify.register(require('./router/api'), { prefix: '/api' }); fastify.register(require('./router/api'), { prefix: '/api' });
fastify.get('/:id', (req, reply) => { fastify.get('/:id', (req, reply) => {
@ -43,6 +41,7 @@ fastify.get('/:id', (req, reply) => {
reply.sendFile('/template/journey.html'); reply.sendFile('/template/journey.html');
} }
}); });
fastify.get('/view/:id', (req, reply) => reply.sendFile('/template/journey.html'));