diff --git a/dockerfile b/dockerfile index 63003cd..b1af6ba 100644 --- a/dockerfile +++ b/dockerfile @@ -7,7 +7,7 @@ RUN npm install COPY . ./ RUN npm run build -FROM nginx:alpine-slim +FROM georgjung/nginx-brotli:mainline-alpine RUN rm -f /etc/nginx/nginx.conf COPY ./nginx.conf /etc/nginx/nginx.conf COPY --from=build /app/build /usr/share/nginx/html diff --git a/nginx.conf b/nginx.conf index e0f7712..12058cd 100644 --- a/nginx.conf +++ b/nginx.conf @@ -1,3 +1,5 @@ +load_module modules/ngx_http_brotli_static_module.so; + user nginx; worker_processes auto; @@ -44,6 +46,7 @@ http { root /usr/share/nginx/html; index index.html; gzip_static on; + brotli_static on; error_page 500 502 503 504 /50x.html; try_files $uri $uri.html $uri/ =404; add_header Cache-Control "public, no-transform, max-age=1209600"; diff --git a/src/app.css b/src/app.css index 7663de0..e403cbd 100644 --- a/src/app.css +++ b/src/app.css @@ -28,7 +28,8 @@ @font-face { font-family: 'ubuntu'; - src: url('/font/ubuntumono/ubuntumono-regular.woff2') format('woff2'), url('/font/ubuntumono/ubuntumono-refular.woff') format('woff'), url('/font/ubuntumono/ubuntumono-regular.ttf') format('truetype'); + src: url('/font/ubuntumono/ubuntumono-regular.woff2') format('woff2'), url('/font/ubuntumono/ubuntumono-regular.woff') format('woff'), + url('/font/ubuntumono/ubuntumono-regular.ttf') format('truetype'); font-weight: 400; font-style: normal; } diff --git a/src/lib/ldb/staff/table/table-generator.svelte b/src/lib/ldb/staff/table/table-generator.svelte index 561c346..4c91c9b 100644 --- a/src/lib/ldb/staff/table/table-generator.svelte +++ b/src/lib/ldb/staff/table/table-generator.svelte @@ -150,72 +150,78 @@ click(rid, uid, tid); } +

Your display is too small to view this data

- - - - - - - - - - - - - - - - {#each services as service} - {#await generateServiceData(service)} - - {:then serviceData} - detail(event, service.rid, service.uid, service.trainid)} - on:keypress={(event) => detail(event, service.rid, service.uid, service.trainid)} +
IDFromToPlatSchExpSchExp
- ArrivalDeparture
Loading Service Data...
+ + + + + + + + + + + + + + + {#each services as service} + {#await generateServiceData(service)} + + {:then serviceData} + detail(event, service.rid, service.uid, service.trainid)} + on:keypress={(event) => detail(event, service.rid, service.uid, service.trainid)} + > + + + + - - - - - - - - + + + - - - - - {:catch} - - - - {/await} - {/each} -
IDFromToPlatSchExpSchExp
+ ArrivalDeparture
Loading Service Data...
{service.trainid}{serviceData.from}{serviceData.to}{serviceData.platform.number || '-'}{service.trainid}{serviceData.from}{serviceData.to}{serviceData.platform.number || '-'}{serviceData.schArr}{serviceData.isArrDelayed ? 'LATE' : serviceData.expArr}{serviceData.schDep}{serviceData.schArr}{serviceData.isArrDelayed ? 'LATE' : serviceData.expArr}{serviceData.schDep}{serviceData.isDepDelayed ? 'LATE' : serviceData.expDep}
- {service.operator} {#if service.isCharter}charter{/if} - {#if serviceData.length} | {serviceData.length} carriages{/if} - {#if service.delayReason} -
- - {/if} - {#if service.cancelReason} -
- - {/if} -
Unable to display service
+ > + + + + {service.operator} + {#if service.isCharter}charter{/if} + {#if serviceData.length} | {serviceData.length} carriages{/if} + {#if service.delayReason} +
+ + {/if} + {#if service.cancelReason} +
+ + {/if} + + + {:catch} + + Unable to display service + + {/await} + {/each} +