Merge pull request '9/9マージ' (#11) from main_watanabe into main

Reviewed-on: #11

.gitignore

@@ -21,3 +21,4 @@ yarn-error.log
 /.nova
 /.vscode
 /.zed
+.gitignore

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');
     }
 }

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');
     }
 }

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');
     }
 }

resources/views/error.blade.php

@@ -1,28 +0,0 @@
-<!doctype html>
-<html lang="ja">
-  <head>
-    <title>｜So-Manager</title>
-    <meta charset="utf-8">
-    <link rel="icon" href="assets/img/favicon.ico">
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/typicons/2.0.9/typicons.css" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/earlyaccess/roundedmplus1c.css" rel="stylesheet" />
-    <link href="../bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="assets/css/style.css" rel="stylesheet">
-    <script src="assets/js/ie-emulation-modes-warning.js"></script>
-  </head>
-  <body id="" class="">
-    <div id="font-scale" class="home">
-      @include('layouts.header');
-      <!-- ▼　メイン部分　▼ -->
-      <main role="main" id="" class="">
-        <article id="main-content" class="news-detail container">
-          <header class="news-title mt50 mb30 text-center">
-            <h1 class="h3">ページが見つかりません<br />{{ $errors->first('error') }}</h1>
-          </header>
-        </article>
-      </main>
-      <!-- ▲　メイン部分　▲ -->
-      @include('layouts.footer');
-    </div>
-  </body>
-</html>

resources/views/general/error.blade.php

@@ -0,0 +1,10 @@
+@extends('layouts.general')
+@section('content')
+      <main role="main" id="" class="">
+        <article id="main-content" class="news-detail container">
+          <header class="news-title mt50 mb30 text-center">
+            <h1 class="h3">ページが見つかりません<br />{{ $errors->first('error') }}</h1>
+          </header>
+        </article>
+      </main>
+@endsection

resources/views/general/swo10_1.blade.php

@@ -1,19 +1,5 @@
-<!doctype html>
+@extends('layouts.general')
-<html lang="ja">
+@section('content')
-  <head>
-    <title>｜So-Manager</title>
-    <meta charset="utf-8">
-    <link rel="icon" href="assets/img/favicon.ico">
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/typicons/2.0.9/typicons.css" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/earlyaccess/roundedmplus1c.css" rel="stylesheet" />
-    <link href="../bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="assets/css/style.css" rel="stylesheet">
-    <script src="assets/js/ie-emulation-modes-warning.js"></script>
-  </head>
-  <body id="" class="">
-    <div id="font-scale" class="home">
-      @include('layouts.header');
-      <!-- ▼　メイン部分　▼ -->
       <section id="" class="container mt20 mb20">
         <h2 class="text-success text-center">運営会社</h2>
         <div class="row">
@@ -48,7 +34,7 @@
           </div>
           <div class="col-12 col-lg-3 offset-0 offset-lg-1">
               <div class="pc mt50"><p><br></p></div>
-              <img src="assets/shachou.png" alt="社長" class="w-100" />
+                <img src="{{ asset('assets/shachou.png') }}" alt="社長" class="w-100" />
           </div>
           <div class="col-12 col-lg-10 offset-0 offset-lg-1 mt20 mb20">
             <table class="table">
@@ -118,9 +104,4 @@
           </div>
         </div>
       </section>
-      <!-- ▲　メイン部分　▲ -->
+@endsection
-      @include('layouts.info');
-      @include('layouts.footer');
-    </div>
-  </body>
-</html>

resources/views/general/swo11_1.blade.php

@@ -1,19 +1,5 @@
-<!doctype html>
+@extends('layouts.general')
-<html lang="ja">
+@section('content')
-  <head>
-    <title>｜So-Manager</title>
-    <meta charset="utf-8">
-    <link rel="icon" href="assets/img/favicon.ico">
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/typicons/2.0.9/typicons.css" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/earlyaccess/roundedmplus1c.css" rel="stylesheet" />
-    <link href="../bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="assets/css/style.css" rel="stylesheet">
-    <script src="assets/js/ie-emulation-modes-warning.js"></script>
-  </head>
-  <body id="" class="">
-    <div id="font-scale" class="home">
-      @include('layouts.header');
-      <!-- ▼　メイン部分　▼ -->
       <section id="" class="container mt20 mb20">
         <div class="row">
           <div class="col-12 col-lg-10 offset-0 offset-lg-1 mt20 mb20">
@@ -95,9 +81,4 @@
           </div>
         </div>
       </section>
-      <!-- ▲　メイン部分　▲ -->
+@endsection
-      @include('layouts.info');
-      @include('layouts.footer');
-    </div>
-  </body>
-</html>

resources/views/general/swo12_1.blade.php

@@ -1,19 +1,5 @@
-<!doctype html>
+@extends('layouts.general')
-<html lang="ja">
+@section('content')
-  <head>
-    <title>｜So-Manager</title>
-    <meta charset="utf-8">
-    <link rel="icon" href="assets/img/favicon.ico">
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/typicons/2.0.9/typicons.css" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/earlyaccess/roundedmplus1c.css" rel="stylesheet" />
-    <link href="../bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="assets/css/style.css" rel="stylesheet">
-    <script src="assets/js/ie-emulation-modes-warning.js"></script>
-  </head>
-  <body id="" class="">
-    <div id="font-scale" class="home">
-      @include('layouts.header');
-      <!-- ▼　メイン部分　▼ -->
       <section id="" class="container mt20 mb20">
         <div class="row">
           <div class="col-12 col-lg-10 offset-0 offset-lg-1 mt20 mb20">
@@ -99,9 +85,4 @@
           </div>
         </div>
       </section>
-      <!-- ▲　メイン部分　▲ -->
+@endsection
-      @include('layouts.info');
-      @include('layouts.footer');
-    </div>
-  </body>
-</html>

resources/views/general/swo13_1.blade.php

@@ -1,19 +1,5 @@
-<!doctype html>
+@extends('layouts.general')
-<html lang="ja">
+@section('content')
-  <head>
-    <title>｜So-Manager</title>
-    <meta charset="utf-8">
-    <link rel="icon" href="assets/img/favicon.ico">
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/typicons/2.0.9/typicons.css" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/earlyaccess/roundedmplus1c.css" rel="stylesheet" />
-    <link href="../bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="assets/css/style.css" rel="stylesheet">
-    <script src="assets/js/ie-emulation-modes-warning.js"></script>
-  </head>
-  <body id="" class="">
-    <div id="font-scale" class="home">
-      @include('layouts.header');
-      <!-- ▼　メイン部分　▼ -->
       <section id="" class="container mt20 mb20">
         <div class="row">
           <div class="col-12 col-lg-10 offset-0 offset-lg-1 mt20 mb20">
@@ -78,9 +64,4 @@
           </div>
         </div>
       </section>
-      <!-- ▲　メイン部分　▲ -->
+@endsection
-      @include('layouts.info');
-      @include('layouts.footer');
-    </div>
-  </body>
-</html>

resources/views/general/swo14_1.blade.php

@@ -1,19 +1,5 @@
-<!doctype html>
+@extends('layouts.general')
-<html lang="ja">
+@section('content')
-  <head>
-    <title>｜So-Manager</title>
-    <meta charset="utf-8">
-    <link rel="icon" href="assets/img/favicon.ico">
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/typicons/2.0.9/typicons.css" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/earlyaccess/roundedmplus1c.css" rel="stylesheet" />
-    <link href="../bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="assets/css/style.css" rel="stylesheet">
-    <script src="assets/js/ie-emulation-modes-warning.js"></script>
-  </head>
-  <body id="" class="">
-    <div id="font-scale" class="home">
-      @include('layouts.header');
-      <!-- ▼　メイン部分　▼ -->
       <section id="" class="container mt20 mb20">
         <div class="row">
           <div class="col-12 col-lg-10 offset-0 offset-lg-1 mt20 mb20">
@@ -61,9 +47,4 @@
           </div>
         </div>
       </section>
-      <!-- ▲　メイン部分　▲ -->
+@endsection
-      @include('layouts.info');
-      @include('layouts.footer');
-    </div>
-  </body>
-</html>

resources/views/general/swo15_1.blade.php

