From dcefe2527910b2dd9b7524a267cad7a31c8e99bd Mon Sep 17 00:00:00 2001
From: asdfqwer0910 <2101385@s.asojuku.ac.jp>
Date: Mon, 25 Nov 2024 19:58:15 -0500
Subject: [PATCH 1/2] =?UTF-8?q?=E3=83=91=E3=82=B9=E3=83=AF=E3=83=BC?=
 =?UTF-8?q?=E3=83=89=E5=86=8D=E8=A8=AD=E5=AE=9A=E3=81=AE=E3=83=9C=E3=82=BF?=
 =?UTF-8?q?=E3=83=B3=E9=81=B7=E7=A7=BB=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/pages/password_forget.dart | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/pages/password_forget.dart b/lib/pages/password_forget.dart
index b3efd82..dedca50 100644
--- a/lib/pages/password_forget.dart
+++ b/lib/pages/password_forget.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:sysdev_suretti/pages/login.dart';
+import 'package:sysdev_suretti/pages/new_password.dart';
 
 class PasswordForgetPage extends StatefulWidget {
   const PasswordForgetPage({super.key});
@@ -27,6 +28,9 @@ class _PasswordForgetPageState extends State<PasswordForgetPage> {
         ScaffoldMessenger.of(context).showSnackBar(
           const SnackBar(content: Text("認証メールを送信しました。")),
         );
+        Navigator.of(context).push(MaterialPageRoute(builder: (context) {
+          return const NewPasswordPage();
+        }));
       }
     });
   }

From 3a7da7f7a74180bbdb97873286348fa6576b646d Mon Sep 17 00:00:00 2001
From: asdfqwer0910 <2101385@s.asojuku.ac.jp>
Date: Wed, 11 Dec 2024 09:46:01 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E7=94=BB=E9=9D=A2?=
 =?UTF-8?q?=E3=81=AEUI=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/pages/notice.dart | 43 ++++++++++++++++---------------------------
 1 file changed, 16 insertions(+), 27 deletions(-)

diff --git a/lib/pages/notice.dart b/lib/pages/notice.dart
index 0476a65..d3aad2d 100644
--- a/lib/pages/notice.dart
+++ b/lib/pages/notice.dart
@@ -69,29 +69,27 @@ class _NotificationPageState extends State<NotificationPage> {
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
             Row(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
               children: [
-                Opacity(
-                  opacity: 0,
-                  child: IconButton(
-                    icon: const Icon(Icons.filter_list),
-                    onPressed: () {
-                      _showFilterDialog();
-                    },
+                Expanded(
+                  child: Align(
+                    alignment: Alignment.centerLeft,
+                    child: Text(
+                      '選択されたフィルター: $_selectedFilter',
+                      style: const TextStyle(fontSize: 14, color: Colors.grey),
+                    ),
                   ),
                 ),
-                const Text(
-                  "通知",
-                  style: TextStyle(
-                    fontSize: 16,
+                Expanded(
+                  child: Align(
+                    alignment: Alignment.centerRight,
+                    child: IconButton(
+                      icon: const Icon(Icons.filter_list),
+                      onPressed: () {
+                        _showFilterDialog();
+                      },
+                    ),
                   ),
                 ),
-                IconButton(
-                  icon: const Icon(Icons.filter_list),
-                  onPressed: () {
-                    _showFilterDialog();
-                  },
-                ),
               ],
             ),
             const Divider(
@@ -99,15 +97,6 @@ class _NotificationPageState extends State<NotificationPage> {
               thickness: 1,
               color: Colors.grey,
             ),
-            Row(
-              mainAxisAlignment: MainAxisAlignment.end,
-              children: [
-                Text(
-                  '選択されたフィルター: $_selectedFilter',
-                  style: const TextStyle(fontSize: 12, color: Colors.grey),
-                ),
-              ],
-            ),
             const Card(
               color: Color(0xFFF4F6FF),
               child: Padding(