From 5a591c59bc4bf5d755308f55b720485a794d7492 Mon Sep 17 00:00:00 2001 From: Fluffy-Bean Date: Wed, 21 Sep 2022 13:02:38 +0000 Subject: [PATCH 01/39] Code cleanup in progress --- about.php | 8 +- account.php | 13 +- app/server/secrete.php | 25 ---- app/settings/manifest.json | 2 +- app/settings/settings.php | 10 +- css/main.css | 15 ++- css/scss/_body.scss | 16 ++- image.php | 246 ++++++++++++++++++------------------- index.php | 23 ++-- password-reset.php | 20 +-- ui/nav.php | 117 +++++++++++++++--- ui/required.php | 74 +---------- upload.php | 118 +++++++++--------- 13 files changed, 339 insertions(+), 348 deletions(-) delete mode 100644 app/server/secrete.php diff --git a/about.php b/about.php index 18e1d22..30ce0c0 100644 --- a/about.php +++ b/about.php @@ -1,3 +1,5 @@ + + @@ -5,12 +7,8 @@ - - +

diff --git a/account.php b/account.php index e93b3c7..eef3200 100644 --- a/account.php +++ b/account.php @@ -1,3 +1,5 @@ + + @@ -7,14 +9,13 @@ - 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/ . . ."); - \ No newline at end of file diff --git a/app/settings/manifest.json b/app/settings/manifest.json index dca09b2..931549b 100644 --- a/app/settings/manifest.json +++ b/app/settings/manifest.json @@ -26,7 +26,7 @@ "The world will not be destroyed by those who do evil, but by those who watch them and do nothing." ], "license":"GPL 3.0", - "version": "22.09.20", + "version": "22.09.21", "user_name": "Michal", "is_testing": "true", "upload_max": "20" diff --git a/app/settings/settings.php b/app/settings/settings.php index 84cf2fa..b315fa7 100644 --- a/app/settings/settings.php +++ b/app/settings/settings.php @@ -9,12 +9,4 @@ |------------------------------------------------------------- */ $user_import = file_get_contents(__DIR__."/manifest.json"); -$user_settings = json_decode($user_import, true); - -foreach ($user_settings->data as $website) { - foreach ($website->debug as $debug) { - - } -} - -$debug = $user_settings["website"]["debug"]; +$user_settings = json_decode($user_import, true); \ No newline at end of file diff --git a/css/main.css b/css/main.css index aec0d1d..fc5c4e2 100644 --- a/css/main.css +++ b/css/main.css @@ -217,7 +217,8 @@ nav .btn { margin: 0.25rem; padding: 0; height: auto; - max-width: calc(33.33% - 0.5rem); + max-width: calc(20% - 0.5rem); + min-width: calc(20% - 0.5rem); background-color: #151515; border-radius: -0.25rem; position: relative; @@ -236,6 +237,18 @@ nav .btn { padding-bottom: 100%; } +@media (max-width: 800px) { + .gallery-item { + max-width: calc(25% - 0.5rem); + min-width: calc(25% - 0.5rem); + } +} +@media (max-width: 550px) { + .gallery-item { + max-width: calc(33.33% - 0.5rem); + min-width: calc(33.33% - 0.5rem); + } +} .gallery-image { margin: 0; padding: 0; diff --git a/css/scss/_body.scss b/css/scss/_body.scss index 2d03dfd..4825c49 100644 --- a/css/scss/_body.scss +++ b/css/scss/_body.scss @@ -64,7 +64,8 @@ padding: 0; height: auto; - max-width: calc(33.33% - 0.5rem); + max-width: calc(20% - 0.5rem); + min-width: calc(20% - 0.5rem); background-color: $bg; border-radius: calc($rad - 0.5rem); @@ -91,6 +92,19 @@ } } +@media (max-width: 800px) { + .gallery-item { + max-width: calc(25% - 0.5rem); + min-width: calc(25% - 0.5rem); + } +} +@media (max-width: 550px) { + .gallery-item { + max-width: calc(33.33% - 0.5rem); + min-width: calc(33.33% - 0.5rem); + } +} + .gallery-image { margin: 0; padding: 0; diff --git a/image.php b/image.php index 0930052..3f2af79 100644 --- a/image.php +++ b/image.php @@ -1,3 +1,5 @@ + + @@ -5,162 +7,150 @@ - get_image_info($conn, $_GET['id']); + /* + |------------------------------------------------------------- + | Get image ID + |------------------------------------------------------------- + | Image ID should be written in the URL of the page as ?id=69 + | If ID cannot be obtained, give error. ID going here ^^ + |------------------------------------------------------------- + */ + if (isset($_GET['id']) && is_numeric($_GET['id'])) { + // Get all image info + $image = $image_info->get_image_info($conn, $_GET['id']); - // Check if image is avalible - if (isset($image['imagename'])) { - $image_present = True; + // Check if image is avalible + if (isset($image['imagename'])) { + $image_present = True; + } else { + ?> + + + ?> - - get_user_info($conn, $image['author']); + if ($image_present) { + /* + |------------------------------------------------------------- + | Check user details + |------------------------------------------------------------- + */ + if (isset($image['author'])) { + // Get all information on the user + $user = $user_info->get_user_info($conn, $image['author']); - if (isset($user['username'])) { - $image_author = $user['username']; + if (isset($user['username'])) { + $image_author = $user['username']; + } else { + $image_author = "Deleted User"; + } } else { - $image_author = "Deleted User"; + $image_author = "No author"; + } + + /* + |------------------------------------------------------------- + | Check if image path is good + |------------------------------------------------------------- + */ + if (isset($image['imagename'])) { + $image_path = "images/".$image['imagename']; + $image_alt = $image['alt']; + } else { + $image_path = "assets/no_image.png"; + $image_alt = "No image could be found, sowwy"; + } + + /* + |------------------------------------------------------------- + | If description not set or empty, replace with filler + |------------------------------------------------------------- + */ + if (!isset($image_alt) || empty($image_alt)) { + $image_alt = "No description avalible"; } } else { - $image_author = "No author"; - } - - /* - |------------------------------------------------------------- - | Check if image path is good - |------------------------------------------------------------- - */ - if (isset($image['imagename'])) { - $image_path = "images/".$image['imagename']; - $image_alt = $image['alt']; - } else { + /* + |------------------------------------------------------------- + | Image was not present + |------------------------------------------------------------- + */ $image_path = "assets/no_image.png"; $image_alt = "No image could be found, sowwy"; } /* - |------------------------------------------------------------- - | If description not set or empty, replace with filler - |------------------------------------------------------------- + |------------------------------------------------------------- + | Check user privilge + |------------------------------------------------------------- */ - if (!isset($image_alt) || empty($image_alt)) { - $image_alt = "No description avalible"; + if ($image_info->image_privilage($image['author']) || $user_info->is_admin($conn, $_SESSION['id'])) { + $privilaged = True; + } else { + $privilaged = False; } - } else { + + if (is_file("images/previews/".$image['imagename'])) { + echo "
+ ".$image_alt." + +
"; + ?> + + + ".$image_alt." +
"; + } + + /* - |------------------------------------------------------------- - | Image was not present - |------------------------------------------------------------- + |------------------------------------------------------------- + | Start of displaying all info on image + |------------------------------------------------------------- */ - $image_path = "assets/no_image.png"; - $image_alt = "No image could be found, sowwy"; - } - - /* - |------------------------------------------------------------- - | Check user privilge - |------------------------------------------------------------- - */ - if ($image_info->image_privilage($image['author']) || $user_info->is_admin($conn, $_SESSION['id'])) { - $privilaged = True; - } else { - $privilaged = False; - } - - if (is_file("images/previews/".$image['imagename'])) { - echo "
- ".$image_alt." - -
"; - ?> - - - ".$image_alt." - "; - } - - - /* - |------------------------------------------------------------- - | Start of displaying all info on image - |------------------------------------------------------------- - */ - if ($image_present) { + if ($image_present) { ?>
diff --git a/index.php b/index.php index 2cbfd16..85bbd74 100644 --- a/index.php +++ b/index.php @@ -1,3 +1,5 @@ + + @@ -6,18 +8,17 @@ - - - + if ($_GET['del']) { + ?> + +
+ @@ -5,21 +7,19 @@ - is_loggedin() != true) { - header("location: account.php"); - exit; - } + // Check if the user is logged in, otherwise redirect to login page + if ($user_info->is_loggedin() != true) { + header("location: account.php"); + exit; + } ?>
diff --git a/ui/nav.php b/ui/nav.php index df84c3d..423aa68 100644 --- a/ui/nav.php +++ b/ui/nav.php @@ -1,28 +1,105 @@ + + + +
+ + +
+
+

Header

+
+

Description

+
+
+ +
+ + + + + + + + +
\ No newline at end of file diff --git a/ui/required.php b/ui/required.php index f43c1c8..cba2be3 100644 --- a/ui/required.php +++ b/ui/required.php @@ -1,56 +1,6 @@ - -
- - -
-
-

Header

-
-

Description

-
-
- -
- - - - - - - - -
- - - \ No newline at end of file +} \ No newline at end of file diff --git a/upload.php b/upload.php index 41822d9..0278b23 100644 --- a/upload.php +++ b/upload.php @@ -1,74 +1,27 @@ + + - - - is_loggedin()) { - ?> - - is_loggedin()) { + ?> + +
@@ -84,6 +37,51 @@
+ + From 6755f1af0dcc4166c0610eaa2dec15fdc35e1120 Mon Sep 17 00:00:00 2001 From: Fluffy-Bean Date: Wed, 21 Sep 2022 13:37:45 +0000 Subject: [PATCH 02/39] Update README --- README.md | 47 +++++++++++++++++++++------- about.php | 8 ++--- account.php | 8 ++--- {ui => app}/required.php | 0 {ui => assets/ui}/footer.php | 0 {ui => assets/ui}/header.php | 0 {ui => assets/ui}/nav.php | 0 error.php | 4 +-- image.php | 8 ++--- index.php | 8 ++--- GitHub/onlylegs.jpg => onlylegs.jpg | Bin password-reset.php | 8 ++--- upload.php | 8 ++--- 13 files changed, 62 insertions(+), 37 deletions(-) rename {ui => app}/required.php (100%) rename {ui => assets/ui}/footer.php (100%) rename {ui => assets/ui}/header.php (100%) rename {ui => assets/ui}/nav.php (100%) rename GitHub/onlylegs.jpg => onlylegs.jpg (100%) diff --git a/README.md b/README.md index 681442b..9fa3f8d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,10 @@ -# OnlyLegs! -The only gallery made by a maned wolf. +
+ +

+
+ +# Only legs! +The only gallery made by a maned wolf ## How to setup ### Downloading & installing @@ -7,9 +12,12 @@ The only gallery made by a maned wolf. Download this project and move it into your website(s) folder. Usually under ```/var/www/html/``` on Linux. #### Imagik -You will need to install the image-magik PHP plugin for thumbnail creation, on Ubuntu its as easy as ```apt install php-imagick```. +You will need to install the image-magik PHP plugin for thumbnail creation, on Ubuntu its as easy as: -#### PHP + apt install php-imagick + + +#### PHP and Nginx This project also requires PHP 8.1 and was made with Ubuntu 22.04 LTS and Nginx in mind, so I reccommend running this gallery on such. With Nginx, you may need to configure the ```/etc/nginx/sites-available/default.conf``` for the new version on PHP. You must find the allowed index list and add index.php as such: @@ -17,18 +25,29 @@ With Nginx, you may need to configure the ```/etc/nginx/sites-available/default. # Add index.php to the list if you are using PHP index index.php index.html index.htm index.nginx-debian.html; -Then you have to find the ```fastcgi-php``` configuration, you will need to uncomment the lines and update the php version to 8.1 and now the config should look like the following: +Then you have to find the ```fastcgi-php``` configuration and uncomment the lines and update the php version to 8.1 and now the config should look like the following: location ~ \.php$ { include snippets/fastcgi-php.conf; fastcgi_pass unix:/var/run/php/php8.1-fpm.sock; } +With that, you may need to increase the ```client_max_body_size``` in the ```nginx.conf```, which should be located under ```/etc/nginx/nginx.conf```. There make sure your ```http``` looks like this: + + http { + client_body_buffer_size 16K; + client_header_buffer_size 1k; + client_max_body_size 32M; + +Most important of them being ```client_max_body_size```. + ### Database setup If you made it this far, congrats! We're not even close to done. Next you will need to setup your database. If you're running a seperate server for databases, that'll also work. #### Note: -If you run into errors with connecting to the database, you may need to install php-mysqli, on Ubuntu that command will be ```apt install php-mysqli```. +If you run into errors with connecting to the database, you may need to install php-mysqli, on Ubuntu that command will be: + + apt install php-mysqli You first need to head over to ```app/server/conn.php``` and set the correct information, if you're using localhost, this should be the following details: @@ -94,11 +113,17 @@ Since there is currently no automated install script for this gallery, you'll ha mkdir images/thumbnails mkdir images/previews -This'll make 3 new folders. That is where all the uploaded images will be held in. But before you go anywhere, you will need to ```chown``` them so Nginx can access them, a simple way of doing this is ```chown www-data:www-data -R images``` this will give Nginx access to the folder and all of its content. -### Creating an account -For now, there is no automated way of doing this, so you will have to go into your database on a terminal and type the following command ```INSERT INTO tokens (code, used) VALUES('UserToken', False)```. You have now made a token that you can use to make an account with. +This'll make 3 new folders. That is where all the uploaded images will be held in. But before you go anywhere, you will need to ```chown``` the folders so Nginx can access the images within them, so do the following: + + chown www-data:www-data -R images + +### Creating an account +For now, there is no automated way of doing this, so you will have to go into your database on a terminal and type the following command: + + INSERT INTO tokens (code, used) VALUES('UserToken', False) + +Head over to the Login section off the app and click the Need an account button, from there you can enter your own details. Once you get to the token section enter __UserToken__. And with that, you have now set up your own image gallery! -Head over to the Login section off the app and click the Need an account button, from there you can enter your own details. Once you get to the token section enter ```UserToken```. And with that, you have now set up your own image gallery! ## Usage ### Admin @@ -109,7 +134,7 @@ If you trust someone enough, you can set them to a moderator through the setting ### Images Uploading images is as simple as choosing the image you want to upload, then clicking upload! Keep in mind that not all formats play well as this gallery uses Imagik to generate thumbnails and preview images, so images such as GIFs do not work as of now. Supported file formats include JPG, JPEG, PNG and WEBP. -You should also keep in mind the file size, by default images of 20MBs should be able to get uploaded. But if you run into issues, either raise the file size in the ```manifest.json``` or locate your ```php.ini``` on your webserver and raise the ```upload_max_filesize``` and ```post_max_size``` to a same or greater value. +You should also keep in mind the file size, by default images of 20MBs should be able to get uploaded. But if you run into issues, either raise the file size in the ```manifest.json``` or locate your ```php.ini``` on your webserver, usually under ```/etc/php/8.1/fpm/php.ini```, and modify ```upload_max_filesize```, then ```post_max_size``` to a same or greater value. ## License This project is under the GNU v3 License diff --git a/about.php b/about.php index 30ce0c0..ae2961e 100644 --- a/about.php +++ b/about.php @@ -1,14 +1,14 @@ - + - + - +

@@ -36,7 +36,7 @@ Creators Twitter
- + \ No newline at end of file diff --git a/account.php b/account.php index eef3200..dd602cf 100644 --- a/account.php +++ b/account.php @@ -1,15 +1,15 @@ - + - + - + \ No newline at end of file diff --git a/ui/required.php b/app/required.php similarity index 100% rename from ui/required.php rename to app/required.php diff --git a/ui/footer.php b/assets/ui/footer.php similarity index 100% rename from ui/footer.php rename to assets/ui/footer.php diff --git a/ui/header.php b/assets/ui/header.php similarity index 100% rename from ui/header.php rename to assets/ui/header.php diff --git a/ui/nav.php b/assets/ui/nav.php similarity index 100% rename from ui/nav.php rename to assets/ui/nav.php diff --git a/error.php b/error.php index 576a58e..1964066 100644 --- a/error.php +++ b/error.php @@ -2,7 +2,7 @@ - + @@ -20,7 +20,7 @@ ?>
- + \ No newline at end of file diff --git a/image.php b/image.php index 3f2af79..ab0051f 100644 --- a/image.php +++ b/image.php @@ -1,15 +1,15 @@ - + - + - + \ No newline at end of file diff --git a/index.php b/index.php index 85bbd74..d1defa7 100644 --- a/index.php +++ b/index.php @@ -1,15 +1,15 @@ - + - + @@ -86,6 +86,6 @@ ?>
- + diff --git a/GitHub/onlylegs.jpg b/onlylegs.jpg similarity index 100% rename from GitHub/onlylegs.jpg rename to onlylegs.jpg diff --git a/password-reset.php b/password-reset.php index e5b4776..fce1e82 100644 --- a/password-reset.php +++ b/password-reset.php @@ -1,15 +1,15 @@ - + - + - + \ No newline at end of file diff --git a/upload.php b/upload.php index 0278b23..575c46d 100644 --- a/upload.php +++ b/upload.php @@ -1,15 +1,15 @@ - + - + - + \ No newline at end of file From 95ad97f19dff0933686dedec363083e6a97b6db0 Mon Sep 17 00:00:00 2001 From: Fluffy-Bean Date: Wed, 21 Sep 2022 13:39:46 +0000 Subject: [PATCH 03/39] F --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9fa3f8d..24aba7d 100644 --- a/README.md +++ b/README.md @@ -120,9 +120,9 @@ This'll make 3 new folders. That is where all the uploaded images will be held i ### Creating an account For now, there is no automated way of doing this, so you will have to go into your database on a terminal and type the following command: - INSERT INTO tokens (code, used) VALUES('UserToken', False) + INSERT INTO tokens (code, used) VALUES('UserToken', false) -Head over to the Login section off the app and click the Need an account button, from there you can enter your own details. Once you get to the token section enter __UserToken__. And with that, you have now set up your own image gallery! +Head over to the Login section off the app and click the __Need an account__ button, from there you can enter your own details. Once you get to the token section enter __UserToken__. And with that, you have now set up your own image gallery! ## Usage From e7f55dc0623ced59312973ce37a0a21e4c1ab604 Mon Sep 17 00:00:00 2001 From: Fluffy-Bean Date: Wed, 21 Sep 2022 14:23:17 +0000 Subject: [PATCH 04/39] A handfull of fixes --- about.php | 4 ++-- app/settings/manifest.json | 7 +++---- css/main.css | 29 +++++++++++++++++++++-------- css/main.scss | 16 +++++++++++++++- css/scss/_body.scss | 6 +++--- css/scss/_variables.scss | 2 +- image.php | 4 ++-- upload.php | 5 +++-- 8 files changed, 50 insertions(+), 23 deletions(-) diff --git a/about.php b/about.php index ae2961e..d2a8e72 100644 --- a/about.php +++ b/about.php @@ -32,8 +32,8 @@

Development

- Project Github - Creators Twitter +

This projects GitHub: Repo

+

My Twitter: Twitter

diff --git a/app/settings/manifest.json b/app/settings/manifest.json index 931549b..e42827f 100644 --- a/app/settings/manifest.json +++ b/app/settings/manifest.json @@ -22,12 +22,11 @@ "The weather is dry", "Need me a man 👀", "Gods die too.", - "Eat hotchip and lie", - "The world will not be destroyed by those who do evil, but by those who watch them and do nothing." + "Eat hotchip and lie" ], "license":"GPL 3.0", "version": "22.09.21", - "user_name": "Michal", + "user_name": "[your name]", "is_testing": "true", - "upload_max": "20" + "upload_max": "32" } \ No newline at end of file diff --git a/css/main.css b/css/main.css index fc5c4e2..66cc47d 100644 --- a/css/main.css +++ b/css/main.css @@ -17,7 +17,7 @@ --red: #B66467; --orange: #FF7700; --green: #8C977D; - --black: #151515; + --black: #121212; --white: #E8E3E3; --accent: #8C977D; --shadow: 6px 6px 2px rgba(21, 21, 21, 0.4); @@ -355,7 +355,7 @@ nav .btn { border: none; border-radius: calc(0.25rem - (0.5rem + 3px)); transition: outline 0.1s cubic-bezier(0.19, 1, 0.22, 1); - background-color: #151515; + background-color: #121212; opacity: 0.8; box-shadow: 6px 6px 2px rgba(21, 21, 21, 0.4); } @@ -685,7 +685,7 @@ nav .btn { justify-content: space-between; } .log:nth-child(even) { - background-color: rgba(255, 255, 255, 0.0666666667); + background-color: rgba(232, 227, 227, 0.0666666667); } .log > * { margin: 0 0.5rem 0 0; @@ -732,7 +732,7 @@ nav .btn { justify-content: space-between; } .ban:nth-child(even) { - background-color: rgba(255, 255, 255, 0.0666666667); + background-color: rgba(232, 227, 227, 0.0666666667); } .ban > * { margin: 0 0.5rem 0 0; @@ -786,7 +786,7 @@ nav .btn { justify-content: space-between; } .user:nth-child(even) { - background-color: rgba(255, 255, 255, 0.0666666667); + background-color: rgba(232, 227, 227, 0.0666666667); } .user > * { margin: 0 0.5rem 0 0; @@ -1039,7 +1039,7 @@ body * { text-decoration: none; background-color: #E8E3E3; border: none; - border-radius: 0.25rem; + border-radius: calc(0.25rem - (0.5rem + 3px)); } .btn:where(input[type=file])::file-selector-button { margin: -0.25rem 0.5rem -0.25rem -0.25rem; @@ -1049,7 +1049,7 @@ body * { text-decoration: none; background-color: #E8E3E3; border: none; - border-radius: 0.25rem; + border-radius: calc(0.25rem - (0.5rem + 3px)); } a.btn { @@ -1065,7 +1065,7 @@ a.btn { } .btn-neutral { - background-color: #151515; + background-color: #121212; } /* @@ -1108,6 +1108,19 @@ br { line-height: 0.25rem; } +/* + |------------------------------------------------------------- + | Link text + |------------------------------------------------------------- +*/ +a.link { + display: inline; + text-decoration: underline; +} +a.link:hover { + color: #8C977D; +} + /* |------------------------------------------------------------- | BACK TO TOP diff --git a/css/main.scss b/css/main.scss index 9082cdc..abd85d3 100644 --- a/css/main.scss +++ b/css/main.scss @@ -102,7 +102,7 @@ body { background-color: $white; border: none; - border-radius: $rad; + border-radius: calc($rad - (0.5rem + 3px)); } } @@ -166,6 +166,20 @@ br { line-height: 0.25rem; } +/* + |------------------------------------------------------------- + | Link text + |------------------------------------------------------------- +*/ +a.link { + display: inline; + text-decoration: underline; + + &:hover { + color: $page-accent; + } +} + /* |------------------------------------------------------------- | BACK TO TOP diff --git a/css/scss/_body.scss b/css/scss/_body.scss index 4825c49..400ec0e 100644 --- a/css/scss/_body.scss +++ b/css/scss/_body.scss @@ -409,7 +409,7 @@ justify-content: space-between; &:nth-child(even) { - background-color: #ffffff11; + background-color: #E8E3E311; } & > * { @@ -461,7 +461,7 @@ justify-content: space-between; &:nth-child(even) { - background-color: #ffffff11; + background-color: #E8E3E311; } & > * { @@ -519,7 +519,7 @@ justify-content: space-between; &:nth-child(even) { - background-color: #ffffff11; + background-color: #E8E3E311; } & > * { diff --git a/css/scss/_variables.scss b/css/scss/_variables.scss index a3ded82..e262271 100644 --- a/css/scss/_variables.scss +++ b/css/scss/_variables.scss @@ -7,7 +7,7 @@ $fg-alt: #151515; $red: #B66467; $orange: #FF7700; $green: #8C977D; -$black: #151515; +$black: #121212; $white: #E8E3E3; $page-accent: #8C977D; diff --git a/image.php b/image.php index ab0051f..59c6ab2 100644 --- a/image.php +++ b/image.php @@ -320,7 +320,7 @@ var header = "Enter new Description/Alt"; var description = "Whatcha gonna put in there 👀"; var actionBox = "
\ - \ + \ \
"; flyoutShow(header, description, actionBox); @@ -356,7 +356,7 @@ var header = "Tags"; var description = "Tags are seperated by spaces, only alowed characters are a-z and underscores, all hyphens are converted to underscores. There are also special tags such as nsfw that'll blur images in the overview"; var actionBox = "
\ - \ + \ \
"; flyoutShow(header, description, actionBox); diff --git a/upload.php b/upload.php index 575c46d..5e76cfb 100644 --- a/upload.php +++ b/upload.php @@ -30,8 +30,9 @@
- - +
+ +
From 55c853e81c7b466efcbcffca60e65e8488467cc7 Mon Sep 17 00:00:00 2001 From: Fluffy-Bean Date: Wed, 21 Sep 2022 16:28:57 +0000 Subject: [PATCH 05/39] Fullscreen image view --- assets/ui/nav.php | 6 ++--- css/main.css | 49 ++++++++++++++++++++++++++++++++++ css/scss/_body.scss | 65 +++++++++++++++++++++++++++++++++++++++++++++ image.php | 53 +++++++++++++++++++++++------------- 4 files changed, 152 insertions(+), 21 deletions(-) diff --git a/assets/ui/nav.php b/assets/ui/nav.php index 423aa68..15427b2 100644 --- a/assets/ui/nav.php +++ b/assets/ui/nav.php @@ -5,11 +5,11 @@ use App\Account; $loggedin = new Account(); ?> -