diff --git a/.gitignore b/.gitignore index c7cf1fa..7de6258 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ yarn-error.log /.nova /.vscode /.zed +.gitignore \ No newline at end of file diff --git a/app/Http/Controllers/InquiryConfirmController.php b/app/Http/Controllers/InquiryConfirmController.php index 9f3f550..064d8c1 100644 --- a/app/Http/Controllers/InquiryConfirmController.php +++ b/app/Http/Controllers/InquiryConfirmController.php @@ -23,7 +23,7 @@ class InquiryConfirmController extends Controller public function index() { // 入力画面に遷移 - return view('/swo7_1',['form_data' => $this->form_data ]); + return view('general.swo7_1',['form_data' => $this->form_data ]); } // お問い合わせ入力⇒お問い合わせ確認 @@ -50,7 +50,7 @@ class InquiryConfirmController extends Controller // バリデーションチェック $validator = Validator::make($request->all(), $rules, $message); if ($validator->fails()) { - return redirect('/swo7_1') + return redirect('general.swo7_1') ->withErrors($validator) ->withInput() ->with('before_subject', implode(',', $request->input('subject'))); @@ -67,7 +67,7 @@ class InquiryConfirmController extends Controller ]; // 確認画面に遷移 - return view('/swo7_2', ['input_data' => $input_data]); + return view('general.swo7_2', ['input_data' => $input_data]); } // お問い合わせ確認⇒お問い合わせ入力(戻る)orお問い合わせ完了(送信) @@ -75,7 +75,7 @@ class InquiryConfirmController extends Controller { // 前の画面に戻る if($request->input('back') == 'back'){ - return redirect('/swo7_1') + return redirect('general.swo7_1') ->withInput($request->all()) ->with('before_subject', $request->input('subject')); } @@ -105,6 +105,6 @@ class InquiryConfirmController extends Controller }); // 完了画面に遷移 - return view('/swo7_3'); + return view('general.swo7_3'); } } \ No newline at end of file diff --git a/app/Http/Controllers/MemberRegistrationController.php b/app/Http/Controllers/MemberRegistrationController.php index 9ccd188..22dcd95 100644 --- a/app/Http/Controllers/MemberRegistrationController.php +++ b/app/Http/Controllers/MemberRegistrationController.php @@ -23,7 +23,7 @@ class MemberRegistrationController extends Controller ]; $validator = Validator::make($request->all(), $rules, $message); if ($validator->fails()) { - return redirect('/swo2_1') + return redirect('general.swo2_1') ->withErrors($validator) ->withInput(); } @@ -33,7 +33,7 @@ class MemberRegistrationController extends Controller $existingMember = User::where('user_primemail', $email)->get(); foreach ($existingMember as $member) { if ($member->user_quit_flag != 1) { - return redirect('/swo2_1') + return redirect('general.swo2_1') ->withErrors(['email' => '指定のメールアドレスは既に使用されています。']) ->withInput(); } @@ -48,7 +48,7 @@ class MemberRegistrationController extends Controller }); // 完了画面遷移 - return view('/swo2_2'); + return view('general.swo2_2'); } // 入力画面表示 @@ -56,7 +56,7 @@ class MemberRegistrationController extends Controller { // 署名付きURLの有効期限チェック if (!request()->hasValidSignature()) { - return redirect('/error')->withErrors(['error' => '署名の有効期限が切れています']); + return redirect('general.error')->withErrors(['error' => '署名の有効期限が切れています']); } // 初回遷移(GETアクセス)時のリクエストパラメータチェック @@ -65,21 +65,21 @@ class MemberRegistrationController extends Controller // パラメータ存在チェック $encryptedEmail = request()->query('email'); if (!$encryptedEmail) { - return redirect('/error')->withErrors(['error' => 'メールアドレスが指定されていません']); + return redirect('general.error')->withErrors(['error' => 'メールアドレスが指定されていません']); } // パラメータ整合性チェック try { $email = decrypt($encryptedEmail); } catch (\Exception $e) { - return redirect('/error')->withErrors(['error' => 'メールアドレスの情報が不正です']); + return redirect('general.error')->withErrors(['error' => 'メールアドレスの情報が不正です']); } // 二重登録防止チェック $existingMember = User::where('user_primemail', $email)->get(); foreach ($existingMember as $member) { if ($member->user_quit_flag != 1) { - return redirect('/error')->withErrors(['error' => '既に登録済みです']); + return redirect('general.error')->withErrors(['error' => '既に登録済みです']); } } @@ -88,7 +88,7 @@ class MemberRegistrationController extends Controller } // 入力画面に遷移 - return view('/swo2_3'); + return view('general.swo2_3'); } // 確認画面表示 @@ -96,7 +96,7 @@ class MemberRegistrationController extends Controller { // 登録完了後のブラウザバックによる二重登録対策 if (!session()->has('email')) { - return redirect('/error')->withErrors(['error' => '不正なアクセスです']); + return redirect('general.error')->withErrors(['error' => '不正なアクセスです']); } // 入力チェック内容 (メールアドレスはセッションから取得するため対象外) @@ -119,7 +119,7 @@ class MemberRegistrationController extends Controller // バリデーションチェック $validator = Validator::make($request->all(), $rules, $message); if ($validator->fails()) { - return redirect('/swo2_3') + return redirect('general.swo2_3') ->withErrors($validator) ->withInput(); } @@ -134,7 +134,7 @@ class MemberRegistrationController extends Controller ]; // 確認画面に遷移 - return view('/swo2_4', ['input_data' => $input_data]); + return view('general.swo2_4', ['input_data' => $input_data]); } // 会員登録 or 戻る @@ -142,12 +142,12 @@ class MemberRegistrationController extends Controller { // 前の画面に戻る if($request->input('back') == 'back'){ - return redirect('/swo2_3')->withInput(); + return redirect('general.swo2_3')->withInput(); } // 登録完了後のブラウザバックによる二重登録対策 if (!session()->has('email')) { - return redirect('/error')->withErrors(['error' => '不正なアクセスです']); + return redirect('general.error')->withErrors(['error' => '不正なアクセスです']); } // 利用者連番、利用者ID(利用者連番+7DSRチェックデジット)、初期パスワード(ハッシュ化)を生成 @@ -185,6 +185,6 @@ class MemberRegistrationController extends Controller session()->forget('email'); // 完了画面に遷移 - return view('/swo2_5'); + return view('general.swo2_5'); } } \ No newline at end of file diff --git a/app/Http/Controllers/PasswordReminderController.php b/app/Http/Controllers/PasswordReminderController.php index d8ffb6a..51a9ef6 100644 --- a/app/Http/Controllers/PasswordReminderController.php +++ b/app/Http/Controllers/PasswordReminderController.php @@ -30,7 +30,7 @@ class PasswordReminderController extends Controller // バリデーションチェック $validator = Validator::make($request->all(), $rules, $message); if ($validator->fails()) { - return redirect('/swo8_2') + return redirect('general.swo8_2') ->withErrors($validator) ->withInput(); } @@ -44,7 +44,7 @@ class PasswordReminderController extends Controller $query->where('user_mobile', $phone)->orWhere('user_homephone', $phone); })->first(); if (!$existingMember) { - return redirect('/swo8_2') + return redirect('general.swo8_2') ->withErrors(['nodata' => '該当する会員情報が見つかりませんでした']) ->withInput(); } @@ -66,6 +66,6 @@ class PasswordReminderController extends Controller }); // 完了画面遷移 - return view('/swo8_3'); + return view('general.swo8_3'); } } \ No newline at end of file diff --git a/resources/views/error.blade.php b/resources/views/error.blade.php deleted file mode 100644 index 780d7cb..0000000 --- a/resources/views/error.blade.php +++ /dev/null @@ -1,28 +0,0 @@ - - - - |So-Manager - - - - - - - - - -
- @include('layouts.header'); - -
-
-
-

ページが見つかりません
{{ $errors->first('error') }}

-
-
-
- - @include('layouts.footer'); -
- - diff --git a/resources/views/general/error.blade.php b/resources/views/general/error.blade.php new file mode 100644 index 0000000..c8daba3 --- /dev/null +++ b/resources/views/general/error.blade.php @@ -0,0 +1,10 @@ +@extends('layouts.general') +@section('content') +
+
+
+

ページが見つかりません
{{ $errors->first('error') }}

+
+
+
+@endsection \ No newline at end of file diff --git a/resources/views/swo10_1.blade.php b/resources/views/general/swo10_1.blade.php similarity index 83% rename from resources/views/swo10_1.blade.php rename to resources/views/general/swo10_1.blade.php index de9135f..6b968de 100644 --- a/resources/views/swo10_1.blade.php +++ b/resources/views/general/swo10_1.blade.php @@ -1,19 +1,5 @@ - - - - |So-Manager - - - - - - - - - -
- @include('layouts.header'); - +@extends('layouts.general') +@section('content')

運営会社

@@ -48,7 +34,7 @@


- 社長 + 社長
@@ -118,9 +104,4 @@ - - @include('layouts.info'); - @include('layouts.footer'); - - - +@endsection \ No newline at end of file diff --git a/resources/views/swo11_1.blade.php b/resources/views/general/swo11_1.blade.php similarity index 87% rename from resources/views/swo11_1.blade.php rename to resources/views/general/swo11_1.blade.php index 43c44c4..978abef 100644 --- a/resources/views/swo11_1.blade.php +++ b/resources/views/general/swo11_1.blade.php @@ -1,19 +1,5 @@ - - - - |So-Manager - - - - - - - - - -
- @include('layouts.header'); - +@extends('layouts.general') +@section('content')
@@ -95,9 +81,4 @@
- - @include('layouts.info'); - @include('layouts.footer'); -
- - +@endsection \ No newline at end of file diff --git a/resources/views/swo12_1.blade.php b/resources/views/general/swo12_1.blade.php similarity index 94% rename from resources/views/swo12_1.blade.php rename to resources/views/general/swo12_1.blade.php index 05e8b1c..de1133b 100644 --- a/resources/views/swo12_1.blade.php +++ b/resources/views/general/swo12_1.blade.php @@ -1,19 +1,5 @@ - - - - |So-Manager - - - - - - - - - -
- @include('layouts.header'); - +@extends('layouts.general') +@section('content')
@@ -99,9 +85,4 @@
- - @include('layouts.info'); - @include('layouts.footer'); -
- - +@endsection diff --git a/resources/views/swo13_1.blade.php b/resources/views/general/swo13_1.blade.php similarity index 88% rename from resources/views/swo13_1.blade.php rename to resources/views/general/swo13_1.blade.php index f6da02b..3263ff3 100644 --- a/resources/views/swo13_1.blade.php +++ b/resources/views/general/swo13_1.blade.php @@ -1,19 +1,5 @@ - - - - |So-Manager - - - - - - - - - -
- @include('layouts.header'); - +@extends('layouts.general') +@section('content')
@@ -78,9 +64,4 @@
- - @include('layouts.info'); - @include('layouts.footer'); -
- - +@endsection \ No newline at end of file diff --git a/resources/views/swo14_1.blade.php b/resources/views/general/swo14_1.blade.php similarity index 86% rename from resources/views/swo14_1.blade.php rename to resources/views/general/swo14_1.blade.php index 3935b85..2176721 100644 --- a/resources/views/swo14_1.blade.php +++ b/resources/views/general/swo14_1.blade.php @@ -1,19 +1,5 @@ - - - - |So-Manager - - - - - - - - - -
- @include('layouts.header'); - +@extends('layouts.general') +@section('content')
@@ -61,9 +47,4 @@
- - @include('layouts.info'); - @include('layouts.footer'); -
- - +@endsection diff --git a/resources/views/swo15_1.blade.php b/resources/views/general/swo15_1.blade.php similarity index 81% rename from resources/views/swo15_1.blade.php rename to resources/views/general/swo15_1.blade.php index 307ef40..3f3e72e 100644 --- a/resources/views/swo15_1.blade.php +++ b/resources/views/general/swo15_1.blade.php @@ -1,19 +1,5 @@ - - - - |So-Manager - - - - - - - - - -
- @include('layouts.header'); - +@extends('layouts.general') +@section('content')
@@ -45,7 +31,7 @@

開示等の依頼の手続き、使用する様式

開示等の依頼は、以下の手続き及び様式に則って実施致します。

利用目的の通知:本書面の“開示対象個人情報の利用目的”をご覧下さい。

-

開示、訂正・削除、利用停止:当社の定める様式にて実施致します。該当の受付け窓口にご連絡頂き、所定の様式『個人情報開示等依頼書(PDF:9KB)』を入手のうえ、手続きをお願い致します。

+

開示、訂正・削除、利用停止:当社の定める様式にて実施致します。該当の受付け窓口にご連絡頂き、所定の様式『個人情報開示等依頼書(PDF:9KB)』を入手のうえ、手続きをお願い致します。

回答に関しては、記入済み個人情報開示等依頼書を、ご自宅への郵送のみとさせて頂きます。

開示対象個人情報の取扱いに関する苦情受付け窓口

開示対象個人情報の取扱いに関する苦情、相談に関しましては、以下の窓口宛てにご連絡ください。

@@ -58,9 +44,4 @@
- - @include('layouts.info'); - @include('layouts.footer'); -
- - +@endsection diff --git a/resources/views/swo16_1.blade.php b/resources/views/general/swo16_1.blade.php similarity index 72% rename from resources/views/swo16_1.blade.php rename to resources/views/general/swo16_1.blade.php index 7bc1fcb..fab96de 100644 --- a/resources/views/swo16_1.blade.php +++ b/resources/views/general/swo16_1.blade.php @@ -1,19 +1,5 @@ - - - - |So-Manager - - - - - - - - - -
- @include('layouts.header'); - +@extends('layouts.general') +@section('content')
@@ -55,18 +41,13 @@
- - @include('layouts.info'); - @include('layouts.footer'); -
- - + - - + +@endsection diff --git a/resources/views/swo17_1.blade.php b/resources/views/general/swo17_1.blade.php similarity index 63% rename from resources/views/swo17_1.blade.php rename to resources/views/general/swo17_1.blade.php index 69289ff..874bc55 100644 --- a/resources/views/swo17_1.blade.php +++ b/resources/views/general/swo17_1.blade.php @@ -1,19 +1,5 @@ - - - - |So-Manager - - - - - - - - - -
- @include('layouts.header'); - +@extends('layouts.general') +@section('content')

サイトマップ

@@ -41,9 +27,4 @@
- - @include('layouts.info'); - @include('layouts.footer'); - - - +@endsection diff --git a/resources/views/general/swo1_1.blade.php b/resources/views/general/swo1_1.blade.php new file mode 100644 index 0000000..1d8940c --- /dev/null +++ b/resources/views/general/swo1_1.blade.php @@ -0,0 +1,36 @@ +@extends('layouts.general') +@section('content') +
+
+
+

So-Managerの駐車場・駐輪場のご利用開始はこちらから

+
+ +
+
+@endsection \ No newline at end of file diff --git a/resources/views/general/swo2_1.blade.php b/resources/views/general/swo2_1.blade.php new file mode 100644 index 0000000..6f9a461 --- /dev/null +++ b/resources/views/general/swo2_1.blade.php @@ -0,0 +1,53 @@ +@extends('layouts.general') +@section('content') +
+
+
+
+
+
+
新規会員登録
+
+
+

会員登録ページのご案内をお送りします。お客様のメールアドレスをご入力ください。

+
+
+ +
+
+ + @if($errors->has('email')) +
{{ $errors->first('email') }}
+ @endif +
+
+ + 戻る +
+ @csrf + +
+
+
+
+
+
+ + + @if(!$errors->has('email')) + + + @endif + +@endsection \ No newline at end of file diff --git a/resources/views/swo2_2.blade.php b/resources/views/general/swo2_2.blade.php similarity index 51% rename from resources/views/swo2_2.blade.php rename to resources/views/general/swo2_2.blade.php index 6e4dd21..67b7724 100644 --- a/resources/views/swo2_2.blade.php +++ b/resources/views/general/swo2_2.blade.php @@ -1,18 +1,5 @@ - - - - |So-Manager - - - - - - - - - -
- @include('layouts.header'); +@extends('layouts.general') +@section('content')
@@ -30,9 +17,4 @@
- - @include('layouts.info'); - @include('layouts.footer'); -
- - +@endsection \ No newline at end of file diff --git a/resources/views/swo2_3.blade.php b/resources/views/general/swo2_3.blade.php similarity index 85% rename from resources/views/swo2_3.blade.php rename to resources/views/general/swo2_3.blade.php index cd0a6ef..d90ae0a 100644 --- a/resources/views/swo2_3.blade.php +++ b/resources/views/general/swo2_3.blade.php @@ -1,20 +1,5 @@ - - - - |So-Manager - - - - - - - - - - -
- @include('layouts.header'); - +@extends('layouts.general') +@section('content')
@@ -93,9 +78,4 @@
- - @include('layouts.info'); - @include('layouts.footer'); -
- - +@endsection \ No newline at end of file diff --git a/resources/views/swo2_4.blade.php b/resources/views/general/swo2_4.blade.php similarity index 79% rename from resources/views/swo2_4.blade.php rename to resources/views/general/swo2_4.blade.php index 76d6665..bdebb7a 100644 --- a/resources/views/swo2_4.blade.php +++ b/resources/views/general/swo2_4.blade.php @@ -1,19 +1,5 @@ - - - - |So-Manager - - - - - - - - - -
- @include('layouts.header'); - +@extends('layouts.general') +@section('content')
@@ -56,9 +42,4 @@
- - @include('layouts.info'); - @include('layouts.footer'); -
- - +@endsection \ No newline at end of file diff --git a/resources/views/general/swo2_5.blade.php b/resources/views/general/swo2_5.blade.php new file mode 100644 index 0000000..124cf92 --- /dev/null +++ b/resources/views/general/swo2_5.blade.php @@ -0,0 +1,15 @@ +@extends('layouts.general') +@section('content') +
+ +
+@endsection + + diff --git a/resources/views/swo3_1.blade.php b/resources/views/general/swo3_1.blade.php similarity index 88% rename from resources/views/swo3_1.blade.php rename to resources/views/general/swo3_1.blade.php index ee0e6df..176b1c2 100644 --- a/resources/views/swo3_1.blade.php +++ b/resources/views/general/swo3_1.blade.php @@ -1,19 +1,5 @@ - - - - |So-Manager - - - - - - - - - -
- @include('layouts.header'); - +@extends('layouts.general') +@section('content')
@@ -121,15 +107,6 @@
- -
-
-

Copyright© so-rin Co.,Ltd. All Rights Reserved. · - 加盟団体 -

-
-
- @@ -141,10 +118,5 @@ - - - + +@endsection diff --git a/resources/views/swo3_2.blade.php b/resources/views/general/swo3_2.blade.php similarity index 74% rename from resources/views/swo3_2.blade.php rename to resources/views/general/swo3_2.blade.php index 502913a..5155315 100644 --- a/resources/views/swo3_2.blade.php +++ b/resources/views/general/swo3_2.blade.php @@ -1,18 +1,5 @@ - - - - |So-Manager - - - - - - - - - - @include('layouts.header'); - +@extends('layouts.general') +@section('content')
@@ -47,14 +34,6 @@
-
-
-

Copyright© so-rin Co.,Ltd. All Rights Reserved. · - 加盟団体 -

-
-
- @@ -66,10 +45,5 @@ - - - + +@endsection diff --git a/resources/views/swo5_1.blade.php b/resources/views/general/swo5_1.blade.php similarity index 99% rename from resources/views/swo5_1.blade.php rename to resources/views/general/swo5_1.blade.php index b87dba9..9f67506 100644 --- a/resources/views/swo5_1.blade.php +++ b/resources/views/general/swo5_1.blade.php @@ -57,7 +57,7 @@ - @include('layouts.header'); + @include('partials.header')
diff --git a/resources/views/swo6_1.blade.php b/resources/views/general/swo6_1.blade.php similarity index 92% rename from resources/views/swo6_1.blade.php rename to resources/views/general/swo6_1.blade.php index 86b9955..e13d293 100644 --- a/resources/views/swo6_1.blade.php +++ b/resources/views/general/swo6_1.blade.php @@ -1,18 +1,5 @@ - - - - |So-Manager - - - - - - - - - -
- @include('layouts.header'); +@extends('layouts.general') +@section('content')
@@ -103,11 +90,4 @@
- - @include('layouts.info'); - @include('layouts.footer'); - - -
- - +@endsection diff --git a/resources/views/swo7_1.blade.php b/resources/views/general/swo7_1.blade.php similarity index 68% rename from resources/views/swo7_1.blade.php rename to resources/views/general/swo7_1.blade.php index 71cf92b..30afafe 100644 --- a/resources/views/swo7_1.blade.php +++ b/resources/views/general/swo7_1.blade.php @@ -1,28 +1,14 @@ - - - - |So-Manager - - - - - - - - - -
- @include('layouts.header'); - +@extends('layouts.general') +@section('content')

お問い合わせ

株式会社ソーリンへのご訪問ありがとうございます。 - お問い合わせいただくお客さまは、当社のホームページにおける個人情報の取り扱いについて、あらかじめご確認いただき、ご同意いただいた上でお問い合わせください。個人情報の開示、訂正、削除、利用停止については、こちらをご覧下さい。
+ お問い合わせいただくお客さまは、当社のホームページにおける個人情報の取り扱いについて、あらかじめご確認いただき、ご同意いただいた上でお問い合わせください。個人情報の開示、訂正、削除、利用停止については、こちらをご覧下さい。
また、メールから送信ができないお客様はお手数ですが、下記電話までご連絡をお願い致します。 ※ 携帯・スマートフォンからメールでのお問い合わせの際に、確実にご返信をさせていただくために、ドメイン (so-manager.com) の受信許可設定をお願い致します。

-
+
@foreach($form_data as $value)
{{ $value[2] }}
@@ -62,9 +48,4 @@
- - @include('layouts.info'); - @include('layouts.footer'); -
- - +@endsection diff --git a/resources/views/general/swo7_2.blade.php b/resources/views/general/swo7_2.blade.php new file mode 100644 index 0000000..f75d35c --- /dev/null +++ b/resources/views/general/swo7_2.blade.php @@ -0,0 +1,71 @@ +@extends('layouts.general') +@section('content') + +
+

確認画面

+

以下の内容で間違いがなければ、「送信する」ボタンを押してください。

+ +
+ + @foreach($input_data as $value) + + + + + @endforeach + +
{{ $value[2] }}{{ $value[1] }}
+

+ + +

+ @csrf + +
+@endsection \ No newline at end of file diff --git a/resources/views/general/swo7_3.blade.php b/resources/views/general/swo7_3.blade.php new file mode 100644 index 0000000..40e8c6f --- /dev/null +++ b/resources/views/general/swo7_3.blade.php @@ -0,0 +1,13 @@ +@extends('layouts.general') +@section('content') +
+ +
+@endsection diff --git a/resources/views/swo8_1.blade.php b/resources/views/general/swo8_1.blade.php similarity index 70% rename from resources/views/swo8_1.blade.php rename to resources/views/general/swo8_1.blade.php index 7b2a54a..bca209c 100644 --- a/resources/views/swo8_1.blade.php +++ b/resources/views/general/swo8_1.blade.php @@ -1,19 +1,5 @@ - - - - |So-Manager - - - - - - - - - -
- @include('layouts.header'); - +@extends('layouts.general') +@section('content')
@@ -48,9 +34,4 @@
- - @include('layouts.info'); - @include('layouts.footer'); -
- - +@endsection \ No newline at end of file diff --git a/resources/views/swo8_2.blade.php b/resources/views/general/swo8_2.blade.php similarity index 75% rename from resources/views/swo8_2.blade.php rename to resources/views/general/swo8_2.blade.php index 0c57682..7035d61 100644 --- a/resources/views/swo8_2.blade.php +++ b/resources/views/general/swo8_2.blade.php @@ -1,19 +1,5 @@ - - - - |So-Manager - - - - - - - - - -
- @include('layouts.header'); - +@extends('layouts.general') +@section('content')
@@ -22,8 +8,7 @@
パスワードの再設定
-
- +
@@ -62,9 +47,4 @@
- - @include('layouts.info'); - @include('layouts.footer'); -
- - +@endsection diff --git a/resources/views/swo8_3.blade.php b/resources/views/general/swo8_3.blade.php similarity index 50% rename from resources/views/swo8_3.blade.php rename to resources/views/general/swo8_3.blade.php index 9c29807..7a2c621 100644 --- a/resources/views/swo8_3.blade.php +++ b/resources/views/general/swo8_3.blade.php @@ -1,19 +1,5 @@ - - - - |So-Manager - - - - - - - - - -
- @include('layouts.header'); - +@extends('layouts.general') +@section('content')
@@ -31,9 +17,4 @@
- - @include('layouts.info'); - @include('layouts.footer'); -
- - +@endsection diff --git a/resources/views/swo9_1.blade.php b/resources/views/general/swo9_1.blade.php similarity index 55% rename from resources/views/swo9_1.blade.php rename to resources/views/general/swo9_1.blade.php index 8c03f1e..2c8892c 100644 --- a/resources/views/swo9_1.blade.php +++ b/resources/views/general/swo9_1.blade.php @@ -1,19 +1,5 @@ - - - - |So-Manager - - - - - - - - - -
- @include('layouts.header'); - +@extends('layouts.general') +@section('content')
@@ -30,9 +16,5 @@
- - @include('layouts.info'); - @include('layouts.footer'); -
- - +@endsection + diff --git a/resources/views/swo9_2.blade.php b/resources/views/general/swo9_2.blade.php similarity index 53% rename from resources/views/swo9_2.blade.php rename to resources/views/general/swo9_2.blade.php index 8a3d3b7..491bfec 100644 --- a/resources/views/swo9_2.blade.php +++ b/resources/views/general/swo9_2.blade.php @@ -1,19 +1,5 @@ - - - - |So-Manager - - - - - - - - - -
- @include('layouts.header'); - +@extends('layouts.general') +@section('content')
@@ -30,9 +16,4 @@
- - @include('layouts.info'); - @include('layouts.footer'); - - - \ No newline at end of file +@endsection diff --git a/resources/views/general/swo9_3.blade.php b/resources/views/general/swo9_3.blade.php new file mode 100644 index 0000000..79f22b5 --- /dev/null +++ b/resources/views/general/swo9_3.blade.php @@ -0,0 +1,16 @@ +@extends('layouts.general') +@section('content') +
+
+
+

2025.02.10

+
+
+

+ 4月より料金区分が変わる契約者様は手続きが必要です。新しい区分が確認出来る身分証明書をご用意の上サポートセンターまでお問い合わせをお願い致します。So-Managerサポートセンター
+ : 03-5856-4720(毎日12時~22時)

+
+
+
+
+@endsection \ No newline at end of file diff --git a/resources/views/swo9_4.blade.php b/resources/views/general/swo9_4.blade.php similarity index 55% rename from resources/views/swo9_4.blade.php rename to resources/views/general/swo9_4.blade.php index c99c311..2647c5a 100644 --- a/resources/views/swo9_4.blade.php +++ b/resources/views/general/swo9_4.blade.php @@ -1,19 +1,5 @@ - - - - |So-Manager - - - - - - - - - -
- @include('layouts.header'); - +@extends('layouts.general') +@section('content')
@@ -25,18 +11,13 @@ 平素は、十条駅西口自転車駐車場(仮設)をご利用いただき、誠にありがとうございます。
駐輪場掲示物・係員のお声かけ等で、ご案内させて頂いておりますが、2025年1月9日で
当仮設駐輪場は、閉鎖となり駅前ロータリー地下に移転いたします。
-  定期利用料については、2階料金が廃止となります。
+ 定期利用料については、2階料金が廃止となります。
駐車位置に関しては、優先置場(平置きでラック無し)をご用意しております。
お手間をお掛け致しますが、ご理解・ご協力の上、よろしくお願い申し上げます。

- 駐輪場営業時間 4:00~翌日1:00
+ 駐輪場営業時間 4:00~翌日1:00
1:00~4:00までは、閉場し自転車・人の出入りは出来ません。

- - @include('layouts.info'); - @include('layouts.footer'); - - - \ No newline at end of file +@endsection \ No newline at end of file diff --git a/resources/views/swo9_5.blade.php b/resources/views/general/swo9_5.blade.php similarity index 60% rename from resources/views/swo9_5.blade.php rename to resources/views/general/swo9_5.blade.php index a37d190..e33592a 100644 --- a/resources/views/swo9_5.blade.php +++ b/resources/views/general/swo9_5.blade.php @@ -1,19 +1,5 @@ - - - - |So-Manager - - - - - - - - - -
- @include('layouts.header'); - +@extends('layouts.general') +@section('content')
@@ -29,9 +15,4 @@
- - @include('layouts.info'); - @include('layouts.footer'); - - - \ No newline at end of file +@endsection \ No newline at end of file diff --git a/resources/views/layouts/general.blade.php b/resources/views/layouts/general.blade.php new file mode 100644 index 0000000..beb8dde --- /dev/null +++ b/resources/views/layouts/general.blade.php @@ -0,0 +1,25 @@ + + + + |So-Manager + + + + + + + + + + + + +
+ @include('partials.header') + @yield('content') + @include('partials.news') + @include('partials.banner') + @include('partials.footer') +
+ + diff --git a/resources/views/partials/banner.blade.php b/resources/views/partials/banner.blade.php new file mode 100644 index 0000000..845aed9 --- /dev/null +++ b/resources/views/partials/banner.blade.php @@ -0,0 +1,19 @@ + +
+
+
+

So-Managerとは?

+

+ So-Managerは、株式会社ソーリンがお送りする、駐輪場マネジメントウェブシステムです。
+ 空き駐輪場の検索、予約、駐輪場定期の新規発行、更新がネット上からカンタンに行えます。 +

+ ご利用方法のページへ +
+
+
+ + + + \ No newline at end of file diff --git a/resources/views/layouts/footer.blade.php b/resources/views/partials/footer.blade.php similarity index 91% rename from resources/views/layouts/footer.blade.php rename to resources/views/partials/footer.blade.php index a382c6c..4ed0810 100644 --- a/resources/views/layouts/footer.blade.php +++ b/resources/views/partials/footer.blade.php @@ -24,5 +24,5 @@ -
Pマーク
+
Pマーク
\ No newline at end of file diff --git a/resources/views/layouts/header.blade.php b/resources/views/partials/header.blade.php similarity index 93% rename from resources/views/layouts/header.blade.php rename to resources/views/partials/header.blade.php index 0acb147..56747d4 100644 --- a/resources/views/layouts/header.blade.php +++ b/resources/views/partials/header.blade.php @@ -3,14 +3,13 @@
+
マイページへログイン diff --git a/resources/views/layouts/info.blade.php b/resources/views/partials/news.blade.php similarity index 64% rename from resources/views/layouts/info.blade.php rename to resources/views/partials/news.blade.php index 3621334..9a5dcc4 100644 --- a/resources/views/layouts/info.blade.php +++ b/resources/views/partials/news.blade.php @@ -38,23 +38,4 @@
- - -
-
-
-

So-Managerとは?

-

- So-Managerは、株式会社ソーリンがお送りする、駐輪場マネジメントウェブシステムです。
- 空き駐輪場の検索、予約、駐輪場定期の新規発行、更新がネット上からカンタンに行えます。 -

- ご利用方法のページへ -
-
-
- - - - \ No newline at end of file + \ No newline at end of file diff --git a/resources/views/swo1_1.blade.php b/resources/views/swo1_1.blade.php deleted file mode 100644 index 80d3fce..0000000 --- a/resources/views/swo1_1.blade.php +++ /dev/null @@ -1,55 +0,0 @@ - - - - |So-Manager - - - - - - - - - -
- @include('layouts.header'); - -
-
-
-

So-Managerの駐車場・駐輪場のご利用開始はこちらから

-
- -
-
- - @include('layouts.info'); - @include('layouts.footer'); -
- - diff --git a/resources/views/swo2_1.blade.php b/resources/views/swo2_1.blade.php deleted file mode 100644 index 8794774..0000000 --- a/resources/views/swo2_1.blade.php +++ /dev/null @@ -1,79 +0,0 @@ - - - - |So-Manager - - - - - - - - - -
- @include('layouts.header'); - -
-
-
-
-
-
-
新規会員登録
-
-
-

会員登録ページのご案内をお送りします。お客様のメールアドレスをご入力ください。

- -
- -
-
- - @if($errors->has('email')) -
{{ $errors->first('email') }}
- @endif -
-
- - 戻る -
- @csrf - -
-
-
-
-
-
- - - @if(!$errors->has('email')) - - - @endif - @include('layouts.info'); - @include('layouts.footer'); -
- - - - - - diff --git a/resources/views/swo2_5.blade.php b/resources/views/swo2_5.blade.php deleted file mode 100644 index 4600d5a..0000000 --- a/resources/views/swo2_5.blade.php +++ /dev/null @@ -1,34 +0,0 @@ - - - - |So-Manager - - - - - - - - - -
- @include('layouts.header'); - -
- -
- - @include('layouts.info'); - @include('layouts.footer'); -
- - - - diff --git a/resources/views/swo7_2.blade.php b/resources/views/swo7_2.blade.php deleted file mode 100644 index 90d259f..0000000 --- a/resources/views/swo7_2.blade.php +++ /dev/null @@ -1,90 +0,0 @@ - - - - |So-Manager - - - - - - - - - - -
- @include('layouts.header'); - -
-

確認画面

-

以下の内容で間違いがなければ、「送信する」ボタンを押してください。

-
- - - @foreach($input_data as $value) - - - - - @endforeach - -
{{ $value[2] }}{{ $value[1] }}
-

- - -

- @csrf -
-
- - @include('layouts.footer'); -
- - \ No newline at end of file diff --git a/resources/views/swo7_3.blade.php b/resources/views/swo7_3.blade.php deleted file mode 100644 index 7d829fc..0000000 --- a/resources/views/swo7_3.blade.php +++ /dev/null @@ -1,31 +0,0 @@ - - - - |So-Manager - - - - - - - - - -
- @include('layouts.header'); - -
- -
- - @include('layouts.footer'); -
- - diff --git a/resources/views/swo9_3.blade.php b/resources/views/swo9_3.blade.php deleted file mode 100644 index d89510a..0000000 --- a/resources/views/swo9_3.blade.php +++ /dev/null @@ -1,35 +0,0 @@ - - - - |So-Manager - - - - - - - - - -
- @include('layouts.header'); - -
-
-
-

2025.02.10

-
-
-

- 4月より料金区分が変わる契約者様は手続きが必要です。新しい区分が確認出来る身分証明書をご用意の上サポートセンターまでお問い合わせをお願い致します。So-Managerサポートセンター
- : 03-5856-4720(毎日12時~22時)

-
-
-
-
- - @include('layouts.info'); - @include('layouts.footer'); -
- - \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index e5939e6..aecf642 100644 --- a/routes/web.php +++ b/routes/web.php @@ -21,31 +21,31 @@ use App\Http\Controllers\ParkWaitlistController; use App\Http\Controllers\ReceiptController; // 画面遷移のみ -Route::get('/', function () { return view('swo1_1'); })->name('swo1_1'); -Route::get('/swo2_1', function () { return view('swo2_1'); })->name('swo2_1'); -Route::get('/swo3_1', function () { return view('swo3_1'); })->name('swo3_1'); -Route::get('/swo3_2', function () { return view('swo3_2'); })->name('swo3_2'); -Route::get('/swo3_3', function () { return view('swo3_3'); })->name('swo3_3'); -Route::get('/swo4_1', function () { return view('swo4_1'); })->name('swo4_1'); -Route::get('/swo5_1', function () { return view('swo5_1'); })->name('swo5_1'); -Route::get('/swo6_1', function () { return view('swo6_1'); })->name('swo6_1'); -Route::get('/swo8_1', function () { return view('swo8_1'); })->name('swo8_1'); -Route::get('/swo8_2', function () { return view('swo8_2'); })->name('swo8_2'); -Route::get('/swo9_1', function () { return view('swo9_1'); })->name('swo9_1'); -Route::get('/swo9_2', function () { return view('swo9_2'); })->name('swo9_2'); -Route::get('/swo9_3', function () { return view('swo9_3'); })->name('swo9_3'); -Route::get('/swo9_4', function () { return view('swo9_4'); })->name('swo9_4'); -Route::get('/swo9_5', function () { return view('swo9_5'); })->name('swo9_5'); -Route::get('/swo10_1', function () { return view('swo10_1'); })->name('swo10_1'); -Route::get('/swo11_1', function () { return view('swo11_1'); })->name('swo11_1'); -Route::get('/swo12_1', function () { return view('swo12_1'); })->name('swo12_1'); -Route::get('/swo13_1', function () { return view('swo13_1'); })->name('swo13_1'); -Route::get('/swo14_1', function () { return view('swo14_1'); })->name('swo14_1'); -Route::get('/swo15_1', function () { return view('swo15_1'); })->name('swo15_1'); -Route::get('/swo15_2', function () { return view('swo15_2'); })->name('swo15_2'); -Route::get('/swo16_1', function () { return view('swo16_1'); })->name('swo16_1'); -Route::get('/swo17_1', function () { return view('swo17_1'); })->name('swo17_1'); -Route::get('/error', function () { return view('error'); })->name('error'); +Route::get('/', function () { return view('general.swo1_1'); })->name('swo1_1'); +Route::get('/swo2_1', function () { return view('general.swo2_1'); })->name('swo2_1'); +Route::get('/swo3_1', function () { return view('general.swo3_1'); })->name('swo3_1'); +Route::get('/swo3_2', function () { return view('general.swo3_2'); })->name('swo3_2'); +Route::get('/swo3_3', function () { return view('general.swo3_3'); })->name('swo3_3'); +Route::get('/swo4_1', function () { return view('general.swo4_1'); })->name('swo4_1'); +Route::get('/swo5_1', function () { return view('general.swo5_1'); })->name('swo5_1'); +Route::get('/swo6_1', function () { return view('general.swo6_1'); })->name('swo6_1'); +Route::get('/swo8_1', function () { return view('general.swo8_1'); })->name('swo8_1'); +Route::get('/swo8_2', function () { return view('general.swo8_2'); })->name('swo8_2'); +Route::get('/swo9_1', function () { return view('general.swo9_1'); })->name('swo9_1'); +Route::get('/swo9_2', function () { return view('general.swo9_2'); })->name('swo9_2'); +Route::get('/swo9_3', function () { return view('general.swo9_3'); })->name('swo9_3'); +Route::get('/swo9_4', function () { return view('general.swo9_4'); })->name('swo9_4'); +Route::get('/swo9_5', function () { return view('general.swo9_5'); })->name('swo9_5'); +Route::get('/swo10_1', function () { return view('general.swo10_1'); })->name('swo10_1'); +Route::get('/swo11_1', function () { return view('general.swo11_1'); })->name('swo11_1'); +Route::get('/swo12_1', function () { return view('general.swo12_1'); })->name('swo12_1'); +Route::get('/swo13_1', function () { return view('general.swo13_1'); })->name('swo13_1'); +Route::get('/swo14_1', function () { return view('general.swo14_1'); })->name('swo14_1'); +Route::get('/swo15_1', function () { return view('general.swo15_1'); })->name('swo15_1'); +Route::get('/swo15_2', function () { return view('general.swo15_2'); })->name('swo15_2'); +Route::get('/swo16_1', function () { return view('general.swo16_1'); })->name('swo16_1'); +Route::get('/swo17_1', function () { return view('general.swo17_1'); })->name('swo17_1'); +Route::get('/error', function () { return view('general.error'); })->name('error'); // コントローラー経由 Route::post('/swo2_2', [MemberRegistrationController::class, 'sendMail'])->name('swo2_2');