diff --git a/App.js b/App.js index 6cbb521..181e02a 100644 --- a/App.js +++ b/App.js @@ -3,21 +3,23 @@ import { NavigationContainer } from "@react-navigation/native"; import { createNativeStackNavigator } from "@react-navigation/native-stack"; import HomeScreen from "./src/screens/HomeScreen"; -import SignInScreen from "./src/screens/SignInScreen"; +// import SignInScreen from "./src/screens/SignInScreen"; import DonateScreen from "./src/screens/DonateScreen"; import WebsitesScreen from "./src/screens/WebsitesScreen"; +import VolunteerFormScreen from "./src/screens/VolunteerFormScreen"; const Stack = createNativeStackNavigator(); export default function App() { return ( - - - - - - - - + // + // + // + // + // + // + // + // + ); } diff --git a/src/components/BackButton.js b/src/components/BackButton.js index 69e4898..06b094f 100644 --- a/src/components/BackButton.js +++ b/src/components/BackButton.js @@ -2,20 +2,21 @@ import { StyleSheet, Text, View, Image } from "react-native"; export default function BackButton(props) { return ( - - {"\n\n\n"} - - - Back - + + + + + Back + + ); } @@ -24,11 +25,6 @@ const styles = StyleSheet.create({ back: { flexDirection: "row", alignItems: "center", - justifyContent: "center", - alignSelf: "flex-start", - paddingRight: "13%", - borderRadius: 30, - marginVertical: "-10%", }, backText: { diff --git a/src/components/MultipleChoice.js b/src/components/MultipleChoice.js index 69f6344..c864460 100644 --- a/src/components/MultipleChoice.js +++ b/src/components/MultipleChoice.js @@ -2,10 +2,19 @@ import React from "react"; import { View, Text, TouchableOpacity, StyleSheet } from "react-native"; -const MultipleChoice = ({ options, selectedOption, onSelect }) => { +const MultipleChoice = ({ + title, + options, + selectedOption, + onSelect, + color = "black", +}) => { return ( - - Performance Type * + + + {title} + * + {options.map((option) => ( { const styles = StyleSheet.create({ label: { - fontSize: 16, + fontSize: 25, marginVertical: 10, - fontWeight: "bold", }, option: { flexDirection: "row", @@ -59,11 +67,12 @@ const styles = StyleSheet.create({ }, optionText: { marginLeft: 10, - fontSize: 14, + fontSize: 20, + flexWrap: "wrap", }, selectedText: { color: "#1E90FF", - fontWeight: "bold", + fontWeight: "condensedBold", }, }); diff --git a/src/components/NextButton.js b/src/components/NextButton.js index 26a4bc5..7a3cd9d 100644 --- a/src/components/NextButton.js +++ b/src/components/NextButton.js @@ -3,8 +3,7 @@ import { StyleSheet, Text, View, Image } from "react-native"; export default function NextButton() { return ( - {"\n\n\n"} - Next + {"Next"} - - {props.title} - * + + + {title} + * - + {"\n"} + {subtitle} + setText(text)} + keyboardType={keyboardType} + > ); } const styles = StyleSheet.create({ inputField: { + height: 50, borderRadius: 15, borderWidth: 3, - flexGrow: 0.5, - textAlignVertical: "top", - }, - red: { - color: "red", - }, - container: { - flexGrow: 1, + fontSize: 30, + textAlign: "center", + marginBottom: 20, + paddingHorizontal: "10%", }, }); diff --git a/src/screens/ContactInfoScreen.js b/src/screens/ContactInfoScreen.js deleted file mode 100644 index 5ab8780..0000000 --- a/src/screens/ContactInfoScreen.js +++ /dev/null @@ -1,100 +0,0 @@ -import { - Pressable, - View, - SafeAreaView, - KeyboardAvoidingView, - StyleSheet, - Text, -} from "react-native"; -import BackButton from "../components/BackButton"; -import TextField from "../components/TextField"; -import NextButton from "../components/NextButton"; - -export default function ContactInfoScreen() { - return ( - // TODO - - - - - - - - - - Contact Info - - - Please fill in the following details about the person who will be - performing at the concert. - - - - - - - - - - - - - - - ); -} - -const styles = StyleSheet.create({ - container: { - paddingVertical: "7%", - display: "flex", - alignItems: "stretch", - flexDirection: "column", - flex: 1, - minHeight: "100%", - }, - body: { - display: "flex", - flexDirection: "column", - justifyContent: "space-between", - flex: 3, - alignItems: "stretch", - paddingHorizontal: "8%", - }, - form: { - display: "flex", - alignItems: "stretch", - flex: 6, - }, - heading: { - fontSize: 64, - fontWeight: "condensedBold", - }, - header: { - alignItems: "center", - paddingHorizontal: "5%", - flex: 1, - }, - backButton: { - alignSelf: "flex-start", - }, - instructions: { - fontSize: 20, - flexWrap: "wrap", - }, - field: { - flex: 1, - backgroundColor: "blue", - }, - nextButton: { - alignSelf: "flex-end", - flex: 2, - justifyContent: "flex-end", - }, -}); diff --git a/src/screens/PerformanceDetailsScreen.js b/src/screens/PerformanceDetailsScreen.js deleted file mode 100644 index 3d9b3c5..0000000 --- a/src/screens/PerformanceDetailsScreen.js +++ /dev/null @@ -1,61 +0,0 @@ -// PerformanceDetailsScreen.js -import React, { useState } from "react"; -import { View, StyleSheet, ScrollView, Button } from "react-native"; -import MultipleChoice from "../components/MultipleChoice"; -import TextField from "../components/TextField"; - -const PerformanceDetailsScreen = () => { - const [performanceType, setPerformanceType] = useState("individual"); - const [timeLimit, setTimeLimit] = useState(""); - const [recordingLink, setRecordingLink] = useState(""); - - const performanceOptions = [ - { label: "Individual performance only", value: "individual" }, - { - label: "Individual performance and music instrument presentation", - value: "individualPresentation", - }, - { label: "Group performance only", value: "group" }, - { - label: "Group performance and music instrument presentation", - value: "groupPresentation", - }, - { - label: "Library Band Ensemble (Band, Orchestra, or Choir)", - value: "library", - }, - ]; - - return ( - - - - -