Merge gitlab.com:TheGamecraft/c-cms

Conflicts:
	.gitignore
	app/Http/Controllers/AdminController.php
	app/Providers/AppServiceProvider.php
	app/User.php
	artisan
	bootstrap/cache/.gitignore
	composer.lock
	config/app.php
	database/migrations/2014_10_12_000000_create_users_table.php
	readme.md
	resources/views/admin/dashboard.blade.php
	resources/views/auth/login.blade.php
	resources/views/layouts/admin/header.blade.php
	routes/web.php
	storage/app/.gitignore
	storage/app/public/.gitignore
	storage/framework/.gitignore
	storage/framework/cache/.gitignore
	storage/framework/sessions/.gitignore
	storage/framework/testing/.gitignore
	storage/framework/views/.gitignore
	storage/logs/.gitignore
This commit is contained in:
TheGamecraft
2018-07-13 13:36:39 -04:00
7805 changed files with 861844 additions and 52 deletions

View File

@@ -66,4 +66,4 @@ foreach (Auth::user()->unreadNotifications as $notification) {
</div>
</div>
</header><!-- /header -->
</header><!-- /header -->

View File

@@ -0,0 +1,83 @@
<nav class="navbar navbar-expand-sm navbar-default">
<div class="navbar-header">
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#main-menu" aria-controls="main-menu" aria-expanded="false" aria-label="Toggle navigation">
<i class="fa fa-bars"></i>
</button>
<a class="navbar-brand" href="./"><img src="images/logo.png" alt="Logo"></a>
<a class="navbar-brand hidden" href="./"><img src="images/logo2.png" alt="Logo"></a>
</div>
<div id="main-menu" class="main-menu collapse navbar-collapse">
<ul class="nav navbar-nav">
<li class="active">
<a href="/admin"> <i class="menu-icon fa fa-dashboard"></i>Dashboard </a>
</li>
<h3 class="menu-title">Espace cadet cadre</h3><!-- /.menu-title -->
<li class="menu-item-has-children dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="menu-icon fa fa-envelope"></i>Message</a>
<ul class="sub-menu children dropdown-menu">
<li><i class="fa fa-plus"></i><a href="/admin">Buttons</a></li>
<li><i class="fa fa-id-badge"></i><a href="/admin">Badges</a></li>
<li><i class="fa fa-bars"></i><a href="/admin">Tabs</a></li>
</ul>
</li>
<li class="menu-item-has-children dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="menu-icon ti-blackboard"></i>Plan de cours</a>
<ul class="sub-menu children dropdown-menu">
<li><i class="fa fa-table"></i><a href="/admin">Basic Table</a></li>
<li><i class="fa fa-table"></i><a href="/admin">Data Table</a></li>
</ul>
</li>
<h3 class="menu-title">Administration</h3><!-- /.menu-title -->
<li class="menu-item-has-children dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="menu-icon fa fa-picture-o"></i>Page publique</a>
<ul class="sub-menu children dropdown-menu">
<li><i class="menu-icon fa fa-fort-awesome"></i><a href="/admin">Font Awesome</a></li>
<li><i class="menu-icon ti-themify-logo"></i><a href="/admin">Themefy Icons</a></li>
</ul>
</li>
<li class="menu-item-has-children dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="menu-icon fa fa-calendar"></i>Horaire</a>
<ul class="sub-menu children dropdown-menu">
<li><i class="menu-icon fa fa-line-chart"></i><a href="/admin">Chart JS</a></li>
<li><i class="menu-icon fa fa-area-chart"></i><a href="/admin">Flot Chart</a></li>
<li><i class="menu-icon fa fa-pie-chart"></i><a href="/admin">Peity Chart</a></li>
</ul>
</li>
<li class="menu-item-has-children dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="menu-icon ti-panel"></i>Services</a>
<ul class="sub-menu children dropdown-menu">
<li><i class="menu-icon fa fa-map-o"></i><a href="maps-gmap.html">Google Maps</a></li>
<li><i class="menu-icon fa fa-street-view"></i><a href="maps-vector.html">Vector Maps</a></li>
</ul>
</li>
<li class="menu-item-has-children dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="menu-icon fa fa-area-chart"></i>Statistiques</a>
<ul class="sub-menu children dropdown-menu">
<li><i class="menu-icon fa fa-map-o"></i><a href="maps-gmap.html">Google Maps</a></li>
<li><i class="menu-icon fa fa-street-view"></i><a href="maps-vector.html">Vector Maps</a></li>
</ul>
</li>
<li class="menu-item-has-children dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="menu-icon fa fa-users"></i>Utilisateurs</a>
<ul class="sub-menu children dropdown-menu">
<li><i class="menu-icon fa fa-map-o"></i><a href="maps-gmap.html">Google Maps</a></li>
<li><i class="menu-icon fa fa-street-view"></i><a href="maps-vector.html">Vector Maps</a></li>
</ul>
</li>
<h3 class="menu-title">Outils</h3><!-- /.menu-title -->
<li>
<a href="widgets.html"> <i class="menu-icon fa fa-bug"></i>Signaler un bug </a>
</li>
<li>
<a href="widgets.html"> <i class="menu-icon fa fa-bullhorn "></i>Mise à jour </a>
</li>
</ul>
</div>
</nav>