Skip to content
This repository has been archived by the owner on Sep 20, 2019. It is now read-only.

Commit

Permalink
Merge pull request #67 from labs13-connect-kids/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
blkfltchr committed Jul 5, 2019
2 parents 368bb63 + cb9b45a commit a622c27
Show file tree
Hide file tree
Showing 72 changed files with 4,814 additions and 806 deletions.
6 changes: 4 additions & 2 deletions .expo-shared/assets.json
@@ -1,6 +1,8 @@
{
"78a98ada1895bfb44ee13d25037303ee2ff5d7ef44ae99b4b673d0d75ecd4d25": true,
"0951b12e98e6e659d3b2fc0ffc4a38132b16545b1296417ab99d2a1617b898bf": true,
"7adc6cdde1172c646f8dda7fcb1186d148e59e6d2a40774bd7e03281a653f19c": true,
"89ed26367cdb9b771858e026f2eb95bfdb90e5ae943e716575327ec325f39c44": true
"6bb3206b0acf2dcc4ac643efea102f020eab6923127f40db56165b27b151e9b9": true,
"d490dcf018953a1e713d87b14430562cb9669b0e0e6151e5757fdb32aaff504c": true,
"e9676a094e81d5e8ef64e6e385163269b285fffdaf75e53c9d5c241f97f10183": true,
"9c9be79f7d164ef23d16ee23a18024ff1e66a73cfe2af5a0b0c18bae8cd1165c": true
}
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -8,3 +8,4 @@ npm-debug.*
*.orig.*
web-build/
web-report/
environment.js
23 changes: 23 additions & 0 deletions ADR.md
@@ -0,0 +1,23 @@
# Title "ADR 1: Introduction of Redux"

Context This section describes the forces at play, including technological, political, social, and project local. These forces are probably in tension, and should be called out as such. The language in this section is value-neutral. It is simply describing facts.

Decision This section describes our response to these forces. It is stated in full sentences, with active voice. "We will ..."

Status A decision may be "proposed" if the project stakeholders haven't agreed with it yet, or "accepted" once it is agreed. If a later ADR changes or reverses a decision, it may be marked as "deprecated" or "superseded" with a reference to its replacement.

Consequences This section describes the resulting context, after applying the decision. All consequences should be listed here, not just the "positive" ones. A particular decision may have positive, negative, and neutral consequences, but all of them affect the team and project in the future.

The whole document should be one or two pages long. We will write each ADR as if it is a conversation with a future developer. This requires good writing style, with full sentences organized into paragraphs. Bullets are acceptable only for visual style, not as an excuse for writing sentence fragments. (Bullets kill people, even PowerPoint bullets.)

Status
Accepted.

Consequences
One ADR describes one significant decision for a specific project. It should be something that has an effect on how the rest of the project will run.

The consequences of one ADR are very likely to become the context for subsequent ADRs. This is also similar to Alexander's idea of a pattern language: the large-scale responses create spaces for the smaller scale to fit into.

Developers and project stakeholders can see the ADRs, even as the team composition changes over time.

