Skip to content
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

Production #7

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

Production #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a719da8
adjusting README
Redrecovery9 Sep 21, 2017
4700efa
merging
Redrecovery9 Sep 21, 2017
01a3bca
merging
Redrecovery9 Sep 21, 2017
6fa00d0
fixing README
Redrecovery9 Sep 22, 2017
3b4e94b
touch up
Redrecovery9 Oct 2, 2017
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
Binary file modified .DS_Store
View file
Open in desktop
Binary file not shown.
7 changes: 7 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
# Raspberry-Pint
A mobile app that monitors the level of your keg, temperature, and will show details of the beer you're drinking. With just a click you can see all the details of the beer or you can see what the temperature of you keg is at as well as how full your keg is.

## API
- https://github.com/KCN8/Raspberry-Pint-RPI-Software
- https://github.com/KCN8/Raspberry-Pint-API

## Future Plans
- HardWare to work
Expand All @@ -24,6 +27,10 @@ A mobile app that monitors the level of your keg, temperature, and will show det
- Sweat
- Tears

## Screenshots
<img src="assets/Home_page.png" width="160"> <img src="assets/Kegs.png" width="160">
<img src="assets/Keg_stats.png" width="160"> <img src="assets/Contact.png" width="160">

## Mockups
<img src="assets/Home.png" width="160"> <img src="assets/Kegs on tap.png" width="160">
<img src="assets/Keg Status.png" width="160"> <img src="assets/Add keg.png" width="160">
Binary file modified assets/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added assets/Contact.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/Home_page.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/Keg_stats.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/Kegs.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.
172 changes: 140 additions & 32 deletions components/Contact.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,150 @@
import React, { Component } from 'react';
import { Image } from 'react-native';
import { Container, Header, Content, Card, CardItem, Thumbnail, Text, Button, Icon, Left, Body } from 'native-base';
import { Col, Row, Grid } from "react-native-easy-grid";
import { Container, Header, Content, Card, CardItem, Thumbnail, Text, Button, Icon, Left, Right, Body } from 'native-base';


