Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions src/app/Http/Controllers/Customer/CustomerEquipmentController.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,19 @@ public function __construct(protected CustomerEquipmentService $svc) {}
public function index(Request $request, Customer $customer): Response
{
return Inertia::render('Customer/Equipment/Index', [
'alerts' => fn() => $customer->Alerts,
'allowVpn' => fn() => config('customer.allow_vpn_data'),
'availableEquipment' => fn() => CacheData::equipmentCategorySelectBox(),
'customer' => fn() => $customer,
'permissions' => fn() => UserPermissions::customerPermissions($request->user()),
'siteList' => fn() => $customer->Sites->makeVisible(['href']),
'vpnData' => fn() => $customer->CustomerVpn,
'alerts' => fn () => $customer->Alerts,
'allowVpn' => fn () => config('customer.allow_vpn_data'),
'availableEquipment' => fn () => CacheData::equipmentCategorySelectBox(),
'customer' => fn () => $customer,
'permissions' => fn () => UserPermissions::customerPermissions($request->user()),
'siteList' => fn () => $customer->Sites->makeVisible(['href']),
'vpnData' => fn () => $customer->CustomerVpn,

/**
* Deferred Props
*/
'groupedEquipmentList' => Inertia::defer(
fn() => $customer->Equipment
fn () => $customer->Equipment
->load('Sites')
->groupBy('equip_name')
->chunk(25)
Expand All @@ -63,20 +63,20 @@ public function store(CustomerEquipmentRequest $request, Customer $customer): Re
public function show(Request $request, Customer $customer, CustomerEquipment $equipment): Response
{
return Inertia::render('Customer/Equipment/Show', [
'alerts' => fn() => $customer->Alerts,
'allowVpn' => fn() => config('customer.allow_vpn_data'),
'permissions' => fn() => UserPermissions::customerPermissions($request->user()),
'customer' => fn() => $customer,
'equipment' => fn() => $equipment,
'siteList' => fn() => $equipment->Sites->makeVisible(['href']),
'equipment-data' => fn() => $equipment->CustomerEquipmentData,
'noteList' => fn() => $equipment->getNotes(),
'fileList' => fn() => $equipment->getFiles(),
'fileTypes' => fn() => CacheData::fileTypes(),
'vpnData' => fn() => $customer->CustomerVpn,
'alerts' => fn () => $customer->Alerts,
'allowVpn' => fn () => config('customer.allow_vpn_data'),
'permissions' => fn () => UserPermissions::customerPermissions($request->user()),
'customer' => fn () => $customer,
'equipment' => fn () => $equipment,
'siteList' => fn () => $equipment->Sites->makeVisible(['href']),
'equipment-data' => fn () => $equipment->CustomerEquipmentData,
'noteList' => fn () => $equipment->getNotes(),
'fileList' => fn () => $equipment->getFiles(),
'fileTypes' => fn () => CacheData::fileTypes(),
'vpnData' => fn () => $customer->CustomerVpn,

// Deferred props
'equipmentList' => Inertia::defer(fn() => $customer->Equipment->load('Sites')),
'equipmentList' => Inertia::defer(fn () => $customer->Equipment->load('Sites')),
]);
}

Expand Down
54 changes: 27 additions & 27 deletions src/app/Http/Controllers/Customer/CustomerSiteController.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ public function __construct(protected CustomerService $svc) {}
public function index(Request $request, Customer $customer): Response
{
return Inertia::render('Customer/Site/Index', [
'alerts' => fn() => $customer->Alerts,
'customer' => fn() => $customer,
'permissions' => fn() => UserPermissions::customerPermissions($request->user()),
'siteList' => fn() => $customer->Sites->makeVisible(['href']),
'isFav' => fn() => $customer->isFav($request->user()),
'alerts' => fn () => $customer->Alerts,
'customer' => fn () => $customer,
'permissions' => fn () => UserPermissions::customerPermissions($request->user()),
'siteList' => fn () => $customer->Sites->makeVisible(['href']),
'isFav' => fn () => $customer->isFav($request->user()),
]);
}

Expand All @@ -38,8 +38,8 @@ public function create(?Customer $customer = null): Response
$this->authorize('create', CustomerSite::class);

return Inertia::render('Customer/Site/Create', [
'default-state' => fn() => config('customer.default_state'),
'parent-customer' => fn() => $customer,
'default-state' => fn () => config('customer.default_state'),
'parent-customer' => fn () => $customer,
]);
}

Expand All @@ -61,34 +61,34 @@ public function store(CustomerSiteRequest $request, ?Customer $customer = null):
public function show(Request $request, Customer $customer, CustomerSite $site): Response
{
return Inertia::render('Customer/Site/Show', [
'alerts' => fn() => $customer->Alerts,
'allowShareVpn' => fn() => config('customer.allow_share_vpn_data'),
'allowVpn' => fn() => config('customer.allow_vpn_data'),
'availableEquipment' => fn() => CacheData::equipmentCategorySelectBox(),
'customer' => fn() => $customer,
'currentSite' => fn() => $site,
'fileTypes' => fn() => CacheData::fileTypes(),
'isFav' => fn() => $customer->isFav($request->user()),
'permissions' => fn() => UserPermissions::customerPermissions(
'alerts' => fn () => $customer->Alerts,
'allowShareVpn' => fn () => config('customer.allow_share_vpn_data'),
'allowVpn' => fn () => config('customer.allow_vpn_data'),
'availableEquipment' => fn () => CacheData::equipmentCategorySelectBox(),
'customer' => fn () => $customer,
'currentSite' => fn () => $site,
'fileTypes' => fn () => CacheData::fileTypes(),
'isFav' => fn () => $customer->isFav($request->user()),
'permissions' => fn () => UserPermissions::customerPermissions(
$request->user()
),
'phoneTypes' => fn() => CacheData::phoneTypes(),
'siteList' => fn() => $customer->Sites->makeVisible(['href']),
'phoneTypes' => fn () => CacheData::phoneTypes(),
'siteList' => fn () => $customer->Sites->makeVisible(['href']),

/**
* Deferred Props
*/
'contactList' => Inertia::defer(fn() => $site->SiteContact),
'equipmentList' => Inertia::defer(fn() => $site->SiteEquipment->load('Sites')),
'fileList' => Inertia::defer(fn() => $site->SiteFile->append('href')),
'contactList' => Inertia::defer(fn () => $site->SiteContact),
'equipmentList' => Inertia::defer(fn () => $site->SiteEquipment->load('Sites')),
'fileList' => Inertia::defer(fn () => $site->SiteFile->append('href')),
'groupedEquipmentList' => Inertia::defer(
fn() => $site->SiteEquipment
fn () => $site->SiteEquipment
->load('Sites')
->groupBy('equip_name')
->chunk(5)
),
'noteList' => Inertia::defer(fn() => $site->SiteNote),
'vpnData' => Inertia::defer(fn() => $customer->CustomerVpn),
'noteList' => Inertia::defer(fn () => $site->SiteNote),
'vpnData' => Inertia::defer(fn () => $customer->CustomerVpn),
]);
}

Expand All @@ -97,9 +97,9 @@ public function edit(Customer $customer, CustomerSite $site): Response
$this->authorize('update', $site);

return Inertia::render('Customer/Site/Edit', [
'default-state' => fn() => config('customer.default_state'),
'parent-customer' => fn() => $customer,
'site' => fn() => $site,
'default-state' => fn () => config('customer.default_state'),
'parent-customer' => fn () => $customer,
'site' => fn () => $site,
]);
}

Expand Down
2 changes: 1 addition & 1 deletion src/app/Services/Maintenance/LogUtilitiesService.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public function validateLogChannel(string $channel): string|false
public function validateLogFile(string $channel, string $filename): string|bool
{
$folder = $this->validateLogChannel($channel);
$relativePath = $folder . DIRECTORY_SEPARATOR . $filename . '.log';
$relativePath = $folder.DIRECTORY_SEPARATOR.$filename.'.log';

if (! Storage::disk('logs')->exists($relativePath)) {
return false;
Expand Down
12 changes: 6 additions & 6 deletions src/config/version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ current:
label: v
major: 8
minor: 0
patch: 2
patch: 4
prerelease: null
buildmetadata: null
commit: '921'
commit: 92b
timestamp:
year: 2025
month: 6
month: 7
day: 28
hour: 3
minute: 32
second: 15
hour: 2
minute: 0
second: 23
timezone: UTC
commit:
mode: git-local
Expand Down
70 changes: 62 additions & 8 deletions src/package-lock.json

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

2 changes: 1 addition & 1 deletion src/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"dev": "vite"
},
"devDependencies": {
"axios": "^1.6",
"axios": "^1.11",
"chokidar": "^3.6",
"laravel-echo": "^1.16.1",
"laravel-vite-plugin": "^1.0",
Expand Down
22 changes: 12 additions & 10 deletions src/resources/css/app.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import 'tailwindcss';
@import "tailwindcss";

@config '../../tailwind.config.js';

Expand All @@ -11,19 +11,22 @@
color utility to any element that depends on these defaults.
*/
@layer base {
*,
::after,
::before,
::backdrop,
::file-selector-button {
border-color: var(--color-gray-200, currentcolor);
}
*,
::after,
::before,
::backdrop,
::file-selector-button {
border-color: var(--color-gray-200, currentcolor);
}
}

.pointer {
cursor: pointer;
}

.mask-field {
@apply blur-xs hover:blur-none;
}

/**
* Classes to quickly set Card Component sizes
Expand Down Expand Up @@ -93,7 +96,7 @@
}

.text-warning {
@apply text-yellow-500
@apply text-yellow-500;
}

.text-muted {
Expand All @@ -107,7 +110,6 @@
.text-danger {
@apply text-red-600;
}

}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { getStatusIcon, getStatusType } from "@/Composables/styleData.module";
<ResourceList v-if="alerts.length" :list="alerts" compact>
<template #list-item="{ item }">
<div
class="flex grow rounded-lg opacity-75"
class="flex grow rounded-lg opacity-65"
:class="getStatusType(item.type)"
>
<div class="px-3 py-2">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,3 @@ const checkForHyperlink = (url: string): string => {
</div>
</div>
</template>

<style scoped lang="postcss">
.mask-field {
@apply blur-xs hover:blur-none;
}
</style>
Loading