Merge remote-tracking branch 'origin/master' into oasis

# Conflicts:
#	app/Console/Commands/SetupDevEnvironment.php
#	app/Console/Kernel.php
#	app/Http/Resources/InvoiceResource.php
#	app/Http/Resources/UserResource.php
#	app/Models/User.php
#	composer.lock
#	config/app.php
#	config/custom-language-translations.php
#	config/language-translations.php
#	public/chunks/admin.js
#	public/chunks/app-language.js
#	public/chunks/dashboard.js
#	public/chunks/files.js
#	public/chunks/files~chunks/shared-files~chunks/shared/file-browser.js
#	public/chunks/files~chunks/shared-files~chunks/shared/file-browser~chunks/shared/single-file.js
#	public/chunks/invoices.js
#	public/chunks/pages.js
#	public/chunks/plan-subscribers.js
#	public/chunks/plans.js
#	public/chunks/platform.js
#	public/chunks/settings-invoices.js
#	public/chunks/settings-payment-methods.js
#	public/chunks/settings-subscription.js
#	public/chunks/shared-files.js
#	public/chunks/shared.js
#	public/chunks/shared/file-browser.js
#	public/chunks/user-invoices.js
#	public/chunks/user-subscription.js
#	public/chunks/users.js
#	public/js/main.js
#	public/mix-manifest.json
#	resources/js/components/FilesView/FileItemGrid.vue
#	resources/js/components/FilesView/FileItemList.vue
This commit is contained in:
Peter Papp
2021-04-29 11:06:14 +02:00
166 changed files with 2945 additions and 2876 deletions
@@ -0,0 +1,24 @@
name: Code Style Fix
on: [push, pull_request]
jobs:
php-cs-fixer:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v2
with:
ref: ${{ github.head_ref }}
- name: Run PHP CS Fixer
uses: docker://oskarstark/php-cs-fixer-ga
with:
args: --config=.php_cs.dist --allow-risky=yes
- name: Commit changes
uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: Fix backend code styling
+35
View File
@@ -0,0 +1,35 @@
name: Frontend Build
on:
push:
branches: [ master ]
pull_request:
branches: [ master ]
workflow_dispatch:
jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [14.x]
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: Install dependencies
run: npm install
- run: npm run prod
- name: Commit changes
uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: Application Build
+1
View File
File diff suppressed because one or more lines are too long
+79
View File
@@ -0,0 +1,79 @@
<?php
$finder = Symfony\Component\Finder\Finder::create()
->in([
__DIR__ . '/app',
__DIR__ . '/routes',
__DIR__ . '/config',
])
->name('*.php')
->notName('*.blade.php')
->ignoreDotFiles(true)
->ignoreVCS(true);
return PhpCsFixer\Config::create()
->setRules([
'@PSR2' => true,
'array_syntax' => [
'syntax' => 'short'
],
'ordered_imports' => [
'sortAlgorithm' => 'length'
],
'blank_line_before_statement' => [
'statements' => ['break', 'case', 'continue', 'declare', 'default', 'die', 'do', 'exit', 'for', 'foreach', 'goto', 'if', 'include', 'include_once', 'require', 'require_once', 'return', 'switch', 'throw', 'try', 'while', 'yield', 'yield_from'],
],
'class_attributes_separation' => [
'elements' => [
'method',
],
],
'method_argument_space' => [
'on_multiline' => 'ensure_fully_multiline',
'keep_multiple_spaces_after_comma' => true,
],
'no_extra_blank_lines' => [
'break', 'case', 'continue', 'curly_brace_block', 'default', 'extra', 'parenthesis_brace_block', 'return', 'square_brace_block', 'switch', 'throw', 'use', 'useTrait', 'use_trait'
],
'cast_spaces' => [
'space' => 'single'
],
'phpdoc_single_line_var_spacing' => true,
'phpdoc_var_without_name' => true,
'single_space_after_construct' => true,
'single_line_after_imports' => true,
'no_unused_imports' => true,
'not_operator_with_successor_space' => true,
'trailing_comma_in_multiline_array' => true,
'phpdoc_scalar' => true,
'unary_operator_spaces' => true,
'binary_operator_spaces' => true,
'single_trait_insert_per_statement' => false,
'no_spaces_around_offset' => true,
'method_chaining_indentation' => true,
'array_indentation' => true,
'single_quote' => true,
'no_singleline_whitespace_before_semicolons' => true,
'no_empty_statement' => true,
'standardize_increment' => true,
'object_operator_without_whitespace' => true,
'ternary_operator_spaces' => true,
'no_leading_namespace_whitespace' => true,
'no_blank_lines_before_namespace' => true,
'blank_line_after_namespace' => true,
'fully_qualified_strict_types' => true,
'single_line_throw' => true,
'function_typehint_space' => true,
'simplified_if_return' => true,
'no_useless_else' => true,
'no_unneeded_curly_braces' => true,
'no_empty_comment' => true,
'no_blank_lines_after_class_opening' => true,
'whitespace_after_comma_in_array' => true,
'trim_array_spaces' => true,
'no_whitespace_before_comma_in_array' => true,
'constant_case' => true,
'lowercase_keywords' => true,
'lowercase_static_reference' => true,
])
->setFinder($finder);
@@ -1,11 +0,0 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="AuthTest.it_check_non_existed_user_and_return_not_found" type="PHPUnitRunConfigurationType" factoryName="PHPUnit">
<CommandLine>
<PhpTestInterpreterSettings>
<option name="interpreterName" value="PHP 7.4" />
</PhpTestInterpreterSettings>
</CommandLine>
<TestRunner class="Tests\Feature\Accounts\AuthTest" configuration_file="$PROJECT_DIR$/phpunit.xml" file="$PROJECT_DIR$/tests/Feature/Accounts/AuthTest.php" method="it_check_non_existed_user_and_return_not_found" scope="Method" />
<method v="2" />
</configuration>
</component>
+2
View File
@@ -1,3 +1,5 @@
[![Frontend Build](https://github.com/MakingCG/vuefilemanager/actions/workflows/build.yml/badge.svg)](https://github.com/MakingCG/vuefilemanager/actions/workflows/build.yml)
![logo](https://vuefilemanager.com/assets/images/vuefilemanager-horizontal-logo.svg) ![logo](https://vuefilemanager.com/assets/images/vuefilemanager-horizontal-logo.svg)
# Private Cloud Storage Build on Laravel & Vue.js # Private Cloud Storage Build on Laravel & Vue.js
+3 -4
View File
@@ -1,12 +1,11 @@
<?php <?php
namespace App\Actions\Fortify; namespace App\Actions\Fortify;
use App\Models\Setting;
use App\Models\User; use App\Models\User;
use App\Models\Setting;
use App\Models\UserSettings; use App\Models\UserSettings;
use Illuminate\Support\Facades\Validator;
use Illuminate\Validation\Rule; use Illuminate\Validation\Rule;
use Illuminate\Support\Facades\Validator;
use Laravel\Fortify\Contracts\CreatesNewUsers; use Laravel\Fortify\Contracts\CreatesNewUsers;
class CreateNewUser implements CreatesNewUsers class CreateNewUser implements CreatesNewUsers
@@ -25,7 +24,7 @@ class CreateNewUser implements CreatesNewUsers
->pluck('value', 'name'); ->pluck('value', 'name');
// Check if account registration is enabled // Check if account registration is enabled
if (!intval($settings['registration'])) { if (! intval($settings['registration'])) {
abort(401); abort(401);
} }
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Actions\Fortify; namespace App\Actions\Fortify;
use Laravel\Fortify\Rules\Password; use Laravel\Fortify\Rules\Password;
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Actions\Fortify; namespace App\Actions\Fortify;
use Illuminate\Support\Facades\Validator; use Illuminate\Support\Facades\Validator;
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Actions\Fortify; namespace App\Actions\Fortify;
use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Hash;
@@ -1,10 +1,9 @@
<?php <?php
namespace App\Actions\Fortify; namespace App\Actions\Fortify;
use Illuminate\Contracts\Auth\MustVerifyEmail;
use Illuminate\Support\Facades\Validator;
use Illuminate\Validation\Rule; use Illuminate\Validation\Rule;
use Illuminate\Support\Facades\Validator;
use Illuminate\Contracts\Auth\MustVerifyEmail;
use Laravel\Fortify\Contracts\UpdatesUserProfileInformation; use Laravel\Fortify\Contracts\UpdatesUserProfileInformation;
class UpdateUserProfileInformation implements UpdatesUserProfileInformation class UpdateUserProfileInformation implements UpdatesUserProfileInformation
+23 -26
View File
@@ -1,17 +1,16 @@
<?php <?php
namespace App\Console\Commands; namespace App\Console\Commands;
use App\Models\File; use App\Models\File;
use App\Models\Folder;
use App\Models\Share;
use App\Services\SetupService;
use App\Models\Setting;
use App\Models\User; use App\Models\User;
use Illuminate\Console\Command; use App\Models\Share;
use Illuminate\Foundation\Testing\WithFaker; use App\Models\Folder;
use Illuminate\Support\Facades\Storage; use App\Models\Setting;
use Illuminate\Support\Str; use Illuminate\Support\Str;
use App\Services\SetupService;
use Illuminate\Console\Command;
use Illuminate\Support\Facades\Storage;
use Illuminate\Foundation\Testing\WithFaker;
class SetupDevEnvironment extends Command class SetupDevEnvironment extends Command
{ {
@@ -107,7 +106,7 @@ class SetupDevEnvironment extends Command
'timezone' => $this->faker->randomElement(['+1.0', '+2.0', '+3.0']), 'timezone' => $this->faker->randomElement(['+1.0', '+2.0', '+3.0']),
]); ]);
Storage::putFileAs("avatars", storage_path("demo/avatars/avatar-01.png"), 'avatar-01.png', "private"); Storage::putFileAs('avatars', storage_path('demo/avatars/avatar-01.png'), 'avatar-01.png', 'private');
// Show user credentials // Show user credentials
$this->info('Default admin account created. Email: howdy@hi5ve.digital and Password: vuefilemanager'); $this->info('Default admin account created. Email: howdy@hi5ve.digital and Password: vuefilemanager');
@@ -126,7 +125,6 @@ class SetupDevEnvironment extends Command
'avatar' => 'avatar-03.png', 'avatar' => 'avatar-03.png',
], ],
])->each(function ($user) { ])->each(function ($user) {
$newbie = User::forceCreate([ $newbie = User::forceCreate([
'role' => 'user', 'role' => 'user',
'email' => $this->faker->email, 'email' => $this->faker->email,
@@ -148,7 +146,7 @@ class SetupDevEnvironment extends Command
'timezone' => $this->faker->randomElement(['+1.0', '+2.0', '+3.0']), 'timezone' => $this->faker->randomElement(['+1.0', '+2.0', '+3.0']),
]); ]);
Storage::putFileAs("avatars", storage_path("demo/avatars/{$user['avatar']}"), $user['avatar'], "private"); Storage::putFileAs('avatars', storage_path("demo/avatars/{$user['avatar']}"), $user['avatar'], 'private');
$this->info("Generated user with email: $newbie->email and Password: vuefilemanager"); $this->info("Generated user with email: $newbie->email and Password: vuefilemanager");
}); });
@@ -169,12 +167,12 @@ class SetupDevEnvironment extends Command
'author' => 'user', 'author' => 'user',
'name' => 'Shared Folder', 'name' => 'Shared Folder',
'emoji' => [ 'emoji' => [
"codes" => "1F680", 'codes' => '1F680',
"char" => "🚀", 'char' => '🚀',
"name" => "rocket", 'name' => 'rocket',
"category" => "Travel & Places (transport-air)", 'category' => 'Travel & Places (transport-air)',
"group" => "Travel & Places", 'group' => 'Travel & Places',
"subgroup" => "transport-air" 'subgroup' => 'transport-air',
], ],
'created_at' => now(), 'created_at' => now(),
]); ]);
@@ -220,7 +218,7 @@ class SetupDevEnvironment extends Command
'user_id' => $user->id, 'user_id' => $user->id,
'parent_id' => $random_pics->id, 'parent_id' => $random_pics->id,
'author' => 'user', 'author' => 'user',
'name' => "Nature", 'name' => 'Nature',
'emoji' => [ 'emoji' => [
'codes' => '26F0', 'codes' => '26F0',
'char' => '⛰', 'char' => '⛰',
@@ -236,7 +234,7 @@ class SetupDevEnvironment extends Command
'user_id' => $user->id, 'user_id' => $user->id,
'parent_id' => $random_pics->id, 'parent_id' => $random_pics->id,
'author' => 'user', 'author' => 'user',
'name' => "Apartments", 'name' => 'Apartments',
'emoji' => [ 'emoji' => [
'codes' => '1F3E0', 'codes' => '1F3E0',
'char' => '🏠', 'char' => '🏠',
@@ -261,7 +259,7 @@ class SetupDevEnvironment extends Command
'user_id' => $user->id, 'user_id' => $user->id,
'parent_id' => $playable_media->id, 'parent_id' => $playable_media->id,
'author' => 'user', 'author' => 'user',
'name' => "Video", 'name' => 'Video',
]); ]);
$audio = Folder::factory(Folder::class) $audio = Folder::factory(Folder::class)
@@ -269,7 +267,7 @@ class SetupDevEnvironment extends Command
'user_id' => $user->id, 'user_id' => $user->id,
'parent_id' => $playable_media->id, 'parent_id' => $playable_media->id,
'author' => 'user', 'author' => 'user',
'name' => "Audio", 'name' => 'Audio',
]); ]);
// 4. // 4.
@@ -286,7 +284,7 @@ class SetupDevEnvironment extends Command
'user_id' => $user->id, 'user_id' => $user->id,
'parent_id' => $multi_level->id, 'parent_id' => $multi_level->id,
'author' => 'user', 'author' => 'user',
'name' => "First Level", 'name' => 'First Level',
]); ]);
$second_level = Folder::factory(Folder::class) $second_level = Folder::factory(Folder::class)
@@ -294,7 +292,7 @@ class SetupDevEnvironment extends Command
'user_id' => $user->id, 'user_id' => $user->id,
'parent_id' => $first_level->id, 'parent_id' => $first_level->id,
'author' => 'user', 'author' => 'user',
'name' => "Second Level", 'name' => 'Second Level',
]); ]);
$third_level = Folder::factory(Folder::class) $third_level = Folder::factory(Folder::class)
@@ -302,7 +300,7 @@ class SetupDevEnvironment extends Command
'user_id' => $user->id, 'user_id' => $user->id,
'parent_id' => $second_level->id, 'parent_id' => $second_level->id,
'author' => 'user', 'author' => 'user',
'name' => "Third Level", 'name' => 'Third Level',
]); ]);
// 5. // 5.
@@ -367,11 +365,10 @@ class SetupDevEnvironment extends Command
], ],
]) ])
->each(function ($file) use ($user) { ->each(function ($file) use ($user) {
$basename = Str::random(12) . '-' . $file['basename']; $basename = Str::random(12) . '-' . $file['basename'];
// Copy file into app storage // Copy file into app storage
Storage::putFileAs("files/$user->id", storage_path("demo/documents/{$file['basename']}"), $basename, "private"); Storage::putFileAs("files/$user->id", storage_path("demo/documents/{$file['basename']}"), $basename, 'private');
// Create file record // Create file record
File::create([ File::create([
@@ -1,9 +1,8 @@
<?php <?php
namespace App\Console\Commands; namespace App\Console\Commands;
use App\Models\Setting;
use App\Models\User; use App\Models\User;
use App\Models\Setting;
use App\Services\SetupService; use App\Services\SetupService;
use Illuminate\Console\Command; use Illuminate\Console\Command;
@@ -17,7 +16,6 @@ class SetupProdEnvironment extends Command
protected $signature = 'setup:prod'; protected $signature = 'setup:prod';
protected $license = 'Extended'; protected $license = 'Extended';
/** /**
* The console command description. * The console command description.
* *
@@ -165,11 +163,11 @@ class SetupProdEnvironment extends Command
[ [
'name' => 'billing_vat_number', 'name' => 'billing_vat_number',
'value' => null, 'value' => null,
] ],
])->each(function ($col) { ])->each(function ($col) {
Setting::forceCreate([ Setting::forceCreate([
'name' => $col['name'], 'name' => $col['name'],
'value' => $col['value'] 'value' => $col['value'],
]); ]);
}); });
} }
@@ -203,12 +201,12 @@ class SetupProdEnvironment extends Command
{ {
// Migrate database // Migrate database
$this->call('migrate:fresh', [ $this->call('migrate:fresh', [
'--force' => true '--force' => true,
]); ]);
// Generate app key // Generate app key
$this->call('key:generate', [ $this->call('key:generate', [
'--force' => true '--force' => true,
]); ]);
} }
+5 -6
View File
@@ -1,13 +1,12 @@
<?php <?php
namespace App\Console; namespace App\Console;
use App\Console\Commands\SetupDevEnvironment;
use App\Console\Commands\SetupOasisEnvironment;
use App\Services\Oasis\OasisService;
use App\Console\Commands\SetupProdEnvironment;
use App\Services\SchedulerService; use App\Services\SchedulerService;
use App\Services\Oasis\OasisService;
use Illuminate\Console\Scheduling\Schedule; use Illuminate\Console\Scheduling\Schedule;
use App\Console\Commands\SetupDevEnvironment;
use App\Console\Commands\SetupProdEnvironment;
use App\Console\Commands\SetupOasisEnvironment;
use Illuminate\Foundation\Console\Kernel as ConsoleKernel; use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
class Kernel extends ConsoleKernel class Kernel extends ConsoleKernel
@@ -40,7 +39,7 @@ class Kernel extends ConsoleKernel
$schedule->call(function () use ($scheduler) { $schedule->call(function () use ($scheduler) {
$scheduler->delete_old_zips(); $scheduler->delete_old_zips();
if (!is_storage_driver(['local'])) { if (! is_storage_driver(['local'])) {
$scheduler->delete_failed_files(); $scheduler->delete_failed_files();
} }
})->everySixHours(); })->everySixHours();
+1 -4
View File
@@ -1,10 +1,9 @@
<?php <?php
namespace App\Exceptions; namespace App\Exceptions;
use Throwable;
use Illuminate\Database\Eloquent\ModelNotFoundException; use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
use Throwable;
class Handler extends ExceptionHandler class Handler extends ExceptionHandler
{ {
@@ -14,7 +13,6 @@ class Handler extends ExceptionHandler
* @var array * @var array
*/ */
protected $dontReport = [ protected $dontReport = [
//
]; ];
/** /**
@@ -52,7 +50,6 @@ class Handler extends ExceptionHandler
public function render($request, Throwable $exception) public function render($request, Throwable $exception)
{ {
if ($exception instanceof ModelNotFoundException) { if ($exception instanceof ModelNotFoundException) {
return response() return response()
->redirectTo('/not-found')->setStatusCode(404); ->redirectTo('/not-found')->setStatusCode(404);
} }
@@ -1,15 +1,13 @@
<?php <?php
namespace App\Http\Controllers\Admin; namespace App\Http\Controllers\Admin;
use App\Models\File; use DB;
use App\Http\Controllers\Controller;
use App\Http\Resources\UsersCollection;
use App\Services\StripeService;
use App\Models\User; use App\Models\User;
use ByteUnits\Metric; use ByteUnits\Metric;
use DB; use App\Services\StripeService;
use Laravel\Cashier\Subscription; use Laravel\Cashier\Subscription;
use App\Http\Controllers\Controller;
use App\Http\Resources\UsersCollection;
class DashboardController extends Controller class DashboardController extends Controller
{ {
@@ -1,14 +1,11 @@
<?php <?php
namespace App\Http\Controllers\Admin; namespace App\Http\Controllers\Admin;
use App\Http\Controllers\Controller;
use App\Http\Resources\InvoiceAdminCollection;
use App\Http\Resources\InvoiceResource;
use App\Models\Invoice; use App\Models\Invoice;
use App\Services\StripeService; use App\Services\StripeService;
use App\Models\Setting; use App\Http\Controllers\Controller;
use Illuminate\Http\Request; use App\Http\Resources\InvoiceResource;
use App\Http\Resources\InvoiceAdminCollection;
class InvoiceController extends Controller class InvoiceController extends Controller
{ {
@@ -1,15 +1,14 @@
<?php <?php
namespace App\Http\Controllers\Admin; namespace App\Http\Controllers\Admin;
use App\Http\Resources\LanguageCollection;
use App\Http\Resources\LanguageResource;
use App\Models\Language;
use App\Http\Controllers\Controller;
use App\Models\Setting; use App\Models\Setting;
use App\Models\Language;
use Illuminate\Http\Response;
use App\Http\Controllers\Controller;
use App\Http\Resources\LanguageResource;
use App\Http\Resources\LanguageCollection;
use Illuminate\Contracts\Foundation\Application; use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\Routing\ResponseFactory; use Illuminate\Contracts\Routing\ResponseFactory;
use Illuminate\Http\Response;
use App\Http\Requests\Languages\UpdateStringRequest; use App\Http\Requests\Languages\UpdateStringRequest;
use App\Http\Requests\Languages\CreateLanguageRequest; use App\Http\Requests\Languages\CreateLanguageRequest;
use App\Http\Requests\Languages\UpdateLanguageRequest; use App\Http\Requests\Languages\UpdateLanguageRequest;
@@ -24,7 +23,8 @@ class LanguageController extends Controller
public function get_languages() public function get_languages()
{ {
return response( return response(
new LanguageCollection(Language::sortable(['created_at', 'DESC'])->get()), 200 new LanguageCollection(Language::sortable(['created_at', 'DESC'])->get()),
200
); );
} }
@@ -36,7 +36,8 @@ class LanguageController extends Controller
public function get_language(Language $language) public function get_language(Language $language)
{ {
return response( return response(
new LanguageResource($language), 200 new LanguageResource($language),
200
); );
} }
@@ -53,11 +54,12 @@ class LanguageController extends Controller
$language = Language::create([ $language = Language::create([
'name' => $request->input('name'), 'name' => $request->input('name'),
'locale' => $request->input('locale') 'locale' => $request->input('locale'),
]); ]);
return response( return response(
new LanguageResource($language), 201 new LanguageResource($language),
201
); );
} }
@@ -75,7 +77,8 @@ class LanguageController extends Controller
$language->update(make_single_input($request)); $language->update(make_single_input($request));
return response( return response(
new LanguageResource($language), 201 new LanguageResource($language),
201
); );
} }
@@ -95,13 +98,14 @@ class LanguageController extends Controller
->languageTranslations() ->languageTranslations()
->where('key', $request->name) ->where('key', $request->name)
->update([ ->update([
'value' => $request->value 'value' => $request->value,
]); ]);
cache()->forget("language-translations-{$language->locale}"); cache()->forget("language-translations-{$language->locale}");
return response( return response(
'Done', 204 'Done',
204
); );
} }
@@ -130,7 +134,8 @@ class LanguageController extends Controller
$language->delete(); $language->delete();
return response( return response(
'Done', 204 'Done',
204
); );
} }
} }
@@ -1,15 +1,14 @@
<?php <?php
namespace App\Http\Controllers\Admin; namespace App\Http\Controllers\Admin;
use App\Http\Controllers\Controller;
use App\Http\Resources\PageCollection;
use App\Http\Resources\PageResource;
use App\Services\DemoService;
use App\Models\Page; use App\Models\Page;
use Illuminate\Contracts\Routing\ResponseFactory;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\Services\DemoService;
use Illuminate\Http\Response; use Illuminate\Http\Response;
use App\Http\Controllers\Controller;
use App\Http\Resources\PageResource;
use App\Http\Resources\PageCollection;
use Illuminate\Contracts\Routing\ResponseFactory;
class PagesController extends Controller class PagesController extends Controller
{ {
+10 -14
View File
@@ -1,23 +1,20 @@
<?php <?php
namespace App\Http\Controllers\Admin; namespace App\Http\Controllers\Admin;
use App\Http\Controllers\Controller;
use App\Http\Resources\PlanCollection;
use App\Http\Resources\PlanResource;
use App\Http\Resources\UserResource;
use App\Http\Resources\UsersCollection;
use App\Services\DemoService;
use App\Models\Plan; use App\Models\Plan;
use App\Services\StripeService;
use App\Models\User; use App\Models\User;
use Illuminate\Http\Request;
use App\Services\DemoService;
use Illuminate\Http\Response;
use App\Services\StripeService;
use Laravel\Cashier\Subscription;
use App\Http\Controllers\Controller;
use App\Http\Resources\PlanResource;
use Illuminate\Support\Facades\Cache;
use App\Http\Resources\PlanCollection;
use App\Http\Resources\UsersCollection;
use Illuminate\Contracts\Foundation\Application; use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\Routing\ResponseFactory; use Illuminate\Contracts\Routing\ResponseFactory;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Illuminate\Support\Facades\Cache;
use Laravel\Cashier\Subscription;
use Rinvex\Subscriptions\Models\PlanFeature;
class PlanController extends Controller class PlanController extends Controller
{ {
@@ -79,7 +76,6 @@ class PlanController extends Controller
{ {
// TODO: inline request // TODO: inline request
if (is_demo()) { if (is_demo()) {
if (Cache::has('plan-starter-pack')) { if (Cache::has('plan-starter-pack')) {
$plan = Cache::get('plan-starter-pack'); $plan = Cache::get('plan-starter-pack');
} else { } else {
@@ -1,14 +1,13 @@
<?php <?php
namespace App\Http\Controllers\Admin; namespace App\Http\Controllers\Admin;
use App\Http\Controllers\Controller;
use App\Services\DemoService;
use App\Models\Setting;
use Artisan;
use Stripe; use Stripe;
use Cartalyst\Stripe\Exception\UnauthorizedException; use Artisan;
use App\Models\Setting;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\Services\DemoService;
use App\Http\Controllers\Controller;
use Cartalyst\Stripe\Exception\UnauthorizedException;
use Symfony\Component\HttpKernel\Exception\HttpException; use Symfony\Component\HttpKernel\Exception\HttpException;
class SettingController extends Controller class SettingController extends Controller
@@ -30,7 +29,6 @@ class SettingController extends Controller
public function show(Request $request) public function show(Request $request)
{ {
if (strpos($request->column, '|') !== false) { if (strpos($request->column, '|') !== false) {
$columns = explode('|', $request->column); $columns = explode('|', $request->column);
return Setting::whereIn('name', $columns) return Setting::whereIn('name', $columns)
@@ -54,12 +52,11 @@ class SettingController extends Controller
// Store image if exist // Store image if exist
if ($request->hasFile($request->name)) { if ($request->hasFile($request->name)) {
// Find and update image path // Find and update image path
Setting::updateOrCreate([ Setting::updateOrCreate([
'name' => $request->name 'name' => $request->name,
], [ ], [
'value' => store_system_image($request, $request->name) 'value' => store_system_image($request, $request->name),
]); ]);
return response('Done', 204); return response('Done', 204);
@@ -86,8 +83,7 @@ class SettingController extends Controller
// Abort in demo mode // Abort in demo mode
abort_if(is_demo(), 204, 'Done.'); abort_if(is_demo(), 204, 'Done.');
if (!app()->runningUnitTests()) { if (! app()->runningUnitTests()) {
setEnvironmentValue([ setEnvironmentValue([
'MAIL_DRIVER' => $request->driver, 'MAIL_DRIVER' => $request->driver,
'MAIL_HOST' => $request->host, 'MAIL_HOST' => $request->host,
@@ -120,14 +116,12 @@ class SettingController extends Controller
// Try to get stripe account details // Try to get stripe account details
try { try {
if (!app()->runningUnitTests()) { if (! app()->runningUnitTests()) {
Stripe::make($request->secret, '2020-03-02') Stripe::make($request->secret, '2020-03-02')
->account() ->account()
->details(); ->details();
} }
} catch (UnauthorizedException $e) { } catch (UnauthorizedException $e) {
throw new HttpException(401, $e->getMessage()); throw new HttpException(401, $e->getMessage());
} }
@@ -152,8 +146,7 @@ class SettingController extends Controller
]); ]);
}); });
if (!app()->runningUnitTests()) { if (! app()->runningUnitTests()) {
// Set stripe credentials to .env // Set stripe credentials to .env
setEnvironmentValue([ setEnvironmentValue([
'CASHIER_CURRENCY' => $request->currency, 'CASHIER_CURRENCY' => $request->currency,
@@ -179,7 +172,7 @@ class SettingController extends Controller
// Abort in demo mode // Abort in demo mode
abort_if(is_demo(), 204, 'Done.'); abort_if(is_demo(), 204, 'Done.');
if (!app()->runningUnitTests()) { if (! app()->runningUnitTests()) {
Artisan::call('cache:clear'); Artisan::call('cache:clear');
Artisan::call('config:clear'); Artisan::call('config:clear');
Artisan::call('config:cache'); Artisan::call('config:cache');
+17 -21
View File
@@ -1,29 +1,25 @@
<?php <?php
namespace App\Http\Controllers\Admin; namespace App\Http\Controllers\Admin;
use App\Models\File; use Storage;
use App\Models\Folder;
use App\Http\Controllers\Controller;
use App\Http\Requests\Admin\ChangeRoleRequest;
use App\Http\Requests\Admin\ChangeStorageCapacityRequest;
use App\Http\Requests\Admin\CreateUserByAdmin;
use App\Http\Requests\Admin\DeleteUserRequest;
use App\Http\Resources\InvoiceCollection;
use App\Http\Resources\UsersCollection;
use App\Http\Resources\UserResource;
use App\Http\Resources\UserStorageResource;
use App\Http\Resources\UserSubscription;
use App\Services\StripeService;
use App\Models\Share;
use App\Models\User; use App\Models\User;
use App\Models\UserSettings; use App\Models\UserSettings;
use Illuminate\Http\Response;
use App\Services\StripeService;
use App\Http\Controllers\Controller;
use App\Http\Resources\UserResource;
use Illuminate\Support\Facades\Auth;
use App\Http\Resources\UsersCollection;
use App\Http\Resources\UserSubscription;
use Illuminate\Support\Facades\Password;
use App\Http\Resources\InvoiceCollection;
use App\Http\Resources\UserStorageResource;
use App\Http\Requests\Admin\ChangeRoleRequest;
use App\Http\Requests\Admin\CreateUserByAdmin;
use App\Http\Requests\Admin\DeleteUserRequest;
use Illuminate\Contracts\Foundation\Application; use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\Routing\ResponseFactory; use Illuminate\Contracts\Routing\ResponseFactory;
use Illuminate\Http\Response; use App\Http\Requests\Admin\ChangeStorageCapacityRequest;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Password;
use Storage;
class UserController extends Controller class UserController extends Controller
{ {
@@ -81,7 +77,7 @@ class UserController extends Controller
*/ */
public function subscription(User $user) public function subscription(User $user)
{ {
if (!$user->stripeId() || !$user->subscription('main')) { if (! $user->stripeId() || ! $user->subscription('main')) {
return response("User doesn't have any subscription.", 404); return response("User doesn't have any subscription.", 404);
} }
@@ -222,7 +218,7 @@ class UserController extends Controller
} }
if ($user->settings->name !== $request->name) { if ($user->settings->name !== $request->name) {
abort(403, "The name you typed is wrong!"); abort(403, 'The name you typed is wrong!');
} }
$user->delete(); $user->delete();
@@ -1,23 +1,22 @@
<?php <?php
namespace App\Http\Controllers\App; namespace App\Http\Controllers\App;
use App\Http\Controllers\Controller;
use App\Http\Mail\SendContactMessage;
use App\Http\Resources\PricingCollection;
use App\Http\Requests\PublicPages\SendContactMessageRequest;
use App\Http\Resources\PageResource;
use App\Models\Language;
use App\Models\Setting;
use App\Models\Page; use App\Models\Page;
use App\Models\Share; use App\Models\Share;
use App\Services\StripeService; use App\Models\Setting;
use Doctrine\DBAL\Driver\PDOException; use App\Models\Language;
use Illuminate\Contracts\Routing\ResponseFactory;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Http\Response; use Illuminate\Http\Response;
use Illuminate\Support\Facades\Cache; use App\Services\StripeService;
use App\Http\Controllers\Controller;
use App\Http\Resources\PageResource;
use Illuminate\Support\Facades\Mail; use Illuminate\Support\Facades\Mail;
use App\Http\Mail\SendContactMessage;
use Illuminate\Support\Facades\Cache;
use Doctrine\DBAL\Driver\PDOException;
use App\Http\Resources\PricingCollection;
use Illuminate\Contracts\Routing\ResponseFactory;
use App\Http\Requests\PublicPages\SendContactMessageRequest;
class AppFunctionsController extends Controller class AppFunctionsController extends Controller
{ {
@@ -55,13 +54,11 @@ class AppFunctionsController extends Controller
// Get all settings // Get all settings
$settings = get_settings_in_json(); $settings = get_settings_in_json();
} catch (PDOException $e) { } catch (PDOException $e) {
$setup_status = 'setup-database'; $setup_status = 'setup-database';
} }
return view("index") return view('index')
->with('settings', $settings ?? null) ->with('settings', $settings ?? null)
->with('legal', $pages ?? null) ->with('legal', $pages ?? null)
->with('installation', $setup_status); ->with('installation', $setup_status);
@@ -85,7 +82,7 @@ class AppFunctionsController extends Controller
$item->setPublicUrl($shared->token); $item->setPublicUrl($shared->token);
} }
return view("vuefilemanager.crawler.og-view") return view('vuefilemanager.crawler.og-view')
->with('settings', get_settings_in_json()) ->with('settings', get_settings_in_json())
->with('metadata', [ ->with('metadata', [
'url' => url('/share', ['token' => $shared->token]), 'url' => url('/share', ['token' => $shared->token]),
@@ -136,7 +133,6 @@ class AppFunctionsController extends Controller
public function get_setting_columns(Request $request) public function get_setting_columns(Request $request)
{ {
if (strpos($request->column, '|') !== false) { if (strpos($request->column, '|') !== false) {
$columns = collect(explode('|', $request->column)) $columns = collect(explode('|', $request->column))
->each(function ($column) { ->each(function ($column) {
if (in_array($column, $this->blacklist)) { if (in_array($column, $this->blacklist)) {
+7 -13
View File
@@ -1,19 +1,14 @@
<?php <?php
namespace App\Http\Controllers\App; namespace App\Http\Controllers\App;
use App\Http\Controllers\Controller;
use App\Models\Language;
use App\Models\LanguageTranslation;
use App\Services\LanguageService;
use Artisan;
use DB;
use Gate; use Gate;
use Artisan;
use App\Models\Language;
use Illuminate\Http\Response;
use App\Services\LanguageService;
use App\Http\Controllers\Controller;
use Illuminate\Contracts\Foundation\Application; use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\Routing\ResponseFactory; use Illuminate\Contracts\Routing\ResponseFactory;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Schema;
class Maintenance extends Controller class Maintenance extends Controller
{ {
@@ -61,8 +56,6 @@ class Maintenance extends Controller
resolve(LanguageService::class) resolve(LanguageService::class)
->upgrade_language_translations(); ->upgrade_language_translations();
return response('Done.', 201); return response('Done.', 201);
} }
@@ -75,7 +68,7 @@ class Maintenance extends Controller
Gate::authorize('maintenance'); Gate::authorize('maintenance');
$command = Artisan::call('migrate', [ $command = Artisan::call('migrate', [
'--force' => true '--force' => true,
]); ]);
if ($command === 0) { if ($command === 0) {
@@ -85,6 +78,7 @@ class Maintenance extends Controller
if ($command === 1) { if ($command === 1) {
echo 'Operation failed.'; echo 'Operation failed.';
} }
return $command; return $command;
} }
} }
@@ -1,31 +1,29 @@
<?php <?php
namespace App\Http\Controllers\App; namespace App\Http\Controllers\App;
use App\Http\Controllers\Controller;
use App\Http\Requests\SetupWizard\CreateAdminRequest;
use App\Http\Requests\SetupWizard\StoreAppSetupRequest;
use App\Http\Requests\SetupWizard\StoreDatabaseCredentialsRequest;
use App\Http\Requests\SetupWizard\StoreEnvironmentSetupRequest;
use App\Http\Requests\SetupWizard\StoreStripeBillingRequest;
use App\Http\Requests\SetupWizard\StoreStripeCredentialsRequest;
use App\Http\Requests\SetupWizard\StoreStripePlansRequest;
use App\Services\SetupService;
use App\Services\StripeService;
use App\Models\Setting;
use App\Models\User;
use Artisan;
use Cartalyst\Stripe\Exception\UnauthorizedException;
use Doctrine\DBAL\Driver\PDOException;
use Illuminate\Contracts\Routing\ResponseFactory;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Http;
use Illuminate\Support\Str;
use Schema; use Schema;
use Stripe; use Stripe;
use Artisan;
use App\Models\User;
use App\Models\Setting;
use Illuminate\Support\Str;
use Illuminate\Http\Request;
use App\Services\SetupService;
use App\Services\StripeService;
use Illuminate\Support\Facades\DB;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Http;
use Doctrine\DBAL\Driver\PDOException;
use Illuminate\Contracts\Routing\ResponseFactory;
use Cartalyst\Stripe\Exception\UnauthorizedException;
use App\Http\Requests\SetupWizard\StoreAppSetupRequest;
use Symfony\Component\HttpKernel\Exception\HttpException; use Symfony\Component\HttpKernel\Exception\HttpException;
use App\Http\Requests\SetupWizard\StoreStripePlansRequest;
use App\Http\Requests\SetupWizard\StoreStripeBillingRequest;
use App\Http\Requests\SetupWizard\StoreEnvironmentSetupRequest;
use App\Http\Requests\SetupWizard\StoreStripeCredentialsRequest;
use App\Http\Requests\SetupWizard\StoreDatabaseCredentialsRequest;
class SetupWizardController extends Controller class SetupWizardController extends Controller
{ {
@@ -66,8 +64,7 @@ class SetupWizardController extends Controller
*/ */
public function setup_database(StoreDatabaseCredentialsRequest $request) public function setup_database(StoreDatabaseCredentialsRequest $request)
{ {
if (!app()->runningUnitTests()) { if (! app()->runningUnitTests()) {
try { try {
// Set temporary database connection // Set temporary database connection
config(['database.connections.test.driver' => $request->connection]); config(['database.connections.test.driver' => $request->connection]);
@@ -79,7 +76,6 @@ class SetupWizardController extends Controller
// Test connection // Test connection
\DB::connection('test')->getPdo(); \DB::connection('test')->getPdo();
} catch (PDOException $e) { } catch (PDOException $e) {
throw new HttpException(500, $e->getMessage()); throw new HttpException(500, $e->getMessage());
} }
@@ -98,11 +94,11 @@ class SetupWizardController extends Controller
Artisan::call('config:cache'); Artisan::call('config:cache');
Artisan::call('key:generate', [ Artisan::call('key:generate', [
'--force' => true '--force' => true,
]); ]);
Artisan::call('migrate:fresh', [ Artisan::call('migrate:fresh', [
'--force' => true '--force' => true,
]); ]);
} }
@@ -123,15 +119,13 @@ class SetupWizardController extends Controller
*/ */
public function store_stripe_credentials(StoreStripeCredentialsRequest $request) public function store_stripe_credentials(StoreStripeCredentialsRequest $request)
{ {
if (!app()->runningUnitTests()) { if (! app()->runningUnitTests()) {
// Create stripe instance // Create stripe instance
$stripe = Stripe::make($request->secret, '2020-03-02'); $stripe = Stripe::make($request->secret, '2020-03-02');
try { try {
// Try to get stripe account details // Try to get stripe account details
$stripe->account()->details(); $stripe->account()->details();
} catch (UnauthorizedException $e) { } catch (UnauthorizedException $e) {
throw new HttpException(401, $e->getMessage()); throw new HttpException(401, $e->getMessage());
} }
@@ -158,8 +152,7 @@ class SetupWizardController extends Controller
]); ]);
}); });
if (!app()->runningUnitTests()) { if (! app()->runningUnitTests()) {
// Set stripe credentials to .env // Set stripe credentials to .env
setEnvironmentValue([ setEnvironmentValue([
'CASHIER_CURRENCY' => $request->currency, 'CASHIER_CURRENCY' => $request->currency,
@@ -224,7 +217,7 @@ class SetupWizardController extends Controller
]); ]);
}); });
if (!app()->runningUnitTests()) { if (! app()->runningUnitTests()) {
Artisan::call('config:cache'); Artisan::call('config:cache');
} }
@@ -254,8 +247,7 @@ class SetupWizardController extends Controller
*/ */
public function store_environment_setup(StoreEnvironmentSetupRequest $request) public function store_environment_setup(StoreEnvironmentSetupRequest $request)
{ {
if (!app()->runningUnitTests()) { if (! app()->runningUnitTests()) {
$drivers = [ $drivers = [
'local' => [ 'local' => [
'FILESYSTEM_DRIVER' => 'local', 'FILESYSTEM_DRIVER' => 'local',
@@ -312,7 +304,6 @@ class SetupWizardController extends Controller
Artisan::call('config:cache'); Artisan::call('config:cache');
} }
return response('Done', 204); return response('Done', 204);
} }
@@ -380,7 +371,7 @@ class SetupWizardController extends Controller
]); ]);
}); });
if (!app()->runningUnitTests()) { if (! app()->runningUnitTests()) {
setEnvironmentValue([ setEnvironmentValue([
'APP_NAME' => Str::camel($request->title), 'APP_NAME' => Str::camel($request->title),
]); ]);
@@ -435,7 +426,7 @@ class SetupWizardController extends Controller
[ [
'name' => 'purchase_code', 'name' => 'purchase_code',
'value' => $request->purchase_code, 'value' => $request->purchase_code,
] ],
])->each(function ($col) { ])->each(function ($col) {
Setting::forceCreate([ Setting::forceCreate([
'name' => $col['name'], 'name' => $col['name'],
@@ -450,7 +441,6 @@ class SetupWizardController extends Controller
// Login account // Login account
if (Auth::attempt($request->only(['email', 'password']))) { if (Auth::attempt($request->only(['email', 'password']))) {
$request->session()->regenerate(); $request->session()->regenerate();
return response('Registration was successful', 204); return response('Registration was successful', 204);
@@ -474,9 +464,7 @@ class SetupWizardController extends Controller
if (Schema::hasTable('settings') && get_setting('setup_wizard_success')) { if (Schema::hasTable('settings') && get_setting('setup_wizard_success')) {
abort(410, 'Gone'); abort(410, 'Gone');
} }
} catch (PDOException $e) { } catch (PDOException $e) {
return false; return false;
} }
} }
+1 -3
View File
@@ -1,14 +1,12 @@
<?php <?php
namespace App\Http\Controllers\Auth; namespace App\Http\Controllers\Auth;
use App\Http\Requests\Auth\CheckAccountRequest;
use App\Models\User; use App\Models\User;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Http\Requests\Auth\CheckAccountRequest;
class AuthController extends Controller class AuthController extends Controller
{ {
/** /**
* Check if user account exist * Check if user account exist
* *
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http\Controllers\Auth; namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
@@ -1,17 +1,10 @@
<?php <?php
namespace App\Http\Controllers\Auth; namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use App\Mail\TestMail;
use App\Notifications\ResetPassword;
use App\Notifications\ResetUserPasswordNotification;
use App\Models\User;
use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Lang; use Illuminate\Support\Facades\Lang;
use Illuminate\Support\Facades\Mail; use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
use Illuminate\Support\Facades\Notification;
class ForgotPasswordController extends Controller class ForgotPasswordController extends Controller
{ {
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http\Controllers\Auth; namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
@@ -1,12 +1,11 @@
<?php <?php
namespace App\Http\Controllers\Auth; namespace App\Http\Controllers\Auth;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Lang;
use App\Providers\RouteServiceProvider; use App\Providers\RouteServiceProvider;
use Illuminate\Foundation\Auth\ResetsPasswords; use Illuminate\Foundation\Auth\ResetsPasswords;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Lang;
class ResetPasswordController extends Controller class ResetPasswordController extends Controller
{ {
@@ -30,7 +29,6 @@ class ResetPasswordController extends Controller
*/ */
protected $redirectTo = RouteServiceProvider::HOME; protected $redirectTo = RouteServiceProvider::HOME;
/** /**
* Get the response for a successful password reset. * Get the response for a successful password reset.
* *
@@ -40,7 +38,6 @@ class ResetPasswordController extends Controller
*/ */
protected function sendResetResponse(Request $request, $response) protected function sendResetResponse(Request $request, $response)
{ {
return response(['message' => Lang::get($response)]); return response(['message' => Lang::get($response)]);
} }
@@ -53,7 +50,6 @@ class ResetPasswordController extends Controller
*/ */
protected function sendResetFailedResponse(Request $request, $response) protected function sendResetFailedResponse(Request $request, $response)
{ {
return response(['error' => Lang::get($response)], 422); return response(['error' => Lang::get($response)], 422);
} }
} }
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http\Controllers\Auth; namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
+2 -3
View File
@@ -1,11 +1,10 @@
<?php <?php
namespace App\Http\Controllers; namespace App\Http\Controllers;
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
use Illuminate\Foundation\Bus\DispatchesJobs; use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Routing\Controller as BaseController; use Illuminate\Routing\Controller as BaseController;
use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
class Controller extends BaseController class Controller extends BaseController
{ {
@@ -1,16 +1,15 @@
<?php <?php
namespace App\Http\Controllers\FileManager; namespace App\Http\Controllers\FileManager;
use App\Http\Requests\FileBrowser\SearchRequest;
use App\Models\User;
use Illuminate\Support\Facades\Auth;
use App\Http\Controllers\Controller;
use Illuminate\Support\Collection;
use Illuminate\Http\Request;
use App\Models\Folder;
use App\Models\File; use App\Models\File;
use App\Models\User;
use App\Models\Share; use App\Models\Share;
use App\Models\Folder;
use Illuminate\Http\Request;
use Illuminate\Support\Collection;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
use App\Http\Requests\FileBrowser\SearchRequest;
class BrowseController extends Controller class BrowseController extends Controller
{ {
@@ -27,7 +26,6 @@ class BrowseController extends Controller
// Get folder trash items // Get folder trash items
if ($request->query('trash')) { if ($request->query('trash')) {
// Get folders and files // Get folders and files
$folders = Folder::onlyTrashed() $folders = Folder::onlyTrashed()
->with('parent') ->with('parent')
@@ -105,7 +103,7 @@ class BrowseController extends Controller
$files_trashed = File::onlyTrashed() $files_trashed = File::onlyTrashed()
->with(['parent']) ->with(['parent'])
->where('user_id', $user_id) ->where('user_id', $user_id)
->where(function($query) use ($folders_trashed) { ->where(function ($query) use ($folders_trashed) {
$query->whereNull('folder_id'); $query->whereNull('folder_id');
$query->orWhereNotIn('folder_id', array_values(array_unique(recursiveFind($folders_trashed->toArray(), 'id')))); $query->orWhereNotIn('folder_id', array_values(array_unique(recursiveFind($folders_trashed->toArray(), 'id'))));
}) })
@@ -185,7 +183,7 @@ class BrowseController extends Controller
'name' => __t('home'), 'name' => __t('home'),
'location' => 'base', 'location' => 'base',
'folders' => $folders, 'folders' => $folders,
] ],
]; ];
} }
@@ -1,24 +1,22 @@
<?php <?php
namespace App\Http\Controllers\FileManager; namespace App\Http\Controllers\FileManager;
use App\Http\Requests\FileFunctions\CreateFolderRequest; use Exception;
use App\Models\File;
use App\Models\Folder;
use Illuminate\Http\Request;
use App\Services\DemoService;
use App\Services\HelperService;
use App\Http\Controllers\Controller;
use App\Services\FileManagerService;
use Illuminate\Support\Facades\Auth;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Contracts\Routing\ResponseFactory;
use App\Http\Requests\FileFunctions\UploadRequest;
use App\Http\Requests\FileFunctions\MoveItemRequest;
use App\Http\Requests\FileFunctions\DeleteItemRequest; use App\Http\Requests\FileFunctions\DeleteItemRequest;
use App\Http\Requests\FileFunctions\RenameItemRequest; use App\Http\Requests\FileFunctions\RenameItemRequest;
use App\Http\Requests\FileFunctions\MoveItemRequest; use App\Http\Requests\FileFunctions\CreateFolderRequest;
use App\Http\Requests\FileFunctions\UploadRequest;
use App\Services\DemoService;
use App\Services\FileManagerService;
use App\Services\HelperService;
use Illuminate\Contracts\Routing\ResponseFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use App\Http\Controllers\Controller;
use App\Models\Folder;
use App\Models\File;
use Exception;
class EditItemsController extends Controller class EditItemsController extends Controller
{ {
@@ -134,7 +132,7 @@ class EditItemsController extends Controller
$folder = Folder::whereUserId(Auth::id()) $folder = Folder::whereUserId(Auth::id())
->where('id', $id); ->where('id', $id);
if (!$folder->exists()) { if (! $folder->exists()) {
abort(404, "Requested folder doesn't exists."); abort(404, "Requested folder doesn't exists.");
} }
@@ -1,13 +1,12 @@
<?php <?php
namespace App\Http\Controllers\FileManager; namespace App\Http\Controllers\FileManager;
use App\Services\DemoService;
use App\Models\Folder; use App\Models\Folder;
use Illuminate\Support\Facades\Validator; use Illuminate\Http\Request;
use App\Services\DemoService;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use Illuminate\Http\Request; use Illuminate\Support\Facades\Validator;
class FavouriteController extends Controller class FavouriteController extends Controller
{ {
@@ -30,7 +29,6 @@ class FavouriteController extends Controller
// todo: pridat validator ako AddToFavouritesRequest // todo: pridat validator ako AddToFavouritesRequest
foreach ($request->folders as $id) { foreach ($request->folders as $id) {
// Get user & folder // Get user & folder
$user = Auth::user(); $user = Auth::user();
@@ -1,13 +1,12 @@
<?php <?php
namespace App\Http\Controllers\FileManager; namespace App\Http\Controllers\FileManager;
use App\Http\Controllers\Controller;
use App\Models\Zip; use App\Models\Zip;
use App\Services\HelperService;
use Illuminate\Support\Facades\Auth;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\Services\HelperService;
use App\Models\File as UserFile; use App\Models\File as UserFile;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Storage;
class FileAccessController extends Controller class FileAccessController extends Controller
@@ -29,7 +28,7 @@ class FileAccessController extends Controller
public function get_avatar($basename) public function get_avatar($basename)
{ {
// Check if file exist // Check if file exist
if (!Storage::exists("/avatars/$basename")) { if (! Storage::exists("/avatars/$basename")) {
abort(404); abort(404);
} }
@@ -47,7 +46,7 @@ class FileAccessController extends Controller
public function get_system_image($basename) public function get_system_image($basename)
{ {
// Check if file exist // Check if file exist
if (!Storage::exists("/system/$basename")) { if (! Storage::exists("/system/$basename")) {
abort(404); abort(404);
} }
@@ -81,10 +80,9 @@ class FileAccessController extends Controller
$this->check_file_access($shared, $file); $this->check_file_access($shared, $file);
}*/ }*/
// Store user download size // Store user download size
$request->user()->record_download( $request->user()->record_download(
(int)$file->getRawOriginal('filesize') (int) $file->getRawOriginal('filesize')
); );
return $this->helper->download_file($file, Auth::id()); return $this->helper->download_file($file, Auth::id());
@@ -111,11 +109,11 @@ class FileAccessController extends Controller
); );
return $disk->download("zip/$zip->basename", $zip->basename, [ return $disk->download("zip/$zip->basename", $zip->basename, [
"Content-Type" => 'application/zip', 'Content-Type' => 'application/zip',
"Content-Length" => $disk->size("zip/$zip->basename"), 'Content-Length' => $disk->size("zip/$zip->basename"),
"Accept-Ranges" => "bytes", 'Accept-Ranges' => 'bytes',
"Content-Range" => "bytes 0-600/" . $disk->size("zip/$zip->basename"), 'Content-Range' => 'bytes 0-600/' . $disk->size("zip/$zip->basename"),
"Content-Disposition" => "attachment; filename=$zip->basename", 'Content-Disposition' => "attachment; filename=$zip->basename",
]); ]);
} }
@@ -1,19 +1,18 @@
<?php <?php
namespace App\Http\Controllers\FileManager; namespace App\Http\Controllers\FileManager;
use Validator;
use App\Models\Zip;
use App\Models\Share;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
use App\Http\Resources\ShareResource;
use App\Notifications\SharedSendViaEmail;
use Illuminate\Support\Facades\Notification;
use App\Http\Requests\Share\CreateShareRequest; use App\Http\Requests\Share\CreateShareRequest;
use App\Http\Requests\Share\UpdateShareRequest; use App\Http\Requests\Share\UpdateShareRequest;
use App\Http\Resources\ShareResource;
use App\Models\Share;
use App\Models\Zip;
use App\Notifications\SharedSendViaEmail;
use Illuminate\Contracts\Routing\ResponseFactory; use Illuminate\Contracts\Routing\ResponseFactory;
use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Notification;
use Validator;
class ShareController extends Controller class ShareController extends Controller
{ {
@@ -52,9 +51,7 @@ class ShareController extends Controller
// Send shared link via email // Send shared link via email
if ($request->has('emails')) { if ($request->has('emails')) {
foreach ($request->emails as $email) { foreach ($request->emails as $email) {
Notification::route('mail', $email)->notify( Notification::route('mail', $email)->notify(
new SharedSendViaEmail($shared->token) new SharedSendViaEmail($shared->token)
); );
@@ -100,7 +97,6 @@ class ShareController extends Controller
public function destroy(Request $request) public function destroy(Request $request)
{ {
foreach ($request->tokens as $token) { foreach ($request->tokens as $token) {
// Get sharing record // Get sharing record
Share::where('token', $token) Share::where('token', $token)
->where('user_id', Auth::id()) ->where('user_id', Auth::id())
@@ -141,7 +137,6 @@ class ShareController extends Controller
// Send shared link via email // Send shared link via email
if ($request->has('emails')) { if ($request->has('emails')) {
foreach ($request->emails as $email) { foreach ($request->emails as $email) {
Notification::route('mail', $email) Notification::route('mail', $email)
->notify(new SharedSendViaEmail($token)); ->notify(new SharedSendViaEmail($token));
@@ -1,16 +1,15 @@
<?php <?php
namespace App\Http\Controllers\FileManager; namespace App\Http\Controllers\FileManager;
use App\Models\File;
use App\Models\Folder;
use Illuminate\Http\Request;
use App\Services\DemoService; use App\Services\DemoService;
use Illuminate\Contracts\Routing\ResponseFactory;
use Illuminate\Support\Facades\Validator;
use Illuminate\Support\Facades\Storage;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use Illuminate\Http\Request; use Illuminate\Support\Facades\Storage;
use App\Models\Folder; use Illuminate\Support\Facades\Validator;
use App\Models\File; use Illuminate\Contracts\Routing\ResponseFactory;
class TrashController extends Controller class TrashController extends Controller
{ {
@@ -38,7 +37,9 @@ class TrashController extends Controller
]); ]);
// Return error // Return error
if ($validator->fails()) abort(400, 'Bad input'); if ($validator->fails()) {
abort(400, 'Bad input');
}
// Get user id // Get user id
$user_id = Auth::id(); $user_id = Auth::id();
@@ -46,10 +47,8 @@ class TrashController extends Controller
abort_if(is_demo_account('howdy@hi5ve.digital'), 204, 'Done.'); abort_if(is_demo_account('howdy@hi5ve.digital'), 204, 'Done.');
foreach ($request->input('items') as $restore) { foreach ($request->input('items') as $restore) {
// Get folder // Get folder
if ($restore['type'] === 'folder') { if ($restore['type'] === 'folder') {
// Get folder // Get folder
$item = Folder::onlyTrashed() $item = Folder::onlyTrashed()
->where('user_id', $user_id) ->where('user_id', $user_id)
@@ -62,7 +61,6 @@ class TrashController extends Controller
$item->save(); $item->save();
} }
} else { } else {
// Get item // Get item
$item = File::onlyTrashed() $item = File::onlyTrashed()
->where('user_id', $user_id) ->where('user_id', $user_id)
@@ -105,7 +103,6 @@ class TrashController extends Controller
// Force delete files // Force delete files
foreach ($files as $file) { foreach ($files as $file) {
// Delete file // Delete file
Storage::delete("/files/$user_id/{$file->basename}"); Storage::delete("/files/$user_id/{$file->basename}");
@@ -1,20 +1,19 @@
<?php <?php
namespace App\Http\Controllers\Sharing; namespace App\Http\Controllers\Sharing;
use App\Http\Controllers\Controller;
use App\Http\Requests\Share\AuthenticateShareRequest;
use App\Http\Resources\FileResource;
use App\Http\Resources\ShareResource;
use App\Models\File; use App\Models\File;
use App\Models\Folder;
use App\Models\Share; use App\Models\Share;
use App\Services\HelperService; use App\Models\Folder;
use Illuminate\Http\Request;
use Illuminate\Support\Arr; use Illuminate\Support\Arr;
use Illuminate\Http\Request;
use App\Services\HelperService;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use App\Http\Controllers\Controller;
use App\Http\Resources\FileResource;
use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Hash;
use App\Http\Resources\ShareResource;
use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Storage;
use App\Http\Requests\Share\AuthenticateShareRequest;
class BrowseShareController extends Controller class BrowseShareController extends Controller
{ {
@@ -38,27 +37,25 @@ class BrowseShareController extends Controller
} }
// Check if shared is image file and then show it // Check if shared is image file and then show it
if ($shared->type === 'file' && !$shared->is_protected) { if ($shared->type === 'file' && ! $shared->is_protected) {
$image = File::whereUserId($shared->user_id) $image = File::whereUserId($shared->user_id)
->whereType('image') ->whereType('image')
->whereId($shared->item_id) ->whereId($shared->item_id)
->first(); ->first();
if ($image) { if ($image) {
// Store user download size // Store user download size
$shared $shared
->user ->user
->record_download( ->record_download(
(int)$image->getRawOriginal('filesize') (int) $image->getRawOriginal('filesize')
); );
return $this->get_single_image($image, $shared->user_id); return $this->get_single_image($image, $shared->user_id);
} }
} }
return view("index") return view('index')
->with('installation', 'setup-done') ->with('installation', 'setup-done')
->with('settings', get_settings_in_json() ?? null); ->with('settings', get_settings_in_json() ?? null);
} }
@@ -74,7 +71,6 @@ class BrowseShareController extends Controller
{ {
// Check password // Check password
if (Hash::check($request->password, $shared->password)) { if (Hash::check($request->password, $shared->password)) {
$cookie = json_encode([ $cookie = json_encode([
'token' => $shared->token, 'token' => $shared->token,
'authenticated' => true, 'authenticated' => true,
@@ -151,7 +147,6 @@ class BrowseShareController extends Controller
// Filter files // Filter files
$files = $searched_files->filter(function ($file) use ($accessible_folder_ids, $shared) { $files = $searched_files->filter(function ($file) use ($accessible_folder_ids, $shared) {
// Set public urls // Set public urls
$file->setPublicUrl($shared->token); $file->setPublicUrl($shared->token);
@@ -161,7 +156,6 @@ class BrowseShareController extends Controller
// Filter folders // Filter folders
$folders = $searched_folders->filter(function ($folder) use ($accessible_folder_ids) { $folders = $searched_folders->filter(function ($folder) use ($accessible_folder_ids) {
// check if item is in accessible folders // check if item is in accessible folders
return in_array($folder->id, $accessible_folder_ids); return in_array($folder->id, $accessible_folder_ids);
}); });
@@ -198,7 +192,7 @@ class BrowseShareController extends Controller
'name' => __t('home'), 'name' => __t('home'),
'location' => 'public', 'location' => 'public',
'folders' => $folders, 'folders' => $folders,
] ],
]; ];
} }
@@ -240,13 +234,15 @@ class BrowseShareController extends Controller
$path = "/files/$user_id/$file->basename"; $path = "/files/$user_id/$file->basename";
// Check if file exist // Check if file exist
if (!Storage::exists($path)) abort(404); if (! Storage::exists($path)) {
abort(404);
}
return Storage::response($path, $file_pretty_name, [ return Storage::response($path, $file_pretty_name, [
"Content-Type" => Storage::mimeType($path), 'Content-Type' => Storage::mimeType($path),
"Content-Length" => Storage::size($path), 'Content-Length' => Storage::size($path),
"Accept-Ranges" => "bytes", 'Accept-Ranges' => 'bytes',
"Content-Range" => "bytes 0-600/" . Storage::size($path), 'Content-Range' => 'bytes 0-600/' . Storage::size($path),
]); ]);
} }
} }
@@ -1,13 +1,11 @@
<?php <?php
namespace App\Http\Controllers\Sharing; namespace App\Http\Controllers\Sharing;
use App\Http\Controllers\Controller;
use App\Models\File as UserFile;
use App\Models\Share;
use App\Models\Zip; use App\Models\Zip;
use App\Models\Share;
use App\Services\HelperService; use App\Services\HelperService;
use Illuminate\Http\Request; use App\Models\File as UserFile;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Storage;
class FileSharedAccessController extends Controller class FileSharedAccessController extends Controller
@@ -42,11 +40,11 @@ class FileSharedAccessController extends Controller
return $disk return $disk
->download("zip/$zip->basename", $zip->basename, [ ->download("zip/$zip->basename", $zip->basename, [
"Content-Type" => 'application/zip', 'Content-Type' => 'application/zip',
"Content-Length" => $disk->size("zip/$zip->basename"), 'Content-Length' => $disk->size("zip/$zip->basename"),
"Accept-Ranges" => "bytes", 'Accept-Ranges' => 'bytes',
"Content-Range" => "bytes 0-600/" . $disk->size("zip/$zip->basename"), 'Content-Range' => 'bytes 0-600/' . $disk->size("zip/$zip->basename"),
"Content-Disposition" => "attachment; filename=" . $zip->basename, 'Content-Disposition' => 'attachment; filename=' . $zip->basename,
]); ]);
} }
@@ -74,7 +72,7 @@ class FileSharedAccessController extends Controller
$shared $shared
->user ->user
->record_download( ->record_download(
(int)$file->getRawOriginal('filesize') (int) $file->getRawOriginal('filesize')
); );
return $this->helper->download_file($file, $shared->user_id); return $this->helper->download_file($file, $shared->user_id);
@@ -104,7 +102,7 @@ class FileSharedAccessController extends Controller
$shared $shared
->user ->user
->record_download( ->record_download(
(int)$file->getRawOriginal('filesize') (int) $file->getRawOriginal('filesize')
); );
return $this->helper->download_thumbnail_file($file, $shared->user_id); return $this->helper->download_thumbnail_file($file, $shared->user_id);
@@ -1,23 +1,21 @@
<?php <?php
namespace App\Http\Controllers\Sharing; namespace App\Http\Controllers\Sharing;
use App\Http\Controllers\Controller;
use App\Http\Requests\FileFunctions\CreateFolderRequest;
use App\Http\Requests\FileFunctions\DeleteItemRequest;
use App\Http\Requests\FileFunctions\MoveItemRequest;
use App\Http\Requests\FileFunctions\RenameItemRequest;
use App\Http\Requests\FileFunctions\UploadRequest;
use App\Models\File; use App\Models\File;
use App\Models\Folder;
use App\Models\Share; use App\Models\Share;
use App\Services\DemoService; use App\Models\Folder;
use App\Services\FileManagerService;
use App\Services\HelperService;
use Illuminate\Contracts\Routing\ResponseFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth; use App\Services\DemoService;
use App\Services\HelperService;
use App\Http\Controllers\Controller;
use App\Services\FileManagerService;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Contracts\Routing\ResponseFactory;
use App\Http\Requests\FileFunctions\UploadRequest;
use App\Http\Requests\FileFunctions\MoveItemRequest;
use App\Http\Requests\FileFunctions\DeleteItemRequest;
use App\Http\Requests\FileFunctions\RenameItemRequest;
use App\Http\Requests\FileFunctions\CreateFolderRequest;
class ManipulateShareItemsController extends Controller class ManipulateShareItemsController extends Controller
{ {
@@ -123,7 +121,6 @@ class ManipulateShareItemsController extends Controller
{ {
abort_if(is_demo_account($shared->user->email), 204, 'Done.'); abort_if(is_demo_account($shared->user->email), 204, 'Done.');
// Check ability to access protected share record // Check ability to access protected share record
$this->helper->check_protected_share_record($shared); $this->helper->check_protected_share_record($shared);
@@ -133,7 +130,6 @@ class ManipulateShareItemsController extends Controller
} }
foreach ($request->items as $file) { foreach ($request->items as $file) {
// Get file|folder item // Get file|folder item
$item = get_item($file['type'], $file['id']); $item = get_item($file['type'], $file['id']);
@@ -205,22 +201,19 @@ class ManipulateShareItemsController extends Controller
} }
foreach ($request->items as $item) { foreach ($request->items as $item) {
if ($item['type'] === 'folder') { if ($item['type'] === 'folder') {
$this->helper->check_item_access([ $this->helper->check_item_access([
$request->to_id, $item['id'] $request->to_id, $item['id'],
], $shared); ], $shared);
} }
if ($item['type'] !== 'folder') { if ($item['type'] !== 'folder') {
$file = File::where('id', $item['id']) $file = File::where('id', $item['id'])
->where('user_id', $shared->user_id) ->where('user_id', $shared->user_id)
->firstOrFail(); ->firstOrFail();
$this->helper->check_item_access([ $this->helper->check_item_access([
$request->to_id, $file->folder_id $request->to_id, $file->folder_id,
], $shared); ], $shared);
} }
} }
@@ -250,7 +243,7 @@ class ManipulateShareItemsController extends Controller
$folder = Folder::whereUserId($shared->user_id) $folder = Folder::whereUserId($shared->user_id)
->where('id', $id); ->where('id', $id);
if (!$folder->exists()) { if (! $folder->exists()) {
abort(404, 'Requested folder doesn\'t exists.'); abort(404, 'Requested folder doesn\'t exists.');
} }
@@ -1,11 +1,8 @@
<?php <?php
namespace App\Http\Controllers\Subscription; namespace App\Http\Controllers\Subscription;
use App\Services\StripeService;
use App\Models\Setting;
use App\Models\User; use App\Models\User;
use App\Services\StripeService;
use Laravel\Cashier\Http\Controllers\WebhookController as CashierController; use Laravel\Cashier\Http\Controllers\WebhookController as CashierController;
class StripeWebhookController extends CashierController class StripeWebhookController extends CashierController
@@ -39,7 +36,7 @@ class StripeWebhookController extends CashierController
$user $user
->settings() ->settings()
->update([ ->update([
'storage_capacity' => get_setting('storage_default') 'storage_capacity' => get_setting('storage_default'),
]); ]);
return $this->successMethod(); return $this->successMethod();
@@ -64,7 +61,7 @@ class StripeWebhookController extends CashierController
$user $user
->settings() ->settings()
->update([ ->update([
'storage_capacity' => $plan['product']['metadata']['capacity'] 'storage_capacity' => $plan['product']['metadata']['capacity'],
]); ]);
return $this->successMethod(); return $this->successMethod();
+13 -13
View File
@@ -1,18 +1,16 @@
<?php <?php
namespace App\Http\Controllers\User; namespace App\Http\Controllers\User;
use App\Http\Requests\User\UpdateUserPasswordRequest;
use App\Http\Resources\InvoiceCollection;
use App\Http\Resources\StorageDetailResource;
use App\Http\Resources\UserResource;
use App\Http\Resources\UserStorageResource;
use App\Services\DemoService;
use Illuminate\Contracts\Routing\ResponseFactory;
use Illuminate\Support\Facades\Validator;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\Services\DemoService;
use App\Http\Controllers\Controller;
use App\Http\Resources\UserResource;
use Illuminate\Support\Facades\Auth;
use App\Http\Resources\InvoiceCollection;
use Illuminate\Support\Facades\Validator;
use App\Http\Resources\UserStorageResource;
use Illuminate\Contracts\Routing\ResponseFactory;
use App\Http\Requests\User\UpdateUserPasswordRequest;
class AccountController extends Controller class AccountController extends Controller
{ {
@@ -77,7 +75,9 @@ class AccountController extends Controller
]); ]);
// Return error // Return error
if ($validator->fails()) abort(400, 'Bad input'); if ($validator->fails()) {
abort(400, 'Bad input');
}
// Get user // Get user
$user = Auth::user(); $user = Auth::user();
@@ -90,7 +90,7 @@ class AccountController extends Controller
$user $user
->settings() ->settings()
->update([ ->update([
'avatar' => store_avatar($request, 'avatar') 'avatar' => store_avatar($request, 'avatar'),
]); ]);
return response('Saved!', 204); return response('Saved!', 204);
@@ -1,22 +1,20 @@
<?php <?php
namespace App\Http\Controllers\User; namespace App\Http\Controllers\User;
use App\Http\Controllers\Controller;
use App\Http\Requests\Payments\RegisterNewPaymentMethodRequest;
use App\Http\Resources\PaymentCardCollection;
use App\Http\Resources\PaymentCardResource;
use App\Http\Resources\PaymentDefaultCardResource;
use App\Services\DemoService;
use App\Services\StripeService;
use Auth; use Auth;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Cache; use App\Services\DemoService;
use App\Services\StripeService;
use Laravel\Cashier\PaymentMethod; use Laravel\Cashier\PaymentMethod;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Cache;
use App\Http\Resources\PaymentCardResource;
use App\Http\Resources\PaymentCardCollection;
use App\Http\Resources\PaymentDefaultCardResource;
use App\Http\Requests\Payments\RegisterNewPaymentMethodRequest;
class PaymentMethodsController extends Controller class PaymentMethodsController extends Controller
{ {
public function __construct(StripeService $stripe) public function __construct(StripeService $stripe)
{ {
$this->stripe = $stripe; $this->stripe = $stripe;
@@ -32,7 +30,7 @@ class PaymentMethodsController extends Controller
{ {
$user = Auth::user(); $user = Auth::user();
if (!$user->hasPaymentMethod()) { if (! $user->hasPaymentMethod()) {
return abort(204, 'User don\'t have any payment methods'); return abort(204, 'User don\'t have any payment methods');
} }
@@ -40,15 +38,11 @@ class PaymentMethodsController extends Controller
$slug_default_payment_method = 'default-payment-methods-user-' . $user->id; $slug_default_payment_method = 'default-payment-methods-user-' . $user->id;
if (Cache::has($slug_payment_methods) && Cache::has($slug_default_payment_method)) { if (Cache::has($slug_payment_methods) && Cache::has($slug_default_payment_method)) {
$defaultPaymentMethod = Cache::get($slug_default_payment_method); $defaultPaymentMethod = Cache::get($slug_default_payment_method);
$paymentMethodsMapped = Cache::get($slug_payment_methods); $paymentMethodsMapped = Cache::get($slug_payment_methods);
} else { } else {
// Get default payment method // Get default payment method
$defaultPaymentMethod = Cache::rememberForever($slug_default_payment_method, function () use ($user) { $defaultPaymentMethod = Cache::rememberForever($slug_default_payment_method, function () use ($user) {
$defaultPaymentMethodObject = $user->defaultPaymentMethod(); $defaultPaymentMethodObject = $user->defaultPaymentMethod();
return $defaultPaymentMethodObject instanceof PaymentMethod return $defaultPaymentMethodObject instanceof PaymentMethod
@@ -58,7 +52,6 @@ class PaymentMethodsController extends Controller
// filter payment methods without default payment // filter payment methods without default payment
$paymentMethodsMapped = Cache::rememberForever($slug_payment_methods, function () use ($defaultPaymentMethod, $user) { $paymentMethodsMapped = Cache::rememberForever($slug_payment_methods, function () use ($defaultPaymentMethod, $user) {
$paymentMethods = $user->paymentMethods()->filter(function ($paymentMethod) use ($defaultPaymentMethod) { $paymentMethods = $user->paymentMethods()->filter(function ($paymentMethod) use ($defaultPaymentMethod) {
return $paymentMethod->id !== $defaultPaymentMethod->id; return $paymentMethod->id !== $defaultPaymentMethod->id;
}); });
@@ -70,7 +63,7 @@ class PaymentMethodsController extends Controller
}); });
} }
if (!$user->card_brand || !$user->stripe_id || is_null($paymentMethodsMapped) && is_null($paymentMethodsMapped)) { if (! $user->card_brand || ! $user->stripe_id || is_null($paymentMethodsMapped) && is_null($paymentMethodsMapped)) {
return [ return [
'default' => null, 'default' => null,
'others' => [], 'others' => [],
@@ -108,7 +101,7 @@ class PaymentMethodsController extends Controller
// Clear cached payment methods // Clear cached payment methods
cache_forget_many([ cache_forget_many([
'payment-methods-user-' . $user->id, 'payment-methods-user-' . $user->id,
'default-payment-methods-user-' . $user->id 'default-payment-methods-user-' . $user->id,
]); ]);
return response('Done', 204); return response('Done', 204);
@@ -159,7 +152,7 @@ class PaymentMethodsController extends Controller
// Clear cached payment methods // Clear cached payment methods
cache_forget_many([ cache_forget_many([
'payment-methods-user-' . $user->id, 'payment-methods-user-' . $user->id,
'default-payment-methods-user-' . $user->id 'default-payment-methods-user-' . $user->id,
]); ]);
return response('Done!', 204); return response('Done!', 204);
@@ -1,19 +1,18 @@
<?php <?php
namespace App\Http\Controllers\User; namespace App\Http\Controllers\User;
use App\Http\Controllers\Controller;
use App\Http\Requests\Subscription\StoreUpgradeAccountRequest;
use App\Http\Resources\UserSubscription;
use App\Services\DemoService;
use App\Models\User;
use App\Services\StripeService;
use Auth; use Auth;
use App\Models\User;
use Stripe\SetupIntent;
use App\Services\DemoService;
use Illuminate\Http\Response;
use App\Services\StripeService;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Cache;
use App\Http\Resources\UserSubscription;
use Illuminate\Contracts\Foundation\Application; use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\Routing\ResponseFactory; use Illuminate\Contracts\Routing\ResponseFactory;
use Illuminate\Http\Response; use App\Http\Requests\Subscription\StoreUpgradeAccountRequest;
use Illuminate\Support\Facades\Cache;
use Stripe\SetupIntent;
class SubscriptionController extends Controller class SubscriptionController extends Controller
{ {
@@ -34,7 +33,8 @@ class SubscriptionController extends Controller
public function setup_intent() public function setup_intent()
{ {
return response( return response(
$this->stripe->getSetupIntent(Auth::user()), 201 $this->stripe->getSetupIntent(Auth::user()),
201
); );
} }
@@ -47,7 +47,7 @@ class SubscriptionController extends Controller
{ {
$user = User::find(Auth::id()); $user = User::find(Auth::id());
if (!$user->subscription('main')) { if (! $user->subscription('main')) {
return abort(204, 'User don\'t have any subscription'); return abort(204, 'User don\'t have any subscription');
} }
@@ -97,7 +97,7 @@ class SubscriptionController extends Controller
// Update user storage limit // Update user storage limit
$user->settings()->update([ $user->settings()->update([
'storage_capacity' => $plan['product']['metadata']['capacity'] 'storage_capacity' => $plan['product']['metadata']['capacity'],
]); ]);
return response('Done!', 204); return response('Done!', 204);
-1
View File
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http; namespace App\Http;
use Illuminate\Foundation\Http\Kernel as HttpKernel; use Illuminate\Foundation\Http\Kernel as HttpKernel;
-2
View File
@@ -1,9 +1,7 @@
<?php <?php
namespace App\Http\Mail; namespace App\Http\Mail;
use Illuminate\Bus\Queueable; use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Mail\Mailable; use Illuminate\Mail\Mailable;
use Illuminate\Queue\SerializesModels; use Illuminate\Queue\SerializesModels;
-1
View File
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http\Middleware; namespace App\Http\Middleware;
use Illuminate\Auth\Middleware\Authenticate as Middleware; use Illuminate\Auth\Middleware\Authenticate as Middleware;
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http\Middleware; namespace App\Http\Middleware;
use Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode as Middleware; use Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode as Middleware;
-2
View File
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http\Middleware; namespace App\Http\Middleware;
use Illuminate\Cookie\Middleware\EncryptCookies as Middleware; use Illuminate\Cookie\Middleware\EncryptCookies as Middleware;
@@ -12,6 +11,5 @@ class EncryptCookies extends Middleware
* @var array * @var array
*/ */
protected $except = [ protected $except = [
]; ];
} }
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http\Middleware; namespace App\Http\Middleware;
use Illuminate\Foundation\Http\Middleware\PreventRequestsDuringMaintenance as Middleware; use Illuminate\Foundation\Http\Middleware\PreventRequestsDuringMaintenance as Middleware;
@@ -12,6 +11,5 @@ class PreventRequestsDuringMaintenance extends Middleware
* @var array * @var array
*/ */
protected $except = [ protected $except = [
//
]; ];
} }
@@ -1,8 +1,6 @@
<?php <?php
namespace App\Http\Middleware; namespace App\Http\Middleware;
use App\Providers\RouteServiceProvider;
use Closure; use Closure;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
-1
View File
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http\Middleware; namespace App\Http\Middleware;
use Illuminate\Foundation\Http\Middleware\TrimStrings as Middleware; use Illuminate\Foundation\Http\Middleware\TrimStrings as Middleware;
+1 -2
View File
@@ -1,9 +1,8 @@
<?php <?php
namespace App\Http\Middleware; namespace App\Http\Middleware;
use Fideloper\Proxy\TrustProxies as Middleware;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Fideloper\Proxy\TrustProxies as Middleware;
class TrustProxies extends Middleware class TrustProxies extends Middleware
{ {
-1
View File
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http\Middleware; namespace App\Http\Middleware;
use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as Middleware; use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as Middleware;
+2 -3
View File
@@ -1,12 +1,11 @@
<?php <?php
namespace App\Http\Notifications; namespace App\Http\Notifications;
use Laravel\Cashier\Payment;
use Illuminate\Bus\Queueable; use Illuminate\Bus\Queueable;
use Illuminate\Notifications\Notification;
use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Notifications\Messages\MailMessage; use Illuminate\Notifications\Messages\MailMessage;
use Illuminate\Notifications\Notification;
use Laravel\Cashier\Payment;
class ConfirmPayment extends Notification implements ShouldQueue class ConfirmPayment extends Notification implements ShouldQueue
{ {
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http\Requests\Admin; namespace App\Http\Requests\Admin;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
@@ -25,7 +24,7 @@ class ChangeRoleRequest extends FormRequest
{ {
return [ return [
'attributes' => 'required|array', 'attributes' => 'required|array',
'attributes.role' => 'required|string' 'attributes.role' => 'required|string',
]; ];
} }
} }
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http\Requests\Admin; namespace App\Http\Requests\Admin;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
@@ -25,7 +24,7 @@ class ChangeStorageCapacityRequest extends FormRequest
{ {
return [ return [
'attributes' => 'required|array', 'attributes' => 'required|array',
'attributes.storage_capacity' => 'required|digits_between:1,9' 'attributes.storage_capacity' => 'required|digits_between:1,9',
]; ];
} }
} }
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http\Requests\Admin; namespace App\Http\Requests\Admin;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http\Requests\Admin; namespace App\Http\Requests\Admin;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http\Requests\Auth; namespace App\Http\Requests\Auth;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http\Requests\FileBrowser; namespace App\Http\Requests\FileBrowser;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
@@ -1,9 +1,7 @@
<?php <?php
namespace App\Http\Requests\FileFunctions; namespace App\Http\Requests\FileFunctions;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Facades\Auth;
class CreateFolderRequest extends FormRequest class CreateFolderRequest extends FormRequest
{ {
@@ -1,9 +1,7 @@
<?php <?php
namespace App\Http\Requests\FileFunctions; namespace App\Http\Requests\FileFunctions;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Facades\Auth;
class DeleteItemRequest extends FormRequest class DeleteItemRequest extends FormRequest
{ {
@@ -27,7 +25,7 @@ class DeleteItemRequest extends FormRequest
return [ return [
'data[*].force_delete' => 'required|boolean', 'data[*].force_delete' => 'required|boolean',
'data[*].type' => 'required|string', 'data[*].type' => 'required|string',
'data[*].id' => 'required|integer' 'data[*].id' => 'required|integer',
]; ];
} }
} }
@@ -1,9 +1,7 @@
<?php <?php
namespace App\Http\Requests\FileFunctions; namespace App\Http\Requests\FileFunctions;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Facades\Auth;
class MoveItemRequest extends FormRequest class MoveItemRequest extends FormRequest
{ {
@@ -1,9 +1,7 @@
<?php <?php
namespace App\Http\Requests\FileFunctions; namespace App\Http\Requests\FileFunctions;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Facades\Auth;
class RenameItemRequest extends FormRequest class RenameItemRequest extends FormRequest
{ {
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http\Requests\FileFunctions; namespace App\Http\Requests\FileFunctions;
use App\Rules\DisabledMimetypes; use App\Rules\DisabledMimetypes;
@@ -26,7 +25,7 @@ class UploadRequest extends FormRequest
{ {
return [ return [
'folder_id' => 'nullable|uuid', 'folder_id' => 'nullable|uuid',
'file' => ['required', 'file', new DisabledMimetypes] 'file' => ['required', 'file', new DisabledMimetypes],
]; ];
} }
} }
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http\Requests\Languages; namespace App\Http\Requests\Languages;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
@@ -25,7 +24,7 @@ class CreateLanguageRequest extends FormRequest
{ {
return [ return [
'name' => 'required|string', 'name' => 'required|string',
'locale' => 'required|string' 'locale' => 'required|string',
]; ];
} }
} }
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http\Requests\Languages; namespace App\Http\Requests\Languages;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
@@ -25,7 +24,7 @@ class UpdateLanguageRequest extends FormRequest
{ {
return [ return [
'name' => 'required|string', 'name' => 'required|string',
'value' => 'required|string' 'value' => 'required|string',
]; ];
} }
} }
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http\Requests\Languages; namespace App\Http\Requests\Languages;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
@@ -25,7 +24,7 @@ class UpdateStringRequest extends FormRequest
{ {
return [ return [
'name' => 'required|string', 'name' => 'required|string',
'value' => 'required|string' 'value' => 'required|string',
]; ];
} }
} }
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http\Requests\Payments; namespace App\Http\Requests\Payments;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
@@ -25,7 +24,7 @@ class RegisterNewPaymentMethodRequest extends FormRequest
{ {
return [ return [
'token' => 'required|string', 'token' => 'required|string',
'default' => 'required|boolean' 'default' => 'required|boolean',
]; ];
} }
} }
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http\Requests\PublicPages; namespace App\Http\Requests\PublicPages;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http\Requests\SetupWizard; namespace App\Http\Requests\SetupWizard;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http\Requests\SetupWizard; namespace App\Http\Requests\SetupWizard;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http\Requests\SetupWizard; namespace App\Http\Requests\SetupWizard;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http\Requests\SetupWizard; namespace App\Http\Requests\SetupWizard;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http\Requests\SetupWizard; namespace App\Http\Requests\SetupWizard;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http\Requests\SetupWizard; namespace App\Http\Requests\SetupWizard;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http\Requests\Share; namespace App\Http\Requests\Share;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
@@ -1,9 +1,8 @@
<?php <?php
namespace App\Http\Requests\Share; namespace App\Http\Requests\Share;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use Illuminate\Foundation\Http\FormRequest;
class CreateShareRequest extends FormRequest class CreateShareRequest extends FormRequest
{ {
@@ -30,7 +29,7 @@ class CreateShareRequest extends FormRequest
'expiration' => 'integer|nullable', 'expiration' => 'integer|nullable',
'permission' => 'string', 'permission' => 'string',
'password' => 'string', 'password' => 'string',
'emails.*' => 'email' 'emails.*' => 'email',
]; ];
} }
} }
@@ -1,9 +1,8 @@
<?php <?php
namespace App\Http\Requests\Share; namespace App\Http\Requests\Share;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use Illuminate\Foundation\Http\FormRequest;
class UpdateShareRequest extends FormRequest class UpdateShareRequest extends FormRequest
{ {
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http\Requests\Subscription; namespace App\Http\Requests\Subscription;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http\Requests\User; namespace App\Http\Requests\User;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
+1 -2
View File
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http\Resources; namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\JsonResource; use Illuminate\Http\Resources\Json\JsonResource;
@@ -28,7 +27,7 @@ class FileResource extends JsonResource
'thumbnail' => $this->thumbnail, 'thumbnail' => $this->thumbnail,
'created_at' => $this->created_at, 'created_at' => $this->created_at,
'updated_at' => $this->created_at, 'updated_at' => $this->created_at,
] ],
], ],
]; ];
} }
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http\Resources; namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\ResourceCollection; use Illuminate\Http\Resources\Json\ResourceCollection;
+5 -6
View File
@@ -1,10 +1,9 @@
<?php <?php
namespace App\Http\Resources; namespace App\Http\Resources;
use App\Models\User; use App\Models\User;
use Illuminate\Http\Resources\Json\JsonResource;
use Laravel\Cashier\Cashier; use Laravel\Cashier\Cashier;
use Illuminate\Http\Resources\Json\JsonResource;
class InvoiceAdminResource extends JsonResource class InvoiceAdminResource extends JsonResource
{ {
@@ -54,10 +53,10 @@ class InvoiceAdminResource extends JsonResource
'attributes' => [ 'attributes' => [
'name' => $user->settings->name, 'name' => $user->settings->name,
'avatar' => $user->settings->avatar, 'avatar' => $user->settings->avatar,
] ],
] ],
] ],
] ],
]; ];
}), }),
], ],
-1
View File
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http\Resources; namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\ResourceCollection; use Illuminate\Http\Resources\Json\ResourceCollection;
+5 -6
View File
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http\Resources; namespace App\Http\Resources;
use App\Models\User; use App\Models\User;
@@ -26,7 +25,7 @@ class InvoiceResource extends JsonResource
'customer' => $this->customer, 'customer' => $this->customer,
'total' => $this->total(), 'total' => $this->total(),
'currency' => $this->currency, 'currency' => $this->currency,
'created_at_formatted' => format_date($this->date(), '%d. %B %Y'), 'created_at_formatted' => format_date($this->date(), '%d. %B. %Y'),
'created_at' => $this->created, 'created_at' => $this->created,
'order' => $this->number, 'order' => $this->number,
'user_id' => $user->id ?? null, 'user_id' => $user->id ?? null,
@@ -48,10 +47,10 @@ class InvoiceResource extends JsonResource
'attributes' => [ 'attributes' => [
'name' => $user->settings->name, 'name' => $user->settings->name,
'avatar' => $user->settings->avatar, 'avatar' => $user->settings->avatar,
] ],
] ],
] ],
] ],
]), ]),
], ],
]; ];
+1 -2
View File
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http\Resources; namespace App\Http\Resources;
use App\Models\Language; use App\Models\Language;
@@ -25,7 +24,7 @@ class LanguageCollection extends ResourceCollection
'data' => $this->collection, 'data' => $this->collection,
'meta' => [ 'meta' => [
'current_language' => new LanguageResource($current_language), 'current_language' => new LanguageResource($current_language),
'reference_translations' => get_default_language_translations() 'reference_translations' => get_default_language_translations(),
], ],
]; ];
} }
+1 -2
View File
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http\Resources; namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\JsonResource; use Illuminate\Http\Resources\Json\JsonResource;
@@ -24,7 +23,7 @@ class LanguageResource extends JsonResource
'translations' => map_language_translations($this->languageTranslations), 'translations' => map_language_translations($this->languageTranslations),
'updated_at' => $this->updated_at, 'updated_at' => $this->updated_at,
'created_at' => $this->created_at, 'created_at' => $this->created_at,
] ],
], ],
]; ];
} }
-1
View File
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http\Resources; namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\ResourceCollection; use Illuminate\Http\Resources\Json\ResourceCollection;
+1 -3
View File
@@ -1,8 +1,6 @@
<?php <?php
namespace App\Http\Resources; namespace App\Http\Resources;
use App\Models\Page;
use Illuminate\Http\Resources\Json\JsonResource; use Illuminate\Http\Resources\Json\JsonResource;
class PageResource extends JsonResource class PageResource extends JsonResource
@@ -25,7 +23,7 @@ class PageResource extends JsonResource
'slug' => $this->slug, 'slug' => $this->slug,
'content' => $this->content, 'content' => $this->content,
'content_formatted' => add_paragraphs($this->content), 'content_formatted' => add_paragraphs($this->content),
] ],
], ],
]; ];
} }
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http\Resources; namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\ResourceCollection; use Illuminate\Http\Resources\Json\ResourceCollection;
+3 -4
View File
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http\Resources; namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\JsonResource; use Illuminate\Http\Resources\Json\JsonResource;
@@ -16,7 +15,7 @@ class PaymentCardResource extends JsonResource
{ {
return [ return [
'data' => [ 'data' => [
'id' => (string)$this['id'], 'id' => (string) $this['id'],
'type' => 'payment_method', 'type' => 'payment_method',
'attributes' => [ 'attributes' => [
'provider' => 'stripe', 'provider' => 'stripe',
@@ -28,8 +27,8 @@ class PaymentCardResource extends JsonResource
'created_at' => format_date($this['created_at'], '%d. %B. %Y'), 'created_at' => format_date($this['created_at'], '%d. %B. %Y'),
'status' => 'active', 'status' => 'active',
'default' => 0, 'default' => 0,
] ],
] ],
]; ];
} }
} }
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http\Resources; namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\JsonResource; use Illuminate\Http\Resources\Json\JsonResource;
@@ -16,7 +15,7 @@ class PaymentDefaultCardResource extends JsonResource
{ {
return [ return [
'data' => [ 'data' => [
'id' => (string)$this['id'], 'id' => (string) $this['id'],
'type' => 'payment_method', 'type' => 'payment_method',
'attributes' => [ 'attributes' => [
'provider' => 'stripe', 'provider' => 'stripe',
@@ -28,8 +27,8 @@ class PaymentDefaultCardResource extends JsonResource
'created_at' => format_date($this['created_at'], '%d. %B. %Y'), 'created_at' => format_date($this['created_at'], '%d. %B. %Y'),
'status' => 'active', 'status' => 'active',
'default' => 0, 'default' => 0,
] ],
] ],
]; ];
} }
} }
-1
View File
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http\Resources; namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\ResourceCollection; use Illuminate\Http\Resources\Json\ResourceCollection;
+3 -4
View File
@@ -1,10 +1,9 @@
<?php <?php
namespace App\Http\Resources; namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\JsonResource;
use Laravel\Cashier\Cashier; use Laravel\Cashier\Cashier;
use Laravel\Cashier\Subscription; use Laravel\Cashier\Subscription;
use Illuminate\Http\Resources\Json\JsonResource;
class PlanResource extends JsonResource class PlanResource extends JsonResource
{ {
@@ -36,8 +35,8 @@ class PlanResource extends JsonResource
'capacity' => (int) $this['product']['metadata']['capacity'], 'capacity' => (int) $this['product']['metadata']['capacity'],
'created_at_formatted' => format_date($this['plan']['created']), 'created_at_formatted' => format_date($this['plan']['created']),
'created_at' => $this['plan']['created'], 'created_at' => $this['plan']['created'],
] ],
] ],
]; ];
} }
} }
-1
View File
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http\Resources; namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\ResourceCollection; use Illuminate\Http\Resources\Json\ResourceCollection;
+5 -6
View File
@@ -1,10 +1,9 @@
<?php <?php
namespace App\Http\Resources; namespace App\Http\Resources;
use Laravel\Cashier\Cashier;
use App\Services\StripeService; use App\Services\StripeService;
use Illuminate\Http\Resources\Json\JsonResource; use Illuminate\Http\Resources\Json\JsonResource;
use Laravel\Cashier\Cashier;
class PricingResource extends JsonResource class PricingResource extends JsonResource
{ {
@@ -25,11 +24,11 @@ class PricingResource extends JsonResource
'description' => $this['product']['description'], 'description' => $this['product']['description'],
'price' => Cashier::formatAmount($this['plan']['amount']), 'price' => Cashier::formatAmount($this['plan']['amount']),
'capacity_formatted' => format_gigabytes($this['product']['metadata']['capacity']), 'capacity_formatted' => format_gigabytes($this['product']['metadata']['capacity']),
'capacity' => (int)$this['product']['metadata']['capacity'], 'capacity' => (int) $this['product']['metadata']['capacity'],
'currency' => config('cashier.currency'), 'currency' => config('cashier.currency'),
'tax_rates' => resolve(StripeService::class)->get_tax_rates($this['plan']['amount']) 'tax_rates' => resolve(StripeService::class)->get_tax_rates($this['plan']['amount']),
] ],
] ],
]; ];
} }
} }
+4 -5
View File
@@ -1,5 +1,4 @@
<?php <?php
namespace App\Http\Resources; namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\JsonResource; use Illuminate\Http\Resources\Json\JsonResource;
@@ -16,20 +15,20 @@ class ShareResource extends JsonResource
{ {
return [ return [
'data' => [ 'data' => [
'id' => (string)$this->id, 'id' => (string) $this->id,
'type' => 'shares', 'type' => 'shares',
'attributes' => [ 'attributes' => [
'permission' => $this->permission, 'permission' => $this->permission,
'is_protected' => $this->is_protected, 'is_protected' => $this->is_protected,
'item_id' => $this->item_id, 'item_id' => $this->item_id,
'expire_in' => (int)$this->expire_in, 'expire_in' => (int) $this->expire_in,
'token' => $this->token, 'token' => $this->token,
'link' => $this->link, 'link' => $this->link,
'type' => $this->type, 'type' => $this->type,
'created_at' => $this->created_at, 'created_at' => $this->created_at,
'updated_at' => $this->updated_at, 'updated_at' => $this->updated_at,
] ],
] ],
]; ];
} }
} }

Some files were not shown because too many files have changed in this diff Show More