Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
58 changes: 29 additions & 29 deletions front-end/components/auth/login.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
// }
Expand All @@ -61,34 +61,34 @@ const onSignIn = (props, dispatch) => {
// }

const LSForm = props => {
const { handleSubmit } = props;
return (
<Container style={ styles.container }>
<Content style={ styles.content }>
<Image style={styles.logo} source={require('../../assets/icons/woven-logo-copy.png')} />
<Form style={ styles.form }>
<Field name="email" label="email" component={renderInput} />
<Field name="password" secureTextEntry={true} label="password" component={renderInput} />
<Grid style={styles.buttonGrid}>
<Col style={styles.buttonContainer}>
<Button
full
bordered
style={styles.signinButton}
transparent
onPress={handleSubmit(onSignIn)} >
<ButtonTextStyle>
<Text uppercase={false} style={styles.signinText}>
login
</Text>
</ButtonTextStyle>
</Button>
</Col>
</Grid>
</Form>
</Content>
</Container>
)
const { handleSubmit } = props;
return (
<Container style={ styles.container }>
<Content style={ styles.content }>
<Image style={styles.logo} source={require('../../assets/icons/woven-logo-copy.png')} />
<Form style={ styles.form }>
<Field name="email" label="email" component={renderInput} />
<Field name="password" secureTextEntry={true} label="password" component={renderInput} />
<Grid style={styles.buttonGrid}>
<Col style={styles.buttonContainer}>
<Button
full
bordered
style={styles.signinButton}
transparent
onPress={handleSubmit(onSignIn)} >
<ButtonTextStyle>
<Text uppercase={false} style={styles.signinText}>
login
</Text>
</ButtonTextStyle>
</Button>
</Col>
</Grid>
</Form>
</Content>
</Container>
)
}

const warn = formProps => {
Expand Down
33 changes: 33 additions & 0 deletions front-end/components/empty_view.js
Original file line number Diff line number Diff line change
@@ -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 (
<View>
<Image style={styles.logo} source={require('../assets/icons/woven-logo-copy.png')} />
</View>
);
};
};

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;
2 changes: 0 additions & 2 deletions front-end/components/todos/todo_list.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand All @@ -28,7 +27,6 @@ class TodoList extends React.Component {

this.addNewTodo = this.addNewTodo.bind(this);
this.onRefresh = this.onRefresh.bind(this);

}

componentDidMount() {
Expand Down
2 changes: 1 addition & 1 deletion front-end/store/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
6 changes: 4 additions & 2 deletions ios/Woven.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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 */; };
Expand Down Expand Up @@ -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 = "<group>"; };
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 = "<group>"; };
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 = "<group>"; };
3CA7AAEA34F543FDAE091C03 /* libRNFS.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNFS.a; sourceTree = "<group>"; };
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 = "<group>"; };
Expand Down Expand Up @@ -542,6 +544,7 @@
13B07FB51A68108700A75B9A /* Images.xcassets */,
13B07FB61A68108700A75B9A /* Info.plist */,
13B07FB11A68108700A75B9A /* LaunchScreen.xib */,
3190AFBC1F94307B004A6209 /* icon-60@3x copy.png */,
13B07FB71A68108700A75B9A /* main.m */,
);
name = Woven;
Expand Down Expand Up @@ -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 */,
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
27 changes: 12 additions & 15 deletions ios/Woven/Base.lproj/LaunchScreen.xib
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7702" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7701"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
<capability name="Unknown constraint types" minToolsVersion="5.1"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
Expand All @@ -12,26 +17,18 @@
<rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Powered by React Native" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
<rect key="frame" x="20" y="439" width="441" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Woven" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
<rect key="frame" x="20" y="140" width="441" height="43"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
<rect key="frame" x="20" y="139.5" width="441" height="44.5"/>
<fontDescription key="fontDescription" type="system" pointSize="37"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<color key="backgroundColor" red="0.89717288639354931" green="1" blue="0.90119042930887461" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
<constraints>
<constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC"/>
<constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk"/>
<constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Kzo-t9-V3l"/>
<constraint firstItem="8ie-xW-0ye" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="MfP-vx-nX0"/>
<constraint firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="ZEH-qu-HZ9"/>
<constraint firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="MfP-vx-nX0"/>
<constraint firstItem="kId-c2-rCX" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="fvb-Df-36g"/>
</constraints>
<nil key="simulatedStatusBarMetrics"/>
Expand Down
4 changes: 2 additions & 2 deletions ios/Woven/Images.xcassets/AppIcon.appiconset/Contents.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{
"size" : "20x20",
"idiom" : "iphone",
"filename" : "icon-20@2x.png",
"filename" : "icon-20@2x-1.png",
"scale" : "2x"
},
{
Expand Down Expand Up @@ -149,4 +149,4 @@
"version" : 1,
"author" : "xcode"
}
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions ios/Woven/Images.xcassets/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Binary file added woven-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.