Compare commits

..

2 Commits

Author SHA1 Message Date
d33433eb8f
fix some icon animations 2023-07-10 13:19:35 +02:00
71d5dd14df
randomize order of recipes based on day 2023-07-10 13:00:11 +02:00
14 changed files with 49 additions and 80 deletions

View File

@ -3,17 +3,13 @@ export let recipe
export let current_month export let current_month
export let icon_override = false; export let icon_override = false;
export let search = "search_me" export let search = "search_me"
import "$lib/css/shake.css";
import "$lib/css/icon.css";
if(icon_override){ if(icon_override){
current_month = recipe.season[0] current_month = recipe.season[0]
} }
// Winter: ❄️
// Weihnachten: 🎄
// Ostern: 🐇
// Fastenzeit: ✝️
// Herbst: 🍂
// Sommer: ☀️
</script> </script>
<style> <style>
.card{ .card{
@ -34,18 +30,6 @@ if(icon_override){
box-shadow: 0em 0em 2em 0.1em rgba(0, 0, 0, 0.3); box-shadow: 0em 0em 2em 0.1em rgba(0, 0, 0, 0.3);
transition: 200ms; transition: 200ms;
} }
.card .icon{
text-decoration: unset;
transition: 100ms;
position: absolute;
font-size: 1.5rem;
top:-0.5em;
right:-0.5em;
padding: 0.25em;
background-color: var(--nord6);
border-radius:1000px;
box-shadow: 0em 0em 2em 0.1em rgba(0, 0, 0, 0.6);
}
.card:hover, .card:hover,
.card:focus-within{ .card:focus-within{
transform: scale(1.02,1.02); transform: scale(1.02,1.02);
@ -55,17 +39,6 @@ if(icon_override){
.card:active{ .card:active{
scale: 0.95 0.95; scale: 0.95 0.95;
} }
.card .icon:hover,
.card .icon:focus-visible
{
box-shadow: 0em 0em 1em 0.2em rgba(0, 0, 0, 0.6);
transform:scale(1.2, 1.2)
}
.icon:active{
scale: 0.8 0.8;
rotate: 30deg;
}
.card img{ .card img{
height: 50%; height: 50%;
object-fit: cover; object-fit: cover;
@ -115,7 +88,7 @@ if(icon_override){
line-height: 1.5em; line-height: 1.5em;
margin-bottom: 0.5em; margin-bottom: 0.5em;
transition: 100ms; transition: 100ms;
box-shadow: 0.2em 0.2em 0.2em 0.05em rgba(0, 0, 0, 0.3); box-shadow: 0em 0em 0.2em 0.05em rgba(0, 0, 0, 0.3);
} }
.card .tag:hover, .card .tag:hover,
.card .tag:focus-visible .card .tag:focus-visible
@ -158,36 +131,6 @@ if(icon_override){
{ {
animation: shake 0.6s animation: shake 0.6s
} }
@keyframes shake{
0%{
transform: rotate(0)
scale(1,1);
}
25%{
box-shadow: 0em 0em 1em 0.2em rgba(0, 0, 0, 0.6);
transform: rotate(30deg)
scale(1.2,1.2)
;
}
50%{
box-shadow: 0em 0em 1em 0.2em rgba(0, 0, 0, 0.6);
transform: rotate(-30deg)
scale(1.2,1.2);
}
74%{
box-shadow: 0em 0em 1em 0.2em rgba(0, 0, 0, 0.6);
transform: rotate(30deg)
scale(1.2, 1.2);
}
100%{
transform: rotate(0)
scale(1,1);
}
}
</style> </style>
<a class="card {search}" href="/rezepte/{recipe.short_name}" data-tags=[{recipe.tags}]> <a class="card {search}" href="/rezepte/{recipe.short_name}" data-tags=[{recipe.tags}]>
{#if icon_override || recipe.season.includes(current_month)} {#if icon_override || recipe.season.includes(current_month)}

View File

@ -1,6 +1,8 @@
<script lang="ts"> <script lang="ts">
import Cross from '$lib/assets/icons/Cross.svelte' import Cross from '$lib/assets/icons/Cross.svelte'
import "$lib/css/shake.css"
import "$lib/css/icon.css"
// all data shared with rest of page in card_data // all data shared with rest of page in card_data
export let card_data export let card_data
@ -15,12 +17,6 @@ if(!card_data.tags){
let new_tag let new_tag
let image_preview_url let image_preview_url
// Winter: ❄️
// Weihnachten: 🎄
// Ostern: 🐇
// Fastenzeit: ✝️
// Herbst: 🍂
// Sommer: ☀️
export function show_local_image(){ export function show_local_image(){
var file = this.files[0] var file = this.files[0]

View File

@ -3,6 +3,7 @@
import Cross from '$lib/assets/icons/Cross.svelte'; import Cross from '$lib/assets/icons/Cross.svelte';
import SeasonSelect from '$lib/components/SeasonSelect.svelte'; import SeasonSelect from '$lib/components/SeasonSelect.svelte';
import '$lib/css/action_button.css' import '$lib/css/action_button.css'
import '$lib/css/shake.css'
import { redirect } from '@sveltejs/kit'; import { redirect } from '@sveltejs/kit';
import { RecipeModelType } from '../../types/types'; import { RecipeModelType } from '../../types/types';

View File

@ -14,7 +14,9 @@
border-radius: 1000px; border-radius: 1000px;
box-shadow: 0em 0em 0.5em 0.2em rgba(0, 0, 0, 0.2); box-shadow: 0em 0em 0.5em 0.2em rgba(0, 0, 0, 0.2);
} }
a:hover{ a:hover,
a:focus-visible
{
--angle: 15deg; --angle: 15deg;
animation: shake 0.5s ease forwards; animation: shake 0.5s ease forwards;
} }

View File

@ -1,5 +1,5 @@
<script> <script>
import "$lib/components/nordtheme.css" import "$lib/css/nordtheme.css"
export let title export let title
</script> </script>
<style> <style>

View File

@ -1,3 +1,6 @@
:root{
--angle: 15deg;
}
.action_button{ .action_button{
border: none; border: none;
cursor: pointer; cursor: pointer;
@ -22,7 +25,6 @@
.action_button:active{ .action_button:active{
transition: 50ms; transition: 50ms;
scale: 0.8 0.8; scale: 0.8 0.8;
rotate: 30deg;
} }
@ -33,20 +35,20 @@
} }
25%{ 25%{
box-shadow: 0em 0em 1em 0.2em rgba(0, 0, 0, 0.6); box-shadow: 0em 0em 1em 0.2em rgba(0, 0, 0, 0.6);
transform: rotate(15deg) transform: rotate(--angle)
scale(1.2,1.2) scale(1.2,1.2)
; ;
} }
50%{ 50%{
box-shadow: 0em 0em 1em 0.2em rgba(0, 0, 0, 0.6); box-shadow: 0em 0em 1em 0.2em rgba(0, 0, 0, 0.6);
transform: rotate(-15deg) transform: rotate(calc(-1 * --angle))
scale(1.2,1.2); scale(1.2,1.2);
} }
74%{ 74%{
box-shadow: 0em 0em 1em 0.2em rgba(0, 0, 0, 0.6); box-shadow: 0em 0em 1em 0.2em rgba(0, 0, 0, 0.6);
transform: rotate(15deg) transform: rotate(--angle)
scale(1.2, 1.2); scale(1.2, 1.2);
} }
100%{ 100%{

17
src/lib/js/randomize.js Normal file
View File

@ -0,0 +1,17 @@
const time = new Date()
const MS_PER_DAY = 86400000
let seed = Math.floor(time.getTime()/MS_PER_DAY)
function mulberry32(a) {
return function() {
var t = a += 0x6D2B79F5;
t = Math.imul(t ^ t >>> 15, t | 1);
t ^= t + Math.imul(t ^ t >>> 7, t | 61);
return ((t ^ t >>> 14) >>> 0) / 4294967296;
}
}
let rand = mulberry32(seed)
export function rand_array(array){
array.sort((a,b) => 0.5 - rand())
return array
}

View File

@ -7,6 +7,7 @@
export let data: PageData; export let data: PageData;
export let current_month = new Date().getMonth() + 1 export let current_month = new Date().getMonth() + 1
const all_categories = [ ...new Set (data.all_brief.map(item => item.category))]; const all_categories = [ ...new Set (data.all_brief.map(item => item.category))];
import { rand_array } from '$lib/js/randomize';
</script> </script>
<style> <style>
h1{ h1{
@ -20,7 +21,7 @@ h1{
<h1>Rezepte</h1> <h1>Rezepte</h1>
<section> <section>
<MediaScroller title="In Saison:"> <MediaScroller title="In Saison:">
{#each data.season as recipe} {#each rand_array(data.season) as recipe}
<Card {recipe} {current_month} search=""></Card> <Card {recipe} {current_month} search=""></Card>
{/each} {/each}
</MediaScroller> </MediaScroller>
@ -29,7 +30,7 @@ h1{
{#each all_categories as category} {#each all_categories as category}
<MediaScroller title={category}> <MediaScroller title={category}>
{#each data.all_brief.filter(recipe => recipe.category == category) as recipe} {#each rand_array(data.all_brief.filter(recipe => recipe.category == category)) as recipe}
<Card {recipe} {current_month}></Card> <Card {recipe} {current_month}></Card>
{/each} {/each}
</MediaScroller> </MediaScroller>

View File

@ -5,13 +5,14 @@
export let data: PageData; export let data: PageData;
export let current_month = new Date().getMonth() + 1; export let current_month = new Date().getMonth() + 1;
import Card from '$lib/components/Card.svelte' import Card from '$lib/components/Card.svelte'
import { rand_array } from '$lib/js/randomize';
</script> </script>
<h1>Rezepte</h1> <h1>Rezepte</h1>
<h2>In Kategorie {data.category}</h2> <h2>In Kategorie {data.category}</h2>
<Search></Search> <Search></Search>
<section> <section>
<Recipes> <Recipes>
{#each data.recipes as recipe} {#each rand_array(data.recipes) as recipe}
<Card {recipe} {current_month}></Card> <Card {recipe} {current_month}></Card>
{/each} {/each}
</Recipes> </Recipes>

View File

@ -17,7 +17,9 @@
border-radius: 1000px; border-radius: 1000px;
box-shadow: 0em 0em 0.5em 0.2em rgba(0, 0, 0, 0.2); box-shadow: 0em 0em 0.5em 0.2em rgba(0, 0, 0, 0.2);
} }
a:hover{ a:hover,
a:focus-visible
{
--angle: 15deg; --angle: 15deg;
animation: shake 0.5s ease forwards; animation: shake 0.5s ease forwards;
} }

View File

@ -6,11 +6,12 @@
import Card from '$lib/components/Card.svelte'; import Card from '$lib/components/Card.svelte';
import Search from '$lib/components/Search.svelte'; import Search from '$lib/components/Search.svelte';
export let data: PageData; export let data: PageData;
import { rand_array } from '$lib/js/randomize';
</script> </script>
<IconLayout icons={data.icons}> <IconLayout icons={data.icons}>
<h2 slot=test>Rezepte mit {data.icon}</h2> <h2 slot=test>Rezepte mit {data.icon}</h2>
<Recipes slot=recipes> <Recipes slot=recipes>
{#each data.season as recipe} {#each rand_array(data.season) as recipe}
<Card {recipe} icon_override=true></Card> <Card {recipe} icon_override=true></Card>
{/each} {/each}
</Recipes> </Recipes>

View File

@ -8,12 +8,13 @@
import Search from '$lib/components/Search.svelte'; import Search from '$lib/components/Search.svelte';
export let data: PageData; export let data: PageData;
export let current_month = new Date().getMonth() + 1 export let current_month = new Date().getMonth() + 1
import { rand_array } from '$lib/js/randomize';
</script> </script>
<SeasonLayout> <SeasonLayout>
<h2 slot=test>Rezepte des Monats </h2> <h2 slot=test>Rezepte des Monats </h2>
<Recipes slot=recipes> <Recipes slot=recipes>
{#each data.season as recipe} {#each rand_array(data.season) as recipe}
<Card {recipe} {current_month}></Card> <Card {recipe} {current_month}></Card>
{/each} {/each}
</Recipes> </Recipes>

View File

@ -7,11 +7,12 @@
import Search from '$lib/components/Search.svelte'; import Search from '$lib/components/Search.svelte';
export let data: PageData; export let data: PageData;
let months = ["Januar", "Februar", "März", "April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November", "Dezember"] let months = ["Januar", "Februar", "März", "April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November", "Dezember"]
import { rand_array } from '$lib/js/randomize';
</script> </script>
<SeasonLayout> <SeasonLayout>
<h2 slot=test>Rezepte die im {months[data.month-1]} in Saison sind</h2> <h2 slot=test>Rezepte die im {months[data.month-1]} in Saison sind</h2>
<Recipes slot=recipes> <Recipes slot=recipes>
{#each data.season as recipe} {#each rand_array(data.season) as recipe}
<Card {recipe} icon_override=true></Card> <Card {recipe} icon_override=true></Card>
{/each} {/each}
</Recipes> </Recipes>

View File

@ -5,13 +5,14 @@
export let current_month = new Date().getMonth() + 1; export let current_month = new Date().getMonth() + 1;
import Card from '$lib/components/Card.svelte' import Card from '$lib/components/Card.svelte'
import Search from '$lib/components/Search.svelte'; import Search from '$lib/components/Search.svelte';
import { rand_array } from '$lib/js/randomize';
</script> </script>
<h1>Rezepte</h1> <h1>Rezepte</h1>
<h2>In Tag {data.tag}</h2> <h2>In Tag {data.tag}</h2>
<Search></Search> <Search></Search>
<section> <section>
<Recipes> <Recipes>
{#each data.recipes as recipe} {#each rand_array(data.recipes) as recipe}
<Card {recipe} {current_month}></Card> <Card {recipe} {current_month}></Card>
{/each} {/each}
</Recipes> </Recipes>