From 67cf7a6ced2600dacf470825a572369b1b106447 Mon Sep 17 00:00:00 2001 From: Milos Holba Date: Thu, 11 Feb 2021 17:11:59 +0100 Subject: [PATCH] change names of routes --- .../Language/LanguageController.php | 51 ++++++------ app/Language.php | 4 +- public/mix-manifest.json | 79 ++++++++----------- routes/api.php | 6 +- 4 files changed, 65 insertions(+), 75 deletions(-) diff --git a/app/Http/Controllers/Language/LanguageController.php b/app/Http/Controllers/Language/LanguageController.php index 12791bb6..d7553b96 100644 --- a/app/Http/Controllers/Language/LanguageController.php +++ b/app/Http/Controllers/Language/LanguageController.php @@ -10,13 +10,34 @@ use App\Http\Controllers\Controller; class LanguageController extends Controller { + /** + * Get all languages + * + * @return string + */ + public function get_languages () + { + return Language::all(); + } + + /** + * Get all language strings + * + * @param $language + * @return string + */ + public function get_language_strings($language) + { + return Language::where('locale', $language)->with('languegeStrings')->first(); + } + /** * Create new language * * @param Request $request * @return string */ - public function create(Request $request) + public function create_language(Request $request) { // Check if is demo if (env('APP_DEMO')) { @@ -33,17 +54,6 @@ class LanguageController extends Controller return $language; } - /** - * Get all language strings - * - * @param $language - * @return string - */ - public function get_language_strings($language) - { - return Language::where('locale', $language)->with('languegeStrings')->first(); - } - /** * Update strings for language * @@ -57,18 +67,17 @@ class LanguageController extends Controller return Demo::response_204(); } + // Get language $lang = Language::where('locale', $request->input('locale'))->first(); - // dd($lang->id); - foreach($request->input('language') as $language) { // If key with lang already exist update, if no crate LanguageString::updateOrCreate([ 'language_id' => $lang->id, - 'key' => $language['key'], - 'lang' => $lang->locale, + 'key' => $language['key'], + 'lang' => $lang->locale, ],[ 'value' => $language['value'] ]); @@ -76,14 +85,4 @@ class LanguageController extends Controller return response('Done', 204); } - - /** - * Get all languages - * - * @return string - */ - public function get_languages () - { - return Language::all(); - } } diff --git a/app/Language.php b/app/Language.php index 580c7c31..564afce2 100644 --- a/app/Language.php +++ b/app/Language.php @@ -19,8 +19,8 @@ class Language extends Model protected static function booted() { - static::creating(function($model) { - $model->id = Str::uuid(); + static::creating(function($language) { + $language->id = Str::uuid(); }); } diff --git a/public/mix-manifest.json b/public/mix-manifest.json index b5291290..3138b4ad 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -75,48 +75,39 @@ "/chunks/user-storage.js": "/chunks/user-storage.js?id=5cfec8a8f8a8aef24ef2", "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=34603496ceacb8bd2da3", "/chunks/users.js": "/chunks/users.js?id=6e68cb068f69fba3199c", - "/chunks/files~chunks/shared-files~chunks/shared-page.9c00a577ed3bec474797.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.9c00a577ed3bec474797.hot-update.js", - "/chunks/files~chunks/shared-files~chunks/shared-page.9f3e82e178713f15df4d.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.9f3e82e178713f15df4d.hot-update.js", - "/chunks/files~chunks/shared-files~chunks/shared-page.ad4c905a2ac6b1145710.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.ad4c905a2ac6b1145710.hot-update.js", - "/chunks/files~chunks/shared-files~chunks/shared-page.c8a6e4c3d77f2866a449.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.c8a6e4c3d77f2866a449.hot-update.js", - "/chunks/files~chunks/shared-files~chunks/shared-page.9cc2c53635c9285c9bf4.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.9cc2c53635c9285c9bf4.hot-update.js", - "/chunks/files~chunks/shared-files~chunks/shared-page.91e84fcc65331ffb8a9d.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.91e84fcc65331ffb8a9d.hot-update.js", - "/chunks/files~chunks/shared-files~chunks/shared-page.446e9414658ffa0b595c.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.446e9414658ffa0b595c.hot-update.js", - "/chunks/files~chunks/shared-files~chunks/shared-page.c90898a702ee307a1072.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.c90898a702ee307a1072.hot-update.js", - "/chunks/files~chunks/shared-files~chunks/shared-page.3bcd1a35fc099de2db3b.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.3bcd1a35fc099de2db3b.hot-update.js", - "/js/main.6471eb760893f2ccd583.hot-update.js": "/js/main.6471eb760893f2ccd583.hot-update.js", - "/chunks/admin.6471eb760893f2ccd583.hot-update.js": "/chunks/admin.6471eb760893f2ccd583.hot-update.js", - "/chunks/admin-account.6471eb760893f2ccd583.hot-update.js": "/chunks/admin-account.6471eb760893f2ccd583.hot-update.js", - "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.6471eb760893f2ccd583.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.6471eb760893f2ccd583.hot-update.js", - "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.6471eb760893f2ccd583.hot-update.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.6471eb760893f2ccd583.hot-update.js", - "/chunks/app-index.6471eb760893f2ccd583.hot-update.js": "/chunks/app-index.6471eb760893f2ccd583.hot-update.js", - "/chunks/app-settings.6471eb760893f2ccd583.hot-update.js": "/chunks/app-settings.6471eb760893f2ccd583.hot-update.js", - "/chunks/app-setup.6471eb760893f2ccd583.hot-update.js": "/chunks/app-setup.6471eb760893f2ccd583.hot-update.js", - "/chunks/billings-detail.6471eb760893f2ccd583.hot-update.js": "/chunks/billings-detail.6471eb760893f2ccd583.hot-update.js", - "/chunks/contact-us.6471eb760893f2ccd583.hot-update.js": "/chunks/contact-us.6471eb760893f2ccd583.hot-update.js", - "/chunks/dashboard.6471eb760893f2ccd583.hot-update.js": "/chunks/dashboard.6471eb760893f2ccd583.hot-update.js", - "/chunks/database.6471eb760893f2ccd583.hot-update.js": "/chunks/database.6471eb760893f2ccd583.hot-update.js", - "/chunks/environment-setup.6471eb760893f2ccd583.hot-update.js": "/chunks/environment-setup.6471eb760893f2ccd583.hot-update.js", - "/chunks/files.6471eb760893f2ccd583.hot-update.js": "/chunks/files.6471eb760893f2ccd583.hot-update.js", - "/chunks/files~chunks/shared-files~chunks/shared-page.6471eb760893f2ccd583.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.6471eb760893f2ccd583.hot-update.js", - "/chunks/installation-disclaimer.6471eb760893f2ccd583.hot-update.js": "/chunks/installation-disclaimer.6471eb760893f2ccd583.hot-update.js", - "/chunks/landing-page.6471eb760893f2ccd583.hot-update.js": "/chunks/landing-page.6471eb760893f2ccd583.hot-update.js", - "/chunks/plan-create.6471eb760893f2ccd583.hot-update.js": "/chunks/plan-create.6471eb760893f2ccd583.hot-update.js", - "/chunks/plan-subscribers.6471eb760893f2ccd583.hot-update.js": "/chunks/plan-subscribers.6471eb760893f2ccd583.hot-update.js", - "/chunks/profile.6471eb760893f2ccd583.hot-update.js": "/chunks/profile.6471eb760893f2ccd583.hot-update.js", - "/chunks/purchase-code.6471eb760893f2ccd583.hot-update.js": "/chunks/purchase-code.6471eb760893f2ccd583.hot-update.js", - "/chunks/settings.6471eb760893f2ccd583.hot-update.js": "/chunks/settings.6471eb760893f2ccd583.hot-update.js", - "/chunks/settings-create-payment-methods.6471eb760893f2ccd583.hot-update.js": "/chunks/settings-create-payment-methods.6471eb760893f2ccd583.hot-update.js", - "/chunks/settings-invoices.6471eb760893f2ccd583.hot-update.js": "/chunks/settings-invoices.6471eb760893f2ccd583.hot-update.js", - "/chunks/settings-payment-methods.6471eb760893f2ccd583.hot-update.js": "/chunks/settings-payment-methods.6471eb760893f2ccd583.hot-update.js", - "/chunks/settings-subscription.6471eb760893f2ccd583.hot-update.js": "/chunks/settings-subscription.6471eb760893f2ccd583.hot-update.js", - "/chunks/shared-page.6471eb760893f2ccd583.hot-update.js": "/chunks/shared-page.6471eb760893f2ccd583.hot-update.js", - "/chunks/sign-in.6471eb760893f2ccd583.hot-update.js": "/chunks/sign-in.6471eb760893f2ccd583.hot-update.js", - "/chunks/sign-up.6471eb760893f2ccd583.hot-update.js": "/chunks/sign-up.6471eb760893f2ccd583.hot-update.js", - "/chunks/stripe-credentials.6471eb760893f2ccd583.hot-update.js": "/chunks/stripe-credentials.6471eb760893f2ccd583.hot-update.js", - "/chunks/subscription-plans.6471eb760893f2ccd583.hot-update.js": "/chunks/subscription-plans.6471eb760893f2ccd583.hot-update.js", - "/chunks/upgrade.6471eb760893f2ccd583.hot-update.js": "/chunks/upgrade.6471eb760893f2ccd583.hot-update.js", - "/chunks/upgrade-billing.6471eb760893f2ccd583.hot-update.js": "/chunks/upgrade-billing.6471eb760893f2ccd583.hot-update.js", - "/chunks/user-invoices.6471eb760893f2ccd583.hot-update.js": "/chunks/user-invoices.6471eb760893f2ccd583.hot-update.js", - "/chunks/user-subscription.6471eb760893f2ccd583.hot-update.js": "/chunks/user-subscription.6471eb760893f2ccd583.hot-update.js" + "/js/main.e9267f5855b7b9bf8a61.hot-update.js": "/js/main.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/admin.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/admin.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/admin-account.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/admin-account.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/app-index.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/app-index.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/app-settings.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/app-settings.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/app-setup.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/app-setup.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/billings-detail.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/billings-detail.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/contact-us.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/contact-us.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/dashboard.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/dashboard.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/database.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/database.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/environment-setup.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/environment-setup.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/files.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/files.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/files~chunks/shared-files~chunks/shared-page.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/installation-disclaimer.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/installation-disclaimer.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/landing-page.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/landing-page.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/plan-create.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/plan-create.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/plan-subscribers.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/plan-subscribers.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/profile.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/profile.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/purchase-code.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/purchase-code.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/settings.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/settings.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/settings-create-payment-methods.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/settings-create-payment-methods.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/settings-invoices.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/settings-invoices.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/settings-payment-methods.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/settings-payment-methods.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/settings-subscription.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/settings-subscription.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/shared-page.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/shared-page.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/sign-in.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/sign-in.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/sign-up.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/sign-up.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/stripe-credentials.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/stripe-credentials.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/subscription-plans.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/subscription-plans.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/upgrade.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/upgrade.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/upgrade-billing.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/upgrade-billing.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/user-invoices.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/user-invoices.e9267f5855b7b9bf8a61.hot-update.js", + "/chunks/user-subscription.e9267f5855b7b9bf8a61.hot-update.js": "/chunks/user-subscription.e9267f5855b7b9bf8a61.hot-update.js" } diff --git a/routes/api.php b/routes/api.php index 6bd9183f..480db933 100644 --- a/routes/api.php +++ b/routes/api.php @@ -170,10 +170,10 @@ Route::group(['middleware' => ['auth:api', 'auth.master', 'auth.admin', 'scope:m Route::get('/flush-cache', 'AppFunctionsController@flush_cache'); // Language - Route::post('/language/create', 'Language\LanguageController@create'); - Route::patch('/language/update', 'Language\LanguageController@update_string'); - Route::get('/language/{language}/strings', 'Language\LanguageController@get_language_strings'); + Route::post('/language/create', 'Language\LanguageController@create_language'); + Route::patch('/language/update-string', 'Language\LanguageController@update_string'); Route::get('/language/get', 'Language\LanguageController@get_languages'); + Route::get('/language/{language}/strings', 'Language\LanguageController@get_language_strings'); }); // Protected sharing routes for authenticated user