From 5ce95010d5508bc525a4d09a08842c557716053d Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 16 Jun 2022 13:04:05 +1000 Subject: [PATCH] Add switch to force react as front end --- app/Http/Controllers/BaseController.php | 2 +- app/Http/Controllers/SelfUpdateController.php | 19 +- app/Models/Account.php | 5 +- app/Transformers/AccountTransformer.php | 2 +- ...6_10_030503_set_account_flag_for_react.php | 3 - ..._06_16_025156_add_react_switching_flag.php | 30 +++ .../react/invoiceninja-logo@dark.365f6449.png | Bin 0 -> 4280 bytes .../ninja2020/vendor_profile/edit.blade.php | 177 ++++++++++++++++++ 8 files changed, 227 insertions(+), 11 deletions(-) create mode 100644 database/migrations/2022_06_16_025156_add_react_switching_flag.php create mode 100644 public/react/invoiceninja-logo@dark.365f6449.png create mode 100644 resources/views/portal/ninja2020/vendor_profile/edit.blade.php diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php index 90bdc3429ff7..9332df3876f6 100644 --- a/app/Http/Controllers/BaseController.php +++ b/app/Http/Controllers/BaseController.php @@ -800,7 +800,7 @@ class BaseController extends Controller $this->buildCache(); - if(config('ninja.react_app_enabled')) + if(Ninja::isSelfHost() && $account->set_react_as_default_ap) return response()->view('react.index', $data)->header('X-Frame-Options', 'SAMEORIGIN', false); else return response()->view('index.index', $data)->header('X-Frame-Options', 'SAMEORIGIN', false); diff --git a/app/Http/Controllers/SelfUpdateController.php b/app/Http/Controllers/SelfUpdateController.php index 06105ab32e20..051b4066d1a4 100644 --- a/app/Http/Controllers/SelfUpdateController.php +++ b/app/Http/Controllers/SelfUpdateController.php @@ -196,15 +196,26 @@ class SelfUpdateController extends BaseController private function cleanOldSnapChromeBinaries() { $current_revision = base_path('vendor/beganovich/snappdf/versions/revision.txt'); + $current_revision_text = file_get_contents($current_revision); - $directoryIterator = new \RecursiveDirectoryIterator(base_path('vendor/beganovich/snappdf/versions'), \RecursiveDirectoryIterator::SKIP_DOTS); + $iterator = new \DirectoryIterator(base_path('vendor/beganovich/snappdf/versions')); - foreach (new \RecursiveIteratorIterator($directoryIterator) as $file) { + foreach ($iterator as $file) + { - unlink($file->getPathName()); + if($file->isDir() && !$file->isDot() && ($current_revision_text != $file->getFileName())) + { - } + $directoryIterator = new \RecursiveDirectoryIterator(base_path('vendor/beganovich/snappdf/versions/'.$file->getFileName()), \RecursiveDirectoryIterator::SKIP_DOTS); + foreach (new \RecursiveIteratorIterator($directoryIterator) as $filex) + { + unlink($filex->getPathName()); + } + + } + + } } diff --git a/app/Models/Account.php b/app/Models/Account.php index b2a94fb95dff..1692ac7d6ea4 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -57,7 +57,7 @@ class Account extends BaseModel 'utm_content', 'user_agent', 'platform', - // 'set_react_as_default_ap', + 'set_react_as_default_ap', ]; /** @@ -75,7 +75,8 @@ class Account extends BaseModel 'updated_at' => 'timestamp', 'created_at' => 'timestamp', 'deleted_at' => 'timestamp', - 'onboarding' => 'object' + 'onboarding' => 'object', + 'set_react_as_default_ap' => 'bool' ]; const PLAN_FREE = 'free'; diff --git a/app/Transformers/AccountTransformer.php b/app/Transformers/AccountTransformer.php index 502f0b9dedc5..9536a9dc422f 100644 --- a/app/Transformers/AccountTransformer.php +++ b/app/Transformers/AccountTransformer.php @@ -86,7 +86,7 @@ class AccountTransformer extends EntityTransformer 'hosted_client_count' => (int) $account->hosted_client_count, 'hosted_company_count' => (int) $account->hosted_company_count, 'is_hosted' => (bool) Ninja::isHosted(), - // 'set_react_as_default_ap' => (bool) $account->set_react_as_default_ap + 'set_react_as_default_ap' => (bool) $account->set_react_as_default_ap ]; } diff --git a/database/migrations/2022_06_10_030503_set_account_flag_for_react.php b/database/migrations/2022_06_10_030503_set_account_flag_for_react.php index a81f53fa4c3e..3a26ea68b3a3 100644 --- a/database/migrations/2022_06_10_030503_set_account_flag_for_react.php +++ b/database/migrations/2022_06_10_030503_set_account_flag_for_react.php @@ -23,9 +23,6 @@ class SetAccountFlagForReact extends Migration { Illuminate\Support\Facades\Artisan::call('ninja:design-update'); - // Schema::table('accounts', function (Blueprint $table) { - // $table->boolean('set_react_as_default_ap')->default(0); - // }); } /** diff --git a/database/migrations/2022_06_16_025156_add_react_switching_flag.php b/database/migrations/2022_06_16_025156_add_react_switching_flag.php new file mode 100644 index 000000000000..704846795358 --- /dev/null +++ b/database/migrations/2022_06_16_025156_add_react_switching_flag.php @@ -0,0 +1,30 @@ +boolean('set_react_as_default_ap')->default(0); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + } +} diff --git a/public/react/invoiceninja-logo@dark.365f6449.png b/public/react/invoiceninja-logo@dark.365f6449.png new file mode 100644 index 0000000000000000000000000000000000000000..2ad35df2688293325358b12956c3c919d2a71727 GIT binary patch literal 4280 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 Q?_Lub=o#rYXgkLJ4^s;BKmY&$ literal 0 HcmV?d00001 diff --git a/resources/views/portal/ninja2020/vendor_profile/edit.blade.php b/resources/views/portal/ninja2020/vendor_profile/edit.blade.php new file mode 100644 index 000000000000..f7fb6a6d1289 --- /dev/null +++ b/resources/views/portal/ninja2020/vendor_profile/edit.blade.php @@ -0,0 +1,177 @@ +@extends('portal.ninja2020.layout.vendor_app') + +@section('meta_title', ctrans('texts.vendor_information')) + +@section('header') +

