diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index e69de29..0000000 diff --git a/LICENSE.md b/GitHub/LICENSE.md similarity index 100% rename from LICENSE.md rename to GitHub/LICENSE.md diff --git a/about.php b/about.php index ee9296e..8628cb0 100644 --- a/about.php +++ b/about.php @@ -1,66 +1,66 @@ + - - - Lynx Gallery + + + Lynx Gallery - - - + + + - - - + + + - - + + - - - + + + - - - + + + + - + -
-

What is Fluffys Amazing Gallery?

-

Fluffys Amazing Gallery is a smol project I originally started to control the images on my main page, but quickly turned into something much bigger...

-

What Do I want this to become in the future? No clue, but I do want this to be usable by others, if its a file they download a docker image they setup on your own web server.

-

Will it become that any time soon? No, but. I am going to work on this untill it becomes what I want it to be!

+
+

What is Fluffys Amazing Gallery?

+

Fluffys Amazing Gallery is a smol project I originally started to control the images on my main page, but quickly turned into something much bigger...

+

What Do I want this to become in the future? No clue, but I do want this to be usable by others, if its a file they download a docker image they setup on your own web server.

+

Will it become that any time soon? No, but. I am going to work on this untill it becomes what I want it to be!

-
+
-

Can you add "A" or "B"?

-

No.

+

Can you add "A" or "B"?

+

No.

-
+
-

How do I use this!

-

First you must obtain the invite code. If you don't have one and are interested in trying this, feel free to DM me on Telegram!

-

But once you're done doing that, you can start making your account at the signup page here.

-

From there you should be able to go and login at this fancy page here!

-

Now you should see "Welcome (your username)" at the homepage. From there navigate to the navbar and click on the upload button. Choose your file, enter the description and your image is up!

+

How do I use this!

+

First you must obtain the invite code. If you don't have one and are interested in trying this, feel free to DM me on Telegram!

+

But once you're done doing that, you can start making your account at the signup page here.

+

From there you should be able to go and login at this fancy page here!

+

Now you should see "Welcome (your username)" at the homepage. From there navigate to the navbar and click on the upload button. Choose your file, enter the description and your image is up!

-
+
-

Credits!

-

To Carty for being super cool again and helping me get started with SQL and PHP!

-

To Phosphor for providing nice SVG icons.

-

To mrHDash...

-
+

Credits!

+

To Carty for being super cool again and helping me get started with SQL and PHP!

+

To Phosphor for providing nice SVG icons.

+

To mrHDash...

+
- + - + + \ No newline at end of file diff --git a/account/account.php b/account/account.php index 86feae8..0da3f06 100644 --- a/account/account.php +++ b/account/account.php @@ -1,79 +1,79 @@ + - - - Lynx Gallery + + + Lynx Gallery - - - + + + - - - + + + - - + + - - - + + + - - - + + + + - + -
-

Account settings

- "; - if ($_SESSION["id"] == 1) { - echo "

Invite Codes

"; - $token_request = mysqli_query($conn, "SELECT * FROM tokens WHERE used = 0"); - while ($token = mysqli_fetch_array($token_request)) { - ?> - - - - - -
-

Danger ahead

-

Resetting your password regularly is a good way of keeping your account safe

- Reset Password -
-

Don't leave! I'm with the science team!

- Logout - -

You must be logged in to change your account settings!

- Login! - -
+
+

Account settings

+ "; + if ($_SESSION["id"] == 1) { + echo "

Invite Codes

"; + $token_request = mysqli_query($conn, "SELECT * FROM tokens WHERE used = 0"); + while ($token = mysqli_fetch_array($token_request)) { + ?> + + + + + +
+

Danger ahead

+

Resetting your password regularly is a good way of keeping your account safe

+ Reset Password +
+

Don't leave! I'm with the science team!

+ Logout + +

You must be logged in to change your account settings!

+ Login! + +
- + - + + \ No newline at end of file diff --git a/account/login.php b/account/login.php index 8d2a939..2a24a2a 100644 --- a/account/login.php +++ b/account/login.php @@ -1,75 +1,75 @@ + - - - Lynx Gallery + + + Lynx Gallery - - - + + + - - - + + + - - + + - - - + + + - - - + + + + - - - + // Check if the user is already logged in, if yes then redirect him to welcome page + if (isset($_SESSION["loggedin"]) && $_SESSION["loggedin"] === true) { + ?> + + -
-

Login

-

Passwords are important to keep safe. Don't tell anyone your password, not even Fluffy!

