Skip to content

N
new_excelso
Commit 2719898f authored by Wahyu Adjie Prasetyo's avatar Wahyu Adjie Prasetyo
Browse files
Options

Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek 

# Conflicts:
#	App.js
parents 8f442fda e2500b05
Hide whitespace changes
Inline Side-by-side
Showing with 114 additions and 86 deletions
App.js
View file @ 2719898f
...@@ -11,24 +11,19 @@ import * as Localization from 'expo-localization'; ...@@ -11,24 +11,19 @@ import * as Localization from 'expo-localization';
import i18n from 'i18n-js'; import i18n from 'i18n-js';
import en from './lib/en'; import en from './lib/en';
import id from './lib/id'; import id from './lib/id';
import React, {useEffect,useState } from 'react'; import React, { useState, useEffect } from 'react';
import { Text, View } from 'react-native'; import { Text, View } from 'react-native';
import { AppLoading } from 'expo'; import { AppLoading } from 'expo';
import * as Font from 'expo-font'; import * as Font from 'expo-font';
let customFonts = {
'Gotham-Black': require('./assets/font/Gotham-Bold-700.otf'),
'Gotham-SemiBoldItalic': require('./assets/font/Gotham-BoldItalic-400.otf')
};
export const lang = i18n.translations = { export const lang = i18n.translations = {
en:en, en: en,
id:id id: id
} }
export const set_lang = i18n.locale = Localization.locale;
export const fallbacks = i18n.fallbacks = true;
export const set_lang = i18n.locale = Localization.locale;
export const fallbacks = i18n.fallbacks = true;
const persistConfig = { const persistConfig = {
key: 'root', key: 'root',
...@@ -39,6 +34,14 @@ const persistReducers = persistReducer(persistConfig, rootReducer) ...@@ -39,6 +34,14 @@ const persistReducers = persistReducer(persistConfig, rootReducer)
const store = createStore(persistReducers); const store = createStore(persistReducers);
const persistor = persistStore(store) const persistor = persistStore(store)
i18n.locale = Localization.locale; i18n.locale = Localization.locale;
let customFonts = {
'Gotham-Black': require('./assets/font/Gotham-Bold-700.otf'),
'Gotham-SemiBoldItalic': require('./assets/font/Gotham-BoldItalic-400.otf'),
'Gotham-Thin': require('./assets/font/iCiel-Gotham-Thin.ttf'),
'Gotham-Light': require('./assets/font/Metropolis-Light.otf'),
};
export default function App() { export default function App() {
const [fontsLoaded, setfontsLoaded] = useState(false) const [fontsLoaded, setfontsLoaded] = useState(false)
......
assets/font/README.txt deleted 100644 → 0
View file @ 8f442fda
To learn more about the font family and its license, visit https://www.fontmirror.com/gotham-bold
\ No newline at end of file
view/Auth.js
View file @ 2719898f
...@@ -56,10 +56,10 @@ enableScreens(); ...@@ -56,10 +56,10 @@ enableScreens();
const Tab = createBottomTabNavigator(); const Tab = createBottomTabNavigator();
function HomePage({navigation}) { function HomePage({ navigation }) {
return ( return (
<Tab.Navigator <Tab.Navigator
screenOptions={({ route }) => ({ screenOptions={({ route }) => ({
tabBarIcon: ({ focused, color, size }) => { tabBarIcon: ({ focused, color, size }) => {
let iconName; let iconName;
...@@ -88,7 +88,7 @@ function HomePage({navigation}) { ...@@ -88,7 +88,7 @@ function HomePage({navigation}) {
tabBarOptions={{ activeTintColor: 'cornflowerblue', inactiveTintColor: 'gray' }} tabBarOptions={{ activeTintColor: 'cornflowerblue', inactiveTintColor: 'gray' }}
> >
<Tab.Screen name="HOME" component={Home} /> <Tab.Screen name="HOME" component={Home} />
<Tab.Screen name="MENU" component={MenuSelection} /> <Tab.Screen name="MENU" component={MenuSelection} />
<Tab.Screen name="REWARDS" component={RewardsList} /> <Tab.Screen name="REWARDS" component={RewardsList} />
<Tab.Screen name="ORDER" component={OrderHistory} /> <Tab.Screen name="ORDER" component={OrderHistory} />
...@@ -113,7 +113,7 @@ class Auth extends React.Component { ...@@ -113,7 +113,7 @@ class Auth extends React.Component {
this.props.session_id === '' ? ( this.props.session_id === '' ? (
<> <>
{/* <Stack.Screen name="Change language" component={ChangeLanguage} /> */} {/* <Stack.Screen name="Change language" component={ChangeLanguage} /> */}
<Stack.Screen name="Login" component={Login} options={{headerShown:false}} /> <Stack.Screen name="Login" component={Login} options={{ headerShown: false }} />
<Stack.Screen name="Home" component={Home} /> <Stack.Screen name="Home" component={Home} />
<Stack.Screen name="Profile" component={ProfilePage} /> <Stack.Screen name="Profile" component={ProfilePage} />
<Stack.Screen name="Change Profil" component={ChangeProfile} /> <Stack.Screen name="Change Profil" component={ChangeProfile} />
...@@ -124,11 +124,24 @@ class Auth extends React.Component { ...@@ -124,11 +124,24 @@ class Auth extends React.Component {
<> <>
<Stack.Screen name="Email Confirmation" component={EmailConfirmation} /> <Stack.Screen name="Email Confirmation" component={EmailConfirmation} />
<Stack.Screen name="Login" component={Login} /> <Stack.Screen name="Login" component={Login} />
<Stack.Screen name="Home" component={Home} options={{headerShown:false}} /> <Stack.Screen name="Home" component={Home} options={{ headerShown: false }} />
</> </>
) : ( ) : (
<> <>
<Stack.Screen name="Home" component={HomePage} options={{headerShown:false}}/> <Stack.Screen name="Home" component={HomePage}
options={{
headerShown: false,
title: 'TODAY PROMOTION',
headerStyle: { backgroundColor: '#CFB368' },
headerTitleContainerStyle:{alignContent:'center'},
headerTitleStyle: {
alignSelf: 'center',
fontFamily: 'Gotham-Black',
color:'white',
textAlign:'center'
}
}} />
<Stack.Screen name="Profile" component={ProfilePage} /> <Stack.Screen name="Profile" component={ProfilePage} />
<Stack.Screen name="Change Profil" component={ChangeProfile} /> <Stack.Screen name="Change Profil" component={ChangeProfile} />
<Stack.Screen name="Change language" component={ChangeLanguage} /> <Stack.Screen name="Change language" component={ChangeLanguage} />
...@@ -136,26 +149,27 @@ class Auth extends React.Component { ...@@ -136,26 +149,27 @@ class Auth extends React.Component {
<Stack.Screen name="Card Activation" component={CardActivation} /> <Stack.Screen name="Card Activation" component={CardActivation} />
<Stack.Screen name="Renewal" component={Renewal} /> <Stack.Screen name="Renewal" component={Renewal} />
<Stack.Screen name="Account" component={Account} /> <Stack.Screen name="Account" component={Account} />
<Stack.Screen name="Login" component={Login} options={{headerShown:false}}/> <Stack.Screen name="Login" component={Login} options={{ headerShown: false }} />
<Stack.Screen name="Transfer Balance" component={TransferBalance} /> <Stack.Screen name="Transfer Balance" component={TransferBalance} />
<Stack.Screen name="Register" component={Register} /> <Stack.Screen name="Register" component={Register} />
<Stack.Screen name="Email Confirmation" component={EmailConfirmation} /> <Stack.Screen name="Email Confirmation" component={EmailConfirmation} />
<Stack.Screen name="Upgrade Premium" component={UpgradePremium} /> <Stack.Screen name="Upgrade Premium" component={UpgradePremium} />
<Stack.Screen name="Camera" component={Cameras} /> <Stack.Screen name="Camera" component={Cameras} />
<Stack.Screen name="Delivery Address" component={DeliveryAddress}/> <Stack.Screen name="Delivery Address" component={DeliveryAddress} />
<Stack.Screen name="Address Detail" component={AddressDetail} /> <Stack.Screen name="Address Detail" component={AddressDetail} />
<Stack.Screen name="Menu Detail" component={MenuDetail} /> <Stack.Screen name="Menu Detail" component={MenuDetail} />
<Stack.Screen name="Pickup Name" component={PickupName} options={{title:"PICKUP STORE",headerStyle:{backgroundColor:"#ccb46c"},headerTitleAlign:'center',headerTitleStyle:{color:'white',fontWeight:'bold'}}} /> <Stack.Screen name="Pickup Name" component={PickupName} options={{ title: "PICKUP STORE", headerStyle: { backgroundColor: "#ccb46c" }, headerTitleAlign: 'center', headerTitleStyle: { color: 'white', fontWeight: 'bold' } }} />
<Stack.Screen name="Outlet Detail" component={OutletDetail}/> <Stack.Screen name="Outlet Detail" component={OutletDetail} />
<Stack.Screen name="Menu Select" component={MenuSelection} options={{headerShown:false}} /> <Stack.Screen name="Menu Select" component={MenuSelection} options={{ headerShown: false }} />
<Stack.Screen name="Card Info" component={CardInfo} /> <Stack.Screen name="Card Info" component={CardInfo} />
<Stack.Screen name="Shopping Cart" component={ShoppingCart} /> <Stack.Screen name="Shopping Cart" component={ShoppingCart} />
<Stack.Screen name="Order History" component={OrderHistory} /> <Stack.Screen name="Order History" component={OrderHistory} />
<Stack.Screen name="Reward History" component={RewardHistory} /> <Stack.Screen name="Reward History" component={RewardHistory} />
<Stack.Screen name="Order Detail" component={OrderDetail} options={({ navigation, route }) => ({ headerLeft: props => <HeaderBackButton {...props} onPress={()=>navigation.navigate('Home',{screen:'ORDER'})}/>, <Stack.Screen name="Order Detail" component={OrderDetail} options={({ navigation, route }) => ({
headerLeft: props => <HeaderBackButton {...props} onPress={() => navigation.navigate('Home', { screen: 'ORDER' })} />,
})}/>
})} />
</> </>
) )
...@@ -177,10 +191,10 @@ class Auth extends React.Component { ...@@ -177,10 +191,10 @@ class Auth extends React.Component {
<Stack.Screen name="News Detail" component={NewsDetail} /> <Stack.Screen name="News Detail" component={NewsDetail} />
{/* <Stack.Screen name="Delivery Address" component={DeliveryAddress} /> */} {/* <Stack.Screen name="Delivery Address" component={DeliveryAddress} /> */}
<Stack.Screen name="Confirm Your Order" component={MenuConfirmation} /> <Stack.Screen name="Confirm Your Order" component={MenuConfirmation} />
{/* <Stack.Screen name="Card Info" component={CardInfo} /> */} {/* <Stack.Screen name="Card Info" component={CardInfo} /> */}
{/* <Stack.Screen name="Change password" component={ChangePassword} /> */} {/* <Stack.Screen name="Change password" component={ChangePassword} /> */}
......
view/Login.js
View file @ 2719898f
import * as React from 'react'; import * as React from 'react';
import { Button, View, Text, TextInput, StyleSheet, Alert, Platform, Image } from 'react-native'; import { Button, View, Text, TextInput, StyleSheet, Alert, Platform, Image, TouchableOpacity, StatusBar, ImageBackground } from 'react-native';
import Axios from 'axios'; import Axios from 'axios';
import Constants from 'expo-constants'; import Constants from 'expo-constants';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
...@@ -183,60 +183,61 @@ class Login extends React.Component { ...@@ -183,60 +183,61 @@ class Login extends React.Component {
render() { render() {
return ( return (
<View style={styles.container}> <View style={styles.container}>
<View style={{ flex: 1 }}> <StatusBar
<View style={{ flex: 1, flexDirection: 'row' }}> hidden={true} />
<View style={{ flex: 3 }}> <ImageBackground source={require('../assets/images/loging-background.jpg')} style={{ width: '100%', height: '100%' }}>
<Image <View style={styles.logo}>
style={{ height: '100%', width: '100%' }} <Image source={require('../assets/images/excelso-log.png')} style={styles.imageslogo}></Image>
source={require('../assets/images/daun.png')} </View>
<View style={styles.v_form}>
<View style={{ flex: 1, marginRight: 30, marginLeft: 30, justifyContent: 'center' }}>
<Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 20, textAlign: 'center', margin: 3 }}>Email</Text>
<TextInput
style={{ height: 40, borderColor: 'gray', borderWidth: 1, padding: 10, borderRadius: 10,textAlign:'center', fontFamily:'Gotham-Black',color:'white',fontSize:13,fontWeight:'bold' }}
onChangeText={(email) => this.setState({ email })}
autoCapitalize="none"
value={this.state.email}
keyboardType='email-address'
/> />
</View> </View>
<View style={{ flex: 6 }}> <View style={{ flex: 1, height: 50, marginRight: 30, marginLeft: 30, justifyContent: 'center' }}>
<Image <Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 20, textAlign: 'center', margin: 3 }}>Password</Text>
style={{ height: 150, width: 150, alignSelf: 'center', top: '20%', }} <TextInput
source={require('../assets/excelso.png')} style={{ height: 40, borderColor: 'gray', borderWidth: 1, padding: 5, borderRadius: 10,textAlign:'center',fontFamily:'Gotham-Black',color:'white',fontSize:13,fontWeight:'bold' }}
onChangeText={password => this.setState({ password })}
value={this.state.password}
secureTextEntry={true}
/> />
</View> </View>
<View style={{ flex: 1, height: 50, marginRight: 70, marginLeft: 70, justifyContent: 'center' }}>
<TouchableOpacity onPress={()=>this.handleLoggin()}>
<View style={{ height: 50, borderRadius: 20, backgroundColor: '#CFB368' }}>
<Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 20, textAlign: 'center', margin: 15 }}>LOGIN</Text>
</View>
</TouchableOpacity>
</View>
</View> </View>
</View> <View style={styles.v_policy}>
<View style={{ flex: 1, marginRight: 20, marginLeft: 20 }}> <View style={{ flex: 1, justifyContent: 'center' }}>
<View style={{ marginRight: 20, marginLeft: 20,marginBottom: 10 }}> <TouchableOpacity onPress={() => this.props.navigation.navigate('New Register')}>
<Text style={{ color: 'white', textAlign: 'center' }}>Email</Text> <Text style={{ fontFamily: 'Gotham-Light', color: '#CFB368', fontSize: 19, textAlign: 'center', marginBottom: 5 }}>REGISTER</Text>
<TextInput </TouchableOpacity>
style={{ height: 40, borderColor: 'gray', borderWidth: 1, padding: 5, borderRadius: 20, margin:5 }} <TouchableOpacity onPress={() => this.props.navigation.navigate('Reset Password')}>
onChangeText={(email) => this.setState({ email })} <Text style={{ fontFamily: 'Gotham-Light', color: '#CFB368', fontSize: 19, textAlign: 'center', marginTop: 5 }}>FORGOT PASSWORD</Text>
autoCapitalize="none" </TouchableOpacity>
value={this.state.email} </View>
keyboardType='email-address'
/>
</View>
<View style={{ marginRight: 20, marginLeft: 20 }}>
<Text style={{ color: 'white', textAlign: 'center' }}>Password</Text>
<TextInput
style={{ height: 40, borderColor: 'gray', borderWidth: 1, padding: 5, borderRadius: 20, margin:5 }}
onChangeText={password => this.setState({ password })}
value={this.state.password}
secureTextEntry={true}
/>
</View>
<View style={{ height: 50, backgroundColor: '#CFB368', marginRight: 70, marginLeft: 70, borderRadius: 20 ,margin:15 }}>
<Text style={{textAlign:'center',alignSelf:'center',top: 15, fontWeight:'bold'}}>LOGIN</Text>
</View>
</View>
<View style={{ flex: 1 }}>
<View style={{justifyContent:'center',margin:10,}}>
<Text style={{ color: 'white', textAlign: 'center',fontSize: 20, fontFamily:'Ghotam-Black'}}>Register</Text>
<Text style={{ color: 'white', textAlign: 'center',fontSize:20 }}>Forgot Password</Text>
</View>
<View style={{justifyContent:'center',margin:10,}}>
<Text style={{ color: 'white', textAlign: 'center' }}>Dengan Login atau Register, Kamu menyetujui aturan </Text>
<Text style={{ color: 'white', textAlign: 'center' }}>Panduan Layanan dan Kebijakan Privasi Kami </Text>
</View>
</View>
<View style={{ flex: 1, justifyContent: 'center', marginRight: 60, marginLeft: 60 }}>
<Text style={{ fontFamily: 'Gotham-Light', color: '#CFB368', fontSize: 13, textAlign: 'center', marginBottom: 5 }}>
Dengan Login atau Register, Kamu menyetujui aturan <Text style={{ fontWeight: 'bold' }}> Panduan Layanan</Text> dan <Text style={{ fontWeight: 'bold' }}>Kebijakan Privasi kami</Text>
</Text>
</View>
</View>
</ImageBackground>
</View> </View>
) )
} }
...@@ -247,17 +248,28 @@ const styles = StyleSheet.create({ ...@@ -247,17 +248,28 @@ const styles = StyleSheet.create({
flex: 1, flex: 1,
backgroundColor: '#151515', backgroundColor: '#151515',
}, },
form: { logo: {
flex: 2.5,
flex: 6, height: 50
}, },
footer: { imageslogo: {
flex: 1, height: 170,
margin: 10,
width: 150,
justifyContent: 'center',
alignSelf: 'center',
top: 50
},
v_form: {
flex: 3,
// borderColor: 'red',
// borderWidth: 1,
}, },
container_register: { v_policy: {
height: 50, flex: 2,
flexDirection: 'row', // borderColor: 'red',
margin: 10 // borderWidth: 1,
} }
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment