diff --git a/back/database/migrations/development.db b/back/database/migrations/development.db index 6f7a227..5c78dff 100644 Binary files a/back/database/migrations/development.db and b/back/database/migrations/development.db differ diff --git a/front/src/components/SEO.tsx b/front/src/components/SEO.tsx index ae92313..432a52f 100644 --- a/front/src/components/SEO.tsx +++ b/front/src/components/SEO.tsx @@ -3,8 +3,6 @@ import { Helmet } from 'react-helmet'; import { PageProps } from 'gatsby'; -import ogImagePath from '../images/og-image.jpeg'; - interface Props { title: string; description?: string; @@ -18,7 +16,7 @@ export const SEO: React.FC = ({ title, description, location }) => ( diff --git a/front/src/views/RegularPage/RegularPageContent.ts b/front/src/domain/basicPage/RegularPageContent.ts similarity index 100% rename from front/src/views/RegularPage/RegularPageContent.ts rename to front/src/domain/basicPage/RegularPageContent.ts diff --git a/front/src/domain/basicPage/hooks/useLegeOharraContent.ts b/front/src/domain/basicPage/hooks/useLegeOharraContent.ts new file mode 100644 index 0000000..4655af2 --- /dev/null +++ b/front/src/domain/basicPage/hooks/useLegeOharraContent.ts @@ -0,0 +1,20 @@ +import { graphql, useStaticQuery } from 'gatsby'; + +import { RegularPageContent } from '../RegularPageContent'; + +interface DataProps { + strapiLegeOharra: RegularPageContent; +} + +export function useLegeOharraContent(): RegularPageContent { + const { strapiLegeOharra } = useStaticQuery(graphql` + { + strapiLegeOharra { + izenburua + edukia + } + } + `); + + return strapiLegeOharra; +} diff --git a/front/src/domain/basicPage/hooks/usePribatutasunPolitikaContent.ts b/front/src/domain/basicPage/hooks/usePribatutasunPolitikaContent.ts new file mode 100644 index 0000000..c5571f5 --- /dev/null +++ b/front/src/domain/basicPage/hooks/usePribatutasunPolitikaContent.ts @@ -0,0 +1,20 @@ +import { graphql, useStaticQuery } from 'gatsby'; + +import { RegularPageContent } from '../RegularPageContent'; + +interface DataProps { + strapiPribatutasunPolitika: RegularPageContent; +} + +export function usePribatutasunPolitikaContent(): RegularPageContent { + const { strapiPribatutasunPolitika } = useStaticQuery(graphql` + { + strapiPribatutasunPolitika { + izenburua + edukia + } + } + `); + + return strapiPribatutasunPolitika; +} diff --git a/front/src/views/Hasiera/HasieraContent.ts b/front/src/domain/hasiera/HasieraContent.ts similarity index 100% rename from front/src/views/Hasiera/HasieraContent.ts rename to front/src/domain/hasiera/HasieraContent.ts diff --git a/front/src/domain/hasiera/hooks/useHasieraContent.ts b/front/src/domain/hasiera/hooks/useHasieraContent.ts new file mode 100644 index 0000000..639c94a --- /dev/null +++ b/front/src/domain/hasiera/hooks/useHasieraContent.ts @@ -0,0 +1,21 @@ +import { graphql, useStaticQuery } from 'gatsby'; + +import { HasieraContent } from '../HasieraContent'; + +interface DataProps { + strapiHasiera: HasieraContent; +} + +export function useHasieraContent(): HasieraContent { + const { strapiHasiera } = useStaticQuery(graphql` + { + strapiHasiera { + deskribapena + izenburua + edukia + } + } + `); + + return strapiHasiera; +} diff --git a/front/src/domain/kafetegia/KafetegiaContent.ts b/front/src/domain/kafetegia/KafetegiaContent.ts new file mode 100644 index 0000000..ee4529f --- /dev/null +++ b/front/src/domain/kafetegia/KafetegiaContent.ts @@ -0,0 +1,7 @@ +import { MenuKonponentea } from './hooks/useKafetegiaContent'; + +export interface KafetegiaContent { + deskribapena: string; + izenburua: string; + menua: MenuKonponentea[]; +} diff --git a/front/src/domain/dtos/ProduktuaDTO.ts b/front/src/domain/kafetegia/dtos/ProduktuaDTO.ts similarity index 100% rename from front/src/domain/dtos/ProduktuaDTO.ts rename to front/src/domain/kafetegia/dtos/ProduktuaDTO.ts diff --git a/front/src/domain/factories/produktuaFactory.ts b/front/src/domain/kafetegia/factories/produktuaFactory.ts similarity index 100% rename from front/src/domain/factories/produktuaFactory.ts rename to front/src/domain/kafetegia/factories/produktuaFactory.ts diff --git a/front/src/viewQueries/useKafetegiaData.ts b/front/src/domain/kafetegia/hooks/useKafetegiaContent.ts similarity index 90% rename from front/src/viewQueries/useKafetegiaData.ts rename to front/src/domain/kafetegia/hooks/useKafetegiaContent.ts index b21aabf..dcedbf4 100644 --- a/front/src/viewQueries/useKafetegiaData.ts +++ b/front/src/domain/kafetegia/hooks/useKafetegiaContent.ts @@ -1,7 +1,7 @@ import { graphql, useStaticQuery } from 'gatsby'; -import { ProduktuaDTO } from '../domain/dtos/ProduktuaDTO'; -import { KafetegiaData } from './KafetegiaData'; +import { ProduktuaDTO } from '../dtos/ProduktuaDTO'; +import { KafetegiaContent } from '../KafetegiaContent'; export type MenuKonponentea = | { @@ -24,7 +24,7 @@ interface DataProps { }; } -export function useKafetegiaData(): KafetegiaData { +export function useKafetegiaContent(): KafetegiaContent { const { strapiKafetegia: { izenburua, deskribapena, menua }, } = useStaticQuery(graphql` diff --git a/front/src/domain/mappers/mapAlergenoIdentifikadoreaToIzena.ts b/front/src/domain/kafetegia/mappers/mapAlergenoIdentifikadoreaToIzena.ts similarity index 100% rename from front/src/domain/mappers/mapAlergenoIdentifikadoreaToIzena.ts rename to front/src/domain/kafetegia/mappers/mapAlergenoIdentifikadoreaToIzena.ts diff --git a/front/src/domain/mappers/mapAlergenoIdentifikadoreaToZenbakia.ts b/front/src/domain/kafetegia/mappers/mapAlergenoIdentifikadoreaToZenbakia.ts similarity index 100% rename from front/src/domain/mappers/mapAlergenoIdentifikadoreaToZenbakia.ts rename to front/src/domain/kafetegia/mappers/mapAlergenoIdentifikadoreaToZenbakia.ts diff --git a/front/src/domain/models/AlergenoIdentifikadorea.ts b/front/src/domain/kafetegia/models/AlergenoIdentifikadorea.ts similarity index 100% rename from front/src/domain/models/AlergenoIdentifikadorea.ts rename to front/src/domain/kafetegia/models/AlergenoIdentifikadorea.ts diff --git a/front/src/domain/models/Alergenoa.ts b/front/src/domain/kafetegia/models/Alergenoa.ts similarity index 100% rename from front/src/domain/models/Alergenoa.ts rename to front/src/domain/kafetegia/models/Alergenoa.ts diff --git a/front/src/domain/models/Produktua.ts b/front/src/domain/kafetegia/models/Produktua.ts similarity index 100% rename from front/src/domain/models/Produktua.ts rename to front/src/domain/kafetegia/models/Produktua.ts diff --git a/front/src/images/logo.png b/front/src/images/logo.png deleted file mode 100644 index 7993095..0000000 Binary files a/front/src/images/logo.png and /dev/null differ diff --git a/front/src/pages/PribatutasunPolitika.tsx b/front/src/pages/PribatutasunPolitika.tsx new file mode 100644 index 0000000..42b859a --- /dev/null +++ b/front/src/pages/PribatutasunPolitika.tsx @@ -0,0 +1,26 @@ +import React from 'react'; + +import { graphql, PageProps, useStaticQuery } from 'gatsby'; + +import { SEO } from '../components/SEO'; +import { RegularPage } from '../views/RegularPage/RegularPage'; +import { DataProps } from './pribatutasun-politika'; + +export const PribatutasunPolitika: React.FC = ({ location }) => { + const { strapiPribatutasunPolitika } = useStaticQuery(graphql` + { + strapiPribatutasunPolitika { + izenburua + edukia + } + } + `); + + return ( + <> + + + + + ); +}; diff --git a/front/src/pages/index.tsx b/front/src/pages/index.tsx index a41efdc..feb8cf8 100644 --- a/front/src/pages/index.tsx +++ b/front/src/pages/index.tsx @@ -1,35 +1,23 @@ import React from 'react'; -import { graphql, PageProps, useStaticQuery } from 'gatsby'; +import { PageProps } from 'gatsby'; import { SEO } from '../components/SEO'; +import { useHasieraContent } from '../domain/hasiera/hooks/useHasieraContent'; import { Hasiera } from '../views/Hasiera/Hasiera'; -import { HasieraContent } from '../views/Hasiera/HasieraContent'; - -interface DataProps { - strapiHasiera: HasieraContent; -} const IndexPage: React.FC = ({ location }) => { - const { strapiHasiera } = useStaticQuery(graphql` - { - strapiHasiera { - deskribapena - izenburua - edukia - } - } - `); + const content = useHasieraContent(); return ( <> - + ); }; diff --git a/front/src/pages/kafetegia.tsx b/front/src/pages/kafetegia.tsx index 668d515..6205f38 100644 --- a/front/src/pages/kafetegia.tsx +++ b/front/src/pages/kafetegia.tsx @@ -3,11 +3,11 @@ import React from 'react'; import { PageProps } from 'gatsby'; import { SEO } from '../components/SEO'; -import { useKafetegiaData } from '../viewQueries/useKafetegiaData'; +import { useKafetegiaContent } from '../domain/kafetegia/hooks/useKafetegiaContent'; import { Kafetegia } from '../views/Kafetegia'; const KafetegiaPage: React.FC = ({ location }) => { - const content = useKafetegiaData(); + const content = useKafetegiaContent(); return ( <> diff --git a/front/src/pages/lege-oharra.tsx b/front/src/pages/lege-oharra.tsx index 9fb7dbf..e34543c 100644 --- a/front/src/pages/lege-oharra.tsx +++ b/front/src/pages/lege-oharra.tsx @@ -1,30 +1,19 @@ import React from 'react'; -import { graphql, PageProps, useStaticQuery } from 'gatsby'; +import { PageProps } from 'gatsby'; import { SEO } from '../components/SEO'; +import { useLegeOharraContent } from '../domain/basicPage/hooks/useLegeOharraContent'; import { RegularPage } from '../views/RegularPage'; -import { RegularPageContent } from '../views/RegularPage/RegularPageContent'; - -interface DataProps { - strapiLegeOharra: RegularPageContent; -} const LegeOharra: React.FC = ({ location }) => { - const { strapiLegeOharra } = useStaticQuery(graphql` - { - strapiLegeOharra { - izenburua - edukia - } - } - `); + const content = useLegeOharraContent(); return ( <> - + - + ); }; diff --git a/front/src/pages/pribatutasun-politika.tsx b/front/src/pages/pribatutasun-politika.tsx index 0ebb457..b5c63ec 100644 --- a/front/src/pages/pribatutasun-politika.tsx +++ b/front/src/pages/pribatutasun-politika.tsx @@ -1,30 +1,19 @@ import React from 'react'; -import { graphql, PageProps, useStaticQuery } from 'gatsby'; +import { PageProps } from 'gatsby'; import { SEO } from '../components/SEO'; +import { usePribatutasunPolitikaContent } from '../domain/basicPage/hooks/usePribatutasunPolitikaContent'; import { RegularPage } from '../views/RegularPage/RegularPage'; -import { RegularPageContent } from '../views/RegularPage/RegularPageContent'; - -interface DataProps { - strapiPribatutasunPolitika: RegularPageContent; -} const PribatutasunPolitika: React.FC = ({ location }) => { - const { strapiPribatutasunPolitika } = useStaticQuery(graphql` - { - strapiPribatutasunPolitika { - izenburua - edukia - } - } - `); + const content = usePribatutasunPolitikaContent(); return ( <> - + - + ); }; diff --git a/front/src/viewQueries/KafetegiaData.ts b/front/src/viewQueries/KafetegiaData.ts deleted file mode 100644 index a62c3bc..0000000 --- a/front/src/viewQueries/KafetegiaData.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { MenuKonponentea } from './useKafetegiaData'; - -export interface KafetegiaData { - deskribapena: string; - izenburua: string; - menua: MenuKonponentea[]; -} diff --git a/front/src/views/Hasiera/Hasiera.tsx b/front/src/views/Hasiera/Hasiera.tsx index b83a830..c87e153 100644 --- a/front/src/views/Hasiera/Hasiera.tsx +++ b/front/src/views/Hasiera/Hasiera.tsx @@ -2,11 +2,11 @@ import React from 'react'; import ReactMarkdown from 'react-markdown'; import Gezia from '../../assets/gezia.svg'; -import { Container } from '../../components/Container'; -import { Gainburua } from '../../components/Gainburua'; -import { Oina } from '../../components/Oina'; +import { HasieraContent } from '../../domain/hasiera/HasieraContent'; +import { Container } from '../components/Container'; +import { Gainburua } from '../components/Gainburua'; +import { Oina } from '../components/Oina'; import * as styles from './Hasiera.module.scss'; -import { HasieraContent } from './HasieraContent'; interface Props { content: HasieraContent; diff --git a/front/src/views/Kafetegia/Kafetegia.tsx b/front/src/views/Kafetegia/Kafetegia.tsx index 512cc8f..70a79ed 100644 --- a/front/src/views/Kafetegia/Kafetegia.tsx +++ b/front/src/views/Kafetegia/Kafetegia.tsx @@ -1,15 +1,15 @@ import React from 'react'; -import { AlergenoLegenda } from '../../components/AlergenoLegenda'; -import { Container } from '../../components/Container'; -import { Gainburua } from '../../components/Gainburua'; -import { Oina } from '../../components/Oina'; -import { produktuaFactory } from '../../domain/factories/produktuaFactory'; -import { KafetegiaData } from '../../viewQueries/KafetegiaData'; +import { produktuaFactory } from '../../domain/kafetegia/factories/produktuaFactory'; +import { KafetegiaContent } from '../../domain/kafetegia/KafetegiaContent'; +import { Container } from '../components/Container'; +import { Gainburua } from '../components/Gainburua'; +import { Oina } from '../components/Oina'; +import { AlergenoLegenda } from './components/AlergenoLegenda'; import { ProduktuZerrenda } from './components/ProduktuZerrenda'; import * as styles from './Kafetegia.module.scss'; -export const Kafetegia: React.FC<{ content: KafetegiaData }> = ({ +export const Kafetegia: React.FC<{ content: KafetegiaContent }> = ({ content, }) => { const { izenburua, deskribapena, menua } = content; diff --git a/front/src/components/AlergenoLegenda/AlergenoLegenda.module.scss b/front/src/views/Kafetegia/components/AlergenoLegenda/AlergenoLegenda.module.scss similarity index 94% rename from front/src/components/AlergenoLegenda/AlergenoLegenda.module.scss rename to front/src/views/Kafetegia/components/AlergenoLegenda/AlergenoLegenda.module.scss index 6043207..532aa8e 100644 --- a/front/src/components/AlergenoLegenda/AlergenoLegenda.module.scss +++ b/front/src/views/Kafetegia/components/AlergenoLegenda/AlergenoLegenda.module.scss @@ -1,4 +1,4 @@ -@import '../../styles/tools/mediaQueries.scss'; +@import '../../../../styles/tools/mediaQueries.scss'; .wrapper { width: 100%; diff --git a/front/src/components/AlergenoLegenda/AlergenoLegenda.tsx b/front/src/views/Kafetegia/components/AlergenoLegenda/AlergenoLegenda.tsx similarity index 73% rename from front/src/components/AlergenoLegenda/AlergenoLegenda.tsx rename to front/src/views/Kafetegia/components/AlergenoLegenda/AlergenoLegenda.tsx index 264098a..da444c0 100644 --- a/front/src/components/AlergenoLegenda/AlergenoLegenda.tsx +++ b/front/src/views/Kafetegia/components/AlergenoLegenda/AlergenoLegenda.tsx @@ -1,8 +1,8 @@ import React from 'react'; -import { mapAlergenoIdentifikadoreaToIzena } from '../../domain/mappers/mapAlergenoIdentifikadoreaToIzena'; -import { mapAlergenoIdentifikadoreaToZenbakia } from '../../domain/mappers/mapAlergenoIdentifikadoreaToZenbakia'; -import { AlergenoIdentifikadorea } from '../../domain/models/AlergenoIdentifikadorea'; +import { mapAlergenoIdentifikadoreaToIzena } from '../../../../domain/kafetegia/mappers/mapAlergenoIdentifikadoreaToIzena'; +import { mapAlergenoIdentifikadoreaToZenbakia } from '../../../../domain/kafetegia/mappers/mapAlergenoIdentifikadoreaToZenbakia'; +import { AlergenoIdentifikadorea } from '../../../../domain/kafetegia/models/AlergenoIdentifikadorea'; import * as styles from './AlergenoLegenda.module.scss'; import { AlergenoLogoa } from './AlergenoLogoa'; diff --git a/front/src/components/AlergenoLegenda/AlergenoLogoa.tsx b/front/src/views/Kafetegia/components/AlergenoLegenda/AlergenoLogoa.tsx similarity index 94% rename from front/src/components/AlergenoLegenda/AlergenoLogoa.tsx rename to front/src/views/Kafetegia/components/AlergenoLegenda/AlergenoLogoa.tsx index 20e9981..abb0ff1 100644 --- a/front/src/components/AlergenoLegenda/AlergenoLogoa.tsx +++ b/front/src/views/Kafetegia/components/AlergenoLegenda/AlergenoLogoa.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { AlergenoIdentifikadorea } from '../../domain/models/AlergenoIdentifikadorea'; +import { AlergenoIdentifikadorea } from '../../../../domain/kafetegia/models/AlergenoIdentifikadorea'; import Apioa from './assets/alergenoak/apioa.svg'; import Arraina from './assets/alergenoak/arraina.svg'; import Arrautzak from './assets/alergenoak/arrautzak.svg'; diff --git a/front/src/components/AlergenoLegenda/assets/alergenoak/apioa.svg b/front/src/views/Kafetegia/components/AlergenoLegenda/assets/alergenoak/apioa.svg similarity index 100% rename from front/src/components/AlergenoLegenda/assets/alergenoak/apioa.svg rename to front/src/views/Kafetegia/components/AlergenoLegenda/assets/alergenoak/apioa.svg diff --git a/front/src/components/AlergenoLegenda/assets/alergenoak/arraina.svg b/front/src/views/Kafetegia/components/AlergenoLegenda/assets/alergenoak/arraina.svg similarity index 100% rename from front/src/components/AlergenoLegenda/assets/alergenoak/arraina.svg rename to front/src/views/Kafetegia/components/AlergenoLegenda/assets/alergenoak/arraina.svg diff --git a/front/src/components/AlergenoLegenda/assets/alergenoak/arrautzak.svg b/front/src/views/Kafetegia/components/AlergenoLegenda/assets/alergenoak/arrautzak.svg similarity index 100% rename from front/src/components/AlergenoLegenda/assets/alergenoak/arrautzak.svg rename to front/src/views/Kafetegia/components/AlergenoLegenda/assets/alergenoak/arrautzak.svg diff --git a/front/src/components/AlergenoLegenda/assets/alergenoak/esnekiak.svg b/front/src/views/Kafetegia/components/AlergenoLegenda/assets/alergenoak/esnekiak.svg similarity index 100% rename from front/src/components/AlergenoLegenda/assets/alergenoak/esnekiak.svg rename to front/src/views/Kafetegia/components/AlergenoLegenda/assets/alergenoak/esnekiak.svg diff --git a/front/src/components/AlergenoLegenda/assets/alergenoak/fruituLehorrak.svg b/front/src/views/Kafetegia/components/AlergenoLegenda/assets/alergenoak/fruituLehorrak.svg similarity index 100% rename from front/src/components/AlergenoLegenda/assets/alergenoak/fruituLehorrak.svg rename to front/src/views/Kafetegia/components/AlergenoLegenda/assets/alergenoak/fruituLehorrak.svg diff --git a/front/src/components/AlergenoLegenda/assets/alergenoak/glutena.svg b/front/src/views/Kafetegia/components/AlergenoLegenda/assets/alergenoak/glutena.svg similarity index 100% rename from front/src/components/AlergenoLegenda/assets/alergenoak/glutena.svg rename to front/src/views/Kafetegia/components/AlergenoLegenda/assets/alergenoak/glutena.svg diff --git a/front/src/components/AlergenoLegenda/assets/alergenoak/kakahueteak.svg b/front/src/views/Kafetegia/components/AlergenoLegenda/assets/alergenoak/kakahueteak.svg similarity index 100% rename from front/src/components/AlergenoLegenda/assets/alergenoak/kakahueteak.svg rename to front/src/views/Kafetegia/components/AlergenoLegenda/assets/alergenoak/kakahueteak.svg diff --git a/front/src/components/AlergenoLegenda/assets/alergenoak/krustazeoak.svg b/front/src/views/Kafetegia/components/AlergenoLegenda/assets/alergenoak/krustazeoak.svg similarity index 100% rename from front/src/components/AlergenoLegenda/assets/alergenoak/krustazeoak.svg rename to front/src/views/Kafetegia/components/AlergenoLegenda/assets/alergenoak/krustazeoak.svg diff --git a/front/src/components/AlergenoLegenda/assets/alergenoak/lupinuak.svg b/front/src/views/Kafetegia/components/AlergenoLegenda/assets/alergenoak/lupinuak.svg similarity index 100% rename from front/src/components/AlergenoLegenda/assets/alergenoak/lupinuak.svg rename to front/src/views/Kafetegia/components/AlergenoLegenda/assets/alergenoak/lupinuak.svg diff --git a/front/src/components/AlergenoLegenda/assets/alergenoak/moluskuak.svg b/front/src/views/Kafetegia/components/AlergenoLegenda/assets/alergenoak/moluskuak.svg similarity index 100% rename from front/src/components/AlergenoLegenda/assets/alergenoak/moluskuak.svg rename to front/src/views/Kafetegia/components/AlergenoLegenda/assets/alergenoak/moluskuak.svg diff --git a/front/src/components/AlergenoLegenda/assets/alergenoak/sesamoa.svg b/front/src/views/Kafetegia/components/AlergenoLegenda/assets/alergenoak/sesamoa.svg similarity index 100% rename from front/src/components/AlergenoLegenda/assets/alergenoak/sesamoa.svg rename to front/src/views/Kafetegia/components/AlergenoLegenda/assets/alergenoak/sesamoa.svg diff --git a/front/src/components/AlergenoLegenda/assets/alergenoak/soja.svg b/front/src/views/Kafetegia/components/AlergenoLegenda/assets/alergenoak/soja.svg similarity index 100% rename from front/src/components/AlergenoLegenda/assets/alergenoak/soja.svg rename to front/src/views/Kafetegia/components/AlergenoLegenda/assets/alergenoak/soja.svg diff --git a/front/src/components/AlergenoLegenda/assets/alergenoak/sulfitoak.svg b/front/src/views/Kafetegia/components/AlergenoLegenda/assets/alergenoak/sulfitoak.svg similarity index 100% rename from front/src/components/AlergenoLegenda/assets/alergenoak/sulfitoak.svg rename to front/src/views/Kafetegia/components/AlergenoLegenda/assets/alergenoak/sulfitoak.svg diff --git a/front/src/components/AlergenoLegenda/assets/alergenoak/ziapea.svg b/front/src/views/Kafetegia/components/AlergenoLegenda/assets/alergenoak/ziapea.svg similarity index 100% rename from front/src/components/AlergenoLegenda/assets/alergenoak/ziapea.svg rename to front/src/views/Kafetegia/components/AlergenoLegenda/assets/alergenoak/ziapea.svg diff --git a/front/src/components/AlergenoLegenda/index.ts b/front/src/views/Kafetegia/components/AlergenoLegenda/index.ts similarity index 100% rename from front/src/components/AlergenoLegenda/index.ts rename to front/src/views/Kafetegia/components/AlergenoLegenda/index.ts diff --git a/front/src/views/Kafetegia/components/ProduktuZerrenda/ProduktuZerrenda.tsx b/front/src/views/Kafetegia/components/ProduktuZerrenda/ProduktuZerrenda.tsx index f26d1f0..b5492a5 100644 --- a/front/src/views/Kafetegia/components/ProduktuZerrenda/ProduktuZerrenda.tsx +++ b/front/src/views/Kafetegia/components/ProduktuZerrenda/ProduktuZerrenda.tsx @@ -2,7 +2,7 @@ import React from 'react'; import BeganoaLogo from '../../../../assets/beganoa.svg'; import EkologikoaLogo from '../../../../assets/ekologikoa.svg'; -import { Produktua } from '../../../../domain/models/Produktua'; +import { Produktua } from '../../../../domain/kafetegia/models/Produktua'; import * as styles from './ProduktuZerrenda.module.scss'; interface Props { diff --git a/front/src/views/NotFound/NotFound.tsx b/front/src/views/NotFound/NotFound.tsx index 460ed8c..38bdead 100644 --- a/front/src/views/NotFound/NotFound.tsx +++ b/front/src/views/NotFound/NotFound.tsx @@ -2,8 +2,8 @@ import React from 'react'; import { Link } from 'gatsby'; -import { Container } from '../../components/Container'; -import { Gainburua } from '../../components/Gainburua'; +import { Container } from '../components/Container'; +import { Gainburua } from '../components/Gainburua'; export const NotFound: React.FC = () => ( <> diff --git a/front/src/views/RegularPage/RegularPage.tsx b/front/src/views/RegularPage/RegularPage.tsx index 954386e..56f5257 100644 --- a/front/src/views/RegularPage/RegularPage.tsx +++ b/front/src/views/RegularPage/RegularPage.tsx @@ -3,11 +3,11 @@ import ReactMarkdown from 'react-markdown'; import remarkGfm from 'remark-gfm'; -import { Container } from '../../components/Container'; -import { Gainburua } from '../../components/Gainburua'; -import { Oina } from '../../components/Oina'; +import { RegularPageContent } from '../../domain/basicPage/RegularPageContent'; +import { Container } from '../components/Container'; +import { Gainburua } from '../components/Gainburua'; +import { Oina } from '../components/Oina'; import * as styles from './RegularPage.module.scss'; -import { RegularPageContent } from './RegularPageContent'; interface Props { content: RegularPageContent; diff --git a/front/src/components/Container/Container.module.scss b/front/src/views/components/Container/Container.module.scss similarity index 86% rename from front/src/components/Container/Container.module.scss rename to front/src/views/components/Container/Container.module.scss index 0cb0512..acc1ebe 100644 --- a/front/src/components/Container/Container.module.scss +++ b/front/src/views/components/Container/Container.module.scss @@ -1,4 +1,4 @@ -@import '../../styles/tools/mediaQueries.scss'; +@import '../../../styles/tools/mediaQueries.scss'; .wrapper { margin-left: auto; diff --git a/front/src/components/Container/Container.tsx b/front/src/views/components/Container/Container.tsx similarity index 100% rename from front/src/components/Container/Container.tsx rename to front/src/views/components/Container/Container.tsx diff --git a/front/src/components/Container/index.ts b/front/src/views/components/Container/index.ts similarity index 100% rename from front/src/components/Container/index.ts rename to front/src/views/components/Container/index.ts diff --git a/front/src/components/Gainburua/AtalaName.ts b/front/src/views/components/Gainburua/AtalaName.ts similarity index 100% rename from front/src/components/Gainburua/AtalaName.ts rename to front/src/views/components/Gainburua/AtalaName.ts diff --git a/front/src/components/Gainburua/Gainburua.module.scss b/front/src/views/components/Gainburua/Gainburua.module.scss similarity index 95% rename from front/src/components/Gainburua/Gainburua.module.scss rename to front/src/views/components/Gainburua/Gainburua.module.scss index 94f374a..b112b8f 100644 --- a/front/src/components/Gainburua/Gainburua.module.scss +++ b/front/src/views/components/Gainburua/Gainburua.module.scss @@ -1,6 +1,6 @@ -@import '../../styles/tools/mediaQueries.scss'; -@import '../../styles/tools/mixins/font.scss'; -@import '../../styles/tools/mixins/container.scss'; +@import '../../../styles/tools/mediaQueries.scss'; +@import '../../../styles/tools/mixins/font.scss'; +@import '../../../styles/tools/mixins/container.scss'; .geziaWrapper { display: none; diff --git a/front/src/components/Gainburua/Gainburua.tsx b/front/src/views/components/Gainburua/Gainburua.tsx similarity index 96% rename from front/src/components/Gainburua/Gainburua.tsx rename to front/src/views/components/Gainburua/Gainburua.tsx index f0705e5..414b76e 100644 --- a/front/src/components/Gainburua/Gainburua.tsx +++ b/front/src/views/components/Gainburua/Gainburua.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { classNames } from '../../utilities/classnames'; +import { classNames } from '../../../utilities/classnames'; import Gezia from './assets/gezia.svg'; import Logo from './assets/logo.svg'; import { AtalaName } from './AtalaName'; diff --git a/front/src/components/Gainburua/assets/gezia.svg b/front/src/views/components/Gainburua/assets/gezia.svg similarity index 100% rename from front/src/components/Gainburua/assets/gezia.svg rename to front/src/views/components/Gainburua/assets/gezia.svg diff --git a/front/src/components/Gainburua/assets/hamburguer.svg b/front/src/views/components/Gainburua/assets/hamburguer.svg similarity index 100% rename from front/src/components/Gainburua/assets/hamburguer.svg rename to front/src/views/components/Gainburua/assets/hamburguer.svg diff --git a/front/src/components/Gainburua/assets/itxi.svg b/front/src/views/components/Gainburua/assets/itxi.svg similarity index 100% rename from front/src/components/Gainburua/assets/itxi.svg rename to front/src/views/components/Gainburua/assets/itxi.svg diff --git a/front/src/components/Gainburua/assets/logo.svg b/front/src/views/components/Gainburua/assets/logo.svg similarity index 100% rename from front/src/components/Gainburua/assets/logo.svg rename to front/src/views/components/Gainburua/assets/logo.svg diff --git a/front/src/components/Gainburua/components/DesktopNabigazioa/DesktopNabigazioa.module.scss b/front/src/views/components/Gainburua/components/DesktopNabigazioa/DesktopNabigazioa.module.scss similarity index 100% rename from front/src/components/Gainburua/components/DesktopNabigazioa/DesktopNabigazioa.module.scss rename to front/src/views/components/Gainburua/components/DesktopNabigazioa/DesktopNabigazioa.module.scss diff --git a/front/src/components/Gainburua/components/DesktopNabigazioa/DesktopNabigazioa.tsx b/front/src/views/components/Gainburua/components/DesktopNabigazioa/DesktopNabigazioa.tsx similarity index 93% rename from front/src/components/Gainburua/components/DesktopNabigazioa/DesktopNabigazioa.tsx rename to front/src/views/components/Gainburua/components/DesktopNabigazioa/DesktopNabigazioa.tsx index 888b38b..4816499 100644 --- a/front/src/components/Gainburua/components/DesktopNabigazioa/DesktopNabigazioa.tsx +++ b/front/src/views/components/Gainburua/components/DesktopNabigazioa/DesktopNabigazioa.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { Link } from 'gatsby'; -import { classNames } from '../../../../utilities/classnames'; +import { classNames } from '../../../../../utilities/classnames'; import * as styles from './DesktopNabigazioa.module.scss'; import type { AtalaName } from '../../AtalaName'; diff --git a/front/src/components/Gainburua/components/DesktopNabigazioa/index.ts b/front/src/views/components/Gainburua/components/DesktopNabigazioa/index.ts similarity index 100% rename from front/src/components/Gainburua/components/DesktopNabigazioa/index.ts rename to front/src/views/components/Gainburua/components/DesktopNabigazioa/index.ts diff --git a/front/src/components/Gainburua/components/KontaktuDatuak/KontaktuDatuak.module.scss b/front/src/views/components/Gainburua/components/KontaktuDatuak/KontaktuDatuak.module.scss similarity index 94% rename from front/src/components/Gainburua/components/KontaktuDatuak/KontaktuDatuak.module.scss rename to front/src/views/components/Gainburua/components/KontaktuDatuak/KontaktuDatuak.module.scss index 3ef8d3d..880d6a0 100644 --- a/front/src/components/Gainburua/components/KontaktuDatuak/KontaktuDatuak.module.scss +++ b/front/src/views/components/Gainburua/components/KontaktuDatuak/KontaktuDatuak.module.scss @@ -1,4 +1,4 @@ -@import '../../../../styles/tools/mixins/font.scss'; +@import '../../../../../styles/tools/mixins/font.scss'; .wrapper { display: flex; diff --git a/front/src/components/Gainburua/components/KontaktuDatuak/KontaktuDatuak.tsx b/front/src/views/components/Gainburua/components/KontaktuDatuak/KontaktuDatuak.tsx similarity index 90% rename from front/src/components/Gainburua/components/KontaktuDatuak/KontaktuDatuak.tsx rename to front/src/views/components/Gainburua/components/KontaktuDatuak/KontaktuDatuak.tsx index c0b8344..7aac958 100644 --- a/front/src/components/Gainburua/components/KontaktuDatuak/KontaktuDatuak.tsx +++ b/front/src/views/components/Gainburua/components/KontaktuDatuak/KontaktuDatuak.tsx @@ -1,8 +1,8 @@ import React from 'react'; -import InstagramLogo from '../../../../assets/instagram.svg'; -import TwitterLogo from '../../../../assets/twitter.svg'; -import { classNames } from '../../../../utilities/classnames'; +import InstagramLogo from '../../../../../assets/instagram.svg'; +import TwitterLogo from '../../../../../assets/twitter.svg'; +import { classNames } from '../../../../../utilities/classnames'; import * as styles from './KontaktuDatuak.module.scss'; interface Props { diff --git a/front/src/components/Gainburua/components/KontaktuDatuak/index.ts b/front/src/views/components/Gainburua/components/KontaktuDatuak/index.ts similarity index 100% rename from front/src/components/Gainburua/components/KontaktuDatuak/index.ts rename to front/src/views/components/Gainburua/components/KontaktuDatuak/index.ts diff --git a/front/src/components/Gainburua/components/MugikorNabigazioa/MugikorNabigazioa.module.scss b/front/src/views/components/Gainburua/components/MugikorNabigazioa/MugikorNabigazioa.module.scss similarity index 94% rename from front/src/components/Gainburua/components/MugikorNabigazioa/MugikorNabigazioa.module.scss rename to front/src/views/components/Gainburua/components/MugikorNabigazioa/MugikorNabigazioa.module.scss index f43235b..5d1ae10 100644 --- a/front/src/components/Gainburua/components/MugikorNabigazioa/MugikorNabigazioa.module.scss +++ b/front/src/views/components/Gainburua/components/MugikorNabigazioa/MugikorNabigazioa.module.scss @@ -1,4 +1,4 @@ -@import '../../../../styles/tools/mixins/font.scss'; +@import '../../../../../styles/tools/mixins/font.scss'; .kontaktuaWrapper { display: flex; diff --git a/front/src/components/Gainburua/components/MugikorNabigazioa/MugikorNabigazioa.tsx b/front/src/views/components/Gainburua/components/MugikorNabigazioa/MugikorNabigazioa.tsx similarity index 100% rename from front/src/components/Gainburua/components/MugikorNabigazioa/MugikorNabigazioa.tsx rename to front/src/views/components/Gainburua/components/MugikorNabigazioa/MugikorNabigazioa.tsx diff --git a/front/src/components/Gainburua/components/MugikorNabigazioa/index.ts b/front/src/views/components/Gainburua/components/MugikorNabigazioa/index.ts similarity index 100% rename from front/src/components/Gainburua/components/MugikorNabigazioa/index.ts rename to front/src/views/components/Gainburua/components/MugikorNabigazioa/index.ts diff --git a/front/src/components/Gainburua/index.ts b/front/src/views/components/Gainburua/index.ts similarity index 100% rename from front/src/components/Gainburua/index.ts rename to front/src/views/components/Gainburua/index.ts diff --git a/front/src/components/Oina/Oina.module.scss b/front/src/views/components/Oina/Oina.module.scss similarity index 100% rename from front/src/components/Oina/Oina.module.scss rename to front/src/views/components/Oina/Oina.module.scss diff --git a/front/src/components/Oina/Oina.tsx b/front/src/views/components/Oina/Oina.tsx similarity index 100% rename from front/src/components/Oina/Oina.tsx rename to front/src/views/components/Oina/Oina.tsx diff --git a/front/src/components/Oina/index.ts b/front/src/views/components/Oina/index.ts similarity index 100% rename from front/src/components/Oina/index.ts rename to front/src/views/components/Oina/index.ts diff --git a/front/src/images/og-image.jpeg b/front/static/og-image.jpeg similarity index 100% rename from front/src/images/og-image.jpeg rename to front/static/og-image.jpeg