Merge branch 'master' into hendrik-testing
This commit is contained in:
Hendrik
@@ -13,88 +13,24 @@
|
||||
<p>
|
||||
<?php
|
||||
foreach($members as $member) {
|
||||
echo "<a href=\"profile.php?username=" . $member["username"] . "\" data-title=\"" . $member["username"] . "\"><img class=\"profile-picture\" src=\"" . $member["profilepicture"] . "\" alt=\"" . $member["username"] . "'s profielfoto\">";
|
||||
echo "<a href=\"profile.php?username=" . $member["username"] . "\" data-title=\"" . $member["username"] . "\"><img class=\"profile-picture\" src=\"" . $member["profilepicture"] . "\" alt=\"" . $member["username"] . "'s profielfoto\"></a>";
|
||||
}
|
||||
?>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div class="posts">
|
||||
<div class="post platform">
|
||||
<h2>Lorem</h2>
|
||||
<p>Lorem ipsum dolor sit amet, consectetur.</p>
|
||||
<p class="subscript">Enkele minuten geleden geplaatst</p>
|
||||
</div>
|
||||
<div class="post platform">
|
||||
<h2>Image</h2>
|
||||
<img src="http://i.imgur.com/ypIQKjE.jpg" alt="Olympic Mountains, Washington">
|
||||
<p class="subscript">Gisteren geplaatst</p>
|
||||
</div>
|
||||
<div class="post platform">
|
||||
<h2>Ipsum</h2>
|
||||
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Rem nihil alias amet dolores fuga totam sequi a cupiditate ipsa voluptas id facilis nobis.</p>
|
||||
<p class="subscript">Maandag geplaatst</p>
|
||||
</div>
|
||||
<div class="post platform">
|
||||
<h2>Dolor</h2>
|
||||
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit.</p>
|
||||
<p class="subscript">4 Januari geplaatst</p>
|
||||
</div>
|
||||
<div class="post platform">
|
||||
<h2>Sit</h2>
|
||||
<p>Lorem ipsum dolor sit.</p>
|
||||
<p class="subscript">4 Januari geplaatst</p>
|
||||
</div>
|
||||
<div class="post platform">
|
||||
<h2>Image</h2>
|
||||
<img src="https://i.redditmedia.com/EBWWiEojgkRrdn89R7qF7tBZjJszJaIqgkWUH23s11A.jpg?w=576&s=ba4fe1f02485cb2327305924ef869a66" alt="Nunobiki Falls, Kobe Japan">
|
||||
<p class="subscript">4 Januari geplaatst</p>
|
||||
</div>
|
||||
<div class="post platform">
|
||||
<h2>Amet</h2>
|
||||
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Minima asperiores eveniet vero velit eligendi aliquid in.</p>
|
||||
<p class="subscript">4 Januari geplaatst</p>
|
||||
</div>
|
||||
<div class="post platform">
|
||||
<h2>Consectetur</h2>
|
||||
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Error aliquid reprehenderit expedita odio beatae est.</p>
|
||||
<p class="subscript">4 Januari geplaatst</p>
|
||||
</div>
|
||||
<div class="post platform">
|
||||
<h2>Adipisicing</h2>
|
||||
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Quaerat architecto quis tenetur fugiat veniam iste molestiae fuga labore!</p>
|
||||
<p class="subscript">4 Januari geplaatst</p>
|
||||
</div>
|
||||
<div class="post platform">
|
||||
<h2>Elit</h2>
|
||||
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Rem ut debitis dolorum earum expedita eveniet voluptatem quibusdam facere eos numquam commodi ad iusto laboriosam rerum aliquam.</p>
|
||||
<p class="subscript">4 Januari geplaatst</p>
|
||||
</div>
|
||||
<div class="post platform">
|
||||
<h2>Geen error</h2>
|
||||
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Doloribus dolorem maxime minima animi cum.</p>
|
||||
<p class="subscript">4 Januari geplaatst</p>
|
||||
</div>
|
||||
<div class="post platform">
|
||||
<h2>Image</h2>
|
||||
<img src="https://i.reddituploads.com/82c1c4dd0cfb4a4aa1cfa16f93f5dbfa?fit=max&h=1536&w=1536&s=dd629d407f3646ee6e3adb4da78c93f2" alt="Oregon cliffs are no joke.">
|
||||
<p class="subscript">4 Januari geplaatst</p>
|
||||
</div>
|
||||
<div class="post platform">
|
||||
<h2>Aliquid</h2>
|
||||
<p>Lorem ipsum dolor sit amet, consectetur.</p>
|
||||
<p class="subscript">4 Januari geplaatst</p>
|
||||
</div>
|
||||
<div class="post platform">
|
||||
<h2>Odit</h2>
|
||||
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Odit accusamus tempore at porro officia rerum est impedit ea ipsa tenetur. Labore libero hic error sunt laborum expedita.</p>
|
||||
<p class="subscript">4 Januari geplaatst</p>
|
||||
</div>
|
||||
<div class="post platform">
|
||||
<h2>Accusamus</h2>
|
||||
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Nobis quaerat suscipit ad.</p>
|
||||
<p class="subscript">4 Januari geplaatst</p>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="modal">
|
||||
<div class="modal-content platform">
|
||||
<div class="modal-close">
|
||||
×
|
||||
</div>
|
||||
<div class="modal-response" id="modal-response">
|
||||
<span class="modal-default">Aan het laden...</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -5,7 +5,6 @@
|
||||
<script src="js/main.js"></script>
|
||||
<script src="js/header.js"></script>
|
||||
<script src="js/menu.js"></script>
|
||||
<script src="js/notifications.js"></script>
|
||||
<style>
|
||||
/* Add your css files here. */
|
||||
@import url("styles/main.css");
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<nav class="menu">
|
||||
<section id="friends-menu-section">
|
||||
<h4>
|
||||
Top vrienden
|
||||
Recente vrienden
|
||||
</h4>
|
||||
<ul id="menu-friends-list" class="nav-list">
|
||||
</ul>
|
||||
@@ -12,6 +12,13 @@
|
||||
</h4>
|
||||
<ul id="menu-groups-list" class="nav-list">
|
||||
</ul>
|
||||
<ul class="nav-list">
|
||||
<li>
|
||||
<a href="#">
|
||||
Maak een groep aan
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</section>
|
||||
<section>
|
||||
<ul class="nav-list">
|
||||
|
||||
@@ -5,14 +5,14 @@ function messagePage(string $content) {
|
||||
<html>
|
||||
<head>
|
||||
<style>
|
||||
@import url(styles/main.css);
|
||||
@import url(styles/settings.css);
|
||||
@import url(styles/resetpassword.css);
|
||||
@import url(../styles/main.css);
|
||||
@import url(../styles/settings.css);
|
||||
@import url(../styles/message-page.css);
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class='password-change'>
|
||||
<div class='top-logo'><a href='login.php'><img src='img/top-logo.png' alt='MyHyvesbook+'/></a></div>
|
||||
<div class='top-logo'><a href='../index.php'><img src='../img/top-logo.png' alt='MyHyvesbook+'/></a></div>
|
||||
<div class='item-box platform'>$content</div>
|
||||
</div>
|
||||
</body>
|
||||
|
||||
@@ -1,9 +1,20 @@
|
||||
<nav class="menu" id="notification-center">
|
||||
<section id="quick-links">
|
||||
<a href="chat.php"><i class="fa fa-comments-o" data-title="Prive chats"></i></a>
|
||||
<a href="settings.php"><i class="fa fa-cog" data-title="Instellingen"></i></a>
|
||||
<a href="profile.php"><i class="fa fa-user" data-title="Profiel"></i></a>
|
||||
<a href="logout.php"><i class="fa fa-sign-out" data-title="Uitloggen"></i></a>
|
||||
<a href="chat.php" data-title="Prive chats"><i class="fa fa-comments-o"></i></a>
|
||||
<a href="settings.php" data-title="Instellingen"><i class="fa fa-cog"></i></a>
|
||||
<a href="profile.php" data-title="Profiel"><i class="fa fa-user"></i></a>
|
||||
<?php
|
||||
include_once ("../queries/user.php");
|
||||
|
||||
// auth
|
||||
$userinfo = getRoleByID($_SESSION['userID'])->fetch(PDO::FETCH_ASSOC);
|
||||
|
||||
if ($userinfo['role'] == 'admin' OR $userinfo['role'] == 'owner') {
|
||||
echo "<a href=\"admin.php\" data-title=\"Admin\"><i class=\"fa fa-lock\"></i></a>";
|
||||
echo "<style>@import url('styles/adminbutton.css'); </style>";
|
||||
}
|
||||
?>
|
||||
<a href="logout.php" data-title="Admin"><i class="fa fa-sign-out"></i></a>
|
||||
</section>
|
||||
<section id="friend-request-section">
|
||||
<h4>
|
||||
|
||||
@@ -26,13 +26,12 @@ echo("
|
||||
<input type="hidden" id="newcomment-textarea" name="postID" value="<?= $postID ?>">
|
||||
<textarea id="newcomment" name="newcomment-content" placeholder="Laat een reactie achter..."></textarea> <br>
|
||||
<button onclick="postComment('reaction')" name="button" value="reaction">Reageer!</button>
|
||||
<!-- TODO: if/else op "niet slecht." button voor like/unlike-->
|
||||
<button onclick="postComment('nietslecht')" name="button" value="nietslecht">
|
||||
<button onclick="postComment('nietslecht')" name="button" value="nietslecht" class="nietslecht">
|
||||
<?php
|
||||
if (checkNietSlecht($postID, $_SESSION["userID"])) {
|
||||
echo 'Trek <span class="nietslecht">"Niet slecht."</span> terug';
|
||||
echo 'Trek <span class="nietslecht-text">"Niet slecht."</span> terug';
|
||||
} else {
|
||||
echo 'Vind ik <span class="nietslecht">"Niet slecht."</span>';
|
||||
echo '<img src="img/nietslecht_small.png" /> <span class="nietslecht-text">"Niet slecht."</span>';
|
||||
}
|
||||
?>
|
||||
</button>
|
||||
@@ -51,7 +50,7 @@ echo("
|
||||
<div class='comment'>
|
||||
<div class='commentinfo'>
|
||||
$commentauthor
|
||||
<span class='commentdate', title='$commentdate'>
|
||||
<span class='commentdate' title='$commentdate'>
|
||||
$commentnicetime
|
||||
</span>
|
||||
</div>
|
||||
|
||||
@@ -1,24 +1,41 @@
|
||||
<div class="content">
|
||||
<div class="profile-box platform">
|
||||
<img class="left profile-picture" src="<?php echo $user["profilepicture"] ?>">
|
||||
<form id="start-profile-chat-form" class="right" action="chat.php" method="get">
|
||||
<button name="username"
|
||||
class="friend-button green"
|
||||
value="<?php echo $user["userID"] ?>">
|
||||
<i class="fa fa-comment-o"></i> Chat
|
||||
</button>
|
||||
</form>
|
||||
<div class="friend-button-container">
|
||||
|
||||
<div class="user-box">
|
||||
<img class="profile-picture main-picture" src="<?= $user["profilepicture"] ?>"><br />
|
||||
<div class="platform">
|
||||
<div class="status-buttons-container">
|
||||
<button disabled class="gray"><?= $user["onlinestatus"] ?></button>
|
||||
<button disabled class="gray"><?= $user["role"] ?></button>
|
||||
</div>
|
||||
<div class="friend-button-container">
|
||||
<p>:)</p>
|
||||
<p>Je ziet er goed uit vandaag</p>
|
||||
</div>
|
||||
<div class="profile-info">
|
||||
<h2><?= $user["fname"]?> <?=$user["lname"]?></h2>
|
||||
<h5><?=$user["username"]?></h5>
|
||||
<?php if (strlen($user["bio"]) <= 50) {
|
||||
echo "<p>" . $user["bio"] . "</p>";
|
||||
} ?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<?php if (strlen($user["bio"]) > 50) {
|
||||
echo "<div class='platform'><h3>Bio:</h3><p>" . $user["bio"] . "</p></div>";
|
||||
} ?>
|
||||
|
||||
<h1 class="profile-username"><?= $user["fname"]?> <?=$user["lname"]?></h1>
|
||||
<h5 class="profile-username"><?=$user["username"]?></h5>
|
||||
<p><?=$user["bio"]?></p>
|
||||
<div class="item-box platform">
|
||||
<h3>Informatie</h3>
|
||||
<p>
|
||||
<ul>
|
||||
<li>Geboren op: <?= $user["birthdate"] ?></li>
|
||||
<li>Locatie: <?= $user["location"] ?></li>
|
||||
<li>Lid sinds: <?= nicetime($user["creationdate"]) ?></li>
|
||||
</ul>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div class="item-box left platform">
|
||||
<h2>Vrienden</h2>
|
||||
<div class="item-box platform">
|
||||
<h3>Vrienden</h3>
|
||||
<p>
|
||||
<?php
|
||||
while($friend = $profile_friends->fetch()) {
|
||||
@@ -33,12 +50,12 @@
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div class="item-box right platform">
|
||||
<h2>Groepen</h2>
|
||||
<div class="item-box platform">
|
||||
<h3>Groepen</h3>
|
||||
<p>
|
||||
<?php
|
||||
while($group = $profile_groups->fetch()) {
|
||||
echo "<a href='/group/${group["name"]}/' data-title='${group["name"]}'><img class='group-picture' src='${group["picture"]}' alt='${group["name"]}s logo'></a>";
|
||||
echo "<a href='group.php?groupname=${group['name']}' data-title='${group["name"]}'><img class='group-picture' src='${group["picture"]}' alt='${group["name"]}s logo'></a>";
|
||||
}
|
||||
|
||||
if($profile_groups->rowCount() === 0) {
|
||||
|
||||
Reference in New Issue
Block a user