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: order list + search rework #7

Merged
merged 1 commit into from
Jun 11, 2024
Merged

feat: order list + search rework #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
153 changes: 110 additions & 43 deletions src/screens/feed/search.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
import { Card, Searchbar, useTheme } from "react-native-paper";
import {
ActivityIndicator,
Button,
Card,
Icon,
Searchbar,
Text,
useTheme,
} from "react-native-paper";
import { useState } from "react";
import { SafeAreaView, ScrollView, StyleSheet, View } from "react-native";
import { useNavigation } from "@react-navigation/native";
import { ActionType, FeedItem } from "../../stores/feed";
import Item from "../../components/feed/item";
import { parse } from "fast-html-parser";
import * as WebBrowser from "expo-web-browser";

export interface Item {
id: number;
Expand Down Expand Up @@ -78,62 +87,106 @@ export default function SearchScreen() {
const [search, setSearch] = useState("");
const navigation = useNavigation();

const [itemResults, setItemsResults] = useState<FeedItem[]>([]);
const [articleResults, setArticleResults] = useState<FeedItem[]>([]);
const [itemResults, setItemsResults] = useState<FeedItem[] | null>(null);
const [articleResults, setArticleResults] = useState<FeedItem[] | null>(null);
const [searched, setSearched] = useState(false);

async function updateResults() {
setSearched(!!search);
if (!search) return;

setItemsResults(null);
setArticleResults(null);

getItems(search).then(setItemsResults);
getArticles(search).then(setArticleResults);
}

async function orderList() {
await WebBrowser.openBrowserAsync(
"https://docs.google.com/document/d/1cyrfqq37l9QdhByT1zExyk_W7TDEhyO6/edit",
);
}

return (
<SafeAreaView style={styles.view}>
<View
style={{
...styles.component,
backgroundColor: theme.colors.background,
}}
>
<Searchbar
placeholder="Search"
onChangeText={setSearch}
onSubmitEditing={updateResults}
icon={"chevron-left"}
onIconPress={navigation.goBack}
value={search}
/>
</View>
<ScrollView>
<>
<SafeAreaView style={styles.view}>
<View
style={{
...styles.component,
...styles.results,
backgroundColor: theme.colors.background,
}}
>
{itemResults.length > 0 && (
<Card>
<Card.Title title={"Inventaris"} />
<Card.Content style={styles.content}>
{itemResults.map((result, index) => (
<Item key={index} item={result} />
))}
</Card.Content>
</Card>
)}
{articleResults.length > 0 && (
<Card>
<Card.Title title={"Artikelen"} />
<Card.Content style={styles.content}>
{articleResults.map((result, index) => (
<Item key={index} item={result} />
))}
</Card.Content>
</Card>
)}
<Searchbar
placeholder="Search"
onChangeText={setSearch}
onSubmitEditing={updateResults}
icon={"chevron-left"}
onIconPress={navigation.goBack}
value={search}
/>
</View>
<ScrollView contentContainerStyle={{ flexGrow: 1 }}>
<View
style={{
...styles.component,
...styles.results,
}}
>
{searched && (
<>
<Card>
<Card.Title title={"Inventaris"} />
<Card.Content style={styles.content}>
{itemResults ? (
itemResults.length > 0 ? (
itemResults.map((result, index) => (
<Item key={index} item={result} />
))
) : (
<View style={styles.center}>
<Text>Geen producten gevonden</Text>
<Button onPress={orderList} mode={"text"}>
Mis je iets? Bekijk de bestellijst
</Button>
</View>
)
) : (
<ActivityIndicator animating={true} />
)}
</Card.Content>
</Card>
<Card>
<Card.Title title={"Artikelen"} />
<Card.Content style={styles.content}>
{articleResults ? (
articleResults.length > 0 ? (
articleResults.map((result, index) => (
<Item key={index} item={result} />
))
) : (
<View style={styles.center}>
<Text>Geen artikelen gevonden</Text>
</View>
)
) : (
<ActivityIndicator animating={true} />
)}
</Card.Content>
</Card>
</>
)}
</View>
</ScrollView>
</SafeAreaView>

{!searched && (
<View style={styles.start}>
<Icon size={75} source={"magnify"} />
<Text>Zoek naar artikelen en items in de inventaris</Text>
</View>
</ScrollView>
</SafeAreaView>
)}
</>
);
}

Expand All @@ -153,4 +206,18 @@ const styles = StyleSheet.create({
content: {
gap: 10,
},
center: {
alignItems: "center",
},
start: {
position: "absolute",
left: 0,
top: 0,
width: "100%",
height: "100%",
zIndex: -1,
justifyContent: "center",
alignItems: "center",
gap: 10,
},
});
15 changes: 15 additions & 0 deletions src/screens/settings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,33 @@ import { useContext } from "react";
import AuthContext, { Authed } from "../auth";
import { ScrollView, StyleSheet, View } from "react-native";
import { Appbar, Button, Card, Text } from "react-native-paper";
import * as WebBrowser from "expo-web-browser";
import auth from "../auth";

export default function SettingsScreen() {
const authState = useContext(AuthContext);

async function orderList() {
await WebBrowser.openBrowserAsync(
"https://docs.google.com/document/d/1cyrfqq37l9QdhByT1zExyk_W7TDEhyO6/edit",
);
}

return (
<>
<Appbar.Header>
<Appbar.Content title={"Instellingen"} />
</Appbar.Header>
<ScrollView>
<View style={styles.container}>
<Card>
<Card.Title title={"Algemeen"} />
<Card.Content style={styles.content}>
<Button mode={"contained"} onPress={orderList}>
Bestellijst
</Button>
</Card.Content>
</Card>
<Card>
<Card.Title title={"Account"} />
{authState.authenticated === Authed.AUTHENTICATED && (
Expand Down
Loading