@@ -1,19 +1,5 @@
-<!doctype html>
+@extends('layouts.general')
-<html lang="ja">
+@section('content')
-  <head>
-    <title>｜So-Manager</title>
-    <meta charset="utf-8">
-    <link rel="icon" href="assets/img/favicon.ico">
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/typicons/2.0.9/typicons.css" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/earlyaccess/roundedmplus1c.css" rel="stylesheet" />
-    <link href="../bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="assets/css/style.css" rel="stylesheet">
-    <script src="assets/js/ie-emulation-modes-warning.js"></script>
-  </head>
-  <body id="" class="">
-    <div id="font-scale" class="home">
-      @include('layouts.header');
-      <!-- ▼　メイン部分　▼ -->
       <section id="" class="container mt20 mb20">
         <div class="row">
           <div class="col-12 col-lg-10 offset-0 offset-lg-1 mt20 mb20">
@@ -45,7 +31,7 @@
             <h3 class="other mt50">開示等の依頼の手続き、使用する様式</h3>
             <p class="p1">開示等の依頼は、以下の手続き及び様式に則って実施致します。</p>
             <p class="p1">利用目的の通知：本書面の“開示対象個人情報の利用目的”をご覧下さい。</p>
-            <p class="p1">開示、訂正・削除、利用停止：当社の定める様式にて実施致します。該当の受付け窓口にご連絡頂き、所定の様式『<a href="./assets/page-img/privacy_disclosure.pdf" target="_blank">個人情報開示等依頼書(PDF:9KB)</a>』を入手のうえ、手続きをお願い致します。</p>
+            <p class="p1">開示、訂正・削除、利用停止：当社の定める様式にて実施致します。該当の受付け窓口にご連絡頂き、所定の様式『<a href="{{ asset('assets/page-img/privacy_disclosure.pdf') }}" target="_blank">個人情報開示等依頼書(PDF:9KB)</a>』を入手のうえ、手続きをお願い致します。</p>
             <p class="p1">回答に関しては、記入済み個人情報開示等依頼書を、ご自宅への郵送のみとさせて頂きます。</p>
             <h3 class="other mt50">開示対象個人情報の取扱いに関する苦情受付け窓口</h3>
             <p class="p1">開示対象個人情報の取扱いに関する苦情、相談に関しましては、以下の窓口宛てにご連絡ください。</p>
@@ -58,9 +44,4 @@
           </div>
         </div>
       </section>
-      <!-- ▲　メイン部分　▲ -->
+@endsection
-      @include('layouts.info');
-      @include('layouts.footer');
-    </div>
-  </body>
-</html>

resources/views/general/swo16_1.blade.php

@@ -1,19 +1,5 @@
-<!doctype html>
+@extends('layouts.general')
-<html lang="ja">
+@section('content')
-  <head>
-    <title>｜So-Manager</title>
-    <meta charset="utf-8">
-    <link rel="icon" href="assets/img/favicon.ico">
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/typicons/2.0.9/typicons.css" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/earlyaccess/roundedmplus1c.css" rel="stylesheet" />
-    <link href="../bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="assets/css/style.css" rel="stylesheet">
-    <script src="assets/js/ie-emulation-modes-warning.js"></script>
-  </head>
-  <body id="" class="">
-    <div id="font-scale" class="home">
-      @include('layouts.header');
-      <!-- ▼　メイン部分　▼ -->
       <section id="" class="container mt20 mb20">
         <div class="row">
           <div class="col-12 col-lg-10 offset-0 offset-lg-1 mt20 mb20">
@@ -55,10 +41,6 @@
           </div>
         </div>
       </section>
-      <!-- ▲　メイン部分　▲ -->
-      @include('layouts.info');
-      @include('layouts.footer');
-    </div>
       <script src="https://code.jquery.com/jquery-3.4.1.min.js"></script>
       <script>
         $(document).ready(function() {
@@ -68,5 +50,4 @@
           })
         })
       </script>
-  </body>
+@endsection
-</html>

resources/views/general/swo17_1.blade.php

@@ -1,19 +1,5 @@
-<!doctype html>
+@extends('layouts.general')
-<html lang="ja">
+@section('content')
-  <head>
-    <title>｜So-Manager</title>
-    <meta charset="utf-8">
-    <link rel="icon" href="assets/img/favicon.ico">
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/typicons/2.0.9/typicons.css" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/earlyaccess/roundedmplus1c.css" rel="stylesheet" />
-    <link href="../bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="assets/css/style.css" rel="stylesheet">
-    <script src="assets/js/ie-emulation-modes-warning.js"></script>
-  </head>
-  <body id="" class="">
-    <div id="font-scale" class="home">
-      @include('layouts.header');
-      <!-- ▼　メイン部分　▼ -->
       <section id="" class="container mt20 mb20">
         <h2 class="text-success text-center">サイトマップ</h2>
         <div class="row">
@@ -41,9 +27,4 @@
           </div>
         </div>
       </section>
-      <!-- ▲　メイン部分　▲ -->
+@endsection
-      @include('layouts.info');
-      @include('layouts.footer');
-    </div>
-  </body>
-</html>

resources/views/general/swo1_1.blade.php

@@ -0,0 +1,36 @@
+@extends('layouts.general')
+@section('content')
+      <main role="main" id="" class="">
+        <section id="front-catch-area" class="jumbotron">
+          <div class="container text-center">
+            <h2>So-Managerの駐車場・駐輪場のご利用開始はこちらから</h2>
+          </div>
+          <div class="conainer mt40">
+            <div class="row">
+              <div class="col-6 col-md-2 offset-0 offset-md-4 mt20">
+                <div class="card">
+                  <div class="card-body text-center">
+                    <a href="{{route('swo5_1')}}">
+                      <figure class=""><img src="{{ asset('assets/img/menu-sagasu.png') }}" alt="menu1" class="w-75"></figure>
+                      <h3 class="h6"><br>
+                        <img src="{{ asset('assets/img/search-icon.png') }}" style="height: 1em;">駐輪場を探す
+                      </h3>
+                    </a>
+                  </div>
+                </div>
+              </div>
+              <div class="col-6 col-md-2 offset-0 mt20">
+                <div class="card">
+                  <div class="card-body text-center">
+                    <a href="{{route('swo8_1')}}">
+                        <figure class=""><img src="{{ asset('assets/img/menu-loguin.png') }}" alt="menu1" class="w-75"></figure>
+                      <h3 class="h6">マイページへログイン<br>定期更新・予約確認</h3>
+                    </a>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </section>
+      </main>
+@endsection

resources/views/general/swo2_1.blade.php

@@ -0,0 +1,53 @@
+@extends('layouts.general')
+@section('content')
+      <main role="main" id="" class="">
+        <section id="" class="container mt20 mb20">
+          <div class="row">
+            <div class="col-12 col-lg-10 offset-0 offset-lg-1 mt20 mb20">
+              <div class="card border-success">
+                <div class="card-header border-success">
+                  <h5 class="card-title text-success">新規会員登録</h5>
+                </div>
+                <div class="card-body mt30">
+                  <p class="mb30">会員登録ページのご案内をお送りします。お客様のメールアドレスをご入力ください。</p>
+                  <form class="row form" action="{{route('swo2_2')}}" method="post">
+                    <div class="col-12 col-lg-3 text-lg-center offset-0 offset-lg-1">
+                      <label for="">メールアドレス</label>
+                    </div>
+                    <div class="col-12 col-lg-7 mb10">
+                      <input type="email" name="email" class="form-control form-control-lg" placeholder="info@so-manager.com" value="{{ old('email') }}"/>
+                      @if($errors->has('email'))
+                        <div class="text-danger">{{ $errors->first('email') }}</div>
+                      @endif
+                    </div>
+                    <div class="col-12 col-lg-6 text-lg-center offset-0 offset-lg-3 mt30 mb50">
+                      <button type="submit" class="btn btn-block btn-lg btn-success">送信する</button>
+                      <a href="{{route('swo1_1')}}" class="btn btn-block btn-lg btn-outline-success">戻る</a>
+                    </div>
+                    @csrf
+                  </form>
+                </div>
+              </div>
+            </div>
+          </div>
+        </section>
+        </main>
+      <!-- ▲　メイン部分　▲ -->
+      <!-- ▼　モーダル部分　▼ -->
+      @if(!$errors->has('email'))
+        <div class="modal fade" id="cautionModal" tabindex="-1" role="dialog" aria-labelledby="cautionModalLabel">
+          <div class="modal-dialog modal-lg" role="document">
+            <div class="modal-content px-5 py-5">
+              <div class="modal-body">
+                <h1 class="text-center">注意事項</h1><hr>
+                <p>1) so-manage.comからのメールを受信できるようドメイン指定受信設定をしてください。</p>
+                <p class="mb50">2) メールアドレスの開始が.（ドット）から始まるメールアドレスや＠の前に.（ドット）が複数続くメールアドレスなどはso-manager.comからのメールを受け付けない場合があります。この場合は、別のメールアドレスをご登録ください。</p>
+                <button type="button" class="btn btn-block btn-lg btn-success" data-dismiss="modal">OK</button>
+              </div><!-- /.modal-body -->
+            </div><!-- /.modal-content -->
+          </div><!-- /.modal-dialog -->
+        </div><!-- /.modal -->
+        <script>jQuery(document).ready(function(){jQuery('#cautionModal').modal('show');});</script>
+      @endif
+      <!-- ▲　モーダル部分　▲ -->
+@endsection

