From 5e124aa2b41f7bec35dded61a324781c3e3a3ff2 Mon Sep 17 00:00:00 2001 From: flejk Date: Thu, 10 Feb 2022 11:01:44 +0100 Subject: [PATCH] Everythink :/ --- README.md | 7 --- admin.php | 92 +++++++++++++++++++++++++++++++ beer.php | 27 +++++---- brewery.php | 14 +++-- controller/follow.php | 34 ++++++++++++ controller/getRecord.php | 16 +++++- controller/insertArticle.php | 59 ++++++++++++++++++++ controller/insertBeer.php | 87 +++++++++++++++++++++++++++++ controller/insertBrewery.php | 63 +++++++++++++++++++++ controller/insertWhat.php | 34 ++++++++++++ controller/listLatest.php | 55 ++++++++++++++++++ controller/rate.php | 28 ++++++++++ controller/unfollow.php | 34 ++++++++++++ databaseDeploy/priloha5.sql | 20 +++---- myList.php | 27 ++++++++- passChange.php | 19 ++++--- search.php | 5 +- src/starN.png | Bin 0 -> 5353 bytes src/starY.png | Bin 0 -> 7274 bytes src/style/style.css | 11 +++- verify.php | 13 ++++- view/mainContent/listTags.php | 7 +++ view/mainContent/userButtons.php | 63 +++++++++++---------- view/navbar/loginbar.php | 2 +- view/navbar/userbar.php | 15 +++-- 25 files changed, 645 insertions(+), 87 deletions(-) create mode 100644 admin.php create mode 100644 controller/follow.php create mode 100644 controller/insertArticle.php create mode 100644 controller/insertBeer.php create mode 100644 controller/insertBrewery.php create mode 100644 controller/insertWhat.php create mode 100644 controller/rate.php create mode 100644 controller/unfollow.php create mode 100644 src/starN.png create mode 100644 src/starY.png create mode 100644 view/mainContent/listTags.php diff --git a/README.md b/README.md index 81d98c9..3b10b04 100755 --- a/README.md +++ b/README.md @@ -4,18 +4,11 @@ ## TO DO: *Make searchbar work* - *Implement listing and following* ### Tasks *search.php* - *implement tags* - *insert beer/brewery/article form - /admin.php* - *add beer to list/ add brewery to follow* - - *brewery/beer/list .php* - diff --git a/admin.php b/admin.php new file mode 100644 index 0000000..52f3b1d --- /dev/null +++ b/admin.php @@ -0,0 +1,92 @@ + + + + + + + Admin Login + + + + +
+

SECRET ADMIN LOGIN???

