admin/imexmobile
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build updates & remove testing items.

Browse Source
This commit is contained in:
Patrick Fic
2022-05-12 13:34:54 -07:00
parent 717b75a1b8
commit 451950883a
7 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app.json
View File

@@ -2,7 +2,7 @@
"expo": { "expo": {
"name": "ImEX Mobile", "name": "ImEX Mobile",
"slug": "imexmobile", "slug": "imexmobile",
"version": "1.3.3", "version": "1.3.5",
"extra": { "extra": {
"expover": "1" "expover": "1"
}, },
@@ -11,12 +11,12 @@
"ios": { "ios": {
"supportsTablet": true, "supportsTablet": true,
"bundleIdentifier": "com.imex.imexmobile", "bundleIdentifier": "com.imex.imexmobile",
"buildNumber": "1.3.3", "buildNumber": "1",
"googleServicesFile": "./GoogleService-Info.plist" "googleServicesFile": "./GoogleService-Info.plist"
}, },
"android": { "android": {
"package": "com.imex.imexmobile", "package": "com.imex.imexmobile",
"versionCode": 1030300, "versionCode": 1100001,
"googleServicesFile": "./google-services.json" "googleServicesFile": "./google-services.json"
}, },
"splash": { "splash": {

2
components/screen-main/screen-main.component.jsx
View File

@@ -5,7 +5,7 @@ import { createStackNavigator } from "@react-navigation/stack";
import i18n from "i18next"; import i18n from "i18next";
import React, { useEffect } from "react"; import React, { useEffect } from "react";
import { Button } from "react-native-paper"; import { Button } from "react-native-paper";
import { SafeAreaView } from "react-native-safe-area-context"; import { SafeAreaView } from "react-native";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { createStructuredSelector } from "reselect"; import { createStructuredSelector } from "reselect";
import { logImEXEvent } from "../../firebase/firebase.analytics"; import { logImEXEvent } from "../../firebase/firebase.analytics";

6
components/screen-settings/screen-settings.component.jsx
View File

@@ -1,8 +1,8 @@
import Constants from "expo-constants"; import Constants from "expo-constants";
import React from "react"; import React from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { Button, View, Text } from "react-native"; import { View, Text } from "react-native";
import { Title } from "react-native-paper"; import { Title, Button } from "react-native-paper";
import { purgeStoredState } from "redux-persist"; import { purgeStoredState } from "redux-persist";
import SignOutButton from "../sign-out-button/sign-out-button.component"; import SignOutButton from "../sign-out-button/sign-out-button.component";
import * as Updates from "expo-updates"; import * as Updates from "expo-updates";
@@ -25,7 +25,7 @@ export default function ScreenSettingsComponent() {
})} })}
</Title> </Title>
<Text>{Updates.releaseChannel}</Text> <Text>Release Channel {Updates.releaseChannel}</Text>
<SignOutButton /> <SignOutButton />
<Button title="Purge State" onPress={() => purgeStoredState()} /> <Button title="Purge State" onPress={() => purgeStoredState()} />
</View> </View>

79
components/screen-sign-in/screen-sign-in.component.jsx
View File