resources/views/general/swo2_2.blade.php

@@ -1,18 +1,5 @@
-<!doctype html>
+@extends('layouts.general')
-<html lang="ja">
+@section('content')
-  <head>
-    <title>｜So-Manager</title>
-    <meta charset="utf-8">
-    <link rel="icon" href="assets/img/favicon.ico">
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/typicons/2.0.9/typicons.css" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/earlyaccess/roundedmplus1c.css" rel="stylesheet" />
-    <link href="../bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="assets/css/style.css" rel="stylesheet">
-    <script src="assets/js/ie-emulation-modes-warning.js"></script>
-  </head>
-  <body id="" class="">
-    <div id="font-scale" class="home">
-      @include('layouts.header');
       <main role="main" id="" class="">
         <section id="" class="container mt20 mb20">
           <div class="row">
@@ -30,9 +17,4 @@
           </div>
         </section>
       </main>
-      <!-- ▲　メイン部分　▲ -->
+@endsection
-      @include('layouts.info');
-      @include('layouts.footer');
-    </div>
-  </body>
-</html>

resources/views/general/swo2_3.blade.php

@@ -1,20 +1,5 @@
-<!doctype html>
+@extends('layouts.general')
-<html lang="ja">
+@section('content')
-  <head>
-    <title>｜So-Manager</title>
-    <meta charset="utf-8">
-    <link rel="icon" href="assets/img/favicon.ico">
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/typicons/2.0.9/typicons.css" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/earlyaccess/roundedmplus1c.css" rel="stylesheet" />
-    <link href="../bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="assets/css/style.css" rel="stylesheet">
-    <link href="assets/css/app.css" rel="stylesheet">
-    <script src="assets/js/ie-emulation-modes-warning.js"></script>
-  </head>
-  <body id="" class="">
-    <div id="font-scale" class="home">
-      @include('layouts.header');
-      <!-- ▼　メイン部分　▼ -->
       <main role="main" id="" class="">
         <section id="" class="container mt20 mb20">
           <div class="row">
@@ -93,9 +78,4 @@
           </div>
         </section>
       </main>
-      <!-- ▲　メイン部分　▲ -->
+@endsection
-      @include('layouts.info');
-      @include('layouts.footer');
-    </div>
-  </body>
-</html>

resources/views/general/swo2_4.blade.php

@@ -1,19 +1,5 @@
-<!doctype html>
+@extends('layouts.general')
-<html lang="ja">
+@section('content')
-  <head>
-    <title>｜So-Manager</title>
-    <meta charset="utf-8">
-    <link rel="icon" href="assets/img/favicon.ico">
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/typicons/2.0.9/typicons.css" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/earlyaccess/roundedmplus1c.css" rel="stylesheet" />
-    <link href="../bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="assets/css/style.css" rel="stylesheet">
-    <script src="assets/js/ie-emulation-modes-warning.js"></script>
-  </head>
-  <body id="" class="">
-    <div id="font-scale" class="home">
-      @include('layouts.header');
-      <!-- ▼　メイン部分　▼ -->
       <main role="main" id="" class="">
         <section id="" class="container mt20 mb20">
           <div class="row">
@@ -56,9 +42,4 @@
           </div>
         </section>
       </main>
-      <!-- ▲　メイン部分　▲ -->
+@endsection
-      @include('layouts.info');
-      @include('layouts.footer');
-    </div>
-  </body>
-</html>

resources/views/general/swo2_5.blade.php

@@ -0,0 +1,15 @@
+@extends('layouts.general')
+@section('content')
+      <main role="main" id="" class="">
+        <article id="main-content" class="news-detail container">
+          <div class="news-detail-content row mb50">
+            <div class="col-12 col-lg-8 offset-0 offset-lg-2"><p>
+              <br><br>新規会員登録が完了しました。<br><br>
+              <a href="{{route('swo1_1')}}">トップページへ戻る>></a></p>
+            </div>
+          </div>
+        </article>
+      </main>
+@endsection
+
+

resources/views/general/swo3_1.blade.php

@@ -1,19 +1,5 @@
-<!doctype html>
+@extends('layouts.general')
-<html lang="ja">
+@section('content')
-  <head>
-    <title>｜So-Manager</title>
-    <meta charset="utf-8">
-    <link rel="icon" href="assets/img/favicon.ico">
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/typicons/2.0.9/typicons.css" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/earlyaccess/roundedmplus1c.css" rel="stylesheet" />
-    <link href="../bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="assets/css/style.css" rel="stylesheet">
-    <script src="assets/js/ie-emulation-modes-warning.js"></script>
-  </head>
-  <body id="" class="">
-    <div id="font-scale" class="home">
-      @include('layouts.header');
-      <!-- ▼　メイン部分　▼ -->
     <main role="main">
       <div class="container">
         <div class="row">
@@ -121,15 +107,6 @@
         </div><!-- /.modal-content -->
       </div><!-- /.modal-dialog -->
     </div><!-- /.modal -->
-
-    <footer class="fixed-lg-bottom bg-light">
-      <div class="container-fluid">
-        <p class="m-0 text-right">Copyright&copy; so-rin Co.,Ltd. All Rights Reserved. &middot; 
-          <a href="./summary.html" target="_brank">加盟団体</a>
-        </p>
-      </div>
-    </footer>
-    
     <script src="./js/vendor/holder.min.js"></script>
     <script src="https://map.so-manager.com/plugins/jquery/jquery.js"></script>
     <script src="https://map.so-manager.com/js/app.js"></script>
@@ -141,10 +118,5 @@
     <script src="./assets/js/lightbox2-dev/src/js/lightbox.js" type="text/javascript"></script>
     <script src="./assets/js/commons.js"></script>
     <script src="./assets/js/main.js"></script>
-    <script type="text/javascript">
+    <script type="text/javascript">$(document).ready(function() {$('#privacy-modal').modal('toggle')})</script>
-      $(document).ready(function() {
+@endsection
-        $('#privacy-modal').modal('toggle')
-      })
-    </script>
-  </body>
-</html>

resources/views/general/swo3_2.blade.php

@@ -1,18 +1,5 @@
-<!doctype html>
+@extends('layouts.general')
-<html lang="ja">
+@section('content')
-  <head>
-    <title>｜So-Manager</title>
-    <meta charset="utf-8">
-    <link rel="icon" href="assets/img/favicon.ico">
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/typicons/2.0.9/typicons.css" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/earlyaccess/roundedmplus1c.css" rel="stylesheet" />
-    <link href="../bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="assets/css/style.css" rel="stylesheet">
-    <script src="assets/js/ie-emulation-modes-warning.js"></script>
-  </head>
-  <body id="" class="">
-    @include('layouts.header');
-    <!-- ▼　メイン部分　▼ -->
     <main role="main">
       <div class="container">
         <div class="row">
@@ -47,14 +34,6 @@
         </div>
       </div>
     </main>
