From 3b842be5c9eee1a9e717d9d0582fbbdbba03b9a6 Mon Sep 17 00:00:00 2001
From: Emily Liu <emilyliu@Emilys-MBP.fios-router.home>
Date: Fri, 20 Nov 2020 02:44:02 -0500
Subject: [PATCH] poll pg (no css?) + styling

---
 app/Announcements.js     |  2 +-
 app/Clubs.js             |  4 ++--
 app/LunchEvents.js       |  4 ++--
 app/Poll.js              | 15 +++++++++++----
 app/SSLOps.js            |  4 ++--
 app/Staff.js             |  2 +-
 app/StudentWeek.js       | 32 +++++++++++++++++++++++++-------
 app/styles/liststyles.js | 12 +++++++++++-
 8 files changed, 55 insertions(+), 20 deletions(-)

diff --git a/app/Announcements.js b/app/Announcements.js
index fa65493..2261c5d 100644
--- a/app/Announcements.js
+++ b/app/Announcements.js
@@ -55,7 +55,7 @@ function TeacherButton(props) {
 	return (
 		<View style={[styles.item1,{flexDirection:'row'}]}>
 		  <TouchableOpacity style={{flex:1}} onPress={()=>{props.navigation.navigate('TeacherList',{data:props.data,name:props.name})}} activeOpacity={0.8}>
-			<Text style={styles.title}>{props.name}</Text>
+			<Text style={styles.title3}>{props.name}</Text>
 		  </TouchableOpacity>
 		  {props.icon?<Icon.Button color={color} name="star" size={30} style={{alignSelf:'center'}} backgroundColor="white" onPress={()=>{setColor(color=='#dba309'?'lightgrey':'#dba309');props.addFavorite(props.name)}}/>:<></>}
 		</View>
diff --git a/app/Clubs.js b/app/Clubs.js
index 926058e..b3589d3 100644
--- a/app/Clubs.js
+++ b/app/Clubs.js
@@ -34,7 +34,7 @@ const Stack = createStackNavigator();
 export const ClubInfo = ({route}) => {
   const item = route.params;
   return (
-    <View style = {{padding: 10}}>
+    <View style = {{padding: 10, backgroundColor: 'white', height: '100%'}}>
       <View style ={styles.infoContainer}>
         <Text style = {styles.title1}>Meeting Time and Day: </Text>
         <Text style = {{fontSize:20}}>{item.meeting}</Text>
@@ -57,7 +57,7 @@ function ClubElement (props) {
       <TouchableOpacity style={styles.item1} onPress={()=>props.navigation.navigate('ClubInfo', {data:props.data,name:props.name,meeting:item.meeting,link:item.link,sponsor:item.sponsor})} activeOpacity={0.8}>
         <View style = {{display: 'flex', flexDirection: 'row', alignItems: 'center'}}>
           <Image source = {require('./assets/clubs.png')} style = {{height: 40, width: 40, marginRight: 10}}/>
-          <Text style={styles.title}>{props.item.name}</Text>
+          <Text style={styles.title3}>{props.item.name}</Text>
         </View>
         
       </TouchableOpacity>
diff --git a/app/LunchEvents.js b/app/LunchEvents.js
index 1be04d5..fa82372 100644
--- a/app/LunchEvents.js
+++ b/app/LunchEvents.js
@@ -27,7 +27,7 @@ const Stack = createStackNavigator();
 export const LunchInfo = ({route}) => {
     const item = route.params;
     return (
-      <View style = {{padding: 10}}>
+      <View style = {{padding: 10, backgroundColor: 'white', height: '100%'}}>
         <View style ={styles.infoContainer}>
             <Text style = {styles.title1}>Description: </Text>
             <Text style = {styles.title}>{item.text}</Text>
@@ -47,7 +47,7 @@ function LunchEvent (props) {
             <TouchableOpacity style={styles.item1} onPress={()=>props.navigation.navigate('LunchInfo', {data:props.data,name:item.title,text:item.text,loc:item.loc})} activeOpacity={0.8}>
             <View style = {{display: 'flex', flexDirection: 'row', alignItems: 'center'}}>
                 <Image source = {require('./assets/lunch.png')} style = {{height: 40, width: 40, marginRight: 10}}/>
-                <Text style={styles.title}>{item.title}</Text>
+                <Text style={styles.title3}>{item.title}</Text>
             </View>
             </TouchableOpacity>
         </View>
diff --git a/app/Poll.js b/app/Poll.js
index 71cc40a..153a1af 100644
--- a/app/Poll.js
+++ b/app/Poll.js
@@ -15,13 +15,20 @@ import {
   DebugInstructions,
   ReloadInstructions,
 } from 'react-native/Libraries/NewAppScreen';
-
+import {WebView} from 'react-native-webview';
 class Poll extends React.Component {
 	render() {
 		return (
-			<View>
-			
-			</View>
+			<WebView
+        source = {{uri: 'https://docs.google.com/forms/d/e/1FAIpQLSfR0XP2yo3TV3egz7aMok56wnP9kG4FQt2v3rHrrayf8uC7Vw/viewform?usp=sf_link'}}
+        javaScriptEnabled={true}
+        domStorageEnabled={true}
+        startInLoadingState={true}
+        style={{marginTop: 20}}
+        cacheEnabled={true}
+        
+      />
+      
 		)
 	}
 }
diff --git a/app/SSLOps.js b/app/SSLOps.js
index d0818bb..231cdfb 100644
--- a/app/SSLOps.js
+++ b/app/SSLOps.js
@@ -29,7 +29,7 @@ export const SSLInfo = ({route}) => {
 	const item = route.params;
 	console
 	return (
-		<View style = {{padding: 10}}>
+		<View style = {{padding: 10, backgroundColor: 'white', height: '100%'}}>
 			<View style ={styles.infoContainer}>
 				<Text style = {styles.title1}>Description: </Text>
 				<Text style = {styles.title}>{item.text}</Text>
@@ -53,7 +53,7 @@ function SSLElement (props) {
 			<TouchableOpacity style={styles.item1} onPress={()=>props.navigation.navigate('SSLInfo', {data: props.data, name: item.item.title, text: item.item.text, loc:item.item.loc, teacher: item.item.teacher})} activeOpacity={0.8}>
 				<View style = {{display: 'flex', flexDirection: 'row', alignItems: 'center'}}>
 					<Image source = {require('./assets/sslopps.png')} style = {{height: 40, width: 40, marginRight: 10}}/>
-					<Text style={styles.title}>{item.item.title}</Text>
+					<Text style={styles.title3}>{item.item.title}</Text>
 				</View>
 			</TouchableOpacity>
 		</View>
diff --git a/app/Staff.js b/app/Staff.js
index fd80445..bb65e29 100644
--- a/app/Staff.js
+++ b/app/Staff.js
@@ -32,7 +32,7 @@ const StaffElement = ({item}) => {
 	  <TouchableOpacity style={styles.item1} onPress={()=>setVisible(!visible)} activeOpacity={0.8}>
     <View style = {{display: 'flex', flexDirection: 'row', alignItems: 'center'}}>
       <Image source = {require('./assets/staff.png')} style = {{height: 40, width: 40, marginRight: 10}}/>
-      <Text style={styles.title}>{item.item.name}</Text>
+      <Text style={styles.title3}>{item.item.name}</Text>
     </View>
 		{visible?extra:<></>}
 	  </TouchableOpacity>
diff --git a/app/StudentWeek.js b/app/StudentWeek.js
index 924044c..8c3aa25 100644
--- a/app/StudentWeek.js
+++ b/app/StudentWeek.js
@@ -45,13 +45,31 @@ class StudentWeek extends React.Component {
 		} else {
 			const iconURI = this.state.data.icon !== undefined?`data:image/png;charset=utf-8;base64,${this.state.data.icon}`:'';
 			return (
-				<View style={{paddingTop:'5%',paddingLeft:'10%',paddingRight:'10%'}}>
-					<Text style={{fontSize:32,marginBottom:'10%',textAlign:'center'}}>{this.state.data.name}</Text>
-					<Image style = {{height: '50%', width:'100%'}}source={{uri:iconURI}} />
-					<View style = {{paddingTop:'5%'}}>
-						<Text style={{fontSize: 20}}>Grade {this.state.data.year}</Text>
-						<Text style={{fontSize: 20}}>{"\n"}Hobbies: {this.state.data.hobbies}</Text>
-						<Text style={{fontSize: 20}}>{"\n"}Achievements: {this.state.data.achievements}</Text>
+				<View style={{paddingTop:'5%',paddingHorizontal:'10%', backgroundColor: 'white', height: '100%'}}>
+					<View style = {{display: 'flex', flexDirection: 'row', justifyContent: 'space-between'}}>
+						<View>
+							<Text style={{fontSize:28,marginBottom:'10%',textAlign:'center'}}>{this.state.data.name}</Text>	
+							<Text style={{fontSize:20}}>{'\t'}Grade {this.state.data.year}</Text>
+						</View>
+						<View style = {{height: 150, width: 150}}>
+							<Image style = {{height: '100%', width:'100%', borderRadius: 6}}source={{iconURI}} />
+						</View>
+						
+					</View>
+					
+					<View style = {{paddingTop:'10%', height: '55%', display: 'flex', flexDirection: 'column', justifyContent: 'space-between'}}>
+						<View>
+							<Text style={{fontSize: 20, fontWeight: 'bold'}}>{"\n"}Hobbies</Text>
+							<Text style={{fontSize: 20}}>{'\t'}{this.state.data.hobbies}</Text>
+						</View>
+						<View>
+							<Text style={{fontSize: 20, fontWeight: 'bold'}}>{"\n"}Achievements </Text>
+							<Text style={{fontSize: 20}}>{'\t'}{this.state.data.achievements}</Text>
+						</View>
+						<View>
+							<Text style={{fontSize: 20, fontWeight: 'bold'}}>{"\n"}Message</Text>
+							<Text style={{fontSize: 20}}>{'\t'}{this.state.data.messages}</Text>
+						</View>
 					</View>
 					
 				</View>
diff --git a/app/styles/liststyles.js b/app/styles/liststyles.js
index 2527b12..a6c4313 100644
--- a/app/styles/liststyles.js
+++ b/app/styles/liststyles.js
@@ -19,7 +19,7 @@ const styles = StyleSheet.create({
     width: '100%',
   },
   title: {
-    fontSize: 28,
+    fontSize: 20,
   },
   date: {
 	  fontSize:12,
@@ -40,6 +40,9 @@ const styles = StyleSheet.create({
     textDecorationStyle: "solid",
     textDecorationColor: "red",
   },
+  title3: {
+    fontSize: 28,
+  },
   link: {
     fontSize: 28,
     textDecorationLine: 'underline',
@@ -51,6 +54,13 @@ const styles = StyleSheet.create({
     borderRadius: 6,
     padding: 5,
     marginBottom: 10,
+    shadowColor: "black",
+		shadowOffset: {
+			width: 0,
+			height: 0
+		},
+		shadowOpacity: 0.3,
+		shadowRadius: 3,
   },
   headerTitle: {
     fontSize: 24,