Merge branch 'marijn-newFileStructure' into 'master'

Marijn new file structure See merge request !44
2017-01-13 14:46:54 +01:00
parent 120e02f4d1 1cffad77d6
commit 16e9423851
38 changed files with 35 additions and 45 deletions
--- a/.idea/WebDB.iml
+++ b/.idea/WebDB.iml
@@ -14,15 +14,5 @@
        </SOURCES>
      </library>
    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="PHP" type="php">
-        <CLASSES>
-          <root url="file:///usr/share/php" />
-        </CLASSES>
-        <SOURCES>
-          <root url="file:///usr/share/php" />
-        </SOURCES>
-      </library>
-    </orderEntry>
  </component>
 </module>
--- a/website/php/connect.php
+++ b/website/php/connect.php
--- a/website/public/admin.php
+++ b/website/public/admin.php
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <?php include("views/head.php"); ?>
+    <?php include("../views/head.php"); ?>
    <style>
        @import url("styles/adminpanel.css");
    </style>
@@ -12,13 +12,13 @@
 * This view adds the main layout over the screen.
 * Header and menu.
 */
-include("views/main.php");
+include("../views/main.php");

 /* Add your view files here. */
-include("views/adminpanel.php");
+include("../views/adminpanel.php");

 /* This adds the footer. */
-include("views/footer.php");
+include("../views/footer.php");
 ?>
 </body>
 </html>
--- a/website/public/chat.php
+++ b/website/public/chat.php
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <?php include("views/head.php"); ?>
+    <?php include("../views/head.php"); ?>
    <style>
        @import url("styles/chat.css");
    </style>
@@ -12,13 +12,13 @@
 * This view adds the main layout over the screen.
 * Header, menu, footer.
 */
-include("views/main.php");
+include("../views/main.php");

 /* Add your view files here. */
-include("views/chat-view.php");
+include("../views/chat-view.php");

 /* This adds the footer. */
-include("views/footer.php");
+include("../views/footer.php");
 ?>
 </body>
 </html>
--- a/website/public/fonts/FontAwesome.otf
+++ b/website/public/fonts/FontAwesome.otf
--- a/website/public/fonts/fontawesome-webfont.eot
+++ b/website/public/fonts/fontawesome-webfont.eot
--- a/website/public/fonts/fontawesome-webfont.svg
+++ b/website/public/fonts/fontawesome-webfont.svg
--- a/website/public/fonts/fontawesome-webfont.ttf
+++ b/website/public/fonts/fontawesome-webfont.ttf
--- a/website/public/fonts/fontawesome-webfont.woff
+++ b/website/public/fonts/fontawesome-webfont.woff
--- a/website/public/fonts/fontawesome-webfont.woff2
+++ b/website/public/fonts/fontawesome-webfont.woff2
--- a/website/public/group.php
+++ b/website/public/group.php
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <?php include("views/head.php"); ?>
+    <?php include("../views/head.php"); ?>
    <style>
        @import url("styles/profile.css");
    </style>
@@ -12,13 +12,13 @@
 * This view adds the main layout over the screen.
 * Header, menu, footer.
 */
-include("views/main.php");
+include("../views/main.php");

 /* Add your view files here. */
-include("views/group.php");
+include("../views/group.php");

 /* This adds the footer. */
-include("views/footer.php");
+include("../views/footer.php");
 ?>
 </body>
 </html>
--- a/website/public/img/add-friend.png
+++ b/website/public/img/add-friend.png
--- a/website/public/img/leave-group.png
+++ b/website/public/img/leave-group.png
--- a/website/public/img/top-logo.png
+++ b/website/public/img/top-logo.png
--- a/website/public/js/dobPicker.js
+++ b/website/public/js/dobPicker.js
--- a/website/public/js/dobPicker.min.js
+++ b/website/public/js/dobPicker.min.js
--- a/website/public/js/header.js
+++ b/website/public/js/header.js
--- a/website/public/js/jquery.js
+++ b/website/public/js/jquery.js
--- a/website/public/js/menu.js
+++ b/website/public/js/menu.js
--- a/website/public/login.php
+++ b/website/public/login.php
@@ -17,7 +17,7 @@
         alt="MyHyvesbook+">
 </div>

-<form action="../profile.php"
+<form action="profile.php"
      method="post">
    <h1>Welkom bij MyHyvesbook+</h1>

--- a/website/public/profile.php
+++ b/website/public/profile.php
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <?php include("views/head.php"); ?>
+    <?php include("../views/head.php"); ?>
    <style>
        @import url("styles/profile.css");
    </style>
