From 0e23bfffb6e3877a79ae2f8c5152d75fadf1707e Mon Sep 17 00:00:00 2001 From: Fluffy-Bean <michal-gdula@protonmail.com> Date: Tue, 27 Sep 2022 21:39:02 +0000 Subject: [PATCH] Updating naming of alert variables --- account.php | 2 +- app/account/account.php | 102 ++++++++++++++++++------------------- app/image/group.php | 20 ++++---- app/image/image.php | 28 +++++----- app/image/upload_image.php | 18 +++---- css/main.css | 28 +++++++--- css/main.scss | 18 ++++--- css/scss/_variables.scss | 20 +++++++- group.php | 4 +- image.php | 8 +-- index.php | 4 +- upload.php | 4 +- 12 files changed, 147 insertions(+), 109 deletions(-) diff --git a/account.php b/account.php index 923f19b..cbf0c1d 100644 --- a/account.php +++ b/account.php @@ -70,7 +70,7 @@ $("#image").val(""); $("#submit").val(""); } else { - sniffleAdd('Gwha!', 'Pls provide image', 'var(--red)', 'assets/icons/file-search.svg'); + sniffleAdd('Gwha!', 'Pls provide image', 'var(--warning)', 'assets/icons/file-search.svg'); } }); </script> diff --git a/app/account/account.php b/app/account/account.php index 819632a..85195a4 100644 --- a/app/account/account.php +++ b/app/account/account.php @@ -34,7 +34,7 @@ if (isset($_POST['submit_login'])) { if ($ban_perm) { ?> <script> - sniffleAdd('Bye bye!', 'You have been banned, contact the owner if you feel that this was a mistake', 'var(--red)', 'assets/icons/warning.svg'); + sniffleAdd('Bye bye!', 'You have been banned, contact the owner if you feel that this was a mistake', 'var(--warning)', 'assets/icons/warning.svg'); </script> <?php @@ -42,7 +42,7 @@ if (isset($_POST['submit_login'])) { } elseif (($ban_diff / 60) <= 60) { ?> <script> - sniffleAdd('Slow down!', 'You have attempted to login/signup too many times in 10 minutes. Come back in <?php echo round(60-($ban_diff/60)); ?> minutes', 'var(--red)', 'assets/icons/warning.svg'); + sniffleAdd('Slow down!', 'You have attempted to login/signup too many times in 10 minutes. Come back in <?php echo round(60-($ban_diff/60)); ?> minutes', 'var(--warning)', 'assets/icons/warning.svg'); </script> <?php @@ -71,7 +71,7 @@ if (isset($_POST['submit_login'])) { if (empty(trim($_POST["username"]))) { ?> <script> - sniffleAdd('Who dis?', 'You must enter a username to login!', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Who dis?', 'You must enter a username to login!', 'var(--warning)', 'assets/icons/cross.svg'); </script> <?php $error += 1; @@ -83,7 +83,7 @@ if (isset($_POST['submit_login'])) { if (empty(trim($_POST["password"]))) { ?> <script> - sniffleAdd('Whats the magic word?', 'Pls enter the super duper secrete word(s) to login!', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Whats the magic word?', 'Pls enter the super duper secrete word(s) to login!', 'var(--warning)', 'assets/icons/cross.svg'); </script> <?php $error += 1; @@ -139,7 +139,7 @@ if (isset($_POST['submit_login'])) { } else { ?> <script> - sniffleAdd('Sus', 'Username or Password WRONG, please try again :3', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Sus', 'Username or Password WRONG, please try again :3', 'var(--warning)', 'assets/icons/cross.svg'); </script> <?php mysqli_query($conn,"INSERT INTO logs (ipaddress, action) VALUES('$user_ip','Failed to enter correct Password')"); @@ -148,7 +148,7 @@ if (isset($_POST['submit_login'])) { } else { ?> <script> - sniffleAdd('Sus', 'Username or Password WRONG, please try again :3', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Sus', 'Username or Password WRONG, please try again :3', 'var(--warning)', 'assets/icons/cross.svg'); </script> <?php mysqli_query($conn,"INSERT INTO logs (ipaddress, action) VALUES('$user_ip','Failed to enter correct Username')"); @@ -156,7 +156,7 @@ if (isset($_POST['submit_login'])) { } else { ?> <script> - sniffleAdd('woops...', 'Sowwy, something went wrong on our end :c', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('woops...', 'Sowwy, something went wrong on our end :c', 'var(--warning)', 'assets/icons/cross.svg'); </script> <?php } @@ -188,7 +188,7 @@ if (isset($_POST['submit_signup'])) { if ($ban_perm) { ?> <script> - sniffleAdd('Bye bye!', 'You have been banned, contact the owner if you feel that this was a mistake', 'var(--red)', 'assets/icons/warning.svg'); + sniffleAdd('Bye bye!', 'You have been banned, contact the owner if you feel that this was a mistake', 'var(--warning)', 'assets/icons/warning.svg'); </script> <?php @@ -196,7 +196,7 @@ if (isset($_POST['submit_signup'])) { } elseif (($ban_diff / 60) <= 60) { ?> <script> - sniffleAdd('Slow down!', 'You have attempted to login/signup too many times in 10 minutes. Come back in <?php echo round(60-($ban_diff/60)); ?> minutes', 'var(--red)', 'assets/icons/warning.svg'); + sniffleAdd('Slow down!', 'You have attempted to login/signup too many times in 10 minutes. Come back in <?php echo round(60-($ban_diff/60)); ?> minutes', 'var(--warning)', 'assets/icons/warning.svg'); </script> <?php @@ -225,7 +225,7 @@ if (isset($_POST['submit_signup'])) { // Username not entered ?> <script> - sniffleAdd('Hmmm', 'You must enter a username!', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Hmmm', 'You must enter a username!', 'var(--warning)', 'assets/icons/cross.svg'); </script> <?php $error = $error + 1; @@ -233,7 +233,7 @@ if (isset($_POST['submit_signup'])) { // Username entered contains illegal characters ?> <script> - sniffleAdd('Sussy Wussy', 'Very sus. Username can only contain letters, numbers, and underscores', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Sussy Wussy', 'Very sus. Username can only contain letters, numbers, and underscores', 'var(--warning)', 'assets/icons/cross.svg'); </script> <?php $error = $error + 1; @@ -254,7 +254,7 @@ if (isset($_POST['submit_signup'])) { // Username taken ?> <script> - sniffleAdd('A clone?', 'Sorry, but username was already taken by someone else', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('A clone?', 'Sorry, but username was already taken by someone else', 'var(--warning)', 'assets/icons/cross.svg'); </script> <?php $error = $error + 1; @@ -264,7 +264,7 @@ if (isset($_POST['submit_signup'])) { } else { ?> <script> - sniffleAdd('Reee', 'We had a problem on our end, sowwy', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Reee', 'We had a problem on our end, sowwy', 'var(--warning)', 'assets/icons/cross.svg'); </script> <?php $error = $error + 1; @@ -279,7 +279,7 @@ if (isset($_POST['submit_signup'])) { // No password entered ?> <script> - sniffleAdd('What', 'You must enter a password, dont want just anyone seeing your stuff uwu', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('What', 'You must enter a password, dont want just anyone seeing your stuff uwu', 'var(--warning)', 'assets/icons/cross.svg'); </script> <?php $error = $error + 1; @@ -287,7 +287,7 @@ if (isset($_POST['submit_signup'])) { // Password not long enough 👀 ?> <script> - sniffleAdd('👀', 'Nice (Password) but its not long enough 👀', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('👀', 'Nice (Password) but its not long enough 👀', 'var(--warning)', 'assets/icons/cross.svg'); </script> <?php $error = $error + 1; @@ -300,7 +300,7 @@ if (isset($_POST['submit_signup'])) { // Did not confirm passowrd ?> <script> - sniffleAdd('Eh?', 'Confirm the password pls, its very important you remember what it issss', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Eh?', 'Confirm the password pls, its very important you remember what it issss', 'var(--warning)', 'assets/icons/cross.svg'); </script> <?php $error = $error + 1; @@ -310,7 +310,7 @@ if (isset($_POST['submit_signup'])) { // Password and re-entered Password does not match ?> <script> - sniffleAdd('Try again', 'Passwords need to be the same, smelly smelly', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Try again', 'Passwords need to be the same, smelly smelly', 'var(--warning)', 'assets/icons/cross.svg'); </script> <?php $error = $error + 1; @@ -323,7 +323,7 @@ if (isset($_POST['submit_signup'])) { if (empty($_POST['token'])) { ?> <script> - sniffleAdd('smelly', 'Enter Invite Code ;3', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('smelly', 'Enter Invite Code ;3', 'var(--warning)', 'assets/icons/cross.svg'); </script> <?php mysqli_query($conn,"INSERT INTO logs (ipaddress, action) VALUES('$user_ip','Failed to enter correct Invite Code')"); @@ -345,7 +345,7 @@ if (isset($_POST['submit_signup'])) { } else { ?> <script> - sniffleAdd('Argh', 'Your invite code/token did not check out, woopsie!', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Argh', 'Your invite code/token did not check out, woopsie!', 'var(--warning)', 'assets/icons/cross.svg'); </script> <?php $error = $error + 1; @@ -353,7 +353,7 @@ if (isset($_POST['submit_signup'])) { } else { ?> <script> - sniffleAdd('Woops', 'The server or website died inside and could not process your information, sowwy!', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Woops', 'The server or website died inside and could not process your information, sowwy!', 'var(--warning)', 'assets/icons/cross.svg'); </script> <?php $error = $error + 1; @@ -396,7 +396,7 @@ if (isset($_POST['submit_signup'])) { // Yupeee! Account was made ?> <script> - sniffleAdd('Success!', 'You account made for <?php echo $username; ?>!!!!! You must now login', 'var(--green)', 'assets/icons/hand-waving.svg'); + sniffleAdd('Success!', 'You account made for <?php echo $username; ?>!!!!! You must now login', 'var(--success)', 'assets/icons/hand-waving.svg'); loginShow(); </script> <?php @@ -404,7 +404,7 @@ if (isset($_POST['submit_signup'])) { } else { ?> <script> - sniffleAdd('Bruh', 'Something went fuckywucky, please try later', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Bruh', 'Something went fuckywucky, please try later', 'var(--warning)', 'assets/icons/cross.svg'); </script> <?php } @@ -448,7 +448,7 @@ if (isset($_POST['toggle_admin'])) { if (mysqli_stmt_execute($stmt)) { ?> <script> - sniffleAdd('Bap!', '<?php echo $username; ?> has been <?php echo $admin_update_message; ?>!', 'var(--green)', 'assets/icons/check.svg'); + sniffleAdd('Bap!', '<?php echo $username; ?> has been <?php echo $admin_update_message; ?>!', 'var(--success)', 'assets/icons/check.svg'); flyoutClose(); </script> <?php @@ -456,7 +456,7 @@ if (isset($_POST['toggle_admin'])) { } else { ?> <script> - sniffleAdd('Bruh', 'Something went fuckywucky, please try later', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Bruh', 'Something went fuckywucky, please try later', 'var(--warning)', 'assets/icons/cross.svg'); flyoutClose(); </script> <?php @@ -464,7 +464,7 @@ if (isset($_POST['toggle_admin'])) { } else { ?> <script> - sniffleAdd('Bruh', 'Something went fuckywucky, please try later', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Bruh', 'Something went fuckywucky, please try later', 'var(--warning)', 'assets/icons/cross.svg'); flyoutClose(); </script> <?php @@ -472,7 +472,7 @@ if (isset($_POST['toggle_admin'])) { } else { ?> <script> - sniffleAdd('Bruh', 'You\'re not an admin, you cannot!!!!', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Bruh', 'You\'re not an admin, you cannot!!!!', 'var(--warning)', 'assets/icons/cross.svg'); flyoutClose(); </script> <?php @@ -500,7 +500,7 @@ if (isset($_POST['password_reset_submit'])) { if (empty(trim($_POST["new_password"]))) { ?> <script> - sniffleAdd('Meep', 'Enter a new password!', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Meep', 'Enter a new password!', 'var(--warning)', 'assets/icons/cross.svg'); flyoutClose(); </script> <?php @@ -508,7 +508,7 @@ if (isset($_POST['password_reset_submit'])) { } elseif(strlen(trim($_POST["new_password"])) < 6) { ?> <script> - sniffleAdd('Not long enough...', 'Password, must be 6 or more characters in length uwu', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Not long enough...', 'Password, must be 6 or more characters in length uwu', 'var(--warning)', 'assets/icons/cross.svg'); flyoutClose(); </script> <?php @@ -521,7 +521,7 @@ if (isset($_POST['password_reset_submit'])) { if (empty(trim($_POST["confirm_password"]))) { ?> <script> - sniffleAdd('Meep', 'You must confirm the password!!!!', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Meep', 'You must confirm the password!!!!', 'var(--warning)', 'assets/icons/cross.svg'); flyoutClose(); </script> <?php @@ -531,7 +531,7 @@ if (isset($_POST['password_reset_submit'])) { if(empty($error) && ($new_password != $confirm_password)) { ?> <script> - sniffleAdd('AAAA', 'Passwords do not match!!!', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('AAAA', 'Passwords do not match!!!', 'var(--warning)', 'assets/icons/cross.svg'); flyoutClose(); </script> <?php @@ -546,7 +546,7 @@ if (isset($_POST['password_reset_submit'])) { } else { ?> <script> - sniffleAdd('Oopsie', 'An error occured while figuring out which user to change the password of... Are you an admin?', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Oopsie', 'An error occured while figuring out which user to change the password of... Are you an admin?', 'var(--warning)', 'assets/icons/cross.svg'); flyoutClose(); </script> <?php @@ -573,7 +573,7 @@ if (isset($_POST['password_reset_submit'])) { session_destroy(); ?> <script> - sniffleAdd('Password updated', 'Now goodbye.... you will be redirected in a moment', 'var(--green)', 'assets/icons/check.svg'); + sniffleAdd('Password updated', 'Now goodbye.... you will be redirected in a moment', 'var(--success)', 'assets/icons/check.svg'); setTimeout(function(){window.location.href = "account/login.php";}, 2000); </script> <?php @@ -581,7 +581,7 @@ if (isset($_POST['password_reset_submit'])) { // An admin has changed the password ?> <script> - sniffleAdd('Password updated', 'Password has been reset for user! But their session may still be active', 'var(--green)', 'assets/icons/check.svg'); + sniffleAdd('Password updated', 'Password has been reset for user! But their session may still be active', 'var(--success)', 'assets/icons/check.svg'); flyoutClose(); </script> <?php @@ -589,7 +589,7 @@ if (isset($_POST['password_reset_submit'])) { } else { ?> <script> - sniffleAdd('Bruh', 'Something happened on our end, sowwy', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Bruh', 'Something happened on our end, sowwy', 'var(--warning)', 'assets/icons/cross.svg'); flyoutClose(); </script> <?php @@ -610,7 +610,7 @@ if (isset($_POST['account_delete_submit'])) { if ($_POST['delete_id'] == 1) { ?> <script> - sniffleAdd('Sussy', 'You cannot delete the owners account!!!!!', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Sussy', 'You cannot delete the owners account!!!!!', 'var(--warning)', 'assets/icons/cross.svg'); flyoutClose(); </script> <?php @@ -641,7 +641,7 @@ if (isset($_POST['account_delete_submit'])) { } else { ?> <script> - sniffleAdd('Sus', 'Try again! ;3', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Sus', 'Try again! ;3', 'var(--warning)', 'assets/icons/cross.svg'); flyoutClose(); </script> <?php @@ -651,7 +651,7 @@ if (isset($_POST['account_delete_submit'])) { } else { ?> <script> - sniffleAdd('Sus', 'Try again! ;3', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Sus', 'Try again! ;3', 'var(--warning)', 'assets/icons/cross.svg'); flyoutClose(); </script> <?php @@ -660,7 +660,7 @@ if (isset($_POST['account_delete_submit'])) { } else { ?> <script> - sniffleAdd('AAA', 'Something went wrong on our end, sowwy', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('AAA', 'Something went wrong on our end, sowwy', 'var(--warning)', 'assets/icons/cross.svg'); flyoutClose(); </script> <?php @@ -670,7 +670,7 @@ if (isset($_POST['account_delete_submit'])) { } else { ?> <script> - sniffleAdd('oof', 'You did not enter a password!', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('oof', 'You did not enter a password!', 'var(--warning)', 'assets/icons/cross.svg'); flyoutClose(); </script> <?php @@ -681,7 +681,7 @@ if (isset($_POST['account_delete_submit'])) { } else { ?> <script> - sniffleAdd('Ono', 'You aren\'t privilaged enough to delete accounts!', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Ono', 'You aren\'t privilaged enough to delete accounts!', 'var(--warning)', 'assets/icons/cross.svg'); flyoutClose(); </script> <?php @@ -690,7 +690,7 @@ if (isset($_POST['account_delete_submit'])) { } else { ?> <script> - sniffleAdd('Oopsie', 'We couldn\'t find the account that was requested to be deleted', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Oopsie', 'We couldn\'t find the account that was requested to be deleted', 'var(--warning)', 'assets/icons/cross.svg'); flyoutClose(); </script> <?php @@ -721,7 +721,7 @@ if (isset($_POST['account_delete_submit'])) { ?> <script> - sniffleAdd('Progress', 'Deleted all images from the user', 'var(--green)', 'assets/icons/warning.svg'); + sniffleAdd('Progress', 'Deleted all images from the user', 'var(--success)', 'assets/icons/warning.svg'); flyoutClose(); </script> <?php @@ -738,7 +738,7 @@ if (isset($_POST['account_delete_submit'])) { if ($_POST['delete_id'] == $_SESSION['id']) { ?> <script> - sniffleAdd('Goodbye!', 'Successfully deleted your account! You will be redirected in a few seconds...', 'var(--green)', 'assets/icons/check.svg'); + sniffleAdd('Goodbye!', 'Successfully deleted your account! You will be redirected in a few seconds...', 'var(--success)', 'assets/icons/check.svg'); flyoutClose(); setTimeout(function(){window.location.href = "app/account/logout.php";}, 2000); @@ -747,7 +747,7 @@ if (isset($_POST['account_delete_submit'])) { } else { ?> <script> - sniffleAdd('Goodbye!', 'Successfully deleted the user!', 'var(--green)', 'assets/icons/check.svg'); + sniffleAdd('Goodbye!', 'Successfully deleted the user!', 'var(--success)', 'assets/icons/check.svg'); flyoutClose(); </script> <?php @@ -755,7 +755,7 @@ if (isset($_POST['account_delete_submit'])) { } else { ?> <script> - sniffleAdd('Oopsie', 'Some error occured, working on fixing these things', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Oopsie', 'Some error occured, working on fixing these things', 'var(--warning)', 'assets/icons/cross.svg'); flyoutClose(); </script> <?php @@ -795,7 +795,7 @@ if (isset($_POST['pfp_submit'])) { if ($make_stuff->thumbnail($image_path, $image_path, 300) != "success") { ?> <script> - sniffleAdd('Gwha!', 'We hit a small roadbump while compressing your profile picture', 'var(--black)', 'assets/icons/bug.svg'); + sniffleAdd('Gwha!', 'We hit a small roadbump while compressing your profile picture', 'var(--alert)', 'assets/icons/bug.svg'); </script> <?php } @@ -805,34 +805,34 @@ if (isset($_POST['pfp_submit'])) { if (mysqli_query($conn, $sql)) { ?> <script> - sniffleAdd(':3', 'Your Image uploaded successfully!', 'var(--green)', 'assets/icons/check.svg'); + sniffleAdd(':3', 'Your Image uploaded successfully!', 'var(--success)', 'assets/icons/check.svg'); </script> <?php } else { ?> <script> - sniffleAdd(':c', 'Something went fuckywucky, please try later', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd(':c', 'Something went fuckywucky, please try later', 'var(--warning)', 'assets/icons/cross.svg'); </script> <?php } } else { ?> <script> - sniffleAdd('Hmmff', 'Something happened when moving the file to the server. This may just been a 1-off so try again', 'var(--red)', 'assets/icons/bug.svg'); + sniffleAdd('Hmmff', 'Something happened when moving the file to the server. This may just been a 1-off so try again', 'var(--warning)', 'assets/icons/bug.svg'); </script> <?php } } else { ?> <script> - sniffleAdd('Woopsie', 'The file type you are trying to upload is not supported. Supported files include: JPEG, JPG, PNG and WEBP', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Woopsie', 'The file type you are trying to upload is not supported. Supported files include: JPEG, JPG, PNG and WEBP', 'var(--warning)', 'assets/icons/cross.svg'); </script> <?php } } else { ?> <script> - sniffleAdd('Denied!!!', 'As you are not logged in', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Denied!!!', 'As you are not logged in', 'var(--warning)', 'assets/icons/cross.svg'); </script> <?php } diff --git a/app/image/group.php b/app/image/group.php index 17119c7..4d213ff 100644 --- a/app/image/group.php +++ b/app/image/group.php @@ -46,7 +46,7 @@ if (isset($_POST['group_submit'])) { } else { ?> <script> - sniffleAdd('Oopsie....', 'An error occured on the servers', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Oopsie....', 'An error occured on the servers', 'var(--warning)', 'assets/icons/cross.svg'); </script> <?php } @@ -54,7 +54,7 @@ if (isset($_POST['group_submit'])) { } else { ?> <script> - sniffleAdd('Gwa Gwa', 'You\'re not privilaged enough to do thissss!', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Gwa Gwa', 'You\'re not privilaged enough to do thissss!', 'var(--warning)', 'assets/icons/cross.svg'); </script> <?php } @@ -86,14 +86,14 @@ if (isset($_POST['title_submit'])) { if (mysqli_stmt_execute($stmt)) { ?> <script> - sniffleAdd('Success!!!', 'The title has been updated successfully! You may need to refresh the page to see the new information.', 'var(--green)', 'assets/icons/check.svg'); + sniffleAdd('Success!!!', 'The title has been updated successfully! You may need to refresh the page to see the new information.', 'var(--success)', 'assets/icons/check.svg'); flyoutClose(); </script> <?php } else { ?> <script> - sniffleAdd('Error :c', 'An error occured on the servers', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Error :c', 'An error occured on the servers', 'var(--warning)', 'assets/icons/cross.svg'); flyoutClose(); </script> <?php @@ -101,7 +101,7 @@ if (isset($_POST['title_submit'])) { } else { ?> <script> - sniffleAdd('Error :c', 'An error occured on the servers', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Error :c', 'An error occured on the servers', 'var(--warning)', 'assets/icons/cross.svg'); flyoutClose(); </script> <?php @@ -109,7 +109,7 @@ if (isset($_POST['title_submit'])) { } else { ?> <script> - sniffleAdd('Denied', 'It seems that you do not have the right permitions to edit this image.', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Denied', 'It seems that you do not have the right permitions to edit this image.', 'var(--warning)', 'assets/icons/cross.svg'); flyoutClose(); </script> <?php @@ -141,7 +141,7 @@ if (isset($_POST['new_group_submit'])) { } else { ?> <script> - sniffleAdd('Denied', 'You must have an account to preform this action!', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Denied', 'You must have an account to preform this action!', 'var(--warning)', 'assets/icons/cross.svg'); </script> <?php } @@ -175,7 +175,7 @@ if (isset($_POST['group_delete'])) { } else { ?> <script> - sniffleAdd('Ouchie', 'Something went wrong while deleting the group', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Ouchie', 'Something went wrong while deleting the group', 'var(--warning)', 'assets/icons/cross.svg'); flyoutClose(); </script> <?php @@ -183,7 +183,7 @@ if (isset($_POST['group_delete'])) { } else { ?> <script> - sniffleAdd('Ouchie', 'Something went wrong while deleting the image group', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Ouchie', 'Something went wrong while deleting the image group', 'var(--warning)', 'assets/icons/cross.svg'); flyoutClose(); </script> <?php @@ -191,7 +191,7 @@ if (isset($_POST['group_delete'])) { } else { ?> <script> - sniffleAdd('Denied!!!', 'You do not have the right permitions to delete this group', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Denied!!!', 'You do not have the right permitions to delete this group', 'var(--warning)', 'assets/icons/cross.svg'); flyoutClose(); </script> <?php diff --git a/app/image/image.php b/app/image/image.php index ee6425b..3733751 100644 --- a/app/image/image.php +++ b/app/image/image.php @@ -58,7 +58,7 @@ if (isset($_POST['submit_delete'])) { } else { ?> <script> - sniffleAdd('Oopsie', 'The image failed to delete off of the servers, contact Fluffy about his terrible programming', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Oopsie', 'The image failed to delete off of the servers, contact Fluffy about his terrible programming', 'var(--warning)', 'assets/icons/cross.svg'); flyoutClose(); </script> <?php @@ -66,7 +66,7 @@ if (isset($_POST['submit_delete'])) { } else { ?> <script> - sniffleAdd('Error :c', 'An error occured on the servers', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Error :c', 'An error occured on the servers', 'var(--warning)', 'assets/icons/cross.svg'); flyoutClose(); </script> <?php @@ -74,7 +74,7 @@ if (isset($_POST['submit_delete'])) { } else { ?> <script> - sniffleAdd('Denied', 'It seems that you do not have the right permitions to edit this image.', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Denied', 'It seems that you do not have the right permitions to edit this image.', 'var(--warning)', 'assets/icons/cross.svg'); flyoutClose(); </script> <?php @@ -115,14 +115,14 @@ if (isset($_POST['submit_description'])) { if (mysqli_stmt_execute($stmt)) { ?> <script> - sniffleAdd('Success!!!', 'Description has been updated successfully! You may need to refresh the page to see the new information.', 'var(--green)', 'assets/icons/check.svg'); + sniffleAdd('Success!!!', 'Description has been updated successfully! You may need to refresh the page to see the new information.', 'var(--success)', 'assets/icons/check.svg'); flyoutClose(); </script> <?php } else { ?> <script> - sniffleAdd('Error :c', 'An error occured on the servers', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Error :c', 'An error occured on the servers', 'var(--warning)', 'assets/icons/cross.svg'); flyoutClose(); </script> <?php @@ -130,7 +130,7 @@ if (isset($_POST['submit_description'])) { } else { ?> <script> - sniffleAdd('Error :c', 'An error occured on the servers', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Error :c', 'An error occured on the servers', 'var(--warning)', 'assets/icons/cross.svg'); flyoutClose(); </script> <?php @@ -138,7 +138,7 @@ if (isset($_POST['submit_description'])) { } else { ?> <script> - sniffleAdd('Denied', 'It seems that you do not have the right permitions to edit this image.', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Denied', 'It seems that you do not have the right permitions to edit this image.', 'var(--warning)', 'assets/icons/cross.svg'); flyoutClose(); </script> <?php @@ -176,14 +176,14 @@ if (isset($_POST['submit_tags'])) { if (mysqli_stmt_execute($stmt)) { ?> <script> - sniffleAdd('Success!!!', 'Tags have been modified successfully! You may need to refresh the page to see the new information.', 'var(--green)', 'assets/icons/check.svg'); + sniffleAdd('Success!!!', 'Tags have been modified successfully! You may need to refresh the page to see the new information.', 'var(--success)', 'assets/icons/check.svg'); flyoutClose(); </script> <?php } else { ?> <script> - sniffleAdd('Error :c', 'An error occured on the servers', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Error :c', 'An error occured on the servers', 'var(--warning)', 'assets/icons/cross.svg'); flyoutClose(); </script> <?php @@ -191,7 +191,7 @@ if (isset($_POST['submit_tags'])) { } else { ?> <script> - sniffleAdd('Error :c', 'An error occured on the servers', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Error :c', 'An error occured on the servers', 'var(--warning)', 'assets/icons/cross.svg'); flyoutClose(); </script> <?php @@ -199,7 +199,7 @@ if (isset($_POST['submit_tags'])) { } else { ?> <script> - sniffleAdd('Denied', 'It seems that you do not have the right permitions to modify tags here.', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Denied', 'It seems that you do not have the right permitions to modify tags here.', 'var(--warning)', 'assets/icons/cross.svg'); flyoutClose(); </script> <?php @@ -232,14 +232,14 @@ if (isset($_POST['submit_author'])) { if (mysqli_stmt_execute($stmt)) { ?> <script> - sniffleAdd('Success!!!', 'The Author has been updated successfully! You may need to refresh the page to see the new information.', 'var(--green)', 'assets/icons/check.svg'); + sniffleAdd('Success!!!', 'The Author has been updated successfully! You may need to refresh the page to see the new information.', 'var(--success)', 'assets/icons/check.svg'); flyoutClose(); </script> <?php } else { ?> <script> - sniffleAdd('Oopsie....', 'An error occured on the servers', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Oopsie....', 'An error occured on the servers', 'var(--warning)', 'assets/icons/cross.svg'); flyoutClose(); </script> <?php @@ -248,7 +248,7 @@ if (isset($_POST['submit_author'])) { } else { ?> <script> - sniffleAdd('Denied', 'Sussy wussy.', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Denied', 'Sussy wussy.', 'var(--warning)', 'assets/icons/cross.svg'); flyoutClose(); </script> <?php diff --git a/app/image/upload_image.php b/app/image/upload_image.php index 5574974..1c33059 100644 --- a/app/image/upload_image.php +++ b/app/image/upload_image.php @@ -34,7 +34,7 @@ if (isset($_POST['submit'])) { if (!in_array($file_type, $allowed_types)) { ?> <script> - sniffleAdd('Woopsie', 'The file type you are trying to upload is not supported. Supported files include: JPEG, JPG, PNG and WEBP', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Woopsie', 'The file type you are trying to upload is not supported. Supported files include: JPEG, JPG, PNG and WEBP', 'var(--warning)', 'assets/icons/cross.svg'); </script> <?php $error += 1; @@ -85,7 +85,7 @@ if (isset($_POST['submit'])) { if (is_file($image_path)) { ?> <script> - sniffleAdd('Woopsie', 'There was an error in your manifest.json and cause filename errors, please setup a name with a unique template', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Woopsie', 'There was an error in your manifest.json and cause filename errors, please setup a name with a unique template', 'var(--warning)', 'assets/icons/cross.svg'); </script> <?php $error += 1; @@ -98,7 +98,7 @@ if (isset($_POST['submit'])) { if (is_file($image_path)) { ?> <script> - sniffleAdd('Woopsie', 'A file under that name already exists!', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Woopsie', 'A file under that name already exists!', 'var(--warning)', 'assets/icons/cross.svg'); </script> <?php $error += 1; @@ -114,7 +114,7 @@ if (isset($_POST['submit'])) { if ($make_stuff->thumbnail($image_path, $thumb_dir.$image_newname, 300) != "success") { ?> <script> - sniffleAdd('Gwha!', 'We hit a small roadbump during making of the thumbail. We will continue anyway! \n Full Error: <?php echo $make_thumbnail; ?>', 'var(--black)', 'assets/icons/bug.svg'); + sniffleAdd('Gwha!', 'We hit a small roadbump during making of the thumbail. We will continue anyway! \n Full Error: <?php echo $make_thumbnail; ?>', 'var(--allert)', 'assets/icons/bug.svg'); </script> <?php } @@ -123,7 +123,7 @@ if (isset($_POST['submit'])) { if ($make_stuff->thumbnail($image_path, $preview_dir.$image_newname, 900) != "success") { ?> <script> - sniffleAdd('Gwha!', 'We hit a small roadbump during making of the preview. We will continue anyway! \n Full Error: <?php echo $make_preview; ?>', 'var(--black)', 'assets/icons/bug.svg'); + sniffleAdd('Gwha!', 'We hit a small roadbump during making of the preview. We will continue anyway! \n Full Error: <?php echo $make_preview; ?>', 'var(--allert)', 'assets/icons/bug.svg'); </script> <?php } @@ -146,13 +146,13 @@ if (isset($_POST['submit'])) { if (mysqli_stmt_execute($stmt)) { ?> <script> - sniffleAdd(':3', 'Your Image uploaded successfully!', 'var(--green)', 'assets/icons/check.svg'); + sniffleAdd(':3', 'Your Image uploaded successfully!', 'var(--success)', 'assets/icons/check.svg'); </script> <?php } else { ?> <script> - sniffleAdd(':c', 'Something went fuckywucky, please try later', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd(':c', 'Something went fuckywucky, please try later', 'var(--warning)', 'assets/icons/cross.svg'); </script> <?php } @@ -160,7 +160,7 @@ if (isset($_POST['submit'])) { } else { ?> <script> - sniffleAdd('Hmmff', 'Something happened when moving the file to the server. This may just been a 1-off so try again', 'var(--red)', 'assets/icons/bug.svg'); + sniffleAdd('Hmmff', 'Something happened when moving the file to the server. This may just been a 1-off so try again', 'var(--warning)', 'assets/icons/bug.svg'); </script> <?php } @@ -168,7 +168,7 @@ if (isset($_POST['submit'])) { } else { ?> <script> - sniffleAdd('Denied!!!', 'As you are not loggedin, your upload has been stopped, L', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Denied!!!', 'As you are not loggedin, your upload has been stopped, L', 'var(--warning)', 'assets/icons/cross.svg'); </script> <?php } diff --git a/css/main.css b/css/main.css index 1e1ac27..61f51e1 100644 --- a/css/main.css +++ b/css/main.css @@ -15,13 +15,21 @@ --fg: #E8E3E3; --fg-dark: #151515; --red: #B66467; - --orange: #FF7700; + --orange: #D8A657; + --yellow: #D9BC8C; --green: #8C977D; + --blue: #8DA3B9; + --purple: #A988B0; --black: #121212; --white: #E8E3E3; --accent: #8C977D; + --warning: #B66467; + --alert: #D8A657; + --success: #8C977D; + --neutral: #121212; --shadow: 6px 6px 2px rgba(21, 21, 21, 0.4); --rad: 0.4rem; + --border: #8C977D 0.2rem solid; } /* @@ -968,7 +976,7 @@ footer a { font-family: "Secular One", sans-serif; } footer a:hover { - color: #FF7700; + color: #D8A657; } /* @@ -1054,16 +1062,24 @@ a.btn { text-align: center; } -.btn-good { - background-color: #8C977D; -} - .btn-bad { background-color: #B66467; + /*color: darken($warning, 40%);*/ +} + +.btn-warning { + background-color: #D8A657; + /*color: darken($warning, 40%);*/ +} + +.btn-good { + background-color: #8C977D; + /*color: darken($warning, 40%);*/ } .btn-neutral { background-color: #121212; + /*color: $white;*/ } /* diff --git a/css/main.scss b/css/main.scss index 82ee3f9..23795b7 100644 --- a/css/main.scss +++ b/css/main.scss @@ -110,16 +110,22 @@ a.btn { text-align: center; } -.btn-good { - background-color: $page-accent; -} .btn-bad { - background-color: $red; + background-color: $warning; + /*color: darken($warning, 40%);*/ +} +.btn-warning { + background-color: $alert; + /*color: darken($warning, 40%);*/ +} +.btn-good { + background-color: $page-accent; + /*color: darken($warning, 40%);*/ } - .btn-neutral { - background-color: $black; + background-color: $neutral; + /*color: $white;*/ } /* diff --git a/css/scss/_variables.scss b/css/scss/_variables.scss index cd0eccd..9e3fee1 100644 --- a/css/scss/_variables.scss +++ b/css/scss/_variables.scss @@ -5,12 +5,20 @@ $fg: #E8E3E3; $fg-alt: #151515; $red: #B66467; -$orange: #FF7700; +$orange: #D8A657; +$yellow: #D9BC8C; $green: #8C977D; +$blue: #8DA3B9; +$purple: #A988B0; + $black: #121212; $white: #E8E3E3; $page-accent: #8C977D; +$warning: $red; +$alert: $orange; +$success: $green; +$neutral: $black; $shadow: 6px 6px 2px #15151566; $rad: 0.4rem; @@ -38,13 +46,21 @@ sans-serif; --red: #{$red}; --orange: #{$orange}; + --yellow: #{$yellow}; --green: #{$green}; + --blue: #{$blue}; + --purple: #{$purple}; + --black: #{$black}; --white: #{$white}; --accent: #{$page-accent}; + --warning: #{$warning}; + --alert: #{$alert}; + --success: #{$success}; + --neutral: #{$neutral}; --shadow: #{$shadow}; - --rad: #{$rad}; + --border: #{$border}; } \ No newline at end of file diff --git a/group.php b/group.php index c184c2f..afa9ec4 100644 --- a/group.php +++ b/group.php @@ -22,7 +22,7 @@ if (isset($_SESSION['err'])) { ?> <script> - sniffleAdd("Error", "<?php echo $_SESSION['msg']; ?>", "var(--red)", "assets/icons/trash.svg"); + sniffleAdd("Error", "<?php echo $_SESSION['msg']; ?>", "var(--warning)", "assets/icons/trash.svg"); </script> <?php unset($_SESSION['err']); @@ -234,7 +234,7 @@ var images = getList(); if (images <= 0) { - sniffleAdd('Oppsie', 'Groups need at least 1 image in them. Alternativly, you can delete this group.', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Oppsie', 'Groups need at least 1 image in them. Alternativly, you can delete this group.', 'var(--warning)', 'assets/icons/cross.svg'); } else { $("#sniffle").load("app/image/group.php", { group_images: images, diff --git a/image.php b/image.php index a0ab731..1b07d6f 100644 --- a/image.php +++ b/image.php @@ -39,7 +39,7 @@ } else { ?> <script> - sniffleAdd('Woops', 'Something happened, either image with the ID <?php echo $_GET['id']; ?> was deleted or never existed, either way it could not be found!', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Woops', 'Something happened, either image with the ID <?php echo $_GET['id']; ?> was deleted or never existed, either way it could not be found!', 'var(--warning)', 'assets/icons/cross.svg'); </script> <?php $image_present = False; @@ -47,7 +47,7 @@ } else { ?> <script> - sniffleAdd('Where is da image?', 'The link you followed seems to be broken, or there was some other error, who knows!', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Where is da image?', 'The link you followed seems to be broken, or there was some other error, who knows!', 'var(--warning)', 'assets/icons/cross.svg'); </script> <?php $image_present = False; @@ -246,7 +246,7 @@ <a id='download' class='btn btn-good' href='<?php echo "images/".$image['imagename']; ?>' download='<?php echo $image['imagename']; ?>'><img class='svg' src='assets/icons/download.svg'>Download image</a> <script> $("#download").click(function() { - sniffleAdd("Info", "Image download started!", "var(--green)", "assets/icons/download.svg"); + sniffleAdd("Info", "Image download started!", "var(--success)", "assets/icons/download.svg"); }); </script> @@ -256,7 +256,7 @@ function copyLink() { navigator.clipboard.writeText(window.location.href); - sniffleAdd("Info", "Link has been copied!", "var(--green)", "assets/icons/clipboard-text.svg"); + sniffleAdd("Info", "Link has been copied!", "var(--success)", "assets/icons/clipboard-text.svg"); } </script> </div> diff --git a/index.php b/index.php index 5ffc534..9919753 100644 --- a/index.php +++ b/index.php @@ -14,7 +14,7 @@ if (isset($_SESSION['del'])) { ?> <script> - sniffleAdd("Image Deleted", "Successfully deleted image: <?php echo $_SESSION['del']; ?>", "var(--green)", "assets/icons/trash.svg"); + sniffleAdd("Image Deleted", "Successfully deleted image: <?php echo $_SESSION['del']; ?>", "var(--success)", "assets/icons/trash.svg"); </script> <?php unset($_SESSION['del']); @@ -22,7 +22,7 @@ if (isset($_SESSION['welc'])) { ?> <script> - sniffleAdd('O hi <?php echo $_SESSION["username"]; ?>', 'You are now logged in, enjoy your stay!', 'var(--green)', 'assets/icons/hand-waving.svg'); + sniffleAdd('O hi <?php echo $_SESSION["username"]; ?>', 'You are now logged in, enjoy your stay!', 'var(--success)', 'assets/icons/hand-waving.svg'); </script> <?php unset($_SESSION['welc']); diff --git a/upload.php b/upload.php index bfe1b61..1db45aa 100644 --- a/upload.php +++ b/upload.php @@ -18,7 +18,7 @@ if (!$user_info->is_loggedin()) { ?> <script> - sniffleAdd('Who are you!', 'You must be loggedin to upload things, sowwy!', 'var(--red)', 'assets/icons/cross.svg'); + sniffleAdd('Who are you!', 'You must be loggedin to upload things, sowwy!', 'var(--alert)', 'assets/icons/cross.svg'); </script> <?php } @@ -90,7 +90,7 @@ $("#tags").val(""); $("#submit").val(""); } else { - sniffleAdd('Gwha!', 'Pls provide image', 'var(--red)', 'assets/icons/file-search.svg'); + sniffleAdd('Gwha!', 'Pls provide image', 'var(--warning)', 'assets/icons/file-search.svg'); } }); </script>