-    <footer class="fixed-lg-bottom bg-light">
-      <div class="container-fluid">
-        <p class="m-0 text-right">Copyright&copy; so-rin Co.,Ltd. All Rights Reserved. &middot; 
-          <a href="./summary.html" target="_brank">加盟団体</a>
-        </p>
-      </div>
-    </footer>
-
     <script src="./js/vendor/holder.min.js"></script>
     <script src="https://map.so-manager.com/plugins/jquery/jquery.js"></script>
     <script src="https://map.so-manager.com/js/app.js"></script>
@@ -66,10 +45,5 @@
     <script src="./assets/js/lightbox2-dev/src/js/lightbox.js" type="text/javascript"></script>
     <script src="./assets/js/commons.js"></script>
     <script src="./assets/js/main.js"></script>
-    <script type="text/javascript">
+    <script type="text/javascript">$(document).ready(function() {$('#privacy-modal').modal('toggle')})</script>
-      $(document).ready(function() {
+@endsection
-        $('#privacy-modal').modal('toggle')
-      })
-    </script>
-  </body>
-</html>

resources/views/general/swo5_1.blade.php

@@ -57,7 +57,7 @@
     </style>
   </head>
   <body>
-  @include('layouts.header');
+  @include('partials.header')
   <main role="main" class="">
   <div class="">
     <div class="row no-gutters">

resources/views/general/swo6_1.blade.php

@@ -1,18 +1,5 @@
-<!doctype html>
+@extends('layouts.general')
-<html lang="ja">
+@section('content')
-  <head>
-    <title>｜So-Manager</title>
-    <meta charset="utf-8">
-    <link rel="icon" href="assets/img/favicon.ico">
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/typicons/2.0.9/typicons.css" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/earlyaccess/roundedmplus1c.css" rel="stylesheet" />
-    <link href="../bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="assets/css/style.css" rel="stylesheet">
-    <script src="assets/js/ie-emulation-modes-warning.js"></script>
-  </head>
-  <body id="" class="">
-    <div id="font-scale" class="home">
-      @include('layouts.header');
       <section id="" class="container mt20 mb20">
         <div class="row">
           <div class="col-12 col-lg-10 offset-0 offset-lg-1 mt20 mb20">
@@ -103,11 +90,4 @@
           </div>
         </div>
       </section>
-      <!-- ▲　メイン部分　▲ -->
+@endsection
-      @include('layouts.info');
-      @include('layouts.footer');
-    <script src="https://so-manager.com/plugins/jquery/jquery.min.js"></script>
-    <script src="https://so-manager.com/html/bootstrap/js/bootstrap.min.js"></script>
-    </div>
-  </body>
-</html>

resources/views/general/swo7_1.blade.php

@@ -1,25 +1,11 @@
-<!doctype html>
+@extends('layouts.general')
-<html lang="ja">
+@section('content')
-  <head>
-    <title>｜So-Manager</title>
-    <meta charset="utf-8">
-    <link rel="icon" href="assets/img/favicon.ico">
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/typicons/2.0.9/typicons.css" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/earlyaccess/roundedmplus1c.css" rel="stylesheet" />
-    <link href="../bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="assets/css/style.css" rel="stylesheet">
-    <script src="assets/js/ie-emulation-modes-warning.js"></script>
-  </head>
-  <body id="" class="">
-    <div id="font-scale" class="home">
-      @include('layouts.header');
-      <!-- ▼　メイン部分　▼ -->
       <section id="" class="container mt20 mb20">
         <div class="row">
           <div class="col-12 col-lg-10 offset-0 offset-lg-1 mt20 mb20">
             <h2 class="text-success text-center">お問い合わせ</h2>
               <p>株式会社ソーリンへのご訪問ありがとうございます。
-              お問い合わせいただくお客さまは、当社のホームページにおける<a href="{{route('swo14_1')}}">個人情報の取り扱い</a>について、あらかじめご確認いただき、ご同意いただいた上でお問い合わせください。個人情報の開示、訂正、削除、利用停止については、<a href="./assets/privacy_disclosure.pdf">こちら</a>をご覧下さい。<br>
+                お問い合わせいただくお客さまは、当社のホームページにおける<a href="{{ route('swo14_1') }}">個人情報の取り扱い</a>について、あらかじめご確認いただき、ご同意いただいた上でお問い合わせください。個人情報の開示、訂正、削除、利用停止については、<a href="{{ asset('assets/privacy_disclosure.pdf') }}">こちら</a>をご覧下さい。<br>
               また、メールから送信ができないお客様はお手数ですが、下記電話までご連絡をお願い致します。
               ※ 携帯・スマートフォンからメールでのお問い合わせの際に、確実にご返信をさせていただくために、ドメイン (so-manager.com) の受信許可設定をお願い致します。</p>
             <form class="form-contact form mt50" method="post" action="{{ route('swo7_2') }}">
@@ -62,9 +48,4 @@
           </div>
         </div>
       </section>
-      <!-- ▲　メイン部分　▲ -->
+@endsection
-      @include('layouts.info');
-      @include('layouts.footer');
-    </div>
-  </body>
-</html>

resources/views/general/swo7_2.blade.php

@@ -0,0 +1,71 @@
+@extends('layouts.general')
+@section('content')
+      <style type="text/css">
+        #formWrap {
+          width:700px;
+          margin:0 auto;
+          color:#555;
+          line-height:120%;
+          font-size:90%;
+        }
+        table.formTable{
+          width:100%;
+          margin:0 auto;
+          border-collapse:collapse;
+        }
+        table.formTable td,table.formTable th{
+          border:1px solid #ccc;
+          padding:10px;
+        }
+        table.formTable th{
+          width:30%;
+          font-weight:normal;
+          background:#efefef;
+          text-align:left;
+        }
+        p.error_messe{
+          margin:5px 0;
+          color:red;
+        }
+        @media screen and (max-width:572px) {
+          #formWrap {
+            width:95%;
+            margin:0 auto;
+          }
+          table.formTable th, table.formTable td {
+            width:auto;
+            display:block;
+          }
+          table.formTable th {
+            margin-top:5px;
+            border-bottom:0;
+          }
+          input[type="submit"], input[type="reset"], input[type="button"] {
+            display:block;
+            width:100%;
+            height:40px;
+          }
+        }
+      </style>
+      <div id="formWrap">
+        <h2 class="text-center mt50 mb30">確認画面</h2>
+        <p align="center">以下の内容で間違いがなければ、「送信する」ボタンを押してください。</p>
+        <form method="POST" action="{{route('swo7_3')}}">
+          <table class="formTable table">
+            <tbody>
+              @foreach($input_data as $value)
+                <tr>
+                  <th>{{ $value[2] }}</th><td>{{ $value[1] }}</td>
+                  <input name="{{ $value[0] }}" type="hidden" value="{{ $value[1] }}">
+                </tr>
+              @endforeach
+            </tbody>
+          </table>
+          <p align="center" class="mt50 mb50">
+            <button type="submit" class="btn btn-success" name='submit' value="complete">送信する</button>
+            <button type="submit" class="btn btn-outline-success" name='back' value="back">前画面に戻る</button>
+          </p>
+          @csrf
+        </form>
+      </div>
+@endsection

resources/views/general/swo7_3.blade.php

@@ -0,0 +1,13 @@
+@extends('layouts.general')
+@section('content')
+      <main role="main" id="" class="">
+        <article id="main-content" class="news-detail container">
+          <div class="news-detail-content row mb50">
+            <div class="col-12 col-lg-8 offset-0 offset-lg-2"><p>
+              <br><br>お問い合わせありがとうございます。送信は正常に完了しました。<br><br>
+              <a href="{{route('swo1_1')}}">トップページへ戻る>></a></p>
+            </div>
+          </div>
+        </article>
+      </main>
+@endsection

resources/views/general/swo8_1.blade.php

