Skip to content

Commit

Permalink
Merge branch 'all-redesign' into profile-redesign-and-bugfixes
Browse files Browse the repository at this point in the history
  • Loading branch information
danny committed Oct 6, 2024
2 parents f42fae1 + 058f7a5 commit cbefdf6
Show file tree
Hide file tree
Showing 6 changed files with 249 additions and 185 deletions.
8 changes: 4 additions & 4 deletions components/Checkbox.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export function Checkbox({ onPress, text, style }: checkboxProps) {
<Pressable onPress={onCheckmarkPress} style={styles.checkboxContainer}>
<View style={[styles.checkboxBase, checked && styles.checkboxChecked]}>
{checked && (
<Ionicons name="checkmark" size={20} style={styles.checkmark} />
<Ionicons name="checkmark" size={30} style={styles.checkmark} />
)}
</View>
<ArkadText style={style ? style : styles.text} text={text} />
Expand All @@ -39,7 +39,7 @@ const styles = StyleSheet.create({
borderRadius: 4,
borderWidth: 2,
borderColor: Colors.white,
backgroundColor: "transparent",
backgroundColor: Colors.white,
marginLeft: 12,
},
text: {
Expand All @@ -49,7 +49,7 @@ const styles = StyleSheet.create({
},

checkboxChecked: {
backgroundColor: Colors.arkadNavy,
backgroundColor: Colors.white,
},

checkboxContainer: {
Expand All @@ -58,7 +58,7 @@ const styles = StyleSheet.create({
},

checkmark: {
color: Colors.white,
color: Colors.arkadOrange,
alignSelf: "center",
},
});
232 changes: 116 additions & 116 deletions components/eventList/EventList.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,131 +186,131 @@ export function EventList({ events, onPress, showTickets }: EventListProps) {
</View>
<View style={styles.unregisterBox}>
<Pressable onPress={handleCrossPress}>
<Entypo name="cross" size={height * 0.08} color="black" />{" "}
<Entypo name="cross" size={height * 0.08} color="black" />
</Pressable>
</View>

<RBSheet
ref={(ref) => (refRBSheet.current[1] = ref)}
useNativeDriver={true}
height={height * 0.6}
customStyles={{
draggableIcon: {
backgroundColor: "transparent",
},
container: {
backgroundColor: Colors.arkadNavy,
},
}}
customModalProps={{
animationType: "fade",
statusBarTranslucent: false,
}}
customAvoidingViewProps={{
enabled: false,
}}
>
<View style={styles.centeredView}>
<View style={styles.qrModalContainer}>
<QRCode
size={Dimensions.get("window").width * 0.65}
value={chosenTicket?.code}
/>
</View>

<ArkadText
style={{ fontSize: 25, paddingTop: "2%" }}
text={`${event.name}`}
/>
<ArkadText
style={{ fontSize: 15, fontStyle: "italic" }}
text={`Ticket ID: ${chosenTicket?.code}`}
<RBSheet
ref={(ref) => (refRBSheet.current[1] = ref)}
useNativeDriver={true}
height={height * 0.6}
customStyles={{
draggableIcon: {
backgroundColor: "transparent",
},
container: {
backgroundColor: Colors.arkadNavy,
},
}}
customModalProps={{
animationType: "fade",
statusBarTranslucent: false,
}}
customAvoidingViewProps={{
enabled: false,
}}
>
<View style={styles.centeredView}>
<View style={styles.qrModalContainer}>
<QRCode
size={Dimensions.get("window").width * 0.65}
value={chosenTicket?.code}
/>
<ArkadButton
onPress={() => {
refRBSheet.current[1]?.close();
selectedTicket(null);
}}
style={{
width: "75%",
backgroundColor: Colors.arkadTurkos,
paddingBottom: "2%",
}}
>
<ArkadText text="Close" />
</ArkadButton>
</View>
</RBSheet>

<RBSheet
ref={(ref) => (refRBSheet.current[0] = ref)}
useNativeDriver={true}
height={height * 0.3}
customStyles={{
draggableIcon: {
backgroundColor: "transparent",
},
container: {
backgroundColor: Colors.arkadNavy,
},
}}
customModalProps={{
animationType: "fade",
statusBarTranslucent: false,
}}
customAvoidingViewProps={{
enabled: false,
}}
>
<View>
<ArkadText
style={{
color: Colors.white,
fontSize: 25,
fontFamily: "main-font-bold",
marginTop: "10%",
}}
text={`Do you want to unregister from ${event.name}?`}
/>
<View
style={{
flexDirection: "row",
justifyContent: "space-between",
width: "90%",
alignSelf: "center",
}}
>
{isYesButtonDisabled && (
<ArkadButton
onPress={() => null}
style={{
backgroundColor: Colors.gray,
width: "45%",
}}
>
<ArkadText text="Yes" />
</ArkadButton>
)}
{!isYesButtonDisabled && (
<ArkadButton
onPress={() => deregister(event)}
style={{
backgroundColor: Colors.arkadTurkos,
width: "45%",
}}
>
<ArkadText text="Yes" />
</ArkadButton>
)}
<ArkadText
style={{ fontSize: 25, paddingTop: "2%" }}
text={`${event.name}`}
/>
<ArkadText
style={{ fontSize: 15, fontStyle: "italic" }}
text={`Ticket ID: ${chosenTicket?.code}`}
/>
<ArkadButton
onPress={() => {
refRBSheet.current[1]?.close();
selectedTicket(null);
}}
style={{
width: "75%",
backgroundColor: Colors.arkadTurkos,
paddingBottom: "2%",
}}
>
<ArkadText text="Close" />
</ArkadButton>
</View>
</RBSheet>

<RBSheet
ref={(ref) => (refRBSheet.current[0] = ref)}
useNativeDriver={true}
height={height * 0.3}
customStyles={{
draggableIcon: {
backgroundColor: "transparent",
},
container: {
backgroundColor: Colors.arkadNavy,
},
}}
customModalProps={{
animationType: "fade",
statusBarTranslucent: false,
}}
customAvoidingViewProps={{
enabled: false,
}}
>
<View>
<ArkadText
style={{
color: Colors.white,
fontSize: 25,
fontFamily: "main-font-bold",
marginTop: "10%",
}}
text={`Do you want to unregister from ${event.name}?`}
/>
<View
style={{
flexDirection: "row",
justifyContent: "space-between",
width: "90%",
alignSelf: "center",
}}
>
{isYesButtonDisabled && (
<ArkadButton
onPress={() => refRBSheet.current[0]?.close()}
style={{ width: "45%" }}
onPress={() => null}
style={{
backgroundColor: Colors.gray,
width: "45%",
}}
>
<ArkadText text="Close" />
<ArkadText text="Yes" />
</ArkadButton>
</View>
)}
{!isYesButtonDisabled && (
<ArkadButton
onPress={() => deregister(event)}
style={{
backgroundColor: Colors.arkadTurkos,
width: "45%",
}}
>
<ArkadText text="Yes" />
</ArkadButton>
)}
<ArkadButton
onPress={() => refRBSheet.current[0]?.close()}
style={{ width: "45%" }}
>
<ArkadText text="Close" />
</ArkadButton>
</View>
</RBSheet>
</View>
</View>
</RBSheet>
</View>
)}
</View>
Expand Down
22 changes: 20 additions & 2 deletions screens/auth/ForgotPasswordScreen.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,17 +52,26 @@ export default function ForgotPasswordScreen({
source={require("../../assets/images/arkad_logo_inverted.png")}
/>
<View style={styles.inputContainer}>
<ArkadText text="Email" style={styles.inputTitle} />
<TextInput
placeholder="Email"
keyboardType="email-address"
onChangeText={setEmail}
onSubmitEditing={forgotPassword}
style={{ borderColor: Colors.white, color: Colors.white }}
style={{
borderColor: Colors.white,
color: Colors.black,
backgroundColor: Colors.white,
paddingTop: 15,
}}
/>
{loading ? (
<ActivityIndicator />
) : (
<ArkadButton onPress={forgotPassword} style={{}}>
<ArkadButton
onPress={forgotPassword}
style={{ backgroundColor: Colors.arkadTurkos }}
>
<ArkadText text="Submit" style={{}} />
</ArkadButton>
)}
Expand Down Expand Up @@ -96,4 +105,13 @@ const styles = StyleSheet.create({
fontSize: 24,
fontWeight: "bold",
},

inputTitle: {
fontSize: 20,
fontWeight: "bold",
color: Colors.white,
textAlign: "left",
paddingLeft: 12,
marginBottom: -10,
},
});
33 changes: 29 additions & 4 deletions screens/auth/LoginScreen.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,19 +79,32 @@ export default function LoginScreen({ navigation }: LoginScreenParams) {
{/* <SSO /> */}
{loginEmail && (
<View>
<ArkadText text="Email" style={styles.inputTitle} />
<TextInput
placeholder="Email"
keyboardType="email-address"
onChangeText={setEmail}
onSubmitEditing={login}
style={{ borderColor: Colors.white, color: Colors.white }}
style={{
borderColor: Colors.white,
color: Colors.black,
backgroundColor: Colors.white,
paddingTop: 15,
}}
/>

<ArkadText text="Password" style={styles.inputTitle} />
<TextInput
placeholder="Password"
secureTextEntry
onChangeText={setPassword}
onSubmitEditing={login}
style={{ borderColor: Colors.white, color: Colors.white }}
style={{
borderColor: Colors.white,
color: Colors.black,
backgroundColor: Colors.white,
paddingTop: 15,
}}
/>
</View>
)}
Expand All @@ -115,7 +128,10 @@ export default function LoginScreen({ navigation }: LoginScreenParams) {
style={styles.signUpContainer}
onPress={() => navigation.navigate("ForgotPasswordScreen")}
>
<ArkadText style={styles.signUpText} text={"Forgot your password?"} />
<ArkadText
style={styles.signUpText}
text={"Forgot your password? Click here!"}
/>
</Pressable>
</View>
</ScrollView>
Expand Down Expand Up @@ -146,11 +162,20 @@ const styles = StyleSheet.create({
},
signUpText: {
textAlign: "center",
textDecorationLine: "underline",
// textDecorationLine: "underline",
color: Colors.arkadTurkos,
},
loginButton: {
width: "65%",
alignSelf: "center",
},

inputTitle: {
fontSize: 20,
fontWeight: "bold",
color: Colors.white,
textAlign: "left",
paddingLeft: 12,
marginBottom: -10,
},
});
Loading

0 comments on commit cbefdf6

Please sign in to comment.