@@ -47,43 +47,52 @@ export function SignIn({ emailSignInStart, signingIn }) {
<Image style={localStyles.logo} source={Logo} /> <Image style={localStyles.logo} source={Logo} />
<Title>{t("app.title")}</Title> <Title>{t("app.title")}</Title>
</View> </View>
<Formik initialValues={{ email: "", password: "" }} onSubmit={formSubmit}>
{({ handleChange, handleBlur, handleSubmit, values }) => (
<View>
<TextInput
label={t("signin.fields.email")}
mode="outlined"
autoCapitalize="none"
keyboardType="email-address"
onChangeText={handleChange("email")}
onBlur={handleBlur("email")}
value={values.email}
style={[localStyles.input]}
/>
<TextInput <View style={{ flex: 1 }}>
label={t("signin.fields.password")} <Formik
mode="outlined" initialValues={{ email: "", password: "" }}
secureTextEntry={true} onSubmit={formSubmit}
onChangeText={handleChange("password")} >
onBlur={handleBlur("password")} {({ handleChange, handleBlur, handleSubmit, values }) => (
value={values.password} <View>
style={[localStyles.input]} <TextInput
/> label={t("signin.fields.email")}
mode="outlined"
autoCapitalize="none"
keyboardType="email-address"
onChangeText={handleChange("email")}
onBlur={handleBlur("email")}
value={values.email}
style={[localStyles.input]}
/>
<SignInErrorAlertComponent /> <TextInput
<Button mode="outlined" loading={signingIn} onPress={handleSubmit}> label={t("signin.fields.password")}
<Text>{t("signin.actions.signin")}</Text> mode="outlined"
</Button> secureTextEntry={true}
<Text> onChangeText={handleChange("password")}
{t("settings.labels.version", { onBlur={handleBlur("password")}
number: Constants.manifest.version, value={values.password}
})} style={[localStyles.input]}
{`${process.env.NODE_ENV || ""} ${Updates.releaseChannel || ""}`} />
</Text>
</View> <SignInErrorAlertComponent />
)} <Button
</Formik> mode="outlined"
loading={signingIn}
onPress={handleSubmit}
>
<Text>{t("signin.actions.signin")}</Text>
</Button>
</View>
)}
</Formik>
</View>
<Text style={{ padding: 10, alignSelf: "center" }}>
{t("settings.labels.version", {
number: Constants.manifest.version,
})}
</Text>
</View> </View>
); );
} }

12
eas.json
View File

@@ -3,14 +3,14 @@
"version": ">= 0.52.0" "version": ">= 0.52.0"
}, },
"build": { "build": {
"development": { "test": {
"developmentClient": true, "developmentClient": true,
"distribution": "internal" "distribution": "internal",
"releaseChannel": "test"
}, },
"preview": { "production": {
"distribution": "internal" "release-channel": "production"
}, }
"production": {}
}, },
"submit": { "submit": {
"production": {} "production": {}

6
package.json
View File

@@ -8,10 +8,8 @@
"eject": "expo eject", "eject": "expo eject",
"release:test": "expo publish --release-channel test", "release:test": "expo publish --release-channel test",
"release:production": "expo publish --release-channel production", "release:production": "expo publish --release-channel production",
"build:ios:production": "expo build:ios --release-channel production", "build:production": "eas build --profile production",
"build:ios:test": "expo build:ios --release-channel test", "build:test": "eas build --profile test"
"build:android:production": "expo build:android --release-channel production",
"build:android:test": "expo build:android --release-channel test"
}, },
"dependencies": { "dependencies": {
"@apollo/client": "^3.7.0-alpha.3", "@apollo/client": "^3.7.0-alpha.3",

9
redux/user/user.sagas.js
View File

@@ -109,14 +109,7 @@ export function* signInSuccessSaga({ payload }) {
const shop = yield client.query({ query: QUERY_BODYSHOP }); const shop = yield client.query({ query: QUERY_BODYSHOP });
logImEXEvent("imexmobile_sign_in_success", payload); logImEXEvent("imexmobile_sign_in_success", payload);
yield put( yield put(setBodyshop(shop.data.bodyshops[0]));
setBodyshop({
...shop.data.bodyshops[0],
uselocalmediaserver: true,
localmediaserverhttp: "http://192.168.1.235:8000", //TODO: ENSURE THAT THIS HAS BEEN REMOVED POST TESTING.
localmediaservernetwork: "\\192.168.1.235:8000", //TODO: ENSURE THAT THIS HAS BEEN REMOVED POST TESTING.
})
);
} catch (error) { } catch (error) {
console.log("UH-OH. Couldn't get shop details.", error); console.log("UH-OH. Couldn't get shop details.", error);
} }