@@ -12,13 +12,13 @@
 * This view adds the main layout over the screen.
 * Header, menu, footer.
 */
-include("views/main.php");
+include("../views/main.php");

 /* Add your view files here. */
-include("views/profile.php");
+include("../views/profile.php");

 /* This adds the footer. */
-include("views/footer.php");
+include("../views/footer.php");
 ?>
 </body>
 </html>
--- a/website/public/search.php
+++ b/website/public/search.php
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <?php include("views/head.php"); ?>
+    <?php include("../views/head.php"); ?>
    <style>
        @import url("styles/search.css");
    </style>
@@ -12,13 +12,13 @@
 * This view adds the main layout over the screen.
 * Header and menu.
 */
-include("views/main.php");
+include("../views/main.php");

 /* Add your view files here. */
-include("views/search-view.php");
+include("../views/search-view.php");

 /* This adds the footer. */
-include("views/footer.php");
+include("../views/footer.php");
 ?>
 </body>
 </html>
--- a/website/public/settings.php
+++ b/website/public/settings.php
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <?php include("views/head.php"); ?>
+    <?php include("../views/head.php"); ?>
    <style>
        @import url("styles/settings.css");
    </style>
@@ -12,13 +12,13 @@
 * This view adds the main layout over the screen.
 * Header and menu.
 */
-include("views/main.php");
+include("../views/main.php");

 /* Add your view files here. */
-include("views/settings-view.php");
+include("../views/settings-view.php");

 /* This adds the footer. */
-include("views/footer.php");
+include("../views/footer.php");
 ?>
 </body>
 </html>
--- a/website/public/styles/adminpanel.css
+++ b/website/public/styles/adminpanel.css
--- a/website/public/styles/chat.css
+++ b/website/public/styles/chat.css
--- a/website/public/styles/font-awesome.css
+++ b/website/public/styles/font-awesome.css
--- a/website/public/styles/footer.css
+++ b/website/public/styles/footer.css
--- a/website/public/styles/header.css
+++ b/website/public/styles/header.css
--- a/website/public/styles/index.css
+++ b/website/public/styles/index.css
--- a/website/public/styles/main.css
+++ b/website/public/styles/main.css
--- a/website/public/styles/menu.css
+++ b/website/public/styles/menu.css
--- a/website/public/styles/profile.css
+++ b/website/public/styles/profile.css
--- a/website/public/styles/search.css
+++ b/website/public/styles/search.css
--- a/website/public/styles/settings.css
+++ b/website/public/styles/settings.css
--- a/website/public/template.php
+++ b/website/public/template.php
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <?php include("views/head.php"); ?>
+    <?php include("../views/head.php"); ?>
    <style>
        /*Insert own stylesheet here ;)*/
    </style>
@@ -12,13 +12,13 @@
 * This view adds the main layout over the screen.
 * Header and menu.
 */
-include("views/main.php");
+include("../views/main.php");

 /* Add your view files here. */
-include("views/homepage.php");
+include("../views/homepage.php");

 /* This adds the footer. */
-include("views/footer.php");
+include("../views/footer.php");
 ?>
 </body>
 </html>
--- a/website/styles/font-awesome.css
+++ b/website/styles/font-awesome.css
--- a/website/views/group.php
+++ b/website/views/group.php
@@ -2,7 +2,7 @@
    <div class="profile-box platform">
        <img class="left group-picture" src="http://i.imgur.com/afjEUx2.jpg">
        <div class="profile-button">
-            <p><img src="../website/img/leave-group.png"> Groep verlaten</p>
+            <p><img src="img/leave-group.png"> Groep verlaten</p>
        </div>
        <h1 class="profile-username">[groepnaam]</h1>
        <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Nunc aliquam neque turpis, id porta quam iaculis id. Sed suscipit, nisl a fermentum congue, nunc augue finibus lectus, id varius nunc purus nec dolor. Integer laoreet tellus sit amet sapien auctor congue. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Sed quis fermentum odio, sed dictum nulla. Donec aliquam rutrum orci cursus tempus. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.</p>
--- a/website/views/profile.php
+++ b/website/views/profile.php
@@ -2,7 +2,7 @@
    <div class="profile-box platform">
        <img class="left profile-picture" src="http://i.imgur.com/afjEUx2.jpg">
        <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">[gebruikersnaam]</h1>
        <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Nunc aliquam neque turpis, id porta quam iaculis id. Sed suscipit, nisl a fermentum congue, nunc augue finibus lectus, id varius nunc purus nec dolor. Integer laoreet tellus sit amet sapien auctor congue. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Sed quis fermentum odio, sed dictum nulla. Donec aliquam rutrum orci cursus tempus. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.</p>