From dc89737cfcf9f44f770a24aa3a4324d0c6da19da Mon Sep 17 00:00:00 2001 From: Fluffy-Bean Date: Wed, 3 Aug 2022 17:46:50 +0100 Subject: [PATCH] AJAX rewrite --- info/about.php => about.php | 22 ++- account/account.php | 21 ++- account/login.php | 21 ++- account/password-reset.php | 21 ++- account/signup.php | 21 ++- css/master.css | 33 +++- css/nav.css | 6 +- css/normalize.css | 349 ++++++++++++++++++++++++++++++++++++ image.php | 165 ++++++++++------- index.php | 27 ++- scripts/flyout.js | 4 +- ui/footer.php | 52 +++--- ui/header.php | 30 ---- ui/nav.php | 20 +++ ui/required.php | 60 +++++-- upload.php | 21 ++- 16 files changed, 689 insertions(+), 184 deletions(-) rename info/about.php => about.php (82%) create mode 100644 css/normalize.css delete mode 100644 ui/header.php create mode 100644 ui/nav.php diff --git a/info/about.php b/about.php similarity index 82% rename from info/about.php rename to about.php index 1e9e6ca..7af9794 100644 --- a/info/about.php +++ b/about.php @@ -1,16 +1,26 @@ + + - Gallery - - + Lynx Gallery + + + + + + - +

What is Fluffys Amazing Gallery?

