Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add stripcard support to app #12

Merged
merged 2 commits into from
Jul 2, 2024
Merged

feat: add stripcard support to app #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15d51dc
feat: view stripcard
sverben Jul 2, 2024
95334b0
feat: begeleider indicators for stripcard
sverben Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/auth.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ export enum Authed {
AUTHENTICATED,
}

interface StripCard {
used: number;
count: number;
}

interface User {
aud: string;
iat: number;
Expand All @@ -38,6 +43,7 @@ interface User {
exp: number;
auth_time: number;
jti: string;
stripcard: StripCard | null;
}

interface LoadingState {
Expand Down
22 changes: 18 additions & 4 deletions src/components/register/presence.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
import {
getSlots,
Presence as PresenceType,
Slot,
slotsAtom,
} from "../../stores/register";
import { ActivityIndicator, Checkbox, Switch, Text } from "react-native-paper";
import { StyleSheet, TouchableOpacity } from "react-native";
import { Icon, Switch, Text } from "react-native-paper";
import { StyleSheet, TouchableOpacity, View } from "react-native";
import { useContext, useState } from "react";
import AuthContext, { Authed } from "../../auth";
import { useAtom } from "jotai";
import { Platform } from "react-native";
import { AANMELDEN } from "../../env";

export default function Presence({
Expand Down Expand Up @@ -46,6 +44,14 @@ export default function Presence({
<TouchableOpacity style={styles.presence} onPress={markSeen}>
<Switch value={seen} onChange={markSeen} />
<Text>{presence.name}</Text>
{presence.stripcard_count && (
<View style={styles.stripcard}>
<Icon size={22} source={"clipboard-list"} />
<Text>
{presence.stripcard_used} / {presence.stripcard_count}
</Text>
</View>
)}
</TouchableOpacity>
);
}
Expand All @@ -57,4 +63,12 @@ const styles = StyleSheet.create({
alignItems: "center",
gap: 10,
},
stripcard: {
flex: 1,
display: "flex",
flexDirection: "row",
justifyContent: "flex-end",
alignItems: "center",
gap: 5,
},
});
45 changes: 40 additions & 5 deletions src/screens/feed/slot.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { StackScreenProps } from "@react-navigation/stack";
import { Alert, ScrollView, StyleSheet, View } from "react-native";
import { Button, Card, Chip, Text } from "react-native-paper";
import { Button, Card, Chip, Icon, Text } from "react-native-paper";
import { useContext, useEffect, useState } from "react";
import { getSlots, membersAtom, Slot, slotsAtom } from "../../stores/register";
import { useAtom } from "jotai";
Expand Down Expand Up @@ -66,17 +66,40 @@ export default function SlotScreen({ route, navigation }: Props) {
<View style={styles.slot}>
<ScrollView>
<View style={styles.info}>
{authState.authenticated === Authed.AUTHENTICATED &&
authState.user.stripcard && (
<>
<View style={styles.header}>
<Icon size={22} source={"clipboard-list"} />
<Text variant={"titleMedium"}>Strippenkaart</Text>
</View>
<Card>
<Card.Content>
<Text variant={"titleSmall"}>
Je strippenkaart is {authState.user.stripcard.used} van de{" "}
{authState.user.stripcard.count} keer gebruikt.
</Text>
</Card.Content>
</Card>
</>
)}
{slot.announcement && (
<>
<Text variant={"titleMedium"}>Aankondiging</Text>
<View style={styles.header}>
<Icon size={22} source={"bullhorn"} />
<Text variant={"titleMedium"}>Aankondiging</Text>
</View>
<Card>
<Card.Content>
<Text variant={"titleSmall"}>{slot.announcement}</Text>
</Card.Content>
</Card>
</>
)}
<Text variant={"titleMedium"}>Beschikbaarheid</Text>
<View style={styles.header}>
<Icon size={22} source={"account"} />
<Text variant={"titleMedium"}>Beschikbaarheid</Text>
</View>
<Card>
<Card.Content>
<Text variant={"titleSmall"}>
Expand All @@ -86,7 +109,10 @@ export default function SlotScreen({ route, navigation }: Props) {
</Card.Content>
</Card>

<Text variant={"titleMedium"}>Begeleiders</Text>
<View style={styles.header}>
<Icon size={22} source={"account-supervisor"} />
<Text variant={"titleMedium"}>Begeleiders</Text>
</View>
<Card>
<Card.Content style={styles.chips}>
{slot.tutors.length === 0 && (
Expand All @@ -100,7 +126,10 @@ export default function SlotScreen({ route, navigation }: Props) {

{slot.presence && (
<>
<Text variant={"titleMedium"}>Leden</Text>
<View style={styles.header}>
<Icon size={22} source={"account-details"} />
<Text variant={"titleMedium"}>Leden</Text>
</View>
<Card>
<Card.Content>
<PresenceCard slot={slot} members={members} />
Expand Down Expand Up @@ -156,4 +185,10 @@ const styles = StyleSheet.create({
button: {
borderRadius: 25,
},
header: {
display: "flex",
flexDirection: "row",
alignItems: "center",
gap: 5,
},
});
4 changes: 4 additions & 0 deletions src/stores/register.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,15 @@ export interface Presence {
id: number;
seen: boolean;
name: string;
stripcard_used: number | null;
stripcard_count: number | null;
}

export interface Member {
id: number;
name: string;
stripcard_used: number | null;
stripcard_count: number | null;
}

export interface Slot {
Expand Down
Loading