aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilly Micieli <micieli@laposte.net>2019-04-24 19:28:36 +0200
committerWilly Micieli <micieli@laposte.net>2019-04-24 19:28:36 +0200
commit605e54da5611ab850d4978451ec00e00356a71bc (patch)
tree84d8ec51e8d368f2eda88692f16293c22a732d41
parent230c03caaeb97f2af89475f5a7976267d3e3f221 (diff)
downloadimperium-605e54da5611ab850d4978451ec00e00356a71bc.zip
imperium-605e54da5611ab850d4978451ec00e00356a71bc.tar.gz
fix navbar bugs8.2.1
-rw-r--r--imperium/Command/App.php32
-rw-r--r--phinx.php4
2 files changed, 3 insertions, 33 deletions
diff --git a/imperium/Command/App.php b/imperium/Command/App.php
index 62f2393..6bc3d91 100644
--- a/imperium/Command/App.php
+++ b/imperium/Command/App.php
@@ -159,37 +159,7 @@ return [
</head>
<body>
- <nav class=\"navbar navbar-expand-md navbar-dark bg-primary mb-5\">
- <a class=\"navbar-brand\" href=\"{{ root() }}\">Shaolin</a>
- <button class=\"navbar-toggler\" type=\"button\" data-toggle=\"collapse\" data-target=\"#navbarCollapse\" aria-controls=\"navbarCollapse\" aria-expanded=\"false\" aria-label=\"Toggle navigation\">
- <span class=\"navbar-toggler-icon\"></span>
- </button>
- <div class=\"collapse navbar-collapse\" id=\"navbarCollapse\">
- <ul class=\"navbar-nav mr-auto\">
- {% if logged() %}
- <li class=\"nav-item dropdown\">
- <a class=\"nav-link dropdown-toggle\" href=\"#\" id=\"user\" role=\"button\" data-toggle=\"dropdown\" aria-haspopup=\"true\" aria-expanded=\"false\">
- {{ user()->username }}
- </a>
- <div class=\"dropdown-menu\" aria-labelledby=\"user\">
- {% if user()->id == \"1\" %}
- <a class=\"dropdown-item\" href=\"{{ route('admin') }}\">Admin</a>
- <a class=\"dropdown-item\" href=\"{{ route('home') }}\">Home</a>
- {% else %}
- <a class=\"dropdown-item\" href=\"{{ route('home') }}\">Home</a>
- {% endif %}
- <div class=\"dropdown-divider\"></div>
- <a class=\"dropdown-item\" href=\"{{ route('logout') }}\">Logout</a>
- </div>
- </li>
- {% else %}
- <li class=\"nav-item\">
- <a class=\"nav-link\" href=\"{{ route('login') }}\">Login</a>
- </li>
- {% endif %}
- </ul>
- </div>
- </nav>
+ {{navbar('shaolin','navbar navbar-expand-lg navbar-light bg-light shadow fixed-top','')}}
<main class=\"container mt-5\">
{{ display('success') }}
diff --git a/phinx.php b/phinx.php
index cac7977..ed153f1 100644
--- a/phinx.php
+++ b/phinx.php
@@ -4,8 +4,8 @@ $x = app()->connect();
return [
"paths" => [
- "migrations" => "db/migrations",
- "seeds" => "db/seeds"
+ "migrations" => "dbs/migrations",
+ "seeds" => "dbs/seeds"
],
"environments" =>
[