Skip to content

Redux refactor #7

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
petermiles wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Redux refactor #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1583b2b
should have broken up
Jan 6, 2018
dc177c6
change modal
Jan 7, 2018
71ffb6e
Clean up android files. Start work on settings page
Jan 9, 2018
d782f60
profile refactored to redux, saved 27 lines 8)
Jan 9, 2018
bf97c20
profile refactored
Jan 9, 2018
f79174a
Merge branch 'master' into reduxRefactor
petermiles Jan 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions android/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
<uses-permission android:name="android.permission.VIBRATE"/>
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

<uses-sdk
android:minSdkVersion="16"
Expand Down
Binary file removed android/app/src/main/assets/fonts/Entypo.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed android/app/src/main/assets/fonts/EvilIcons.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed android/app/src/main/assets/fonts/Feather.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed android/app/src/main/assets/fonts/FontAwesome.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed android/app/src/main/assets/fonts/Foundation.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed android/app/src/main/assets/fonts/Ionicons.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed android/app/src/main/assets/fonts/MaterialIcons.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed android/app/src/main/assets/fonts/Octicons.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed android/app/src/main/assets/fonts/SimpleLineIcons.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed android/app/src/main/assets/fonts/Zocial.ttf
View file
Open in desktop
Binary file not shown.
4 changes: 4 additions & 0 deletions android/app/src/main/java/com/weshouldnetwork/MainApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import com.facebook.react.shell.MainReactPackage;
import com.facebook.soloader.SoLoader;
import com.lwansbrough.RCTCamera.RCTCameraPackage;
import com.imagepicker.ImagePickerPackage;

