From ea34fa8eb42c35621a3bce6a7bb286432587e203 Mon Sep 17 00:00:00 2001 From: Filip Rojek Date: Thu, 16 Nov 2023 00:46:49 +0100 Subject: [PATCH] pages: home, login, signup, signin, add are almost done --- frontend/index.php | 33 +++++++++++++++++++--------- frontend/js/home.js | 5 +++++ frontend/js/nav.js | 11 +++++----- frontend/libs/Router.php | 26 ++++++++++++++++++++-- frontend/pages/beer_get/beer_get.php | 20 +++++++++++++++++ frontend/pages/home/home.php | 23 +++---------------- frontend/pages/login/login.php | 1 - frontend/pages/signup/signup.php | 13 ++++++----- 8 files changed, 88 insertions(+), 44 deletions(-) create mode 100644 frontend/js/home.js create mode 100644 frontend/pages/beer_get/beer_get.php diff --git a/frontend/index.php b/frontend/index.php index f7a5a15..835ef63 100644 --- a/frontend/index.php +++ b/frontend/index.php @@ -31,9 +31,6 @@ - - -
@@ -78,23 +75,31 @@ route('GET', '/', 'home'); - $R->route('GET', '/beer/add', 'beer_add'); - $R->route('GET', '/review/add', 'review_add'); - $R->route('GET', '/login', 'login'); - $R->route('GET', '/signup', 'signup'); + if(!$LOGGEDIN) { + $R->route('GET', '/', 'home'); + $R->route('GET', '/login', 'login'); + $R->route('GET', '/signup', 'signup'); + } - $R->route('POST', '/contact/send', 'contact'); + if($LOGGEDIN) { + $R->route('GET', '/', 'beer_get'); + $R->route('GET', '/beer/add', 'beer_add'); + $R->route('GET', '/beer/get/{id}', 'beer_get'); + $R->route('GET', '/review/add', 'review_add'); + + $R->route('POST', '/contact/send', 'contact'); + } if(!$LOGGEDIN && $R->getUrl() == '/') { // show login page } - $R = null; + //$R = null; ?> + + + + + + + + + diff --git a/frontend/js/home.js b/frontend/js/home.js new file mode 100644 index 0000000..32ce5d9 --- /dev/null +++ b/frontend/js/home.js @@ -0,0 +1,5 @@ +qSA(".card-beer").forEach(el => { + el.addEventListener("click", (e) => { + window.location.href = "/beer/" + el.querySelector("img").id + }) +}); diff --git a/frontend/js/nav.js b/frontend/js/nav.js index 691c0a7..2ef919a 100644 --- a/frontend/js/nav.js +++ b/frontend/js/nav.js @@ -3,14 +3,12 @@ function show_modal(selector, modal_selector = null) { if(modal_selector === null) { modal_selector = selector } - const btn = qS(selector) const md = qS(modal_selector) btn.addEventListener("click", (el) => { md.classList.add("md-active") }) } catch (error) { - console.error(error) } } @@ -19,6 +17,9 @@ show_modal("#nav-login", "#md-login") show_modal("#nav-signup", "#md-signup") show_modal(".nav-user", "#md-user-tree") -qS(".nav-user").addEventListener("click", () => { - qS(".nav-user-dropdown").classList.toggle("visible") -}) \ No newline at end of file +try { + qS(".nav-user").addEventListener("click", () => { + qS(".nav-user-dropdown").classList.toggle("visible") + }) +} catch (err) { +} \ No newline at end of file diff --git a/frontend/libs/Router.php b/frontend/libs/Router.php index 33ce42c..2df9944 100644 --- a/frontend/libs/Router.php +++ b/frontend/libs/Router.php @@ -2,13 +2,24 @@ class Router { public $returned = false; public $url = null; + public $id = null; function route($method, $url, $filename) { $this->url = $url; $methods = ['GET', 'POST']; if(in_array($method, $methods)) { if($_SERVER['REQUEST_METHOD'] == $method) { - if ($_SERVER['REQUEST_URI'] == $url) { + if(count(explode("{", $url)) > 1) { + if(explode("}", explode("{", $url)[1])[0] == "id") { + $tmp = explode("/", $_SERVER['REQUEST_URI'], 1); + $cnt = count(explode("/", $_SERVER['REQUEST_URI'], 1)); + $this->id = $tmp[$cnt - 1]; + require_once("./pages/$filename/$filename.php"); + $this->returned = true; + return; + } + } + if($_SERVER['REQUEST_URI'] == $url) { require_once("./pages/$filename/$filename.php"); $this->returned = true; return; @@ -17,10 +28,21 @@ class Router { } } - function getUrl() { + static function getUrl() { return $_SERVER['REQUEST_URI']; } + static function getID() { + $tmp = explode("/", $_SERVER['REQUEST_URI']); + $cnt = count($tmp); + $id = $tmp[$cnt -1]; + if(is_numeric($id)) { + return $id; + } else { + return null; + } + } + function __destruct() { if($_SERVER['REQUEST_METHOD'] == 'GET') { if(!$this->returned){ diff --git a/frontend/pages/beer_get/beer_get.php b/frontend/pages/beer_get/beer_get.php new file mode 100644 index 0000000..d27db9c --- /dev/null +++ b/frontend/pages/beer_get/beer_get.php @@ -0,0 +1,20 @@ +
+ +
+ beer image +

Beer Name

+

12 Degree

+
+ +
+ beer image +

Beer Name

+

12 Degree

+
+ +
diff --git a/frontend/pages/home/home.php b/frontend/pages/home/home.php index acb8d50..93c24f7 100644 --- a/frontend/pages/home/home.php +++ b/frontend/pages/home/home.php @@ -1,20 +1,3 @@ -
- -
- beer image -

Beer Name

-

12 Degree

-
- - - -
+

Welcome to DeguApp!

+
+

Please Log in

\ No newline at end of file diff --git a/frontend/pages/login/login.php b/frontend/pages/login/login.php index 962de66..cf29bc0 100644 --- a/frontend/pages/login/login.php +++ b/frontend/pages/login/login.php @@ -16,7 +16,6 @@