Merge branch 'master' into marijn-chat
This commit is contained in:
@@ -0,0 +1,18 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
<?php
|
||||||
|
include("views/head.php");
|
||||||
|
?>
|
||||||
|
<body>
|
||||||
|
<?php
|
||||||
|
/*
|
||||||
|
* This view adds the main layout over the screen.
|
||||||
|
* Header, menu, footer.
|
||||||
|
*/
|
||||||
|
// include("views/main.php");
|
||||||
|
|
||||||
|
/* Add your view files here. */
|
||||||
|
include("views/homepage.php");
|
||||||
|
?>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
|||||||
4
website/js/jquery.js
vendored
Normal file
4
website/js/jquery.js
vendored
Normal file
File diff suppressed because one or more lines are too long
14
website/php/connect.php
Normal file
14
website/php/connect.php
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
<?php
|
||||||
|
$servername = "agile136.science.uva.nl";
|
||||||
|
$username = "admin";
|
||||||
|
$password = "qdtboXhCHJyL2szC";
|
||||||
|
|
||||||
|
// Create connection
|
||||||
|
$conn = new mysqli($servername, $username, $password);
|
||||||
|
|
||||||
|
// Check connection
|
||||||
|
if ($conn->connect_error) {
|
||||||
|
die("Connection failed: " . $conn->connect_error);
|
||||||
|
}
|
||||||
|
|
||||||
|
?>
|
||||||
15
website/styles/main.css
Normal file
15
website/styles/main.css
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
body {
|
||||||
|
background-color: white;
|
||||||
|
color: #333;
|
||||||
|
font-family: Arial;
|
||||||
|
}
|
||||||
|
|
||||||
|
::selection {
|
||||||
|
background: #845663;
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
::-moz-selection {
|
||||||
|
background: #845663;
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
10
website/views/head.php
Normal file
10
website/views/head.php
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<title>MyHyvesbook+</title>
|
||||||
|
<!-- Add your javascript files here. -->
|
||||||
|
<script src="js/jquery.js"></script>
|
||||||
|
<style>
|
||||||
|
/* Add your css files here. */
|
||||||
|
@import url("css/main.css");
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
3
website/views/homepage.php
Normal file
3
website/views/homepage.php
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
<div class="content">
|
||||||
|
<!-- Add the content here. -->
|
||||||
|
</div>
|
||||||
Reference in New Issue
Block a user