import io.invertase.firebase.RNFirebasePackage;
// optional packages - add/remove as appropriate
Expand Down Expand Up @@ -38,6 +39,9 @@ protected List<ReactPackage> getPackages() {
new MainReactPackage(),
new RNFirebasePackage(),
// add/remove these packages as appropriate
new ImagePickerPackage() // <-- add this line
// OR if you want to customize dialog style
new ImagePickerPackage(R.style.my_dialog_style)
new RNFirebaseAdMobPackage(),
new RNFirebaseAnalyticsPackage(),
new RNFirebaseAuthPackage(),
Expand Down
Binary file modified android/app/src/main/res/mipmap-hdpi/ic_launcher.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-mdpi/ic_launcher.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ buildscript {
dependencies {
classpath 'com.android.tools.build:gradle:2.2.3'
classpath 'com.google.gms:google-services:3.1.1'
classpath 'com.android.tools.build:gradle:2.2.+'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
Expand Down
Binary file added assets/play/ic_launcher.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/xxhdpi/ic_launcher.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/xxxhdpi/ic_launcher_APP.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion db/favoriteGet.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SELECT * FROM user_favorites JOIN user_data ON user_data.uid = user_favorites.favoriteuid WHERE userid = ${id};
SELECT * FROM user_favorites JOIN user_data ON user_data.uid = user_favorites.favoriteuid WHERE userid = ${id} ORDER BY user_favorites.id DESC;
9 changes: 8 additions & 1 deletion index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ import { createRootNavigator } from "./router";

import { checkAuth } from "./src/functions/auth";

import { Provider } from "react-redux";
import store from "./src/ducks/store";

export default class App extends React.Component {
constructor(props) {
super(props);
Expand All @@ -28,7 +31,11 @@ export default class App extends React.Component {
return null;
}
const Layout = createRootNavigator(signedIn);
return <Layout props={checkAuth} />;
return (
<Provider store={store}>
<Layout props={checkAuth} />
</Provider>
);
}
}

Expand Down
5 changes: 5 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,18 @@
"react-native-camera": "^0.12.0",
"react-native-easy-grid": "^0.1.15",
"react-native-firebase": "^3.1.1",
"react-native-image-picker": "^0.26.7",
"react-native-keyboard-aware-scroll-view": "^0.4.1",
"react-native-linkedin": "^1.3.1",
"react-native-material-textfield": "^0.11.0",
"react-native-qrcode": "^0.2.6",
"react-native-svg-animated-linear-gradient": "^0.1.8",
"react-native-swiper": "^1.5.13",
"react-navigation": "^1.0.0-beta.21",
"react-redux": "^5.0.6",
"redux": "^3.7.2",
"redux-devtools-extension": "^2.13.2",
"redux-promise-middleware": "^5.0.0",
"rn-placeholder": "^1.2.0",
"styled-components": "^2.2.4"
}
Expand Down
142 changes: 80 additions & 62 deletions router.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,43 @@
import { StackNavigator, TabNavigator } from 'react-navigation';
import AppOnBoard from './src/components/onBoarding/AppOnBoard/AppOnBoard';
import SignUpOnBoard from './src/components/onBoarding/SignUpOnBoard/SignUpOnBoard';
import EmailSignUp from './src/components/onBoarding/auth/signUp/EmailSignUp';
import Connect from './src/components/connect/Connect';
import Profile from './src/components/user/profile/Profile';
import Scan from './src/components/scan/Scan';
import FavoritesPage from './src/components/favorites/FavoritesPage';
import { StackNavigator, TabNavigator } from "react-navigation";
import AppOnBoard from "./src/components/onBoarding/AppOnBoard/AppOnBoard";
import SignUpOnBoard from "./src/components/onBoarding/SignUpOnBoard/SignUpOnBoard";
import EmailSignUp from "./src/components/onBoarding/auth/signUp/EmailSignUp";
import Connect from "./src/components/connect/Connect";
import Profile from "./src/components/user/profile/Profile";
import Scan from "./src/components/scan/Scan";
import FavoritesPage from "./src/components/favorites/FavoritesPage";

export const ScannedProfile = TabNavigator(
export const ProfilePage = StackNavigator(
{
Profile: {
screen: Profile,
path: '/profile/:user',
},
Settings: {
screen: Profile,
},
Info: {
screen: Profile,
},
},
{
initialRouteName: "Profile",
}
);

export const ScannedProfile = TabNavigator(
{
Profile: {
screen: ProfilePage,
path: "/profile/:user",
navigationOptions: {
tabBarLabel: 'Profile',
tabBarLabel: "Profile",
swipeEnabled: true,
},
},
Connect: {
screen: Connect,
navigationOptions: {
tabBarLabel: 'Connect',
tabBarLabel: "Connect",
},
},
},
Expand All @@ -29,13 +46,13 @@ export const ScannedProfile = TabNavigator(
swipeEnabled: true,
tabBarOptions: {
showLabel: true,
activeTintColor: 'white',
inactiveTintColor: 'white',
activeBackgroundColor: '#2196f3',
inactiveBackgroundColor: '#1e88e5',
activeTintColor: "white",
inactiveTintColor: "white",
activeBackgroundColor: "#2196f3",
inactiveBackgroundColor: "#1e88e5",
},
initialRouteName: 'Profile',
},
initialRouteName: "Profile",
}
);

export const SignedIn = TabNavigator(
Expand All @@ -45,17 +62,17 @@ export const SignedIn = TabNavigator(
},
Profile: {
screen: Profile,
path: '/profile/:user',
initialRouteParams: { user: 'test' },
path: "/profile/:user",
initialRouteParams: { user: "test" },
navigationOptions: {
tabBarLabel: 'Profile',
tabBarLabel: "Profile",
swipeEnabled: true,
},
},
Connect: {
screen: Connect,
navigationOptions: {
tabBarLabel: 'Connect',
tabBarLabel: "Connect",
},
},
},
Expand All @@ -66,48 +83,49 @@ export const SignedIn = TabNavigator(
tabBarOptions: {
showLabel: true,
indicatorStyle: {
backgroundColor: 'white',
backgroundColor: "white",
},
activeTintColor: 'white',
inactiveTintColor: 'white',
activeBackgroundColor: '#2196f3',
inactiveBackgroundColor: '#1e88e5',
activeTintColor: "white",
inactiveTintColor: "white",
activeBackgroundColor: "#2196f3",
inactiveBackgroundColor: "#1e88e5",
},
initialRouteName: 'Profile',
},
initialRouteName: "Profile",
}
);

export const createRootNavigator = (signedIn = false) => StackNavigator(
{
SignedIn: {
screen: SignedIn,
path: '/signedIn/:user',
initialRouteName: signedIn ? 'Profile' : 'SignedOut',
},
SignedOut: {
screen: AppOnBoard,
},
Scan: {
screen: Scan,
},
ScannedProfile: {
screen: ScannedProfile,
path: 'profile/:uid',
initialRouteName: 'Profile',
},
OnBoard: {
screen: AppOnBoard,
},
SignUpOnBoard: {
screen: SignUpOnBoard,
},
EmailSignUp: {
screen: EmailSignUp,
export const createRootNavigator = (signedIn = false) =>
StackNavigator(
{
SignedIn: {
screen: SignedIn,
path: "/signedIn/:user",
initialRouteName: signedIn ? "Profile" : "SignedOut",
},
SignedOut: {
screen: AppOnBoard,
},
Scan: {
screen: Scan,
},
ScannedProfile: {
screen: ScannedProfile,
path: "profile/:uid",
initialRouteName: "Profile",
},
OnBoard: {
screen: AppOnBoard,
},
SignUpOnBoard: {
screen: SignUpOnBoard,
},
EmailSignUp: {
screen: EmailSignUp,
},
},
},
{
headerMode: 'none',
mode: 'modal',
initialRouteName: signedIn ? 'SignedIn' : 'OnBoard',
},
);
{
headerMode: "none",
mode: "modal",
initialRouteName: signedIn ? "SignedIn" : "OnBoard",
}
);
Loading