Skip to content

Commit

Permalink
conv framework
Browse files Browse the repository at this point in the history
  • Loading branch information
WiWaG committed Jan 18, 2021
1 parent 8ecc3cc commit cc64988
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 40 deletions.
File renamed without changes.
4 changes: 4 additions & 0 deletions assets/js/nav-active.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
$(".nav a").on("click", function(){
$(".nav").find(".active").removeClass("active");
$(this).parent().addClass("active");
});
33 changes: 1 addition & 32 deletions index.php
Original file line number Diff line number Diff line change
@@ -1,16 +1,5 @@
<?php

// Turn on all errors, warnings and notifications at the top of this app
// ini_set('display_errors', 1);
// ini_set('display_startup_errors', 1);
// error_reporting(E_ALL);

// require 'core/core.php';

// Throw all errors to a central error handler function
// This function is in core/core.php file
// set_exception_handler('exception_handler');

use app\lib\Router;
use app\lib\Request;

Expand All @@ -25,28 +14,8 @@
$function = $route['function'];


if (!Request::ajax())

{

// Load the HTML header
if (!Request::ajax()) {

require 'views/partials/header.view.php';
// require 'views/partials/navbar.view.php';


// Inject code from contho $class->$function();
echo $class->$function();
// require 'views/partials/content.view.sample.php';


// Close it with the bottom end </body> and </html> tags

require 'views/partials/bottom.view.php';

}
else {

echo $class->$function();

}
6 changes: 2 additions & 4 deletions views/bedrijven.view.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
Bedrijven

<?php require 'partials/header.view.php'; ?>
<?php require 'partials/header.view.php'; ?>
<?php require 'partials/navbar.view.php'; ?>

<div class="header">
Expand All @@ -21,4 +19,4 @@



<?php require 'partials/footer.view.php';?>
<?php require 'partials/bottom.view.php';?>
4 changes: 2 additions & 2 deletions views/home.view.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@

</div>
<div id="page-inner">
<p>frontpage</p>
<p>frontpage2</p>
</div>
<!-- /. PAGE INNER -->



<?php require 'partials/footer.view.php'; ?>
<?php require 'partials/bottom.view.php'; ?>
2 changes: 1 addition & 1 deletion views/partials/bottom.view.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
<script src="assets/js/Lightweight-Chart/jquery.chart.js"></script>
<!-- Custom Js -->
<script src="../../assets/js/custom-scripts.js"></script>
<script src="../../assets/js/nav-active.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion views/partials/navbar.view.php
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@
<ul class="nav" id="main-menu">

<li>
<a class="active-menu" href="index.php"><i class="fa fa-dashboard"></i> Dashboard</a>
<a class="active" href="#"><i class="fa fa-dashboard"></i> Dashboard</a>
</li>
<li>
<a href="bedrijven"><i class="fa fa-desktop"></i>Bedrijven</a>
Expand Down

0 comments on commit cc64988

Please sign in to comment.