rawalcher/interaktive-systeme
Archived
1
0
Fork 0
Code Issues 5 Pull requests 2 Projects Releases 14 Packages Wiki Activity Actions

changed useFetch to take a Query parameter so It is easy to work with across the whole app

Browse source
This commit is contained in:
thschleicher 2023-12-23 12:28:00 +01:00 • committed by Jakob Stornig
parent 8009a6a090
commit ef90c4ee1a
5 changed files with 51 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/(tabs)/budget/index.tsx
View file

@ -18,7 +18,7 @@ export default function Page() {
}
});
const {data, isLoading, reFetch} = useFetch();
const {data, isLoading, reFetch} = useFetch({sql: "SELECT guid as category_guid, name as category_name, color as category_color FROM category", args: []});
return (
<SafeAreaView style={styles.container}>

16
app/(tabs)/home/index.tsx
View file

@ -5,7 +5,8 @@ import { FlatList } from 'react-native-gesture-handler';
import { SafeAreaView } from 'react-native-safe-area-context';
import { ExpenseItem, LoadingSymbol, Plus, SearchBar, Welcome } from '../../../components';
import useFetch from '../../../hooks/useFetch';
import { addExpense } from "../../../services/database";
import { useThemeColor } from "../../../hooks/useThemeColor";
import { addExpense, executeQuery } from "../../../services/database";
import { useAuth } from '../../contexts/AuthContext';
import { useRouter } from "expo-router";
import { SimpleDate } from '../../../util/SimpleDate';
@ -81,7 +82,7 @@ export default function Page() {
}
}
const {data, isLoading, reFetch} = useFetch();
const {data, isLoading, reFetch} = useFetch({sql: "SELECT e.guid AS expense_guid, c.guid AS category_guid, e.name AS expense_name, c.name AS category_name, e.datetime AS expense_datetime, e.amount AS expense_amount, c.color AS category_color, c.type AS category_type FROM expense e JOIN category c ON e.category_guid = c.guid;", args: []});
const expenseDates = useMemo(()=>
constructMarkedDates(data)
@ -93,9 +94,14 @@ export default function Page() {
<SafeAreaView edges={["left", "right", "top"]} style={styles.safeAreaViewStyle}>
{plusShow && <Plus onPress={()=>{
// router.push("/(tabs)/home/addItem");
newExpense("Test Title", "3b33b8ac-5fc1-43e5-81fc-cf61628861f7", "69.69.1234", 100).then(() => {
reFetch();
});
executeQuery({sql: "SELECT guid FROM category", args: []}).then((result) => {
if("rows" in result[0]) {
newExpense("Test Title", result[0]["rows"][0]["guid"], "69.69.1234", 100).then(() => {
reFetch();
});
}
})
}}/>}
{isLoading && <LoadingSymbol></LoadingSymbol>}

31
app/(tabs)/stats/index.tsx
View file

@ -1,17 +1,17 @@
import { Query } from 'expo-sqlite';
import { StyleSheet, Text, View } from 'react-native';
import { deleteExpenses } from '../../../services/database';
import { addCategory, deleteDatabase, deleteExpenses, executeQuery, initDatabase } from '../../../services/database';
export default function Page() {
const styles = StyleSheet.create({
container: {
flex: 1,
justifyContent: 'center',
justifyContent: 'space-evenly',
alignItems: 'center',
},
text: {
textAlign: 'center',
fontSize: 40,
color: "red",
color: "yellow",
}
});
@ -24,5 +24,28 @@ export default function Page() {
console.log("Expenses Deleted!");
})
}}>Reset Expenses</Text>
<Text style={styles.text} onPress={() => {
deleteDatabase();
console.log("Database Deleted!");
}}>Reset Database</Text>
<Text style={styles.text} onPress={() => {
initDatabase().then(() => {
console.log("Database Initialized!");
});
}}>Init Database</Text>
<Text style={styles.text} onPress={() => {
addCategory("Test", "blue", "budget").then(() => {
const getCategoryQuery: Query = {sql: "SELECT guid FROM category", args: []};
executeQuery(getCategoryQuery).then((result) => {
if("rows" in result[0]) {
console.log(result[0]["rows"]);
}
})
console.log("Category added with success!");
})
}}>Add Category</Text>
</View>);
}