mirror of
https://github.com/devcode-it/openstamanager.git
synced 2025-03-13 09:40:18 +01:00
fix: Fix setup non funzionante
This commit is contained in:
parent
899eb1090e
commit
f20bef6943
@ -73,15 +73,8 @@ class SetupController extends Controller
|
||||
|
||||
// Identifying permissions granted to the user
|
||||
$database_name = Str::replace('_', '\_', $database_name);
|
||||
/**
|
||||
* @psalm-suppress InvalidArgument
|
||||
*
|
||||
* @noinspection PhpParamsInspection
|
||||
*
|
||||
* @phpstan-ignore-next-line
|
||||
*/
|
||||
$grants = $connection->select($connection->raw('SHOW GRANTS FOR CURRENT_USER'));
|
||||
|
||||
$grants = $connection->select('SHOW GRANTS FOR CURRENT_USER');
|
||||
$requirements = [
|
||||
'SELECT',
|
||||
'INSERT',
|
||||
|
@ -55,12 +55,12 @@ export default class SetupPage extends Page<SetupPageAttributes> {
|
||||
|
||||
try {
|
||||
await Request.put(route('setup.save'), data);
|
||||
void showSnackbar(__('Impostazioni salvate correttamente'));
|
||||
router.visit(route('login'));
|
||||
} catch (error: any) {
|
||||
// eslint-disable-next-line no-console
|
||||
console.error(error);
|
||||
void showSnackbar((error as RequestError<{message: string}>).response.message);
|
||||
return;
|
||||
}
|
||||
|
||||
void showSnackbar(__('Impostazioni salvate correttamente'));
|
||||
router.visit(route('login'));
|
||||
}
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
import '@material/web/checkbox/checkbox.js';
|
||||
import '@material/web/field/outlined-field.js';
|
||||
import '@material/web/select/filled-select.js';
|
||||
import '@osm/Components/m3/FilledSelect';
|
||||
import '@material/web/select/select-option.js';
|
||||
|
||||
import type {MdCheckbox} from '@material/web/checkbox/checkbox';
|
||||
@ -60,7 +60,7 @@ export default class WelcomeStep<A extends WelcomeStepAttributes = WelcomeStepAt
|
||||
</md-filled-select>
|
||||
<h4>{__('Licenza')}</h4>
|
||||
<p>{__('OpenSTAManager è tutelato dalla licenza GPL 3.0, da accettare obbligatoriamente per poter utilizzare il gestionale.')}</p>
|
||||
<md-outlined-field populated style={{marginBottom: '8px'}}>
|
||||
<md-outlined-field populated style={{marginBottom: '8px', '--md-outlined-field-container-padding-vertical': '0'}}>
|
||||
<p style={{
|
||||
overflow: 'auto', resize: 'both', height: '250px', fontFamily: 'monospace'
|
||||
}}>{this.attrs.get('license')}</p>
|
||||
|
@ -27,18 +27,19 @@
|
||||
@endphp
|
||||
|
||||
@inertia
|
||||
|
||||
<script>
|
||||
app = @js([
|
||||
'locale' => app()->getLocale(),
|
||||
'modules' => $modules,
|
||||
'user' => auth()->user(),
|
||||
'user' => Route::currentRouteName() !== 'setup.index' && auth()->user(),
|
||||
'VERSION' => trim(file_get_contents(base_path('VERSION'))),
|
||||
'REVISION' => trim(file_get_contents(base_path('REVISION'))),
|
||||
'settings' => [
|
||||
'date_format' => settings('date_format_long'),
|
||||
'date_format_short' => settings('date_format_short'),
|
||||
'time_format' => settings('time_format'),
|
||||
]
|
||||
]
|
||||
]);
|
||||
</script>
|
||||
|
||||
|
@ -2,6 +2,7 @@
|
||||
|
||||
use App\Http\Controllers\Api\SetupController;
|
||||
use App\Http\Middleware\CheckConfigurationMiddleware;
|
||||
use Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful;
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
@ -14,12 +15,15 @@ use App\Http\Middleware\CheckConfigurationMiddleware;
|
||||
|
|
||||
*/
|
||||
|
||||
Route::name('setup.')->middleware(CheckConfigurationMiddleware::class)->group(static function () {
|
||||
Route::post('setup/test', [SetupController::class, 'testDatabase'])
|
||||
->name('test');
|
||||
Route::name('setup.')
|
||||
->middleware(CheckConfigurationMiddleware::class)
|
||||
->withoutMiddleware([EnsureFrontendRequestsAreStateful::class])
|
||||
->group(static function () {
|
||||
Route::post('setup/test', [SetupController::class, 'testDatabase'])
|
||||
->name('test');
|
||||
|
||||
Route::put('setup/save', [SetupController::class, 'save'])
|
||||
->name('save');
|
||||
});
|
||||
Route::put('setup/save', [SetupController::class, 'save'])
|
||||
->name('save');
|
||||
});
|
||||
|
||||
Route::restifyAuth();
|
||||
|
@ -2,6 +2,8 @@
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Middleware\CheckConfigurationMiddleware;
|
||||
use App\Http\Middleware\LocaleMiddleware;
|
||||
use App\Http\Middleware\RedirectIfAuthenticated;
|
||||
use Illuminate\Support\Facades\Route;
|
||||
|
||||
/*
|
||||
@ -16,7 +18,9 @@ use Illuminate\Support\Facades\Route;
|
||||
*/
|
||||
|
||||
Route::get('/', static fn () => redirect()->route('login'))
|
||||
->middleware(CheckConfigurationMiddleware::class);
|
||||
->middleware(CheckConfigurationMiddleware::class)
|
||||
/** @psalm-suppress PossiblyInvalidMethodCall */
|
||||
->withoutMiddleware([LocaleMiddleware::class, RedirectIfAuthenticated::class]);
|
||||
|
||||
Route::middleware('guest')->group(static function () {
|
||||
Route::inertia('login', 'LoginPage', ['external' => true])
|
||||
@ -32,7 +36,8 @@ Route::middleware('guest')->group(static function () {
|
||||
'license' => cache()->rememberForever('app.license', static fn () => file_get_contents(base_path('LICENSE'))),
|
||||
'external' => true,
|
||||
])
|
||||
->middleware('guest', CheckConfigurationMiddleware::class)
|
||||
->middleware(CheckConfigurationMiddleware::class)
|
||||
->withoutMiddleware([LocaleMiddleware::class, RedirectIfAuthenticated::class])
|
||||
->name('setup.index');
|
||||
});
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user