Merge pull request #16 from Shehan-lakshitha/12-login-ui

bug fix
Shehan-lakshitha · Aug 7, 2023 · 3a9bcd6 · 3a9bcd6
2 parents 0ac909c + 39acbb6
commit 3a9bcd6
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 15 deletions.
diff --git a/frontend/src/screens/ForgetPassword.tsx b/frontend/src/screens/ForgetPassword.tsx
@@ -63,7 +63,7 @@ const styles = StyleSheet.create({
   },
   header: {
     flexDirection: 'row',
-    alignItems: 'center',
+    alignItems: 'flex-end',
   },
   headerTitle: {
     color: COLORS.black,
@@ -82,6 +82,7 @@ const styles = StyleSheet.create({
   },
   inputContainer: {
     marginBottom: 25,
+    marginHorizontal: 15,
   },
   label: {
     color: COLORS.black,

diff --git a/frontend/src/screens/Login.tsx b/frontend/src/screens/Login.tsx
@@ -31,7 +31,10 @@ export default function Login({navigation}: LoginProps) {
   return (
     <SafeAreaView style={styles.container}>
       <View style={styles.header}>
-        <Text style={styles.title}>Login</Text>
+        <TouchableOpacity onPress={() => navigation.goBack()}>
+          <Icon name="chevron-left" size={24} color={COLORS.black} />
+        </TouchableOpacity>
+        <Text style={styles.headertitle}>Login</Text>
       </View>
       <View style={styles.form}>
         <View style={styles.inputContainer}>
@@ -107,21 +110,23 @@ export default function Login({navigation}: LoginProps) {
 const styles = StyleSheet.create({
   container: {
     flex: 1,
-    marginVertical: 16,
+    marginHorizontal: 22,
+    marginTop: 22,
   },
   header: {
     flexDirection: 'row',
+    alignItems: 'flex-end',
     justifyContent: 'center',
-    marginVertical: 28,
   },
-  title: {
+  headertitle: {
     color: COLORS.black,
-    fontSize: 22,
-    fontWeight: '500',
-    marginBottom: 40,
+    fontSize: 24,
+    fontWeight: '600',
+    marginHorizontal: '35%',
   },
   form: {
-    margin: 25,
+    marginTop: 100,
+    marginHorizontal: 15,
   },
   inputContainer: {
     marginBottom: 25,
@@ -156,7 +161,9 @@ const styles = StyleSheet.create({
     fontWeight: '400',
   },
   loginBtn: {
-    margin: 30,
+    marginTop: 240,
+    marginHorizontal: 15,
+    marginBottom: 20,
   },
   footer: {
     flexDirection: 'row',

diff --git a/frontend/src/screens/ResetPassword.tsx b/frontend/src/screens/ResetPassword.tsx
@@ -100,7 +100,7 @@ const styles = StyleSheet.create({
   },
   header: {
     flexDirection: 'row',
-    alignItems: 'center',
+    alignItems: 'flex-end',
   },
   headerTitle: {
     color: COLORS.black,
@@ -109,8 +109,8 @@ const styles = StyleSheet.create({
     marginHorizontal: '20%',
   },
   form: {
-    margin: 25,
-    marginTop: 50,
+    margin: 15,
+    marginTop: 100,
   },
   inputContainer: {
     marginBottom: 25,
@@ -140,9 +140,9 @@ const styles = StyleSheet.create({
     color: COLORS.black,
   },
   btnContainer: {
-    marginVertical: 300,
+    marginVertical: 250,
   },
   ConfirmBtn: {
-    margin: 24,
+    margin: 15,
   },
 });