diff --git a/front-end/components/auth/login.js b/front-end/components/auth/login.js
index d041e6f..a0b8f3a 100644
--- a/front-end/components/auth/login.js
+++ b/front-end/components/auth/login.js
@@ -51,7 +51,7 @@ const onSignIn = (props, dispatch) => {
dispatch(loginUser(props.email, props.password));
}
-// DEMO LOGINS
+// ---- DEMO LOGINS ----
// const demoLogin = (props, dispatch) => {
// dispatch(loginUser('AwesomeUser@awesome.com', 'awesome'));
// }
@@ -61,34 +61,34 @@ const onSignIn = (props, dispatch) => {
// }
const LSForm = props => {
- const { handleSubmit } = props;
- return (
-
-
-
-
-
-
- )
+ const { handleSubmit } = props;
+ return (
+
+
+
+
+
+
+ )
}
const warn = formProps => {
diff --git a/front-end/components/empty_view.js b/front-end/components/empty_view.js
new file mode 100644
index 0000000..ca7582e
--- /dev/null
+++ b/front-end/components/empty_view.js
@@ -0,0 +1,33 @@
+import React from 'react';
+import {
+ View,
+ Text,
+ StyleSheet,
+ Image
+} from 'react-native';
+import Dimensions from 'Dimensions';
+
+class EmptyView extends React.Component {
+
+ render() {
+ return (
+
+
+
+ );
+ };
+};
+
+const styles = StyleSheet.create({
+ container: {
+ flex:1
+ },
+ logo: {
+ width: Dimensions.get('window').width*.4,
+ height: Dimensions.get('window').width*.4,
+ margin: Dimensions.get('window').width*.2,
+ alignSelf: 'center'
+ }
+})
+
+export default EmptyView;
diff --git a/front-end/components/todos/todo_list.js b/front-end/components/todos/todo_list.js
index 1ec8ad6..5366933 100644
--- a/front-end/components/todos/todo_list.js
+++ b/front-end/components/todos/todo_list.js
@@ -12,7 +12,6 @@ import {
FlatList
} from 'react-native';
import Dimensions from 'Dimensions';
-
import {unauthUser, getTodos, deleteTodo, setTodos, createTodo} from '../../actions';
import TodoItem from './todo_item';
@@ -28,7 +27,6 @@ class TodoList extends React.Component {
this.addNewTodo = this.addNewTodo.bind(this);
this.onRefresh = this.onRefresh.bind(this);
-
}
componentDidMount() {
diff --git a/front-end/store/index.js b/front-end/store/index.js
index 9011795..2faae34 100644
--- a/front-end/store/index.js
+++ b/front-end/store/index.js
@@ -4,7 +4,7 @@ import {AsyncStorage} from 'react-native';
import {persistStore, autoRehydrate} from 'redux-persist';
import rootReducer from '../reducers/root_reducer';
-const configureStore = (initialState={}) => {
+const configureStore = (initialState) => {
let store = createStore(rootReducer, initialState, compose(
applyMiddleware(thunk),
autoRehydrate()
diff --git a/ios/Woven.xcodeproj/project.pbxproj b/ios/Woven.xcodeproj/project.pbxproj
index a6c23f0..2dc815a 100644
--- a/ios/Woven.xcodeproj/project.pbxproj
+++ b/ios/Woven.xcodeproj/project.pbxproj
@@ -38,6 +38,7 @@
2D02E4C91E0B4AEC006451C7 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3EA31DF850E9000B6D8A /* libReact.a */; };
2DCD954D1E0B4F2C00145EB5 /* WovenTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* WovenTests.m */; };
2F2F31F07D944B21B9ADF9C7 /* Roboto.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 60CDB28993FC469FA19F9BCE /* Roboto.ttf */; };
+ 3190AFBD1F94307B004A6209 /* icon-60@3x copy.png in Resources */ = {isa = PBXBuildFile; fileRef = 3190AFBC1F94307B004A6209 /* icon-60@3x copy.png */; };
416693C3197A439CB53B6092 /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 11D91337A5034329AF2680E5 /* Zocial.ttf */; };
547FE10257194E95A1034DE7 /* Ionicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BAB0328C396F4D7EBB429B8F /* Ionicons.ttf */; };
5551EC10FD0F4B7FABCA8070 /* Octicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 06D6B963419A4EEB85A490FD /* Octicons.ttf */; };
@@ -363,6 +364,7 @@
25B42BDC99CF497FA4385846 /* RNVectorIcons.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNVectorIcons.xcodeproj; path = "../node_modules/react-native-vector-icons/RNVectorIcons.xcodeproj"; sourceTree = ""; };
2D02E47B1E0B4A5D006451C7 /* Woven-tvOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Woven-tvOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
2D02E4901E0B4A5D006451C7 /* Woven-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Woven-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
+ 3190AFBC1F94307B004A6209 /* icon-60@3x copy.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "icon-60@3x copy.png"; path = "Woven/Images.xcassets/AppIcon.appiconset/icon-60@3x copy.png"; sourceTree = ""; };
377F03C0A7FF4B54A3FF9B0A /* RCTImageResizer.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RCTImageResizer.xcodeproj; path = "../node_modules/react-native-image-resizer/ios/RCTImageResizer.xcodeproj"; sourceTree = ""; };
3CA7AAEA34F543FDAE091C03 /* libRNFS.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNFS.a; sourceTree = ""; };
427D1918D71247A48DE5B938 /* Entypo.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Entypo.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Entypo.ttf"; sourceTree = ""; };
@@ -542,6 +544,7 @@
13B07FB51A68108700A75B9A /* Images.xcassets */,
13B07FB61A68108700A75B9A /* Info.plist */,
13B07FB11A68108700A75B9A /* LaunchScreen.xib */,
+ 3190AFBC1F94307B004A6209 /* icon-60@3x copy.png */,
13B07FB71A68108700A75B9A /* main.m */,
);
name = Woven;
@@ -1190,6 +1193,7 @@
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */,
BBF82A61EA484E2BB9FC25D8 /* Entypo.ttf in Resources */,
+ 3190AFBD1F94307B004A6209 /* icon-60@3x copy.png in Resources */,
EF237E79415D47359B3D861A /* EvilIcons.ttf in Resources */,
619605A5B50C40BCB26EDA2F /* FontAwesome.ttf in Resources */,
D04330159BDD47E89FDF3543 /* Foundation.ttf in Resources */,
@@ -1474,7 +1478,6 @@
2D02E4971E0B4A5E006451C7 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CLANG_ANALYZER_NONNULL = YES;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
@@ -1517,7 +1520,6 @@
2D02E4981E0B4A5E006451C7 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CLANG_ANALYZER_NONNULL = YES;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
diff --git a/ios/Woven/Base.lproj/LaunchScreen.xib b/ios/Woven/Base.lproj/LaunchScreen.xib
index aa67e27..d1e9edc 100644
--- a/ios/Woven/Base.lproj/LaunchScreen.xib
+++ b/ios/Woven/Base.lproj/LaunchScreen.xib
@@ -1,9 +1,14 @@
-
-
+
+
+
+
+
-
+
+
+
@@ -12,26 +17,18 @@
-
-
+
-
-
-
+
diff --git a/ios/Woven/Images.xcassets/AppIcon.appiconset/Contents.json b/ios/Woven/Images.xcassets/AppIcon.appiconset/Contents.json
index fd6012a..8246714 100644
--- a/ios/Woven/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/ios/Woven/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -3,7 +3,7 @@
{
"size" : "20x20",
"idiom" : "iphone",
- "filename" : "icon-20@2x.png",
+ "filename" : "icon-20@2x-1.png",
"scale" : "2x"
},
{
@@ -149,4 +149,4 @@
"version" : 1,
"author" : "xcode"
}
-}
+}
\ No newline at end of file
diff --git a/ios/Woven/Images.xcassets/AppIcon.appiconset/icon-20@2x-1.png b/ios/Woven/Images.xcassets/AppIcon.appiconset/icon-20@2x-1.png
new file mode 100644
index 0000000..76a0e5a
Binary files /dev/null and b/ios/Woven/Images.xcassets/AppIcon.appiconset/icon-20@2x-1.png differ
diff --git a/ios/Woven/Images.xcassets/AppIcon.appiconset/icon-60@3x copy.png b/ios/Woven/Images.xcassets/AppIcon.appiconset/icon-60@3x copy.png
new file mode 100644
index 0000000..8fb944a
Binary files /dev/null and b/ios/Woven/Images.xcassets/AppIcon.appiconset/icon-60@3x copy.png differ
diff --git a/ios/Woven/Images.xcassets/Contents.json b/ios/Woven/Images.xcassets/Contents.json
new file mode 100644
index 0000000..da4a164
--- /dev/null
+++ b/ios/Woven/Images.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/woven-icon.png b/woven-icon.png
new file mode 100644
index 0000000..c3f7b80
Binary files /dev/null and b/woven-icon.png differ