The motivation behind previous decisions is visible for everyone, present and future. Nobody is left scratching their heads to understand, "What were they thinking?" and the time to change old decisions will be clear from changes in the project's context.
3 changes: 2 additions & 1 deletion App.js
Expand Up @@ -18,7 +18,8 @@ export default class App extends Component {

async componentDidMount() {
await Font.loadAsync({
[constants.fontFamily]: require('./assets/fonts/Futura-Light.otf')
[constants.fontFamily]: require('./assets/fonts/Futura-Light.otf'),
['Roboto_medium']: require('./assets/fonts/Roboto_medium.otf')
});
this.setState({ fontLoaded: true });
}
Expand Down
54 changes: 36 additions & 18 deletions README.md
Expand Up @@ -10,17 +10,11 @@ You can find the repo for the project at [connect our kids repo](https://github.
| [<img src="https://github.com/favicon.ico" width="15"> ](https://github.com/AsaOfDiamonds) | [<img src="https://github.com/favicon.ico" width="15"> ](https://github.com/rytwalker) | [<img src="https://github.com/favicon.ico" width="15"> ](https://github.com/NightlyD3V) | [<img src="https://github.com/favicon.ico" width="15"> ](https://github.com/maxgunter99) | [<img src="https://github.com/favicon.ico" width="15"> ](https://github.com/pedrolmr) | [<img src="https://github.com/favicon.ico" width="15"> ](https://github.com/wcolts2000) |
| [ <img src="https://static.licdn.com/sc/h/al2o9zrvru7aqj8e1x2rzsrca" width="15"> ](https://www.linkedin.com/in/shalom1/) | [ <img src="https://static.licdn.com/sc/h/al2o9zrvru7aqj8e1x2rzsrca" width="15"> ](https://www.linkedin.com/https://www.linkedin.com/in/ryan-walker-41082b47/) | [ <img src="https://static.licdn.com/sc/h/al2o9zrvru7aqj8e1x2rzsrca" width="15"> ](https://www.linkedin.com/in/tyler-spaulding-58337b132/) | [ <img src="https://static.licdn.com/sc/h/al2o9zrvru7aqj8e1x2rzsrca" width="15"> ](https://www.linkedin.com/in/michael-gunter-5383a0181/) | [ <img src="https://static.licdn.com/sc/h/al2o9zrvru7aqj8e1x2rzsrca" width="15"> ](https://www.linkedin.com/in/pedro-montesinos-64a247127/) | [ <img src="https://static.licdn.com/sc/h/al2o9zrvru7aqj8e1x2rzsrca" width="15"> ](https://www.linkedin.com/in/sean-pheneger-5393a089/) |

🚫 Optional examples of using badges with links for your tech stack, make sure to change these to fit your project

[![Swift Version][swift-image]][swift-url]
[![Build Status][travis-image]][travis-url]
[![License][license-image]][license-url]
[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
[![CocoaPods Compatible](https://img.shields.io/cocoapods/v/EZSwiftExtensions.svg)](https://img.shields.io/cocoapods/v/LFAlertController.svg)
[![Platform](https://img.shields.io/cocoapods/p/LFAlertController.svg?style=flat)](http://cocoapods.org/pods/LFAlertController)
[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com)

🚫 more info on using badges [here](https://github.com/badges/shields)
[![React Native Version][rn-image]][rn-url]
[![License][license-image]][license-url]


## Project Overview

Expand Down Expand Up @@ -64,11 +58,36 @@ People Search API [development api](https://dev.search.connectourkids.org/)
## Requirements

🚫 These are examples, make sure this matches your project's requirements

- iOS 8.0+
- Xcode 7.3
- Cocoa Pods
- iOS 10.0+
- Android 5.0+
- Axios https://www.npmjs.com/package/axios
- Expo https://docs.expo.io/versions/latest/introduction/faq/
- Expo-Constants https://www.npmjs.com/package/expo-constants
- Expo-Font https://www.npmjs.com/package/expo-font
- Native-Base https://www.npmjs.com/package/native-base
- React https://reactjs.org/
- React-Dom https://www.npmjs.com/package/react-dom
- React-Native https://github.com/facebook/react-native
- React-Native-Auth0 https://www.npmjs.com/package/react-native-auth0
- React-Native-Web https://github.com/necolas/react-native-web
- React-Navigation https://reactnavigation.org/
- React-Redux https://react-redux.js.org/
- Redux https://redux.js.org/
- Redux_Devtools-Extension https://www.npmjs.com/package/redux-devtools-extension
- Redux-Thunk https://www.npmjs.com/package/redux-thunk

## Recommended Tools

- Android Studio https://developer.android.com/studio
- Android Studio Emulator https://docs.expo.io/versions/latest/workflow/android-studio-emulator/
- Xcode https://developer.apple.com/xcode/
- iOS Simulator https://docs.expo.io/versions/v33.0.0/workflow/ios-simulator/

## Screen Flow

- part 1
![Screen Flow 1](screens1.PNG)
![Screen Flow 2](loginSignUpPaths.PNG)

## Contributing

Expand Down Expand Up @@ -119,9 +138,8 @@ These contribution guidelines have been adapted from [this good-Contributing.md-

See [People Search API](https://docs.google.com/document/d/1145R9-FcmA1NMXMAwbzFmNZ4DRtdWuazCsZYtJa8Owg/edit) for details on the backend of our project.

[swift-image]: https://img.shields.io/badge/swift-3.0-orange.svg
[swift-url]: https://swift.org/
[rn-image]: https://img.shields.io/badge/React%20Native-.60-blue.svg
[rn-url]: https://facebook.github.io/react-native/
[license-image]: https://img.shields.io/badge/License-MIT-blue.svg
[license-url]: LICENSE
[travis-image]: https://img.shields.io/travis/dbader/node-datadog-metrics/master.svg?style=flat-square
[travis-url]: https://travis-ci.org/dbader/node-datadog-metrics

12 changes: 9 additions & 3 deletions app.json
@@ -1,11 +1,12 @@
{
"expo": {
"name": "connectOurKids",
"name": "Connect Our Kids",
"slug": "connectOurKids",
"scheme": "connectourkids",
"privacy": "public",
"sdkVersion": "33.0.0",
"platforms": ["ios", "android", "web"],
"version": "1.0.0",
"version": "1.0.5",
"orientation": "portrait",
"icon": "./assets/icon.png",
"splash": {
Expand All @@ -18,7 +19,12 @@
},
"assetBundlePatterns": ["**/*"],
"ios": {
"supportsTablet": true
"supportsTablet": true,
"bundleIdentifier": "com.connectourkids.connect-our-kids"
},
"android": {
"package": "com.connectOurKids.connectOurKids",
"versionCode": 2
}
}
}
Binary file added assets/fonts/Roboto_medium.otf
Binary file not shown.
Binary file modified assets/icon.png
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/logoSmall.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/splash.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions connectOurKids_upload_cert.pem
@@ -0,0 +1,21 @@
-----BEGIN CERTIFICATE-----
MIIDaTCCAlGgAwIBAgIEVKbGSzANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJV
UzEJMAcGA1UECBMAMQkwBwYDVQQHEwAxCTAHBgNVBAoTADEJMAcGA1UECxMAMSow
KAYDVQQDEyFjb20uY29ubmVjdE91cktpZHMuY29ubmVjdE91cktpZHMwHhcNMTkw
NzAzMTgwNTM4WhcNNDYxMTE4MTgwNTM4WjBlMQswCQYDVQQGEwJVUzEJMAcGA1UE
CBMAMQkwBwYDVQQHEwAxCTAHBgNVBAoTADEJMAcGA1UECxMAMSowKAYDVQQDEyFj
b20uY29ubmVjdE91cktpZHMuY29ubmVjdE91cktpZHMwggEiMA0GCSqGSIb3DQEB
AQUAA4IBDwAwggEKAoIBAQCIVe7ziiVVCv7kc702/PCGcULCUy5x5C5+U1ylt9zY
TOOqVoQZfvCard2e1n1qtSVlHRPMcO815xPR7lMnZfa7uAtDo719yWRA5h0u7md0
YKoz3nWtO9miYiE7rtBtvKczWRJu2dZfj6vch7cKBmhBg42p8kQiCeqCai9GNd56
ja1njc/q4gPac1zI1DCzI+Q+io/oDjjxdaM6Dm8C3nTeDxu7TuHt1mk4nlHRw4n0
LYxLcOBI8x8Ib37VCk5u3704aZR/4Yo/dSwbq3wX/bXrzlnx+jGHWseT1Aek5jvi
YUyhcKmZ5MvzPoqv5hDes8tWaCPPkwK5F9b+D8fkqOjbAgMBAAGjITAfMB0GA1Ud
DgQWBBTXyJfm+gHo3kEkiWYQcmoe9sEzRDANBgkqhkiG9w0BAQsFAAOCAQEAWCId
2PAxFlFWBWI/Tl9KJzmGXYEyDkq4YcSi4FqVxQSF9+BeVre5mArv2ProtYvb0cTK
6trU3sqym7Al1/QupM0u6rbipwWbTuDK3LE8GApudQtohZKhZieTGpXWZcZXZHJo
5oDzngd+6JrOuP2A5zBuKeYsbAOiZISwNHoosdyV6HINqgoHfvl0+ba4CIRTI5FB
XdnujNnc+Qo4DxU0ayDb4NWzASu6YfEaGw6WAhFmztP+Lj2CVtn5BeST2kIFQM+a
VvokdgLB9caiH+3n4F35aozTW7rCZzmcIPbsw0/5WFwhCw2AZN3KQYExM8xdhP1p
eepG8MdE7WV5hbpv2g==
-----END CERTIFICATE-----
Binary file added loginSignUpPaths.PNG
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 package.json
Expand Up @@ -10,7 +10,9 @@
"dependencies": {
"axios": "^0.19.0",
"expo": "^33.0.0",
"expo-constants": "~5.0.1",
"expo-font": "~5.0.1",
"flatted": "^2.0.1",
"jwt-decode": "^2.2.0",
"native-base": "^2.12.1",
"react": "16.8.3",
Expand Down
Binary file added screens1.PNG
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 5 additions & 2 deletions src/UI/CustomText.js → src/UI/MainText.js
@@ -1,5 +1,6 @@
import React from 'react';
import { Text, StyleSheet } from 'react-native';
import constants from '../helpers/constants';

const CustomText = props => {
// by spreading props and styles in an array, we can pass it custom styles to override or add to these base styles when we use this component
Expand All @@ -12,8 +13,10 @@ const CustomText = props => {

const styles = StyleSheet.create({
mainText: {
color: '#0f0f0f',
backgroundColor: 'transparent'
fontFamily: constants.fontFamily,
fontSize: 18,
lineHeight: 26,
marginBottom: 20
}
});

Expand Down
77 changes: 77 additions & 0 deletions src/UI/NavigationButton.js
@@ -0,0 +1,77 @@
import React from 'react';
import { StyleSheet } from 'react-native';
import { Button, Text } from 'native-base';
import constants from '../helpers/constants';

const NavigationButton = ({ handlePress, subTitleText, style, titleText }) => {
return (
<Button
style={[styles.button, styles.primaryBtn, { ...style }]}
block
onPress={handlePress}
>
<Text style={[styles.primaryBtnText, styles.lightBtn]}>{titleText}</Text>
<Text style={[styles.buttonText, styles.lightBtn]}>{subTitleText}</Text>
</Button>
);
};

const styles = StyleSheet.create({
container: {
backgroundColor: '#fff',
padding: 20
},
mainText: {
fontFamily: constants.fontFamily,
fontSize: 18,
lineHeight: 26,
marginBottom: 5
},
videoText: {
color: constants.highlightColor,
fontWeight: 'bold',
marginBottom: 5
},
header: {
flexDirection: 'row',
alignItems: 'center',
justifyContent: 'space-between',
marginBottom: 25
},

button: {
justifyContent: 'space-between',
alignItems: 'center',
flexDirection: 'column',
justifyContent: 'center',
marginBottom: 10
},
primaryBtn: {
backgroundColor: constants.highlightColor
},
primaryBtnText: {
fontSize: 12,
textTransform: 'uppercase',
fontWeight: 'bold',
color: constants.highlightColor,
flex: 1
},
buttonText: {
color: constants.highlightColor,
fontSize: 12,
textTransform: 'uppercase'
},
lightBtn: {
color: '#fff'
},
lastBtn: {
marginBottom: 50
},
textInput: {
borderColor: 'black',
borderWidth: 1,
borderStyle: 'solid'
}
});

export default NavigationButton;
20 changes: 20 additions & 0 deletions src/UI/ScreenContainer.js
@@ -0,0 +1,20 @@
import React from 'react';
import { StyleSheet } from 'react-native';
import { Container } from 'native-base';

const ScreenContainer = props => {
return (
<Container style={[styles.container, { ...props.style }]}>
{props.children}
</Container>
);
};

const styles = StyleSheet.create({
container: {
backgroundColor: '#fff',
padding: 20
}
});

export default ScreenContainer;
70 changes: 70 additions & 0 deletions src/components/AuthModals/RegisterModalsContainer.js
@@ -0,0 +1,70 @@
import React from 'react';
import { View, Modal, StyleSheet, Dimensions } from 'react-native';
import SocialWorkerModal from './SocialWorkerModal';
import VideoAgreeModal from './VideoAgreeModal';
import VideoModal from './VideoModal';
import constants from '../../helpers/constants';
import { sendEvent } from './../../helpers/createEvent';

const RegisterModalsContainer = props => {
return (
<Modal
animationType="slide"
transparent={false}
visible={props.modalVisible}
onRequestClose={() => {
props.setModalVisible(false);
}}
>
<View style={styles.marginTop}>
<View>
{props.modalVisible && !props.videoAgree && !props.videoVisible && (
<SocialWorkerModal
modalVisible={props.modalVisible}
advanceModal={props.setAgreeModalVisible}
setModalVisible={props.setModalVisible}
sendEvent={sendEvent}
/>
)}
{!props.videoVisible && props.videoAgree && (
<VideoAgreeModal
modalVisible={props.modalVisible}
advanceModal={props.setVideoPlayerModalVisible}
setModalVisible={props.setModalVisible}
onLogin={props.onLogin}
sendEvent={sendEvent}
/>
)}
{!props.videoAgree && props.videoVisible && (
<VideoModal
setModalVisible={props.setModalVisible}
onLogin={props.onLogin}
sendEvent={sendEvent}
/>
)}
</View>
</View>
</Modal>
);
};

const styles = StyleSheet.create({
marginTop: {
marginTop: 22
},
logo: {
width: Dimensions.get('window').width - 40,
height: 100
},
button: {
justifyContent: 'center',
alignItems: 'center',
flexDirection: 'row',
backgroundColor: constants.highlightColor
},
btnText: {
color: '#fff'
}
});

export default RegisterModalsContainer;

0 comments on commit a622c27

Please sign in to comment.