From 4cd8eccf922183b054a515f3412c0fc2dc972ed1 Mon Sep 17 00:00:00 2001
From: Matthew Patrick <Matthew.535200018@stu.untar.ac.id>
Date: Mon, 16 May 2022 02:19:36 +0700
Subject: [PATCH] forgot_pass_body - Fixed Styles

---
 lib/components/forgot_pass_body.dart | 22 ++++++++++++++--------
 lib/components/menu.dart             |  3 ++-
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/lib/components/forgot_pass_body.dart b/lib/components/forgot_pass_body.dart
index b949e4b..dbde9f5 100644
--- a/lib/components/forgot_pass_body.dart
+++ b/lib/components/forgot_pass_body.dart
@@ -38,7 +38,7 @@ class _ForgotPassBodyState extends State<ForgotPassBody> {
                   Icons.mail_sharp,
                   color: Colors.white,
                 ),
-                Text('  EMAIL', style: TextStyle(color: Colors.white)),
+                Text('  Email', style: TextStyle(color: Colors.white)),
               ],
             ),
           ),
@@ -49,11 +49,17 @@ class _ForgotPassBodyState extends State<ForgotPassBody> {
               keyboardType: TextInputType.emailAddress,
               style: TextStyle(color: Colors.white),
               decoration: InputDecoration(
-                  border: OutlineInputBorder(
-                      borderSide: BorderSide(color: Colors.white)),
-                  hintText: 'EMAIL',
-                  fillColor: Colors.white,
-                  hintStyle: TextStyle(color: Colors.white)),
+                focusedBorder: OutlineInputBorder(
+                    borderSide: const BorderSide(
+                      color: Colors.red,
+                    ),
+                    borderRadius: BorderRadius.circular(10.0)),
+                enabledBorder: OutlineInputBorder(
+                    borderSide: const BorderSide(
+                      color: Colors.white60,
+                    ),
+                    borderRadius: BorderRadius.circular(10.0)),
+              ),
             ),
           ),
           ElevatedButton(
@@ -65,7 +71,7 @@ class _ForgotPassBodyState extends State<ForgotPassBody> {
                 shape: MaterialStateProperty.all<RoundedRectangleBorder>(
                     RoundedRectangleBorder(
                         borderRadius: BorderRadius.circular(18.0),
-                        side: const BorderSide(color: Colors.red)))),
+                        side: const BorderSide(color: Colors.black)))),
             onPressed: () {
               Map<String, dynamic> data = {
                 "email": emailController.text,
@@ -88,7 +94,7 @@ class _ForgotPassBodyState extends State<ForgotPassBody> {
                 shape: MaterialStateProperty.all<RoundedRectangleBorder>(
                     RoundedRectangleBorder(
                         borderRadius: BorderRadius.circular(18.0),
-                        side: const BorderSide(color: Colors.red)))),
+                        side: const BorderSide(color: Colors.black)))),
             onPressed: () {
               Navigator.pushNamed(context, '/login');
             },
diff --git a/lib/components/menu.dart b/lib/components/menu.dart
index ac661ce..e254211 100644
--- a/lib/components/menu.dart
+++ b/lib/components/menu.dart
@@ -1,4 +1,5 @@
 import 'dart:math' as math;
+import 'package:nekoya_flutter/screens/forgotpassword.dart';
 import 'package:nekoya_flutter/screens/otp.dart';
 import 'package:universal_html/html.dart' as html;
 import 'package:flutter/material.dart';
@@ -75,7 +76,7 @@ class _MenuState extends State<Menu> {
         html.window.history.pushState(null, '', '/products');
         _selectedWidget = const Products();
       } else if (index == 2) {
-        _selectedWidget = const Otp();
+        _selectedWidget = const ForgotPassword();
       } else if (index == 3) {
         html.window.history.pushState(null, '', '/cart');
         _selectedWidget = const Cart();