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

Changed style and added friendrequests

Browse Source
This commit is contained in:
Lars van Hijfte
2017-01-23 11:33:27 +01:00
parent 71202ab857
commit 93b6835ea4
16 changed files with 178 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
website/public/API/loadMessages.php
View File

@@ -1,6 +1,7 @@
<?php
session_start();
require_once("../../queries/connect.php");
require_once("../../queries/private_message.php");
require_once("../../queries/checkInput.php");

8
website/public/API/loadNotifications.php Normal file
View File

@@ -0,0 +1,8 @@
<?php
session_start();
require_once ("../../queries/connect.php");
require_once ("../../queries/friendship.php");
echo selectAllFriendRequests();

34
website/public/js/notifications.js Normal file
View File

@@ -0,0 +1,34 @@
function showNotifications(notifications, id) {
$("#friendrequestslist").html("");
for (i in notifications) {
$("#friendrequestslist").append(" \
<li class='friend-item $extraItem'> \
<form action='profile.php' method='get'> \
<button type='submit' \
name='username' \
value='"+ notifications[i].username +"'> \
<div class='friend'> \
<img alt='PF' class='profile-picture' src='"+ notifications[i].profilepicture +"'/> \
"+ notifications[i].username +" \
</div> \
</button> \
</form> \
</li> \
");
}
}
function loadNotifications() {
$.post(
"API/loadNotifications.php"
).done(function(data) {
if (data && data != "[]") {
showNotifications(JSON.parse(data), "friendrequestslist");
}
});
setTimeout(loadNotifications, 10000);
}
loadNotifications();

2
website/public/profile.php
View File

@@ -4,7 +4,7 @@
<?php include("../views/head.php"); ?>
<script src="/js/masonry.js"></script>
<style>
@import url("/styles/profile.css");
@import url("styles/profile.css");
</style>
</head>
<body>

4
website/public/styles/adminpanel.css
View File

@@ -6,7 +6,7 @@
.admin-title {
margin: 10px;
padding-bottom: 5px;
border-bottom: 4px solid #845663;
border-bottom: 4px solid #FBC02D;
}
.admin-panel input[type="radio"], input[type="checkbox"] {
@@ -18,7 +18,7 @@
padding: 8px;
vertical-align: top;
border-radius: 10px;
border: 4px solid #845663;
border: 4px solid #FBC02D;
box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
}

2
website/public/styles/chat.css
View File

@@ -83,7 +83,7 @@
.chat-field input[type="submit"] {
width: auto;
float: right;
background-color: #845663;
background-color: #FBC02D;
color: white;
padding: 5px 10px;
border-radius: 0 10px 10px 0;

8
website/public/styles/header.css
View File

@@ -8,21 +8,23 @@ header {
width: 100%;
color: white;
background-color: rgba(132,86,99, 0.98);
background-color: #FBC02D;
box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
}
#header-logo {
padding-left: 42px;
}
#header-logo, #header-logo img {
height: 80px;
vertical-align: middle;
line-height: 80px;
padding-left: 5px;
}
#header-search {
padding-left: 48px;
padding-left: 42px;
}

2
website/public/styles/index.css
View File

@@ -19,7 +19,7 @@ body {
background-size: cover;
background-attachment: fixed;*/
/*background-color: #B78996;*/
/*background-color: #EEE;*/
color: #333;
font-family: Arial, sans-serif;
}

71
website/public/styles/main.css
View File

