diff --git a/.prettierrc.js b/.prettierrc.js index fb4a66a..86f023e 100644 --- a/.prettierrc.js +++ b/.prettierrc.js @@ -1,8 +1,4 @@ module.exports = { - arrowParens: 'avoid', - bracketSameLine: true, - bracketSpacing: false, printWidth: 120, singleQuote: true, - trailingComma: 'all', }; \ No newline at end of file diff --git a/android/app/build.gradle b/android/app/build.gradle index 04b1464..e927dc1 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -1,4 +1,5 @@ apply plugin: "com.android.application" +apply from: project(':react-native-config').projectDir.getPath() + "/dotenv.gradle" import com.android.build.OutputFile import org.apache.tools.ant.taskdefs.condition.Os diff --git a/android/app/src/main/java/no/neuf/chateau/MainApplication.java b/android/app/src/main/java/no/neuf/chateau/MainApplication.java index 641ccd7..6adcb72 100644 --- a/android/app/src/main/java/no/neuf/chateau/MainApplication.java +++ b/android/app/src/main/java/no/neuf/chateau/MainApplication.java @@ -4,6 +4,7 @@ import android.app.Application; import android.content.Context; import com.facebook.react.PackageList; import com.facebook.react.ReactApplication; +import com.lugg.ReactNativeConfig.ReactNativeConfigPackage; import com.facebook.react.ReactInstanceManager; import com.facebook.react.ReactNativeHost; import com.facebook.react.ReactPackage; diff --git a/package.json b/package.json index fd0e091..9f88b59 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "react-is": "^17.0.2", "react-native": "0.68.2", "react-native-confetti": "^0.1.0", - "react-native-config": "^0.11.7", + "react-native-config": "^1.4.6", "react-native-gesture-handler": "^1.2.1", "react-native-htmlview": "^0.14.0", "react-native-safe-area-context": "^3.3.2", diff --git a/src/App.js b/src/App.js index cca1de5..023b0d2 100644 --- a/src/App.js +++ b/src/App.js @@ -1,15 +1,15 @@ import React from 'react'; -import {Provider} from 'react-redux'; -import {PersistGate} from 'redux-persist/integration/react'; +import { Provider } from 'react-redux'; +import { PersistGate } from 'redux-persist/integration/react'; import Config from 'react-native-config'; -import {ApolloClient, HttpLink, InMemoryCache, ApolloProvider} from '@apollo/client'; +import { ApolloClient, HttpLink, InMemoryCache, ApolloProvider } from '@apollo/client'; // import { StripeProvider } from '@stripe/stripe-react-native'; import Dusken from './Dusken'; -import {store, persistor} from './reduxStore'; +import { store, persistor } from './reduxStore'; const apolloClient = new ApolloClient({ - link: new HttpLink({uri: `${Config.DUSKEN_API_URL}/api/graphql/`}), + link: new HttpLink({ uri: `${Config.DUSKEN_API_URL}/api/graphql/` }), cache: new InMemoryCache(), }); diff --git a/src/modules/membership/Proof.js b/src/modules/membership/Proof.js index 7828371..ef23184 100644 --- a/src/modules/membership/Proof.js +++ b/src/modules/membership/Proof.js @@ -145,7 +145,6 @@ const Proof = ({ onLogoutPress, user, fetchUser, isFetchingUserData }) => { }; if (!user) { - console.log('🔥', user); return ( No user! diff --git a/yarn.lock b/yarn.lock index 0011775..31ceb78 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8340,10 +8340,10 @@ react-native-confetti@^0.1.0: resolved "https://registry.yarnpkg.com/react-native-confetti/-/react-native-confetti-0.1.0.tgz#9ec93c07f845de5ebeaed700043fd5218792b6f1" integrity sha512-+cXJvnPXKc0i/eTQcuzcjrlfIxmn/xFw4UyuVKQOWNK6BfWABvO6Ms6Zp6ivF1E8Vxt2vJkzJlNyoBvMh9FxKA== -react-native-config@^0.11.7: - version "0.11.7" - resolved "https://registry.yarnpkg.com/react-native-config/-/react-native-config-0.11.7.tgz#a2b323f2ecd76a4df88cbb6bc86eaa2ef9febee7" - integrity sha512-dn5s+zhwLyE25vRT/vaEtLk/j8ZL1UZKvejORNDWakSwpOnLmFurFeaZV83IqkPlfWHXHFdsYe2IRYG1WN4WkQ== +react-native-config@^1.4.6: + version "1.4.6" + resolved "https://registry.yarnpkg.com/react-native-config/-/react-native-config-1.4.6.tgz#2aefebf4d9cf02831e64bbc1307596bd212f6d42" + integrity sha512-cSLdOfva2IPCxh6HjHN1IDVW9ratAvNnnAUx6ar2Byvr8KQU7++ysdFYPaoNVuJURuYoAKgvjab8ZcnwGZIO6Q== react-native-gesture-handler@^1.2.1: version "1.10.3"