From dcf6ad42176677b83cd5b17ac39a6266868cac7a Mon Sep 17 00:00:00 2001 From: jaskaran Date: Fri, 26 Mar 2021 11:04:51 +0000 Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=A4=96=20remove=20static/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .kubernetes/ingress.yaml | 30 +- .routify/config.js | 4 +- .routify/routes.js | 388 +------------------------- package.json | 2 +- public/{static => }/favicon.png | Bin public/index.html | 2 +- public/{static => }/open.jpg | Bin public/{static => }/outside-enki.webp | Bin src/pages/index.svelte | 8 +- 9 files changed, 9 insertions(+), 425 deletions(-) rename public/{static => }/favicon.png (100%) rename public/{static => }/open.jpg (100%) rename public/{static => }/outside-enki.webp (100%) diff --git a/.kubernetes/ingress.yaml b/.kubernetes/ingress.yaml index 88cf4ae8..bc5306bd 100644 --- a/.kubernetes/ingress.yaml +++ b/.kubernetes/ingress.yaml @@ -1,30 +1,3 @@ -apiVersion: extensions/v1beta1 -kind: Ingress -metadata: - name: enki - annotations: - kubernetes.io/ingress.class: "nginx" - nginx.ingress.kubernetes.io/use-regex: "true" - nginx.ingress.kubernetes.io/proxy-connect-timeout: "7200" - nginx.ingress.kubernetes.io/proxy-send-timeout: "7200" - nginx.ingress.kubernetes.io/proxy-read-timeout: "7200" - cert-manager.io/issuer: "letsencrypt-prod" -spec: - tls: - - secretName: enki-website - hosts: - - enki.jobspeed.uk - rules: - - host: enki.jobspeed.uk - http: - paths: - - path: /* - backend: - servicePort: 5000 - serviceName: enki-website - ---- - apiVersion: extensions/v1beta1 kind: Ingress metadata: @@ -38,7 +11,6 @@ metadata: cert-manager.io/issuer: "letsencrypt-prod" nginx.ingress.kubernetes.io/configuration-snippet: | more_set_headers "Cache-Control: public, max-age=604800"; - spec: tls: - secretName: enki-website @@ -48,7 +20,7 @@ spec: - host: enki.jobspeed.uk http: paths: - - path: /static/* + - path: /* backend: servicePort: 5000 serviceName: enki-website diff --git a/.routify/config.js b/.routify/config.js index ee60de5e..5ee6d77d 100644 --- a/.routify/config.js +++ b/.routify/config.js @@ -4,9 +4,9 @@ module.exports = { routifyDir: '.routify', ignore: '', dynamicImports: true, - singleBuild: false, + singleBuild: true, noHashScroll: false, distDir: 'dist', extensions: ['svelte', 'html', 'svx', 'md'], - started: '2021-03-25T11:32:23.431Z', + started: '2021-03-26T10:54:34.657Z', }; diff --git a/.routify/routes.js b/.routify/routes.js index 64ff520d..a3b22dd1 100644 --- a/.routify/routes.js +++ b/.routify/routes.js @@ -1,10 +1,10 @@ /** * @roxi/routify 2.7.3 - * File generated Thu Mar 25 2021 11:32:25 GMT+0000 (Greenwich Mean Time) + * File generated Fri Mar 26 2021 10:54:36 GMT+0000 (Greenwich Mean Time) */ export const __version = '2.7.3'; -export const __timestamp = '2021-03-25T11:32:25.031Z'; +export const __timestamp = '2021-03-26T10:54:36.141Z'; //buildRoutes import { buildClientTree } from '@roxi/routify/runtime/buildRoutes'; @@ -16,45 +16,14 @@ export const options = {}; //tree export const _tree = { - name: '_layout', - filepath: '/_layout.svelte', root: true, - ownMeta: {}, - absolutePath: '/home/jaskaran/fun/enki-website/src/pages/_layout.svelte', children: [ { - isFile: true, isDir: true, - file: '_layout.svelte', - filepath: '/classes/_layout.svelte', - name: '_layout', - ext: 'svelte', - badExt: false, - absolutePath: - '/home/jaskaran/fun/enki-website/src/pages/classes/_layout.svelte', children: [ { - isFile: true, - isDir: false, - file: 'index.svelte', - filepath: '/classes/index.svelte', - name: 'index', - ext: 'svelte', - badExt: false, - absolutePath: - '/home/jaskaran/fun/enki-website/src/pages/classes/index.svelte', - importPath: '../src/pages/classes/index.svelte', - isLayout: false, - isReset: false, isIndex: true, - isFallback: false, isPage: true, - ownMeta: {}, - meta: { - recursive: true, - preload: false, - prerender: true, - }, path: '/classes/index', id: '_classes_index', component: () => @@ -62,55 +31,17 @@ export const _tree = { }, ], isLayout: true, - isReset: false, - isIndex: false, - isFallback: false, - isPage: false, - importPath: '../src/pages/classes/_layout.svelte', - ownMeta: {}, - meta: { - recursive: true, - preload: false, - prerender: true, - }, path: '/classes', id: '_classes__layout', component: () => import('../src/pages/classes/_layout.svelte').then((m) => m.default), }, { - isFile: true, isDir: true, - file: '_layout.svelte', - filepath: '/contact/_layout.svelte', - name: '_layout', - ext: 'svelte', - badExt: false, - absolutePath: - '/home/jaskaran/fun/enki-website/src/pages/contact/_layout.svelte', children: [ { - isFile: true, - isDir: false, - file: 'index.svelte', - filepath: '/contact/index.svelte', - name: 'index', - ext: 'svelte', - badExt: false, - absolutePath: - '/home/jaskaran/fun/enki-website/src/pages/contact/index.svelte', - importPath: '../src/pages/contact/index.svelte', - isLayout: false, - isReset: false, isIndex: true, - isFallback: false, isPage: true, - ownMeta: {}, - meta: { - recursive: true, - preload: false, - prerender: true, - }, path: '/contact/index', id: '_contact_index', component: () => @@ -118,81 +49,24 @@ export const _tree = { }, ], isLayout: true, - isReset: false, - isIndex: false, - isFallback: false, - isPage: false, - importPath: '../src/pages/contact/_layout.svelte', - ownMeta: {}, - meta: { - recursive: true, - preload: false, - prerender: true, - }, path: '/contact', id: '_contact__layout', component: () => import('../src/pages/contact/_layout.svelte').then((m) => m.default), }, { - isFile: true, - isDir: false, - file: 'index.svelte', - filepath: '/index.svelte', - name: 'index', - ext: 'svelte', - badExt: false, - absolutePath: '/home/jaskaran/fun/enki-website/src/pages/index.svelte', - importPath: '../src/pages/index.svelte', - isLayout: false, - isReset: false, isIndex: true, - isFallback: false, isPage: true, - ownMeta: {}, - meta: { - recursive: true, - preload: false, - prerender: true, - }, path: '/index', id: '_index', component: () => import('../src/pages/index.svelte').then((m) => m.default), }, { - isFile: true, isDir: true, - file: '_layout.svelte', - filepath: '/online-shop/_layout.svelte', - name: '_layout', - ext: 'svelte', - badExt: false, - absolutePath: - '/home/jaskaran/fun/enki-website/src/pages/online-shop/_layout.svelte', children: [ { - isFile: true, - isDir: false, - file: '[category].svelte', - filepath: '/online-shop/[category].svelte', - name: '[category]', - ext: 'svelte', - badExt: false, - absolutePath: - '/home/jaskaran/fun/enki-website/src/pages/online-shop/[category].svelte', - importPath: '../src/pages/online-shop/[category].svelte', - isLayout: false, - isReset: false, - isIndex: false, - isFallback: false, isPage: true, - ownMeta: {}, - meta: { - recursive: true, - preload: false, - prerender: true, - }, path: '/online-shop/:category', id: '_onlineShop__category', component: () => @@ -201,39 +75,11 @@ export const _tree = { ), }, { - isFile: false, isDir: true, - file: '[subCategory]', - filepath: '/online-shop/[subCategory]', - name: '[subCategory]', ext: '', - badExt: false, - absolutePath: - '/home/jaskaran/fun/enki-website/src/pages/online-shop/[subCategory]', children: [ { - isFile: true, - isDir: false, - file: '[subCategory].svelte', - filepath: '/online-shop/[subCategory]/[subCategory].svelte', - name: '[subCategory]', - ext: 'svelte', - badExt: false, - absolutePath: - '/home/jaskaran/fun/enki-website/src/pages/online-shop/[subCategory]/[subCategory].svelte', - importPath: - '../src/pages/online-shop/[subCategory]/[subCategory].svelte', - isLayout: false, - isReset: false, - isIndex: false, - isFallback: false, isPage: true, - ownMeta: {}, - meta: { - recursive: true, - preload: false, - prerender: true, - }, path: '/online-shop/:subCategory/:subCategory', id: '_onlineShop__subCategory__subCategory', component: () => @@ -242,41 +88,11 @@ export const _tree = { ).then((m) => m.default), }, ], - isLayout: false, - isReset: false, - isIndex: false, - isFallback: false, - isPage: false, - ownMeta: {}, - meta: { - recursive: true, - preload: false, - prerender: true, - }, path: '/online-shop/:subCategory', }, { - isFile: true, - isDir: false, - file: 'index.svelte', - filepath: '/online-shop/index.svelte', - name: 'index', - ext: 'svelte', - badExt: false, - absolutePath: - '/home/jaskaran/fun/enki-website/src/pages/online-shop/index.svelte', - importPath: '../src/pages/online-shop/index.svelte', - isLayout: false, - isReset: false, isIndex: true, - isFallback: false, isPage: true, - ownMeta: {}, - meta: { - recursive: true, - preload: false, - prerender: true, - }, path: '/online-shop/index', id: '_onlineShop_index', component: () => @@ -286,17 +102,6 @@ export const _tree = { }, ], isLayout: true, - isReset: false, - isIndex: false, - isFallback: false, - isPage: false, - importPath: '../src/pages/online-shop/_layout.svelte', - ownMeta: {}, - meta: { - recursive: true, - preload: false, - prerender: true, - }, path: '/online-shop', id: '_onlineShop__layout', component: () => @@ -305,92 +110,24 @@ export const _tree = { ), }, { - isFile: true, isDir: true, - file: '_layout.svelte', - filepath: '/payment/_layout.svelte', - name: '_layout', - ext: 'svelte', - badExt: false, - absolutePath: - '/home/jaskaran/fun/enki-website/src/pages/payment/_layout.svelte', children: [ { - isFile: true, - isDir: false, - file: 'basket.svelte', - filepath: '/payment/basket.svelte', - name: 'basket', - ext: 'svelte', - badExt: false, - absolutePath: - '/home/jaskaran/fun/enki-website/src/pages/payment/basket.svelte', - importPath: '../src/pages/payment/basket.svelte', - isLayout: false, - isReset: false, - isIndex: false, - isFallback: false, isPage: true, - ownMeta: {}, - meta: { - recursive: true, - preload: false, - prerender: true, - }, path: '/payment/basket', id: '_payment_basket', component: () => import('../src/pages/payment/basket.svelte').then((m) => m.default), }, { - isFile: true, - isDir: false, - file: 'cancel.svelte', - filepath: '/payment/cancel.svelte', - name: 'cancel', - ext: 'svelte', - badExt: false, - absolutePath: - '/home/jaskaran/fun/enki-website/src/pages/payment/cancel.svelte', - importPath: '../src/pages/payment/cancel.svelte', - isLayout: false, - isReset: false, - isIndex: false, - isFallback: false, isPage: true, - ownMeta: {}, - meta: { - recursive: true, - preload: false, - prerender: true, - }, path: '/payment/cancel', id: '_payment_cancel', component: () => import('../src/pages/payment/cancel.svelte').then((m) => m.default), }, { - isFile: true, - isDir: false, - file: 'checkout.svelte', - filepath: '/payment/checkout.svelte', - name: 'checkout', - ext: 'svelte', - badExt: false, - absolutePath: - '/home/jaskaran/fun/enki-website/src/pages/payment/checkout.svelte', - importPath: '../src/pages/payment/checkout.svelte', - isLayout: false, - isReset: false, - isIndex: false, - isFallback: false, isPage: true, - ownMeta: {}, - meta: { - recursive: true, - preload: false, - prerender: true, - }, path: '/payment/checkout', id: '_payment_checkout', component: () => @@ -399,27 +136,7 @@ export const _tree = { ), }, { - isFile: true, - isDir: false, - file: 'success.svelte', - filepath: '/payment/success.svelte', - name: 'success', - ext: 'svelte', - badExt: false, - absolutePath: - '/home/jaskaran/fun/enki-website/src/pages/payment/success.svelte', - importPath: '../src/pages/payment/success.svelte', - isLayout: false, - isReset: false, - isIndex: false, - isFallback: false, isPage: true, - ownMeta: {}, - meta: { - recursive: true, - preload: false, - prerender: true, - }, path: '/payment/success', id: '_payment_success', component: () => @@ -429,55 +146,17 @@ export const _tree = { }, ], isLayout: true, - isReset: false, - isIndex: false, - isFallback: false, - isPage: false, - importPath: '../src/pages/payment/_layout.svelte', - ownMeta: {}, - meta: { - recursive: true, - preload: false, - prerender: true, - }, path: '/payment', id: '_payment__layout', component: () => import('../src/pages/payment/_layout.svelte').then((m) => m.default), }, { - isFile: true, isDir: true, - file: '_layout.svelte', - filepath: '/services/_layout.svelte', - name: '_layout', - ext: 'svelte', - badExt: false, - absolutePath: - '/home/jaskaran/fun/enki-website/src/pages/services/_layout.svelte', children: [ { - isFile: true, - isDir: false, - file: 'index.svelte', - filepath: '/services/index.svelte', - name: 'index', - ext: 'svelte', - badExt: false, - absolutePath: - '/home/jaskaran/fun/enki-website/src/pages/services/index.svelte', - importPath: '../src/pages/services/index.svelte', - isLayout: false, - isReset: false, isIndex: true, - isFallback: false, isPage: true, - ownMeta: {}, - meta: { - recursive: true, - preload: false, - prerender: true, - }, path: '/services/index', id: '_services_index', component: () => @@ -485,55 +164,17 @@ export const _tree = { }, ], isLayout: true, - isReset: false, - isIndex: false, - isFallback: false, - isPage: false, - importPath: '../src/pages/services/_layout.svelte', - ownMeta: {}, - meta: { - recursive: true, - preload: false, - prerender: true, - }, path: '/services', id: '_services__layout', component: () => import('../src/pages/services/_layout.svelte').then((m) => m.default), }, { - isFile: true, isDir: true, - file: '_layout.svelte', - filepath: '/what-we-offer/_layout.svelte', - name: '_layout', - ext: 'svelte', - badExt: false, - absolutePath: - '/home/jaskaran/fun/enki-website/src/pages/what-we-offer/_layout.svelte', children: [ { - isFile: true, - isDir: false, - file: 'index.svelte', - filepath: '/what-we-offer/index.svelte', - name: 'index', - ext: 'svelte', - badExt: false, - absolutePath: - '/home/jaskaran/fun/enki-website/src/pages/what-we-offer/index.svelte', - importPath: '../src/pages/what-we-offer/index.svelte', - isLayout: false, - isReset: false, isIndex: true, - isFallback: false, isPage: true, - ownMeta: {}, - meta: { - recursive: true, - preload: false, - prerender: true, - }, path: '/what-we-offer/index', id: '_whatWeOffer_index', component: () => @@ -543,17 +184,6 @@ export const _tree = { }, ], isLayout: true, - isReset: false, - isIndex: false, - isFallback: false, - isPage: false, - importPath: '../src/pages/what-we-offer/_layout.svelte', - ownMeta: {}, - meta: { - recursive: true, - preload: false, - prerender: true, - }, path: '/what-we-offer', id: '_whatWeOffer__layout', component: () => @@ -563,20 +193,6 @@ export const _tree = { }, ], isLayout: true, - isReset: false, - isIndex: false, - isFallback: false, - isPage: false, - isFile: true, - file: '_layout.svelte', - ext: 'svelte', - badExt: false, - importPath: '../src/pages/_layout.svelte', - meta: { - recursive: true, - preload: false, - prerender: true, - }, path: '/', id: '__layout', component: () => import('../src/pages/_layout.svelte').then((m) => m.default), diff --git a/package.json b/package.json index 9fe356c1..df107345 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "scripts": { "build": "rollup -c", "dev": "rollup -c -w", - "start": "sirv public --single", + "start": "sirv public/ --single", "validate": "svelte-check", "format": "prettier --write \"{,!(node_modules|public)/**/}*.{js,svelte,ts}\"", "test": "jest" diff --git a/public/static/favicon.png b/public/favicon.png similarity index 100% rename from public/static/favicon.png rename to public/favicon.png diff --git a/public/index.html b/public/index.html index 12335f36..759dfb21 100644 --- a/public/index.html +++ b/public/index.html @@ -7,7 +7,7 @@ Enki - + diff --git a/public/static/open.jpg b/public/open.jpg similarity index 100% rename from public/static/open.jpg rename to public/open.jpg diff --git a/public/static/outside-enki.webp b/public/outside-enki.webp similarity index 100% rename from public/static/outside-enki.webp rename to public/outside-enki.webp diff --git a/src/pages/index.svelte b/src/pages/index.svelte index c81732ec..2d661ad6 100644 --- a/src/pages/index.svelte +++ b/src/pages/index.svelte @@ -17,7 +17,7 @@ width: 100vw; height: 100vh; background-size: 100vw 100%; - background-image: url('/static/outside-enki.webp'); + background-image: url('/outside-enki.webp'); background-repeat: no-repeat; } @@ -73,10 +73,6 @@ on:mouseover={() => (swing = true)} on:mouseout={() => (swing = false)} on:click={$goto('/what-we-offer')}> - shop open sign + shop open sign