From c9299b5410a55fa867826e389d16a48479a78504 Mon Sep 17 00:00:00 2001 From: Frankie B Date: Tue, 11 Jun 2024 18:02:01 +0100 Subject: Merge MVC rewrite into master (#21) * Just commit it all * Require auth * crap * Update homepage * Block AI scrapers * Update cache update script * Add dummy file * Remove unnecessary lastfm config var * Use withQueryParameters for LastFM API * Fix embeds * Update example env * Smard --- public/css/master.css | 179 ++++++++++++++++++++++++++--- public/images/icons/home2/user-desktop.png | Bin 0 -> 780 bytes public/images/icons/nav/admin.png | Bin 0 -> 705 bytes public/images/icons/nav/home2.png | Bin 0 -> 1159 bytes public/js/neverSaid.js | 52 ++++----- public/robots.txt | 16 +++ 6 files changed, 205 insertions(+), 42 deletions(-) create mode 100644 public/images/icons/home2/user-desktop.png create mode 100644 public/images/icons/nav/admin.png create mode 100644 public/images/icons/nav/home2.png (limited to 'public') diff --git a/public/css/master.css b/public/css/master.css index 4b4fbc3..1b8683d 100644 --- a/public/css/master.css +++ b/public/css/master.css @@ -111,6 +111,10 @@ pre { grid-row-gap: 0; } +.nav-wrapper div:nth-child(2) { + text-align: right; +} + .theme-selector label { font-weight: bold; } @@ -226,7 +230,7 @@ table.computers td ul { padding-left: 20px; } -table.computers section-title { +table.computers .section-title { text-decoration: underline; font-style: italic; font-weight: bold; @@ -272,34 +276,46 @@ a { text-decoration: underline dotted; } -table.gb-entry-form tr td { +table.form tr td { border: none; } -table.gb-entry-form tr td label { +table.form tr td label { padding-right: 5px; } -table.gb-entry-form tr td span.text-danger { +table.form tr td span.text-danger { padding-left: 5px; color: var(--warning); } -table.gb-entry-form tr td textarea, -table.gb-entry-form tr td input, -table.gb-entry-form tr td button{ - margin-bottom: 5px; - margin-left: 10px; +input.file { + border: 0 !important; +} + +table.form tr td textarea, +table.form tr td input, +table.form tr td button, +form.import input::file-selector-button, +form.import button { background-color: var(--background); border: var(--foreground) solid 1px; } -table.gb-entry-form tr td button { +table.form label { + margin: 5px 0; +} + +form.import button, +form.import input::file-selector-button, +table.form tr td button { color: var(--foreground); background-color: var(--background-secondary); } -table.gb-entry-form tr td button:hover { +form.import button:hover, +form.import input::file-selector-button:hover, +table.form tr td button:hover { color: var(--background); background-color: var(--foreground); } @@ -318,7 +334,7 @@ table.gb-entry-form-container tr td ul { margin: 0; } -table.gb-entry-form tbody tr td textarea { +table.form tbody tr td textarea { width: 210px; } @@ -490,20 +506,151 @@ label[for="scheme-selector"] { } -.music-top10 td { +.music-top10 td, +.music-top10 th { border: none; border-left: 1px dotted var(--foreground); padding: 2px 5px } -.music-top10 tr:nth-child(2) td { +.music-top10 tr:nth-child(1) th { border-bottom: 1px dotted var(--foreground); } -.music-top10 tr:nth-child(3) td { +.music-top10 tr:nth-child(2) td { padding-top: 5px; } -.music-top10 td:first-child { +.music-top10 td:first-child, +.music-top10 th:first-child { border: none; } + +.music-top10 tr th:first-child { + text-align: right; +} + +.music-top10 td { + white-space: nowrap; text-overflow:ellipsis; overflow: hidden; +} + +.music-top10 tr td:first-child { + text-align: right; +} + +.music-top10 tr td:nth-child(2), +.music-top10 tr td:nth-child(3) { + width: 50%; +} + +.current-track { + width: 100%; +} + +.current-track h2 { + margin: 0; +} + +.info-section ul { + list-style-position: inside; + list-style-type: none; + padding-left: 0; + margin: 0; +} + +.info-section ul li:before { + content: "◆ "; +} + +.info-section h2 { + margin: 0; +} + +.info-section p { + margin-top: 10px; +} + +.contact-section { + display: grid; + grid-template-rows: 1fr 1fr; +} + +.banner { + padding: 5px; + margin-top: 10px; + display: grid; + grid-template-columns: repeat(2, 1fr); + grid-template-rows: 1fr; + grid-column-gap: 0; + grid-row-gap: 0; +} + +.banner div:nth-child(1) { + text-align: left; +} + +.banner div:nth-child(2) { + text-align: right; +} + +.red-banner { + border: 3px solid var(--foreground); + background-color: var(--background-secondary); +} + +.info-admin td, +.info-admin th { + border: 1px solid var(--foreground); + padding: 5px; +} + +.info-admin th { + background-color: var(--background-secondary); +} + +.info-admin th.blank { + border: none; + background-color: var(--background); +} + +.info-admin button { + border: 1px solid var(--foreground); + background-color: var(--background); + color: var(--foreground); +} + +.info-admin button:hover { + background-color: var(--foreground); + color: var(--background); +} + +.info-admin button:active { + background-color: var(--background-secondary); + color: var(--foreground); +} + +.info-admin-section h2 { + margin-bottom: 5px; +} + +.fullwidth { + width: 100%; +} + +.fullwidth td:last-child { + width: 0; +} + +.guestbook-message { + text-wrap: wrap; + width: 100%; +} + +td.diagonal-line { + background: linear-gradient(to right bottom, var(--background) 0%,var(--background) 49.9%,var(--foreground) 50%,var(--foreground) 51%,var(--background) 51.1%,var(--background) 100%); +} + +form.import h2 { + margin: 10px 0 5px 0; +} + diff --git a/public/images/icons/home2/user-desktop.png b/public/images/icons/home2/user-desktop.png new file mode 100644 index 0000000..af9715f Binary files /dev/null and b/public/images/icons/home2/user-desktop.png differ diff --git a/public/images/icons/nav/admin.png b/public/images/icons/nav/admin.png new file mode 100644 index 0000000..153a405 Binary files /dev/null and b/public/images/icons/nav/admin.png differ diff --git a/public/images/icons/nav/home2.png b/public/images/icons/nav/home2.png new file mode 100644 index 0000000..76f6da7 Binary files /dev/null and b/public/images/icons/nav/home2.png differ diff --git a/public/js/neverSaid.js b/public/js/neverSaid.js index 5b58d60..ac0e6ae 100644 --- a/public/js/neverSaid.js +++ b/public/js/neverSaid.js @@ -1,31 +1,31 @@ // Define an array of strings const neverSaid = [ - "ASM: The Director liked all the props we got today.", - "PM: Ah ha, a revolve. Terrific.", - "Chippie: I don't know, let's look at the ground plan.", - "Set Designer: Well, let's just have whatever is cheaper.", - "Sound: Better turn that down a bit. We don't want to deafen them.", - "Director: Sorry, my mistake.", - "Electrics: This equipment is more complicated than we need.", - "Performer: I really think my big scene should be cut.", - "SM: Can we doo that scene change again please?", - "LX designer: Bit more light from those big chaps at the side. Yes that's right, the ones on stalks whatever they are called.", - "Electrics: All the equipment works perfectly.", - "Musicians: So what if that's the end of a call. Let's just finish this bit off.", - "Wardrobe: Now, when exactly is the first dress rehearsal?", - "Workshop: I don't want anyone to know, but if you insist then yes, I admit it, I have just done an all-nighter.", - "Performer: This costume is so comfortable.", - "Admin: The level of overtime payments here are simply unacceptable. Our backstage staff deserve better.", - "Box Office: Comps? No problem.", - "Set Designer: You're right, it looks dreadful.", - "Flyman: No, my lips are sealed. What I may or may not have seen remains a secret.", - "Electrics: That had nothing to do with the computer, it was my fault.", - "Crew: No, no, I'm sure that's our job.", - "SMgt: Thanks, but I don't drink", - "Performer: Let me stand down here with my back to the audience.", - "Chippie: I can't really manage those big fast power tools myself.", - "Chippie: I prefer to use these little hand drills.", - "All: Let's go and ask the Production Manager. He'll know." + "ASM: The Director liked all the props we got today.", + "PM: Ah ha, a revolve. Terrific.", + "Chippie: I don't know, let's look at the ground plan.", + "Set Designer: Well, let's just have whatever is cheaper.", + "Sound: Better turn that down a bit. We don't want to deafen them.", + "Director: Sorry, my mistake.", + "Electrics: This equipment is more complicated than we need.", + "Performer: I really think my big scene should be cut.", + "SM: Can we do that scene change again please?", + "LX designer: Bit more light from those big chaps at the side. Yes that's right, the ones on stalks whatever they are called.", + "Electrics: All the equipment works perfectly.", + "Musicians: So what if that's the end of a call. Let's just finish this bit off.", + "Wardrobe: Now, when exactly is the first dress rehearsal?", + "Workshop: I don't want anyone to know, but if you insist then yes, I admit it, I have just done an all-nighter.", + "Performer: This costume is so comfortable.", + "Admin: The level of overtime payments here are simply unacceptable. Our backstage staff deserve better.", + "Box Office: Comps? No problem.", + "Set Designer: You're right, it looks dreadful.", + "Flyman: No, my lips are sealed. What I may or may not have seen remains a secret.", + "Electrics: That had nothing to do with the computer, it was my fault.", + "Crew: No, no, I'm sure that's our job.", + "SMgt: Thanks, but I don't drink", + "Performer: Let me stand down here with my back to the audience.", + "Chippie: I can't really manage those big fast power tools myself.", + "Chippie: I prefer to use these little hand drills.", + "All: Let's go and ask the Production Manager. He'll know." ] // Generate a random index into the array diff --git a/public/robots.txt b/public/robots.txt index e65f07c..582552d 100644 --- a/public/robots.txt +++ b/public/robots.txt @@ -3,3 +3,19 @@ Disallow: /admin Disallow: /login Disallow: /js Disallow: /css + +User-Agent: GPTBot +Disallow: / + +User-Agent: ChatGPT-User +Disallow: / + +User-Agent: Google-Extended +Disallow: / + +User-Agent: CCBot +Disallow: / + +User-Agent: PerplexityBot +Disallow: / + -- cgit v1.2.3-54-g00ecf