nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-30 03:25:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

- usage metric fix

Browse Source 
- ui fix
- index:usage artisan command
- demo payment settings
This commit is contained in:
Čarodej
2022-01-10 15:43:55 +01:00
parent 5de2b8b0e0
commit 08139c8f96
47 changed files with 88 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/App/Console/Commands/SetupDevEnvironment.php
+46 -22
View File
@@ -57,11 +57,10 @@ class SetupDevEnvironment extends Command
$this->migrate_and_generate();
$this->info('Storing default settings and content...');
$this->store_default_settings();
($this->seedDefaultPages)();
($this->seedDefaultSettings)($this->license);
($this->seedDefaultLanguage)();
$this->store_default_settings();
$this->info('Creating default admin...');
$this->create_admin();
@@ -651,13 +650,13 @@ class SetupDevEnvironment extends Command
// Get apartments gallery
collect([
'demo/images/apartments/Apartment Architecture Ceiling Chairs.jpg',
'demo/images/apartments/Apartment Chair.jpg',
'demo/images/apartments/Apartment Contemporary Couch Curtains.jpg',
'demo/images/apartments/Brown Wooden Center Table.jpg',
'demo/images/apartments/Home.jpg',
'demo/images/apartments/Kitchen Appliances.jpg',
'demo/images/apartments/Kitchen Island.jpg',
'demo/images/apartments/Apartment Architecture Ceiling Chairs.jpeg',
'demo/images/apartments/Apartment Chair.jpeg',
'demo/images/apartments/Apartment Contemporary Couch Curtains.jpeg',
'demo/images/apartments/Brown Wooden Center Table.jpeg',
'demo/images/apartments/Home.jpeg',
'demo/images/apartments/Kitchen Appliances.jpeg',
'demo/images/apartments/Kitchen Island.jpeg',
])
->each(function ($file) use ($user, $apartments) {
$thumbnail = $this->generate_thumbnails($file, $user);
@@ -678,17 +677,17 @@ class SetupDevEnvironment extends Command
// Get nature gallery
collect([
'demo/images/nature/Bird Patterncolorful Green.jpg',
'demo/images/nature/Close Up Of Peacock.jpg',
'demo/images/nature/Close Up Photography Of Tiger.jpg',
'demo/images/nature/Cold Nature Cute Ice.jpg',
'demo/images/nature/Landscape Photo of Forest.jpg',
'demo/images/nature/Photo of Hawksbill Sea Turtle.jpg',
'demo/images/nature/Photo Of Reindeer in The Snow.jpg',
'demo/images/nature/View Of Elephant in Water.jpg',
'demo/images/nature/Waterfall Between Trees.jpg',
'demo/images/nature/Wildlife Photography of Elephant During Golden Hour.jpg',
'demo/images/nature/Yellow Animal Eyes Fur.jpg',
'demo/images/nature/Bird Patterncolorful Green.jpeg',
'demo/images/nature/Close Up Of Peacock.jpeg',
'demo/images/nature/Close Up Photography Of Tiger.jpeg',
'demo/images/nature/Cold Nature Cute Ice.jpeg',
'demo/images/nature/Landscape Photo of Forest.jpeg',
'demo/images/nature/Photo of Hawksbill Sea Turtle.jpeg',
'demo/images/nature/Photo Of Reindeer in The Snow.jpeg',
'demo/images/nature/View Of Elephant in Water.jpeg',
'demo/images/nature/Waterfall Between Trees.jpeg',
'demo/images/nature/Wildlife Photography of Elephant During Golden Hour.jpeg',
'demo/images/nature/Yellow Animal Eyes Fur.jpeg',
])
->each(function ($file) use ($user, $nature) {
$thumbnail = $this->generate_thumbnails($file, $user);
@@ -1005,7 +1004,7 @@ class SetupDevEnvironment extends Command
'value' => 1,
],
[
'name' => 'payments_active',
'name' => 'allowed_payments',
'value' => 1,
],
[
@@ -1064,9 +1063,34 @@ class SetupDevEnvironment extends Command
'name' => 'billing_vat_number',
'value' => '41241241234',
],
[
'name' => 'allowed_registration_bonus',
'value' => 1,
],
[
'name' => 'registration_bonus_amount',
'value' => 10,
],
[
'name' => 'allowed_paypal',
'value' => 1,
],
[
'name' => 'allowed_paystack',
'value' => 1,
],
[
'name' => 'allowed_stripe',
'value' => 1,
],
[
'name' => 'subscription_type',
'value' => 'metered',
],
])->each(function ($col) {
Setting::forceCreate([
Setting::updateOrCreate([
'name' => $col['name'],
], [
'value' => $col['value'],
]);
});
src/App/Socialite/Controllers/SocialiteCallbackController.php
+3 -3
View File
@@ -37,9 +37,9 @@ class SocialiteCallbackController extends Controller
// Create data user data object
$data = CreateUserData::fromArray([
'name' => $provider_user->name,
'email' => $provider_user->email,
'avatar' => store_socialite_avatar($provider_user->avatar),
'name' => $provider_user->getName(),
'email' => $provider_user->getEmail(),
'avatar' => store_socialite_avatar($provider_user->getAvatar()),
'oauth_provider' => $provider,
]);
src/App/Users/Resources/UserStorageResource.php
+2 -2
View File
@@ -132,8 +132,8 @@ class UserStorageResource extends JsonResource
->where('created_at', '>', $period)
->sum('upload');
$upload = $trafficRecords->map(fn ($record) => round(($record->upload / $uploadMax) * 100, 2));
$download = $trafficRecords->map(fn ($record) => round(($record->download / $downloadMax) * 100, 2));
$upload = $trafficRecords->map(fn ($record) => $uploadMax !== 0 ? round(($record->upload / $uploadMax) * 100, 2) : 0);
$download = $trafficRecords->map(fn ($record) => $downloadMax !== 0 ? round(($record->download / $downloadMax) * 100, 2) : 0);
return [$downloadTotal, $uploadTotal, $upload, $download];
}
src/Domain/Settings/Actions/SeedDefaultSettingsAction.php
+5 -1
View File
@@ -13,6 +13,10 @@ class SeedDefaultSettingsAction
): void {
collect(
config('content.content.' . strtolower($license))
)->each(fn ($content) => Setting::forceCreate($content));
)->each(fn ($content) => Setting::updateOrCreate([
'name' => $content['name'],
], [
'value' => $content['value'],
]));
}
}
src/Support/Scheduler/Actions/ReportUsageAction.php
+3 -3
View File
@@ -39,7 +39,7 @@ class ReportUsageAction
->sum('filesize');
// We count storage size in GB, e.g. 0.15 is 150mb
$amount = $filesize / 1000000000;
$amount = $filesize / 1000000;
// Record storage capacity usage
$subscription->recordUsage('storage', $amount);
@@ -51,10 +51,10 @@ class ReportUsageAction
$record = $subscription
->user
->traffics()
->where('created_at', today()->subDay())
->whereDate('created_at', today()->subDay())
->first();
$amount = ($record->download ?? 0) / 1000000000;
$amount = (($record->download ?? 0) + ($record->upload ?? 0)) / 1000000;
// Record storage capacity usage
$subscription->recordUsage('bandwidth', $amount);
src/Support/helpers.php
+1 -1
View File
@@ -475,7 +475,7 @@ if (! function_exists('get_storage_percentage')) {
// Count progress
if ($total == 0) {
$progress = 100;
$progress = 0;
} else {
$progress = ($used * 100) / $total;
}