mirror of
https://github.com/urosran/cally.git
synced 2025-11-26 00:24:53 +00:00
fix groceries, todo, calendar
This commit is contained in:
@ -1,5 +1,6 @@
|
||||
import { MaterialCommunityIcons } from "@expo/vector-icons";
|
||||
import { createContext, useContext, useState } from "react";
|
||||
import fuzzysort from "fuzzysort";
|
||||
|
||||
export enum GroceryFrequency {
|
||||
Never = "Never",
|
||||
@ -32,9 +33,10 @@ export enum GroceryCategory {
|
||||
Household = "Household",
|
||||
PersonalCare = "Personal Care",
|
||||
Frozen = "Frozen",
|
||||
None = "No Category",
|
||||
}
|
||||
|
||||
type MaterialIconNames = keyof typeof MaterialCommunityIcons.glyphMap;
|
||||
/*type MaterialIconNames = keyof typeof MaterialCommunityIcons.glyphMap;
|
||||
const iconMapping: { [key in GroceryCategory]: MaterialIconNames } = {
|
||||
//за сад се иконице за категорију бирају одавде
|
||||
[GroceryCategory.Fruit]: "food-apple",
|
||||
@ -48,15 +50,16 @@ const iconMapping: { [key in GroceryCategory]: MaterialIconNames } = {
|
||||
[GroceryCategory.Household]: "home",
|
||||
[GroceryCategory.PersonalCare]: "face-man-profile",
|
||||
[GroceryCategory.Frozen]: "snowflake",
|
||||
};
|
||||
};*/
|
||||
|
||||
interface IGroceryContext {
|
||||
groceries: IGrocery[];
|
||||
iconMapping: { [key in GroceryCategory]: MaterialIconNames };
|
||||
updateGroceryItem: (id: number, changes: Partial<IGrocery>) => void;
|
||||
isAddingGrocery: boolean;
|
||||
setIsAddingGrocery: (value: boolean) => void;
|
||||
addGrocery: (grocery: IGrocery) => void;
|
||||
groceries: IGrocery[];
|
||||
//iconMapping: { [key in GroceryCategory]: MaterialIconNames };
|
||||
updateGroceryItem: (id: number, changes: Partial<IGrocery>) => void;
|
||||
isAddingGrocery: boolean;
|
||||
setIsAddingGrocery: (value: boolean) => void;
|
||||
addGrocery: (grocery: IGrocery) => void;
|
||||
fuzzyMatchGroceryCategory: (groceryTitle: string) => GroceryCategory;
|
||||
}
|
||||
|
||||
const GroceryContext = createContext<IGroceryContext | undefined>(undefined);
|
||||
@ -109,11 +112,114 @@ export const GroceryProvider: React.FC<{ children: React.ReactNode }> = ({
|
||||
...prevGroceries,
|
||||
{
|
||||
...grocery,
|
||||
id: prevGroceries.length ? prevGroceries[prevGroceries.length - 1].id + 1 : 0,
|
||||
id: prevGroceries.length
|
||||
? prevGroceries[prevGroceries.length - 1].id + 1
|
||||
: 0,
|
||||
},
|
||||
]);
|
||||
};
|
||||
|
||||
const groceryExamples = {
|
||||
[GroceryCategory.Fruit]: [
|
||||
'apple', 'apples', 'banana', 'bananas', 'orange', 'oranges', 'grape', 'grapes',
|
||||
'pear', 'pears', 'pineapple', 'pineapples', 'kiwi', 'kiwis', 'strawberry',
|
||||
'strawberries', 'blueberry', 'blueberries', 'mango', 'mangoes', 'watermelon',
|
||||
'watermelons', 'peach', 'peaches', 'plum', 'plums', 'cherry', 'cherries',
|
||||
'raspberry', 'raspberries', 'blackberry', 'blackberries', 'pomegranate',
|
||||
'pomegranates', 'lemon', 'lemons', 'lime', 'limes', 'coconut', 'coconuts'
|
||||
],
|
||||
[GroceryCategory.Dairy]: [
|
||||
'milk', 'whole milk', 'skim milk', 'almond milk', 'soy milk', 'cheese',
|
||||
'cheeses', 'yoghurt', 'yogurt', 'greek yoghurt', 'greek yogurt', 'butter',
|
||||
'margarine', 'cream', 'whipping cream', 'heavy cream', 'ice cream', 'ice creams',
|
||||
'sour cream', 'whipped cream', 'cream cheese', 'cream cheeses', 'buttermilk',
|
||||
'cottage cheese', 'ghee', 'kefir'
|
||||
],
|
||||
[GroceryCategory.Vegetables]: [
|
||||
'carrot', 'carrots', 'broccoli', 'lettuce', 'lettuces', 'spinach', 'kale',
|
||||
'cabbage', 'cabbages', 'cauliflower', 'zucchini', 'zucchinis', 'onion', 'onions',
|
||||
'garlic', 'pepper', 'peppers', 'bell pepper', 'bell peppers', 'tomato', 'tomatoes',
|
||||
'cucumber', 'cucumbers', 'potato', 'potatoes', 'sweet potato', 'sweet potatoes',
|
||||
'beet', 'beets', 'eggplant', 'eggplants', 'celery', 'radish', 'radishes',
|
||||
'asparagus', 'mushroom', 'mushrooms'
|
||||
],
|
||||
[GroceryCategory.Meat]: [
|
||||
'steak', 'steaks', 'beef', 'pork', 'lamb', 'veal', 'ribeye', 'tenderloin',
|
||||
'filet mignon', 'bacon', 'ham', 'sausage', 'sausages', 'salami', 'ground beef',
|
||||
'beef mince', 'hamburger meat', 'prosciutto', 'brisket', 'pork chop', 'pork chops'
|
||||
],
|
||||
[GroceryCategory.Poultry]: [
|
||||
'chicken', 'whole chicken', 'chickens', 'chicken breast', 'chicken breasts',
|
||||
'breast of chicken', 'chicken thigh', 'chicken thighs', 'chicken leg', 'chicken legs',
|
||||
'chicken wing', 'chicken wings', 'wing', 'wings', 'drumsticks', 'chicken drumstick',
|
||||
'turkey', 'whole turkey', 'ground turkey', 'turkey breast', 'turkey breasts',
|
||||
'turkey leg', 'duck', 'ducks', 'goose', 'quail', 'pheasant'
|
||||
],
|
||||
[GroceryCategory.Bakery]: [
|
||||
'bread', 'breads', 'whole wheat bread', 'sourdough bread', 'bagel', 'bagels',
|
||||
'croissant', 'croissants', 'muffin', 'muffins', 'buns', 'hamburger bun',
|
||||
'hamburger buns', 'hotdog bun', 'hotdog buns', 'donut', 'donuts', 'roll', 'rolls',
|
||||
'dinner roll', 'dinner rolls', 'scone', 'scones', 'toast', 'ciabatta',
|
||||
'focaccia', 'brioche', 'pita', 'pitas', 'naan', 'baguette', 'baguettes',
|
||||
'pastry', 'pastries', 'pretzel', 'pretzels'
|
||||
],
|
||||
[GroceryCategory.Beverages]: [
|
||||
'coffee', 'decaf coffee', 'iced coffee', 'cold brew', 'tea', 'iced tea',
|
||||
'black tea', 'green tea', 'herbal tea', 'juice', 'apple juice', 'orange juice',
|
||||
'grape juice', 'water', 'sparkling water', 'flavored water', 'soda', 'cola',
|
||||
'diet soda', 'beer', 'lager', 'ale', 'wine', 'red wine', 'white wine',
|
||||
'whiskey', 'whisky', 'vodka', 'rum', 'gin', 'smoothie', 'smoothies', 'milkshake',
|
||||
'milkshakes', 'energy drink', 'energy drinks', 'sports drink', 'sports drinks',
|
||||
'lemonade', 'sparkling lemonade', 'iced lemonade', 'sparkling water', 'cider',
|
||||
'hard cider', 'kombucha'
|
||||
],
|
||||
[GroceryCategory.Snacks]: [
|
||||
'chips', 'potato chips', 'tortilla chips', 'corn chips', 'candy', 'candies',
|
||||
'chocolate', 'chocolates', 'dark chocolate', 'milk chocolate', 'white chocolate',
|
||||
'cookies', 'popcorn', 'pretzel', 'pretzels', 'nuts', 'mixed nuts', 'almonds',
|
||||
'cashews', 'trail mix', 'granola bar', 'granola bars', 'protein bar', 'protein bars',
|
||||
'crackers', 'gummies', 'gummy bears', 'fruit snacks', 'dried fruit',
|
||||
'peanut butter', 'rice cakes', 'snack cakes'
|
||||
],
|
||||
[GroceryCategory.Household]: [
|
||||
'detergent', 'laundry detergent', 'dish soap', 'dishwasher detergent',
|
||||
'toilet paper', 'paper towels', 'trash bags', 'bin liners', 'broom', 'mop',
|
||||
'cleaner', 'surface cleaner', 'multi-purpose cleaner', 'disinfectant', 'bleach',
|
||||
'fabric softener', 'vacuum bags', 'aluminum foil', 'plastic wrap', 'cling wrap',
|
||||
'light bulbs', 'batteries', 'laundry soap', 'sponges', 'scrubbers',
|
||||
'dishwashing liquid'
|
||||
],
|
||||
[GroceryCategory.PersonalCare]: [
|
||||
'shampoo', 'conditioner', 'hair shampoo', 'hair conditioner', 'soap', 'bar soap',
|
||||
'liquid soap', 'toothpaste', 'toothbrush', 'toothbrushes', 'electric toothbrush',
|
||||
'deodorant', 'antiperspirant', 'lotion', 'moisturizer', 'razor', 'shaving razor',
|
||||
'shaving cream', 'body wash', 'face wash', 'sunscreen', 'hair gel', 'hair spray',
|
||||
'nail polish', 'cotton swabs', 'lip balm', 'chapstick', 'hand cream', 'sanitizer'
|
||||
],
|
||||
[GroceryCategory.Frozen]: [
|
||||
'ice cream', 'ice creams', 'frozen pizza', 'frozen pizzas', 'frozen vegetables',
|
||||
'frozen veg', 'frozen peas', 'frozen fruit', 'frozen fish', 'frozen chicken',
|
||||
'frozen wings', 'frozen fries', 'frozen french fries', 'frozen shrimp',
|
||||
'frozen prawns', 'frozen dumplings', 'frozen waffles', 'frozen pancakes',
|
||||
'frozen pie', 'frozen pies', 'frozen lasagna', 'frozen burrito', 'frozen burritos',
|
||||
'frozen nuggets', 'frozen pastry', 'frozen pastries', 'frozen meals'
|
||||
],
|
||||
};
|
||||
|
||||
const fuzzyMatchGroceryCategory = (groceryTitle: string): GroceryCategory => {
|
||||
let bestMatchCategory = GroceryCategory.None;
|
||||
let bestMatchScore = -1000;
|
||||
|
||||
Object.entries(groceryExamples).forEach(([category, examples]) => {
|
||||
const matches = fuzzysort.go(groceryTitle, examples);
|
||||
if (matches.length > 0 && matches[0].score > bestMatchScore) {
|
||||
bestMatchScore = matches[0].score;
|
||||
bestMatchCategory = category as GroceryCategory;
|
||||
}
|
||||
});
|
||||
|
||||
return bestMatchCategory;
|
||||
};
|
||||
|
||||
const updateGroceryItem = (id: number, changes: Partial<IGrocery>) => {
|
||||
setGroceries((prevGroceries) =>
|
||||
@ -125,7 +231,15 @@ export const GroceryProvider: React.FC<{ children: React.ReactNode }> = ({
|
||||
|
||||
return (
|
||||
<GroceryContext.Provider
|
||||
value={{ groceries, iconMapping, updateGroceryItem, isAddingGrocery, setIsAddingGrocery, addGrocery }}
|
||||
value={{
|
||||
groceries,
|
||||
fuzzyMatchGroceryCategory,
|
||||
//iconMapping,
|
||||
updateGroceryItem,
|
||||
isAddingGrocery,
|
||||
setIsAddingGrocery,
|
||||
addGrocery,
|
||||
}}
|
||||
>
|
||||
{children}
|
||||
</GroceryContext.Provider>
|
||||
|
||||
@ -21,6 +21,7 @@ interface IToDosContext {
|
||||
toDos: IToDo[];
|
||||
updateToDo: (id: number, changes: Partial<IToDo>) => void;
|
||||
addToDo: (newToDo: IToDo) => void;
|
||||
maxPoints: number;
|
||||
}
|
||||
|
||||
const ToDosContext = createContext<IToDosContext>(undefined!);
|
||||
@ -35,7 +36,7 @@ export const ToDosContextProvider: FC<{ children: ReactNode }> = ({
|
||||
done: false,
|
||||
date: new Date(),
|
||||
rotate: true,
|
||||
repeatType: "Every week"
|
||||
repeatType: "Every week",
|
||||
},
|
||||
{
|
||||
id: 1,
|
||||
@ -43,7 +44,7 @@ export const ToDosContextProvider: FC<{ children: ReactNode }> = ({
|
||||
done: false,
|
||||
date: new Date(),
|
||||
rotate: false,
|
||||
repeatType: "Every week"
|
||||
repeatType: "Every week",
|
||||
},
|
||||
{
|
||||
id: 2,
|
||||
@ -51,7 +52,7 @@ export const ToDosContextProvider: FC<{ children: ReactNode }> = ({
|
||||
done: false,
|
||||
date: new Date(),
|
||||
rotate: true,
|
||||
repeatType: "Every week"
|
||||
repeatType: "Every week",
|
||||
},
|
||||
{
|
||||
id: 3,
|
||||
@ -60,7 +61,7 @@ export const ToDosContextProvider: FC<{ children: ReactNode }> = ({
|
||||
date: new Date(Date.now() + 86400000),
|
||||
points: 40,
|
||||
rotate: false,
|
||||
repeatType: "Every week"
|
||||
repeatType: "Every week",
|
||||
},
|
||||
{
|
||||
id: 4,
|
||||
@ -68,7 +69,7 @@ export const ToDosContextProvider: FC<{ children: ReactNode }> = ({
|
||||
done: false,
|
||||
date: new Date(Date.now() + 86400000),
|
||||
rotate: false,
|
||||
repeatType: "Once a Month"
|
||||
repeatType: "Once a Month",
|
||||
},
|
||||
{
|
||||
id: 5,
|
||||
@ -76,7 +77,7 @@ export const ToDosContextProvider: FC<{ children: ReactNode }> = ({
|
||||
done: false,
|
||||
date: new Date(Date.now() + 2 * 86400000),
|
||||
rotate: true,
|
||||
repeatType: "Once a Month"
|
||||
repeatType: "Once a Month",
|
||||
},
|
||||
{
|
||||
id: 6,
|
||||
@ -84,7 +85,8 @@ export const ToDosContextProvider: FC<{ children: ReactNode }> = ({
|
||||
done: false,
|
||||
date: new Date(Date.now() + 3 * 86400000),
|
||||
rotate: false,
|
||||
repeatType: "Once a year"
|
||||
repeatType: "Once a year",
|
||||
points: 50,
|
||||
},
|
||||
{
|
||||
id: 7,
|
||||
@ -92,7 +94,7 @@ export const ToDosContextProvider: FC<{ children: ReactNode }> = ({
|
||||
done: false,
|
||||
date: null,
|
||||
rotate: false,
|
||||
repeatType: "None"
|
||||
repeatType: "None",
|
||||
},
|
||||
{
|
||||
id: 8,
|
||||
@ -100,14 +102,34 @@ export const ToDosContextProvider: FC<{ children: ReactNode }> = ({
|
||||
done: false,
|
||||
date: null,
|
||||
rotate: false,
|
||||
repeatType: "None"
|
||||
repeatType: "None",
|
||||
points: 10,
|
||||
},
|
||||
]);
|
||||
|
||||
const initCalc = (): number => {
|
||||
return toDos.reduce(
|
||||
(sum, todo) => sum + (todo.points ? todo.points : 0),
|
||||
50
|
||||
);
|
||||
};
|
||||
|
||||
const calculateMaxPoints = () => {
|
||||
const totalPoints = toDos.reduce(
|
||||
(sum, todo) => sum + (todo.points ? todo.points : 0),
|
||||
0
|
||||
);
|
||||
setMaxPoints(totalPoints);
|
||||
};
|
||||
|
||||
const [maxPoints, setMaxPoints] = useState<number>(initCalc);
|
||||
|
||||
const updateToDo = (id: number, changes: Partial<IToDo>) => {
|
||||
setToDos((prevToDos) =>
|
||||
prevToDos.map((toDo) => (toDo.id === id ? { ...toDo, ...changes } : toDo))
|
||||
);
|
||||
|
||||
calculateMaxPoints();
|
||||
};
|
||||
|
||||
const addToDo = (newToDo: IToDo) => {
|
||||
@ -118,10 +140,11 @@ export const ToDosContextProvider: FC<{ children: ReactNode }> = ({
|
||||
id: prevToDos.length ? prevToDos[prevToDos.length - 1].id + 1 : 0,
|
||||
},
|
||||
]);
|
||||
calculateMaxPoints();
|
||||
};
|
||||
|
||||
return (
|
||||
<ToDosContext.Provider value={{ toDos, updateToDo, addToDo }}>
|
||||
<ToDosContext.Provider value={{ toDos, updateToDo, addToDo, maxPoints }}>
|
||||
{children}
|
||||
</ToDosContext.Provider>
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user