-
-
- - -
- -
- Need an account? Sign up! -
+
+

Login

+

Passwords are important to keep safe. Don't tell anyone your password, not even Fluffy!

+
+
+ + +
+ +
+ Need an account? Sign up! +
- + - + - + + \ No newline at end of file diff --git a/account/password-reset.php b/account/password-reset.php index 1692224..af87516 100644 --- a/account/password-reset.php +++ b/account/password-reset.php @@ -1,71 +1,71 @@ + - - - Lynx Gallery + + + Lynx Gallery - - - + + + - - - + + + - - + + - - - + + + - - - + + + + - + // Check if the user is logged in, otherwise redirect to login page + if (!isset($_SESSION["loggedin"]) || $_SESSION["loggedin"] !== true) { + header("location: https://superdupersecteteuploadtest.fluffybean.gay/account/login.php"); + exit; + } + ?> -
-

Reset Password

-

After reset, you will be kicked out to login again

-
-
- - -
- -
-
+
+

Reset Password

+

After reset, you will be kicked out to login again

+
+
+ + +
+ +
+
- + - + - + + \ No newline at end of file diff --git a/account/signup.php b/account/signup.php index 19e5b70..a9af857 100644 --- a/account/signup.php +++ b/account/signup.php @@ -1,73 +1,73 @@ + - - - Lynx Gallery + + + Lynx Gallery - - - + + + - - - + + + - - + + - - - + + + - - - + + + + - + -
-

Make account

-

And amazing things happened here...

-
-
- -
- - -
- -
- -
-
+
+

Make account

+

And amazing things happened here...

