Merge #154 Awards into dev

2018-03-17 00:03:17 -05:00
parent 7dd6a7e7f3 78724e981c
commit 45a22e26be
16 changed files with 457 additions and 0 deletions
--- a/resources/views/admin/menu.blade.php
+++ b/resources/views/admin/menu.blade.php
@@ -37,6 +37,7 @@
            <li><a href="{{ url('/admin/expenses') }}"><i class="pe-7s-cash"></i>expenses</a></li>
            <li><a href="{{ url('/admin/users') }}"><i class="pe-7s-users"></i>users</a></li>
            <li><a href="{{ url('/admin/ranks') }}"><i class="pe-7s-graph1"></i>ranks</a></li>
+            <li><a href="{!! url('/admin/awards') !!}"><i class="pe-7s-diamond"></i>awards</a></li>
            <li><a href="{{ url('/admin/settings') }}"><i class="pe-7s-config"></i>settings</a></li>
        </ul>
    </div>