merge-in from dev

This commit is contained in:
Adam Piontek 2021-11-28 10:26:25 -05:00
commit 6da0bf41e2
9 changed files with 856 additions and 911 deletions

1
.gitignore vendored
View file

@ -19,4 +19,3 @@ Thumbs.db
npm-debug.log
node_modules/
dist/

4
dist/4xx.html vendored
View file

@ -1 +1,5 @@
<<<<<<< HEAD
<!doctype html><html lang="en"><head><meta charset="UTF-8"><title>{{placeholder "http.error.status_code"}} Error!</title><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no"><meta name="description" content="You tried to get something thats not there!"><meta name="author" content="Oh no! {{placeholder "http.error.status_code"}}!"><link rel="icon" href="/favicon.ico"><link href="/err_css/app.css" rel="stylesheet"></head><body class="bg-cover bg-center grid grid-cols-1 place-content-center" style="background-image: url(/err_images/content/4xx_rainbow.jpg);"><div class="grid justify-items-center text-gray-900"><img src="/err_images/content/4xx_unicorn.png" class="unicorn" alt="UNICORN"><h1 class="text-5xl leading-normal text-center">Oh no! <a class="hover:underline hover:text-gray-800 font-bold" href="https://httpstatuses.com/{{placeholder "http.error.status_code"}}">{{placeholder "http.error.status_code"}}, {{placeholder "http.error.status_text"}}</a></h1><p class="text-info font-serif leading-loose">You tried to get something that can't be got!</p><p class="icon-link mt-0 sm:mt-2 md:mt-6"><a class="text-5xl hover:text-gray-800 filter hover:drop-shadow-md" title="Home" href="https://73k.us/" target="_blank"><svg class="h-12 w-12" viewBox="0 0 20 20" fill="currentColor"><path d="M10.707 2.293a1 1 0 00-1.414 0l-7 7a1 1 0 001.414 1.414L4 10.414V17a1 1 0 001 1h2a1 1 0 001-1v-2a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 001 1h2a1 1 0 001-1v-6.586l.293.293a1 1 0 001.414-1.414l-7-7z"/></svg></a></p><p class="text-copy text-gray-200 mt-3 sm:mt-6 md:mt-8">(Unicorn image <a href="https://creativecommons.org/licenses/by-nc/4.0/" class="text-gray-100 underline">Creative Commons 4.0 BY-NC</a> via <a href="http://pngimg.com/download/24891" class="text-gray-100 underline">pngimg.com</a>)</p></div></body></html>
=======
<!doctype html><html lang="en"><head><meta charset="UTF-8"><title>{{placeholder "http.error.status_code"}} Error!</title><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no"><meta name="description" content="You tried to get something thats not there!"><meta name="author" content="Oh no! {{placeholder "http.error.status_code"}}!"><link rel="icon" href="/favicon.ico"><script defer="defer" src="/err_js/app.js"></script><link href="/err_css/app.css" rel="stylesheet"></head><body class="w-screen h-screen overflow-y-auto overflow-x-hidden bg-cover bg-center grid grid-cols-1 place-content-center" style="background-image: url(/err_images/content/4xx_rainbow.jpg);"><div class="grid justify-items-center text-gray-900"><img src="/err_images/content/4xx_unicorn.png" class="unicorn" alt="UNICORN"><h1 class="text-5xl leading-normal text-center">Oh no! <a class="hover:underline hover:text-gray-800 font-bold" href="https://httpstatuses.com/{{placeholder "http.error.status_code"}}">{{placeholder "http.error.status_code"}}, {{placeholder "http.error.status_text"}}</a></h1><p class="text-info font-serif leading-loose">You tried to get something that can't be got!</p><p class="icon-link mt-0 sm:mt-2 md:mt-6"><a class="text-5xl hover:text-gray-800 filter hover:drop-shadow-md" title="Home" href="https://73k.us/" target="_blank"><svg class="h-12 w-12" viewBox="0 0 20 20" fill="currentColor"><path d="M10.707 2.293a1 1 0 00-1.414 0l-7 7a1 1 0 001.414 1.414L4 10.414V17a1 1 0 001 1h2a1 1 0 001-1v-2a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 001 1h2a1 1 0 001-1v-6.586l.293.293a1 1 0 001.414-1.414l-7-7z"/></svg></a></p><p class="text-copy text-gray-200 mt-3 sm:mt-6 md:mt-8">(Unicorn image <a href="https://creativecommons.org/licenses/by-nc/4.0/" class="text-gray-100 underline">Creative Commons 4.0 BY-NC</a> via <a href="http://pngimg.com/download/24891" class="text-gray-100 underline">pngimg.com</a>)</p></div></body></html>
>>>>>>> dev

4
dist/5xx.html vendored
View file