+
+
+ +
+ + +
+ +
+ +
+
- + - + - + + \ No newline at end of file diff --git a/app/account/login.php b/app/account/login.php index 8ff01a2..051c978 100644 --- a/app/account/login.php +++ b/app/account/login.php @@ -81,7 +81,7 @@ if (isset($_POST['submit'])) { ?> * { margin-top: 0; margin-bottom: 0.5rem; } -footer a { - margin: 0.5rem; +footer p { + margin: 0 0.5rem; text-decoration: none; + font-size: 16px; + font-family: "Secular One", sans-serif; +} +footer a { + margin: 0 0.5rem; + text-decoration: none; + font-size: 16px; font-family: "Secular One", sans-serif; } footer a:hover { diff --git a/css/scss/_body.scss b/css/scss/_body.scss index ee98b2e..10b9f94 100644 --- a/css/scss/_body.scss +++ b/css/scss/_body.scss @@ -96,8 +96,9 @@ } .nsfw-blur { - filter: blur(10px); + filter: blur(8px); } + .nsfw-warning { width: 100%; height: 100%; @@ -106,38 +107,46 @@ bottom: 0; left: 0; right: 0; - + position: absolute; z-index: 5; - display: flex; flex-direction: column; + display: flex; + flex-direction: column; justify-content: center; align-items: center; text-decoration: none; font-family: $font-body; + background-color: $bg-alt; + span { color: $red; text-align: center; - text-shadow: 0 0 2px $black; + + &::after { + content: ' Content'; + } } + img { margin: 0.25rem; - width: 2rem; - height: 2rem; + width: 2.5rem; + height: 2.5rem; } } @media (max-width: 500px) { .nsfw-warning { - span { - display: none; + span::after { + content: none; } } } + /* |------------------------------------------------------------- | IMAGE @@ -213,6 +222,7 @@ border-radius: $rad; font-family: $font-body; + &::before { content: '# '; } diff --git a/css/scss/_footer.scss b/css/scss/_footer.scss index ec433c0..dac9c4a 100644 --- a/css/scss/_footer.scss +++ b/css/scss/_footer.scss @@ -13,10 +13,20 @@ footer { width: calc(100% - 1.4rem); - a { - margin: 0.5rem; + p { + margin: 0 0.5rem; text-decoration: none; + font-size: 16px; + + font-family: $font-body; + } + + a { + margin: 0 0.5rem; + + text-decoration: none; + font-size: 16px; font-family: $font-body; diff --git a/image.php b/image.php index d51bd1f..4a447cd 100644 --- a/image.php +++ b/image.php @@ -1,394 +1,394 @@ + - - - Lynx Gallery + + + Lynx Gallery - + - + - - - + + + - - + + - - - + + + - - - + + + + - - - - - + + + + + /* + |------------------------------------------------------------- + | Check user privilge + |------------------------------------------------------------- + */ + if (image_privilage($image['author']) || is_admin($_SESSION['id'])) { + $privilaged = True; + } else { + $privilaged = False; + } + ?> -
- ' src='' alt=''> -
+
+ ' src='' alt=''> +
- + -
-

Description

-

-
+
+

Description

+

+
-
-

Details

- Author: ".$image_author."

"; +
+

Details

+ Author: " . $image_author . "

"; - // Image ID - echo "

ID: ".$image['id']."

"; + // Image ID + echo "

ID: " . $image['id'] . "

"; - // File name - if (strlen($image['imagename']) > 30) { - echo "

File Name: ".substr($image['imagename'], 0, 30)."...

"; - } else { - echo "

File Name: ".$image['imagename']."

"; - } + // File name + if (strlen($image['imagename']) > 30) { + echo "

File Name: " . substr($image['imagename'], 0, 30) . "...

"; + } else { + echo "

File Name: " . $image['imagename'] . "

"; + } - // File extention - echo "

File Type: ".pathinfo($image['imagename'], PATHINFO_EXTENSION)."

"; + // File extention + echo "

File Type: " . pathinfo($image['imagename'], PATHINFO_EXTENSION) . "

"; - // Image resolution - list($width, $height) = getimagesize($image_path); - echo "

Image resolution: ".$width."x".$height."

"; + // Image resolution + list($width, $height) = getimagesize($image_path); + echo "

Image resolution: " . $width . "x" . $height . "

"; - // Image Upload date - echo "

Last updated: +0 ".$image['upload']."

"; + // Image Upload date + echo "

Last updated: +0 " . $image['upload'] . "

"; - echo "
"; + echo "
"; - // Image download - echo "Download image"; + // Image download + echo "Download image"; - // Copy image - ?> - - Copy image link"; - ?> -
+ sniffleAdd("Info", "Link has been copied!", "var(--green)", "assets/icons/clipboard-text.svg"); + } + + Copy image link"; + ?> +
-
-

Tags

-
- ".$tag."

"; - } else { - echo "

".$tag."

"; - } - } - } else { - echo "

No tags present

"; - } - ?> -
-
+
+

Tags

+
+ " . $tag . "

"; + } else { + echo "

" . $tag . "

"; + } + } + } else { + echo "

No tags present

"; + } + ?> +
+
- - -
-

Danger zone

+ + +
+

Danger zone

- - - + $("#deleteConfirm").submit(function(event) { + event.preventDefault(); + var deleteSubmit = $("#deleteSubmit").val(); + $("#sniffle").load("app/image/delete_image.php", { + id: , + submit: deleteSubmit + }); + }); + }); + - - - + $("#descriptionConfirm").submit(function(event) { + event.preventDefault(); + var descriptionInput = $("#descriptionInput").val(); + var descriptionSubmit = $("#descriptionSubmit").val(); + $("#sniffle").load("app/image/edit_description.php", { + id: , + input: descriptionInput, + submit: descriptionSubmit + }); + }); + }); + - - - + $("#tagsConfirm").submit(function(event) { + event.preventDefault(); + var tagsInput = $("#tagsInput").val(); + var tagsSubmit = $("#tagsSubmit").val(); + $("#sniffle").load("app/image/edit_tags.php", { + id: , + input: tagsInput, + submit: tagsSubmit + }); + }); + }); + - - - - - "; - } + $("#authorConfirm").submit(function(event) { + event.preventDefault(); + var authorInput = $("#authorInput").val(); + var authorSubmit = $("#authorSubmit").val(); + $("#sniffle").load("app/image/edit_author.php", { + id: , + input: authorInput, + submit: authorSubmit + }); + }); + }); + + "; + } - /* - |------------------------------------------------------------- - | End of displaying all user info - |------------------------------------------------------------- - */ - } - ?> + /* + |------------------------------------------------------------- + | End of displaying all user info + |------------------------------------------------------------- + */ + } + ?> - + + \ No newline at end of file diff --git a/setup.json b/setup.json new file mode 100644 index 0000000..e054fd1 --- /dev/null +++ b/setup.json @@ -0,0 +1,6 @@ +{ + "name": "Only Legs", + "description": "A simple gallery with multiple users in mind", + "version": "15.08.22", + "license":"GPL 3.0" +} \ No newline at end of file diff --git a/ui/functions.php b/ui/functions.php deleted file mode 100644 index b3d9bbc..0000000 --- a/ui/functions.php +++ /dev/null @@ -1 +0,0 @@ -