Margin fixes

This commit is contained in:
Fred Boniface 2023-07-11 22:59:41 +01:00
parent 0c5d488d1f
commit 8676a62f1e
15 changed files with 55 additions and 21 deletions

View File

@ -20,11 +20,11 @@
/** /**
* @type {string | any[]} * @type {string | any[]}
*/ */
let busServices = []; let busServices = [];
/** /**
* @type {string | any[]} * @type {string | any[]}
*/ */
let ferryServices = []; let ferryServices = [];
let dataAge = new Date(0); let dataAge = new Date(0);
let isLoading = true; let isLoading = true;
let isErr = false; let isErr = false;
@ -138,7 +138,7 @@
return processedMessages; return processedMessages;
} }
function showDetail(rid='', uid='', tid='') { function showDetail(rid = '', uid = '', tid = '') {
detail = { detail = {
rid: rid, rid: rid,
uid: uid, uid: uid,
@ -184,15 +184,14 @@
<p id="noservices">There are no scheduled train services in the next two hours</p> <p id="noservices">There are no scheduled train services in the next two hours</p>
{/if} {/if}
{#if busServices && busServices.length} {#if busServices && busServices.length}
<img class="transport-mode-image" src="/images/transport-modes/bus.svg" alt="" />
<img class="transport-mode-image"src="/images/transport-modes/bus.svg" alt=""> <br />
<br>
<span class="transport-mode-text">Bus Services</span> <span class="transport-mode-text">Bus Services</span>
<TableGenerator services={busServices} click={showDetail} /> <TableGenerator services={busServices} click={showDetail} />
{/if} {/if}
{#if ferryServices && ferryServices.length} {#if ferryServices && ferryServices.length}
<img class="transport-mode-image"src="/images/transport-modes/ferry.svg" alt=""> <img class="transport-mode-image" src="/images/transport-modes/ferry.svg" alt="" />
<br> <br />
<span class="transport-mode-text">Ferry Services</span> <span class="transport-mode-text">Ferry Services</span>
<TableGenerator services={ferryServices} click={showDetail} /> <TableGenerator services={ferryServices} click={showDetail} />
{/if} {/if}

View File

@ -145,9 +145,9 @@
}; };
} }
function detail(event,rid,uid,tid) { function detail(event, rid, uid, tid) {
const target = event.target; const target = event.target;
click(rid,uid,tid) click(rid, uid, tid);
} }
</script> </script>
@ -172,7 +172,11 @@
{#await generateServiceData(service)} {#await generateServiceData(service)}
<tr><td colspan="8">Loading Service Data...</td></tr> <tr><td colspan="8">Loading Service Data...</td></tr>
{:then serviceData} {:then serviceData}
<tr class="dataRow" on:click={(event) => detail(event, service.rid, service.uid, service.trainid)} on:keypress={(event) => detail(event, service.rid, service.uid, service.trainid)}> <tr
class="dataRow"
on:click={(event) => detail(event, service.rid, service.uid, service.trainid)}
on:keypress={(event) => detail(event, service.rid, service.uid, service.trainid)}
>
<td class="id">{service.trainid}</td> <td class="id">{service.trainid}</td>
<td class="from {serviceData.isNonPublic && 'nonPass'} {serviceData.isCancelled && 'cancTxt'}">{serviceData.from}</td> <td class="from {serviceData.isNonPublic && 'nonPass'} {serviceData.isCancelled && 'cancTxt'}">{serviceData.from}</td>
<td class="to {serviceData.isNonPublic && 'nonPass'} {serviceData.isCancelled && 'cancTxt'}">{serviceData.to}</td> <td class="to {serviceData.isNonPublic && 'nonPass'} {serviceData.isCancelled && 'cancTxt'}">{serviceData.to}</td>
@ -196,7 +200,7 @@
<Reason type={'delay'} code={service.delayReason} /> <Reason type={'delay'} code={service.delayReason} />
{/if} {/if}
{#if service.cancelReason} {#if service.cancelReason}
<br> <br />
<Reason type={'cancel'} code={service.cancelReason} /> <Reason type={'cancel'} code={service.cancelReason} />
{/if} {/if}
</td> </td>

View File

@ -198,9 +198,8 @@
font-size: 14px; font-size: 14px;
} }
#detailTable { #detailTable {
margin-top: 10px; margin-top: 10px;
margin:auto; margin: auto;
color: white; color: white;
} }
.tableLocation { .tableLocation {

View File

@ -13,8 +13,8 @@
<div class="container"> <div class="container">
<div class="container-header" on:click={expand} on:keypress={expand}> <div class="container-header" on:click={expand} on:keypress={expand}>
<span class="header" <span class="header"
>{service.operator || 'GW'}: {service.stops[0]['publicDeparture'] || service.stops[0]['wttDeparture']} >{service?.operator || ''}: {service?.stops[0]['publicDeparture'] || service?.stops[0]['wttDeparture']}
{service.stops[0]['tiploc']} to {service.stops[service['stops'].length - 1]['tiploc']}</span {service?.stops[0]['tiploc']} to {service?.stops[service['stops'].length - 1]['tiploc']}</span
> >
<span id="container-arrow" class:isExpanded>V</span> <span id="container-arrow" class:isExpanded>V</span>
</div> </div>

View File

@ -6,14 +6,14 @@
const links = [ const links = [
{ title: 'Your Data', path: '/more/data' }, { title: 'Your Data', path: '/more/data' },
{ title: 'Registration', path: '/more/reg' }, { title: 'Registration', path: '/more/reg' },
{ title: 'Settings', path: '/more/settings' },
{ title: 'Report Issue', path: '/more/report' },
{ title: 'About', path: '/more/about' },
{ title: 'Location Reference Code Lookup', path: '/more/corpus' }, { title: 'Location Reference Code Lookup', path: '/more/corpus' },
{ title: 'Reason Code Lookup', path: '/more/reasons' }, { title: 'Reason Code Lookup', path: '/more/reasons' },
{ title: 'Privacy Policy', path: '/more/privacy' }, { title: 'Privacy Policy', path: '/more/privacy' },
{ title: 'Component Versions', path: '/more/versions' }, { title: 'Component Versions', path: '/more/versions' },
{ title: 'Statictics', path: '/more/statistics' }, { title: 'Statistics', path: '/more/statistics' }
{ title: 'Settings', path: '/more/settings' },
{ title: 'Report Issue', path: '/more/report' },
{ title: 'About', path: '/more/about' }
]; ];
</script> </script>

View File

@ -20,6 +20,10 @@
<Nav /> <Nav />
<style> <style>
p {
margin-left: 10px;
margin-right: 10px;
}
.neg { .neg {
margin-top: -40px; margin-top: -40px;
margin-bottom: 40px; margin-bottom: 40px;

View File

@ -100,6 +100,9 @@
<Nav /> <Nav />
<style> <style>
p {
margin: 10px;
}
input { input {
font-family: urwgothic, sans-serif; font-family: urwgothic, sans-serif;
border-radius: 50px; border-radius: 50px;

View File

@ -52,6 +52,9 @@
<Nav /> <Nav />
<style> <style>
p {
margin: 10px;
}
.api_response { .api_response {
color: white; color: white;
} }

View File

@ -85,6 +85,7 @@
<style> <style>
p { p {
margin: 10px;
margin-top: 20px; margin-top: 20px;
} }
input { input {

View File

@ -88,6 +88,9 @@
<Nav /> <Nav />
<style> <style>
p {
margin: 10px;
}
ul { ul {
text-align: left; text-align: left;
color: white; color: white;

View File

@ -71,3 +71,9 @@
<p>You are now logged in</p> <p>You are now logged in</p>
{/if} {/if}
<Nav /> <Nav />
<style>
p {
margin: 14px;
}
</style>

View File

@ -127,6 +127,10 @@
<Nav /> <Nav />
<style> <style>
p {
margin-left: 10px;
margin-right: 10px;
}
select { select {
text-align: center; text-align: center;
border: none; border: none;

View File

@ -27,6 +27,7 @@
{#await getData()} {#await getData()}
<Loading /> <Loading />
{:then data} {:then data}
<br />
<p>API Server:<br /><span>{data?.hostname}</span></p> <p>API Server:<br /><span>{data?.hostname}</span></p>
<p>Runtime Mode: <span>{data?.runtimeMode}</span></p> <p>Runtime Mode: <span>{data?.runtimeMode}</span></p>
<p>Stats Reset: <span>{U2L(data?.reset) || 'Unknown'}</span></p> <p>Stats Reset: <span>{U2L(data?.reset) || 'Unknown'}</span></p>
@ -70,6 +71,7 @@
color: lightgray; color: lightgray;
} }
h2 { h2 {
font-family: urwgothic, sans-serif;
margin-bottom: 2px; margin-bottom: 2px;
margin-top: 8px; margin-top: 8px;
} }

View File

@ -113,6 +113,10 @@
<Nav /> <Nav />
<style> <style>
p {
margin-left: 10px;
margin-right: 10px;
}
.label { .label {
font-weight: 600; font-weight: 600;
color: var(--main-text-color); color: var(--main-text-color);

View File

@ -86,7 +86,9 @@
{/if} {/if}
{#each data as service} {#each data as service}
<TrainDetail {service} /> {#if service}
<TrainDetail {service} />
{/if}
{/each} {/each}
<Nav /> <Nav />