diff --git a/api/_auth.php b/api/_auth.php index f83bd7c..3a47c82 100644 --- a/api/_auth.php +++ b/api/_auth.php @@ -1,4 +1,7 @@ bind_param("s", $_SESSION["userid"]); $s->execute(); if (!(bool)$s->get_result()->fetch_assoc()) { // If not, then destroy session - EndSession(); - echo "user id does not exist"; + AUTH_EndSession(); die("user id used in session does not exist"); } $LOGGED_IN = true; @@ -48,7 +50,7 @@ if (session_status() === PHP_SESSION_ACTIVE && isset($_SESSION["userid"])) { // if ($Config["debug"] && isset($_REQUEST["debug"])) { // If there are not any session and debug mode is on // ATTENTION: FOR DEBUG PURPOSES ONLY! if ($_REQUEST["debug"] == "drop") { - EndSession(); + AUTH_EndSession(); die("session discarded"); } $_SESSION["userid"] = intval($_REQUEST["debug"]); diff --git a/api/_config.php b/api/_config.php index 7970844..7c94eb5 100644 --- a/api/_config.php +++ b/api/_config.php @@ -1,4 +1,7 @@ - \ No newline at end of file +?> diff --git a/api/_db.php b/api/_db.php index e773256..868e429 100644 --- a/api/_db.php +++ b/api/_db.php @@ -1,4 +1,7 @@ - $result->GetData()]); } } diff --git a/api/user/index.php b/api/user/index.php index fc1576e..a253fea 100644 --- a/api/user/index.php +++ b/api/user/index.php @@ -1,4 +1,7 @@ -GetData()) { // User himself and mods can see additional info + // User himself and mods can see additional info + if ($id === $THIS_USER) { $result["email"] = $d["email"]; $result["invite_id"] = $d["invite_id"]; + } elseif ($LOGGED_IN) { + if (User_IsMod($THIS_USER)->GetData()) { + $result["email"] = $d["email"]; + $result["invite_id"] = $d["invite_id"]; + } } return new ReturnT(data: $result); diff --git a/api/user/login.php b/api/user/login.php new file mode 100644 index 0000000..11f7417 --- /dev/null +++ b/api/user/login.php @@ -0,0 +1,89 @@ +prepare("SELECT * FROM users WHERE login = ?"); + $s->bind_param("s", $login); + $s->execute(); + $d = $s->get_result()->fetch_assoc(); + + // Wrong login + if (!(bool)$d) + return new ReturnT(err_code: E_AUT_WRONGCREDS, err_desc: "wrong login or password"); + + $suppl_pwd_hash = hash("sha256", $password . $d["salt"], true); + $real_pwd_hash = $d["password_hash"]; + + // Wrong password + if ($suppl_pwd_hash !== $real_pwd_hash) + return new ReturnT(err_code: E_AUT_WRONGCREDS, err_desc: "wrong login or password"); + + // Actions + + $_SESSION["userid"] = $d["id"]; + $THIS_USER = $d["id"]; + + return new ReturnT(data: true); +} + + + +if (Utils_ThisFileIsRequested(__FILE__)) { + require_once("../_json.php"); + + // HACK: for debugging purposes. Will be removed later + if ($Config["debug"]) + $_POST = $_REQUEST; + + // Log into account + $result = User_Login_Method($_POST); + + // Checking result + if ($result->IsError()) + $result->ThrowJSONError(); + else + JSON_ReturnData(["success" => $result->GetData()]); +} + +?> \ No newline at end of file diff --git a/front/footer.php b/front/footer.php index 265cc07..eba89fb 100644 --- a/front/footer.php +++ b/front/footer.php @@ -1,9 +1,9 @@

- Contacts | - Terms of service | - Privacy + Contacts | + Terms of service | + Privacy

diff --git a/front/head.php b/front/head.php index 9366ff6..0d300aa 100644 --- a/front/head.php +++ b/front/head.php @@ -12,7 +12,14 @@ echo "E949: $PAGE_TITLE\n"; require_once("favicon.html"); ?> + - + +"; +} +?> diff --git a/front/notifications.php b/front/notifications.php new file mode 100644 index 0000000..10eaafe --- /dev/null +++ b/front/notifications.php @@ -0,0 +1,33 @@ +

$text

"; + break; + default: + die("invalid notification type: $type"); + } +} + +// Echo all notifications +function NTFY_EchoAllNotices () { + global $NTFY_NoticesStack; + foreach ($NTFY_NoticesStack as $notice) { + echo "$notice\n"; + } +} + + + +?> diff --git a/front/pages/index/counter.php b/front/pages/index/counter.php index 11cc870..2767a50 100644 --- a/front/pages/index/counter.php +++ b/front/pages/index/counter.php @@ -1,11 +1,20 @@ \ No newline at end of file diff --git a/front/pages/index/random_meme.php b/front/pages/index/random_meme.php index 882d8cd..ad8e045 100644 --- a/front/pages/index/random_meme.php +++ b/front/pages/index/random_meme.php @@ -2,5 +2,5 @@ // TODO: picking random meme ?>
- +
diff --git a/front/pages/index/searchbox.php b/front/pages/index/searchbox.php index 7dd5ed8..da1e0e5 100644 --- a/front/pages/index/searchbox.php +++ b/front/pages/index/searchbox.php @@ -1,11 +1,20 @@
E949 @@ -17,25 +26,25 @@ if (!$IS_FRONTEND) { if ($res->IsError()) $res->ThrowJSONError(); $uname = $res->GetData()["login"]; - echo "$uname"; + echo "$uname"; unset($res); } else { // If user is NOT logged in ?> Login - Signup + Register - Posts - Tags + Posts + Tags Statistics Site map
+
- diff --git a/front/pages/login/page.php b/front/pages/login/page.php new file mode 100644 index 0000000..5e89768 --- /dev/null +++ b/front/pages/login/page.php @@ -0,0 +1,48 @@ +IsError()) { + NTFY_AddNotice("Failed to log into account! Check your credentials and try again.
" . $result->GetError()); + } else { + header("Location: index.php"); + exit(); + } +} + +NTFY_EchoAllNotices(); + + + +?> +
+

Login

+ +
+
+ +
+
+
+ + Reset +
+
+ +
+ +
+

Don't have an account? Register here

+
+
diff --git a/front/pages/main_nav.php b/front/pages/main_nav.php new file mode 100644 index 0000000..2bd10ee --- /dev/null +++ b/front/pages/main_nav.php @@ -0,0 +1,53 @@ + + diff --git a/front/styles/base.css b/front/styles/base.css index 81e4079..4e8e95e 100644 --- a/front/styles/base.css +++ b/front/styles/base.css @@ -1,4 +1,12 @@ -/* Common blocks */ +/* The most base style, used everywhere */ + + + +/* Common */ + +*:focus { + outline: 2px dotted #49f49f; +} body { background-color: #094e59; @@ -12,13 +20,14 @@ body, div, p, a { } + /* Fonts */ -h1, h2, h3, h4, h5, h6, p, ul, li, dd, dt { +h1, h2, h3, h4, h5, h6, p, ul, li, dd, dt, label { font-family: Verdana, Sans-Serif; } -h1, h2, h3, h4, h5, h6, p, a { +h1, h2, h3, h4, h5, h6, p, a, label { color: #00c07c; text-decoration: none; } @@ -31,15 +40,89 @@ a { a:hover { color: #00c07c; + cursor: pointer; } + /* Custom blocks */ +div.wrapper { + margin: auto; +} + div.visualbox { margin: 10px; padding: 10px; border-radius: 5px; box-shadow: 0 0 5px #000; text-shadow: 0 0 2px black, 0 0 6px black; -} \ No newline at end of file + backdrop-filter: blur(6px); +} + +div.notification_fail { + margin: 10px; + padding: 10px; + border-radius: 5px; + box-shadow: 0 0 5px red; + text-shadow: 0 0 2px black, 0 0 6px black; + backdrop-filter: blur(6px); + background-color: #f003; +} +div.notification_fail p { + color: red; +} + + + +/* Input */ + +/* Text input */ +input[type=text], input[type=password] { + color: #00c07c; + background-color: transparent; + border: 2px solid #009049; + border-radius: 3px; + font-family: Verdana, Sans-Serif; + font-size: 16px; + text-shadow: 0 0 6px black; + transition: all 0.25s; +} +input[type=text]:hover, input[type=password]:hover { + border: 2px solid transparent; + border-bottom: 2px solid #009049; +} +input[type=text]:focus, input[type=password]:focus { + border: 2px solid transparent; + border-bottom: 2px solid #49f49f; + outline: none; +} + +/* Submit button */ +input[type=submit] { + background-color: transparent; + border: 2px solid #009049; + border-radius: 3px; + color: #00c07c; + text-shadow: 0 0 6px #000a; + font-family: Verdana, Sans-Serif; + font-size: 16px; + cursor: pointer; + transition: all 0.2s; +} +input[type=submit]:hover { + border: 2px solid transparent; + border-bottom: 2px solid #009049; + background-color: #009049a0; + color: #49f49f; +} +input[type=submit]:focus { + border: 2px solid #49f49f; + outline: none; +} + +/* Checkbox */ +input[type=checkbox] { + cursor: pointer; + background-color: red; +} diff --git a/front/styles/footer.css b/front/styles/footer.css index 14ebca1..274c840 100644 --- a/front/styles/footer.css +++ b/front/styles/footer.css @@ -1,3 +1,7 @@ +/* Style specifically for footer */ + + + div.footer div.quicklinks { padding: 0 0 4px 0; } diff --git a/front/styles/index.css b/front/styles/index.css index 6052910..59e5e79 100644 --- a/front/styles/index.css +++ b/front/styles/index.css @@ -1,12 +1,16 @@ -/* Index wrapper */ +/* Stylesheet for index page */ + + + +/* Custom wrapper */ div.wrapper { text-align: center; - margin: auto; width: 65%; } + /* Index fonts */ div.searchbox a.title { @@ -21,45 +25,20 @@ div.searchbox a.title:hover { color: #009049; } + + /* Index search box */ div.searchbox input[type=text] { margin-top: 2px; margin-bottom: 4px; - color: #00c07c; - background-color: transparent; - border: 2px solid #009049; - border-radius: 3px; - font-family: Verdana, Sans-Serif; - font-size: 16px; - text-shadow: 0 0 6px black; - transition: all 0.25s; -} - -div.searchbox input[type=text]:focus { - border: 2px solid transparent; - border-bottom: 2px solid #009049; - outline: none; } div.searchbox input[type=submit] { margin-top: 4px; - background-color: transparent; - border: 2px solid #009049; - border-radius: 3px; - color: #00c07c; - text-shadow: 0 0 6px #000a; - font-family: Verdana, Sans-Serif; - font-size: 16px; padding: 5px 10px; - cursor: pointer; } -div.searchbox input[type=submit]:focus { - border: 2px solid transparent; - border-bottom: 2px solid #009049; - background-color: #009049a0; -} /* Index navigation */ diff --git a/front/styles/main.css b/front/styles/main.css new file mode 100644 index 0000000..706c6ad --- /dev/null +++ b/front/styles/main.css @@ -0,0 +1,83 @@ +/* Common stylesheet for most of the site */ + + + +/* Adjusting wrapper */ +div.wrapper { + padding-top: 26pt; +} + + + +/* Navigation block */ + +nav.main { + background-color: transparent; + position: fixed; + top: 0; + left: 0; + z-index: 999; + width: 100%; +} + +nav.main ul { + position: relative; + margin: 0; + margin-left: 10px; + margin-right: 10px; + padding: 7px; + backdrop-filter: blur(6px); + border-bottom-left-radius: 5px; + border-bottom-right-radius: 5px; + box-shadow: 0 0 5px #000; + text-shadow: 0 0 2px black, 0 0 6px black; + text-align: center; +} + +nav.main ul li { + display: inline-block; + margin-left: 1.75vw; + margin-right: 1.75vw; +} + +nav.main ul li a { + color: #00c07c; + text-decoration: none; + transition: all 0.2s; +} +nav.main ul li a:hover { + color: #49f49f; +} + +nav.main ul li.current a { + font-weight: bold; + text-decoration: underline; +} + +nav.main ul span { + color: #00c07c; + padding: 0; + margin: 0; +} + + + +/* Other */ + +form.login div { + margin-bottom: 14px; +} + +form.login a { + font-size: 80%; +} + +div.loginmisc { + margin-top: 4px; + margin-bottom: 4px; +} + +div.loginmisc p { + font-style: italic; + font-size: 80%; +} diff --git a/index.php b/index.php index 32c1721..e0a37ae 100644 --- a/index.php +++ b/index.php @@ -1,16 +1,52 @@ false, + "login" => false +); + +// Picking current page +switch ($PICKED_PAGE) { + // Login page + case "login": + $WHAT_PAGE_IS_CURRENT["login"] = true; + $PAGE_TITLE = "Login"; + $PAGE_STYLE = "front/styles/main.css"; + $PAGE_FILE = "front/pages/login/page.php"; + break; + // Main page + case "index": + case "main": + default: + $WHAT_PAGE_IS_CURRENT["main"] = true; + $PAGE_TITLE = "Index"; + $PAGE_STYLE = "front/styles/index.css"; + $PAGE_FILE = "front/pages/index/page.php"; +} @@ -23,10 +59,7 @@ $PAGE_TITLE = "Index"; // TODO