diff --git a/app/Calendar.js b/app/Calendar.js index f2ba83a..8ee5bc7 100644 --- a/app/Calendar.js +++ b/app/Calendar.js @@ -32,6 +32,7 @@ const Event = ({item}) => { const [visible, setVisible] = useState(false) const date = item.item.date.split('-') const today = new Date(getCurrentDate()) + const week = new Date().setDate(new Date().getDate() - 8) const itemDate = new Date(item.item.date) const extra = ( @@ -56,7 +57,7 @@ const Event = ({item}) => { ) } - else { + else if (itemDate >= week){ return ( setVisible(!visible)} activeOpacity={0.8}> @@ -72,7 +73,11 @@ const Event = ({item}) => { ) } - + else { + return ( + null + ) + } } class Calendar extends React.Component { diff --git a/app/Images.js b/app/Images.js new file mode 100644 index 0000000..5a3c879 --- /dev/null +++ b/app/Images.js @@ -0,0 +1,33 @@ +import React, { useState } from 'react'; +import { + SafeAreaView, + StyleSheet, + ScrollView, + View, + Text, + StatusBar, + Modal, + TouchableHighlight, + Image, +} from 'react-native'; + +import { + Header, + LearnMoreLinks, + Colors, + DebugInstructions, + ReloadInstructions, +} from 'react-native/Libraries/NewAppScreen'; +import styles from './styles/morestyles' + +const Images = { + sslopps: require('./assets/sslopps.png'), + lunch: require('./assets/lunch.png'), + settings:require('./assets/settings.png'), + challenge:require('./assets/challenge.png'), + student:require('./assets/student.png'), + announcements:require('./assets/announcements.png'), + resources:require('./assets/resources.png'), +} + +export default Images; \ No newline at end of file diff --git a/app/More.js b/app/More.js index f06a9ef..7a28bdd 100644 --- a/app/More.js +++ b/app/More.js @@ -7,7 +7,8 @@ import { Text, StatusBar, FlatList, - TouchableOpacity + TouchableOpacity, + Image, } from 'react-native'; import { @@ -28,6 +29,8 @@ import StudentWeek from './StudentWeek' import SSLOps, {SSLInfo} from './SSLOps' import LunchEvents, {LunchInfo} from './LunchEvents' import ChallengeWeek from './ChallengeWeek' +import Settings from './Settings' +import Images from './Images' import LinearGradient from 'react-native-linear-gradient' const Stack = createStackNavigator() @@ -43,15 +46,18 @@ class MoreSwitch extends React.Component { + this.props.navigation.navigate(item.key)}> + {item.name} } @@ -121,7 +127,7 @@ class More extends React.Component { }} /> background }} /> + background + }} + /> + + + ) + } +} +export default Settings; \ No newline at end of file diff --git a/app/assets/announcements.png b/app/assets/announcements.png new file mode 100644 index 0000000..7ccebef Binary files /dev/null and b/app/assets/announcements.png differ diff --git a/app/assets/challenge.png b/app/assets/challenge.png new file mode 100644 index 0000000..8825756 Binary files /dev/null and b/app/assets/challenge.png differ diff --git a/app/assets/lunch.png b/app/assets/lunch.png index b22878c..6143c9a 100644 Binary files a/app/assets/lunch.png and b/app/assets/lunch.png differ diff --git a/app/assets/resources.png b/app/assets/resources.png new file mode 100644 index 0000000..54b1055 Binary files /dev/null and b/app/assets/resources.png differ diff --git a/app/assets/settings.png b/app/assets/settings.png new file mode 100644 index 0000000..fb4cb56 Binary files /dev/null and b/app/assets/settings.png differ diff --git a/app/assets/sslopps.png b/app/assets/sslopps.png index 4af2185..636e073 100644 Binary files a/app/assets/sslopps.png and b/app/assets/sslopps.png differ diff --git a/app/assets/student.png b/app/assets/student.png new file mode 100644 index 0000000..1658eca Binary files /dev/null and b/app/assets/student.png differ diff --git a/app/styles/morestyles.js b/app/styles/morestyles.js index de9c3d3..b1c0bf7 100644 --- a/app/styles/morestyles.js +++ b/app/styles/morestyles.js @@ -9,13 +9,15 @@ const styles=StyleSheet.create({ borderBottomColor:'white', borderBottomWidth:0.5, height: Dimensions.get('window').height*0.075, - justifyContent:'center', paddingLeft: '3%', fontSize: 32, + display: 'flex', + flexDirection: 'row', + alignItems: 'center', }, moretext: { - color:'#eee', - fontSize:20, + color:'#e3e3e3', + fontSize:22, }, headerTitle: { fontWeight: 'bold',