Remove index rendering

shengkai · Nov 19, 2018 · 056ad68 · 056ad68
1 parent d4854a5
commit 056ad68
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 25 deletions.
diff --git a/src/index.php b/src/index.php
@@ -7,13 +7,10 @@
 
 // Find all templates with their own navigation item
 $navItems = [];
-$indexPage;
 foreach($templates as $index=>$template)
 {
   if ($template->isNavigation)
     $navItems[$index] = $template;
-  if ($template->isIndex)
-    $indexPage = $template;
 }
 ?>
 <!doctype html>
@@ -75,10 +72,7 @@
 </nav>
 
 <!-- Add your site or application content here -->
-<div class="container-fluid main" ng-view>
-  <!-- Render index page in here for instand display -->
-  <?php $indexPage->render(false) ?>
-</div>
+<div class="container-fluid main" ng-view></div>
 
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js"></script>
 <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.4/angular.min.js"></script>
@@ -104,7 +98,7 @@
 <?php
   foreach($templates as $template)
   {
-     $template->render(true);
+     $template->render();
   }
 ?>
 </body>

diff --git a/src/templates/templates.php b/src/templates/templates.php
@@ -6,8 +6,6 @@ class Template
 {
   public $isNavigation = false;
 
-  public $isIndex = false;
-
   public $navigationTag;
 
   public $link;
@@ -29,20 +27,8 @@ function __construct($name, $path, $navigationTag = null)
     }  
   }
 
-  public function asIndex()
-  {
-    $this->isIndex = true;
-    return $this;
-  }
-
-  public function render($inTag)
+  public function render()
   {
-    if (!$inTag)
-    {
-      include $this->path;   
-      return;
-    }
-
 ?>
 <script type="text/ng-template" id="<?= $this->name ?>">
   <?php include $this->path; ?>
@@ -52,9 +38,8 @@ public function render($inTag)
 
   public static function getAll()
   {
-    $indexPage = new Template("home.html", "templates/home.php");
     $templates = [
-      $indexPage = $indexPage->asIndex(),
+      new Template("home.html", "templates/home.php"),
       new Template("join.html", "templates/join.php"),
       new Template("list.html", "templates/list.html", "Sessions"),
       new Template("master.html", "templates/master.php"),