+ ' . $login_err . '
'; + } + ?> + +
" method="post"> +
+ + + +
+
+ + + +
+
+ +
+
+ + + \ No newline at end of file diff --git a/beer.php b/beer.php index 85273cf..bba9ac4 100644 --- a/beer.php +++ b/beer.php @@ -2,12 +2,12 @@ session_start(); require_once("model/db.php"); require_once("controller/getRecord.php"); +require_once("controller/listLatest.php"); require_once("view/mainContent/userButtons.php"); require("view/header.php"); require("view/sidebar.php"); - $record = getRecord($pdo, "beer", $_GET["id"] ); $title = $record["name"]; $description = $record["description"]; @@ -15,20 +15,25 @@ $date = $record["time"]; $alc = $record["alc"]; $ibu = $record["ibu"]; $brewery_id = $record["brewery_id"]; - -require("view/mainContent/mainContent.php"); - - $brewery = getRecord($pdo, "brewery", $brewery_id )["name"]; +require("view/mainContent/mainContent.php"); -require("view/mainContent/beerExtraInfo.php"); - -echo "Kappa"; if(isset($_SESSION["loggedin"]) && $_SESSION["loggedin"] === true){ if(isThisBound($pdo, "list", $_GET["id"], $_SESSION["id"])){ - unfollowButton($pdo, "list", $_GET["id"], $_SESSION["id"]); - } else followButton($pdo, "list", $_GET["id"], $_SESSION["id"]); - showStars($pdo, $_GET["id"], $_SESSION["id"]); + $rating = getRating( $pdo, $_GET["id"], $_SESSION["id"])["rating"]; + require("view/mainContent/beerExtraInfo.php"); + showStars($_GET["id"], $rating); + unfollowButton("list", $_GET["id"]); + } else { + followButton("list", $_GET["id"]); + } } + + +$array = listTagsByBeer($pdo, $_GET["id"]); + +require("view/mainContent/listTags.php"); + + include("view/footer.php"); \ No newline at end of file diff --git a/brewery.php b/brewery.php index 30bba50..a90c361 100644 --- a/brewery.php +++ b/brewery.php @@ -3,6 +3,7 @@ session_start(); require_once("model/db.php"); require_once("controller/getRecord.php"); require_once("controller/listLatest.php"); +require_once("view/mainContent/userButtons.php"); require("view/header.php"); require("view/sidebar.php"); @@ -19,18 +20,21 @@ $array = listBeersByBrewery($pdo, $_GET["id"]); require("view/mainContent/mainContent.php"); +if(isset($_SESSION["loggedin"]) && $_SESSION["loggedin"] === true){ + if(isThisBound($pdo, "follow", $_GET["id"], $_SESSION["id"])){ + unfollowButton("follow", $_GET["id"]); + } else followButton("follow", $_GET["id"]); +} + require("view/mainContent/breweryExtraInfo.php"); $title = "Beers from $title"; $what = "beer"; + + require("view/sidebar/sidebarLister.php"); -if(isset($_SESSION["loggedin"]) && $_SESSION["loggedin"] === true){ - if(isThisBound($pdo, "follow", $_GET["id"], $_SESSION["id"])){ - unfollowButton($pdo, "follow", $_GET["id"], $_SESSION["id"]); - } else followButton($pdo, "follow", $_GET["id"], $_SESSION["id"]); -} include("view/footer.php"); \ No newline at end of file diff --git a/controller/follow.php b/controller/follow.php new file mode 100644 index 0000000..f306271 --- /dev/null +++ b/controller/follow.php @@ -0,0 +1,34 @@ +exec($sql); +} catch (PDOException $e) { + echo "Error in $from: Not Found"; +} +header("location: ../$what.php?id=$item"); \ No newline at end of file diff --git a/controller/getRecord.php b/controller/getRecord.php index 084ad8d..db7ecc6 100644 --- a/controller/getRecord.php +++ b/controller/getRecord.php @@ -20,7 +20,7 @@ function isThisBound($pdo, $where, $item_id, $user_id){ if($where === "list"){ $item = "beer_id"; }else $item = "brewery_id"; - $sql = "SELECT * FROM $where WHERE $item = $item_id AND user_id = $user_id"; + $sql = "SELECT * FROM $where WHERE $item=$item_id AND user_id=$user_id"; $stmt = $conn->prepare($sql); $stmt->execute(); $result = $stmt->setFetchMode(PDO::FETCH_ASSOC); @@ -29,4 +29,18 @@ function isThisBound($pdo, $where, $item_id, $user_id){ } catch (PDOException $e) { echo "Error in $where: Not Found"; } +} + +function getRating($pdo, $beer, $user){ + $conn = $pdo; + try { + $sql = "SELECT * FROM list WHERE beer_id = $beer AND user_id = $user"; + $stmt = $conn->prepare($sql); + $stmt->execute(); + $result = $stmt->setFetchMode(PDO::FETCH_ASSOC); + $rating = $stmt->fetch(); + } catch (PDOException $e) { + echo "Error in $from: Not Found"; + } + return $rating; } \ No newline at end of file diff --git a/controller/insertArticle.php b/controller/insertArticle.php new file mode 100644 index 0000000..98d6293 --- /dev/null +++ b/controller/insertArticle.php @@ -0,0 +1,59 @@ +exec($sql); + } catch (PDOException $e) { + echo "Error in $from: Not Found"; + } +} +//header("location: ../insertWhat.php"); + +?> + + + + + Insert Article + + + + +
+

Insert Article

+
" method="post"> +
+ + +
+
+ + +
+
+ + Cancel +
+
+
+ + \ No newline at end of file diff --git a/controller/insertBeer.php b/controller/insertBeer.php new file mode 100644 index 0000000..f7c127f --- /dev/null +++ b/controller/insertBeer.php @@ -0,0 +1,87 @@ +exec($sql); + } catch (PDOException $e) { + echo "Error in $from: Not Found"; + } +} +// header("location: ../insertWhat.php"); + +?> + + + + + + Reset Password + + + + +
+

Insert Beer

+
" method="post"> +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + Cancel +
+
+
+ + \ No newline at end of file diff --git a/controller/insertBrewery.php b/controller/insertBrewery.php new file mode 100644 index 0000000..3e1eca2 --- /dev/null +++ b/controller/insertBrewery.php @@ -0,0 +1,63 @@ +exec($sql); + } catch (PDOException $e) { + echo "Error in $from: Not Found"; + } +} +// header("location: ../insertWhat.php"); + +?> + + + + + Reset Password + + + + +
+

Insert Brewery

