diff --git a/app/Clubs.js b/app/Clubs.js
index 2dd6b63..4a50f18 100644
--- a/app/Clubs.js
+++ b/app/Clubs.js
@@ -8,7 +8,9 @@ import {
StatusBar,
ActivityIndicator,
FlatList,
- TouchableOpacity
+ TouchableOpacity,
+ Image,
+ TouchableHighlight
} from 'react-native';
import {
@@ -18,25 +20,61 @@ import {
DebugInstructions,
ReloadInstructions,
} from 'react-native/Libraries/NewAppScreen';
+import { NavigationContainer } from '@react-navigation/native'
+import { createStackNavigator } from '@react-navigation/stack'
import { SearchBar } from 'react-native-elements';
import styles from './styles/liststyles'
import { url } from './resources/fetchInfo.json'
-const ClubElement = ({item}) => {
- const [visible, setVisible] = useState(0)
- const extra = visible?({'\n'}Location: {item.item.loc} {"\n\n"}Sponsor: {item.item.sponsor}):(<>>);
+const Stack = createStackNavigator();
+
+export const ClubInfo = ({route}) => {
+ const item = route.params;
+ return (
+
+ Meeting Time and Day: {'\n'}{item.meeting}{"\n\n"}Zoom Link: {'\n'}{item.link}{"\n\n"}Sponsor: {'\n'}{item.sponsor}
+
+ )
+}
+function ClubElement (props) {
+ const item = props.item;
return(
- setVisible(!visible)} activeOpacity={0.8}>
- {item.item.name}
- {extra}
-
+ props.navigation.navigate('ClubInfo', {data:props.data,name:props.name,meeting:item.meeting,link:item.link,sponsor:item.sponsor})} activeOpacity={0.8}>
+
+
+ {props.item.name}
+
+
+
)
}
-class Clubs extends React.Component {
-
+function Club () {
+ return (
+
+
+
+ ({
+ title:route.params.name
+ })}
+ />
+
+
+ )
+}
+
+class Clubs extends React.Component {
constructor(props) {
super(props);
@@ -91,12 +129,14 @@ class Clubs extends React.Component {
value={this.state.search}/>
}
+ renderItem={({item}) => }
keyExtractor={item => JSON.stringify(item)}
/>
+
+
);
}
}
-export default Clubs;
\ No newline at end of file
+export default Club;
\ No newline at end of file
diff --git a/app/Staff.js b/app/Staff.js
index fa2d38b..e0ad176 100644
--- a/app/Staff.js
+++ b/app/Staff.js
@@ -8,7 +8,8 @@ import {
StatusBar,
ActivityIndicator,
FlatList,
- TouchableOpacity
+ TouchableOpacity,
+ Image
} from 'react-native';
import {
@@ -24,11 +25,14 @@ import { url } from './resources/fetchInfo.json'
const StaffElement = ({item}) => {
const [visible, setVisible] = useState(0)
- const extra = [...item.item.emails.map(email=>(Email: {email}))]
+ const extra = [...item.item.emails.map(email=>({'\n'}Email: {email}))]
return(
- setVisible(!visible)} activeOpacity={0.8}>
- {item.item.name}
+ setVisible(!visible)} activeOpacity={0.8}>
+
+
+ {item.item.name}
+
{visible?extra:<>>}
diff --git a/app/assets/clubs.png b/app/assets/clubs.png
new file mode 100644
index 0000000..35b8011
Binary files /dev/null and b/app/assets/clubs.png differ
diff --git a/app/assets/staff.png b/app/assets/staff.png
new file mode 100644
index 0000000..3fb1d44
Binary files /dev/null and b/app/assets/staff.png differ
diff --git a/app/styles/liststyles.js b/app/styles/liststyles.js
index ae28dfc..20d555d 100644
--- a/app/styles/liststyles.js
+++ b/app/styles/liststyles.js
@@ -13,6 +13,13 @@ const styles = StyleSheet.create({
borderColor: 'black',
borderRadius: 12,
},
+ item1: {
+ backgroundColor: 'white',
+ padding: 15,
+ borderBottomWidth: 2,
+ borderColor: '#bababa',
+ width: '100%',
+ },
title: {
fontSize: 28,
},
diff --git a/app/styles/morestyles.js b/app/styles/morestyles.js
index 0fe067c..bfc07cf 100644
--- a/app/styles/morestyles.js
+++ b/app/styles/morestyles.js
@@ -9,6 +9,7 @@ const styles=StyleSheet.create({
height: Dimensions.get('window').height*0.075,
justifyContent:'center',
paddingLeft: '3%',
+ fontSize: 32,
},
moretext: {
color:'#eee',