Skip to content

Commit 963d942

Browse files
drewvolzhawkrives
authored andcommitted
Style changes to the Odds & Ends views (#178)
Cleaned up the JSON to have a little more formatting.
1 parent 1305c09 commit 963d942

File tree

5 files changed

+60
-8
lines changed

5 files changed

+60
-8
lines changed

data/credits.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
2-
"content": "All About Olaf is a collaborative application created by students and alumni of St. Olaf College in Northfield, MN under the name StoDevX. It is inspired by the original 'All About Olaf', an iOS application created by Drew Volz as an independent project. This version was written in the summer of 2016, led by Elijah Verdoorn and assisted by Hawken Rives and Drew Volz. The app is supported and published by the Student Government Association (SGA) web development team, called the Oleville Development Team.",
3-
"contributers": [
2+
"name": "All About Olaf",
3+
"content": "All About Olaf is a collaborative application created by students and alumni of St. Olaf College in Northfield, MN under the name StoDevX. It is inspired by the original 'All About Olaf', an iOS application created by Drew Volz as an independent project in 2014.\n\nThis version was written in the summer of 2016, led by Elijah Verdoorn and assisted by Hawken Rives and Drew Volz. The app is supported as well as published by the Student Government Association (SGA) web team, called the Oleville Development Team.",
4+
"contributors": [
45
"Elijah Verdoorn",
56
"Drew Volz",
67
"Hawken Rives",

data/privacy.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"text": "oleville.com and All About Olaf Privacy Policy\n This privacy policy has been compiled to better serve those who are concerned with how their 'Personally Identifiable Information' (PII) is being used online. PII, as described in US privacy law and information security, is information that can be used on its own or with other information to identify, contact, or locate a single person, or to identify an individual in context. Please read our privacy policy carefully to get a clear understanding of how we collect, use, protect or otherwise handle your Personally Identifiable Information in accordance with our website.\n What personal information do we collect from the people that visit our blog, website or app?\nWhen do we collect information?\nWe collect information from you when you register on our site or enter information on our site. Provide us with feedback on our products or services \nHow do we use your information?\n\nWe may use the information we collect from you when you register, make a purchase, sign up for our newsletter, respond to a survey or marketing communication, surf the website, or use certain other site features in the following ways:\n• To improve our website in order to better serve you.\nHow do we protect your information?\n\nOur website is scanned on a regular basis for security holes and known vulnerabilities in order to make your visit to our site as safe as possible. We use regular Malware Scanning. Your personal information is contained behind secured networks and is only accessible by a limited number of persons who have special access rights to such systems, and are required to keep the information confidential. In addition, all sensitive/credit information you supply is encrypted via Secure Socket Layer (SSL) technology. We implement a variety of security measures when a user places an order enters, submits, or accesses their information to maintain the safety of your personal information. All transactions are processed through a gateway provider and are not stored or processed on our servers.Do we use 'cookies'?\n\nWe do not use cookies for tracking purposes\nYou can choose to have your computer warn you each time a cookie is being sent, or you can choose to turn off all cookies. You do this through your browser settings. Since browser is a little different, look at your browser's Help Menu to learn the correct way to modify your cookies.\nIf you turn cookies off, some features will be disabled. that make your site experience more efficient and may not function properly.\nThird-party disclosure\n\nWe do not sell, trade, or otherwise transfer to outside parties your Personally Identifiable Information.\nThird-party linksn\n\nOccasionally, at our discretion, we may include or offer third-party products or services on our website. These third-party sites have separate and independent privacy policies. We therefore have no responsibility or liability for the content and activities of these linked sites. Nonetheless, we seek to protect the integrity of our site and welcome any feedback about these sites.\nCalifornia Online Privacy Protection Act\n\nCalOPPA is the first state law in the nation to require commercial websites and online services to post a privacy policy. The law's reach stretches well beyond California to require any person or company in the United States (and conceivably the world) that operates websites collecting Personally Identifiable Information from California consumers to post a conspicuous privacy policy on its website stating exactly the information being collected and those individuals or companies with whom it is being shared. - See more at: http://consumercal.org/california-online-privacy-protection-act-caloppa/#sthash.0FdRbT51.dpuf According to CalOPPA, we agree to the following:\nUsers can visit our site anonymously. Once this privacy policy is created, we will add a link to it on our home page or as a minimum, on the first significant page after entering our website. Our Privacy Policy link includes the word 'Privacy' and can be easily be found on the page specified above.\nYou will be notified of any Privacy Policy changes:\n• On our Privacy Policy Page\nCan change your personal information:\n• By calling us\n• By logging in to your account\nCOPPA (Children Online Privacy Protection Act)\n\nWhen it comes to the collection of personal information from children under the age of 13 years old, the Children's Online Privacy Protection Act (COPPA) puts parents in control. The Federal Trade Commission, United States' consumer protection agency, enforces the COPPA Rule, which spells out what operators of websites and online services must do to protect children's privacy and safety online.\nWe do not specifically market to children under the age of 13 years old.\nFair Information Practices\n\nThe Fair Information Practices Principles form the backbone of privacy law in the United States and the concepts they include have played a significant role in the development of data protection laws around the globe. Understanding the Fair Information Practice Principles and how they should be implemented is critical to comply with the various privacy laws that protect personal information.\nIn order to be in line with Fair Information Practices we will take the following responsive action, should a data breach occur:\nWe will notify you via email\n• Within 1 business day\nWe will notify the users via in-site notification\n• Within 1 business day\nWe also agree to the Individual Redress Principle which requires that individuals have the right to legally pursue enforceable rights against data collectors and processors who fail to adhere to the law. This principle requires not only that individuals have enforceable rights against data users, but also that individuals have recourse to courts or government agencies to investigate and/or prosecute non-compliance by data processors.\nCAN SPAM Act\nThe CAN-SPAM Act is a law that sets the rules for commercial email, establishes requirements for commercial messages, gives recipients the right to have emails stopped from being sent to them, and spells out tough penalties for violations.\nTo be in accordance with CANSPAM, we agree to the following:\n• Not use false or misleading subjects or email addresses.\n• Identify the message as an advertisement in some reasonable way.\n• Include the physical address of our business or site headquarters.\n• Monitor third-party email marketing services for compliance, if one is used.\n• Honor opt-out/unsubscribe requests quickly.\n• Allow users to unsubscribe by using the link at the bottom of each email.\n\nIf at any time you would like to unsubscribe from receiving future emails, you can email us at [email protected] and we will promptly remove you from ALL correspondence.\n\nContacting Us\nIf there are any questions regarding this privacy policy, you may contact us using the information below.\noleville.com\n1520 St. Olaf Ave.\nNorthfield, MN 55057\nUSA\[email protected]\n\nLast Edited on 2016-08-19"
2+
"text": "Oleville.com and All About Olaf Privacy Policy\n\nThis privacy policy has been compiled to better serve those who are concerned with how their 'Personally Identifiable Information' (PII) is being used online. PII, as described in US privacy law and information security, is information that can be used on its own or with other information to identify, contact, or locate a single person, or to identify an individual in context. Please read our privacy policy carefully to get a clear understanding of how we collect, use, protect or otherwise handle your Personally Identifiable Information in accordance with our website.\n\nWhat personal information do we collect from the people that visit our blog, website or app? When do we collect information?\n\nWe collect information from you when you register on our site or enter information on our site. Provide us with feedback on our products or services\n\nHow do we use your information?\n\nWe may use the information we collect from you when you register, make a purchase, sign up for our newsletter, respond to a survey or marketing communication, surf the website, or use certain other site features in the following ways:\n\n• To improve our website in order to better serve you.\n\nHow do we protect your information?\n\nOur website is scanned on a regular basis for security holes and known vulnerabilities in order to make your visit to our site as safe as possible. We use regular Malware Scanning. Your personal information is contained behind secured networks and is only accessible by a limited number of persons who have special access rights to such systems, and are required to keep the information confidential. In addition, all sensitive/credit information you supply is encrypted via Secure Socket Layer (SSL) technology. We implement a variety of security measures when a user places an order enters, submits, or accesses their information to maintain the safety of your personal information. All transactions are processed through a gateway provider and are not stored or processed on our servers.\n\nDo we use 'cookies'?\n\nWe do not use cookies for tracking purposes\n\nYou can choose to have your computer warn you each time a cookie is being sent, or you can choose to turn off all cookies. You do this through your browser settings. Since browser is a little different, look at your browser's Help Menu to learn the correct way to modify your cookies.\n\nIf you turn cookies off, some features will be disabled. that make your site experience more efficient and may not function properly.\n\nThird-party disclosure\n\nWe do not sell, trade, or otherwise transfer to outside parties your Personally Identifiable Information.\n\nThird-party links\n\nOccasionally, at our discretion, we may include or offer third-party products or services on our website. These third-party sites have separate and independent privacy policies. We therefore have no responsibility or liability for the content and activities of these linked sites. Nonetheless, we seek to protect the integrity of our site and welcome any feedback about these sites.\n\nCalifornia Online Privacy Protection Act\n\nCalOPPA is the first state law in the nation to require commercial websites and online services to post a privacy policy. The law's reach stretches well beyond California to require any person or company in the United States (and conceivably the world) that operates websites collecting Personally Identifiable Information from California consumers to post a conspicuous privacy policy on its website stating exactly the information being collected and those individuals or companies with whom it is being shared. - See more at: http://consumercal.org/california-online-privacy-protection-act-caloppa/#sthash.0FdRbT51.dpuf According to CalOPPA, we agree to the following:\n\nUsers can visit our site anonymously. Once this privacy policy is created, we will add a link to it on our home page or as a minimum, on the first significant page after entering our website. Our Privacy Policy link includes the word 'Privacy' and can be easily be found on the page specified above.\n\nYou will be notified of any Privacy Policy changes:\n\n• On our Privacy Policy Page\n\nCan change your personal information:\n\n• By calling us\n\n• By logging in to your account\n\nCOPPA (Children Online Privacy Protection Act)\n\nWhen it comes to the collection of personal information from children under the age of 13 years old, the Children's Online Privacy Protection Act (COPPA) puts parents in control. The Federal Trade Commission, United States' consumer protection agency, enforces the COPPA Rule, which spells out what operators of websites and online services must do to protect children's privacy and safety online.\n\nWe do not specifically market to children under the age of 13 years old.\n\nFair Information Practices\n\n\n\nThe Fair Information Practices Principles form the backbone of privacy law in the United States and the concepts they include have played a significant role in the development of data protection laws around the globe. Understanding the Fair Information Practice Principles and how they should be implemented is critical to comply with the various privacy laws that protect personal information.\n\nIn order to be in line with Fair Information Practices we will take the following responsive action, should a data breach occur:\n\nWe will notify you via email\n\n• Within 1 business day\n\nWe will notify the users via in-site notification\n\n• Within 1 business day\n\nWe also agree to the Individual Redress Principle which requires that individuals have the right to legally pursue enforceable rights against data collectors and processors who fail to adhere to the law. This principle requires not only that individuals have enforceable rights against data users, but also that individuals have recourse to courts or government agencies to investigate and/or prosecute non-compliance by data processors.\n\nCAN SPAM Act\n\nThe CAN-SPAM Act is a law that sets the rules for commercial email, establishes requirements for commercial messages, gives recipients the right to have emails stopped from being sent to them, and spells out tough penalties for violations.\n\nTo be in accordance with CANSPAM, we agree to the following:\n\n• Not use false or misleading subjects or email addresses.\n\n• Identify the message as an advertisement in some reasonable way.\n\n• Include the physical address of our business or site headquarters.\n\n• Monitor third-party email marketing services for compliance, if one is used.\n\n• Honor opt-out/unsubscribe requests quickly.\n\n• Allow users to unsubscribe by using the link at the bottom of each email.\n\nIf at any time you would like to unsubscribe from receiving future emails, you can email us at [email protected] and we will promptly remove you from ALL correspondence.\n\n\nContacting Us\n\nIf there are any questions regarding this privacy policy, you may contact us using the information below.\n\noleville.com\n1520 St. Olaf Ave.\nNorthfield, MN 55057\nUSA\[email protected]\n\n\nLast Edited on 2016-08-19\n\n"
33
}

views/settings/credits.js

Lines changed: 40 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,67 @@ import React from 'react'
33
import {
44
Text,
55
ScrollView,
6+
Image,
67
StyleSheet,
78
} from 'react-native'
89
import credits from '../../data/credits.json'
910

11+
let image = require('../../data/images/icons/ios/[email protected]')
12+
1013
const styles = StyleSheet.create({
1114
container: {
1215
flex: 1,
1316
marginLeft: 5,
1417
marginRight: 5,
18+
paddingBottom: 10,
1519
},
1620
aboutText: {
21+
paddingLeft: 25,
22+
paddingRight: 25,
23+
paddingTop: 10,
24+
lineHeight: 20,
25+
textAlign: 'justify',
26+
},
27+
title: {
28+
fontWeight: 'bold',
29+
alignSelf: 'center',
30+
fontSize: 18,
31+
paddingTop: 20,
32+
paddingBottom: 5,
33+
},
34+
logo: {
35+
width: 100,
36+
height: 100,
37+
margin: 20,
1738
marginBottom: 10,
39+
alignSelf: 'center',
1840
},
1941
nameList: {
20-
alignSelf: 'center',
42+
textAlign: 'center',
43+
paddingLeft: 25,
44+
paddingRight: 25,
45+
lineHeight: 20,
46+
},
47+
last: {
48+
marginBottom: 30,
2149
},
2250
})
2351

2452
export default function CreditsView() {
53+
let formattedContributors = credits.contributors.map(w => w.replace(' ', ' ')).join(' • ')
54+
let formattedAcks = credits.acknowledgements.map(w => w.replace(' ', ' ')).join(' • ')
2555
return (
2656
<ScrollView style={styles.container}>
57+
<Image source={image} style={styles.logo} />
58+
59+
<Text style={styles.title}>{credits.name}</Text>
2760
<Text style={styles.aboutText}>{credits.content}</Text>
28-
<Text style={styles.nameList}>Contributers: {credits.contributers}</Text>
29-
<Text style={styles.nameList}>Acknowledgements: {credits.acknowledgements}</Text>
61+
62+
<Text style={styles.title}>Contributors</Text>
63+
<Text style={styles.nameList}>{formattedContributors}</Text>
64+
65+
<Text style={styles.title}>Acknowledgements</Text>
66+
<Text style={[styles.nameList, styles.last]}>{formattedAcks}</Text>
3067
</ScrollView>
3168
)
3269
}

views/settings/legal.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,19 @@ const styles = StyleSheet.create({
1313
marginLeft: 5,
1414
marginRight: 5,
1515
},
16+
legal: {
17+
paddingLeft: 25,
18+
paddingRight: 25,
19+
paddingTop: 10,
20+
paddingBottom: 20,
21+
lineHeight: 20,
22+
},
1623
})
1724

1825
export default function LegalView() {
1926
return (
2027
<ScrollView style={styles.container}>
21-
<Text>{legal.content}</Text>
28+
<Text style={styles.legal}>{legal.content}</Text>
2229
</ScrollView>
2330
)
2431
}

views/settings/privacy.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,20 @@ const styles = StyleSheet.create({
1212
flex: 1,
1313
marginLeft: 5,
1414
marginRight: 5,
15+
paddingBottom: 10,
16+
},
17+
privacy: {
18+
paddingLeft: 25,
19+
paddingRight: 25,
20+
paddingTop: 10,
21+
lineHeight: 20,
1522
},
1623
})
1724

1825
export default function PrivacyView() {
1926
return (
2027
<ScrollView style={styles.container}>
21-
<Text>{privacy.text}</Text>
28+
<Text style={styles.privacy}>{privacy.text}</Text>
2229
</ScrollView>
2330
)
2431
}

0 commit comments

Comments
 (0)