Skip to content

Commit

Permalink
Update views
Browse files Browse the repository at this point in the history
  • Loading branch information
@daviddmd
daviddmd committed Nov 1, 2022
1 parent 40827ac commit b051204
Show file tree
Hide file tree
Showing 13 changed files with 1,350 additions and 1,527 deletions.
6 changes: 4 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,10 @@ concerning the permanent contact point and security officers to comply with the
All the management and report generation activities are available according to the currently logged-in user roles in
the respective menus, commonly accessed through the top navigation menu.

This project is licensed under the [AGPL 3 license](https://www.gnu.org/licenses/agpl-3.0.en.html), a copy of which may
be found on [LICENSE](LICENSE).

![](documentation/asset_risk_management_process.png)
*The Asset Risk Management submenu*

This project is licensed under the [AGPL 3 license](https://www.gnu.org/licenses/agpl-3.0.en.html), a copy of that
license may be found on [LICENSE](LICENSE).

14 changes: 7 additions & 7 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,20 @@
"ext-pdo": "*",
"directorytree/ldaprecord-laravel": "^v2.6.0",
"guzzlehttp/guzzle": "^7.5.0",
"laravel/framework": "^v9.31.0",
"laravel/jetstream": "^v2.12.2",
"laravel/framework": "^v9.38.0",
"laravel/jetstream": "^v2.12.5",
"laravel/sanctum": "^v2.15.1",
"laravel/tinker": "^v2.7.2",
"livewire/livewire": "^v2.10.7",
"maatwebsite/excel": "^3.1.40"
"maatwebsite/excel": "^3.1.44"
},
"require-dev": {
"fakerphp/faker": "^v1.20.0",
"laravel/sail": "^v1.16.0",
"laravel/sail": "^v1.16.2",
"mockery/mockery": "^1.5.1",
"nunomaduro/collision": "^v6.3.0",
"phpunit/phpunit": "^9.5.24",
"spatie/laravel-ignition": "^1.5.0"
"nunomaduro/collision": "^v6.3.1",
"phpunit/phpunit": "^9.5.26",
"spatie/laravel-ignition": "^1.6.1"
},
"autoload": {
"psr-4": {
Expand Down
438 changes: 224 additions & 214 deletions composer.lock
View file

Large diffs are not rendered by default.

2,119 changes: 956 additions & 1,163 deletions package-lock.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/css/app.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/js/app.js
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions public/mix-manifest.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"/js/app.js": "/js/app.js?id=439876c40a17208d91e87245e09239aa",
"/css/app.css": "/css/app.css?id=8618d29b3289f979997bd55e9d76368c"
"/js/app.js": "/js/app.js?id=32db85bcdd261307b7eb529723c556d2",
"/css/app.css": "/css/app.css?id=40a43d1fa901a20da5b32f0bc961b16f"
}
9 changes: 6 additions & 3 deletions resources/views/assets/show.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -487,9 +487,12 @@ class="text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:ring-blue-300
@endforeach
</tbody>
</table>
<div class="py-16">
<div class="w-full border-t-8 border-gray-300"></div>
</div>

@if(!$loop->last)
<div class="py-16">
<div class="w-full border-t-8 border-gray-300"></div>
</div>
@endif
@endif
@endforeach
</div>
Expand Down
4 changes: 3 additions & 1 deletion resources/views/departments/edit.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ class="text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:outline-none
@include("common.delete_button",["message"=>__("Are you sure you want to delete this department?")])
</form>
@if($department->users->count()>0)
<div class="flex-grow border-t border-gray-400"></div>
<div class="py-2">
<div class="w-full border-t-8 border-gray-300"></div>
</div>
<h2 class="text-center text-2xl font-normal leading-normal mt-0 mb-2">{{__("Members of Department")}}</h2>
<table class="w-full text-sm text-left text-gray-500 dark:text-gray-400">
<thead
Expand Down
8 changes: 5 additions & 3 deletions resources/views/livewire/asset-threats-controls-manage.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,11 @@ class="focus:outline-none text-white bg-green-700 hover:bg-green-800 focus:ring-
{{__("Add Control")}}
</button>
</div>
<div class="py-16">
<div class="w-full border-t-8 border-gray-300"></div>
</div>
@if(!$loop->last)
<div class="py-16">
<div class="w-full border-t-8 border-gray-300"></div>
</div>
@endif
@endforeach

<x-jet-dialog-modal wire:model="assetThreatAddDialogOpen">
Expand Down
2 changes: 1 addition & 1 deletion resources/views/threats/edit.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class="text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:outline-none
@method("DELETE")
@include("common.delete_button",["message"=>__("Are you sure you want to delete this threat?")])
</form>
<div class="flex-grow border-t border-gray-400"></div>
<div class="w-full border-t-8 border-gray-300"></div>
@livewire("threat-controls-manage",["threat"=>$threat])
</div>
</div>
Expand Down
133 changes: 69 additions & 64 deletions resources/views/users/edit.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,71 +79,76 @@ class="form-check-input appearance-none h-4 w-4 border border-gray-300 rounded-s
<button type="submit"
class="text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm w-full sm:w-auto px-5 py-2.5 text-center dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800">{{__("Update")}}</button>
</form>
<div class="flex-grow border-t border-gray-400"></div>
<h2 class="text-center text-2xl font-normal leading-normal mt-0 mb-2">{{__("Assets")}}</h2>
<div class="relative overflow-x-auto shadow-md sm:rounded-lg mb-5">
<table class="w-full text-sm text-left text-gray-500 dark:text-gray-400">
<thead
class="text-xs text-gray-700 uppercase bg-gray-50 dark:bg-gray-700 dark:text-gray-400">
<tr>
<th scope="col" class="px-6 py-3">
{{__("ID")}}
</th>
<th scope="col" class="px-6 py-3">
{{__("Name")}}
</th>
<th scope="col" class="px-6 py-3">
{{__("Type")}}
</th>
<th scope="col" class="px-6 py-3">
{{__("SKU")}}
</th>
<th scope="col" class="px-6 py-3">
{{__("IP")}}
</th>
<th scope="col" class="px-6 py-3">
{{__("MAC")}}
</th>
<th scope="col" class="px-6 py-3">
{{__("Manufacturer")}}
</th>
<th scope="col" class="px-6 py-3">
{{__("Location")}}
</th>
<th scope="col" class="px-6 py-3">
{{__("Action")}}
</th>
</tr>
</thead>
<tbody>
@foreach($user->assets as $asset)
<tr class="bg-white border-b dark:bg-gray-800 dark:border-gray-700">
<td class="px-6 py-4">{{$asset->id}}</td>
<td class="px-6 py-4">{{$asset->name}}</td>
<td class="px-6 py-4">{{$asset->type->name}}</td>
<td class="px-6 py-4">{{$asset->sku}}</td>
<td class="px-6 py-4">{{$asset->ip_address}}</td>
<td class="px-6 py-4">{{$asset->mac_address}}</td>
<td class="px-6 py-4">{{$asset->manufacturer}}</td>
<td class="px-6 py-4">{{$asset->location}}</td>
<td class="px-6 py-4">
@can("update",$asset)
<a href="{{route("assets.edit",$asset->id)}}"
class="text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 mr-2 mb-2 dark:bg-blue-600 dark:hover:bg-blue-700 focus:outline-none dark:focus:ring-blue-800">
{{__("Manage")}}
</a>
@else
<a href="{{route("assets.show",$asset->id)}}"
class="text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 mr-2 mb-2 dark:bg-blue-600 dark:hover:bg-blue-700 focus:outline-none dark:focus:ring-blue-800">
{{__("View")}}
</a>
@endcan
</td>
@if($user->assets->count()>0)
<div class="py-2">
<div class="w-full border-t-8 border-gray-300"></div>
</div>
<h2 class="text-center text-2xl font-normal leading-normal mt-0 mb-2">{{__("Assets")}}</h2>
<div class="relative overflow-x-auto shadow-md sm:rounded-lg mb-5">
<table class="w-full text-sm text-left text-gray-500 dark:text-gray-400">
<thead
class="text-xs text-gray-700 uppercase bg-gray-50 dark:bg-gray-700 dark:text-gray-400">
<tr>
<th scope="col" class="px-6 py-3">
{{__("ID")}}
</th>
<th scope="col" class="px-6 py-3">
{{__("Name")}}
</th>
<th scope="col" class="px-6 py-3">
{{__("Type")}}
</th>
<th scope="col" class="px-6 py-3">
{{__("SKU")}}
</th>
<th scope="col" class="px-6 py-3">
{{__("IP")}}
</th>
<th scope="col" class="px-6 py-3">
{{__("MAC")}}
</th>
<th scope="col" class="px-6 py-3">
{{__("Manufacturer")}}
</th>
<th scope="col" class="px-6 py-3">
{{__("Location")}}
</th>
<th scope="col" class="px-6 py-3">
{{__("Action")}}
</th>
</tr>
@endforeach
</tbody>
</table>
</div>
</thead>
<tbody>
@foreach($user->assets as $asset)
<tr class="bg-white border-b dark:bg-gray-800 dark:border-gray-700">
<td class="px-6 py-4">{{$asset->id}}</td>
<td class="px-6 py-4">{{$asset->name}}</td>
<td class="px-6 py-4">{{$asset->type->name}}</td>
<td class="px-6 py-4">{{$asset->sku}}</td>
<td class="px-6 py-4">{{$asset->ip_address}}</td>
<td class="px-6 py-4">{{$asset->mac_address}}</td>
<td class="px-6 py-4">{{$asset->manufacturer}}</td>
<td class="px-6 py-4">{{$asset->location}}</td>
<td class="px-6 py-4">
@can("update",$asset)
<a href="{{route("assets.edit",$asset->id)}}"
class="text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 mr-2 mb-2 dark:bg-blue-600 dark:hover:bg-blue-700 focus:outline-none dark:focus:ring-blue-800">
{{__("Manage")}}
</a>
@else
<a href="{{route("assets.show",$asset->id)}}"
class="text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 mr-2 mb-2 dark:bg-blue-600 dark:hover:bg-blue-700 focus:outline-none dark:focus:ring-blue-800">
{{__("View")}}
</a>
@endcan
</td>
</tr>
@endforeach
</tbody>
</table>
</div>
@endif

</div>
</div>
</div>
Expand Down
Loading

0 comments on commit b051204

Please sign in to comment.