@@ -1,19 +1,5 @@
-<!doctype html>
+@extends('layouts.general')
-<html lang="ja">
+@section('content')
-  <head>
-    <title>｜So-Manager</title>
-    <meta charset="utf-8">
-    <link rel="icon" href="assets/img/favicon.ico">
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/typicons/2.0.9/typicons.css" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/earlyaccess/roundedmplus1c.css" rel="stylesheet" />
-    <link href="../bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="assets/css/style.css" rel="stylesheet">
-    <script src="assets/js/ie-emulation-modes-warning.js"></script>
-  </head>
-  <body id="" class="">
-    <div id="font-scale" class="home">
-      @include('layouts.header');
-      <!-- ▼　メイン部分　▼ -->
       <main role="main" id="" class="">
         <section id="" class="container mt20 mb20">
           <div class="row">
@@ -48,9 +34,4 @@
           </div>
         </section>
       </main>
-      <!-- ▲　メイン部分　▲ -->
+@endsection
-      @include('layouts.info');
-      @include('layouts.footer');
-    </div>
-  </body>
-</html>

resources/views/general/swo8_2.blade.php

@@ -1,19 +1,5 @@
-<!doctype html>
+@extends('layouts.general')
-<html lang="ja">
+@section('content')
-  <head>
-    <title>｜So-Manager</title>
-    <meta charset="utf-8">
-    <link rel="icon" href="assets/img/favicon.ico">
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/typicons/2.0.9/typicons.css" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/earlyaccess/roundedmplus1c.css" rel="stylesheet" />
-    <link href="../bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="assets/css/style.css" rel="stylesheet">
-    <script src="assets/js/ie-emulation-modes-warning.js"></script>
-  </head>
-  <body id="" class="">
-    <div id="font-scale" class="home">
-      @include('layouts.header');
-      <!-- ▼　メイン部分　▼ -->
       <section id="" class="container mt20 mb20">
         <div class="row">
           <div class="col-12 col-lg-10 offset-0 offset-lg-1 mt20 mb20">
@@ -23,7 +9,6 @@
               </div>
               <div class="card-body mt30">
                 <form class="row form" action="{{ route('swo8_3') }}" method="post">
-                  <input type="hidden" name="_token" value="KyErVdH3giV3UrqRiP3COWGRAYkdJzeU3sJe1hDH">
                   <div class="col-12 col-lg-3 text-lg-center offset-0 offset-lg-1">
                     <label for="user_primemail">メールアドレス</label>
                   </div>
@@ -62,9 +47,4 @@
           </div>
         </div>
       </section>
-      <!-- ▲　メイン部分　▲ -->
+@endsection
-      @include('layouts.info');
-      @include('layouts.footer');
-    </div>
-  </body>
-</html>

resources/views/general/swo8_3.blade.php

@@ -1,19 +1,5 @@
-<!doctype html>
+@extends('layouts.general')
-<html lang="ja">
+@section('content')
-  <head>
-    <title>｜So-Manager</title>
-    <meta charset="utf-8">
-    <link rel="icon" href="assets/img/favicon.ico">
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/typicons/2.0.9/typicons.css" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/earlyaccess/roundedmplus1c.css" rel="stylesheet" />
-    <link href="../bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="assets/css/style.css" rel="stylesheet">
-    <script src="assets/js/ie-emulation-modes-warning.js"></script>
-  </head>
-  <body id="" class="">
-    <div id="font-scale" class="home">
-      @include('layouts.header');
-      <!-- ▼　メイン部分　▼ -->
       <main role="main" id="" class="">
         <section id="" class="container mt20 mb20">
           <div class="row">
@@ -31,9 +17,4 @@
           </div>
         </section>
       </main>
-      <!-- ▲　メイン部分　▲ -->
+@endsection
-      @include('layouts.info');
-      @include('layouts.footer');
-    </div>
-  </body>
-</html>

resources/views/general/swo9_1.blade.php

@@ -1,19 +1,5 @@
-<!doctype html>
+@extends('layouts.general')
-<html lang="ja">
+@section('content')
-  <head>
-    <title>｜So-Manager</title>
-    <meta charset="utf-8">
-    <link rel="icon" href="assets/img/favicon.ico">
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/typicons/2.0.9/typicons.css" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/earlyaccess/roundedmplus1c.css" rel="stylesheet" />
-    <link href="../bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="assets/css/style.css" rel="stylesheet">
-    <script src="assets/js/ie-emulation-modes-warning.js"></script>
-  </head>
-  <body id="" class="">
-    <div id="font-scale" class="home">
-      @include('layouts.header');
-      <!-- ▼　メイン部分　▼ -->
       <main role="main" id="" class="">
         <article id="main-content" class="news-detail container">
           <header class="news-title mt50 mb30 text-center">
@@ -30,9 +16,5 @@
           </div>
         </article>
       </main>
-      <!-- ▲　メイン部分　▲ -->
+@endsection
-      @include('layouts.info');
+
-      @include('layouts.footer');
-    </div>
-  </body>
-</html>

resources/views/general/swo9_2.blade.php

@@ -1,19 +1,5 @@
-<!doctype html>
+@extends('layouts.general')
-<html lang="ja">
+@section('content')
-  <head>
-    <title>｜So-Manager</title>
-    <meta charset="utf-8">
-    <link rel="icon" href="assets/img/favicon.ico">
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/typicons/2.0.9/typicons.css" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/earlyaccess/roundedmplus1c.css" rel="stylesheet" />
-    <link href="../bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="assets/css/style.css" rel="stylesheet">
-    <script src="assets/js/ie-emulation-modes-warning.js"></script>
-  </head>
-  <body id="" class="">
-    <div id="font-scale" class="home">
-      @include('layouts.header');
-      <!-- ▼　メイン部分　▼ -->
       <main role="main" id="" class="">
         <article id="main-content" class="news-detail container">
           <header class="news-title mt50 mb30 text-center">
@@ -30,9 +16,4 @@
           </div>
         </article>
       </main>
-      <!-- ▲　メイン部分　▲ -->
+@endsection
-      @include('layouts.info');
-      @include('layouts.footer');
-    </div>
-  </body>
-</html>

resources/views/general/swo9_3.blade.php

@@ -0,0 +1,16 @@
+@extends('layouts.general')
+@section('content')
+      <main role="main" id="" class="">
+        <article id="main-content" class="news-detail container">
+          <header class="news-title mt50 mb30 text-center">
+            <h1 class="h3">2025.02.10</h1>
+          </header>
+          <div class="news-detail-content row mb50">
+            <div class="col-12 col-lg-8 offset-0 offset-lg-2"><p>
+              4月より料金区分が変わる契約者様は手続きが必要です。新しい区分が確認出来る身分証明書をご用意の上サポートセンターまでお問い合わせをお願い致します。So-Managerサポートセンター<br />
+              : 03-5856-4720（毎日12時～22時)</p>
+            </div>
+          </div>
+        </article>
+      </main>
+@endsection

resources/views/general/swo9_4.blade.php

@@ -1,19 +1,5 @@
-<!doctype html>
+@extends('layouts.general')
-<html lang="ja">
+@section('content')
-  <head>
-    <title>｜So-Manager</title>
-    <meta charset="utf-8">
-    <link rel="icon" href="assets/img/favicon.ico">
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/typicons/2.0.9/typicons.css" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/earlyaccess/roundedmplus1c.css" rel="stylesheet" />
-    <link href="../bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="assets/css/style.css" rel="stylesheet">
-    <script src="assets/js/ie-emulation-modes-warning.js"></script>
-  </head>
-  <body id="" class="">
-    <div id="font-scale" class="home">
-      @include('layouts.header');
-      <!-- ▼　メイン部分　▼ -->
       <main role="main" id="" class="">
         <article id="main-content" class="news-detail container">
           <header class="news-title mt50 mb30 text-center">
@@ -25,18 +11,13 @@
               平素は、十条駅西口自転車駐車場（仮設）をご利用いただき、誠にありがとうございます。<br />
               駐輪場掲示物・係員のお声かけ等で、ご案内させて頂いておりますが、2025年1月9日で<br />
               当仮設駐輪場は、閉鎖となり駅前ロータリー地下に移転いたします。<br />
-              　定期利用料については、2階料金が廃止となります。<br />
+              定期利用料については、2階料金が廃止となります。<br />
               駐車位置に関しては、優先置場（平置きでラック無し）をご用意しております。<br />
               お手間をお掛け致しますが、ご理解・ご協力の上、よろしくお願い申し上げます。<br /><br />