@@ -18,7 +18,7 @@ html {
body {
height: 100%;
background-color: #B78996;
background-color: #EEE;
color: #333;
font-family: Arial, sans-serif;
}
@@ -37,11 +37,12 @@ h3 {
}
h4 {
font-size: 1.6em;
font-size: 1.2em;
}
h5 {
font-size: 1.4em;
font-size: 1.0em;
color: #666;
}
ul {
@@ -54,12 +55,12 @@ p {
/* Selection colors */
::selection {
background: #845663;
background: #FBC02D;
color: white;
}
::-moz-selection {
background: #845663;
background: #FBC02D;
color: white;
}
@@ -75,7 +76,7 @@ p {
.platform {
padding: 20px;
margin-bottom: 10px;
border-radius: 10px;
border-radius: 5px;
background-color: #FFFFFF;
box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
}
@@ -143,7 +144,7 @@ button, input, select {
cursor: pointer;
border: none;
font-size: 16px;
border-radius: 7px;
transition-duration: 250ms;
}
/* All textinput and sections */
@@ -151,19 +152,53 @@ textarea, input, select {
padding: 0 5px;
background: white;
color: #333333;
border: 1px solid #845663;
border-radius: 7px;
border-radius: 5px;
border-bottom: 1px solid #4CAF50;
font-size: 16px;
outline: none;
transition-duration: 250ms;
}
textarea {
padding: 5px;
resize: none;
}
textarea:hover, input:hover, select:hover {
border-radius: 10px;
}
textarea:focus, input:focus, select:focus {
border-radius: 10px;
box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
}
/* All buttons */
button,
input[type="submit"],
input[type="reset"] {
background-color: #845663;
background-color: #FBC02D;
color: white;
padding: 0 10px;
border: none;
border-radius: 5px;
}
button:focus,
input[type="submit"]:focus,
input[type="reset"]:focus {
outline: none;
}
button:active,
input[type="submit"]:active,
input[type="reset"]:active {
outline: none;
box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24)
}
input[type="radio"] {
border-radius: 100%;
}
/* Tables */
@@ -190,19 +225,17 @@ img[data-title]:hover:after,
span[data-title]:hover:after,
div[data-title]:hover:after {
content: attr(data-title);
padding: 4px 4px;
padding: 7px 7px;
color: #FFFFFF;
position: absolute;
left: 0;
top: 100%;
z-index: 20;
top: 150%;
z-index: 200;
white-space: nowrap;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 5px;
-moz-box-shadow: 0 0 4px #222;
-webkit-box-shadow: 0 0 4px #222;
box-shadow: 0 0 4px #222;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
box-shadow: 0 14px 28px rgba(0,0,0,0.25), 0 10px 10px rgba(0,0,0,0.22);
background-color: #333;
font-size: 15px;
line-height: normal;

12
website/public/styles/menu.css
View File

@@ -1,6 +1,7 @@
.menu {
position: fixed;
z-index: 50;
overflow-y: auto;
left: 0;
top: 80px;
@@ -11,6 +12,10 @@
box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
}
.menu section {
box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
}
.menu h4 {
padding: 10px;
}
@@ -26,12 +31,13 @@
cursor: pointer;
}
.friend-item {
.friend-item, .group-item {
cursor: pointer;
transition-duration: 250ms;
}
.friend-item:hover, .group-item:hover {
background: #845663;
background: #FBC02D;
color: white;
}
@@ -56,7 +62,7 @@
}
#quick-links i {
color: #845663;
color: #4CAF50;
font-size: 42px;
padding: 7px;
}

16
website/public/styles/profile.css
View File

@@ -14,7 +14,7 @@
padding-top: 50px;
}
.profile-box h5.profile-username {
padding-top: 0;
padding: 0 0 10px 0;
}
div.posts {
@@ -28,6 +28,15 @@ div.posts div.post {
margin: 20px 0 0 0;
padding: 10px;
width: calc(100% - 40px);
cursor: pointer;
transition-duration: 250ms;
}
div.posts div.post:hover {
/*margin: 15px 0 0 -5px;*/
/*padding: 15px;*/
/*z-index: 20;*/
box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23);
}
div.posts div.post img {
@@ -76,11 +85,12 @@ div.posts .post form textarea.newpost {
float: right;
padding: 10px;
border-radius: 5px;
background-color: #845663;
background-color: #4CAF50;
color: #FFFFFF;
transition-duration: 250ms;
cursor: pointer;
}
.profile-button:hover {
background-color: #B78996;
box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23);
}