Defaulting to bootstrap.

tsetliff · tsetliff · commit d8da42dad0d2 · 2018-08-05T13:38:53.000-04:00
diff --git a/template/app/src/WebAppFramework/Template.php b/template/app/src/WebAppFramework/Template.php
@@ -33,18 +33,18 @@ public function setVariable($name, $value)
      * @param $templateFileName
      */
     public function insertTemplate($templateFileName)
-    {
-        require(APP_LOCATION . '/templates/' . $templateFileName);
-    }
-
-    public function render()
     {
         // Add normal escaped variables to the template
         foreach ($this->rawVariables as $name => $value) {
             // Yes I want to explode out the variables here by name
             $$name = htmlentities($value);
         }
 
-        require(APP_LOCATION . '/templates/' . $this->phpTemplateFile);
+        require(APP_LOCATION . '/templates/' . $templateFileName);
+    }
+
+    public function render()
+    {
+        $this->insertTemplate($this->phpTemplateFile);
     }
 }
diff --git a/template/app/templates/footer.php b/template/app/templates/footer.php
@@ -1,2 +1,5 @@
+<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
+<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
 </body>
 </html>
diff --git a/template/app/templates/header.php b/template/app/templates/header.php
@@ -1,5 +1,12 @@
-<html>
+<!doctype html>
+<html lang="en">
 <head>
+    <!-- Required meta tags -->
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+
     <title>Your Website Name</title>
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
+    <link rel="stylesheet" href="/css/main.css">
 </head>
 <body>
diff --git a/template/app/templates/home.php b/template/app/templates/home.php
@@ -1,8 +1,10 @@
 <?php $this->insertTemplate('header.php'); ?>
 <?php $this->insertTemplate('users/loginBar.php'); ?>
-Hello <?php echo(($name) ? $name : 'world'); ?>!
-<form action="" method="post">
-    Your Name:<input type="text" name="name" value="<?php echo $name; ?>">
-    <input type="submit" value="Submit">
-</form>
+<div class="container">
+    <h1>Hello <?php echo(($name) ? $name : 'world'); ?>!</h1>
+    <form action="" method="post">
+        Your Name:<input type="text" name="name" value="<?php echo $name; ?>">
+        <input type="submit" value="Submit">
+    </form>
+</div>
 <?php $this->insertTemplate('footer.php'); ?>
diff --git a/template/app/templates/users/loginBar.php b/template/app/templates/users/loginBar.php
@@ -1,12 +1,12 @@
-<div id="login-bar" class="top-bar">
+<div id="login-bar" class="top-bar container-fluid text-right">
 <?php
 if (\Di\Di::getAuth()->isLoggedIn()) {
     $user = \Di\Di::getAuth()->getLoggedInUser();
 ?>
 You are logged in as <?php echo $user->getFirstName(); ?> <?php echo $user->getLastName(); ?>. <a href="/Auth/logout">Log Out</a>
 <?php } else { ?>
-Please log in!
 <form action="/Auth/login" method="post">
+    Log In
     Email:<input type="text" name="email" value="">
     Password:<input type="password" name="password" value="">
     <input type="submit" value="Submit">
diff --git a/template/public_html/css/main.css b/template/public_html/css/main.css
@@ -0,0 +1,4 @@
+.top-bar {
+    color: #FFF;
+    background-color: #000;
+}

Original file line number	Diff line number	Diff line change
`@@ -33,18 +33,18 @@ public function setVariable($name, $value)`
`33`	`33`	`* @param $templateFileName`
`34`	`34`	`*/`
`35`	`35`	`public function insertTemplate($templateFileName)`
`36`		`- {`
`37`		`- require(APP_LOCATION . '/templates/' . $templateFileName);`
`38`		`- }`
`39`		`-`
`40`		`- public function render()`
`41`	`36`	`{`
`42`	`37`	`// Add normal escaped variables to the template`
`43`	`38`	`foreach ($this->rawVariables as $name => $value) {`
`44`	`39`	`// Yes I want to explode out the variables here by name`
`45`	`40`	`$$name = htmlentities($value);`
`46`	`41`	`}`
`47`	`42`
`48`		`- require(APP_LOCATION . '/templates/' . $this->phpTemplateFile);`
	`43`	`+ require(APP_LOCATION . '/templates/' . $templateFileName);`
	`44`	`+ }`
	`45`	`+`
	`46`	`+ public function render()`
	`47`	`+ {`
	`48`	`+ $this->insertTemplate($this->phpTemplateFile);`
`49`	`49`	`}`
`50`	`50`	`}`