Skip to content

Commit

Permalink
[WIP] Basic state management; Add Recipes page.
Browse files Browse the repository at this point in the history
  • Loading branch information
cmvanb committed Sep 30, 2024
1 parent 6d8122f commit 3cc5f5e
Show file tree
Hide file tree
Showing 12 changed files with 210 additions and 132 deletions.
5 changes: 3 additions & 2 deletions frontend/src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@ import { createSignal } from 'solid-js';

import TopBar from './components/TopBar';
import DrawerMenu from './components/DrawerMenu';
import { RecipeProvider } from './contexts/RecipeContext';

function App(props) {
const [menuOpen, setMenuOpen] = createSignal(false);

return (
<div>
<RecipeProvider>
<header>
<TopBar menuOpen={menuOpen} setMenuOpen={setMenuOpen} />
<DrawerMenu menuOpen={menuOpen} setMenuOpen={setMenuOpen} />
Expand All @@ -17,7 +18,7 @@ function App(props) {
</main>
<footer>
</footer>
</div>
</RecipeProvider>
);
}

Expand Down
23 changes: 23 additions & 0 deletions frontend/src/contexts/RecipeContext.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { createContext, useContext } from 'solid-js';

import { recipeStore } from '../stores/recipeStore';

const RecipeContext = createContext();

function RecipeProvider(props) {
return (
<RecipeContext.Provider
value={{
recipeStore,
}}
>
{props.children}
</RecipeContext.Provider>
);
}

function useRecipeContext() {
return useContext(RecipeContext);
}

export { RecipeProvider, useRecipeContext };
8 changes: 2 additions & 6 deletions frontend/src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,8 @@ code {
margin: 0 auto;
}

article {
margin: 2rem;
}

article .header {
text-align: center;
main.responsive {
padding: 2rem;
}

article .content {
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import { render } from 'solid-js/web';
import { Router, Route } from '@solidjs/router';

// NOTE: Ordered so local styles will override global styles.
// Local styles will override global styles.
import 'beercss';
import './index.css';

Expand Down
114 changes: 0 additions & 114 deletions frontend/src/pages/Recipe.jsx

This file was deleted.

File renamed without changes.
68 changes: 68 additions & 0 deletions frontend/src/pages/Recipe/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
import './Recipe.css';

import { useRecipeContext } from '../../contexts/RecipeContext';

function Recipe() {
const { recipeStore } = useRecipeContext();
const recipe = recipeStore.recipes[0];

return (
<article class="medium-elevate no-padding">
<nav id="recipe-controls">
<h6 class="max"></h6>
<button class="transparent circle extra" onClick={() => location.href='/recipes'}>
<i>close</i>
</button>
</nav>
<img class="responsive" id="recipe-image" src="https://www.teaforturmeric.com/wp-content/uploads/2018/06/Chicken-Korma-in-pan.jpg" />
<div class="padding">
<section class="header center-align">
<h4>{recipe.title}</h4>
<p>by {recipe.author}</p>
<a class="link" href={recipe.source_url}>{recipe.source_url}</a>
</section>
<section id="recipe-attributes" class="content">
<div class="middle-align recipe-attr">
<i class="small">schedule</i>
<span>Prep: {recipe.prep_time} mins</span>
</div>
<div class="middle-align recipe-attr">
<i class="small">schedule</i>
<span>Cook: {recipe.cook_time} mins</span>
</div>
<div class="middle-align recipe-attr">
<i class="small">group</i>
<span>Serves: {recipe.servings}</span>
</div>
</section>
<section class="content center-align">
<p>{recipe.description}</p>
</section>
<section id="recipe-columns" class="content grid">
<div class="s12 m6 recipe-col">
<h6>Ingredients</h6>
<table class="border fill">
<tbody>
{recipe.ingredients.map((ingredient) => (
<tr>
<td>{ingredient}</td>
</tr>
))}
</tbody>
</table>
</div>
<div class="s12 m6 recipe-col">
<h6>Instructions</h6>
<ol>
{recipe.instructions.map((instruction) => (
<li>{instruction}</li>
))}
</ol>
</div>
</section>
</div>
</article>
);
}

export default Recipe;
9 changes: 0 additions & 9 deletions frontend/src/pages/Recipes.jsx

This file was deleted.

16 changes: 16 additions & 0 deletions frontend/src/pages/Recipes/Recipes.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
.recipe-card p {
/* Multi-line truncate with webkit.
see: https://drafts.csswg.org/css-overflow-3/#webkit-line-clamp */
display: -webkit-box;
-webkit-line-clamp: 4;
-webkit-box-orient: vertical;
overflow: hidden;
text-overflow: ellipsis;
}

.recipe-card a {
display: block;
height: 100%;
width: 100%;
text-decoration: none;
}
40 changes: 40 additions & 0 deletions frontend/src/pages/Recipes/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
import { useRecipeContext } from '../../contexts/RecipeContext';
import './Recipes.css';

function Recipes() {
const { recipeStore } = useRecipeContext();
const recipes = recipeStore.recipes;

return (
<>
<div class="field large prefix round fill active">
<i class="front">search</i>
<input />
<menu class="min">
<div class="field large prefix suffix no-margin fixed">
<i class="front">arrow_back</i>
<input />
<i class="front">close</i>
</div>
</menu>
</div>
<div class="grid">
<For each={recipes}>
{(recipe) => (
<article class="recipe-card medium-elevate no-padding s12 m6 l4">
<a href={`/recipes/${recipe.id}`}>
<img class="responsive small" src="https://www.teaforturmeric.com/wp-content/uploads/2018/06/Chicken-Korma-in-pan.jpg" />
<div class="padding">
<h6>{recipe.title}</h6>
<p>{recipe.description}</p>
</div>
</a>
</article>
)}
</For>
</div>
</>
);
}

export default Recipes;
48 changes: 48 additions & 0 deletions frontend/src/stores/mockData.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
const chicken_korma = {
title: 'Chicken Korma',
author: 'Izzah',
description: 'Looking for a Chicken Korma recipe that’s the real deal? This one-pot chicken korma is made in the Pakistani and North Indian way but without the fuss. All the mind-blowing flavor of korma – yet ready in much less time. After making & testing this korma for years, I’ve perfected it to the point that I can confidently call it the BEST chicken korma.',
source_url: 'https://www.teaforturmeric.com/authentic-chicken-korma/',
servings: 6,
prep_time: 15,
cook_time: 45,
ingredients: [
'1/3 cup neutral oil',
'2 tbsp ghee, or sub more oil',
'2 (~500 g) large onions, sliced*',
'2 lbs bone-in, cut up, skinless chicken (or sub chicken thighs), cleaned and excess skin removed',
'2 bay leaves',
'1 tsp cumin seeds',
'1/8 tsp whole black peppercorns',
'3 green cardamom pods',
'5 whole cloves',
'1 1-inch cinnamon stick',
'8-10 cloves garlic, crushed',
'1 inch piece ginger, crushed',
'2 small tomatoes* (optional), quartered',
'3/4 cup plain, whole-milk yogurt',
'2 tsp coriander powder',
'1 tsp cumin powder',
'1 tsp red chili powder or to taste',
'1/2 tsp turmeric powder',
'1/2 tsp paprika powder or Kashmiri red chili powder, optional – for color',
'2 1/8 tsp salt, or to taste depending on amount of chicken',
'2-3 green chili peppers, chopped',
'1-2 black cardamom pods (optional)',
'1 piece whole mace, or sub pinch ground mace or cinnamon',
'½ tsp garam masala',
'pinch nutmeg powder',
'1/2 tsp diluted kewra essence, or sub rose water',
'1/4 cup cilantro leaves, chopped, optional – for garnish',
'10-12 blanched almonds, for garnish',
],
instructions: [
'Heat a large, heavy-bottomed pan over high heat. Once hot, add the oil and onions and sauté the onions until they are golden brown (~20-25 minutes depending on quantity). Remove the onions from the pan and transfer them to a food processor. Add tomatoes (if using) and yogurt to the food processor and process until mostly smooth.',
'In the same pan used to brown onions, heat ghee (or oil) and add the whole spices, garlic, and ginger. Sauté for 30 seconds or until the garlic and ginger begin to darken. Add the chicken and fry it until it changes color (~5 minutes).',
'Add the yogurt mixture to chicken along with the ground spices, salt, and green chili peppers and sauté until the mixture comes to a light simmer (~2-3 minutes).',
'Lower the heat to medium-low, cover, and allow it to cook for 15 minutes. Uncover and stir in the black cardamom (if using), mace, garam masala, and nutmeg powder. Cover and cook again for 10 minutes.',
'Raise the heat to high. Add 1/2 to 3/4 cup of water (depending on how thin you\'d like the curry) and bring to a boil. Lower the heat and allow chicken to simmer for another 2-3 minutes. The oil will have risen to the top. Sprinkle the kewra essence and stir. Turn off the heat and garnish with cilantro and blanched almonds.',
],
};

export { chicken_korma };
9 changes: 9 additions & 0 deletions frontend/src/stores/recipeStore.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { createStore } from 'solid-js/store';

import { chicken_korma } from './mockData';

const [ recipeStore, setRecipeStore ] = createStore({
recipes: [...Array(12).keys()].map((id) => ({ ...chicken_korma, id: id + 1 }) ),
});

export { recipeStore, setRecipeStore };

0 comments on commit 3cc5f5e

Please sign in to comment.