From 4b609ca71b54b210fcb5dbbae315ba1416b9b5cf Mon Sep 17 00:00:00 2001 From: "p.belezov" Date: Thu, 7 Mar 2024 16:43:57 +0800 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=D0=B2=D0=B0=D1=8F=D0=BB=20=D0=BD?= =?UTF-8?q?=D0=B5=D0=BC=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=BF=D0=BE=20=D0=B3?= =?UTF-8?q?=D0=B0=D0=B9=D0=B4=D0=B0=D0=BC,=20=D0=BD=D0=B0=D0=B4=20=D0=B4?= =?UTF-8?q?=D0=BE=D0=B4=D0=B5=D0=BB=D0=B0=D1=82=D1=8C.=20=D0=9A=D0=BE?= =?UTF-8?q?=D0=BC=D0=BC=D0=B8=D1=82,=20=D1=87=D1=82=D0=BE=D0=B1=D1=8B=20?= =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82=20=D0=BD=D0=B5=20=D0=B7?= =?UTF-8?q?=D0=B0=D1=81=D1=82=D1=80=D1=8F=D0=BB=20=D0=BD=D0=B0=20=D1=80?= =?UTF-8?q?=D0=B0=D0=B1=D0=BE=D1=87=D0=B5=D0=BC=20=D0=BF=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/views/auth/Registration.vue | 22 +++++++++++++++++++ .../auth/{auth.blade.php => login.blade.php} | 2 +- resources/views/auth/{auth.js => login.js} | 0 resources/views/auth/registration.blade.php | 13 +++++++++++ resources/views/auth/registration.js | 15 +++++++++++++ routes/web.php | 20 +++++++++++++++-- vite.config.js | 9 +++++++- 7 files changed, 77 insertions(+), 4 deletions(-) create mode 100644 resources/views/auth/Registration.vue rename resources/views/auth/{auth.blade.php => login.blade.php} (88%) rename resources/views/auth/{auth.js => login.js} (100%) create mode 100644 resources/views/auth/registration.blade.php create mode 100644 resources/views/auth/registration.js diff --git a/resources/views/auth/Registration.vue b/resources/views/auth/Registration.vue new file mode 100644 index 0000000..43a35b9 --- /dev/null +++ b/resources/views/auth/Registration.vue @@ -0,0 +1,22 @@ + + + + + diff --git a/resources/views/auth/auth.blade.php b/resources/views/auth/login.blade.php similarity index 88% rename from resources/views/auth/auth.blade.php rename to resources/views/auth/login.blade.php index 24ad475..ab0cab3 100644 --- a/resources/views/auth/auth.blade.php +++ b/resources/views/auth/login.blade.php @@ -4,7 +4,7 @@ Аутентификация - @vite('resources/views/auth/auth.js') + @vite('resources/views/auth/login.js') @vite('resources/css/app.css') diff --git a/resources/views/auth/auth.js b/resources/views/auth/login.js similarity index 100% rename from resources/views/auth/auth.js rename to resources/views/auth/login.js diff --git a/resources/views/auth/registration.blade.php b/resources/views/auth/registration.blade.php new file mode 100644 index 0000000..5321cc6 --- /dev/null +++ b/resources/views/auth/registration.blade.php @@ -0,0 +1,13 @@ + + + + + + Аутентификация + @vite('resources/views/auth/registration.js') + @vite('resources/css/app.css') + + +
+ + diff --git a/resources/views/auth/registration.js b/resources/views/auth/registration.js new file mode 100644 index 0000000..87c65ac --- /dev/null +++ b/resources/views/auth/registration.js @@ -0,0 +1,15 @@ +import '../../js/bootstrap.js'; +import {createApp} from 'vue' +import App from './Registration.vue' +import { createVuetify } from 'vuetify' +import 'vuetify/styles' +import * as components from 'vuetify/components' +import * as directives from 'vuetify/directives' +import '@mdi/font/css/materialdesignicons.css' + +const vuetify = createVuetify({ + components, + directives +}) + +createApp(App).use(vuetify).mount("#app") diff --git a/routes/web.php b/routes/web.php index ede4a7b..b451b68 100644 --- a/routes/web.php +++ b/routes/web.php @@ -1,5 +1,6 @@ group(function (){ + Route::view('/admin', 'admin')->middleware('auth')->name('admin'); + Route::get('/login', function (){ + if (Auth::check()){ + return redirect(route('user.admin')); + } + return view('auth/login'); + })->name('login'); + // Route::post('/login', []); + // Route::get('/logout', [])->name('logout'); + Route::get('/registration', function (){ + if (Auth::check()){ + return redirect(route('user.admin')); + } + return view('auth/registration'); + }); + // Route::post('/registration', []); }); Route::get('/download/{file}', 'App\Http\Controllers\DownloadController@download'); diff --git a/vite.config.js b/vite.config.js index 6fe0a82..f7dad9f 100644 --- a/vite.config.js +++ b/vite.config.js @@ -6,7 +6,14 @@ export default defineConfig({ plugins: [ vue(), laravel({ - input: ['resources/css/app.css', 'resources/app.js', 'resources/welcome.js', 'resources/caesar.js', "resources/views/auth/auth.js"], + input: [ + 'resources/css/app.css', + 'resources/app.js', + 'resources/welcome.js', + 'resources/caesar.js', + "resources/views/auth/login.js", + "resources/views/auth/registration.js" + ], refresh: true, }), ],