export default class CardShowcaseExample extends Component {
render() {
return (
<Container>
<Content>
<Card style={{flex: 0}}>
<CardItem>
<Left>
<Thumbnail source={{uri: 'Image URL'}} />
<Body>
<Text>NativeBase</Text>
<Text note>April 15, 2016</Text>
</Body>
</Left>
</CardItem>
<CardItem>
<Body>
<Image source={{uri: 'Image URL'}} style={{height: 60, width: 60, flex: 1}}/>
<Text>
//Your text here
</Text>
</Body>
</CardItem>
<CardItem>
<Left>
<Button transparent textStyle={{color: '#87838B'}}>
<Icon name="logo-github" />
<Text>1,926 stars</Text>
</Button>
</Left>
</CardItem>
</Card>
</Content>
</Container>
<Grid>
<Col>
<Row>
<Content>
<Card style={{flex: 0, height:180}}>
<CardItem>
<Left>
<Thumbnail source={{uri: 'https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAAqjAAAAJDAyN2UyODAwLTk4MDUtNGIzYi04ZDFkLTMyMjhiNDY2NjA5Mw.jpg'}} />
<Body>
<Text style={{fontWeight: 'bold'}}>Hyunmo Yang</Text>
</Body>
</Left>
</CardItem>
<CardItem>
<Body>

<Text style={{fontSize:12}}>
<Icon name= "logo-github" />
/yhmgood0130
</Text>
<Text style={{fontSize:12}}>
<Icon name= "logo-linkedin" />
/in/hyunmoyang/
</Text>
</Body>
</CardItem>
</Card>
</Content>
</Row>
<Row>
<Content>
<Card style={{flex: 0, height:180}}>
<CardItem>
<Left>
<Thumbnail source={{uri: 'https://media.licdn.com/media/AAEAAQAAAAAAAAnGAAAAJDlmOWEyYTgyLTEwZGMtNDRjNS1hNDI5LTFjNTdiMTFkYjAwNQ.jpg'}} />
<Body>
<Text style={{fontWeight: 'bold'}}>Eric Wallen</Text>
</Body>
</Left>
</CardItem>
<CardItem>
<Body>

<Text style={{fontSize:12}}>
<Icon name= "logo-github" />
/ericwallen
</Text>
<Text style={{fontSize:12}}>
<Icon name= "logo-linkedin" />
/in/ericwallen/
</Text>
</Body>
</CardItem>
</Card>
</Content>
</Row>
<Row>
<Content>
<Card style={{flex: 0, height:169}}>
<CardItem>
<Left>
<Thumbnail source={{uri: 'https://media.licdn.com/media/AAEAAQAAAAAAAAzdAAAAJDZmN2YzZTcxLTE3YTktNDJhMy1hMzgzLWY4MzliZDNiNDRhMQ.jpg'}} />
<Body>
<Text style={{ fontWeight: 'bold' }}>Recardo Poole</Text>
</Body>
</Left>
</CardItem>
<CardItem>
<Body>
<Text style={{fontSize:12}}>
<Icon name= "logo-github" />
/MrPoole01
</Text>
<Text style={{fontSize:12}}>
<Icon name= "logo-linkedin" />
/in/recardo-poole/
</Text>
</Body>
</CardItem>
</Card>
</Content>
</Row>
</Col>
<Col>
<Row>
<Content>
<Card style={{flex: 0, height:269}}>
<CardItem>
<Left>
<Thumbnail style={{ height: 70, width: 70, borderRadius:35 }} source={{uri: 'https://media.licdn.com/media/AAEAAQAAAAAAAAuIAAAAJDZlZTFiMmZmLTkxMDktNDU0OC04NDUwLTc3YjU5NzQyMGQ0Yw.jpg'}} />
<Body>
<Text style={{ fontWeight: 'bold', fontSize: 16 }}>Casey Herold</Text>
</Body>
</Left>
</CardItem>
<CardItem>
<Body>
<Text style={{fontSize:14, marginBottom:10,marginTop:10}}>
<Icon name= "logo-github" style={{fontSize:40}} />
/KCN8
</Text>
<Text style={{fontSize:14}}>
<Icon name= "logo-linkedin" style={{fontSize:40}} />
/in/casey-herold/
</Text>
</Body>
</CardItem>
</Card>
</Content>
</Row>
<Row>
<Content>
<Card style={{flex: 0, height:260}}>
<CardItem>
<Left>
<Thumbnail style={{ height: 70, width: 70, borderRadius:35 }} source={{uri: 'https://media.licdn.com/media/AAEAAQAAAAAAAAuNAAAAJDI5MTgyMjFjLWQ4NDctNDdmOC05MmU2LTU1Nzg1MTUyMDViZg.jpg'}} />
<Body>
<Text style={{ fontWeight: 'bold', fontSize: 16 }}>Jonathan Sax</Text>
</Body>
</Left>
</CardItem>
<CardItem>
<Body>
<Text style={{fontSize:14, marginBottom:10,marginTop:10}}>
<Icon name= "logo-github" style={{fontSize:40}} />
/Redrecovery9
</Text>
<Text style={{fontSize:14}}>
<Icon name= "logo-linkedin" style={{fontSize:40}} />
/in/jonathan-sax/
</Text>
</Body>
</CardItem>
</Card>
</Content>
</Row>
</Col>
</Grid>
);
}
}
124 changes: 33 additions & 91 deletions components/KegList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,6 @@
import React, { Component } from 'react';
<<<<<<< HEAD
import { StyleSheet, Image } from 'react-native';
import { Container, Header, Footer, FooterTab, Content, Card, CardItem, Thumbnail, Text, Button, Icon, Left, Right, Body } from 'native-base';

