Changeset 0208bbd
- Timestamp:
- 10/24/21 13:12:30 (3 years ago)
- Branches:
- develop, master
- Children:
- 8c71900
- Parents:
- 5e56e8a
- Files:
-
- 1 added
- 3 deleted
- 17 edited
-
Procfile (deleted)
-
app/Exports/UsersExport.php (modified) (2 diffs)
-
app/Http/Controllers/Dashboard/IndexController.php (modified) (1 diff)
-
database/factories/FolderFactory.php (modified) (1 diff)
-
public/assets/css/app.min.css (modified) (1 diff)
-
public/assets/js/app.js (modified) (3 diffs)
-
public/uploads/users/1_avatar1635033319.jpg (added)
-
resources/assets/css/custom.css (modified) (1 diff)
-
resources/assets/js/app.js (deleted)
-
resources/assets/js/app.min.js (modified) (1 diff)
-
resources/assets/js/custom.js (modified) (1 diff)
-
resources/views/dashboard/departments/index.blade.php (modified) (1 diff)
-
resources/views/dashboard/files/index.blade.php (modified) (2 diffs)
-
resources/views/dashboard/folders/files.blade.php (modified) (2 diffs)
-
resources/views/dashboard/folders/index.blade.php (modified) (1 diff)
-
resources/views/dashboard/partials/avatar.blade.php (deleted)
-
resources/views/dashboard/settings/index.blade.php (modified) (1 diff)
-
resources/views/dashboard/users/index.blade.php (modified) (3 diffs)
-
resources/views/layouts/app.blade.php (modified) (3 diffs)
-
resources/views/layouts/pagination.blade.php (modified) (2 diffs)
-
webpack.mix.js (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
app/Exports/UsersExport.php
r5e56e8a r0208bbd 31 31 $row->where('id', $row->created_by)->pluck('username')->first(), 32 32 $row->created_at, 33 $row->updated_at 33 $row->updated_at, 34 $row->avatar, 34 35 ]; 35 36 return $fields; … … 49 50 'Created by', 50 51 'Created at', 51 'Updated at' 52 'Updated at', 53 'Avatar' 52 54 ]; 53 55 } -
app/Http/Controllers/Dashboard/IndexController.php
r5e56e8a r0208bbd 41 41 "excelExt" => array("xls", "xlsx", "xls", "csv"), 42 42 "textExt" => array("txt", "doc", "docx"), 43 "imageExt" => array("png", "jpg", "jpeg") ,43 "imageExt" => array("png", "jpg", "jpeg") 44 44 45 45 ]); -
database/factories/FolderFactory.php
r5e56e8a r0208bbd 27 27 { 28 28 29 $deptId = $this->faker->numberBetween('1', '15');29 $deptId = 1; 30 30 31 31 $deptCode = Department::find($deptId)->code; -
public/assets/css/app.min.css
r5e56e8a r0208bbd 24647 24647 } 24648 24648 24649 @media screen and (max-width: 520px) { 24650 li.page-item-test { 24651 display: none; 24652 } 24653 } 24654 24649 24655 .layout-builder.show { 24650 24656 right: 0; -
public/assets/js/app.js
r5e56e8a r0208bbd 1 'use strict';2 3 (function ($) {4 5 var wind_ = $(window),6 body_ = $('body');7 8 feather.replace({9 'stroke-width': 1.510 });11 12 $(document).on('click', '[data-toggle="fullscreen"]', function () {13 $(this).toggleClass('active-fullscreen');14 if (document.fullscreenEnabled) {15 if ($(this).hasClass("active-fullscreen")) {16 document.documentElement.requestFullscreen();17 } else {18 document.exitFullscreen();19 }20 } else {21 alert("Your browser does not support fullscreen.");22 }23 return false;24 });25 26 $(document).on('click', '.overlay', function () {27 $.removeOverlay();28 if (body_.hasClass('horizontal-navigation')) {29 $('.horizontal-navigation').removeClass('open');30 } else {31 $('.navigation').removeClass('open');32 }33 body_.removeClass('navigation-show');34 });35 36 $(document).on('click', '[data-sidebar-target]', function () {37 var target = $(this).data('sidebar-target');38 $('body').addClass('no-scroll');39 $('.sidebar-group').addClass('show');40 $('.sidebar-group .sidebar').removeClass('show');41 $('.sidebar-group .sidebar' + target).addClass('show');42 return false;43 });44 45 $(document).on('click', '.sidebar-group', function (e) {46 if ($(e.target).is($('.sidebar-group'))) {47 $('.sidebar-group').removeClass('show');48 $('body').removeClass('no-scroll');49 $('.sidebar-group .sidebar').removeClass('show');50 }51 });52 53 // Active pages, automatically show on the menu54 $('.navigation .navigation-menu-body .navigation-menu-group ul li a.active').closest('ul').parent('li').addClass('open').closest('ul').parent('li').addClass('open');55 $('.navigation .navigation-menu-body .navigation-menu-group ul li a.active').closest('div').addClass('open');56 $('.navigation .navigation-menu-tab [data-nav-target="#' + $('.navigation .navigation-menu-body .navigation-menu-group ul li a.active').closest('div').attr('id') + '"]').addClass('active');57 $('body.horizontal-navigation .horizontal-navigation ul li a.active').closest('ul').parent('li').addClass('open').closest('ul').parent('li').addClass('open');58 59 60 /*------------- create/remove overlay -------------*/61 $.createOverlay = function () {62 if ($('.overlay').length < 1) {63 body_.addClass('no-scroll').append('<div class="overlay"></div>');64 $('.overlay').addClass('show');65 }66 };67 68 $.removeOverlay = function () {69 body_.removeClass('no-scroll');70 $('.overlay').remove();71 };72 /*------------- create/remove overlay -------------*/73 74 $('[data-backround-image]').each(function (e) {75 $(this).css("background", 'url(' + $(this).data('backround-image') + ')');76 });77 78 /*------------- page loader -------------*/79 wind_.on('load', function () {80 $('.preloader').fadeOut(400, function () {81 setTimeout(function () {82 toastr.options = {83 timeOut: 2000,84 progressBar: true,85 showMethod: "slideDown",86 hideMethod: "slideUp",87 showDuration: 200,88 hideDuration: 200,89 positionClass: "toast-top-center",90 };91 //toastr.success('Welcome');92 93 $('.theme-switcher').removeClass('open');94 }, 500);95 96 // $('.theme-switcher').css('opacity', 1);97 });98 });99 /*------------- page loader -------------*/100 101 /*------------- side menu (sub menü arrow) -------------*/102 wind_.on('load', function () {103 setTimeout(function () {104 $('.navigation .navigation-menu-body ul li a').each(function () {105 var $this = $(this);106 if ($this.next('ul').length) {107 $this.append('<i class="sub-menu-arrow ti-angle-up"></i>');108 }109 });110 $('.navigation .navigation-menu-body ul li.open>a>.sub-menu-arrow').removeClass('ti-plus').addClass('ti-minus').addClass('rotate-in');111 $('body.horizontal-navigation .horizontal-navigation ul li a').each(function () {112 var $this = $(this);113 if ($this.next('ul').length) {114 $this.append('<i class="sub-menu-arrow ti-angle-right"></i>');115 }116 });117 }, 200);118 });119 /*------------- side menu (sub menü arrow) -------------*/120 121 $(document).on('click', '[data-action="navigation-toggler"]', function () {122 if (body_.hasClass('horizontal-navigation')) {123 $('.horizontal-navigation').toggleClass('open');124 } else {125 $('.navigation').toggleClass('open');126 }127 $.createOverlay();128 });129 130 $(document).on('click', '[data-nav-target]', function () {131 var $this = $(this),132 target = $this.data('nav-target');133 if (body_.hasClass('navigation-toggle-one')) {134 body_.addClass('navigation-show');135 }136 if (body_.hasClass('horizontal-navigation')) {137 $('.navigation .navigation-menu-body').show();138 }139 $('.navigation .navigation-menu-body .navigation-menu-group > div').removeClass('open');140 $('.navigation .navigation-menu-body .navigation-menu-group ' + target).addClass('open');141 $('[data-nav-target]').removeClass('active');142 $this.addClass('active');143 $this.tooltip('hide');144 return false;145 });146 147 var c = $('.header .header-left .header-logo').clone();148 $('.navigation .navigation-header').append(c.addClass('navigation-logo').removeClass('header-logo'));149 150 $(document).on('click', '.navigation-toggler a', function () {151 if (wind_.width() < 1200) {152 $.createOverlay();153 body_.addClass('navigation-show');154 } else {155 if (!body_.hasClass('navigation-toggle-one') && !body_.hasClass('navigation-toggle-two')) {156 body_.addClass('navigation-toggle-one');157 } else if (body_.hasClass('navigation-toggle-one') && !body_.hasClass('navigation-toggle-two')) {158 body_.addClass('navigation-toggle-two');159 body_.removeClass('navigation-toggle-one');160 } else if (!body_.hasClass('navigation-toggle-one') && body_.hasClass('navigation-toggle-two')) {161 body_.removeClass('navigation-toggle-two');162 body_.removeClass('navigation-toggle-one');163 }164 }165 return false;166 });167 168 $(document).on('click', '.header-toggler a', function () {169 $('.header ul.navbar-nav').toggleClass('open');170 return false;171 });172 173 $(document).on('click', '*', function (e) {174 if (!$(e.target).is($('.navigation, .navigation *, .navigation-toggler *')) && body_.hasClass('navigation-toggle-one')) {175 body_.removeClass('navigation-show');176 }177 });178 179 $(document).on('click', '*', function (e) {180 if (!$(e.target).is('.header ul.navbar-nav, .header ul.navbar-nav *, .header-toggler, .header-toggler *')) {181 $('.header ul.navbar-nav').removeClass('open');182 }183 });184 185 /*------------- form validation -------------*/186 window.addEventListener('load', function () {187 // Fetch all the forms we want to apply custom Bootstrap validation styles to188 var forms = document.getElementsByClassName('needs-validation');189 // Loop over them and prevent submission190 Array.prototype.filter.call(forms, function (form) {191 form.addEventListener('submit', function (event) {192 if (form.checkValidity() === false) {193 event.preventDefault();194 event.stopPropagation();195 }196 form.classList.add('was-validated');197 }, false);198 });199 }, false);200 /*------------- form validation -------------*/201 202 /*------------- responsive html table -------------*/203 var table_responsive_stack = $(".table-responsive-stack");204 table_responsive_stack205 .find("th")206 .each(function (i) {207 $(".table-responsive-stack td:nth-child(" + (i + 1) + ")").prepend(208 '<span class="table-responsive-stack-thead">' +209 $(this).text() +210 ":</span> "211 );212 $(".table-responsive-stack-thead").hide();213 });214 215 table_responsive_stack.each(function () {216 var thCount = $(this).find("th").length,217 rowGrow = 100 / thCount + "%";218 $(this).find("th, td").css("flex-basis", rowGrow);219 });220 221 function flexTable() {222 if (wind_.width() < 768) {223 $(".table-responsive-stack").each(function (i) {224 $(this)225 .find(".table-responsive-stack-thead")226 .show();227 $(this)228 .find("thead")229 .hide();230 });231 232 // window is less than 768px233 } else {234 $(".table-responsive-stack").each(function (i) {235 $(this)236 .find(".table-responsive-stack-thead")237 .hide();238 $(this)239 .find("thead")240 .show();241 });242 }243 }244 245 flexTable();246 247 window.onresize = function (event) {248 flexTable();249 };250 /*------------- responsive html table -------------*/251 252 /*------------- header search -------------*/253 $(document).on('click', '[data-toggle="search"], [data-toggle="search"] *', function () {254 $('.header .header-body .header-search').show().find('.form-control').focus();255 return false;256 });257 258 $(document).on('click', '.close-header-search, .close-header-search svg', function () {259 $('.header .header-body .header-search').hide();260 return false;261 });262 263 $(document).on('click', '*', function (e) {264 if (!$(e.target).is($('.header, .header *, [data-toggle="search"], [data-toggle="search"] *'))) {265 $('.header .header-body .header-search').hide();266 }267 });268 /*------------- header search -------------*/269 270 /*------------- custom accordion -------------*/271 $(document).on('click', '.accordion.custom-accordion .accordion-row a.accordion-header', function () {272 var $this = $(this);273 $this.closest('.accordion.custom-accordion').find('.accordion-row').not($this.parent()).removeClass('open');274 $this.parent('.accordion-row').toggleClass('open');275 return false;276 });277 /*------------- custom accordion -------------*/278 279 /*------------- responsive table dropdown -------------*/280 var dropdownMenu,281 table_responsive = $('.table-responsive');282 283 table_responsive.on('show.bs.dropdown', function (e) {284 dropdownMenu = $(e.target).find('.dropdown-menu');285 body_.append(dropdownMenu.detach());286 var eOffset = $(e.target).offset();287 dropdownMenu.css({288 'display': 'block',289 'top': eOffset.top + $(e.target).outerHeight(),290 'left': eOffset.left,291 'width': '184px',292 'font-size': '14px'293 });294 dropdownMenu.addClass("mobPosDropdown");295 });296 297 table_responsive.on('hide.bs.dropdown', function (e) {298 $(e.target).append(dropdownMenu.detach());299 dropdownMenu.hide();300 });301 /*------------- responsive table dropdown -------------*/302 303 /*------------- chat -------------*/304 $(document).on('click', '.chat-block .chat-sidebar .chat-sidebar-content .list-group .list-group-item', function () {305 $('.chat-block .chat-content').addClass('chat-mobile-open');306 return false;307 });308 309 $(document).on('click', '.chat-block .chat-content .mobile-chat-close-btn a', function () {310 $('.chat-block .chat-content').removeClass('chat-mobile-open');311 return false;312 });313 /*------------- chat -------------*/314 315 /*------------- aside menu toggle -------------*/316 $(document).on('click', '.navigation ul li a', function () {317 var $this = $(this);318 if ($this.next('ul').length) {319 var sub_menu_arrow = $this.find('.sub-menu-arrow');320 sub_menu_arrow.toggleClass('rotate-in');321 $this.next('ul').toggle(200);322 $this.parent('li').siblings().find('ul').not($this.parent('li').find('ul')).slideUp(200);323 $this.next('ul').find('li ul').slideUp(200);324 $this.next('ul').find('li>a').find('.sub-menu-arrow').removeClass('ti-minus').addClass('ti-plus');325 $this.next('ul').find('li>a').find('.sub-menu-arrow').removeClass('rotate-in');326 $this.parent('li').siblings().not($this.parent('li').find('ul')).find('>a').find('.sub-menu-arrow').removeClass('ti-minus').addClass('ti-plus');327 $this.parent('li').siblings().not($this.parent('li').find('ul')).find('>a').find('.sub-menu-arrow').removeClass('rotate-in');328 if (sub_menu_arrow.hasClass('rotate-in')) {329 setTimeout(function () {330 sub_menu_arrow.removeClass('ti-plus').addClass('ti-minus');331 }, 200);332 } else {333 sub_menu_arrow.removeClass('ti-minus').addClass('ti-plus');334 }335 if (!body_.hasClass('horizontal-side-menu') && wind_.width() >= 1200) {336 setTimeout(function (e) {337 $('.navigation .navigation-menu-body').getNiceScroll().resize();338 }, 300);339 }340 return false;341 }342 });343 344 $(document).on('click', '.horizontal-navigation ul li a', function () {345 var $this = $(this);346 if ($this.next('ul').length) {347 $this.next('ul').toggle(200);348 $this.parent('li').siblings().find('ul').not($this.parent('li').find('ul')).slideUp(200);349 $this.next('ul').find('li ul').slideUp(200);350 return false;351 }352 });353 354 /*------------- aside menu toggle -------------*/355 356 /*------------- other -------------*/357 $(document).on('click', '.dropdown-menu', function (e) {358 e.stopPropagation();359 });360 361 $('#exampleModal').on('show.bs.modal', function (event) {362 var button = $(event.relatedTarget),363 recipient = button.data('whatever'),364 modal = $(this);365 366 modal.find('.modal-title').text('New message to ' + recipient);367 modal.find('.modal-body input').val(recipient);368 });369 370 $('[data-toggle="tooltip"]').tooltip({371 container: 'body'372 });373 374 $('[data-toggle="popover"]').popover();375 376 $('.carousel').carousel();377 378 if (wind_.width() >= 992) {379 $('.card-scroll').niceScroll();380 $('.table-responsive').niceScroll();381 $('.sidebar-group .sidebar').niceScroll();382 383 $('.app-block .app-content .app-lists').niceScroll();384 $('.app-block .app-sidebar .app-sidebar-menu').niceScroll();385 $('.chat-block .chat-sidebar .chat-sidebar-content').niceScroll();386 var chat_messages = $('.chat-block .chat-content .messages');387 if (chat_messages.length) {388 chat_messages.niceScroll({389 horizrailenabled: false390 });391 chat_messages.getNiceScroll(0).doScrollTop(chat_messages.get(0).scrollHeight, -1);392 }393 }394 395 if (!body_.hasClass('small-navigation') && !body_.hasClass('horizontal-navigation') && wind_.width() >= 992) {396 $('.navigation .navigation-menu-body').niceScroll();397 }398 399 $('.dropdown-menu ul.list-group').niceScroll();400 })(jQuery);401 402 1 /******/ (function(modules) { // webpackBootstrap 403 2 /******/ // The module cache … … 898 497 /***/ (function(module, exports, __webpack_require__) { 899 498 900 __webpack_require__( "./resources/js/app.js");901 module.exports = __webpack_require__( "./public/assets/sass/app.scss");499 __webpack_require__(/*! C:\wamp64\www\themeforest\nago\resources\js\app.js */"./resources/js/app.js"); 500 module.exports = __webpack_require__(/*! C:\wamp64\www\themeforest\nago\public\assets\sass\app.scss */"./public/assets/sass/app.scss"); 902 501 903 502 … … 1054 653 }); 1055 654 655 1056 656 })(jQuery); 1057 657 -
resources/assets/css/custom.css
r5e56e8a r0208bbd 10 10 overflow: auto; 11 11 transition: right .2s; 12 } 13 14 @media screen and (max-width: 520px) { 15 li.page-item-test { 16 display: none; 17 } 12 18 } 13 19 -
resources/assets/js/app.min.js
r5e56e8a r0208bbd 497 497 /***/ (function(module, exports, __webpack_require__) { 498 498 499 __webpack_require__( "./resources/js/app.js");500 module.exports = __webpack_require__( "./public/assets/sass/app.scss");499 __webpack_require__(/*! C:\wamp64\www\themeforest\nago\resources\js\app.js */"./resources/js/app.js"); 500 module.exports = __webpack_require__(/*! C:\wamp64\www\themeforest\nago\public\assets\sass\app.scss */"./public/assets/sass/app.scss"); 501 501 502 502 -
resources/assets/js/custom.js
r5e56e8a r0208bbd 147 147 }); 148 148 149 149 150 })(jQuery); -
resources/views/dashboard/departments/index.blade.php
r5e56e8a r0208bbd 21 21 <div class="dropdown"> 22 22 <a href="javascript:void(0)" data-toggle="modal" data-target="#createModal" class="btn btn-primary text-white"> 23 Add department23 <i class="fa fa-plus pr-1"></i> New 24 24 </a> 25 25 <a href="{{ route("dashboard.departments.downloadAll") }}" class="btn btn-danger text-white"> 26 <i class="fa fa-download pr-1"></i> Download files26 <i class="fa fa-download pr-1"></i> Download 27 27 </a> 28 <a href="{{ route('dashboard.departments.export') }}" class="btn btn-success text-white">Export table</a> 28 <a href="{{ route('dashboard.departments.export') }}" class="btn btn-success text-white"> 29 <i class="fa fa-table pr-1"></i> Export</a> 29 30 </div> 30 31 </div> -
resources/views/dashboard/files/index.blade.php
r5e56e8a r0208bbd 21 21 <div class="dropdown"> 22 22 <a href="javascript:void(0)" data-toggle="modal" data-target="#createModal" class="btn btn-primary text-white"> 23 Add files23 <i class="fa fa-upload pr-1"></i> Upload 24 24 </a> 25 25 <a href="{{ route("dashboard.departments.downloadAll") }}" class="btn btn-danger text-white"> 26 <i class="fa fa-download pr-1"></i> Download all26 <i class="fa fa-download pr-1"></i> Download 27 27 </a> 28 <a href="{{ route('dashboard.files.export') }}" class="btn btn-success text-white">Export table</a> 28 <a href="{{ route('dashboard.files.export') }}" class="btn btn-success text-white"> 29 <i class="fa fa-table pr-1"></i> Export 30 </a> 29 31 </div> 30 32 </div> … … 182 184 <div class="modal-content"> 183 185 <div class="modal-header"> 184 <h5 class="modal-title" id="exampleModalCenterTitle"> Add files</h5>186 <h5 class="modal-title" id="exampleModalCenterTitle">Upload</h5> 185 187 <button type="button" class="close" data-dismiss="modal" aria-label="Close"> 186 188 <i class="ti-close"></i> -
resources/views/dashboard/folders/files.blade.php
r5e56e8a r0208bbd 10 10 <div class="card-body"> 11 11 <a class="btn btn-secondary btn-block text-white" href="javascript:void(0)" data-target="#editModal_{{$folder->id}}" data-toggle="modal"> 12 Add files12 Upload 13 13 </a> 14 14 </div> … … 41 41 <div class="dropdown-menu"> 42 42 <a class="dropdown-item" href="javascript:void(0)" data-toggle="modal" data-target="#editModal_{{$folder->id}}"> 43 Add files43 Upload 44 44 </a> 45 45 -
resources/views/dashboard/folders/index.blade.php
r5e56e8a r0208bbd 69 69 <div class="dropdown-menu"> 70 70 <a class="dropdown-item" href="javascript:void(0)" data-toggle="modal" data-target="#createModal">Add folder</a> 71 <a href="{{ route('dashboard.folders.export') }}" class="dropdown-item text-success">Export table</a>71 <a href="{{ route('dashboard.folders.export') }}" class="dropdown-item text-success">Export</a> 72 72 </div> 73 73 </li> -
resources/views/dashboard/settings/index.blade.php
r5e56e8a r0208bbd 69 69 <div class="form-group"> 70 70 <label>Current</label> 71 @include('dashboard.partials.avatar') 71 <figure class="avatar avatar-sm mr-2"> 72 @if(auth()->user()->avatar==NULL) 73 <img src="{{ url('assets/media/images/user.png') }}" class="rounded-circle" alt="avatar"> 74 @else 75 <img src="{{url('uploads/users/' . auth()->user()->avatar)}}" class="rounded-circle" alt="avatar"> 76 @endif 77 </figure> 78 72 79 </div> 73 80 </div> -
resources/views/dashboard/users/index.blade.php
r5e56e8a r0208bbd 22 22 <div class="dropdown"> 23 23 <a href="javascript:void(0)" data-toggle="modal" data-target="#createModal" class="btn btn-primary text-white"> 24 Add user24 <i class="fa fa-plus pr-1"></i> New 25 25 </a> 26 <a href="{{ route('dashboard.users.export') }}" class="btn btn-success text-white">Export table</a> 26 <a href="{{ route('dashboard.users.export') }}" class="btn btn-success text-white"> 27 <i class="fa fa-table pr-1"></i> Export 28 </a> 27 29 </div> 28 30 </div> … … 63 65 </td> 64 66 <td> 65 @include('dashboard.partials.avatar') 67 <figure class="avatar avatar-sm mr-2"> 68 @if($user->avatar==NULL) 69 <img src="{{ url('assets/media/images/user.png') }}" class="rounded-circle" alt="avatar"> 70 @else 71 <img src="{{url('uploads/users/' . $user->avatar)}}" class="rounded-circle" alt="avatar"> 72 @endif 73 </figure> 66 74 {{$user->username}} 67 75 </td> … … 169 177 <div class="form-group"> 170 178 <label>Current</label> 171 @include('dashboard.partials.avatar') 179 <figure class="avatar avatar-sm mr-2"> 180 @if($user->avatar==NULL) 181 <img src="{{ url('assets/media/images/user.png') }}" class="rounded-circle" alt="avatar"> 182 @else 183 <img src="{{url('uploads/users/' . $user->avatar)}}" class="rounded-circle" alt="avatar"> 184 @endif 185 </figure> 172 186 </div> 173 187 </div> -
resources/views/layouts/app.blade.php
r5e56e8a r0208bbd 54 54 <div class="mb-4"> 55 55 <h6 class="d-flex justify-content-between"> 56 Added d ocuments57 <span class="float-right"> 68</span>56 Added departments 57 <span class="float-right">{{ \App\Models\Department::where('user_id', auth()->user()->id)->count() }}</span> 58 58 </h6> 59 <div class="progress" style="height:5px;">60 <div class="progress-bar bg-secondary" role="progressbar" style="width: 68%;"61 aria-valuenow="68"62 aria-valuemin="0" aria-valuemax="100"></div>63 </div>64 59 </div> 65 60 <div class="mb-4"> 66 61 <h6 class="d-flex justify-content-between"> 67 Used space68 <span >%25</span>62 Added folders 63 <span class="float-right">{{ \App\Models\Folder::where('user_id', auth()->user()->id)->count() }}</span> 69 64 </h6> 70 <div class="progress" style="height: 5px;">71 <div class="progress-bar bg-info" role="progressbar" style="width: 40%;" aria-valuenow="40"72 aria-valuemin="0" aria-valuemax="100"></div>73 </div>74 65 </div> 75 66 <div class="mb-4"> … … 129 120 <a href="#" class="nav-link" title="User menu" data-sidebar-target="#user-menu"> 130 121 <span class="mr-2 d-sm-inline d-none">{{auth()->user()->getFullName()}}</span> 131 @include('dashboard.partials.avatar') 122 <figure class="avatar avatar-sm mr-2"> 123 @if(auth()->user()->avatar==NULL) 124 <img src="{{ url('assets/media/images/user.png') }}" class="rounded-circle" alt="avatar"> 125 @else 126 <img src="{{url('uploads/users/' . auth()->user()->avatar)}}" class="rounded-circle" alt="avatar"> 127 @endif 128 </figure> 132 129 </a> 133 130 </li> … … 197 194 </ul> 198 195 </div> 196 199 197 </div> 200 198 <!-- end::navigation --> -
resources/views/layouts/pagination.blade.php
r5e56e8a r0208bbd 18 18 19 19 @if (is_string($element)) 20 <li class="page-item disabled"><span>{{ $element }}</span></li>20 <li class="page-item-test disabled"><span>{{ $element }}</span></li> 21 21 @endif 22 22 … … 26 26 <li class="page-item active"><a class="page-link" href="#">{{ $page }} <span class="sr-only"></span></a></li> 27 27 @else 28 <li class="page-item "><a class="page-link" href="{{ $url }}">{{ $page }}</a></li>28 <li class="page-item-test"><a class="page-link" href="{{ $url }}">{{ $page }}</a></li> 29 29 @endif 30 30 @endforeach -
webpack.mix.js
r5e56e8a r0208bbd 13 13 14 14 mix.scripts([ 15 'resources/assets/js/app.js',16 15 'resources/assets/js/app.min.js', 17 16 'resources/assets/js/custom.js',
Note:
See TracChangeset
for help on using the changeset viewer.
