diff --git a/back/database/migrations/development.db b/back/database/migrations/development.db index c8387d9..119e59f 100644 Binary files a/back/database/migrations/development.db and b/back/database/migrations/development.db differ diff --git a/back/src/api/kafetegia/content-types/kafetegia/schema.json b/back/src/api/kafetegia/content-types/kafetegia/schema.json index 51e8d0c..7a0c1b1 100644 --- a/back/src/api/kafetegia/content-types/kafetegia/schema.json +++ b/back/src/api/kafetegia/content-types/kafetegia/schema.json @@ -55,6 +55,11 @@ "type": "component", "repeatable": true, "component": "kafetegia.edaria" + }, + "konboak": { + "type": "component", + "repeatable": true, + "component": "kafetegia.edaria" } } } diff --git a/front/gatsby-config.js b/front/gatsby-config.js index f2c845f..2d1dfd8 100644 --- a/front/gatsby-config.js +++ b/front/gatsby-config.js @@ -27,6 +27,9 @@ const query = qs.stringify( tostadak: { populate: ['alergenoak'], }, + konboak: { + populate: ['alergenoak'], + }, }, }, { diff --git a/front/src/pages/kafetegia.tsx b/front/src/pages/kafetegia.tsx index 34d0620..ec81e3e 100644 --- a/front/src/pages/kafetegia.tsx +++ b/front/src/pages/kafetegia.tsx @@ -6,7 +6,7 @@ import { Helmet } from 'react-helmet'; import { Gainburua } from '../components/Gainburua'; import { Container } from '../components/Container'; import styled from 'styled-components'; -import { colors, font, fontWeight, size } from '../ui/theme'; +import { colors, font, fontWeight, media, size } from '../ui/theme'; import BeganoaLogo from '../assets/beganoa.svg'; import EkologikoaLogo from '../assets/ekologikoa.svg'; @@ -26,6 +26,7 @@ const Kafetegia: React.VFC = () => { pikatzekoak, gozoak, tostadak, + konboak, } = useKafetegiaData(); return ( @@ -42,8 +43,8 @@ const Kafetegia: React.VFC = () => { deskribapena={deskribapena} /> - - + + @@ -93,7 +94,24 @@ const Kafetegia: React.VFC = () => { /> + + + + + + GOSARI KONBOAK + + + +

11:00ak arte

+
+ + +
+
+ + @@ -102,20 +120,41 @@ const Kafetegia: React.VFC = () => { -
-
+ + +

On egin!

+
+ + ); }; +const OrduaWrapper = styled.div` + ${font.small()}; + font-weight: ${fontWeight.bold}; + text-align: right; + margin-bottom: ${size.base}px; +`; + +const KonboWrapper = styled.div` + background-color: ${colors.horia}; + padding-top: ${size.base}px; + padding-bottom: ${size.base}px; + margin-bottom: ${size.large}px; +`; + +const OnEgin = styled.div` + text-align: center; + ${font.gargantuan()}; +`; + const ContentWrapper = styled.div` padding: ${size.huge}px 0; `; const TaldeWrapper = styled.section` - &:not(:last-child) { - margin-bottom: ${size.large}px; - } + margin-bottom: ${size.large}px; `; const ZerrendaWrapper = styled.div` @@ -126,10 +165,10 @@ const ZerrendaWrapper = styled.div` const ProduktuZerrenda: React.FC<{ produktuZerrenda: Produktua[]; - izena: React.ReactNode; + izena?: React.ReactNode; }> = ({ produktuZerrenda, izena }) => ( - {izena} + {izena && {izena}} {produktuZerrenda.map(produktua => ( @@ -174,10 +213,15 @@ const ProduktuTaula = styled.table` `; const Ezaugarria = styled.td` - width: ${size.medium}px; - height: ${size.medium}px; + width: ${size.base}px; + height: ${size.base}px; padding: 0 ${size.xtiny}px; vertical-align: top; + + ${media.tablet` + width: ${size.medium}px; + height: ${size.medium}px; + `} `; const Izena = styled.td` diff --git a/front/src/viewQueries/KafetegiaData.ts b/front/src/viewQueries/KafetegiaData.ts index 35f573e..3a19872 100644 --- a/front/src/viewQueries/KafetegiaData.ts +++ b/front/src/viewQueries/KafetegiaData.ts @@ -10,4 +10,5 @@ export interface KafetegiaData { gozoak: Produktua[]; anizkoJogurta: Produktua; tostadak: Produktua[]; + konboak: Produktua[]; } diff --git a/front/src/viewQueries/useKafetegiaData.ts b/front/src/viewQueries/useKafetegiaData.ts index 1f52ec1..32b4570 100644 --- a/front/src/viewQueries/useKafetegiaData.ts +++ b/front/src/viewQueries/useKafetegiaData.ts @@ -16,6 +16,7 @@ interface DataProps { gozoak: ProduktuaDTO[]; anizkoJogurta: ProduktuaDTO; tostadak: ProduktuaDTO[]; + konboak: ProduktuaDTO[]; }; }; }; @@ -35,6 +36,7 @@ export function useKafetegiaData(): KafetegiaData { pikatzekoak, gozoak, tostadak, + konboak, }, }, }, @@ -206,6 +208,29 @@ export function useKafetegiaData(): KafetegiaData { ziapea } } + konboak { + id + ekologikoa + beganoa + izena + prezioa + alergenoak { + apioa + arraina + arrautzak + esnekiak + fruituLehorrak + glutena + kakahueteak + krustazeoak + lupinuak + moluskuak + sesamoa + soja + sulfitoak + ziapea + } + } } } } @@ -222,5 +247,6 @@ export function useKafetegiaData(): KafetegiaData { pikatzekoak: pikatzekoak.map(produktuaFactory), gozoak: gozoak.map(produktuaFactory), tostadak: tostadak.map(produktuaFactory), + konboak: konboak.map(produktuaFactory), }; }