Skip to content

Commit

Permalink
Landing page done.
Browse files Browse the repository at this point in the history
  • Loading branch information
ocornel committed Feb 7, 2021
1 parent 7c4ef04 commit 0497398
Show file tree
Hide file tree
Showing 13 changed files with 238 additions and 74 deletions.
1 change: 1 addition & 0 deletions public/css/landing-page.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 12 additions & 5 deletions public/css/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,13 @@
color: var(--theme-light-blue);
font-size: 14px;
}
.masthead {
background-color: white;
color: var(--theme-dark-blue);
}
.masthead-heading, .masthead-lead {
color: var(--theme-dark-blue);
}
@media (max-width: 770px) {
.navbar-brand-logo {
height: 50px;
Expand All @@ -47,8 +54,8 @@
color: var(--theme-dark-blue);
font-weight: 500;
}


/*.layout-sidebar-backdrop {*/
/* background-color: var(--theme-dark-blue);*/
/*}*/
.btn-inactive {
background-color: #777777;
border-color: #777777;
color: #fff;
}
1 change: 1 addition & 0 deletions public/js/landing-page.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions resources/views/components/table_credits.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
@isset($actions)
<td>
<a href="{{ route('edit_credit', [$credit, $credit->code]) }}" title="Edit"
class="btn-sm btn-secondary"><i class="fa fa-edit"></i></a>
<a href="{{ route('delete_credit', [$credit, $credit->code]) }}" title="Delete" class="btn-sm btn-danger"><i
class="fa fa-trash"></i></a>
class="btn-sm btn-warning"><i class="fa fa-edit"></i></a>
{{-- <a href="{{ route('delete_credit', [$credit, $credit->code]) }}" title="Delete" class="btn-sm btn-danger"><i--}}
{{-- class="fa fa-trash"></i></a>--}}
</td>@endisset
</tr>
@empty
Expand Down
2 changes: 1 addition & 1 deletion resources/views/components/table_noks.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
@isset($actions)
<td>
<a href="{{ route('edit_nok', [$nok, $nok->last_name]) }}" title="Edit"
class="btn-sm btn-secondary"><i class="fa fa-edit"></i></a>
class="btn-sm btn-warning"><i class="fa fa-edit"></i></a>
<a href="{{ route('delete_nok', [$nok]) }}" title="Delete" class="btn-sm btn-danger"><i
class="fa fa-trash"></i></a>
</td>@elseif(isset($extractions))
Expand Down
9 changes: 5 additions & 4 deletions resources/views/components/table_patients.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,13 @@
@isset($actions)
<td>
<a href="{{ route('edit_patient', [$patient, $patient->last_name]) }}" title="Edit"
class="btn-sm btn-secondary"><i class="fa fa-edit"></i></a>
<a href="{{ route('delete_patient', [$patient]) }}" title="Delete" class="btn-sm btn-danger"><i
class="fa fa-trash"></i></a>
class="btn-sm btn-warning"><i class="fa fa-edit"></i></a>
{{-- --}}
{{-- <a href="{{ route('delete_patient', [$patient]) }}" title="Delete" class="btn-sm btn-danger"><i--}}
{{-- class="fa fa-trash-o"></i></a>--}}
</td>@elseif(isset($extractions))
<td>
<a href="" title="Disassociate" class="btn btn-secondary"><i class="fa fa-times"></i></a>
{{-- <a href="" title="Disassociate" class="btn btn-secondary"><i class="fa fa-times"></i></a>--}}
</td>
@endisset
</tr>
Expand Down
79 changes: 46 additions & 33 deletions resources/views/components/table_users.blade.php
Original file line number Diff line number Diff line change
@@ -1,36 +1,49 @@
@isset($users)
<table class="table table-bordered table-striped table-hover dataTable">
<thead>
<tr>
<th>UID</th>
<th>NAME</th>
<th>EMAIL</th>
<th>REGISTERED</th>
@isset($actions)
<th>ACTIONS</th>
@endisset
</tr>
</thead>
<tbody>
@forelse($users as $user)
<tr>
<td>{{$user->id}}</td>
<td><a href="{{ route('show_user', [$user, $user->name]) }}">{{ $user->name }}</a></td>
<td>{{ $user->email }}</td>
<td>{{ \Carbon\Carbon::parse($user->created_at)->format('Y M d') }}</td>
@isset($actions)
<td>
<a href="{{ route('edit_user', [$user, $user->name]) }}" title="Edit"
class="btn-sm btn-secondary"><i class="fa fa-edit"></i></a>
<a href="{{ route('delete_user', [$user]) }}" title="Delete" class="btn-sm btn-danger"><i
class="fa fa-trash"></i></a>
</td>@endisset
</tr>
@empty
<tr><td colspan="10">No records found</td></tr>
@endforelse
</tbody>
</table>
<?php
$auth_user = Auth::user();
?>
<table class="table table-bordered table-striped table-hover dataTable">
<thead>
<tr>
<th>UID</th>
<th>NAME</th>
<th>EMAIL</th>
<th>REGISTERED</th>
@isset($actions)
<th>ACTIONS</th>
@endisset
</tr>
</thead>
<tbody>
@forelse($users as $user)
<tr>
<td>{{$user->id}}</td>
<td><a href="{{ route('show_user', [$user, $user->name]) }}">{{ $user->name }}</a></td>
<td>{{ $user->email }}</td>
<td>{{ \Carbon\Carbon::parse($user->created_at)->format('Y M d') }}</td>
@isset($actions)
<td>
<a href="{{ route('edit_user', [$user, $user->name]) }}" title="Edit"
class="btn-sm btn-warning"><i class="fa fa-edit"></i></a>
@if($user->id != \App\Utils::SUPER_ADMIN_ID)
@if($user->id == $auth_user->id)
<span title="Cannot delete own account" class="btn-sm btn-inactive"><i
class="fa fa-trash"></i></span>
@elseif($user->id != $auth_user->id)
<a href="{{ route('delete_user', [$user]) }}" title="Delete"
class="btn-sm btn-danger"><i
class="fa fa-trash"></i></a>
@endif
@endif
</td>@endisset
</tr>
@empty
<tr>
<td colspan="10">No records found</td>
</tr>
@endforelse
</tbody>
</table>
@else
<p>Please define $users</p>
<p>Please define $users</p>
@endif
Loading

0 comments on commit 0497398

Please sign in to comment.