@ -1 +1,5 @@
<<<<<<< HEAD
<!doctype html><html lang="en"><head><meta charset="UTF-8"><title>{{placeholder "http.error.status_code"}} Error!</title><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no"><meta name="description" content="You tried to get something thats not there!"><meta name="author" content="Kzzt! {{placeholder "http.error.status_code"}}!"><link rel="icon" href="/favicon.ico"><link href="/err_css/app.css" rel="stylesheet"></head><body class="bg-cover bg-center grid grid-cols-1 place-content-center" style="background-image: url(/err_images/content/5xx_rainbow.jpg);"><div class="grid justify-items-center text-gray-900"><img src="/err_images/content/5xx_unicorn.png" class="unicorn" alt="UNICORN"><h1 class="text-5xl leading-normal text-center">K̸z̴z̷t̵!̷ &mdash; <a class="hover:underline hover:text-gray-800 font-bold" href="https://httpstatuses.com/{{placeholder "http.error.status_code"}}">{{placeholder "http.error.status_code"}}, {{placeholder "http.error.status_text"}}</a></h1><p class="text-info font-serif leading-loose">Something went wrong. Try going home&hellip;</p><p class="icon-link mt-0 sm:mt-2 md:mt-6"><a class="text-5xl hover:text-gray-800 filter hover:drop-shadow-md" title="Home" href="https://73k.us/" target="_blank"><svg class="h-12 w-12" viewBox="0 0 20 20" fill="currentColor"><path d="M10.707 2.293a1 1 0 00-1.414 0l-7 7a1 1 0 001.414 1.414L4 10.414V17a1 1 0 001 1h2a1 1 0 001-1v-2a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 001 1h2a1 1 0 001-1v-6.586l.293.293a1 1 0 001.414-1.414l-7-7z"/></svg></a></p><p class="text-copy text-gray-200 mt-3 sm:mt-6 md:mt-8">(Unicorn image <a href="https://creativecommons.org/licenses/by-nc/4.0/" class="text-gray-100 underline">Creative Commons 4.0 BY-NC</a> via <a href="http://pngimg.com/download/24891" class="text-gray-100 underline">pngimg.com</a>)</p></div></body></html>
=======
<!doctype html><html lang="en"><head><meta charset="UTF-8"><title>{{placeholder "http.error.status_code"}} Error!</title><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no"><meta name="description" content="You tried to get something thats not there!"><meta name="author" content="Kzzt! {{placeholder "http.error.status_code"}}!"><link rel="icon" href="/favicon.ico"><script defer="defer" src="/err_js/app.js"></script><link href="/err_css/app.css" rel="stylesheet"></head><body class="w-screen h-screen overflow-y-auto overflow-x-hidden bg-cover bg-center grid grid-cols-1 place-content-center" style="background-image: url(/err_images/content/5xx_rainbow.jpg);"><div class="grid justify-items-center text-gray-900"><img src="/err_images/content/5xx_unicorn.png" class="unicorn" alt="UNICORN"><h1 class="text-5xl leading-normal text-center">K̸z̴z̷t̵!̷ &mdash; <a class="hover:underline hover:text-gray-800 font-bold" href="https://httpstatuses.com/{{placeholder "http.error.status_code"}}">{{placeholder "http.error.status_code"}}, {{placeholder "http.error.status_text"}}</a></h1><p class="text-info font-serif leading-loose">Something went wrong. Try going home&hellip;</p><p class="icon-link mt-0 sm:mt-2 md:mt-6"><a class="text-5xl hover:text-gray-800 filter hover:drop-shadow-md" title="Home" href="https://73k.us/" target="_blank"><svg class="h-12 w-12" viewBox="0 0 20 20" fill="currentColor"><path d="M10.707 2.293a1 1 0 00-1.414 0l-7 7a1 1 0 001.414 1.414L4 10.414V17a1 1 0 001 1h2a1 1 0 001-1v-2a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 001 1h2a1 1 0 001-1v-6.586l.293.293a1 1 0 001.414-1.414l-7-7z"/></svg></a></p><p class="text-copy text-gray-200 mt-3 sm:mt-6 md:mt-8">(Unicorn image <a href="https://creativecommons.org/licenses/by-nc/4.0/" class="text-gray-100 underline">Creative Commons 4.0 BY-NC</a> via <a href="http://pngimg.com/download/24891" class="text-gray-100 underline">pngimg.com</a>)</p></div></body></html>
>>>>>>> dev

File diff suppressed because one or more lines are too long

0
dist/err_js/app.js vendored Normal file
View file

1744
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -1,7 +1,7 @@
{
"author": "Adam Piontek <adam@73k.us> (https://73k.us)",
"name": "@73kus/custom-rainbow-error-pages",
"version": "0.1.0",
"version": "0.1.1",
"description": "Simple but pretty unicorn rainbow error pages for webserver 40x/50x HTTP errors",
"homepage": "https://git.73k.us/73kus-err.git",
"browserslist": [
@ -74,7 +74,7 @@
"watch": "webpack --config configuration/webpack.dev.config.js --mode=development --watch",
"bundle": "npm install && npm run watch",
"dev": "webpack serve --config configuration/webpack.dev.config.js --mode=development",
"production": "NODE_ENV=production webpack --config configuration/webpack.prod.config.js --mode=production",
"prod": "NODE_ENV=production webpack --config configuration/webpack.prod.config.js --mode=production",
"lint:sass": "sass-lint -v -q",
"lint:js": "eslint --ext .js src/js/",
"stats": "webpack --config configuration/webpack.prod.config.js --mode=production --json > dist/stats.json && webpack-bundle-analyzer dist/stats.json"

View file

@ -8,7 +8,7 @@
<meta name="description" content="You tried to get something thats not there!">
<meta name="author" content="Oh no! @@errcode@@!">
</head>
<body class="bg-cover bg-center grid grid-cols-1 place-content-center" style="background-image: url(/err_images/content/4xx_rainbow.jpg);">
<body class="w-screen h-screen overflow-y-auto overflow-x-hidden bg-cover bg-center grid grid-cols-1 place-content-center" style="background-image: url(/err_images/content/4xx_rainbow.jpg);">
<div class="grid justify-items-center text-gray-900">

View file

@ -8,7 +8,7 @@
<meta name="description" content="You tried to get something thats not there!">
<meta name="author" content="Kzzt! @@errcode@@!">
</head>
<body class="bg-cover bg-center grid grid-cols-1 place-content-center" style="background-image: url(/err_images/content/5xx_rainbow.jpg);">
<body class="w-screen h-screen overflow-y-auto overflow-x-hidden bg-cover bg-center grid grid-cols-1 place-content-center" style="background-image: url(/err_images/content/5xx_rainbow.jpg);">
<div class="grid justify-items-center text-gray-900">