{{ ctrans('texts.update_your_personal_info') }}

+@endsection + +@section('body') + @if(session()->has('missing_required_fields')) +
+

{{ ctrans('texts.before_proceeding_with_payment_warning') }}:

+ +
    + @foreach(session()->get('missing_required_fields') as $field) +
  • — {{ ctrans("texts.{$field}") }}
    • + @endforeach +
+ + +
+ @endif + +
+
+
+
+

{{ ctrans('texts.contact_details') }}

+
+
+ +
+
+ @csrf + @method('PUT') +
+
+
+
+ + + @error('first_name') +
+ {{ $message }} +
+ @enderror +
+ +
+ + + @error('last_name') +
+ {{ $message }} +
+ @enderror +
+ +
+ + + @error('email') +
+ {{ $message }} +
+ @enderror +
+ +
+ + + @error('phone') +
+ {{ $message }} +
+ @enderror +
+ + +
+
+ +
+
+
+
+ +
+
+
+
+

{{ ctrans('texts.billing_address') }}

+
+
+
+
+
+
+ + + @error('address1') +
+ {{ $message }} +
+ @enderror +
+
+ + + @error('address2') +
+ {{ $message }} +
+ @enderror +
+
+ + + @error('city') +
+ {{ $message }} +
+ @enderror +
+
+ + + @error('state') +
+ {{ $message }} +
+ @enderror +
+
+ + + @error('postal_code') +
+ {{ $message }} +
+ @enderror +
+
+ + + @error('country') +
+ {{ $message }} +
+ @enderror +
+
+
+
+ +
+
+ +
+
+ + +@endsection