Skip to content

Commit

Permalink
#27
Browse files Browse the repository at this point in the history
  • Loading branch information
@itsbenny99
itsbenny99 committed Aug 18, 2020
1 parent 5f4e981 commit 57b8f71
Show file tree
Hide file tree
Showing 2 changed files with 113 additions and 106 deletions.
5 changes: 3 additions & 2 deletions app/Http/Controllers/FrontController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -554,8 +554,9 @@ public function showProfile($id = null)
$feedback = Feedback::where('controller_id', '=', $id)->where('status', 1)->orderBy('created_at', 'DESC')->get();
$log = ControllerLog::where('cid', '=', $id)->orderBy('id', 'DESC')->get();
$stats = ControllerLog::getControllerStats($id);

return view('site.profile')->with('user', $user)->with('feedback', $feedback)
$dashstats = ControllerLog::aggregateAllControllersByPosAndMonth($year, $month);
$personal_stats = $dashstats[$user_id];
return view('site.profile')->with('user', $user)->with('feedback', $feedback)->with('dashstats', $dashstats)->with('personal_stats', $personal_stats)
->with('log', $log)->with('stats', $stats)->with('url_exist', $url_exist)->with('tickets', $tickets)->with('last_training', $last_training)->with('last_training_given', $last_training_given);
}

Expand Down
214 changes: 110 additions & 104 deletions resources/views/site/profile.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,119 +8,119 @@

<!-- Page Content -->
<div class="content">
<div class="row gutters-tiny invisible" data-toggle="appear">
<!-- Row #1 -->
<div class="col-6 col-md-4 col-xl-2">
<a class="block text-center" href="/training/notes">
<div class="block-content ribbon ribbon-bookmark ribbon-crystal ribbon-left bg-gd-dusk">

<p class="mt-5">
<i class="si si-book-open fa-3x text-white-op"></i>
</p>
<p class="font-w600 text-white">My Training</p>
</div>
</a>
</div>
<div class="col-6 col-md-4 col-xl-2">
<a class="block text-center" href="/events">
<div class="block-content bg-gd-primary">
<p class="mt-5">
<i class="si si-plus fa-3x text-white-op"></i>
</p>
<p class="font-w600 text-white">Events</p>
</div>
</a>
</div>
<div class="col-6 col-md-4 col-xl-2">
<a class="block text-center" href="/controller/feedback">
<div class="block-content ribbon ribbon-bookmark ribbon-crystal ribbon-left bg-gd-sea">

<p class="mt-5">
<i class="si si-bubbles fa-3x text-white-op"></i>
</p>
<p class="font-w600 text-white">Submit Feedback</p>
</div>
</a>
</div>
<div class="col-6 col-md-4 col-xl-2">
<a class="block text-center" href="www.vatusa.net">
<div class="block-content bg-gd-lake">
<p class="mt-5">
<i class="si si-magnifier fa-3x text-white-op"></i>
</p>
<p class="font-w600 text-white">VATUSA Main site</p>
</div>
</a>
</div>
<div class="col-6 col-md-4 col-xl-2">
<a class="block text-center" href="/stats">
<div class="block-content bg-gd-emerald">
<p class="mt-5">
<i class="si si-bar-chart fa-3x text-white-op"></i>
</p>
<p class="font-w600 text-white">Statistics</p>
</div>
</a>
</div>
<div class="col-6 col-md-4 col-xl-2">
<a class="block text-center" href="javascript:void(0)">
<div class="block-content bg-gd-corporate">
<p class="mt-5">
<i class="si si-settings fa-3x text-white-op"></i>
</p>
<p class="font-w600 text-white">Settings</p>
</div>
</a>
</div>
<!-- END Row #1 -->
<div class="row gutters-tiny invisible" data-toggle"appear">
<!-- Row #1 -->
<div class="col-6 col-md-4 col-xl-2">
<a class="block text-center" href="/training/notes">
<div class="block-content ribbon ribbon-bookmark ribbon-crystal ribbon-left bg-gd-dusk">

<p class="mt-5">
<i class="si si-book-open fa-3x text-white-op"></i>
</p>
<p class="font-w600 text-white">My Training</p>
</div>
</a>
</div>
<div class="row row-deck gutters-tiny invisible" data-toggle="appear">
<!-- Row #2 -->
<div class="col-xl-4">
<a class="block block-transparent bg-image d-flex align-items-stretch" href="javascript:void(0)" style="background-image: url('assets/media/photos/[email protected]');">
<div class="block-content block-sticky-options pt-100 bg-black-op">
<div class="block-options block-options-left text-white">
<div class="block-options-item">
<i class="si si-book-open text-white-op"></i>
</div>
<div class="col-6 col-md-4 col-xl-2">
<a class="block text-center" href="/events">
<div class="block-content bg-gd-primary">
<p class="mt-5">
<i class="si si-plus fa-3x text-white-op"></i>
</p>
<p class="font-w600 text-white">Events</p>
</div>
</a>
</div>
<div class="col-6 col-md-4 col-xl-2">
<a class="block text-center" href="/controller/feedback">
<div class="block-content ribbon ribbon-bookmark ribbon-crystal ribbon-left bg-gd-sea">

