Skip to content

Commit

Permalink
Move Menu Admin Knowledge to Inside Login
Browse files Browse the repository at this point in the history
  • Loading branch information
dausdauy committed Sep 14, 2020
1 parent a19ace8 commit 8edbe92
Show file tree
Hide file tree
Showing 9 changed files with 28 additions and 64 deletions.
11 changes: 0 additions & 11 deletions public/css/welcome.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,6 @@
position: relative;
}

.top-right {
position: absolute;
right: 10px;
top: 18px;
}

.content {
text-align: center;
}
Expand Down Expand Up @@ -50,8 +44,3 @@
font-size: xx-large;
font-style: italic;
}

.version {
font-size: 0.4em;
position: absolute;
}
14 changes: 0 additions & 14 deletions public/js/app.js

Large diffs are not rendered by default.

Binary file added public/uploads/14092020 112022 AM_313627976.pdf
Binary file not shown.
17 changes: 14 additions & 3 deletions resources/views/layouts/app.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,27 @@
</li>
@endif -->
@else
<li class="nav-item dropdown">
<a id="navbarDropdown2" class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
{{ __('Portal') }} <span class="caret"></span>
</a>

<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown2">
<a class="dropdown-item" href="{{ route('knowledges.dashboard') }}" target="_blank">
{{ __('Dashboard') }}
</a>
<a class="dropdown-item" href="{{ route('knowledges.index') }}" target="_blank">
{{ __('Admin') }}
</a>
</div>
</li>
<li class="nav-item dropdown">
<!-- <a class="nav-link" href="{{ url('/') }}">{{ __('Portal') }}</a> -->
<a id="navbarDropdown" class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
{{ Auth::user()->name }} <span class="caret"></span>
</a>

<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
<a class="dropdown-item" href="{{ url('/') }}" target="_blank">
{{ __('Portal') }}
</a>
<a class="dropdown-item" href="{{ route('logout') }}" onclick="event.preventDefault();document.getElementById('logout-form').submit();">
{{ __('Logout') }}
</a>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/layouts/knowledge/footer.blade.php
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<div class="subtitle m-t-hg">
<div class="m-t-hg">
Powered by IT Longhi Group &copy 2020
</div>
12 changes: 6 additions & 6 deletions resources/views/layouts/knowledge/modal.blade.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!-- Modal -->
<!-- Modal Material-->
<div class="modal fade" id="ModalAdd" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-dialog modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLabel">Form Input</h5>
Expand All @@ -21,9 +21,9 @@
<label for="formGroupExampleInput2">Category</label>
<select class="form-control" required name="category">
<option Selected disabled>Choose</option>
@foreach($categories as $category)
<option value="{{$category->id}}">{{$category->name_categories}}</option>
@endforeach
@foreach($categories as $category)
<option value="{{$category->id}}">{{$category->name_categories}}</option>
@endforeach
</select>
</div>
<div class="form-group">
Expand All @@ -45,7 +45,7 @@

<!-- Modal Category-->
<div class="modal fade" id="ModalAdd1" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-dialog modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLabel">Add Category</h5>
Expand Down
10 changes: 4 additions & 6 deletions resources/views/layouts/main.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,14 @@
margin: 0;
}
.m-t-hg {
bottom: 0px;
position: fixed;
text-align: center;
left: 0;
color: #fff;
padding : 15px;
width: 100%;
background-color: #243a5c;
z-index: 1001;
z-index:1000;
position: fixed;
bottom: 0;
}
</style>
@stack('style')
Expand All @@ -43,9 +42,8 @@
</head>
<body>
@include('layouts.knowledge.nav')

<main class="py-4">
<div class="container" style="max-width: 925px;margin-bottom: 40px;">
<div class="container" style="max-width: 925px;margin-bottom: 3rem;">
@yield('content')
</div>
</main>
Expand Down
3 changes: 0 additions & 3 deletions resources/views/welcome.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@
<a href="#" class="btn btn-primary btn-lg">About Us</a>
</div>

<div class="subtitle m-t-hg">
Powered by IT Longhi Group &copy 2020
</div>
</div>
</div>

Expand Down
23 changes: 3 additions & 20 deletions routes/web.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,34 +15,17 @@
return view('welcome');
});

Auth::routes();

// Custom URL resource
Route::get('/knowledges/admin', ['as' => 'knowledges.index', 'uses' => 'KnowledgeController@index']);
Route::get('/knowledges/admin_category', ['as' => 'categories.index', 'uses' => 'CategoryController@index']);
Route::get('/knowledges/dashboard', ['as' => 'knowledges.dashboard', 'uses' => 'KnowledgeController@dashboard']);

// Route Resource
Route::resource('knowledges', 'KnowledgeController');
Route::resource('categories', 'CategoryController');

// Route::get('/knowledges/dashboard', function () {
// return View::make('layouts.knowledge.body');
// });

// Route Category




// Route::get('/', function () {
// if(Auth::guest()){
// return view('welcome');
// }else{
// return redirect('/home');
// }
// });


Auth::routes();
Route::resource('categories', 'CategoryController');

Route::get('/home', function(){
return redirect(action('\Kordy\Ticketit\Controllers\TicketsController@index'));
Expand Down

0 comments on commit 8edbe92

Please sign in to comment.