+
" method="post"> +
+ + +
+
+ + +
+
+ + +
+
+ + Cancel +
+
+
+ + \ No newline at end of file diff --git a/controller/insertWhat.php b/controller/insertWhat.php new file mode 100644 index 0000000..876e3a7 --- /dev/null +++ b/controller/insertWhat.php @@ -0,0 +1,34 @@ + + + + + + + Reset Password + + + + +
+ +
+ + \ No newline at end of file diff --git a/controller/listLatest.php b/controller/listLatest.php index 9d28da7..e4180d4 100644 --- a/controller/listLatest.php +++ b/controller/listLatest.php @@ -70,3 +70,58 @@ function listBeersByBrewery($pdo, $where){ return $arrayBeers; } +function listTagsByBeer($pdo, $beer){ + $conn = $pdo; + try { + $stmt = $conn->prepare("SELECT tag_title FROM beer_has_tag INNER JOIN tag ON beer_has_tag.tag_id = tag.id WHERE beer_id = '$beer'"); + $stmt->execute(); + $result = $stmt->setFetchMode(PDO::FETCH_ASSOC); + $arrayBeersXTags = $stmt->fetchAll(); + } catch (PDOException $e) { + echo "Error in Beers: " . $e->getMessage(); + } + return $arrayBeersXTags; +} + +function listBeersByTag($pdo, $tag){ + $conn = $pdo; + try { + + $stmt = $conn->prepare("SELECT FROM beer_has_tag JOIN tag ON tag_id WHERE tag.id = $tag"); + $stmt->execute(); + $result = $stmt->setFetchMode(PDO::FETCH_ASSOC); + $arrayTagsXBeers = $stmt->fetchAll(); + } catch (PDOException $e) { + echo "Error in Beers: " . $e->getMessage(); + } + print_r($arrayTagsXBeers); + return $arrayTagsXBeers; +} + +function listBeersByUser($pdo, $user){ + $conn = $pdo; + try { + + $stmt = $conn->prepare("SELECT name, beer.id, degree, rating FROM beer JOIN list ON beer.id = list.beer_id JOIN user ON list.user_id = user.id WHERE user.id = $user"); + $stmt->execute(); + $result = $stmt->setFetchMode(PDO::FETCH_ASSOC); + $arrayOfBeers = $stmt->fetchAll(); + } catch (PDOException $e) { + echo "Error in Beers: " . $e->getMessage(); + } + return $arrayOfBeers; +} + +function listBeersByBreweryNAN( $pdo ){ + $conn = $pdo; + try { + $sql = "SELECT * FROM brewery"; + $stmt = $conn->prepare($sql); + $stmt->execute(); + $result = $stmt->setFetchMode(PDO::FETCH_ASSOC); + $arrayOfBreweries = $stmt->fetchAll(); + } catch (PDOException $e) { + echo "Error in Breweries: " . $e->getMessage(); + } + return $arrayOfBreweries; +} \ No newline at end of file diff --git a/controller/rate.php b/controller/rate.php new file mode 100644 index 0000000..df97bf0 --- /dev/null +++ b/controller/rate.php @@ -0,0 +1,28 @@ +prepare($sql); + $stmt->execute(); +} catch (PDOException $e) { + echo "Error in list: Not Found"; +} +header("location: ../beer.php?id=$what"); \ No newline at end of file diff --git a/controller/unfollow.php b/controller/unfollow.php new file mode 100644 index 0000000..080fc0e --- /dev/null +++ b/controller/unfollow.php @@ -0,0 +1,34 @@ +exec($sql); +} catch (PDOException $e) { + echo "Error in $from: Not Found"; +} +header("location: ../$what.php?id=$item"); diff --git a/databaseDeploy/priloha5.sql b/databaseDeploy/priloha5.sql index 197949d..8947d37 100644 --- a/databaseDeploy/priloha5.sql +++ b/databaseDeploy/priloha5.sql @@ -11,17 +11,17 @@ insert into user ( nick, mail, password ) values ( 'aaa', 'test@mail.cz', '$2y$1 insert into user ( nick, mail, password ) values ( 'aa', 'test@mail.cz', '$2y$10$QVa2JNaw.VozkHyRWlEGNeAjYfiHEksxVVMhDZPjhGsuAY9MO51.C' ); -insert into brewery (name, region, description) values ( 'Zichovec', 'Louny', 'Remeslny pivovar'); -insert into brewery (name, region, description) values ( 'Siberia', 'Praha 9-Vysocany', 'Remeslny pivovar'); -insert into brewery (name, region, description) values ( 'Matuska', 'Broumy', 'Remeslny pivovar'); -insert into brewery (name, region, description) values ( 'Cestmir', 'Stara Boleslav', 'Remeslny pivovar'); -insert into brewery (name, region, description) values ( 'Prazdroj', 'Plzen', 'Pilsner Urquell'); +insert into brewery ( name, region, description ) values ( 'Zichovec', 'Louny', 'Remeslny pivovar'); +insert into brewery ( name, region, description ) values ( 'Siberia', 'Praha 9-Vysocany', 'Remeslny pivovar'); +insert into brewery ( name, region, description ) values ( 'Matuska', 'Broumy', 'Remeslny pivovar'); +insert into brewery ( name, region, description ) values ( 'Cestmir', 'Stara Boleslav', 'Remeslny pivovar'); +insert into brewery ( name, region, description ) values ( 'Prazdroj', 'Plzen', 'Pilsner Urquell'); -insert into beer ( name, alc, ibu, description, brewery_id, degree) values ( 'Robin', 5.1, '40', 'Quality APA, good as a starting beer', '1','12' ); -insert into beer ( name, alc, ibu, description, brewery_id, degree) values ( 'Krahulik', 5.0, '32', 'Classic Lagger from Zichovec, comes in handy','1', '12' ); -insert into beer ( name, alc, ibu, description, brewery_id, degree) values ( 'Pilsner Urquell', 4.4, '38', 'Oh yes, the PILSNER!','5', '12' ); -insert into beer ( name, alc, ibu, description, brewery_id, degree) values ( 'Zlata Raketa', 7.0, '60', 'Signature beer from Matuska Brewery','3', '17' ); -insert into beer ( name, alc, ibu, description, brewery_id, degree) values ( 'Yummy Blackcurrant Raspberry & Lingonberry', 5.1, '40', 'Simply delicious Beer from Siberia with full taste','2', '12' ); +insert into beer ( name, alc, ibu, description, brewery_id, degree ) values ( 'Robin', 5.1, '40', 'Quality APA, good as a starting beer', '1','12' ); +insert into beer ( name, alc, ibu, description, brewery_id, degree ) values ( 'Krahulik', 5.0, '32', 'Classic Lagger from Zichovec, comes in handy','1', '12' ); +insert into beer ( name, alc, ibu, description, brewery_id, degree ) values ( 'Pilsner Urquell', 4.4, '38', 'Oh yes, the PILSNER!','5', '12' ); +insert into beer ( name, alc, ibu, description, brewery_id, degree ) values ( 'Zlata Raketa', 7.0, '60', 'Signature beer from Matuska Brewery','3', '17' ); +insert into beer ( name, alc, ibu, description, brewery_id, degree ) values ( 'Yummy Blackcurrant Raspberry & Lingonberry', 5.1, '40', 'Simply delicious Beer from Siberia with full taste','2', '12' ); insert into tag ( tag_title ) values ( 'IPA' ); insert into tag ( tag_title ) values ( 'APA' ); diff --git a/myList.php b/myList.php index 204c680..2b249a2 100644 --- a/myList.php +++ b/myList.php @@ -1,12 +1,33 @@ "; + $arrayOfBeers = listBeersByUser($pdo, $_SESSION["id"]); + foreach($arrayOfBeers as $row): + echo " +
+ +
"; + endforeach; + echo ""; include("view/footer.php"); } else { header("location: index.php"); diff --git a/passChange.php b/passChange.php index 3f7ddc0..2746739 100644 --- a/passChange.php +++ b/passChange.php @@ -9,7 +9,7 @@ if(!isset($_SESSION["loggedin"]) || $_SESSION["loggedin"] !== true){ } // Include config file -require_once "config.php"; +require_once ("model/db.php"); // Define variables and initialize with empty values $new_password = $confirm_password = ""; @@ -40,33 +40,34 @@ if($_SERVER["REQUEST_METHOD"] == "POST"){ // Check input errors before updating the database if(empty($new_password_err) && empty($confirm_password_err)){ // Prepare an update statement - $sql = "UPDATE users SET password = ? WHERE id = ?"; + $sql = "UPDATE user SET password = :password WHERE id = :id"; - if($stmt = mysqli_prepare($link, $sql)){ + if($stmt = $pdo->prepare($sql)){ // Bind variables to the prepared statement as parameters - mysqli_stmt_bind_param($stmt, "si", $param_password, $param_id); + $stmt->bindParam(":password", $param_password, PDO::PARAM_STR); + $stmt->bindParam(":id", $param_id, PDO::PARAM_INT); // Set parameters $param_password = password_hash($new_password, PASSWORD_DEFAULT); $param_id = $_SESSION["id"]; // Attempt to execute the prepared statement - if(mysqli_stmt_execute($stmt)){ + if($stmt->execute()){ // Password updated successfully. Destroy the session, and redirect to login page session_destroy(); - header("location: login.php"); + header("location: index.php"); exit(); } else{ echo "Oops! Something went wrong. Please try again later."; } // Close statement - mysqli_stmt_close($stmt); + unset($stmt); } } // Close connection - mysqli_close($link); + unset($pdo); } ?> @@ -98,7 +99,7 @@ if($_SERVER["REQUEST_METHOD"] == "POST"){
- Cancel + Cancel
diff --git a/search.php b/search.php index d6c0ebf..91f3324 100644 --- a/search.php +++ b/search.php @@ -1,4 +1,5 @@ VD`llxldPGoBu=q|x>~{aGtAx@TWVdQ?I3M59C(m)*}tKiV}oo!!%H zY+*Xo{xPL~K_)$4|BSrj{lUh@uJelCOT+0c*+1!~CzrjX4z2x=Ti8@JeKxKfFnrmv zxWq2)VRxOe>o6-w-zxRA@uG94^~LL>)MIcF{ZHxBJWA_2D;tINk6$?tp6P|c^j^tr9X7ipqX7(voLWv!!x&AvlZiw zL%AC1CQwhf-`fFcpZ_O+fA_2tM@Zzg_!E@$jhes*H#^PSxtJ@daaKWxOaGl z$owp}Ww5Yec0rG8XHQIA_0lF%paq20x${Ss+dI&^bEDJkqBwqz+-B3I>fqa}GH;$L z0v8`&>VB6P;&phDloF5KKkHJ%()vewtcP{Yb`}S9UUj}Na@y6IzNBYph2qZ-Eq1gN zU{_A*8Z(Pn%+9*BX&PHu2IggpM`U}#R<5xIEdxzbW8e8q^(cxrbyMq}=S_PL$vb=N zmkiYX9daQayKhYip9H?i9CXqR`Lkf)EoaC{H1%c{p>#AOmpo|+l`_HHe&FF!JRY_0mV z8?*ij?kZ_<@(y_D^hZSR1Cz@iT8nAe?k#0&2P;Rq^@eM6h;NOG^o=JJ*4p)F%8!Pp z?^uzlZqqY0dUx}zu8b@VE4p*mNR`fl!v&kOV+(K1eNC4aTEIpl$5&;ZU%Vo_Jm|o! zjS;jfOP*CWc;0yY)~S6|O?GW`U&oumWE4tmJ>S*UkL~LEsb(ORB75yl2hYn3O=?y) zEh-2!d4+D9cAObvY29}C7fY99KWy2HP|3#)=6dYZ&H1fM#eGoei`KRy#p{dFTJZ^V zCc~=2bJM7oHjZOY@2NW%xBXmn!i^)OJG#|sznt76BboA~#hktw6I`^=+w}MD9m<|x z(8{RndGhq-uUo=m_76+ncIcR^ufe>wY0}%QSg(j}y2a=<@CXjMX0YF2yRpo<&7%a1 zzpxt5u<2{qxRZU|z++>L|4i(!4OdeZ*}IuE7SHL>3CZlwK0`0Q!;E;m>jJR+Mo>n% zuXGmMhBJ9O%kpr3lC@2B_#IE;&O;wJ{I>4OYp-_yE5E3j)lFFCXKEMU=QQ}&(U9zH z@vcjg4|LU>c5+W_#ot)f{BEFBaK;xkN){K$Kb$fL`q{Dh`EJ`2Mg*;G75P?iRUK1+ z!GrZFuRP;_cPZ66zyBt!BO!4ax~%iv-IluN>N|2v{ApDeO@W}iSMu%A15pF-diO@H zbK)(OWw!MOh00giML@NZ5LMc<>fKhRo z$i1?efI+KFWDyRSU>`rUt4IQ)DR>GVz_}^-Q6!9`HrigoalGQkh#60vVssKYB<5kzYcBKP(l= zB@pZu1q)?nUn98CXMeF=5~&J@3lZQ*Sb&&Hkx_}?4C%r4@%!wdlpu^R5UacpvA?mD z@p)gw`ets*9#uGBPXuxQ%>BmtQ|u~Z#LCBq$r3?w<@DGr2aIxjCRYUUxlGk983q9k z4dCI(93q6H5FuL}$fMG50G&n$00tMP^B7;D*g~lc6hg2Pg~0KAgu?)-RM?hB!`YH- zZE+L;25}&nLd8KO5TL?D8px$nzC!#g;UifIMt(gjC5nrn01^)ZIdljIgD@ROfs`l? zk%P0PkU6#hNQX&Wx(daGnC>Ep07RCPF95?}f>;=)>QD;KboOIAU`Tl2ON(D5DB~dx z4j6B~P_FpW5y%(70WwgjCefBcq1e)?$dyi|0b_Gk@q%E96v;#-lL+9+V_fC3Fp*#o zVL@e{A^;T@iG}GZfkBx_5-1WyI$)Ftw9-?R-e~)=Me*cI5sMgQ#*gQG0K9taX>1Eb z@>N}Ev?^_xAT&0J6pVtos(}!{u`Vba6o$db{vJ=LPwo7FSS%z$4# zI3f@TP?;146QE!LA`<{GgzXkxE2_^J#beq(J&c|ocb;d8kf*Gwtn zzxWzoi+^zh1pQ->@6z{&TtDRcE(N~J_(yjAkn6h?_%7og+4X;uOZ&@#2Noj#f})Y* z%%g%@I&u`!5 zt*PF~ad#`5C(Gle!A^9;2=h6H5_9z9xU**$-+_n}Gn4ei$$VQFz9%{NcHFFEY?udCAC^XDn4 zEYUCTW$b`Ql|3&MKaibkV6Z*!sbruDr+KKP#U*01!tkg|y2JJU#7(tTEQz*jfZ1HP zlZXGBH{q$FW^Gzl$sx-1l0=Z1QmQcLs8fB{_{KO7CG96>lQ6D*2rY2W6QQ_Ig_*M)OJ%ag-3Zc`&(q@64m@^776 zoiy*jli~O_E4F0L3G-_^`ExZ&=L+L;mXPSx8SQ6`8`IEOj}WW$;lt)8b`SgJF|DPznq7{)A&CE26JlI)5?^|n~bQr1C2 zMaovPXUh^vO@(|zz3*Gc@B8OHj^Fp+J2TJBJokNG=XG7@ecktQJ#ki+rrQLi1pxrS zHjJ5(HRl(&ehKh%zG*>0O8|htmmpgQx-~8UNTK=?N!|n?J&-~G5||_+0Kn`kOCzO@ zJ=hkt_EAhH;z1ZNq4AUU5UZKJ>5!w%v4F!Da@20`DKJXnXaX* zbS(2@)4pz7!?)Ltvu|9^t9yyMa+taM!*b&(_GcjF05zWd{9?|BqUG=8h~=&a7Xw67 zK4?wJ$#pF~JE?$g8iKj^qlBdH zYGqDsaYaD{`)J@t@nymK>^AkSsDr9ojaEXlm7D8}<|h+$w`WU5r-6-?lb~@07#aU7VnhP2Xuvq<*XLS-(+jv16bi_z)YL{kCesK5x@cTrmXeCMbfmUtUJ%PN!CD&M zza??E?~uwLX068N`^!qDJ);l>6SvB`oQ~n!9zVNKA;aS|bG7+O<%26#pI>_UMlS3m zwX_(T?qrniBxWx(KeKVqV3dzbUM+ojF(s|=-n3_y)teV{rG&}5RkM|EWIToMoUGN= zYty|M9eHV6mqyov+ut%9WG=_z_+9E1g-1O_L^|qWRc8567Oxsn^K! zN07b(-_#Y;MohXAmvbnzOr2qg@B69kxy$m@lYYxWWuy=dA=dzjOq(LJ&mTfkBo5to zWslE>ej1+ZcX!Y(g*Y{OpD4QaqUiV^pTO9=&IY1KG_q#t-Qf!Fd)>o#JsbFY0h#6IM_eY4oE*+BQpPCHuCykhZVXmY5J^l*7nmD}g^$?h$T8gH!{fl7(v6^Q~hh1>U>Bp39*@gyJG znfxGp&g4pr6_0#JM!pT(4|^w3y%fgi23%;V@$n^G8j7x$Yd;;U0OJDLzs`J9i&&h| z*4$2!kk5&zI<@PibT1}XujH6KI|ct{mAn5{`o69t^~85u?#XV+y@ILWzVuYs6CA&| zrcXBKQ>^~JU6FKqcTOnpyY!gB1`J*9c){4T#_)bl2=Ywk=c2vOe&H zL`cA>>chB@T?`%B2)V_hy@r!U<@?_HO}4{R%$$|>s3EY(eFfd(;XE$pies8aZ#*A@ zO7mr$G*lm?&iPN+zdkZmFh6;Ubuyg17)R#G-y+MLT=LOM-mbb?2m zXfA4{@I+law!e_!=DK_N`nbuI^JAy*+@+oi&dH>C;MLhsbk&Tcuue`*4&3Gm_aSxY zX!Kl{vRJP@a&E)~U%@=+6cV-D^D~(iCpml_v2&=?17Ad}Z~XiKJ2u(#T1nJoC;0h$ zPerSS$0t?Po?T6UhP4h?xoy!>Dg%kMkP0x#KhrP~AL;4{d^narXHekGht8Giq25xm zt%r&QUTSx1E4p{s$pdTuy)JY9d;ICpQ`h%xF=@CWCjSzBQQq;`p0^DJVz-P>DK=QL zL{P&A)$Ddx+9X4_?y;8x4Un6X1}39eV==Ac1i!B}O?JD_4L~ivmqZJR@`=7)e#+7t zkRK^&tr&88RZ?81LQjZ0eT|@UT`Hd-p{89DcIjetPpeAq47E=SnItD=VPQZmSFjxy z-bN?lJUq`B)6HXU4PS_GA1NL(UCu6luGmd&_W(3_jXf z)EIs6LHbH(RRiz{sBiuZVOvw`Ri_<^i*2cRX7=OD_(;Zy@Z&-s)rgV^IfvGo9(Bg6ucU^ zVt8N#qgtD0N)%ZWkgPu6^+7>NTg0<1*&;7*)vEH1=-9;kYfx79eM;9hQ*DscO=s;oKBj1nuF(d?WHxBDPOLb~zOVDfvm zew6pSkyv?heP(h~gO`%5sbQsuU=rVopyb1t$YPI9yG7}M)rLj!+bLqn*2Q<5kFCZ^ z=z=WbhOW?$Q+kTc+0M5LF;^U}N$WGDt)+1VBv!Y7q5{Qg;sU=b7rq_^$&4`a$R^?e zVc>bcs@7`HCG+IqWV3@$cKf~RtDHJd`gZp|QZYscRH)HK7nNDkd$Q8DbVkSF@tDY< zTs)~|%OS4iz)b0ovC}Hw2bSN#Z$K0T7FS=|*e6t*%NT!miWze{dFyC@Jbz8)8uxhc z^UxF8&Y}PSS0u^M&3p(JC25;A>d7{p>^xLpD?1Au6)8qLDk+cNv{N#O zwmMKc?Lu9R+Pe*N_FUeu6J-HkGCe$c=XT_6pg?GtCK|QB(kyPxToCN4rTM`BZaEo0fX+tTA(9Me8#S7_euMtcn<*TIf=*rz_Uq)A~^TsQA9Qo5NJp{(-AquUIg zbbU4I%;}a7=3~|^c3cY0+@4nQ2SXQhzYN@U%+97HH*C(GY%13^2_J@Zc)t3~E+JP~ z0@l(`CL1C&; zRaGzt0j34|&~Z$#4^3g6;s=Kjfrh7&D0Gsq4{)6m=jzL#YlA?XdElS%ktta0U-Uk- zpDJ+lfHH9uC>#QVlF86tEogLOe-6pdfc~om&6d;IL#+ukUj`LVF!m?-&=r2AaKry) zPhn8KH_~y#LkZplG6zcIc!mGw(iDTW`paTn0(TObvSGy$`!^(=MEqN<-(p*z*+}Qt zKse@q@&1PXGxrTJ2ZhC=jePNp_3$u8+Msp+Xg6Ox$ql{n7fw_~5^<_9FcFSNf)Q#6 zbubFyh61a*s=KP;h(r`l9rp_r#)n47`QQobR2*^$iNm9+LDYmJh;Xo`8xaRas3O(C znre6$SRJY1hIA!pz%`J_UnmY!Nt~+0dH)*KI+YuT3gJdX64VK*U{|868W^FW%AwLg zA;79?NCF-Ohij_Ce?;SkN1OOk$vDn(lE^rB0+iz8zTsnCaJ0S^MjNCGf&D#V<&C2g zIR@Gw3z83m`S*k^iA=De=8Q;F-Ga2Q1G2k-i_ zpgGBKgvG7bDTiRgf|Co{kV?SOeW|v-zTVoP^^kz;mK)^_)cUa~W+WO15x8FQKWpBG z;P>P1#}@D=ZA<}y8)b{e;eR-x;rt118;&@3Kc?^=I3ITcXMg`Js6WR^|7Ed=I3gUb zrsfJ(*MPfn77L{c)`TGuU>pp=$zMYi1t$=GXQ%lR=>a$@LEoK|DJL6F0c~UhRN9bo z|L^Dk55l@mFwWkFse<7!TNo0JKyf|?U~n`H27>-f7`ncz|IAnm`hPUh+5r4=3~=mz zjB$<^&S?ex>$v)<*}9DX!`IKX_#b-UQ2*=XAL;wAT>r}Tj}-Vv;D4*@U%CE~0{;m7 zZ*~2@$tC#r0}sK6(**@^9%lwD_ub$;3h}#|n;HR*uD|Ec+dk%uY^Inw(f|OVN9z|? z$^ju6&fq3G25Y=&f?JRm4v*8Z^aTKTbudQywhoO=X{Ri@2(m0)_FlHZZdu7%@O#bp zx9>F(Hrd;u1vYUmM>IQ2%z1lRV9C=9310XD8gf-(y6#SQj}y0N-xD|M+$m{-XM59A z?(^Q}MA_q;ChJ$3A)<9Ikdt(_(Ux0xc4%@_3C4t}wWBpa($U~O_Njs1 z_dLMV6si`xgs1_A#d}cn=XkOafrCwPYE&RS1iJ}9jqE+YyU%=8K?D;v+4xty9`Reh6k z{n#I1yP{1!?TUJ*#?1>`_GLENO6=wCdM?h&95{A48scR=)~U$@xt}_qIBnq47KyeS zEKB9`2a22V$m*dJGwWWa+kbqrxU=vYpe!!)qF>?Gt&H-MDc{1q^q>m|IwVg7aJdGt z(!wu?1x7Qj)+i0B+|StIcqt!Wa>V?ezWJyD(y46md+%l@>mv`~dl>6&@`I7hi@lUY z83p~IqD`8wcZ$@l?4IW14>P>ScPOKXeVgiR9TCI4t6biv#LK%1{HiZ#(H40kQA?zf zajb1p_(R3f2K%p*=~R$X`^o9ueGZlF(!qYIt$GEQrP(Zu$X3>r-6&FnRHOMg>QNvc z(foDo$bG#y?sQ)1EK7C~qX!kSAjD!y zV%@8~U+b=DTk(DoA9)Mxpy!vJPHC)$4G@qzW5cVkK`ee*>DbVRZ0-}hD}b{kPyOMR zq#mxLCQtDGY2C3FpJ5Sf`Nu(;{pwH31GJmN+gNkwZTkx#T+Q*J8ZKDpTTh*Q)IjGl z4OmmYQICVa&MpbOk5o7b7-v1AgN=EgiY$zO`0RCE(d1L|VbsOE$S;$^2DLsymzRp~ zNPjy=T!R6AZT(*^B%#%1?EEOxxO4?y+3;0xYcUHM26jXlijs-~3 zQG6Gxm~CHjqQd2|RP6^$$lGMK5I$}5t;&GOJ6t-N{o_J$v2o{gMaGPd$<5r#)aG1g z4wrr!VJ|BH9(`m+a05T;%k5cNYq&sQ75y*>!Q! z)9-z<^^uDe&xEUmjXWhxad@P2&fx;U7+V?@8n{IK2ctv$ An*aa+ literal 0 HcmV?d00001 diff --git a/src/style/style.css b/src/style/style.css index 97b1198..64e754b 100755 --- a/src/style/style.css +++ b/src/style/style.css @@ -23,6 +23,10 @@ body { /* Tagy */ +#star:hover { + src: url("src/starY.png") no-repeat; +} + .taglist .tag{ margin-right:.4em; padding:.5em; @@ -201,16 +205,17 @@ input:focus { button { text-align: center; - background: #575757; + font-size: 1.4em; + background: #fff; color: #575757; - border: 2px solid #fff; + border: 2px solid #575757; border-radius: 8px; cursor: pointer; outline: 0; } button:hover { - color: #fff; + color: black; background: #575757; border: 2px solid #fff; } diff --git a/verify.php b/verify.php index c0827a5..c8c2752 100644 --- a/verify.php +++ b/verify.php @@ -11,10 +11,21 @@ if(isset($_SESSION["loggedin"]) && $_SESSION["loggedin"] === true){ // Include config file require_once("model/db.php"); - // Define variables and initialize with empty values $username = $password = ""; $username_err = $password_err = $login_err = ""; +if($_POST["name"] != null){ + session_start(); + $_SESSION["wrongCr"] = true; + header("location: index.php"); + exit; +} +if(!empty(trim($_POST["password"]))){ + session_start(); + $_SESSION["wrongCr"] = true; + header("location: index.php"); + exit; +} // Processing form data when form is submitted if($_SERVER["REQUEST_METHOD"] == "POST"){ diff --git a/view/mainContent/listTags.php b/view/mainContent/listTags.php new file mode 100644 index 0000000..6c78fcb --- /dev/null +++ b/view/mainContent/listTags.php @@ -0,0 +1,7 @@ +
+
+ + + + +
+
\ No newline at end of file diff --git a/view/mainContent/userButtons.php b/view/mainContent/userButtons.php index 9cba92e..a2e9650 100644 --- a/view/mainContent/userButtons.php +++ b/view/mainContent/userButtons.php @@ -1,35 +1,42 @@ prepare($sql); - $stmt->execute(); - $result = $stmt->setFetchMode(PDO::FETCH_ASSOC); - $record = $stmt->fetch(); - } catch (PDOException $e) { - echo "Error in $from: Not Found"; - } - return $record; +function unfollowButton($where, $item_id){ + echo "
+

"; } -function followButton($pdo, $where, $item_id, $user_id){ - print_r($pdo); - $conn = $pdo; - try { - $sql = "SELECT * FROM $from WHERE id = $where"; - $stmt = $conn->prepare($sql); - $stmt->execute(); - $result = $stmt->setFetchMode(PDO::FETCH_ASSOC); - $record = $stmt->fetch(); - } catch (PDOException $e) { - echo "Error in $from: Not Found"; +function followButton($where, $item_id){ + + echo "
+

"; +} + +function showStars($beer_id, $rating){ + + for ($i = 1; $i <= $rating; $i++) { + echo "
"; + echo ""; + echo ""; + echo "
"; } - return $record; - } -function showStars($pdo, $beer_id, $user_id){ - print_r($pdo); + for ($i = ++$rating ; $i <= 10; $i++) { + echo "
"; + echo ""; + echo ""; + echo "
"; + } } diff --git a/view/navbar/loginbar.php b/view/navbar/loginbar.php index e0359ae..0fb736e 100644 --- a/view/navbar/loginbar.php +++ b/view/navbar/loginbar.php @@ -6,7 +6,7 @@ -