<p class="mt-5">
<i class="si si-bubbles fa-3x text-white-op"></i>
</p>
<p class="font-w600 text-white">Submit Feedback</p>
</div>
</a>
</div>
<div class="col-6 col-md-4 col-xl-2">
<a class="block text-center" href="www.vatusa.net">
<div class="block-content bg-gd-lake">
<p class="mt-5">
<i class="si si-magnifier fa-3x text-white-op"></i>
</p>
<p class="font-w600 text-white">VATUSA Main site</p>
</div>
</a>
</div>
<div class="col-6 col-md-4 col-xl-2">
<a class="block text-center" href="/stats">
<div class="block-content bg-gd-emerald">
<p class="mt-5">
<i class="si si-bar-chart fa-3x text-white-op"></i>
</p>
<p class="font-w600 text-white">Statistics</p>
</div>
</a>
</div>
<div class="col-6 col-md-4 col-xl-2">
<a class="block text-center" href="javascript:void(0)">
<div class="block-content bg-gd-corporate">
<p class="mt-5">
<i class="si si-settings fa-3x text-white-op"></i>
</p>
<p class="font-w600 text-white">Settings</p>
</div>
</a>
</div>
<!-- END Row #1 -->
</div>
<div class="row row-deck gutters-tiny invisible" data-toggle="appear">
<!-- Row #2 -->
<div class="col-xl-4">
<a class="block block-transparent bg-image d-flex align-items-stretch" href="javascript:void(0)" style="background-image: url('assets/media/photos/[email protected]');">
<div class="block-content block-sticky-options pt-100 bg-black-op">
<div class="block-options block-options-left text-white">
<div class="block-options-item">
<i class="si si-book-open text-white-op"></i>
</div>
</div>

<h2 class="h3 font-w700 text-white mb-5">Upcoming Events!</h2>
<h2 class="h3 font-w700 text-white mb-5">Upcoming Events!</h2>

</div>
</a>
</div>
<div class="col-sm-6 col-xl-4">
<a class="block block-transparent bg-image d-flex align-items-stretch" href="javascript:void(0)" style="background-image: url('assets/media/photos/[email protected]');">
<div class="block-content block-sticky-options pt-100 bg-primary-dark-op">
<div class="block-options block-options-left text-white">
<div class="block-options-item">
<i class="si si-book-open text-white-op"></i>
</div>
</div>
</a>
</div>
<div class="col-sm-6 col-xl-4">
<a class="block block-transparent bg-image d-flex align-items-stretch" href="javascript:void(0)" style="background-image: url('assets/media/photos/[email protected]');">
<div class="block-content block-sticky-options pt-100 bg-primary-dark-op">
<div class="block-options block-options-left text-white">
<div class="block-options-item">
<i class="si si-book-open text-white-op"></i>
</div>
</div>

<h2 class="h3 font-w700 text-white mb-5">New News!</h2>
<h2 class="h3 font-w700 text-white mb-5">New News!</h2>

</div>
</a>
</div>
<div class="col-sm-6 col-xl-4">
<a class="block block-transparent bg-image d-flex align-items-stretch" href="javascript:void(0)" style="background-image: url('assets/media/photos/[email protected]');">
<div class="block-content block-sticky-options pt-100 bg-primary-op">
</div>
</a>
</div>
<div class="col-sm-6 col-xl-4">
<a class="block block-transparent bg-image d-flex align-items-stretch" href="javascript:void(0)" style="background-image: url('assets/media/photos/[email protected]');">
<div class="block-content block-sticky-options pt-100 bg-primary-op">


<h2 class="h3 font-w700 text-white mb-5">Check Your Email!</h2>
<h3 class="h5 text-white-op">{{{$user->email}}}</h3>
</div>
</a>
</div>
<!-- END Row #2 -->
<h2 class="h3 font-w700 text-white mb-5">Check Your Email!</h2>
<h3 class="h5 text-white-op">{{{$user->email}}}</h3>
</div>
</a>
</div>
<div class="row gutters-tiny invisible" data-toggle="appear">
<!-- Row #3 -->
<div class="col-xl-8 d-flex align-items-stretch">
<div class="block block-themed block-mode-loading-inverse block-transparent bg-image w-100" style="background-image: url('assets/media/photos/[email protected]');">
<div class="block-header bg-black-op">
<!-- END Row #2 -->
</div>
<div class="row gutters-tiny invisible" data-toggle="appear">
<!-- Row #3 -->
<div class="col-xl-8 d-flex align-items-stretch">
<div class="block block-themed block-mode-loading-inverse block-transparent bg-image w-100" style="background-image: url('assets/media/photos/[email protected]');">
<div class="block-header bg-black-op">=
<div class="ribbon-box">Certifications</div>
<table class="table table-borderless table-vcenter" style="font-size: 1.5em;">
<tbody>
Expand Down Expand Up @@ -224,7 +224,13 @@
<div class="float-right mt-15 d-none d-sm-block">
<i class="si si-book-open fa-2x text-success"></i>
</div>
<div class="font-size-h3 font-w600 text-success" data-toggle="countTo" data-speed="1000" data-to="750">0</div>
@if($personal_stats->total_hrs < 0)
<div class="font-size-h3 font-w600 text-success" data-toggle="countTo" data-speed="1000" data-to="{{ $personal_stats->total_hrs }}">
@else
0
@endif</div>

</div>
<div class="font-size-sm font-w600 text-uppercase text-success-light">Hours This Month</div>
</div>

Expand Down

0 comments on commit 57b8f71

Please sign in to comment.