-              駐輪場営業時間　4：00～翌日1：00<br />
+              駐輪場営業時間 4：00～翌日1：00<br />
               1：00～4：00までは、閉場し自転車・人の出入りは出来ません。</p>
             </div>
           </div>
         </article>
       </main>
-      <!-- ▲　メイン部分　▲ -->
+@endsection
-      @include('layouts.info');
-      @include('layouts.footer');
-    </div>
-  </body>
-</html>

resources/views/general/swo9_5.blade.php

@@ -1,19 +1,5 @@
-<!doctype html>
+@extends('layouts.general')
-<html lang="ja">
+@section('content')
-  <head>
-    <title>｜So-Manager</title>
-    <meta charset="utf-8">
-    <link rel="icon" href="assets/img/favicon.ico">
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/typicons/2.0.9/typicons.css" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/earlyaccess/roundedmplus1c.css" rel="stylesheet" />
-    <link href="../bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="assets/css/style.css" rel="stylesheet">
-    <script src="assets/js/ie-emulation-modes-warning.js"></script>
-  </head>
-  <body id="" class="">
-    <div id="font-scale" class="home">
-      @include('layouts.header');
-      <!-- ▼　メイン部分　▼ -->
       <main role="main" id="" class="">
         <article id="main-content" class="news-detail container">
           <header class="news-title mt50 mb30 text-center">
@@ -29,9 +15,4 @@
           </div>
         </article>
       </main>
-      <!-- ▲　メイン部分　▲ -->
+@endsection
-      @include('layouts.info');
-      @include('layouts.footer');
-    </div>
-  </body>
-</html>

resources/views/layouts/general.blade.php

@@ -0,0 +1,25 @@
+<!doctype html>
+<html lang="ja">
+  <head>
+    <title>｜So-Manager</title>
+    <meta charset="utf-8">
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/typicons/2.0.9/typicons.css" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/earlyaccess/roundedmplus1c.css" rel="stylesheet" />
+    <link rel="icon" href="{{ asset('assets/img/favicon.ico') }}">
+    <link href="{{ asset('../bootstrap/css/bootstrap.min.css') }}" rel="stylesheet">
+    <link href="{{ asset('assets/css/style.css') }}" rel="stylesheet">
+    <link href="{{ asset('assets/css/app.css') }}" rel="stylesheet">
+    <script src="{{ asset('assets/js/jquery.min.js') }}"></script>
+    <script src="{{ asset('assets/js/ie-emulation-modes-warning.js') }}"></script>
+    <script src="{{ asset('../bootstrap/js/bootstrap.min.js') }}"></script>
+  </head>
+  <body>
+    <div id="font-scale" class="home">
+      @include('partials.header')
+      @yield('content')
+      @include('partials.news')
+      @include('partials.banner')
+      @include('partials.footer')
+    </div>
+  </body>
+</html>

resources/views/partials/banner.blade.php

@@ -0,0 +1,19 @@
+    <!-- ▼　ご利用方法のページへ　▼ -->
+    <section id="about" class="pt50 pb50">
+      <div class="container">
+        <div class="row">
+          <h2 class="col-12 text-center">So-Managerとは？</h2>
+          <p class="col-12 col-md-10 offset-0 offset-md-1 text-center">
+            So-Managerは、株式会社ソーリンがお送りする、駐輪場マネジメントウェブシステムです。<br class="pc">
+            空き駐輪場の検索、予約、駐輪場定期の新規発行、更新がネット上からカンタンに行えます。
+          </p>
+          <a href="{{route('swo16_1')}}" target="_parent" class="col-10 col-md-6 offset-1 offset-md-3 btn btn-lg btn-success badge-pill">ご利用方法のページへ</a>
+        </div>
+      </div>
+    </section>
+    <!-- ▲　ご利用方法のページへ　▲ -->
+    <!-- ▼　バナー(詳しくはこちら)　▼ -->
+    <section id="banner" class="">
+      <a href="{{route('swo7_1')}}" target="_blank"><img src="{{ asset('assets/img/donyu-bn.jpg') }}" class="w-100" alt=""></a>
+    </section>
+    <!-- ▲　バナー(詳しくはこちら)　▲ -->

resources/views/partials/footer.blade.php

@@ -24,5 +24,5 @@
           </div>
         </div>
       </section>
-      <figure class="p-mark"><img width="75" src="assets/img/10740034_06_75_JP.gif" alt="Pマーク" /></figure>
+      <figure class="p-mark"><img width="75" src="{{ asset('assets/img/10740034_06_75_JP.gif') }}" alt="Pマーク" /></figure>
     </footer>

resources/views/partials/header.blade.php

@@ -4,13 +4,12 @@
         <div class="row mt10 mb10">
           <div class="col-5 col-lg-4">
             <a id="site-logo" class="navbar-brand" href="{{ route('swo1_1') }}" target="_parent">
-              <img src="assets/img/so-rin_logo.png" alt="logo" />
+              <img src="{{ asset('assets/img/so-rin_logo.png') }}" alt="logo" />
               <h1>
                 <span class="small pc">駐車場・駐輪場総合サポートの株式会社ソーリン<br></span>
                 So-Manager
               </h1>
-            </a>
+            </a>      </div>
-          </div>
           <div class="col-lg-4 d-none d-lg-inline tl-search-area"></div>
           <div class="col-6 col-lg-4 offset-1 offset-lg-0 tl-btn-area">
             <a href="{{route('swo8_1')}}" target="_parent" class="btn btn-success badge-pill" id="login-btn">マイページ<span class="pc">へログイン</span></a>

resources/views/partials/news.blade.php

@@ -39,22 +39,3 @@
       </div>
     </section>
     <!-- ▲　新着情報　▲ -->
-    <!-- ▼　ご利用方法のページへ　▼ -->
-    <section id="about" class="pt50 pb50">
-      <div class="container">
-        <div class="row">
-          <h2 class="col-12 text-center">So-Managerとは？</h2>
-          <p class="col-12 col-md-10 offset-0 offset-md-1 text-center">
-            So-Managerは、株式会社ソーリンがお送りする、駐輪場マネジメントウェブシステムです。<br class="pc">
-            空き駐輪場の検索、予約、駐輪場定期の新規発行、更新がネット上からカンタンに行えます。
-          </p>
-          <a href="{{route('swo16_1')}}" target="_parent" class="col-10 col-md-6 offset-1 offset-md-3 btn btn-lg btn-success badge-pill">ご利用方法のページへ</a>
-        </div>
-      </div>
-    </section>
-    <!-- ▲　ご利用方法のページへ　▲ -->
-    <!-- ▼　バナー(詳しくはこちら)　▼ -->
-    <section id="banner" class="">
-      <a href="{{route('swo7_1')}}" target="_blank"><img src="assets/img/donyu-bn.jpg" class="w-100" alt=""></a>
-    </section>
-    <!-- ▲　バナー(詳しくはこちら)　▲ -->

resources/views/swo1_1.blade.php

@@ -1,55 +0,0 @@
-<!doctype html>
-<html lang="ja">
-  <head>
-    <title>｜So-Manager</title>
-    <meta charset="utf-8">
-    <link rel="icon" href="assets/img/favicon.ico">
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/typicons/2.0.9/typicons.css" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/earlyaccess/roundedmplus1c.css" rel="stylesheet" />
-    <link href="../bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="assets/css/style.css" rel="stylesheet">
-    <script src="assets/js/ie-emulation-modes-warning.js"></script>
-  </head>
-  <body id="" class="">
-    <div id="font-scale" class="home">
-      @include('layouts.header');
-      <!-- ▼　メイン部分　▼ -->
-      <main role="main" id="" class="">
-        <section id="front-catch-area" class="jumbotron">
-          <div class="container text-center">
-            <h2>So-Managerの駐車場・駐輪場のご利用開始はこちらから</h2>
-          </div>
-          <div class="conainer mt40">
-            <div class="row">
-              <div class="col-6 col-md-2 offset-0 offset-md-4 mt20">
-                <div class="card">
-                  <div class="card-body text-center">
-                    <a href="{{route('swo5_1')}}">
-                      <figure class=""><img src="assets/img/menu-sagasu.png" alt="menu1" class="w-75"></figure>
-                      <h3 class="h6"><br>
-                        <img src="assets/img/search-icon.png" style="height: 1em;">駐輪場を探す
-                      </h3>
-                    </a>
-                  </div>
-                </div>
-              </div>
-              <div class="col-6 col-md-2 offset-0 mt20">
-                <div class="card">
-                  <div class="card-body text-center">
-                    <a href="{{route('swo8_1')}}">
-                      <figure class=""><img src="assets/img/menu-loguin.png" alt="menu1" class="w-75"></figure>
-                      <h3 class="h6">マイページへログイン<br>定期更新・予約確認</h3>
-                    </a>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </section>
-      </main>
-      <!-- ▲　メイン部分　▲ -->
-      @include('layouts.info');
-      @include('layouts.footer');
-    </div>
-  </body>
-</html>

