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

Merge branch 'master' into hendrik-testing

Browse Source
This commit is contained in:
Hendrik
2017-01-20 15:39:44 +01:00
parent 4218860936 064fe93ba7
commit b1348a3d0e
16 changed files with 138 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
website/views/adminpanel.php
View File

@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title>Admin Panel</title>
<script src="../public/js/admin.js" charset="utf-8"></script>
<script src="/js/admin.js" charset="utf-8"></script>
<?php
include_once("../queries/user.php");
include_once("../queries/group_page.php");

17
website/views/head.php
View File

@@ -1,17 +1,16 @@
<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/masonry.js"></script>
<script src="/js/jquery.js"></script>
<script src="/js/header.js"></script>
<script src="/js/menu.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

12
website/views/header.php
View File

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

4
website/views/login-view.php
View File

@@ -1,6 +1,6 @@
<div>
<img style="width:50%;margin-left:25%"
src="img/top-logo.png"
src="/img/top-logo.png"
alt="MyHyvesbook+">
</div>
<div class="platform">
@@ -46,6 +46,6 @@
</form>
<!-- Button for going to the register screen -->
<div class="login_containerlogin">
<a href="https://myhyvesbookplus.nl/register.php" class="button">Registreer een account</a>
<a href="https://myhyvesbookplus.nl/register" class="button">Registreer een account</a>
</div>
</div>

6
website/views/login_head.php
View File

@@ -3,9 +3,9 @@
<title>MyHyvesbook+</title>
<link rel="stylesheet"
type="text/css"
href="styles/main.css">
href="/styles/main.css">
<link rel="stylesheet"
type="text/css"
href="styles/index.css">
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
href="/styles/index.css">
<script src="/js/jquery.js"></script>
</head>

2
website/views/menu.php
View File

@@ -51,7 +51,7 @@
echo "
<li class='friend-item'>
<form action='profile.php' method='get'>
<form action='/profile' method='get'>
<button type='submit'
name='username'
value='$randomUser'>

10
website/views/profile.php
View File

@@ -2,7 +2,7 @@
<div class="profile-box platform">
<img class="left profile-picture" src="<?php echo $user["profilepicture"] ?>">
<div class="profile-button">
<p><img src="img/add-friend.png"> Als vriend toevoegen</p>
<p><img src="/img/add-friend.png"> Als vriend toevoegen</p>
</div>
<h1 class="profile-username"><?= $user["fname"]?> <?=$user["lname"]?> (<?=$user["username"]?>)</h1>
<p><?=$user["bio"]?></p>
@@ -13,11 +13,11 @@
<p>
<?php
while($friend = $profile_friends->fetch()) {
echo "<a href='#' 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>";
}
if($friends->rowCount() === 0) {
if($profile_friends->rowCount() === 0) {
echo "<p>Deze gebruiker heeft nog geen vrienden gemaakt.</p>";
}
?>
@@ -29,10 +29,10 @@
<p>
<?php
while($group = $profile_groups->fetch()) {
echo "<a href='#' 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($groups->rowCount() === 0) {
if($profile_groups->rowCount() === 0) {
echo "<p>Deze gebruiker is nog geen lid van een groep.</p>";
}
?>

9
website/views/register-view.php
View File

@@ -1,6 +1,6 @@
<div>
<img style="width:50%;margin-left:25%"
src="img/top-logo.png"
src="/img/top-logo.png"
alt="MyHyvesbook+">
</div>
@@ -123,13 +123,12 @@
value="Registreer uw account"
name="Submit"
id="frm1_submit">
Registreer uw account
Registreer
</button>
</div>
</form>
<!-- Button for going back to login screen -->
<div class="login_containerlogin">
<a href="https://myhyvesbookplus.nl/login.php" class="button">Login met een account</a>
<!-- Button for going back to login screen -->
<a href="https://myhyvesbookplus.nl/login.php" class="left-arrow">Login</a>
</div>
</div>