@@ -31,8 +41,8 @@
diff --git a/account/account.php b/account/account.php index 624ca5e..83517f1 100644 --- a/account/account.php +++ b/account/account.php @@ -1,18 +1,27 @@ + + - Account + Lynx Gallery + + - + + +
@@ -46,8 +55,8 @@
diff --git a/account/login.php b/account/login.php index c013abf..e796eb5 100644 --- a/account/login.php +++ b/account/login.php @@ -1,18 +1,27 @@ + + - Login + Lynx Gallery + + - + + + diff --git a/account/password-reset.php b/account/password-reset.php index de6c47c..cb70390 100644 --- a/account/password-reset.php +++ b/account/password-reset.php @@ -1,18 +1,27 @@ + + - Account + Lynx Gallery + + - + + + diff --git a/account/signup.php b/account/signup.php index 597ce8c..9978bc5 100644 --- a/account/signup.php +++ b/account/signup.php @@ -1,18 +1,27 @@ + + - Sign Up + Lynx Gallery + + - + + + diff --git a/css/master.css b/css/master.css index b8e5911..c716a13 100644 --- a/css/master.css +++ b/css/master.css @@ -1,3 +1,12 @@ +/* + Normalize CSS + + This ensures that the website looks the same across all devices + and browsers, regardless if I waisted my time making a tag look + good or not +*/ +@import "normalize.css"; + @import "nav.css"; @import "footer.css"; @@ -321,8 +330,14 @@ body { /* -=-=-= ALERT =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- */ -.alert-banner { - margin: 0; padding: 0; + +/* + Notification system + + This is the notification system used by the website. Probably a little too much for what its used for +*/ +.notify-root { + margin: 0; padding: 1rem; max-width: 621px; width: calc(100% - 2rem); height: auto; @@ -330,7 +345,19 @@ body { top: 1rem; left: 50%; transform: translateX(-50%); - position: fixed; z-index: 9999999; + position: fixed; z-index: 999; +} +.notify { + margin-bottom: 1rem; padding: 0.5rem; + + width: auto; + + text-align: center; + + display: block; + + border-radius: var(--rad); + outline: 0.5rem solid var(--bg); } .alert { diff --git a/css/nav.css b/css/nav.css index 3f5ad56..18203f3 100644 --- a/css/nav.css +++ b/css/nav.css @@ -19,7 +19,7 @@ nav { box-shadow: var(--shadow); } -nav h3 { +nav p { margin: 0; vertical-align: middle; } @@ -29,7 +29,7 @@ nav hr { opacity: 0; } -.nav-name h3, .nav-name { +.nav-name p, .nav-name { display: block; } .nav-links { @@ -37,7 +37,7 @@ nav hr { justify-content: space-between; } @media (max-width: 800px) { - .nav-name h3, .nav-name hr, .nav-name { + .nav-name p, .nav-name hr, .nav-name { display: none; } .nav-links { diff --git a/css/normalize.css b/css/normalize.css new file mode 100644 index 0000000..192eb9c --- /dev/null +++ b/css/normalize.css @@ -0,0 +1,349 @@ +/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */ + +/* Document + ========================================================================== */ + +/** + * 1. Correct the line height in all browsers. + * 2. Prevent adjustments of font size after orientation changes in iOS. + */ + +html { + line-height: 1.15; /* 1 */ + -webkit-text-size-adjust: 100%; /* 2 */ +} + +/* Sections + ========================================================================== */ + +/** + * Remove the margin in all browsers. + */ + +body { + margin: 0; +} + +/** + * Render the `main` element consistently in IE. + */ + +main { + display: block; +} + +/** + * Correct the font size and margin on `h1` elements within `section` and + * `article` contexts in Chrome, Firefox, and Safari. + */ + +h1 { + font-size: 2em; + margin: 0.67em 0; +} + +/* Grouping content + ========================================================================== */ + +/** + * 1. Add the correct box sizing in Firefox. + * 2. Show the overflow in Edge and IE. + */ + +hr { + box-sizing: content-box; /* 1 */ + height: 0; /* 1 */ + overflow: visible; /* 2 */ +} + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +pre { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ +} + +/* Text-level semantics + ========================================================================== */ + +/** + * Remove the gray background on active links in IE 10. + */ + +a { + background-color: transparent; +} + +/** + * 1. Remove the bottom border in Chrome 57- + * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. + */ + +abbr[title] { + border-bottom: none; /* 1 */ + text-decoration: underline; /* 2 */ + text-decoration: underline dotted; /* 2 */ +} + +/** + * Add the correct font weight in Chrome, Edge, and Safari. + */ + +b, +strong { + font-weight: bolder; +} + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +code, +kbd, +samp { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ +} + +/** + * Add the correct font size in all browsers. + */ + +small { + font-size: 80%; +} + +/** + * Prevent `sub` and `sup` elements from affecting the line height in + * all browsers. + */ + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sub { + bottom: -0.25em; +} + +sup { + top: -0.5em; +} + +/* Embedded content + ========================================================================== */ + +/** + * Remove the border on images inside links in IE 10. + */ + +img { + border-style: none; +} + +/* Forms + ========================================================================== */ + +/** + * 1. Change the font styles in all browsers. + * 2. Remove the margin in Firefox and Safari. + */ + +button, +input, +optgroup, +select, +textarea { + font-family: inherit; /* 1 */ + font-size: 100%; /* 1 */ + line-height: 1.15; /* 1 */ + margin: 0; /* 2 */ +} + +/** + * Show the overflow in IE. + * 1. Show the overflow in Edge. + */ + +button, +input { /* 1 */ + overflow: visible; +} + +/** + * Remove the inheritance of text transform in Edge, Firefox, and IE. + * 1. Remove the inheritance of text transform in Firefox. + */ + +button, +select { /* 1 */ + text-transform: none; +} + +/** + * Correct the inability to style clickable types in iOS and Safari. + */ + +button, +[type="button"], +[type="reset"], +[type="submit"] { + -webkit-appearance: button; +} + +/** + * Remove the inner border and padding in Firefox. + */ + +button::-moz-focus-inner, +[type="button"]::-moz-focus-inner, +[type="reset"]::-moz-focus-inner, +[type="submit"]::-moz-focus-inner { + border-style: none; + padding: 0; +} + +/** + * Restore the focus styles unset by the previous rule. + */ + +button:-moz-focusring, +[type="button"]:-moz-focusring, +[type="reset"]:-moz-focusring, +[type="submit"]:-moz-focusring { + outline: 1px dotted ButtonText; +} + +/** + * Correct the padding in Firefox. + */ + +fieldset { + padding: 0.35em 0.75em 0.625em; +} + +/** + * 1. Correct the text wrapping in Edge and IE. + * 2. Correct the color inheritance from `fieldset` elements in IE. + * 3. Remove the padding so developers are not caught out when they zero out + * `fieldset` elements in all browsers. + */ + +legend { + box-sizing: border-box; /* 1 */ + color: inherit; /* 2 */ + display: table; /* 1 */ + max-width: 100%; /* 1 */ + padding: 0; /* 3 */ + white-space: normal; /* 1 */ +} + +/** + * Add the correct vertical alignment in Chrome, Firefox, and Opera. + */ + +progress { + vertical-align: baseline; +} + +/** + * Remove the default vertical scrollbar in IE 10+. + */ + +textarea { + overflow: auto; +} + +/** + * 1. Add the correct box sizing in IE 10. + * 2. Remove the padding in IE 10. + */ + +[type="checkbox"], +[type="radio"] { + box-sizing: border-box; /* 1 */ + padding: 0; /* 2 */ +} + +/** + * Correct the cursor style of increment and decrement buttons in Chrome. + */ + +[type="number"]::-webkit-inner-spin-button, +[type="number"]::-webkit-outer-spin-button { + height: auto; +} + +/** + * 1. Correct the odd appearance in Chrome and Safari. + * 2. Correct the outline style in Safari. + */ + +[type="search"] { + -webkit-appearance: textfield; /* 1 */ + outline-offset: -2px; /* 2 */ +} + +/** + * Remove the inner padding in Chrome and Safari on macOS. + */ + +[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + +/** + * 1. Correct the inability to style clickable types in iOS and Safari. + * 2. Change font properties to `inherit` in Safari. + */ + +::-webkit-file-upload-button { + -webkit-appearance: button; /* 1 */ + font: inherit; /* 2 */ +} + +/* Interactive + ========================================================================== */ + +/* + * Add the correct display in Edge, IE 10+, and Firefox. + */ + +details { + display: block; +} + +/* + * Add the correct display in all browsers. + */ + +summary { + display: list-item; +} + +/* Misc + ========================================================================== */ + +/** + * Add the correct display in IE 10+. + */ + +template { + display: none; +} + +/** + * Add the correct display in IE 10. + */ + +[hidden] { + display: none; +} diff --git a/image.php b/image.php index d5daae4..0cd9c97 100644 --- a/image.php +++ b/image.php @@ -1,25 +1,101 @@ +"; +// Div Start +echo "
"; + + +// Header for the flyout, must be included +echo "

Header

"; +// Flyout content, must be included!!!! +echo "

Description

"; +// Flyout button, not required so must need more information when added +echo $action; +// Exit button + Div End +echo " +
"; +// Must be included with flyout.php +echo ""; +?> + +Could not find image with ID: ".$_GET['id']."

"; + + // Replacement "no image" image and description + $image_path = "assets/no_image.png"; + $image_alt = "No image could be found, sowwy"; + } +} else { + // No ID toast + //echo "

No ID present

"; + + // Replacement "no image" image and description + //$image_path = "assets/no_image.png"; + //$image_alt = "No image could be found, sowwy"; +} + + +/* + Get all user details + + This gets the user info from the image +*/ +if (isset($image['author'])) { + $user = get_user_info($conn, $image['author']); +} + +/* + Check user privilge + + This requires the user to be logged in or an admin +*/ +if (image_privilage($image['author']) || is_admin($_SESSION['id'])) { + $privilaged = True; +} else { + $privilaged = False; +} +?> + - Gallery + Lynx Gallery + + - - - - - - - + + + - +
+

Could not find image with ID: ".$_GET['id']."

"; - - // Replacement "no image" image and description - $image_path = "assets/no_image.png"; - $image_alt = "No image could be found, sowwy"; - } - } else { - // No ID toast - echo "

No ID present

"; - - // Replacement "no image" image and description - $image_path = "assets/no_image.png"; - $image_alt = "No image could be found, sowwy"; - } - - - // Get all user details - if (isset($image['author'])) { - $user = get_user_info($conn, $image['author']); - } - - // Check user privilge - if (image_privilage($image['author']) || is_admin($_SESSION['id'])) { - $privilaged = True; - } else { - $privilaged = False; - } - - /* Delete flyout @@ -155,9 +192,9 @@ // Attempt to execute the prepared statement if (mysqli_stmt_execute($stmt)) { - header("Location:https://superdupersecteteuploadtest.fluffybean.gay/image.php?id=".$image["id"]."&update=success"); + header("Location:image.php?id=".$image["id"]."&update=success"); } else { - header("Location:https://superdupersecteteuploadtest.fluffybean.gay/image.php?id=".$image["id"]."&update=error"); + header("Location:image.php?id=".$image["id"]."&update=error"); } } } @@ -210,9 +247,9 @@ // Attempt to execute the prepared statement if (mysqli_stmt_execute($stmt)) { - header("Location:https://superdupersecteteuploadtest.fluffybean.gay/image.php?id=".$image["id"]."&update=success"); + header("Location:image.php?id=".$image["id"]."&update=success"); } else { - header("Location:https://superdupersecteteuploadtest.fluffybean.gay/image.php?id=".$image["id"]."&update=error"); + header("Location:image.php?id=".$image["id"]."&update=error"); } } } @@ -250,9 +287,9 @@ // Attempt to execute the prepared statement if (mysqli_stmt_execute($stmt)) { - header("Location:https://superdupersecteteuploadtest.fluffybean.gay/image.php?id=".$image["id"]."&update=success"); + header("Location:image.php?id=".$image["id"]."&update=success"); } else { - header("Location:https://superdupersecteteuploadtest.fluffybean.gay/image.php?id=".$image["id"]."&update=error"); + header("Location:image.php?id=".$image["id"]."&update=error"); } } } @@ -265,6 +302,7 @@ ?> +

Description

+

Details

- + echo "
+ + +
"; } @@ -375,8 +416,8 @@ // Must be included with flyout.php echo ""; - include("ui/top.html"); - include("ui/footer.php"); + include "ui/top.html"; + include "ui/footer.php"; ?> diff --git a/index.php b/index.php index 5392535..94a20ba 100644 --- a/index.php +++ b/index.php @@ -1,18 +1,27 @@ + + - Gallery + Lynx Gallery + + - + + +
@@ -55,7 +64,7 @@ // Clean input $tags_string = tag_clean(trim($_POST['search'])); - header("Location:https://superdupersecteteuploadtest.fluffybean.gay?q=".$tags_string); + header("Location:index.php?q=".$tags_string); } if (isset($_GET["q"])) { echo "

Search results for: ".$_GET['q']."

"; @@ -103,7 +112,7 @@ // Image loading echo "
"; - echo ""; + echo ""; echo "
"; } } else { @@ -116,7 +125,7 @@ // Image loading echo "
"; - echo ""; + echo ""; echo "
"; } } @@ -124,8 +133,8 @@
diff --git a/scripts/flyout.js b/scripts/flyout.js index 50c01dc..c1008d8 100644 --- a/scripts/flyout.js +++ b/scripts/flyout.js @@ -1,5 +1,3 @@ -console.log(" . . /|/| . . . . . . . \n .. /0 0 \\ . . . . . .. \n (III% . \\________, . . \n .. .\\_, .%###%/ \\'\\,.. \n . . . .||#####| |'\\ \\. \n .. . . ||. . .|/. .\\V. \n . . . .|| . . || . . . \n .. . . ||. . .||. . .. \n . . . .|| . . || . . . \n .. . . ||. . .||. . .. \n . . . .|| . . || . . . \n .. . . ||. . .||. . .. \n . . . .|| . . || . . . \n .. . . ||. . .||. . .. \n . . . .|| . . || . . . \n .. . . ||. . .||. . .. \n . . . .|| . . || . . . \n .. . . ||. . .||. . .. \n . . . .|| . . || . . . \n .. . . ||. . .||. . .. \n . . . .|| . . || . . . \n .. . . ||. . .||. . .. \n . . . cc/ . .cc/ . . ."); - $(document).ready(function() { let show = document.querySelectorAll(".flyout-display"); let hide = document.querySelector(".flyout-close"); @@ -19,6 +17,6 @@ $(document).ready(function() { setTimeout(function(){ document.querySelector(".flyout-dim").style.display= "none"; - }, 600); + }, 621); }); }); diff --git a/ui/footer.php b/ui/footer.php index 9abbb1e..dff30cd 100644 --- a/ui/footer.php +++ b/ui/footer.php @@ -1,43 +1,43 @@ - - -