resources/views/swo2_1.blade.php

@@ -1,79 +0,0 @@
-<!doctype html>
-<html lang="ja">
-  <head>
-    <title>｜So-Manager</title>
-    <meta charset="utf-8">
-    <link rel="icon" href="assets/img/favicon.ico">
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/typicons/2.0.9/typicons.css" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/earlyaccess/roundedmplus1c.css" rel="stylesheet" />
-    <link href="../bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="assets/css/style.css" rel="stylesheet">
-    <script src="assets/js/ie-emulation-modes-warning.js"></script>
-  </head>
-  <body id="" class="">
-    <div id="font-scale" class="home">
-      @include('layouts.header');
-      <!-- ▼　メイン部分　▼ -->
-      <main role="main" id="" class="">
-        <section id="" class="container mt20 mb20">
-          <div class="row">
-            <div class="col-12 col-lg-10 offset-0 offset-lg-1 mt20 mb20">
-              <div class="card border-success">
-                <div class="card-header border-success">
-                  <h5 class="card-title text-success">新規会員登録</h5>
-                </div>
-                <div class="card-body mt30">
-                  <p class="mb30">会員登録ページのご案内をお送りします。お客様のメールアドレスをご入力ください。</p>
-                  <form class="row form" action="{{route('swo2_2')}}" method="post">
-                    <div class="col-12 col-lg-3 text-lg-center offset-0 offset-lg-1">
-                      <label for="">メールアドレス</label>
-                    </div>
-                    <div class="col-12 col-lg-7 mb10">
-                      <input type="email" name="email" class="form-control form-control-lg" placeholder="info@so-manager.com" value="{{ old('email') }}"/>
-                      @if($errors->has('email'))
-                        <div class="text-danger">{{ $errors->first('email') }}</div>
-                      @endif
-                    </div>
-                    <div class="col-12 col-lg-6 text-lg-center offset-0 offset-lg-3 mt30 mb50">
-                      <button type="submit" class="btn btn-block btn-lg btn-success">送信する</button>
-                      <a href="{{route('swo1_1')}}" class="btn btn-block btn-lg btn-outline-success">戻る</a>
-                    </div>
-                    @csrf
-                  </form>
-                </div>
-              </div>
-            </div>
-          </div>
-        </section>
-      </main>
-      <!-- ▲　メイン部分　▲ -->
-      <!-- ▼　モーダル部分　▼ -->
-      @if(!$errors->has('email'))
-      <div class="modal fade" id="cautionModal" tabindex="-1" role="dialog" aria-labelledby="cautionModalLabel">
-        <div class="modal-dialog modal-lg" role="document">
-            <div class="modal-content px-5 py-5">
-                <div class="modal-body">
-                    <h1 class="text-center">注意事項</h1>
-                    <hr>
-                    <p>1) so-manage.comからのメールを受信できるようドメイン指定受信設定をしてください。</p>
-                    <p class="mb50">2) メールアドレスの開始が.（ドット）から始まるメールアドレスや＠の前に.（ドット）が複数続くメールアドレスなどはso-manager.comからのメールを受け付けない場合があります。この場合は、別のメールアドレスをご登録ください。</p>
-                    <button type="button" class="btn btn-block btn-lg btn-success" data-dismiss="modal">OK</button>
-                </div><!-- /.modal-body -->
-            </div><!-- /.modal-content -->
-        </div><!-- /.modal-dialog -->
-      </div><!-- /.modal -->
-      <!-- ▲　モーダル部分　▲ -->
-      @endif
-      @include('layouts.info');
-      @include('layouts.footer');
-    </div>
-    
-    <script src="assets/js/jquery.min.js"></script>
-    <script src="../bootstrap/js/bootstrap.min.js"></script>
-    <script>
-      jQuery(document).ready(function(){
-        jQuery('#cautionModal').modal('show');
-      });
-    </script>
-  </body>
-</html>

resources/views/swo2_5.blade.php

@@ -1,34 +0,0 @@
-<!doctype html>
-<html lang="ja">
-  <head>
-    <title>｜So-Manager</title>
-    <meta charset="utf-8">
-    <link rel="icon" href="assets/img/favicon.ico">
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/typicons/2.0.9/typicons.css" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/earlyaccess/roundedmplus1c.css" rel="stylesheet" />
-    <link href="../bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="assets/css/style.css" rel="stylesheet">
-    <script src="assets/js/ie-emulation-modes-warning.js"></script>
-  </head>
-  <body id="" class="">
-    <div id="font-scale" class="home">
-      @include('layouts.header');
-      <!-- ▼　メイン部分　▼ -->
-      <main role="main" id="" class="">
-        <article id="main-content" class="news-detail container">
-          <div class="news-detail-content row mb50">
-            <div class="col-12 col-lg-8 offset-0 offset-lg-2"><p>
-              <br><br>新規会員登録が完了しました。<br><br>
-              <a href="./index.html">トップページへ戻る>></a></p>
-            </div>
-          </div>
-        </article>
-      </main>
-      <!-- ▲　メイン部分　▲ -->
-      @include('layouts.info');
-      @include('layouts.footer');
-    </div>
-  </body>
-</html>
-
-

resources/views/swo7_2.blade.php

@@ -1,90 +0,0 @@
-<!doctype html>
-<html lang="ja">
-  <head>
-    <title>｜So-Manager</title>
-    <meta charset="utf-8">
-    <link rel="icon" href="assets/img/favicon.ico">
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/typicons/2.0.9/typicons.css" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/earlyaccess/roundedmplus1c.css" rel="stylesheet" />
-    <link href="../bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="assets/css/style.css" rel="stylesheet">
-    <script src="assets/js/ie-emulation-modes-warning.js"></script>
-    <style type="text/css">
-      #formWrap {
-        width:700px;
-        margin:0 auto;
-        color:#555;
-        line-height:120%;
-        font-size:90%;
-      }
-      table.formTable{
-        width:100%;
-        margin:0 auto;
-        border-collapse:collapse;
-      }
-      table.formTable td,table.formTable th{
-        border:1px solid #ccc;
-        padding:10px;
-      }
-      table.formTable th{
-        width:30%;
-        font-weight:normal;
-        background:#efefef;
-        text-align:left;
-      }
-      p.error_messe{
-        margin:5px 0;
-        color:red;
-      }
-
-      @media screen and (max-width:572px) {
-        #formWrap {
-          width:95%;
-          margin:0 auto;
-        }
-        table.formTable th, table.formTable td {
-          width:auto;
-          display:block;
-        }
-        table.formTable th {
-          margin-top:5px;
-          border-bottom:0;
-        }
-        input[type="submit"], input[type="reset"], input[type="button"] {
-          display:block;
-          width:100%;
-          height:40px;
-        }
-      }
-    </style>
-  </head>
-  <body id="" class="">
-    <div id="font-scale" class="home">
-      @include('layouts.header');
-      <!-- ▼　メイン部分　▼ -->
-      <div id="formWrap">
-        <h2 class="text-center mt50 mb30">確認画面</h2>
-        <p align="center">以下の内容で間違いがなければ、「送信する」ボタンを押してください。</p>
-        <form method="POST" action="{{route('swo7_3')}}">
-          <table class="formTable table">
-            <tbody>
-              @foreach($input_data as $value)
-                <tr>
-                  <th>{{ $value[2] }}</th><td>{{ $value[1] }}</td>
-                  <input name="{{ $value[0] }}" type="hidden" value="{{ $value[1] }}">
-                </tr>
-              @endforeach
-            </tbody>
-          </table>
-          <p align="center" class="mt50 mb50">
-            <button type="submit" class="btn btn-success" name='submit' value="complete">送信する</button>
-            <button type="submit" class="btn btn-outline-success" name='back' value="back">前画面に戻る</button>
-          </p>
-          @csrf
-        </form>
-      </div>
-      <!-- ▲　メイン部分　▲ -->
-      @include('layouts.footer');
-    </div>
-  </body>
-</html>

