From 93bd735a06d3480b1c7b3a47fc58ca29cfd31980 Mon Sep 17 00:00:00 2001 From: flashwave Date: Fri, 13 Oct 2023 18:08:45 +0000 Subject: [PATCH] Moved subfolders out of the assets directory. --- .gitignore | 2 +- build.js | 87 ++++++++++++++++++ .../icons => private/sprite icons}/email.png | Bin .../sprite icons}/flashii.png | Bin .../icons => private/sprite icons}/github.png | Bin .../sprite icons}/icon-small.psd | Bin .../icons => private/sprite icons}/icon.psd | Bin .../icons => private/sprite icons}/lastfm.png | Bin .../sprite icons}/ninswitch.png | Bin .../icons => private/sprite icons}/paypal.png | Bin .../icons => private/sprite icons}/s-code.png | Bin .../sprite icons}/s-forum.png | Bin .../icons => private/sprite icons}/s-home.png | Bin .../icons => private/sprite icons}/steam.png | Bin .../icons => private/sprite icons}/twitch.png | Bin .../sprite icons}/twitter.png | Bin .../sprite icons}/youtube.png | Bin public/assets/2021.js | 2 +- public/assets/sprite.css | 4 +- .../fonts/electrolize/electrolize400.woff2 | Bin .../{assets => }/fonts/electrolize/style.css | 0 public/{assets/errors => images}/403.jpg | Bin public/{assets/errors => images}/404.jpg | Bin public/{assets/errors => images}/405.jpg | Bin public/{assets/headers => images}/krk-000.jpg | Bin public/{assets/headers => images}/krk-001.jpg | Bin public/{assets/headers => images}/krk-002.jpg | Bin public/{assets/headers => images}/krk-003.jpg | Bin public/{assets/headers => images}/krk-004.jpg | Bin public/{assets/headers => images}/krk-005.jpg | Bin public/{assets/headers => images}/krk-006.jpg | Bin public/{assets/headers => images}/krk-007.jpg | Bin public/{assets/headers => images}/krk-008.jpg | Bin public/{assets/headers => images}/mkt-000.jpg | Bin public/{assets/headers => images}/mkt-001.jpg | Bin public/{assets/headers => images}/mkt-002.jpg | Bin public/{assets/headers => images}/mkt-003.jpg | Bin public/{assets/headers => images}/mkt-004.jpg | Bin public/{assets/headers => images}/mkt-005.jpg | Bin public/{assets/headers => images}/mkt-006.jpg | Bin public/{assets/headers => images}/mkt-007.jpg | Bin public/{assets/headers => images}/mkt-008.jpg | Bin public/{assets/headers => images}/mkt-009.jpg | Bin public/{assets/headers => images}/mkt-010.jpg | Bin public/{assets/headers => images}/mkt-011.jpg | Bin public/{assets/headers => images}/mkt-012.jpg | Bin public/{assets/headers => images}/mkt-013.jpg | Bin public/{assets/headers => images}/mkt-014.jpg | Bin public/{assets/headers => images}/mkt-015.jpg | Bin public/{assets/headers => images}/mkt-016.jpg | Bin public/{assets/headers => images}/mkt-017.jpg | Bin public/{assets/headers => images}/mkt-018.jpg | Bin public/{assets/headers => images}/mkt-019.jpg | Bin public/{assets/headers => images}/mkt-020.jpg | Bin public/{assets/headers => images}/mkt-021.jpg | Bin public/{assets/headers => images}/mkt-022.jpg | Bin public/{assets/headers => images}/mkt-023.jpg | Bin public/{assets/headers => images}/mkt-024.jpg | Bin public/{assets/headers => images}/mkt-025.jpg | Bin public/{assets/headers => images}/mkt-026.jpg | Bin public/{assets/headers => images}/mkt-027.jpg | Bin public/{assets/headers => images}/mkt-028.jpg | Bin public/{assets/headers => images}/mkt-029.jpg | Bin public/{assets/headers => images}/mkt-030.jpg | Bin public/{assets/headers => images}/mkt-031.jpg | Bin public/{assets/headers => images}/mkt-032.jpg | Bin public/{assets/headers => images}/mkt-033.jpg | Bin public/{assets/headers => images}/mkt-034.jpg | Bin public/{assets/headers => images}/mkt-035.jpg | Bin public/{assets/headers => images}/mkt-036.jpg | Bin public/{assets/headers => images}/mkt-037.jpg | Bin public/{assets/headers => images}/mkt-038.jpg | Bin public/{assets/headers => images}/mkt-039.jpg | Bin public/{assets/headers => images}/mkt-040.jpg | Bin public/{assets/headers => images}/mkt-041.jpg | Bin public/{assets/headers => images}/mkt-042.jpg | Bin public/{assets/headers => images}/mkt-043.jpg | Bin public/{assets/headers => images}/mkt-044.jpg | Bin public/{assets/headers => images}/mkt-045.jpg | Bin public/{assets/headers => images}/mkt-046.jpg | Bin public/{assets/headers => images}/mkt-047.jpg | Bin public/{assets/headers => images}/mkt-048.jpg | Bin public/{assets/headers => images}/mkt-049.jpg | Bin public/{assets/headers => images}/mkt-050.jpg | Bin public/{assets/headers => images}/mkt-051.jpg | Bin public/{assets/headers => images}/mkt-052.jpg | Bin public/{assets/headers => images}/mkt-053.jpg | Bin public/{assets/headers => images}/mkt-054.jpg | Bin public/{assets/headers => images}/mkt-055.jpg | Bin public/{assets/headers => images}/mkt-056.jpg | Bin public/{assets/headers => images}/mkt-057.jpg | Bin public/{assets/headers => images}/mkt-058.jpg | Bin public/{assets/headers => images}/mkt-059.jpg | Bin public/{assets/headers => images}/mkt-060.jpg | Bin public/{assets/headers => images}/mkt-061.jpg | Bin public/{assets/headers => images}/mkt-062.jpg | Bin public/{assets/headers => images}/mkt-063.jpg | Bin public/{assets => images}/sprite.png | Bin public/{assets => images}/sprite@2x.png | Bin src/RoutingContext.php | 1 - src/SiteInfo.php | 50 +++++----- templates/errors/403.twig | 2 +- templates/errors/404.twig | 2 +- templates/errors/405.twig | 2 +- templates/master.twig | 2 +- 105 files changed, 120 insertions(+), 34 deletions(-) create mode 100644 build.js rename {public/assets/icons => private/sprite icons}/email.png (100%) rename {public/assets/icons => private/sprite icons}/flashii.png (100%) rename {public/assets/icons => private/sprite icons}/github.png (100%) rename {public/assets/icons => private/sprite icons}/icon-small.psd (100%) rename {public/assets/icons => private/sprite icons}/icon.psd (100%) rename {public/assets/icons => private/sprite icons}/lastfm.png (100%) rename {public/assets/icons => private/sprite icons}/ninswitch.png (100%) rename {public/assets/icons => private/sprite icons}/paypal.png (100%) rename {public/assets/icons => private/sprite icons}/s-code.png (100%) rename {public/assets/icons => private/sprite icons}/s-forum.png (100%) rename {public/assets/icons => private/sprite icons}/s-home.png (100%) rename {public/assets/icons => private/sprite icons}/steam.png (100%) rename {public/assets/icons => private/sprite icons}/twitch.png (100%) rename {public/assets/icons => private/sprite icons}/twitter.png (100%) rename {public/assets/icons => private/sprite icons}/youtube.png (100%) rename public/{assets => }/fonts/electrolize/electrolize400.woff2 (100%) rename public/{assets => }/fonts/electrolize/style.css (100%) rename public/{assets/errors => images}/403.jpg (100%) rename public/{assets/errors => images}/404.jpg (100%) rename public/{assets/errors => images}/405.jpg (100%) rename public/{assets/headers => images}/krk-000.jpg (100%) rename public/{assets/headers => images}/krk-001.jpg (100%) rename public/{assets/headers => images}/krk-002.jpg (100%) rename public/{assets/headers => images}/krk-003.jpg (100%) rename public/{assets/headers => images}/krk-004.jpg (100%) rename public/{assets/headers => images}/krk-005.jpg (100%) rename public/{assets/headers => images}/krk-006.jpg (100%) rename public/{assets/headers => images}/krk-007.jpg (100%) rename public/{assets/headers => images}/krk-008.jpg (100%) rename public/{assets/headers => images}/mkt-000.jpg (100%) rename public/{assets/headers => images}/mkt-001.jpg (100%) rename public/{assets/headers => images}/mkt-002.jpg (100%) rename public/{assets/headers => images}/mkt-003.jpg (100%) rename public/{assets/headers => images}/mkt-004.jpg (100%) rename public/{assets/headers => images}/mkt-005.jpg (100%) rename public/{assets/headers => images}/mkt-006.jpg (100%) rename public/{assets/headers => images}/mkt-007.jpg (100%) rename public/{assets/headers => images}/mkt-008.jpg (100%) rename public/{assets/headers => images}/mkt-009.jpg (100%) rename public/{assets/headers => images}/mkt-010.jpg (100%) rename public/{assets/headers => images}/mkt-011.jpg (100%) rename public/{assets/headers => images}/mkt-012.jpg (100%) rename public/{assets/headers => images}/mkt-013.jpg (100%) rename public/{assets/headers => images}/mkt-014.jpg (100%) rename public/{assets/headers => images}/mkt-015.jpg (100%) rename public/{assets/headers => images}/mkt-016.jpg (100%) rename public/{assets/headers => images}/mkt-017.jpg (100%) rename public/{assets/headers => images}/mkt-018.jpg (100%) rename public/{assets/headers => images}/mkt-019.jpg (100%) rename public/{assets/headers => images}/mkt-020.jpg (100%) rename public/{assets/headers => images}/mkt-021.jpg (100%) rename public/{assets/headers => images}/mkt-022.jpg (100%) rename public/{assets/headers => images}/mkt-023.jpg (100%) rename public/{assets/headers => images}/mkt-024.jpg (100%) rename public/{assets/headers => images}/mkt-025.jpg (100%) rename public/{assets/headers => images}/mkt-026.jpg (100%) rename public/{assets/headers => images}/mkt-027.jpg (100%) rename public/{assets/headers => images}/mkt-028.jpg (100%) rename public/{assets/headers => images}/mkt-029.jpg (100%) rename public/{assets/headers => images}/mkt-030.jpg (100%) rename public/{assets/headers => images}/mkt-031.jpg (100%) rename public/{assets/headers => images}/mkt-032.jpg (100%) rename public/{assets/headers => images}/mkt-033.jpg (100%) rename public/{assets/headers => images}/mkt-034.jpg (100%) rename public/{assets/headers => images}/mkt-035.jpg (100%) rename public/{assets/headers => images}/mkt-036.jpg (100%) rename public/{assets/headers => images}/mkt-037.jpg (100%) rename public/{assets/headers => images}/mkt-038.jpg (100%) rename public/{assets/headers => images}/mkt-039.jpg (100%) rename public/{assets/headers => images}/mkt-040.jpg (100%) rename public/{assets/headers => images}/mkt-041.jpg (100%) rename public/{assets/headers => images}/mkt-042.jpg (100%) rename public/{assets/headers => images}/mkt-043.jpg (100%) rename public/{assets/headers => images}/mkt-044.jpg (100%) rename public/{assets/headers => images}/mkt-045.jpg (100%) rename public/{assets/headers => images}/mkt-046.jpg (100%) rename public/{assets/headers => images}/mkt-047.jpg (100%) rename public/{assets/headers => images}/mkt-048.jpg (100%) rename public/{assets/headers => images}/mkt-049.jpg (100%) rename public/{assets/headers => images}/mkt-050.jpg (100%) rename public/{assets/headers => images}/mkt-051.jpg (100%) rename public/{assets/headers => images}/mkt-052.jpg (100%) rename public/{assets/headers => images}/mkt-053.jpg (100%) rename public/{assets/headers => images}/mkt-054.jpg (100%) rename public/{assets/headers => images}/mkt-055.jpg (100%) rename public/{assets/headers => images}/mkt-056.jpg (100%) rename public/{assets/headers => images}/mkt-057.jpg (100%) rename public/{assets/headers => images}/mkt-058.jpg (100%) rename public/{assets/headers => images}/mkt-059.jpg (100%) rename public/{assets/headers => images}/mkt-060.jpg (100%) rename public/{assets/headers => images}/mkt-061.jpg (100%) rename public/{assets/headers => images}/mkt-062.jpg (100%) rename public/{assets/headers => images}/mkt-063.jpg (100%) rename public/{assets => images}/sprite.png (100%) rename public/{assets => images}/sprite@2x.png (100%) diff --git a/.gitignore b/.gitignore index 9e8a83f..00d617b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,5 +3,5 @@ /.debug /config/*.ini /vendor -/public/assets +/aaaapublic/assets /assets/current.json diff --git a/build.js b/build.js new file mode 100644 index 0000000..f148eb2 --- /dev/null +++ b/build.js @@ -0,0 +1,87 @@ +const fs = require('fs'); +const swc = require('@swc/core'); +const path = require('path'); +const util = require('util'); +const postcss = require('postcss'); +const utils = require('./assets/utils.js'); +const assproc = require('./assets/assproc.js'); + +const rootDir = __dirname; + +const assetsDir = path.join(rootDir, 'assets'); +const assetsCSS = path.join(assetsDir, 'misuzu.css'); +const assetsJS = path.join(assetsDir, 'misuzu.js'); +const assetsInfo = path.join(assetsDir, 'current.json'); + +const pubDir = path.join(rootDir, 'public'); +const pubAssets = '/assets'; +const pubAssetsFull = path.join(pubDir, pubAssets); +const pubAssetCSSFormat = '%s-%s.css'; +const pubAssetJSFormat = '%s-%s.js'; + +const isDebugBuild = fs.existsSync(path.join(rootDir, '.debug')); + +const swcJscOptions = { + target: 'es2016', + loose: false, + externalHelpers: false, + keepClassNames: true, + preserveAllComments: false, + transform: {}, + parser: { + syntax: 'ecmascript', + jsx: true, + dynamicImport: false, + privateMethod: false, + functionBind: false, + exportDefaultFrom: false, + exportNamespaceFrom: false, + decorators: false, + decoratorsBeforeExport: false, + topLevelAwait: true, + importMeta: false, + }, + transform: { + react: { + runtime: 'classic', + pragma: '$er', + }, + }, +}; + +const postcssPlugins = []; +if(!isDebugBuild) postcssPlugins.push(require('cssnano')); +postcssPlugins.push(require('autoprefixer')({ + remove: false, +})); + +fs.mkdirSync(pubAssetsFull, { recursive: true }); + +(async () => { + const mszCssName = await assproc.process(assetsCSS, { 'prefix': '@', 'entry': 'main.css' }) + .then(output => postcss(postcssPlugins).process(output, { from: assetsCSS }).then(output => { + const mszCssName = path.join(pubAssets, util.format(pubAssetCSSFormat, 'misuzu', utils.shortHash(output.css))); + fs.writeFileSync(path.join(pubDir, mszCssName), output.css); + return mszCssName; + })); + + const mszJsName = await assproc.process(assetsJS, { 'prefix': '#', 'entry': 'main.js' }) + .then(output => swc.transform(output, { + filename: 'misuzu.js', + sourceMaps: false, + isModule: false, + minify: !isDebugBuild, + jsc: swcJscOptions, + }).then(async output => { + const mszJsName = path.join(pubAssets, util.format(pubAssetJSFormat, 'misuzu', utils.shortHash(output.code))); + fs.writeFileSync(path.join(pubDir, mszJsName), output.code); + return mszJsName; + })); + + fs.writeFileSync(assetsInfo, JSON.stringify({ + mszjs: mszJsName, + mszcss: mszCssName, + })); + + assproc.housekeep(pubAssetsFull); +})(); diff --git a/public/assets/icons/email.png b/private/sprite icons/email.png similarity index 100% rename from public/assets/icons/email.png rename to private/sprite icons/email.png diff --git a/public/assets/icons/flashii.png b/private/sprite icons/flashii.png similarity index 100% rename from public/assets/icons/flashii.png rename to private/sprite icons/flashii.png diff --git a/public/assets/icons/github.png b/private/sprite icons/github.png similarity index 100% rename from public/assets/icons/github.png rename to private/sprite icons/github.png diff --git a/public/assets/icons/icon-small.psd b/private/sprite icons/icon-small.psd similarity index 100% rename from public/assets/icons/icon-small.psd rename to private/sprite icons/icon-small.psd diff --git a/public/assets/icons/icon.psd b/private/sprite icons/icon.psd similarity index 100% rename from public/assets/icons/icon.psd rename to private/sprite icons/icon.psd diff --git a/public/assets/icons/lastfm.png b/private/sprite icons/lastfm.png similarity index 100% rename from public/assets/icons/lastfm.png rename to private/sprite icons/lastfm.png diff --git a/public/assets/icons/ninswitch.png b/private/sprite icons/ninswitch.png similarity index 100% rename from public/assets/icons/ninswitch.png rename to private/sprite icons/ninswitch.png diff --git a/public/assets/icons/paypal.png b/private/sprite icons/paypal.png similarity index 100% rename from public/assets/icons/paypal.png rename to private/sprite icons/paypal.png diff --git a/public/assets/icons/s-code.png b/private/sprite icons/s-code.png similarity index 100% rename from public/assets/icons/s-code.png rename to private/sprite icons/s-code.png diff --git a/public/assets/icons/s-forum.png b/private/sprite icons/s-forum.png similarity index 100% rename from public/assets/icons/s-forum.png rename to private/sprite icons/s-forum.png diff --git a/public/assets/icons/s-home.png b/private/sprite icons/s-home.png similarity index 100% rename from public/assets/icons/s-home.png rename to private/sprite icons/s-home.png diff --git a/public/assets/icons/steam.png b/private/sprite icons/steam.png similarity index 100% rename from public/assets/icons/steam.png rename to private/sprite icons/steam.png diff --git a/public/assets/icons/twitch.png b/private/sprite icons/twitch.png similarity index 100% rename from public/assets/icons/twitch.png rename to private/sprite icons/twitch.png diff --git a/public/assets/icons/twitter.png b/private/sprite icons/twitter.png similarity index 100% rename from public/assets/icons/twitter.png rename to private/sprite icons/twitter.png diff --git a/public/assets/icons/youtube.png b/private/sprite icons/youtube.png similarity index 100% rename from public/assets/icons/youtube.png rename to private/sprite icons/youtube.png diff --git a/public/assets/2021.js b/public/assets/2021.js index a42ef0a..1fc815a 100644 --- a/public/assets/2021.js +++ b/public/assets/2021.js @@ -134,7 +134,7 @@ window.fm = (function() { this.getRandomHeaderBackground = function() { var set = JSON.parse(sessionStorage.getItem('header-bgs')); if(!set) - return '/assets/errors/404.jpg'; + return '/images/404.jpg'; return set[parseInt(Math.random() * set.length) - 1]; }; diff --git a/public/assets/sprite.css b/public/assets/sprite.css index 0f3600e..5aab1ea 100644 --- a/public/assets/sprite.css +++ b/public/assets/sprite.css @@ -1,11 +1,11 @@ .fmi { - background-image: url('sprite.png'); + background-image: url('/images/sprite.png'); width: 25px; height: 25px; background-size: 400px 25px; } @media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min-device-pixel-ratio: 2) { - .fmi { background-image: url('sprite@2x.png'); background-size: 400px 25px; } + .fmi { background-image: url('/images/sprite@2x.png'); background-size: 400px 25px; } } .fmi.fmi-email { background-position: 400px 0px; } .fmi.fmi-flashii { background-position: 375px 0px; } diff --git a/public/assets/fonts/electrolize/electrolize400.woff2 b/public/fonts/electrolize/electrolize400.woff2 similarity index 100% rename from public/assets/fonts/electrolize/electrolize400.woff2 rename to public/fonts/electrolize/electrolize400.woff2 diff --git a/public/assets/fonts/electrolize/style.css b/public/fonts/electrolize/style.css similarity index 100% rename from public/assets/fonts/electrolize/style.css rename to public/fonts/electrolize/style.css diff --git a/public/assets/errors/403.jpg b/public/images/403.jpg similarity index 100% rename from public/assets/errors/403.jpg rename to public/images/403.jpg diff --git a/public/assets/errors/404.jpg b/public/images/404.jpg similarity index 100% rename from public/assets/errors/404.jpg rename to public/images/404.jpg diff --git a/public/assets/errors/405.jpg b/public/images/405.jpg similarity index 100% rename from public/assets/errors/405.jpg rename to public/images/405.jpg diff --git a/public/assets/headers/krk-000.jpg b/public/images/krk-000.jpg similarity index 100% rename from public/assets/headers/krk-000.jpg rename to public/images/krk-000.jpg diff --git a/public/assets/headers/krk-001.jpg b/public/images/krk-001.jpg similarity index 100% rename from public/assets/headers/krk-001.jpg rename to public/images/krk-001.jpg diff --git a/public/assets/headers/krk-002.jpg b/public/images/krk-002.jpg similarity index 100% rename from public/assets/headers/krk-002.jpg rename to public/images/krk-002.jpg diff --git a/public/assets/headers/krk-003.jpg b/public/images/krk-003.jpg similarity index 100% rename from public/assets/headers/krk-003.jpg rename to public/images/krk-003.jpg diff --git a/public/assets/headers/krk-004.jpg b/public/images/krk-004.jpg similarity index 100% rename from public/assets/headers/krk-004.jpg rename to public/images/krk-004.jpg diff --git a/public/assets/headers/krk-005.jpg b/public/images/krk-005.jpg similarity index 100% rename from public/assets/headers/krk-005.jpg rename to public/images/krk-005.jpg diff --git a/public/assets/headers/krk-006.jpg b/public/images/krk-006.jpg similarity index 100% rename from public/assets/headers/krk-006.jpg rename to public/images/krk-006.jpg diff --git a/public/assets/headers/krk-007.jpg b/public/images/krk-007.jpg similarity index 100% rename from public/assets/headers/krk-007.jpg rename to public/images/krk-007.jpg diff --git a/public/assets/headers/krk-008.jpg b/public/images/krk-008.jpg similarity index 100% rename from public/assets/headers/krk-008.jpg rename to public/images/krk-008.jpg diff --git a/public/assets/headers/mkt-000.jpg b/public/images/mkt-000.jpg similarity index 100% rename from public/assets/headers/mkt-000.jpg rename to public/images/mkt-000.jpg diff --git a/public/assets/headers/mkt-001.jpg b/public/images/mkt-001.jpg similarity index 100% rename from public/assets/headers/mkt-001.jpg rename to public/images/mkt-001.jpg diff --git a/public/assets/headers/mkt-002.jpg b/public/images/mkt-002.jpg similarity index 100% rename from public/assets/headers/mkt-002.jpg rename to public/images/mkt-002.jpg diff --git a/public/assets/headers/mkt-003.jpg b/public/images/mkt-003.jpg similarity index 100% rename from public/assets/headers/mkt-003.jpg rename to public/images/mkt-003.jpg diff --git a/public/assets/headers/mkt-004.jpg b/public/images/mkt-004.jpg similarity index 100% rename from public/assets/headers/mkt-004.jpg rename to public/images/mkt-004.jpg diff --git a/public/assets/headers/mkt-005.jpg b/public/images/mkt-005.jpg similarity index 100% rename from public/assets/headers/mkt-005.jpg rename to public/images/mkt-005.jpg diff --git a/public/assets/headers/mkt-006.jpg b/public/images/mkt-006.jpg similarity index 100% rename from public/assets/headers/mkt-006.jpg rename to public/images/mkt-006.jpg diff --git a/public/assets/headers/mkt-007.jpg b/public/images/mkt-007.jpg similarity index 100% rename from public/assets/headers/mkt-007.jpg rename to public/images/mkt-007.jpg diff --git a/public/assets/headers/mkt-008.jpg b/public/images/mkt-008.jpg similarity index 100% rename from public/assets/headers/mkt-008.jpg rename to public/images/mkt-008.jpg diff --git a/public/assets/headers/mkt-009.jpg b/public/images/mkt-009.jpg similarity index 100% rename from public/assets/headers/mkt-009.jpg rename to public/images/mkt-009.jpg diff --git a/public/assets/headers/mkt-010.jpg b/public/images/mkt-010.jpg similarity index 100% rename from public/assets/headers/mkt-010.jpg rename to public/images/mkt-010.jpg diff --git a/public/assets/headers/mkt-011.jpg b/public/images/mkt-011.jpg similarity index 100% rename from public/assets/headers/mkt-011.jpg rename to public/images/mkt-011.jpg diff --git a/public/assets/headers/mkt-012.jpg b/public/images/mkt-012.jpg similarity index 100% rename from public/assets/headers/mkt-012.jpg rename to public/images/mkt-012.jpg diff --git a/public/assets/headers/mkt-013.jpg b/public/images/mkt-013.jpg similarity index 100% rename from public/assets/headers/mkt-013.jpg rename to public/images/mkt-013.jpg diff --git a/public/assets/headers/mkt-014.jpg b/public/images/mkt-014.jpg similarity index 100% rename from public/assets/headers/mkt-014.jpg rename to public/images/mkt-014.jpg diff --git a/public/assets/headers/mkt-015.jpg b/public/images/mkt-015.jpg similarity index 100% rename from public/assets/headers/mkt-015.jpg rename to public/images/mkt-015.jpg diff --git a/public/assets/headers/mkt-016.jpg b/public/images/mkt-016.jpg similarity index 100% rename from public/assets/headers/mkt-016.jpg rename to public/images/mkt-016.jpg diff --git a/public/assets/headers/mkt-017.jpg b/public/images/mkt-017.jpg similarity index 100% rename from public/assets/headers/mkt-017.jpg rename to public/images/mkt-017.jpg diff --git a/public/assets/headers/mkt-018.jpg b/public/images/mkt-018.jpg similarity index 100% rename from public/assets/headers/mkt-018.jpg rename to public/images/mkt-018.jpg diff --git a/public/assets/headers/mkt-019.jpg b/public/images/mkt-019.jpg similarity index 100% rename from public/assets/headers/mkt-019.jpg rename to public/images/mkt-019.jpg diff --git a/public/assets/headers/mkt-020.jpg b/public/images/mkt-020.jpg similarity index 100% rename from public/assets/headers/mkt-020.jpg rename to public/images/mkt-020.jpg diff --git a/public/assets/headers/mkt-021.jpg b/public/images/mkt-021.jpg similarity index 100% rename from public/assets/headers/mkt-021.jpg rename to public/images/mkt-021.jpg diff --git a/public/assets/headers/mkt-022.jpg b/public/images/mkt-022.jpg similarity index 100% rename from public/assets/headers/mkt-022.jpg rename to public/images/mkt-022.jpg diff --git a/public/assets/headers/mkt-023.jpg b/public/images/mkt-023.jpg similarity index 100% rename from public/assets/headers/mkt-023.jpg rename to public/images/mkt-023.jpg diff --git a/public/assets/headers/mkt-024.jpg b/public/images/mkt-024.jpg similarity index 100% rename from public/assets/headers/mkt-024.jpg rename to public/images/mkt-024.jpg diff --git a/public/assets/headers/mkt-025.jpg b/public/images/mkt-025.jpg similarity index 100% rename from public/assets/headers/mkt-025.jpg rename to public/images/mkt-025.jpg diff --git a/public/assets/headers/mkt-026.jpg b/public/images/mkt-026.jpg similarity index 100% rename from public/assets/headers/mkt-026.jpg rename to public/images/mkt-026.jpg diff --git a/public/assets/headers/mkt-027.jpg b/public/images/mkt-027.jpg similarity index 100% rename from public/assets/headers/mkt-027.jpg rename to public/images/mkt-027.jpg diff --git a/public/assets/headers/mkt-028.jpg b/public/images/mkt-028.jpg similarity index 100% rename from public/assets/headers/mkt-028.jpg rename to public/images/mkt-028.jpg diff --git a/public/assets/headers/mkt-029.jpg b/public/images/mkt-029.jpg similarity index 100% rename from public/assets/headers/mkt-029.jpg rename to public/images/mkt-029.jpg diff --git a/public/assets/headers/mkt-030.jpg b/public/images/mkt-030.jpg similarity index 100% rename from public/assets/headers/mkt-030.jpg rename to public/images/mkt-030.jpg diff --git a/public/assets/headers/mkt-031.jpg b/public/images/mkt-031.jpg similarity index 100% rename from public/assets/headers/mkt-031.jpg rename to public/images/mkt-031.jpg diff --git a/public/assets/headers/mkt-032.jpg b/public/images/mkt-032.jpg similarity index 100% rename from public/assets/headers/mkt-032.jpg rename to public/images/mkt-032.jpg diff --git a/public/assets/headers/mkt-033.jpg b/public/images/mkt-033.jpg similarity index 100% rename from public/assets/headers/mkt-033.jpg rename to public/images/mkt-033.jpg diff --git a/public/assets/headers/mkt-034.jpg b/public/images/mkt-034.jpg similarity index 100% rename from public/assets/headers/mkt-034.jpg rename to public/images/mkt-034.jpg diff --git a/public/assets/headers/mkt-035.jpg b/public/images/mkt-035.jpg similarity index 100% rename from public/assets/headers/mkt-035.jpg rename to public/images/mkt-035.jpg diff --git a/public/assets/headers/mkt-036.jpg b/public/images/mkt-036.jpg similarity index 100% rename from public/assets/headers/mkt-036.jpg rename to public/images/mkt-036.jpg diff --git a/public/assets/headers/mkt-037.jpg b/public/images/mkt-037.jpg similarity index 100% rename from public/assets/headers/mkt-037.jpg rename to public/images/mkt-037.jpg diff --git a/public/assets/headers/mkt-038.jpg b/public/images/mkt-038.jpg similarity index 100% rename from public/assets/headers/mkt-038.jpg rename to public/images/mkt-038.jpg diff --git a/public/assets/headers/mkt-039.jpg b/public/images/mkt-039.jpg similarity index 100% rename from public/assets/headers/mkt-039.jpg rename to public/images/mkt-039.jpg diff --git a/public/assets/headers/mkt-040.jpg b/public/images/mkt-040.jpg similarity index 100% rename from public/assets/headers/mkt-040.jpg rename to public/images/mkt-040.jpg diff --git a/public/assets/headers/mkt-041.jpg b/public/images/mkt-041.jpg similarity index 100% rename from public/assets/headers/mkt-041.jpg rename to public/images/mkt-041.jpg diff --git a/public/assets/headers/mkt-042.jpg b/public/images/mkt-042.jpg similarity index 100% rename from public/assets/headers/mkt-042.jpg rename to public/images/mkt-042.jpg diff --git a/public/assets/headers/mkt-043.jpg b/public/images/mkt-043.jpg similarity index 100% rename from public/assets/headers/mkt-043.jpg rename to public/images/mkt-043.jpg diff --git a/public/assets/headers/mkt-044.jpg b/public/images/mkt-044.jpg similarity index 100% rename from public/assets/headers/mkt-044.jpg rename to public/images/mkt-044.jpg diff --git a/public/assets/headers/mkt-045.jpg b/public/images/mkt-045.jpg similarity index 100% rename from public/assets/headers/mkt-045.jpg rename to public/images/mkt-045.jpg diff --git a/public/assets/headers/mkt-046.jpg b/public/images/mkt-046.jpg similarity index 100% rename from public/assets/headers/mkt-046.jpg rename to public/images/mkt-046.jpg diff --git a/public/assets/headers/mkt-047.jpg b/public/images/mkt-047.jpg similarity index 100% rename from public/assets/headers/mkt-047.jpg rename to public/images/mkt-047.jpg diff --git a/public/assets/headers/mkt-048.jpg b/public/images/mkt-048.jpg similarity index 100% rename from public/assets/headers/mkt-048.jpg rename to public/images/mkt-048.jpg diff --git a/public/assets/headers/mkt-049.jpg b/public/images/mkt-049.jpg similarity index 100% rename from public/assets/headers/mkt-049.jpg rename to public/images/mkt-049.jpg diff --git a/public/assets/headers/mkt-050.jpg b/public/images/mkt-050.jpg similarity index 100% rename from public/assets/headers/mkt-050.jpg rename to public/images/mkt-050.jpg diff --git a/public/assets/headers/mkt-051.jpg b/public/images/mkt-051.jpg similarity index 100% rename from public/assets/headers/mkt-051.jpg rename to public/images/mkt-051.jpg diff --git a/public/assets/headers/mkt-052.jpg b/public/images/mkt-052.jpg similarity index 100% rename from public/assets/headers/mkt-052.jpg rename to public/images/mkt-052.jpg diff --git a/public/assets/headers/mkt-053.jpg b/public/images/mkt-053.jpg similarity index 100% rename from public/assets/headers/mkt-053.jpg rename to public/images/mkt-053.jpg diff --git a/public/assets/headers/mkt-054.jpg b/public/images/mkt-054.jpg similarity index 100% rename from public/assets/headers/mkt-054.jpg rename to public/images/mkt-054.jpg diff --git a/public/assets/headers/mkt-055.jpg b/public/images/mkt-055.jpg similarity index 100% rename from public/assets/headers/mkt-055.jpg rename to public/images/mkt-055.jpg diff --git a/public/assets/headers/mkt-056.jpg b/public/images/mkt-056.jpg similarity index 100% rename from public/assets/headers/mkt-056.jpg rename to public/images/mkt-056.jpg diff --git a/public/assets/headers/mkt-057.jpg b/public/images/mkt-057.jpg similarity index 100% rename from public/assets/headers/mkt-057.jpg rename to public/images/mkt-057.jpg diff --git a/public/assets/headers/mkt-058.jpg b/public/images/mkt-058.jpg similarity index 100% rename from public/assets/headers/mkt-058.jpg rename to public/images/mkt-058.jpg diff --git a/public/assets/headers/mkt-059.jpg b/public/images/mkt-059.jpg similarity index 100% rename from public/assets/headers/mkt-059.jpg rename to public/images/mkt-059.jpg diff --git a/public/assets/headers/mkt-060.jpg b/public/images/mkt-060.jpg similarity index 100% rename from public/assets/headers/mkt-060.jpg rename to public/images/mkt-060.jpg diff --git a/public/assets/headers/mkt-061.jpg b/public/images/mkt-061.jpg similarity index 100% rename from public/assets/headers/mkt-061.jpg rename to public/images/mkt-061.jpg diff --git a/public/assets/headers/mkt-062.jpg b/public/images/mkt-062.jpg similarity index 100% rename from public/assets/headers/mkt-062.jpg rename to public/images/mkt-062.jpg diff --git a/public/assets/headers/mkt-063.jpg b/public/images/mkt-063.jpg similarity index 100% rename from public/assets/headers/mkt-063.jpg rename to public/images/mkt-063.jpg diff --git a/public/assets/sprite.png b/public/images/sprite.png similarity index 100% rename from public/assets/sprite.png rename to public/images/sprite.png diff --git a/public/assets/sprite@2x.png b/public/images/sprite@2x.png similarity index 100% rename from public/assets/sprite@2x.png rename to public/images/sprite@2x.png diff --git a/src/RoutingContext.php b/src/RoutingContext.php index d89754d..f88842c 100644 --- a/src/RoutingContext.php +++ b/src/RoutingContext.php @@ -34,7 +34,6 @@ class RoutingContext { public function registerDefaultErrorPages(): void { $this->router->setDefaultErrorHandler($this->defaultErrorHandler(...)); - $this->router->get('/error/:code', fn($response, $request, string $code) => max(min((int)$code, 599), 400)); } public function register(IRouteHandler $handler): void { diff --git a/src/SiteInfo.php b/src/SiteInfo.php index e702fe3..54112e3 100644 --- a/src/SiteInfo.php +++ b/src/SiteInfo.php @@ -12,32 +12,32 @@ class SiteInfo { public function getHeaderImages(): array { return [ - '/assets/headers/krk-000.jpg', '/assets/headers/krk-001.jpg', '/assets/headers/krk-002.jpg', - '/assets/headers/krk-003.jpg', '/assets/headers/krk-004.jpg', '/assets/headers/krk-005.jpg', - '/assets/headers/krk-006.jpg', '/assets/headers/krk-007.jpg', '/assets/headers/krk-008.jpg', + '/images/krk-000.jpg', '/images/krk-001.jpg', '/images/krk-002.jpg', + '/images/krk-003.jpg', '/images/krk-004.jpg', '/images/krk-005.jpg', + '/images/krk-006.jpg', '/images/krk-007.jpg', '/images/krk-008.jpg', - '/assets/headers/mkt-000.jpg', '/assets/headers/mkt-001.jpg', '/assets/headers/mkt-002.jpg', - '/assets/headers/mkt-003.jpg', '/assets/headers/mkt-004.jpg', '/assets/headers/mkt-005.jpg', - '/assets/headers/mkt-006.jpg', '/assets/headers/mkt-007.jpg', '/assets/headers/mkt-008.jpg', - '/assets/headers/mkt-009.jpg', '/assets/headers/mkt-010.jpg', '/assets/headers/mkt-011.jpg', - '/assets/headers/mkt-012.jpg', '/assets/headers/mkt-013.jpg', '/assets/headers/mkt-014.jpg', - '/assets/headers/mkt-015.jpg', '/assets/headers/mkt-016.jpg', '/assets/headers/mkt-017.jpg', - '/assets/headers/mkt-018.jpg', '/assets/headers/mkt-019.jpg', '/assets/headers/mkt-020.jpg', - '/assets/headers/mkt-021.jpg', '/assets/headers/mkt-022.jpg', '/assets/headers/mkt-023.jpg', - '/assets/headers/mkt-024.jpg', '/assets/headers/mkt-025.jpg', '/assets/headers/mkt-026.jpg', - '/assets/headers/mkt-027.jpg', '/assets/headers/mkt-028.jpg', '/assets/headers/mkt-029.jpg', - '/assets/headers/mkt-030.jpg', '/assets/headers/mkt-031.jpg', '/assets/headers/mkt-032.jpg', - '/assets/headers/mkt-033.jpg', '/assets/headers/mkt-034.jpg', '/assets/headers/mkt-035.jpg', - '/assets/headers/mkt-036.jpg', '/assets/headers/mkt-037.jpg', '/assets/headers/mkt-038.jpg', - '/assets/headers/mkt-039.jpg', '/assets/headers/mkt-040.jpg', '/assets/headers/mkt-041.jpg', - '/assets/headers/mkt-042.jpg', '/assets/headers/mkt-043.jpg', '/assets/headers/mkt-044.jpg', - '/assets/headers/mkt-045.jpg', '/assets/headers/mkt-046.jpg', '/assets/headers/mkt-047.jpg', - '/assets/headers/mkt-048.jpg', '/assets/headers/mkt-049.jpg', '/assets/headers/mkt-050.jpg', - '/assets/headers/mkt-051.jpg', '/assets/headers/mkt-052.jpg', '/assets/headers/mkt-053.jpg', - '/assets/headers/mkt-054.jpg', '/assets/headers/mkt-055.jpg', '/assets/headers/mkt-056.jpg', - '/assets/headers/mkt-057.jpg', '/assets/headers/mkt-058.jpg', '/assets/headers/mkt-059.jpg', - '/assets/headers/mkt-060.jpg', '/assets/headers/mkt-061.jpg', '/assets/headers/mkt-062.jpg', - '/assets/headers/mkt-063.jpg', + '/images/mkt-000.jpg', '/images/mkt-001.jpg', '/images/mkt-002.jpg', + '/images/mkt-003.jpg', '/images/mkt-004.jpg', '/images/mkt-005.jpg', + '/images/mkt-006.jpg', '/images/mkt-007.jpg', '/images/mkt-008.jpg', + '/images/mkt-009.jpg', '/images/mkt-010.jpg', '/images/mkt-011.jpg', + '/images/mkt-012.jpg', '/images/mkt-013.jpg', '/images/mkt-014.jpg', + '/images/mkt-015.jpg', '/images/mkt-016.jpg', '/images/mkt-017.jpg', + '/images/mkt-018.jpg', '/images/mkt-019.jpg', '/images/mkt-020.jpg', + '/images/mkt-021.jpg', '/images/mkt-022.jpg', '/images/mkt-023.jpg', + '/images/mkt-024.jpg', '/images/mkt-025.jpg', '/images/mkt-026.jpg', + '/images/mkt-027.jpg', '/images/mkt-028.jpg', '/images/mkt-029.jpg', + '/images/mkt-030.jpg', '/images/mkt-031.jpg', '/images/mkt-032.jpg', + '/images/mkt-033.jpg', '/images/mkt-034.jpg', '/images/mkt-035.jpg', + '/images/mkt-036.jpg', '/images/mkt-037.jpg', '/images/mkt-038.jpg', + '/images/mkt-039.jpg', '/images/mkt-040.jpg', '/images/mkt-041.jpg', + '/images/mkt-042.jpg', '/images/mkt-043.jpg', '/images/mkt-044.jpg', + '/images/mkt-045.jpg', '/images/mkt-046.jpg', '/images/mkt-047.jpg', + '/images/mkt-048.jpg', '/images/mkt-049.jpg', '/images/mkt-050.jpg', + '/images/mkt-051.jpg', '/images/mkt-052.jpg', '/images/mkt-053.jpg', + '/images/mkt-054.jpg', '/images/mkt-055.jpg', '/images/mkt-056.jpg', + '/images/mkt-057.jpg', '/images/mkt-058.jpg', '/images/mkt-059.jpg', + '/images/mkt-060.jpg', '/images/mkt-061.jpg', '/images/mkt-062.jpg', + '/images/mkt-063.jpg', ]; } diff --git a/templates/errors/403.twig b/templates/errors/403.twig index fbf76f8..a5d071c 100644 --- a/templates/errors/403.twig +++ b/templates/errors/403.twig @@ -1,4 +1,4 @@ {% extends 'errors/master.twig' %} -{% set http_error_image = '/assets/errors/403.jpg' %} +{% set http_error_image = '/images/403.jpg' %} {% set http_error_desc = 'You are not supposed to be here.' %} diff --git a/templates/errors/404.twig b/templates/errors/404.twig index 3f2c0b9..a108053 100644 --- a/templates/errors/404.twig +++ b/templates/errors/404.twig @@ -1,4 +1,4 @@ {% extends 'errors/master.twig' %} -{% set http_error_image = '/assets/errors/404.jpg' %} +{% set http_error_image = '/images/404.jpg' %} {% set http_error_desc = 'Whatever you\'re looking for is no longer here, or might not have been here in the first place.' %} diff --git a/templates/errors/405.twig b/templates/errors/405.twig index e5e253c..9ce9522 100644 --- a/templates/errors/405.twig +++ b/templates/errors/405.twig @@ -1,4 +1,4 @@ {% extends 'errors/master.twig' %} -{% set http_error_image = '/assets/errors/405.jpg' %} +{% set http_error_image = '/images/405.jpg' %} {% set http_error_desc = 'You\'re up to something, aren\'t you?' %} diff --git a/templates/master.twig b/templates/master.twig index ef08c4b..7edeb4d 100644 --- a/templates/master.twig +++ b/templates/master.twig @@ -6,7 +6,7 @@ - +