From 6df396ee04eb95140116c022e627db18b7d6a15d Mon Sep 17 00:00:00 2001 From: Aitor Urrutia Date: Sat, 19 Mar 2022 21:37:25 +0100 Subject: [PATCH] chore: konpilazioa konpontzen du --- .../AlergenoLegenda/AlergenoLegenda.tsx | 14 ++++---------- .../assets/alergenoak/apioa.svg | 0 .../assets/alergenoak/arraina.svg | 0 .../assets/alergenoak/arrautzak.svg | 0 .../assets/alergenoak/esnekiak.svg | 0 .../assets/alergenoak/fruituLehorrak.svg | 0 .../assets/alergenoak/glutena.svg | 0 .../assets/alergenoak/kakahueteak.svg | 0 .../assets/alergenoak/krustazeoak.svg | 0 .../assets/alergenoak/lupinuak.svg | 0 .../assets/alergenoak/moluskuak.svg | 0 .../assets/alergenoak/sesamoa.svg | 0 .../AlergenoLegenda/assets/alergenoak/soja.svg | 0 .../assets/alergenoak/sulfitoak.svg | 0 .../assets/alergenoak/ziapea.svg | 0 .../components/AlergenoLegenda/index.ts | 0 .../{kafetegia/index.tsx => kafetegia.tsx} | 18 +++++++++--------- .../kafetegia => viewQueries}/KafetegiaData.ts | 2 +- .../useKafetegiaData.ts | 4 ++-- 19 files changed, 16 insertions(+), 22 deletions(-) rename front/src/{pages/kafetegia => }/components/AlergenoLegenda/AlergenoLegenda.tsx (89%) rename front/src/{pages/kafetegia => }/components/AlergenoLegenda/assets/alergenoak/apioa.svg (100%) rename front/src/{pages/kafetegia => }/components/AlergenoLegenda/assets/alergenoak/arraina.svg (100%) rename front/src/{pages/kafetegia => }/components/AlergenoLegenda/assets/alergenoak/arrautzak.svg (100%) rename front/src/{pages/kafetegia => }/components/AlergenoLegenda/assets/alergenoak/esnekiak.svg (100%) rename front/src/{pages/kafetegia => }/components/AlergenoLegenda/assets/alergenoak/fruituLehorrak.svg (100%) rename front/src/{pages/kafetegia => }/components/AlergenoLegenda/assets/alergenoak/glutena.svg (100%) rename front/src/{pages/kafetegia => }/components/AlergenoLegenda/assets/alergenoak/kakahueteak.svg (100%) rename front/src/{pages/kafetegia => }/components/AlergenoLegenda/assets/alergenoak/krustazeoak.svg (100%) rename front/src/{pages/kafetegia => }/components/AlergenoLegenda/assets/alergenoak/lupinuak.svg (100%) rename front/src/{pages/kafetegia => }/components/AlergenoLegenda/assets/alergenoak/moluskuak.svg (100%) rename front/src/{pages/kafetegia => }/components/AlergenoLegenda/assets/alergenoak/sesamoa.svg (100%) rename front/src/{pages/kafetegia => }/components/AlergenoLegenda/assets/alergenoak/soja.svg (100%) rename front/src/{pages/kafetegia => }/components/AlergenoLegenda/assets/alergenoak/sulfitoak.svg (100%) rename front/src/{pages/kafetegia => }/components/AlergenoLegenda/assets/alergenoak/ziapea.svg (100%) rename front/src/{pages/kafetegia => }/components/AlergenoLegenda/index.ts (100%) rename front/src/pages/{kafetegia/index.tsx => kafetegia.tsx} (91%) rename front/src/{pages/kafetegia => viewQueries}/KafetegiaData.ts (82%) rename front/src/{pages/kafetegia => viewQueries}/useKafetegiaData.ts (97%) diff --git a/front/src/pages/kafetegia/components/AlergenoLegenda/AlergenoLegenda.tsx b/front/src/components/AlergenoLegenda/AlergenoLegenda.tsx similarity index 89% rename from front/src/pages/kafetegia/components/AlergenoLegenda/AlergenoLegenda.tsx rename to front/src/components/AlergenoLegenda/AlergenoLegenda.tsx index c3433f7..5b8109b 100644 --- a/front/src/pages/kafetegia/components/AlergenoLegenda/AlergenoLegenda.tsx +++ b/front/src/components/AlergenoLegenda/AlergenoLegenda.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { AlergenoIdentifikadorea } from '../../../../domain/models/AlergenoIdentifikadorea'; +import { AlergenoIdentifikadorea } from '../../domain/models/AlergenoIdentifikadorea'; import Esnekiak from './assets/alergenoak/esnekiak.svg'; import Arrautzak from './assets/alergenoak/arrautzak.svg'; import Glutena from './assets/alergenoak/glutena.svg'; @@ -17,15 +17,9 @@ import Apioa from './assets/alergenoak/apioa.svg'; import Ziapea from './assets/alergenoak/ziapea.svg'; import styled from 'styled-components'; import { rem } from 'polished'; -import { - breakpoints, - colors, - fontWeight, - media, - size, -} from '../../../../ui/theme'; -import { mapAlergenoIdentifikadoreaToIzena } from '../../../../domain/mappers/mapAlergenoIdentifikadoreaToIzena'; -import { mapAlergenoIdentifikadoreaToZenbakia } from '../../../../domain/mappers/mapAlergenoIdentifikadoreaToZenbakia'; +import { breakpoints, colors, fontWeight, media, size } from '../../ui/theme'; +import { mapAlergenoIdentifikadoreaToIzena } from '../../domain/mappers/mapAlergenoIdentifikadoreaToIzena'; +import { mapAlergenoIdentifikadoreaToZenbakia } from '../../domain/mappers/mapAlergenoIdentifikadoreaToZenbakia'; import { useMediaQuery } from 'react-responsive'; const alergenoakOrdenaturik: AlergenoIdentifikadorea[] = [ diff --git a/front/src/pages/kafetegia/components/AlergenoLegenda/assets/alergenoak/apioa.svg b/front/src/components/AlergenoLegenda/assets/alergenoak/apioa.svg similarity index 100% rename from front/src/pages/kafetegia/components/AlergenoLegenda/assets/alergenoak/apioa.svg rename to front/src/components/AlergenoLegenda/assets/alergenoak/apioa.svg diff --git a/front/src/pages/kafetegia/components/AlergenoLegenda/assets/alergenoak/arraina.svg b/front/src/components/AlergenoLegenda/assets/alergenoak/arraina.svg similarity index 100% rename from front/src/pages/kafetegia/components/AlergenoLegenda/assets/alergenoak/arraina.svg rename to front/src/components/AlergenoLegenda/assets/alergenoak/arraina.svg diff --git a/front/src/pages/kafetegia/components/AlergenoLegenda/assets/alergenoak/arrautzak.svg b/front/src/components/AlergenoLegenda/assets/alergenoak/arrautzak.svg similarity index 100% rename from front/src/pages/kafetegia/components/AlergenoLegenda/assets/alergenoak/arrautzak.svg rename to front/src/components/AlergenoLegenda/assets/alergenoak/arrautzak.svg diff --git a/front/src/pages/kafetegia/components/AlergenoLegenda/assets/alergenoak/esnekiak.svg b/front/src/components/AlergenoLegenda/assets/alergenoak/esnekiak.svg similarity index 100% rename from front/src/pages/kafetegia/components/AlergenoLegenda/assets/alergenoak/esnekiak.svg rename to front/src/components/AlergenoLegenda/assets/alergenoak/esnekiak.svg diff --git a/front/src/pages/kafetegia/components/AlergenoLegenda/assets/alergenoak/fruituLehorrak.svg b/front/src/components/AlergenoLegenda/assets/alergenoak/fruituLehorrak.svg similarity index 100% rename from front/src/pages/kafetegia/components/AlergenoLegenda/assets/alergenoak/fruituLehorrak.svg rename to front/src/components/AlergenoLegenda/assets/alergenoak/fruituLehorrak.svg diff --git a/front/src/pages/kafetegia/components/AlergenoLegenda/assets/alergenoak/glutena.svg b/front/src/components/AlergenoLegenda/assets/alergenoak/glutena.svg similarity index 100% rename from front/src/pages/kafetegia/components/AlergenoLegenda/assets/alergenoak/glutena.svg rename to front/src/components/AlergenoLegenda/assets/alergenoak/glutena.svg diff --git a/front/src/pages/kafetegia/components/AlergenoLegenda/assets/alergenoak/kakahueteak.svg b/front/src/components/AlergenoLegenda/assets/alergenoak/kakahueteak.svg similarity index 100% rename from front/src/pages/kafetegia/components/AlergenoLegenda/assets/alergenoak/kakahueteak.svg rename to front/src/components/AlergenoLegenda/assets/alergenoak/kakahueteak.svg diff --git a/front/src/pages/kafetegia/components/AlergenoLegenda/assets/alergenoak/krustazeoak.svg b/front/src/components/AlergenoLegenda/assets/alergenoak/krustazeoak.svg similarity index 100% rename from front/src/pages/kafetegia/components/AlergenoLegenda/assets/alergenoak/krustazeoak.svg rename to front/src/components/AlergenoLegenda/assets/alergenoak/krustazeoak.svg diff --git a/front/src/pages/kafetegia/components/AlergenoLegenda/assets/alergenoak/lupinuak.svg b/front/src/components/AlergenoLegenda/assets/alergenoak/lupinuak.svg similarity index 100% rename from front/src/pages/kafetegia/components/AlergenoLegenda/assets/alergenoak/lupinuak.svg rename to front/src/components/AlergenoLegenda/assets/alergenoak/lupinuak.svg diff --git a/front/src/pages/kafetegia/components/AlergenoLegenda/assets/alergenoak/moluskuak.svg b/front/src/components/AlergenoLegenda/assets/alergenoak/moluskuak.svg similarity index 100% rename from front/src/pages/kafetegia/components/AlergenoLegenda/assets/alergenoak/moluskuak.svg rename to front/src/components/AlergenoLegenda/assets/alergenoak/moluskuak.svg diff --git a/front/src/pages/kafetegia/components/AlergenoLegenda/assets/alergenoak/sesamoa.svg b/front/src/components/AlergenoLegenda/assets/alergenoak/sesamoa.svg similarity index 100% rename from front/src/pages/kafetegia/components/AlergenoLegenda/assets/alergenoak/sesamoa.svg rename to front/src/components/AlergenoLegenda/assets/alergenoak/sesamoa.svg diff --git a/front/src/pages/kafetegia/components/AlergenoLegenda/assets/alergenoak/soja.svg b/front/src/components/AlergenoLegenda/assets/alergenoak/soja.svg similarity index 100% rename from front/src/pages/kafetegia/components/AlergenoLegenda/assets/alergenoak/soja.svg rename to front/src/components/AlergenoLegenda/assets/alergenoak/soja.svg diff --git a/front/src/pages/kafetegia/components/AlergenoLegenda/assets/alergenoak/sulfitoak.svg b/front/src/components/AlergenoLegenda/assets/alergenoak/sulfitoak.svg similarity index 100% rename from front/src/pages/kafetegia/components/AlergenoLegenda/assets/alergenoak/sulfitoak.svg rename to front/src/components/AlergenoLegenda/assets/alergenoak/sulfitoak.svg diff --git a/front/src/pages/kafetegia/components/AlergenoLegenda/assets/alergenoak/ziapea.svg b/front/src/components/AlergenoLegenda/assets/alergenoak/ziapea.svg similarity index 100% rename from front/src/pages/kafetegia/components/AlergenoLegenda/assets/alergenoak/ziapea.svg rename to front/src/components/AlergenoLegenda/assets/alergenoak/ziapea.svg diff --git a/front/src/pages/kafetegia/components/AlergenoLegenda/index.ts b/front/src/components/AlergenoLegenda/index.ts similarity index 100% rename from front/src/pages/kafetegia/components/AlergenoLegenda/index.ts rename to front/src/components/AlergenoLegenda/index.ts diff --git a/front/src/pages/kafetegia/index.tsx b/front/src/pages/kafetegia.tsx similarity index 91% rename from front/src/pages/kafetegia/index.tsx rename to front/src/pages/kafetegia.tsx index 3b37b36..34d0620 100644 --- a/front/src/pages/kafetegia/index.tsx +++ b/front/src/pages/kafetegia.tsx @@ -1,19 +1,19 @@ import { PageProps } from 'gatsby'; import React from 'react'; -import { GlobalStyles } from '../../ui/GlobalStyles'; +import { GlobalStyles } from '../ui/GlobalStyles'; import { Helmet } from 'react-helmet'; -import { Gainburua } from '../../components/Gainburua'; -import { Container } from '../../components/Container'; +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, size } from '../ui/theme'; -import BeganoaLogo from '../../assets/beganoa.svg'; -import EkologikoaLogo from '../../assets/ekologikoa.svg'; +import BeganoaLogo from '../assets/beganoa.svg'; +import EkologikoaLogo from '../assets/ekologikoa.svg'; import { rem } from 'polished'; -import { Produktua } from '../../domain/models/Produktua'; -import { useKafetegiaData } from './useKafetegiaData'; -import { AlergenoLegenda } from './components/AlergenoLegenda'; +import { Produktua } from '../domain/models/Produktua'; +import { useKafetegiaData } from '../viewQueries/useKafetegiaData'; +import { AlergenoLegenda } from '../components/AlergenoLegenda'; const Kafetegia: React.VFC = () => { const { diff --git a/front/src/pages/kafetegia/KafetegiaData.ts b/front/src/viewQueries/KafetegiaData.ts similarity index 82% rename from front/src/pages/kafetegia/KafetegiaData.ts rename to front/src/viewQueries/KafetegiaData.ts index 8ad5975..35f573e 100644 --- a/front/src/pages/kafetegia/KafetegiaData.ts +++ b/front/src/viewQueries/KafetegiaData.ts @@ -1,4 +1,4 @@ -import { Produktua } from '../../domain/models/Produktua'; +import { Produktua } from '../domain/models/Produktua'; export interface KafetegiaData { deskribapena: string; diff --git a/front/src/pages/kafetegia/useKafetegiaData.ts b/front/src/viewQueries/useKafetegiaData.ts similarity index 97% rename from front/src/pages/kafetegia/useKafetegiaData.ts rename to front/src/viewQueries/useKafetegiaData.ts index 18c8668..1f52ec1 100644 --- a/front/src/pages/kafetegia/useKafetegiaData.ts +++ b/front/src/viewQueries/useKafetegiaData.ts @@ -1,6 +1,6 @@ import { graphql, useStaticQuery } from 'gatsby'; -import { ProduktuaDTO } from '../../domain/dtos/ProduktuaDTO'; -import { produktuaFactory } from '../../domain/factories/produktuaFactory'; +import { ProduktuaDTO } from '../domain/dtos/ProduktuaDTO'; +import { produktuaFactory } from '../domain/factories/produktuaFactory'; import { KafetegiaData } from './KafetegiaData'; interface DataProps {