export default class KegStatus extends Component {

constructor(props){
super(props);
}

render() {
return (


<Card style={{flex: 0}}>
<CardItem>
<Left>

<Body>
<Text style={{fontSize: 20, textAlign: 'center'}}>Keg {this.props.KegID}</Text>
<Text style={{fontSize: 26, textAlign: 'center'}}>{this.props.beerName}</Text>
<Text style={{textAlign: 'center', marginBottom: 20}}>Suggested Serving Temp: {this.props.servingTemp}</Text>
<Image
style={{width: 100, height: 100}}
source={{uri: this.props.beerPhoto}}
/>



<Text style={{marginTop: 25, marginBottom: 20}}>{this.props.BeerDescription}</Text>

<Text>Keg Size Liters: {this.props.KegSizeLiters}</Text>
<Text>liters Used: {this.props.litersUsed}</Text>

<Text>Keg Temp: {this.props.kegTemp}</Text>
=======
import { StyleSheet, Image, View, Item, Modal, TouchableHighlight } from 'react-native';
import { Container, Header, Footer, FooterTab, Content, Form, Card, CardItem, Thumbnail, Text, Button, Icon, Left, Body } from 'native-base';
import { Container, Header, Footer, FooterTab, Content, Form, Card, CardItem, Thumbnail, Text, Button, Icon, Left, Right, Body } from 'native-base';
import KegStatus from './KegStatus'


Expand All @@ -62,59 +26,42 @@ export default class KegList extends Component {
return (

<View>
<Card style={{flex: 0}}>
<CardItem>
<Left>

<Body>
<Text>{this.props.name}</Text>
<Text note>Sering Temp: {this.props.serving_temp}</Text>
>>>>>>> a1c09aad907af089eb538d100afb660ffc57c188
</Body>
</Left>
</CardItem>

<<<<<<< HEAD
<Card style={{flex: 0}}>
<CardItem>
<Left>


<CardItem>
<Left>
<Button style={{ marginLeft: 20, marginBottom: 20, marginTop: 20,}} textStyle={{color: '#87838B'}} onPress={(id) => this.props.deleteKeg(this.props.KegID)}>
<Icon name="beer" />
<Text>Delete Keg</Text>
</Button>
</Left>
<Right>
<Button style={{ backgroundColor: '#34A34F', marginLeft: 0, marginBottom: 20, marginTop: 20,}} textStyle={{color: '#87838B'}}>
<Icon name="beer" />
<Text>Change Keg</Text>
</Button>
</Right>
</CardItem>
</Card>


=======
<CardItem>
<Body>
<Text style={{fontSize: 20, textAlign: 'center'}}>Keg {this.props.KegID}</Text>
<Text style={{fontSize: 26, textAlign: 'center'}}>{this.props.beerName}</Text>
<Text style={{textAlign: 'center', marginBottom: 20}}>Suggested Serving Temp: {this.props.servingTemp}</Text>
<Image
source={{ uri: this.props.url }}
style={styles.image}/>
<Text style={{ marginTop: 10} }>
{this.props.description}
</Text>
style={{width: 100, height: 100}}
source={{uri: this.props.beerPhoto}}
/>
<Text style={{marginTop: 25, marginBottom: 20}}>{this.props.BeerDescription}</Text>
</Body>
</CardItem>

<CardItem>
<Left>
<Button textStyle={{color: '#87838B'}} style={{ marginLeft: 5 }} onPress={() => this.setModalVisible(true) }>
<Icon name="beer" />
<Text>Keg Status</Text>
</Button>
</Left>
</CardItem>
</Card>
</Left>
</CardItem>



<CardItem>
<Left>
<Button style={{ width: 130, marginLeft: 20, marginBottom: 20, marginTop: 20,}} textStyle={{color: '#87838B'}}
onPress={(id) => this.props.deleteKeg(this.props.KegID)}>
<Icon style={{ marginLeft: 10}} name="beer" />
<Text style={{ marginLeft: -20}} >Delete Keg</Text>
</Button>
</Left>
<Right>
<Button style={{ width: 130, backgroundColor: '#34A34F', marginLeft: 0, marginBottom: 20, marginTop: 20,}} textStyle={{color: '#87838B'}}
onPress={() => this.setModalVisible(true) }>
<Icon style={{ marginLeft: 10}} name="beer" />
<Text style={{ marginLeft: -20}}>Keg Status</Text>
</Button>
</Right>
</CardItem>
</Card>

<Modal
animationType="slide"
Expand All @@ -130,18 +77,13 @@ export default class KegList extends Component {
<KegStatus />
</Modal>
</View>
>>>>>>> a1c09aad907af089eb538d100afb660ffc57c188
);
}
}

const styles = StyleSheet.create({
container: {
<<<<<<< HEAD
// flex: 1,
=======
flex: 1,
>>>>>>> a1c09aad907af089eb538d100afb660ffc57c188
alignItems: 'stretch',
justifyContent: 'center',
},
Expand Down
9 changes: 5 additions & 4 deletions components/KegStatus.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ export default class KegStatus extends Component {
<Card style={{flex: 1}}>
<CardItem>
<Left>
<Thumbnail source={{uri: 'http://blog.patternbank.com/wp-content/uploads/2012/12/vintage-beer-labels-michigan-all-over-beer-02-700x733.jpg'}} />
<Thumbnail source={{uri: 'https://slack-imgs.com/?c=1&url=https%3A%2F%2Fstatic1.squarespace.com%2Fstatic%2F5519a5eae4b0d37c5805566b%2F553ea190e4b0e1b549d3fd21%2F5565fe80e4b02cc99128c794%2F1432747650173%2FMojo6Pack_WEB.jpg%3Fformat%3D750w'}} />
<Body>
<Text>Detroit Premium Beer</Text>
<Text>Mojo IPA</Text>
<Text note>ABV: 12%</Text>
</Body>
</Left>
Expand All @@ -40,7 +40,8 @@ export default class KegStatus extends Component {
source={{uri: 'https://images.duckduckgo.com/iu/?u=http%3A%2F%2Fwww.brewpalacekegbot.com%2Fstatic%2Fimages%2Fkeg%2Ffull%2Fkeg-srm14-3.png&f=1'}}
style={styles.image}/>
<Text>
//Your text here
Pints Remaining: 124
Temperature: 48
</Text>
</Body>
</CardItem>
Expand Down Expand Up @@ -71,7 +72,7 @@ const styles = StyleSheet.create({

height:200,
width: 200,
marginLeft: 40,
marginLeft: 60,
marginTop: 20,
}
});
2 changes: 0 additions & 2 deletions components/OnTap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ const baseURL = 'https://raspberry-pint-api.herokuapp.com'
}
}



async componentDidMount(){
const kegAndBeerResponse = await fetch(`${baseURL}/keg-and-beer`)
const kegAndBeerJSON = await kegAndBeerResponse.json()
Expand Down