MyHyvesBookPlus/WebDB
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into hendrik-search

Browse Source
This commit is contained in:
Hendrik
2017-01-23 16:06:03 +01:00
parent e6f5044a9a 449b500636
commit 2ff23ae668
26 changed files with 302 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
website/views/chat-view.php
View File

@@ -36,7 +36,7 @@
?>
</ul>
</nav>
<div class="chat-right right">
<div class="chat-right">
<div id="chat-history" class="chat-history platform">
</div>
<form id="lastIDForm">

17
website/views/head.php
View File

@@ -1,16 +1,17 @@
<meta charset="utf-8">
<title>MyHyvesbook+</title>
<!-- Add your javascript files here. -->
<script src="/js/jquery.js"></script>
<script src="/js/header.js"></script>
<script src="/js/menu.js"></script>
<script src="js/jquery.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");
@import url("/styles/font-awesome.css");
@import url("/styles/header.css");
@import url("/styles/menu.css");
@import url("/styles/footer.css");
@import url("styles/main.css");
@import url("styles/font-awesome.css");
@import url("styles/header.css");
@import url("styles/menu.css");
@import url("styles/footer.css");
</style>
<?php

10
website/views/header.php
View File

@@ -8,7 +8,7 @@ $userinfo = getHeaderInfo();
<a href="profile.php"><img src="/img/top-logo.png" alt="MyHyvesbook+" /></a>
</div>
<div id="header-search">
<form action="/search" method="get">
<form action="search.php" method="get">
<input name="search"
type="text"
placeholder="Zoek naar wat je wil"
@@ -19,11 +19,6 @@ $userinfo = getHeaderInfo();
</form>
</div>
<div class="right profile-menu">
<div id="profile-menu-popup">
<a href="/logout"><span style="color: red;" class="fa fa-sign-out" data-title="Uitloggen"></span></a> |
<a href="/settings"><span style="color: blue;" class="fa fa-cog" data-title="Instellingen"></span></a> |
<a href="/profile"><span style="color: green;" class="fa fa-user" data-title="Profiel"></span></a>
</div>
<div id="profile-hello-popup">
<div id="hello-loop">
Hallo
@@ -32,5 +27,6 @@ $userinfo = getHeaderInfo();
</div>
<img id="own-profile-picture" class="profile-picture" src="<?=$userinfo["profilepicture"]?>"/>
</div>
<a href="/chat"><div class="right fa fa-comments-o" id="open-chat" data-title="Prive chats"></div></a>
</header>
<?php include("notification-center.php"); ?>

5
website/views/login_head.php
View File

@@ -6,6 +6,7 @@
href="/styles/main.css">
<link rel="stylesheet"
type="text/css"
href="/styles/index.css">
<script src="/js/jquery.js"></script>
href="styles/index.css">
<script src="/js/jqeury.js"></script>
<script src="/js/registerAndLogin.js"></script>
</head>

8
website/views/menu.php
View File

@@ -1,5 +1,5 @@
<nav class="menu">
<section id="friends-menu-section">
<section id="friends-menu-section platform">
<h4>
Vrienden
</h4>
@@ -27,7 +27,7 @@
if (!empty($friend["profilepicture"]))
$pf = $friend["profilepicture"];
if ($i > 1)
if ($i > 5)
$extraItem = "extra-menu-items";
// Echo the friend.
@@ -62,8 +62,8 @@
</form>
</li>
";
if ($i > 1) {
$i -= 1;
if ($i > 5) {
$i -= 5;
echo "
<li class='more-item' id='more-friends-click'>
En nog $i anderen...

16
website/views/notification-center.php Normal file
View File

@@ -0,0 +1,16 @@
<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>
</section>
<section id="notifocationCenter">
<h4>
Vriendchapsverzoeken
</h4>
<ul class="nav-list" id="friendrequestslist">
</ul>
</section>
</nav>

19
website/views/profile.php
View File

@@ -4,7 +4,8 @@
<div class="profile-button">
<p><img src="/img/add-friend.png"> Als vriend toevoegen</p>
</div>
<h1 class="profile-username"><?= $user["fname"]?> <?=$user["lname"]?> (<?=$user["username"]?>)</h1>
<h1 class="profile-username"><?=$user["username"]?></h1>
<h5 class="profile-username"><?= $user["fname"]?> <?=$user["lname"]?></h5>
<p><?=$user["bio"]?></p>
</div>
@@ -13,7 +14,7 @@
<p>
<?php
while($friend = $profile_friends->fetch()) {
echo "<a href='profile/${friend["username"]}/' data-title='${friend["username"]}'><img class='profile-picture' src='${friend["profilepicture"]}' alt='${friend["username"]}'s profielfoto></a>";
echo "<a href='/profile/${friend["username"]}/' data-title='${friend["username"]}'><img class='profile-picture' src='${friend["profilepicture"]}' alt='${friend["username"]}'s profielfoto></a>";
}
@@ -29,7 +30,7 @@
<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/${group["name"]}/' data-title='${group["name"]}'><img class='group-picture' src='${group["picture"]}' alt='${group["name"]}s logo'></a>";
}
if($profile_groups->rowCount() === 0) {
@@ -41,6 +42,18 @@
<div class="posts">
<?php
if ($_SESSION["userID"] === $userID) {
?>
<div class="post platform">
<form>
<input type="text" class="newpost" placeholder="Titel">
<textarea class="newpost">Schrijf een berichtje...</textarea>
<input type="submit" value="Plaats!">
</form>
</div>
<?php
}
while($post = $posts->fetch()) {
$nicetime = nicetime($post["creationdate"]);
echo "