Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

鉁║pdate to Expo SDK 47 #37

Merged
merged 3 commits into from
Nov 11, 2022
Merged

鉁║pdate to Expo SDK 47 #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd01d88
update expo with `expo upgrade`
bnussman Nov 9, 2022
5b0050e
update to use new `routes/settings/EditProfile.tsx` types
bnussman Nov 10, 2022
4b99030
fix image value
bnussman Nov 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion app/babel.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ module.exports = function (api) {
api.cache(true);
return {
presets: ["babel-preset-expo"],
plugins: ["react-native-reanimated/plugin"],
plugins: [
"@babel/plugin-proposal-export-namespace-from",
"react-native-reanimated/plugin",
],
};
};
49 changes: 25 additions & 24 deletions app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,48 +20,49 @@
"@react-navigation/native": "^6.0.11",
"@react-navigation/stack": "^6.2.2",
"apollo-upload-client": "^17.0.0",
"expo": "^46.0.0",
"expo-device": "~4.3.0",
"expo-image-picker": "~13.3.1",
"expo-linear-gradient": "~11.4.0",
"expo-linking": "~3.2.2",
"expo-location": "~14.3.0",
"expo-notifications": "~0.16.1",
"expo-splash-screen": "~0.16.1",
"expo-status-bar": "~1.4.0",
"expo-task-manager": "~10.3.0",
"expo-updates": "~0.14.4",
"expo": "^47.0.0",
"expo-device": "~5.0.0",
"expo-image-picker": "~14.0.1",
"expo-linear-gradient": "~12.0.1",
"expo-linking": "~3.2.3",
"expo-location": "~15.0.1",
"expo-notifications": "~0.17.0",
"expo-splash-screen": "~0.17.4",
"expo-status-bar": "~1.4.2",
"expo-task-manager": "~11.0.1",
"expo-updates": "~0.15.4",
"graphql": "^15.6.1",
"graphql-ws": "^5.11.2",
"native-base": "3.4.12-alpha.1",
"react": "18.0.0",
"react-dom": "18.0.0",
"react": "18.1.0",
"react-dom": "18.1.0",
"react-hook-form": "^7.39.1",
"react-native": "0.69.4",
"react-native-gesture-handler": "~2.5.0",
"react-native": "0.70.5",
"react-native-gesture-handler": "~2.8.0",
"react-native-keyboard-aware-scroll-view": "^0.9.5",
"react-native-maps": "0.31.1",
"react-native-mime-types": "^2.3.0",
"react-native-reanimated": "~2.9.1",
"react-native-safe-area-context": "4.3.1",
"react-native-screens": "~3.15.0",
"react-native-svg": "12.3.0",
"react-native-reanimated": "~2.12.0",
"react-native-safe-area-context": "4.4.1",
"react-native-screens": "~3.18.0",
"react-native-svg": "13.4.0",
"react-native-web": "~0.18.7",
"sentry-expo": "~5.0.0",
"styled-components": "^5.3.3",
"styled-system": "^5.1.5"
},
"devDependencies": {
"@babel/core": "^7.18.6",
"@expo/webpack-config": "^0.17.0",
"@babel/core": "^7.19.3",
"@babel/plugin-proposal-export-namespace-from": "^7.18.9",
"@expo/webpack-config": "^0.17.2",
"@graphql-codegen/cli": "^2.13.11",
"@graphql-codegen/typescript": "^2.8.1",
"@graphql-codegen/typescript-operations": "^2.5.6",
"@graphql-codegen/typescript-react-apollo": "^3.3.6",
"@types/apollo-upload-client": "^17.0.2",
"@types/react": "~18.0.20",
"@types/react-dom": "~18.0.0",
"@types/react-native": "~0.69.1",
"@types/react": "~18.0.24",
"@types/react-dom": "~18.0.8",
"@types/react-native": "~0.70.6",
"@types/uuid": "^8.3.3",
"@typescript-eslint/eslint-plugin": "^5.42.1",
"@typescript-eslint/parser": "^5.42.1",
Expand Down
14 changes: 7 additions & 7 deletions app/routes/auth/SignUp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { Container } from "../../components/Container";
import { Alert } from "../../utils/Alert";
import { UserData } from "../../utils/useUser";
import { Controller, useForm } from "react-hook-form";
import { Avatar } from "../../components/Avatar";
import {
isValidationError,
useValidationErrors,
Expand All @@ -30,7 +31,6 @@ import {
InputGroup,
InputLeftAddon,
} from "native-base";
import { Avatar } from "../../components/Avatar";

const SignUp = gql`
mutation SignUp($input: SignUpInput!) {
Expand Down Expand Up @@ -112,21 +112,21 @@ export function SignUpScreen() {
base64: false,
});

if (result.cancelled) {
if (result.canceled) {
return;
}

if (!isMobile) {
const res = await fetch(result.uri);
const res = await fetch(result.assets[0].uri);
const blob = await res.blob();
const fileType = blob.type.split("/")[1];
const file = new File([blob], "photo." + fileType);
picture = file;
setPhoto(result);
setPhoto(result.assets[0]);
} else {
if (!result.cancelled) {
setPhoto(result);
const file = generateRNFile(result.uri, "file.jpg");
if (!result.canceled) {
setPhoto(result.assets[0]);
const file = generateRNFile(result.assets[0].uri, "file.jpg");
picture = file;
}
}
Expand Down
8 changes: 4 additions & 4 deletions app/routes/cars/AddCar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,20 +86,20 @@ export function AddCar() {
base64: false,
});

if (result.cancelled) {
if (result.canceled) {
return;
}

setValue("photo", result);
setValue("photo", result.assets[0]);

if (!isMobile) {
const res = await fetch(result.uri);
const res = await fetch(result.assets[0].uri);
const blob = await res.blob();
const fileType = blob.type.split("/")[1];
const file = new File([blob], "photo." + fileType);
picture = file;
} else {
const file = generateRNFile(result.uri, "file.jpg");
const file = generateRNFile(result.assets[0].uri, "file.jpg");
picture = file;
}
};
Expand Down
14 changes: 7 additions & 7 deletions app/routes/settings/EditProfile.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,24 +199,24 @@ export function EditProfileScreen() {
base64: false,
});

if (result.cancelled) {
if (result.canceled) {
return;
}

let picture;

if (!isMobile) {
const res = await fetch(result.uri);
const res = await fetch(result.assets[0].uri);
const blob = await res.blob();
const fileType = blob.type.split("/")[1];
const file = new File([blob], "photo." + fileType);
picture = file;
setPhoto(result);
setPhoto(result.assets[0]);
} else {
if (!result.cancelled) {
setPhoto(result);
const fileType = result.uri.split(".")[1];
const file = generateRNFile(result.uri, `file.${fileType}`);
if (!result.canceled) {
setPhoto(result.assets[0]);
const fileType = result.assets[0].uri.split(".")[1];
const file = generateRNFile(result.assets[0].uri, `file.${fileType}`);
picture = file;
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/utils/Apollo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
split,
} from "@apollo/client";

const ip = "192.168.1.181";
const ip = "localhost";

const wsUrl = __DEV__
? `ws://${ip}:3001/subscriptions`
Expand Down