resources/views/swo7_3.blade.php

@@ -1,31 +0,0 @@
-<!doctype html>
-<html lang="ja">
-  <head>
-    <title>｜So-Manager</title>
-    <meta charset="utf-8">
-    <link rel="icon" href="assets/img/favicon.ico">
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/typicons/2.0.9/typicons.css" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/earlyaccess/roundedmplus1c.css" rel="stylesheet" />
-    <link href="../bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="assets/css/style.css" rel="stylesheet">
-    <script src="assets/js/ie-emulation-modes-warning.js"></script>
-  </head>
-  <body id="" class="">
-    <div id="font-scale" class="home">
-      @include('layouts.header');
-      <!-- ▼　メイン部分　▼ -->
-      <main role="main" id="" class="">
-        <article id="main-content" class="news-detail container">
-          <div class="news-detail-content row mb50">
-            <div class="col-12 col-lg-8 offset-0 offset-lg-2"><p>
-              <br><br>お問い合わせありがとうございます。送信は正常に完了しました。<br><br>
-              <a href="{{route('swo1_1')}}">トップページへ戻る>></a></p>
-            </div>
-          </div>
-        </article>
-      </main>
-      <!-- ▲　メイン部分　▲ -->
-      @include('layouts.footer');
-    </div>
-  </body>
-</html>

resources/views/swo9_3.blade.php

@@ -1,35 +0,0 @@
-<!doctype html>
-<html lang="ja">
-  <head>
-    <title>｜So-Manager</title>
-    <meta charset="utf-8">
-    <link rel="icon" href="assets/img/favicon.ico">
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/typicons/2.0.9/typicons.css" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/earlyaccess/roundedmplus1c.css" rel="stylesheet" />
-    <link href="../bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="assets/css/style.css" rel="stylesheet">
-    <script src="assets/js/ie-emulation-modes-warning.js"></script>
-  </head>
-  <body id="" class="">
-    <div id="font-scale" class="home">
-      @include('layouts.header');
-      <!-- ▼　メイン部分　▼ -->
-      <main role="main" id="" class="">
-        <article id="main-content" class="news-detail container">
-          <header class="news-title mt50 mb30 text-center">
-            <h1 class="h3">2025.02.10</h1>
-          </header>
-          <div class="news-detail-content row mb50">
-            <div class="col-12 col-lg-8 offset-0 offset-lg-2"><p>
-              4月より料金区分が変わる契約者様は手続きが必要です。新しい区分が確認出来る身分証明書をご用意の上サポートセンターまでお問い合わせをお願い致します。So-Managerサポートセンター<br />
-              : 03-5856-4720（毎日12時～22時)</p>
-            </div>
-          </div>
-        </article>
-      </main>
-      <!-- ▲　メイン部分　▲ -->
-      @include('layouts.info');
-      @include('layouts.footer');
-    </div>
-  </body>
-</html>

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('/', function () { return view('general.swo1_1'); })->name('swo1_1');
-Route::get('/swo2_1', function () { return view('swo2_1'); })->name('swo2_1');
+Route::get('/swo2_1', function () { return view('general.swo2_1'); })->name('swo2_1');
-Route::get('/swo3_1', function () { return view('swo3_1'); })->name('swo3_1');
+Route::get('/swo3_1', function () { return view('general.swo3_1'); })->name('swo3_1');
-Route::get('/swo3_2', function () { return view('swo3_2'); })->name('swo3_2');
+Route::get('/swo3_2', function () { return view('general.swo3_2'); })->name('swo3_2');
-Route::get('/swo3_3', function () { return view('swo3_3'); })->name('swo3_3');
+Route::get('/swo3_3', function () { return view('general.swo3_3'); })->name('swo3_3');
-Route::get('/swo4_1', function () { return view('swo4_1'); })->name('swo4_1');
+Route::get('/swo4_1', function () { return view('general.swo4_1'); })->name('swo4_1');
-Route::get('/swo5_1', function () { return view('swo5_1'); })->name('swo5_1');
+Route::get('/swo5_1', function () { return view('general.swo5_1'); })->name('swo5_1');
-Route::get('/swo6_1', function () { return view('swo6_1'); })->name('swo6_1');
+Route::get('/swo6_1', function () { return view('general.swo6_1'); })->name('swo6_1');
-Route::get('/swo8_1', function () { return view('swo8_1'); })->name('swo8_1');
+Route::get('/swo8_1', function () { return view('general.swo8_1'); })->name('swo8_1');
-Route::get('/swo8_2', function () { return view('swo8_2'); })->name('swo8_2');
+Route::get('/swo8_2', function () { return view('general.swo8_2'); })->name('swo8_2');
-Route::get('/swo9_1', function () { return view('swo9_1'); })->name('swo9_1');
+Route::get('/swo9_1', function () { return view('general.swo9_1'); })->name('swo9_1');
-Route::get('/swo9_2', function () { return view('swo9_2'); })->name('swo9_2');
+Route::get('/swo9_2', function () { return view('general.swo9_2'); })->name('swo9_2');
-Route::get('/swo9_3', function () { return view('swo9_3'); })->name('swo9_3');
+Route::get('/swo9_3', function () { return view('general.swo9_3'); })->name('swo9_3');
-Route::get('/swo9_4', function () { return view('swo9_4'); })->name('swo9_4');
+Route::get('/swo9_4', function () { return view('general.swo9_4'); })->name('swo9_4');
-Route::get('/swo9_5', function () { return view('swo9_5'); })->name('swo9_5');
+Route::get('/swo9_5', function () { return view('general.swo9_5'); })->name('swo9_5');
-Route::get('/swo10_1', function () { return view('swo10_1'); })->name('swo10_1');
+Route::get('/swo10_1', function () { return view('general.swo10_1'); })->name('swo10_1');
-Route::get('/swo11_1', function () { return view('swo11_1'); })->name('swo11_1');
+Route::get('/swo11_1', function () { return view('general.swo11_1'); })->name('swo11_1');
-Route::get('/swo12_1', function () { return view('swo12_1'); })->name('swo12_1');
+Route::get('/swo12_1', function () { return view('general.swo12_1'); })->name('swo12_1');
-Route::get('/swo13_1', function () { return view('swo13_1'); })->name('swo13_1');
+Route::get('/swo13_1', function () { return view('general.swo13_1'); })->name('swo13_1');
-Route::get('/swo14_1', function () { return view('swo14_1'); })->name('swo14_1');
+Route::get('/swo14_1', function () { return view('general.swo14_1'); })->name('swo14_1');
-Route::get('/swo15_1', function () { return view('swo15_1'); })->name('swo15_1');
+Route::get('/swo15_1', function () { return view('general.swo15_1'); })->name('swo15_1');
-Route::get('/swo15_2', function () { return view('swo15_2'); })->name('swo15_2');
+Route::get('/swo15_2', function () { return view('general.swo15_2'); })->name('swo15_2');
-Route::get('/swo16_1', function () { return view('swo16_1'); })->name('swo16_1');
+Route::get('/swo16_1', function () { return view('general.swo16_1'); })->name('swo16_1');
-Route::get('/swo17_1', function () { return view('swo17_1'); })->name('swo17_1');
+Route::get('/swo17_1', function () { return view('general.swo17_1'); })->name('swo17_1');
-Route::get('/error', function () { return view('error'); })->name('error');
+Route::get('/error', function () { return view('general.error'); })->name('error');
 
 //　コントローラー経由
 Route::post('/swo2_2', [MemberRegistrationController::class, 'sendMail'])->name('swo2_2');