Logout functionality (#126)

* logout functionallity

* logout functionallity format

* merge temoate branch to logout_functionallity format

* add logout

* add logout gormat

* remove forget pass and sc upload

* remove forget pass and sc upload format

* delete record query

* delete record query fomat

* remove base url

* safe db call for remove user

* safe db call for remove user fomat

README.md

@@ -8,4 +8,4 @@ This is a micro-framework for React Native which is designed to help simplify de
 
 # Screenshots
 
-​   <img src="screenshots/splashScreen.png" alt="splash" title="Splash Screen"  width="150" />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <img src="screenshots/dashboardscreen.png" alt="dashboard" title="Dashboard Screen"  width="150" />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img src="screenshots/loginscreen.png" alt="login" title="Login Screen"  width="150" />
+​   <img src="screenshots/splashScreen.png" alt="splash" title="Splash Screen"  width="150" />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <img src="screenshots/lightTheme.JPEG" alt="dashboard" title="Dashboard Screen"  width="150" />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img src="screenshots/darkTheme.JPEG" alt="login" title="Login Screen"  width="150" />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <img src="screenshots/dash-lightTheme.JPEG" alt="dashboard" title="Dashboard Screen"  width="150" />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img src="screenshots/dash-darktheme.JPEG" alt="login" title="Login Screen"  width="150" />

packages/data/src/out/database_port.ts

@@ -4,4 +4,5 @@ export interface DatabasePort {
   addUser(params?: { email: string; password: string; token: string }): Promise<boolean>
   fetchUserData(data: UserModel): Promise<UserModel>
   fetchUserExists(data: UserModel): Promise<boolean>
+  removeUser(params: { email: string }): Promise<boolean>
 }

packages/data/src/repositories/user_repository_impl.ts

@@ -14,7 +14,6 @@ export class UserRepositoryImpl implements UserRepository {
 
   async login(params?: { email: string; password: string }): Promise<boolean> {
     const usermodel: any = await this.network.login({ email: params.email, password: params.password })
-    console.log(usermodel)
     if (usermodel == 'Request failed with status code 403') {
       return usermodel
     } else {
@@ -31,9 +30,16 @@ export class UserRepositoryImpl implements UserRepository {
       email: params.email
     })
   }
+
   async fetchUserExists(params?: { email: string }): Promise<boolean> {
     return await this.database.fetchUserExists({
       email: params.email
     })
   }
+
+  async logout(params?: { email: string }): Promise<boolean> {
+    return await this.database.removeUser({
+      email: params.email
+    })
+  }
 }

packages/database-watermelon/src/dao/user_dao.ts

@@ -39,4 +39,14 @@ export class UserDao extends BaseDao<DbUserModel> {
     if (userCount > 0) return true
     else return false
   }
+
+  async deleteUser(data: { email: string }): Promise<boolean> {
+    await safeDbCall(
+      this.attachedDatabase.write(async () => {
+        const response: any = await this.databaseData.query(Q.where('email', Q.eq(data.email))).destroyAllPermanently()
+        return response
+      })
+    )
+    return true
+  }
 }

packages/database-watermelon/src/database_adapter.ts

@@ -28,5 +28,10 @@ class DatabaseAdapter implements DatabasePort {
       email: data.email
     })
   }
+  async removeUser(params: { email: string }): Promise<boolean> {
+    return await this.databases.userDao.deleteUser({
+      email: params.email
+    })
+  }
 }
 export default DatabaseAdapter

packages/domain/src/di/domain_module.ts

@@ -2,13 +2,15 @@ import { UserRepository } from './../repository/user_repository'
 import { DataModule } from 'data'
 import { Graph, ObjectGraph, Provides, Singleton } from 'di'
 import { LoginUseCase } from '../usecases/login_user_usecase'
-import { FetchUserDataUseCase, FetchUserExistsUseCase } from '../domain'
+import { LogoutUseCase } from '../usecases/logout_usecase'
+import { FetchUserDataUseCase } from '../usecases/user_details_usecase'
+import { FetchUserExistsUseCase } from '../usecases/user_present_data_usecase'
 
 @Singleton()
 @Graph({ subgraphs: [DataModule] })
 export class DomainModule extends ObjectGraph {
   @Provides()
-  providesLoginUseCase(provideUserRepository: UserRepository): LoginUseCase {
+  provideLoginUseCase(provideUserRepository: UserRepository): LoginUseCase {
     return new LoginUseCase(provideUserRepository)
   }
   @Provides()
@@ -19,4 +21,8 @@ export class DomainModule extends ObjectGraph {
   provideUserExistsUseCase(provideUserRepository: UserRepository): FetchUserExistsUseCase {
     return new FetchUserExistsUseCase(provideUserRepository)
   }
+  @Provides()
+  provideLogoutUseCase(provideUserRepository: UserRepository): LogoutUseCase {
+    return new LogoutUseCase(provideUserRepository)
+  }
 }

packages/domain/src/domain.ts

@@ -3,6 +3,7 @@ import { FetchUserDataUseCase, FetchUserDataUseCaseParams } from './usecases/use
 import { LoginUseCase, LoginParams } from './usecases/login_user_usecase'
 import { DomainModule } from './di/domain_module'
 import { UserRepository } from './repository/user_repository'
+import { LogoutUseCase, LogoutParams } from './usecases/logout_usecase'
 
 export {
   DomainModule,
@@ -12,5 +13,7 @@ export {
   FetchUserDataUseCase,
   FetchUserDataUseCaseParams,
   FetchUserExistsUseCase,
-  FetchUserExistsUseCaseParams
+  FetchUserExistsUseCaseParams,
+  LogoutUseCase,
+  LogoutParams
 }

packages/domain/src/repository/user_repository.ts

@@ -4,4 +4,5 @@ export interface UserRepository {
   login(params?: { email: string; password: string }): Promise<boolean>
   fetchUserData(params?: { email: string }): Promise<UserModel>
   fetchUserExists(params?: { email: string }): Promise<boolean>
+  logout(params?: { email: string }): Promise<boolean>
 }

packages/domain/src/usecases/logout_usecase.ts

@@ -0,0 +1,29 @@
+import { UserRepository } from '../repository/user_repository'
+import { FutureUseCase } from './base/base_usecase'
+import { Params } from './base/params'
+
+export class LogoutUseCase extends FutureUseCase<LogoutParams, boolean> {
+  private readonly userRepository: UserRepository
+  constructor(repo: UserRepository) {
+    super()
+    this.userRepository = repo
+  }
+  async execute(params?: LogoutParams): Promise<boolean> {
+    if (params?.verify()) {
+      return await this.userRepository.logout({
+        email: params.email
+      })
+    } else return false
+  }
+}
+export class LogoutParams extends Params {
+  readonly email?: string
+
+  constructor(params?: { email: string }) {
+    super({})
+    this.email = params.email
+  }
+  verify(): boolean {
+    return true
+  }
+}

packages/localisation/lib/en.json

@@ -11,5 +11,6 @@
   "getThere": "Get There.",
   "getStarted": "Get Started",
   "noInput": "please enter data or a valid data",
-  "errorMessage": "please enter proper email and password"
+  "errorMessage": "please enter proper email and password",
+  "logout": "Logout"
 }

packages/mobile/App.tsx

@@ -16,10 +16,6 @@ import SplashScreen from 'react-native-splash-screen'
 import { ThemeProvider } from './src/theme/themeprovider'
 
 class App extends Component {
-  componentDidMount(): void {
-    SplashScreen.hide()
-  }
-
   render() {
     return (
       <ThemeProvider>

packages/mobile/src/assets/images.ts

@@ -2,6 +2,8 @@ const Images = {
   icon: require('./images/logo.png'),
   car: require('./images/car.png'),
   carBlack: require('./images/carblack.png'),
-  iconBlack: require('./images/logoblack.png')
+  iconBlack: require('./images/logoblack.png'),
+  blackLogout: require('./images/blacklogouticon.png'),
+  whiteLogout: require('./images/whitelogouticon.png')
 }
 export default Images

packages/mobile/src/feature/dashboard/dashboard_screen.tsx

@@ -6,22 +6,35 @@ import { AppButton } from '../../widgets/app_button/app_button'
 import { useTheme } from '../../theme/themeprovider'
 import { useEffect, useState } from 'react'
 import { useDispatch, useSelector } from 'react-redux'
+import { logoutAction } from 'presentation'
+import { useNavigation } from '@react-navigation/native'
+import RoutePaths from '../../navigation/router_path'
 import { fetchUserAction } from 'presentation'
 
 const DashboardScreen = () => {
   const { theme, isDark } = useTheme()
-  const [lodingState, setLodingState] = useState(false)
+  const navigation: any = useNavigation()
   const databaseEmail: any = useSelector((state: any) => state?.userData?.data?.payload)
+  const logoutData: any = useSelector((state: any) => state?.logout?.data?.payload)
   const dispatch = useDispatch()
   useEffect(() => {
     dispatch(fetchUserAction({}))
   }, [])
+  const onLogoutClick = () => {
+    dispatch(logoutAction({ databaseEmail }))
+  }
   return (
     <View style={style.mainView}>
       <View style={[style.secView, { backgroundColor: theme.secondaryColor }]}>
+        <TouchableOpacity style={style.logoutButton} onPress={() => onLogoutClick()}>
+          <Image
+            source={isDark ? Images.blackLogout : Images.whiteLogout}
+            style={style.logoutStyle}
+            resizeMode="contain"
+          />
+        </TouchableOpacity>
         <Text style={[style.uberText, { color: theme.textColor }]}>{`${i18n.t('uber')} -  ${databaseEmail}`}</Text>
         <Text style={[style.getText, { color: theme.textColor }]}>{i18n.t('getThere')}</Text>
-
         <Image source={isDark ? Images.carBlack : Images.car} style={style.carStyle} resizeMode="contain" />
       </View>
       <View style={style.thirdView}>

packages/mobile/src/feature/dashboard/dashboard_style.ts

@@ -12,9 +12,9 @@ export default StyleSheet.create({
     height: '75%'
   },
   uberText: {
-    fontSize: 40,
+    fontSize: 28,
     textAlign: 'center',
-    marginTop: '15%',
+    marginTop: '10%',
     fontFamily: 'Poppins-Regular'
   },
   getText: {
@@ -33,7 +33,18 @@ export default StyleSheet.create({
     height: 350,
     alignSelf: 'center',
     position: 'absolute',
-    bottom: 20,
+    bottom: 30,
     right: -100
+  },
+  logoutStyle: {
+    marginTop: 10,
+    width: 30,
+    height: 30,
+    alignSelf: 'flex-end'
+  },
+  logoutButton: {
+    width: 30,
+    height: 30,
+    alignSelf: 'flex-end'
   }
 })

packages/mobile/src/feature/login/login_screen.tsx

@@ -33,11 +33,6 @@ const LoginScreen = () => {
     else setLodingState(false)
   }, [loginData])
 
-  useEffect(() => {
-    if (loginData?.status == Status?.success) navigation.navigate(RoutePaths.dashboard)
-    else if (loginData?.status == Status?.error) alert(i18n.t('noInput'))
-  }, [loginData])
-
   return (
     <View style={[style.mainView, { backgroundColor: theme.backgroundCOlor }]}>
       <View style={style.secView}>
@@ -51,9 +46,6 @@ const LoginScreen = () => {
       <View style={style.buttonVIew}>
         <AppButton loadingState={loadingState} value={'login'} saveData={() => saveData()} />
       </View>
-      <TouchableOpacity>
-        <Text style={[style.forgetpass, { color: theme.textColor }]}>{i18n.t('forgetPassword')}</Text>
-      </TouchableOpacity>
     </View>
   )
 }

packages/mobile/src/feature/login/login_style.ts

@@ -8,7 +8,8 @@ export default StyleSheet.create({
     height: Dimensions.get('window').height
   },
   secView: {
-    width: '100%'
+    width: '100%',
+    marginTop: '10%'
   },
   loginText: {
     fontSize: 24,

packages/mobile/src/navigation/app_router.tsx

@@ -5,24 +5,36 @@ import DashboardScreen from '../feature/dashboard/dashboard_screen'
 import LoginScreen from '../feature/login/login_screen'
 import RoutePaths from './router_path'
 import { useDispatch, useSelector } from 'react-redux'
-import { fetchUserExistsAction } from 'presentation'
+import { Status, fetchUserExistsAction } from 'presentation'
+import SplashScreen from 'react-native-splash-screen'
 
 const AppRouter = () => {
   const Stack = createNativeStackNavigator()
-  const databaseEmail: any = useSelector((state: any) => state?.userPresentData?.data?.payload)
+  const databaseEmail: any = useSelector((state: any) => state?.userExistsData)
+  const logoutData: any = useSelector((state: any) => state?.logout?.data?.payload)
+
   const dispatch = useDispatch()
   useEffect(() => {
     dispatch(fetchUserExistsAction({}))
   }, [])
+
+  useEffect(() => {
+    if (databaseEmail?.status == Status.success) {
+      SplashScreen.hide()
+    }
+  }, [databaseEmail?.status])
   return (
     <NavigationContainer>
       <Stack.Navigator
         screenOptions={{
           headerShown: false
         }}
       >
-        {!databaseEmail && <Stack.Screen name={RoutePaths.login} component={LoginScreen} />}
-        <Stack.Screen name={RoutePaths.dashboard} component={DashboardScreen} />
+        {(!databaseEmail?.data?.payload && databaseEmail?.status == Status.success) || logoutData ? (
+          <Stack.Screen name={RoutePaths.login} component={LoginScreen} />
+        ) : (
+          <Stack.Screen name={RoutePaths.dashboard} component={DashboardScreen} />
+        )}
       </Stack.Navigator>
     </NavigationContainer>
   )

packages/mobile/src/widgets/app_button/app_button_style.ts

@@ -6,9 +6,9 @@ export default StyleSheet.create({
   buttonView: {
     alignSelf: 'center',
     width: '80%',
+    height: 50,
     borderRadius: 15,
-    justifyContent: 'center',
-    paddingVertical: '5%'
+    justifyContent: 'center'
   },
   buttonText: {
     fontSize: 24,

packages/presentation/src/feature/login/saga.ts

@@ -3,17 +3,21 @@ import { Obsidian } from 'di'
 import { put } from 'redux-saga/effects'
 import { LOGIN } from './actions'
 import { LoginParams } from 'domain-layer'
+import { LOGOUT } from '../logout/action'
+import { FETCH_USER_EXISTS } from '../userpresent/action'
 
 function* loginSaga(action) {
   const mesage = 'Request failed with status code 403'
   try {
     const data: any = yield Obsidian.obtain(DomainModule)
-      .providesLoginUseCase()
+      .provideLoginUseCase()
       .execute(new LoginParams({ email: action?.params?.data?.email, password: action?.params?.data?.password }))
     if (data == mesage || data == false) {
       yield put({ type: LOGIN.failure, payload: data })
     } else {
       yield put({ type: LOGIN.success, payload: data })
+      yield put({ type: LOGOUT.failure, payload: false })
+      yield put({ type: FETCH_USER_EXISTS.success, payload: true })
     }
   } catch (e) {
     console.log(e)

packages/presentation/src/feature/logout/action.ts

@@ -0,0 +1,10 @@
+export enum LOGOUT {
+  request = 'LOGOUT_REQUEST',
+  success = 'LOGOUT_SUCCESS',
+  failure = 'LOGOUT_FAILURE'
+}
+
+export const logoutAction = params => ({
+  type: LOGOUT.request,
+  params
+})

packages/presentation/src/feature/logout/reducer.ts

@@ -0,0 +1,23 @@
+import data from 'packages/data/lib/data'
+import { Resource } from '../../utils/resource'
+import { LOGOUT } from './action'
+
+const logoutReducer = (initialState = Resource.none, action) => {
+  switch (action.type) {
+    case LOGOUT.request:
+      return Resource.loading()
+
+    case LOGOUT.success:
+      return Resource.success({
+        data: action
+      })
+
+    case LOGOUT.failure:
+      return Resource.error({
+        error: 'User Not logged in'
+      })
+    default:
+      return initialState
+  }
+}
+export default logoutReducer