diff --git a/back/database/migrations/development.db b/back/database/migrations/development.db index 629c9a9..c8387d9 100644 Binary files a/back/database/migrations/development.db and b/back/database/migrations/development.db differ diff --git a/back/package.json b/back/package.json index 308c765..8d73224 100644 --- a/back/package.json +++ b/back/package.json @@ -11,10 +11,10 @@ }, "devDependencies": {}, "dependencies": { - "@strapi/plugin-i18n": "4.0.4", - "@strapi/plugin-users-permissions": "4.0.4", - "@strapi/strapi": "4.0.4", - "pg": "^8.7.1", + "@strapi/plugin-i18n": "4.1.5", + "@strapi/plugin-users-permissions": "4.1.5", + "@strapi/strapi": "4.1.5", + "pg": "^8.7.3", "pg-connection-string": "^2.5.0", "sqlite3": "5.0.2" }, diff --git a/back/src/api/hasiera/content-types/hasiera/schema.json b/back/src/api/hasiera/content-types/hasiera/schema.json index 6fe1cef..5a96c09 100644 --- a/back/src/api/hasiera/content-types/hasiera/schema.json +++ b/back/src/api/hasiera/content-types/hasiera/schema.json @@ -17,12 +17,6 @@ }, "izenburua": { "type": "string" - }, - "helbidea": { - "type": "component", - "repeatable": false, - "component": "orokorra.helbidea", - "required": true } } } diff --git a/back/src/api/kafetegia/content-types/kafetegia/schema.json b/back/src/api/kafetegia/content-types/kafetegia/schema.json new file mode 100644 index 0000000..51e8d0c --- /dev/null +++ b/back/src/api/kafetegia/content-types/kafetegia/schema.json @@ -0,0 +1,60 @@ +{ + "kind": "singleType", + "collectionName": "kafetegiak", + "info": { + "singularName": "kafetegia", + "pluralName": "kafetegiak", + "displayName": "Kafetegia", + "description": "" + }, + "options": { + "draftAndPublish": true + }, + "pluginOptions": {}, + "attributes": { + "izenburua": { + "type": "string", + "required": true + }, + "deskribapena": { + "type": "text", + "required": true + }, + "edariBeroak": { + "displayName": "edaria", + "type": "component", + "repeatable": true, + "component": "kafetegia.edaria" + }, + "infusioEkologikoak": { + "type": "component", + "repeatable": true, + "component": "kafetegia.edaria" + }, + "edariHotzak": { + "type": "component", + "repeatable": true, + "component": "kafetegia.edaria" + }, + "pikatzekoak": { + "type": "component", + "repeatable": true, + "component": "kafetegia.edaria" + }, + "gozoak": { + "type": "component", + "repeatable": true, + "component": "kafetegia.edaria" + }, + "anizkoJogurta": { + "type": "component", + "repeatable": false, + "component": "kafetegia.edaria" + }, + "tostadak": { + "type": "component", + "repeatable": true, + "component": "kafetegia.edaria" + } + } +} diff --git a/back/src/api/kafetegia/controllers/kafetegia.js b/back/src/api/kafetegia/controllers/kafetegia.js new file mode 100644 index 0000000..c7ef68d --- /dev/null +++ b/back/src/api/kafetegia/controllers/kafetegia.js @@ -0,0 +1,9 @@ +'use strict'; + +/** + * kafetegia controller + */ + +const { createCoreController } = require('@strapi/strapi').factories; + +module.exports = createCoreController('api::kafetegia.kafetegia'); diff --git a/back/src/api/kafetegia/routes/kafetegia.js b/back/src/api/kafetegia/routes/kafetegia.js new file mode 100644 index 0000000..434875b --- /dev/null +++ b/back/src/api/kafetegia/routes/kafetegia.js @@ -0,0 +1,9 @@ +'use strict'; + +/** + * kafetegia router. + */ + +const { createCoreRouter } = require('@strapi/strapi').factories; + +module.exports = createCoreRouter('api::kafetegia.kafetegia'); diff --git a/back/src/api/kafetegia/services/kafetegia.js b/back/src/api/kafetegia/services/kafetegia.js new file mode 100644 index 0000000..5c6a89b --- /dev/null +++ b/back/src/api/kafetegia/services/kafetegia.js @@ -0,0 +1,9 @@ +'use strict'; + +/** + * kafetegia service. + */ + +const { createCoreService } = require('@strapi/strapi').factories; + +module.exports = createCoreService('api::kafetegia.kafetegia'); diff --git a/back/src/components/kafetegia/alergenoa.json b/back/src/components/kafetegia/alergenoa.json new file mode 100644 index 0000000..8242e45 --- /dev/null +++ b/back/src/components/kafetegia/alergenoa.json @@ -0,0 +1,81 @@ +{ + "collectionName": "components_kafetegia_alergenoas", + "info": { + "displayName": "alergenoa", + "icon": "cat", + "description": "" + }, + "options": {}, + "attributes": { + "esnekiak": { + "type": "boolean", + "required": true, + "default": false + }, + "arrautzak": { + "type": "boolean", + "default": false, + "required": true + }, + "glutena": { + "type": "boolean", + "default": false, + "required": true + }, + "moluskuak": { + "type": "boolean", + "default": false, + "required": true + }, + "krustazeoak": { + "type": "boolean", + "default": false, + "required": true + }, + "arraina": { + "type": "boolean", + "default": false, + "required": true + }, + "lupinuak": { + "type": "boolean", + "default": false, + "required": true + }, + "fruituLehorrak": { + "type": "boolean", + "default": false, + "required": true + }, + "kakahueteak": { + "type": "boolean", + "default": false, + "required": true + }, + "sesamoa": { + "type": "boolean", + "default": false, + "required": true + }, + "soja": { + "type": "boolean", + "default": false, + "required": true + }, + "sulfitoak": { + "type": "boolean", + "default": false, + "required": true + }, + "apioa": { + "type": "boolean", + "default": false, + "required": true + }, + "ziapea": { + "type": "boolean", + "required": true, + "default": false + } + } +} diff --git a/back/src/components/kafetegia/edaria.json b/back/src/components/kafetegia/edaria.json new file mode 100644 index 0000000..9867552 --- /dev/null +++ b/back/src/components/kafetegia/edaria.json @@ -0,0 +1,37 @@ +{ + "collectionName": "components_kafetegia_edarias", + "info": { + "displayName": "produktua", + "icon": "coffee", + "description": "" + }, + "options": {}, + "attributes": { + "beganoa": { + "type": "boolean", + "default": false, + "required": true + }, + "ekologikoa": { + "type": "boolean", + "default": false, + "required": true + }, + "prezioa": { + "type": "decimal", + "default": 0, + "required": true + }, + "izena": { + "type": "string", + "required": true + }, + "alergenoak": { + "displayName": "alergenoa", + "type": "component", + "repeatable": false, + "component": "kafetegia.alergenoa", + "required": true + } + } +} diff --git a/front/gatsby-config.js b/front/gatsby-config.js index 1a69113..e5db431 100644 --- a/front/gatsby-config.js +++ b/front/gatsby-config.js @@ -2,6 +2,38 @@ require('dotenv').config({ path: `.env.${process.env.NODE_ENV}`, }); +const qs = require('qs'); +const query = qs.stringify( + { + populate: { + edariBeroak: { + populate: ['alergenoak'], + }, + infusioEkologikoak: { + populate: ['alergenoak'], + }, + edariHotzak: { + populate: ['alergenoak'], + }, + pikatzekoak: { + populate: ['alergenoak'], + }, + gozoak: { + populate: ['alergenoak'], + }, + anizkoJogurta: { + populate: ['alergenoak'], + }, + tostadak: { + populate: ['alergenoak'], + }, + }, + }, + { + encodeValuesOnly: true, + }, +); + module.exports = { plugins: [ 'gatsby-plugin-react-helmet', @@ -12,11 +44,26 @@ module.exports = { path: `${__dirname}/src/images`, }, }, + { + resolve: 'gatsby-source-custom-api', + options: { + rootKey: 'kafetegia', + url: `http://localhost:1337/api/kafetegia?${query}`, + }, + }, { resolve: 'gatsby-source-strapi', options: { apiURL: process.env.API_URL || 'http://localhost:1337/api', - singleTypes: ['hasiera'], + singleTypes: [ + 'hasiera', + { + name: 'kafetegia', + queryParams: { + populate: '*', + }, + }, + ], queryLimit: 1000, }, }, @@ -48,7 +95,7 @@ module.exports = { { resolve: `gatsby-plugin-google-fonts`, options: { - fonts: [`work sans\:600`], + fonts: [`almarai\:600`, `almarai\:300`], display: 'swap', }, }, diff --git a/front/package.json b/front/package.json index c934518..6da75e6 100644 --- a/front/package.json +++ b/front/package.json @@ -29,6 +29,7 @@ "gatsby-plugin-sharp": "^4.5.1", "gatsby-plugin-sitemap": "^5.5.0", "gatsby-plugin-styled-components": "^5.5.0", + "gatsby-source-custom-api": "^2.3.5", "gatsby-source-filesystem": "^4.5.1", "gatsby-source-strapi": "^1.0.2", "gatsby-transformer-sharp": "^4.5.0", @@ -36,10 +37,13 @@ "react": "^17.0.1", "react-dom": "^17.0.1", "react-helmet": "^6.1.0", + "react-responsive": "^9.0.0-beta.6", "styled-components": "^5.3.3" }, "devDependencies": { "@types/react-helmet": "^6.1.5", - "prettier": "^2.5.1" + "gatsby-source-rest-api": "^0.2.3", + "prettier": "^2.5.1", + "qs": "^6.10.3" } } diff --git a/front/typings.d.ts b/front/src/@types/typings.d.ts similarity index 100% rename from front/typings.d.ts rename to front/src/@types/typings.d.ts diff --git a/front/src/assets/beganoa.svg b/front/src/assets/beganoa.svg new file mode 100644 index 0000000..c0e7b81 --- /dev/null +++ b/front/src/assets/beganoa.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/front/src/assets/ekologikoa.svg b/front/src/assets/ekologikoa.svg new file mode 100644 index 0000000..ec06fbe --- /dev/null +++ b/front/src/assets/ekologikoa.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + diff --git a/front/src/components/Container.tsx b/front/src/components/Container.tsx index 7e4f602..b164cf8 100644 --- a/front/src/components/Container.tsx +++ b/front/src/components/Container.tsx @@ -6,16 +6,20 @@ import { size } from '../ui/theme/size'; export const Container = styled.div` margin-left: auto; margin-right: auto; - padding-left: ${rem(size.tiny)}; - padding-right: ${rem(size.tiny)}; + padding-left: ${rem(size.base)}; + padding-right: ${rem(size.base)}; width: 100%; ${media.tablet` + padding-left: 0; + padding-right: 0; width: 744px; `} ${media.desktop` + padding-left: 0; + padding-right: 0; width: 1014px; `} `; diff --git a/front/src/components/Gainburua/DesktopNabigazioa.tsx b/front/src/components/Gainburua/DesktopNabigazioa.tsx new file mode 100644 index 0000000..9f7fc0d --- /dev/null +++ b/front/src/components/Gainburua/DesktopNabigazioa.tsx @@ -0,0 +1,45 @@ +import React from 'react'; +import { Link } from 'gatsby'; +import styled from 'styled-components'; +import { rem } from 'polished'; +import { size } from '../../ui/theme'; + +export const DesktopNabigazioa: React.FC<{ + atala: 'hasiera' | 'kafetegia'; +}> = ({ atala }) => { + return ( + + + + Laba gara + + + Dastatu Laba + + + + ); +}; + +export const Nabigazioa = styled.nav` + width: 100%; + position: absolute; + bottom: ${rem(size.tiny)}; + left: 0; +`; + +export const EstekaZerrenda = styled.ul` + display: flex; + justify-content: center; + list-style-type: none; +`; + +export const Esteka = styled.li<{ aktiboa?: boolean }>` + padding: ${rem(size.small)}; + + ${({ aktiboa }) => + aktiboa && + ` + border-bottom: 3px solid var(--color); + `} +`; diff --git a/front/src/components/Gainburua/Gainburua.tsx b/front/src/components/Gainburua/Gainburua.tsx new file mode 100644 index 0000000..978f7e2 --- /dev/null +++ b/front/src/components/Gainburua/Gainburua.tsx @@ -0,0 +1,168 @@ +import React from 'react'; +import { Link } from 'gatsby'; + +import { rem } from 'polished'; +import styled from 'styled-components'; +import { Container } from '../../components/Container'; +import { breakpoints, font, media, size } from '../../ui/theme'; +import LabaLogo from '../../assets/logo.svg'; + +import { colors } from '../../ui/theme/colors'; +import { DesktopNabigazioa } from './DesktopNabigazioa'; +import { MugikorNabigazioa } from './MugikorNabigazioa'; +import MediaQuery from 'react-responsive'; +import { KontaktuDatuak } from './KontaktuDatuak'; + +interface Props { + izenburua: string; + deskribapena: string; + atala: 'hasiera' | 'kafetegia'; +} + +export const Gainburua: React.FC = ({ + izenburua, + deskribapena, + atala, +}) => { + return ( + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ {deskribapena} + + + + {izenburua} + +
+ + + + + + + ); +}; + +const MugikorWrapper = styled.div` + display: grid; + grid-template-columns: repeat(3, 1fr); + padding-top: ${rem(size.base)}; + + margin-bottom: ${rem(size.medium)}; +`; + +const MenuWrapper = styled.div` + grid-column: 3; + grid-row: 1; + display: flex; + justify-content: flex-end; +`; + +const MugikorLogoWrapper = styled.div` + grid-row: 1; + grid-column: 2; + display: flex; + justify-content: center; +`; + +const Wrapper = styled.div<{ atala: 'hasiera' | 'kafetegia' }>` + --color: ${({ atala }) => + atala === 'hasiera' ? colors.zuria : colors.beltza}; + + background-color: ${({ atala }) => + atala === 'hasiera' ? colors.gorria : colors.horia}; + color: var(--color); + + padding-bottom: ${rem(size.base)}; + + min-height: 100vh; + padding-bottom: 0; +`; + +const LogoWrapper = styled.div` + width: ${rem(size.huge)}; +`; + +const Logo = styled(LabaLogo)` + path { + fill: var(--color); + } +`; + +const GainburuWrapper = styled.header` + padding: ${rem(size.tiny)}; + display: flex; + align-items: start; + justify-content: space-between; + margin-bottom: ${rem(size.base)}; + + ${media.tablet` + padding: ${rem(size.large)}; + `}; +`; + +const Deskribapena = styled.p` + margin-bottom: ${rem(size.xlarge)}; + text-align: justify; + + ${font.base()}; + + ${media.tablet` + ${font.large()}; + `}; +`; + +const IzenburuWrapper = styled.div` + display: flex; + justify-content: flex-end; + align-items: center; +`; + +const Marra = styled.div` + /* altuera erabiliko den letraren berdina da */ + height: ${rem(41.83)}; + flex-grow: 1; + box-shadow: inset 0px -3px 0px 0px var(--color); + margin-right: ${rem(size.tiny)}; +`; + +const Izenburua = styled.h1` + text-align: right; + vertical-align: bottom; + + &:after { + content: '.'; + } + + ${font.gargantuan()}; +`; diff --git a/front/src/components/Gainburua/KontaktuDatuak.tsx b/front/src/components/Gainburua/KontaktuDatuak.tsx new file mode 100644 index 0000000..8ca873f --- /dev/null +++ b/front/src/components/Gainburua/KontaktuDatuak.tsx @@ -0,0 +1,79 @@ +import { rem } from 'polished'; +import React from 'react'; +import styled from 'styled-components'; +import { font, size } from '../../ui/theme'; +import InstagramLogo from '../../assets/instagram.svg'; +import TwitterLogo from '../../assets/twitter.svg'; + +/** + * ERREPIKATUA + * KontaktuDatuak konponentea MugikorNabigazioan errepikatzen da, honek + * logoaren fill-erako kokapenaren araberako CSS aldagaia erabiltzen duelako + * TODO: Beste estrategia bat bilatu, abstrakzio bakarra izateko + */ + +export const KontaktuDatuak: React.FC = () => { + return ( + + +

Gazteluko plaza 2

+

Iruñea

+ + + + + + + + + + + + + + + + + ); +}; + +export const Kontaktua = styled.div` + display: flex; +`; + +export const SareSoziala = styled.li` + width: ${rem(size.base)}; + height: ${rem(size.base)}; + :not(:last-child) { + margin-right: ${rem(size.small)}; + } +`; + +export const Instagram = styled(InstagramLogo)` + width: ${rem(size.base)}; + height: ${rem(size.base)}; + path { + fill: var(--color); + } +`; + +export const Twitter = styled(TwitterLogo)` + width: ${rem(size.base)}; + height: ${rem(size.base)}; + path { + fill: var(--color); + } +`; + +export const SareSozialak = styled.ul` + display: flex; + align-items: center; + list-style-type: none; +`; + +export const Helbidea = styled.address` + border-right: 3px solid var(--color); + padding-right: ${rem(size.small)}; + margin-right: ${rem(size.small)}; + ${font.tiny()}; +`; diff --git a/front/src/components/Gainburua/MugikorNabigazioa.tsx b/front/src/components/Gainburua/MugikorNabigazioa.tsx new file mode 100644 index 0000000..198b950 --- /dev/null +++ b/front/src/components/Gainburua/MugikorNabigazioa.tsx @@ -0,0 +1,184 @@ +import { Link } from 'gatsby'; +import { rem } from 'polished'; +import React, { useState } from 'react'; +import styled from 'styled-components'; +import { font, size } from '../../ui/theme'; +import { colors } from '../../ui/theme/colors'; +import HamburgerIcon from './assets/hamburguer.svg'; +import Itxi from './assets/itxi.svg'; +import InstagramLogo from '../../assets/instagram.svg'; +import TwitterLogo from '../../assets/twitter.svg'; + +export const MugikorNabigazioa: React.FC = () => { + const [isOpen, setIsOpen] = useState(false); + + return ( + <> + {isOpen && ( + + setIsOpen(false)}> + + + + + + + + + + )} + + { + setIsOpen(true); + }} + > + + + + ); +}; + +const KontaktuaWrapper = styled.div` + display: flex; + justify-content: center; + align-items: flex-end; + flex-grow: 1; + width: 100%; +`; + +const Esteka = styled.li` + color: ${colors.zuria}; + ${font.large()}; + text-align: right; + + &:not(:last-child) { + margin-bottom: ${rem(size.base)}; + } + + &:after { + content: '.'; + } +`; + +const Hamburger = styled(HamburgerIcon)` + path { + fill: var(--color); + } +`; + +const OpenClose = styled.div` + cursor: pointer; + width: ${rem(size.medium)}; + margin-bottom: ${rem(size.base)}; +`; + +const NabigazioaWrapper = styled.div` + @keyframes sartu { + from { + right: -300px; + } + to { + right: 0; + } + } + animation-name: sartu; + animation-duration: 0.25s; + + /* Containerrak sartzen duen padding berdina */ + padding: ${rem(size.base)}; + + display: flex; + flex-direction: column; + align-items: flex-end; + + position: absolute; + top: 0; + right: 0; + min-width: 300px; + background-color: ${colors.beltza}; + color: ${colors.zuria}; + height: 100vh; +`; + +/** + * ERREPIKATUA + * KontaktuDatuak konponentea errepikatzen da, besteak logoaren fill-erako kokapenaren + * araberako CSS aldagaia erabiltzen duelako eta hemen testu eta irudi guztiak zuriak izan + * behar direlako + * TODO: Beste estrategia bat bilatu, abstrakzio bakarra izateko + */ +const KontaktuDatuak: React.FC = () => { + return ( + + +

Gazteluko plaza 2

+

Iruñea

+ + + + + + + + + + + + + + + + + ); +}; + +export const Kontaktua = styled.div` + display: flex; +`; + +export const SareSoziala = styled.li` + width: ${rem(size.base)}; + height: ${rem(size.base)}; + :not(:last-child) { + margin-right: ${rem(size.small)}; + } +`; + +export const Instagram = styled(InstagramLogo)` + width: ${rem(size.base)}; + height: ${rem(size.base)}; + path { + fill: ${colors.zuria}; + } +`; + +export const Twitter = styled(TwitterLogo)` + width: ${rem(size.base)}; + height: ${rem(size.base)}; + path { + fill: ${colors.zuria}; + } +`; + +export const SareSozialak = styled.ul` + display: flex; + align-items: center; + list-style-type: none; +`; + +export const Helbidea = styled.address` + border-right: 3px solid ${colors.zuria}; + padding-right: ${rem(size.small)}; + margin-right: ${rem(size.small)}; + ${font.tiny()}; +`; diff --git a/front/src/components/Gainburua/assets/hamburguer.svg b/front/src/components/Gainburua/assets/hamburguer.svg new file mode 100644 index 0000000..d605fe7 --- /dev/null +++ b/front/src/components/Gainburua/assets/hamburguer.svg @@ -0,0 +1,6 @@ + + + + + diff --git a/front/src/components/Gainburua/assets/itxi.svg b/front/src/components/Gainburua/assets/itxi.svg new file mode 100644 index 0000000..29d5210 --- /dev/null +++ b/front/src/components/Gainburua/assets/itxi.svg @@ -0,0 +1,4 @@ + + + diff --git a/front/src/components/Gainburua/index.ts b/front/src/components/Gainburua/index.ts new file mode 100644 index 0000000..4575abf --- /dev/null +++ b/front/src/components/Gainburua/index.ts @@ -0,0 +1 @@ +export { Gainburua } from './Gainburua'; diff --git a/front/src/pages/index.tsx b/front/src/pages/index.tsx index 57989be..25d09c9 100644 --- a/front/src/pages/index.tsx +++ b/front/src/pages/index.tsx @@ -1,15 +1,9 @@ import { graphql, PageProps, useStaticQuery } from 'gatsby'; -import { rem } from 'polished'; import React from 'react'; -import styled from 'styled-components'; -import { Container } from '../components/Container'; import { GlobalStyles } from '../ui/GlobalStyles'; -import { font, media, size } from '../ui/theme'; -import LabaLogo from '../assets/logo.svg'; -import InstagramLogo from '../assets/instagram.svg'; -import TwitterLogo from '../assets/twitter.svg'; import { Helmet } from 'react-helmet'; +import { Gainburua } from '../components/Gainburua'; interface DataProps { strapiHasiera: { @@ -38,7 +32,10 @@ const IndexPage: React.VFC = () => { return ( <> - + = () => { - - - - - - - -

Gazteluko plaza 2

-

Iruñea

- - - - - - - - - - - - - - - - - - - -
- - {strapiHasiera.data.attributes.deskribapena} - - - - - {strapiHasiera.data.attributes.izenburua} - -
- + ); }; -const LogoWrapper = styled.div` - width: ${rem(size.large)}; - - ${media.tablet` - width: ${rem(size.huge)}; - `} -`; - -const Kontaktua = styled.div` - display: flex; -`; - -const SareSoziala = styled.li` - width: ${rem(size.base)}; - height: ${rem(size.base)}; - :not(:last-child) { - margin-right: ${rem(size.small)}; - } -`; - -const Instagram = styled(InstagramLogo)` - width: ${rem(size.base)}; - height: ${rem(size.base)}; - path { - fill: white; - } -`; - -const Twitter = styled(TwitterLogo)` - width: ${rem(size.base)}; - height: ${rem(size.base)}; - path { - fill: white; - } -`; - -const Logo = styled(LabaLogo)` - path { - fill: white; - } -`; - -const SareSozialak = styled.ul` - display: flex; - align-items: center; - list-style-type: none; -`; - -const Helbidea = styled.address` - border-right: 3px solid white; - padding-right: ${rem(size.small)}; - margin-right: ${rem(size.small)}; - ${font.tiny()}; -`; - -const Gainburua = styled.header` - padding: ${rem(size.tiny)}; - display: flex; - align-items: start; - justify-content: space-between; - margin-bottom: ${rem(size.base)}; - - ${media.tablet` - padding: ${rem(size.large)}; - `}; -`; - -const Deskribapena = styled.p` - margin-bottom: ${rem(size.xlarge)}; - text-align: justify; - - ${font.base()}; - - ${media.tablet` - ${font.large()}; - `}; -`; - -const IzenburuWrapper = styled.div` - display: flex; - justify-content: flex-end; - align-items: center; -`; - -const Marra = styled.div` - /* altuera erabiliko den letraren berdina da */ - height: ${rem(41.83)}; - flex-grow: 1; - box-shadow: inset 0px -3px 0px 0px white; - margin-right: ${rem(size.tiny)}; -`; - -const Izenburua = styled.h1` - text-align: right; - vertical-align: bottom; - - &:after { - content: '.'; - } - - ${font.gargantuan()}; -`; - export default IndexPage; diff --git a/front/src/pages/kafetegia.tsx b/front/src/pages/kafetegia.tsx new file mode 100644 index 0000000..4d855f6 --- /dev/null +++ b/front/src/pages/kafetegia.tsx @@ -0,0 +1,431 @@ +import { graphql, PageProps, useStaticQuery } from 'gatsby'; +import React from 'react'; +import { GlobalStyles } from '../ui/GlobalStyles'; + +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 BeganoaLogo from '../assets/beganoa.svg'; +import EkologikoaLogo from '../assets/ekologikoa.svg'; +import { rem } from 'polished'; + +type Alergenoa = + | 'apioa' + | 'arraina' + | 'arrautzak' + | 'esnekiak' + | 'fruituLehorrak' + | 'glutena' + | 'kakahueteak' + | 'krustazeoak' + | 'lupinuak' + | 'moluskuak' + | 'sesamoa' + | 'soja' + | 'sulfitoak' + | 'ziapea'; + +interface Produktua { + id: string; + izena: string; + prezioa: number; + ekologikoa: boolean; + beganoa: boolean; + alergenoak: { + [alergenoa in Alergenoa]: boolean; + }; +} +interface DataProps { + kafetegia: { + data: { + attributes: { + deskribapena: string; + izenburua: string; + edariBeroak: Produktua[]; + infusioEkologikoak: Produktua[]; + edariHotzak: Produktua[]; + pikatzekoak: Produktua[]; + gozoak: Produktua[]; + anizkoJogurta: Produktua; + tostadak: Produktua[]; + }; + }; + }; +} + +const Kafetegia: React.VFC = () => { + const { + kafetegia: { + data: { + attributes: { + izenburua, + deskribapena, + anizkoJogurta, + edariBeroak, + edariHotzak, + infusioEkologikoak, + pikatzekoak, + gozoak, + tostadak, + }, + }, + }, + } = useStaticQuery(graphql` + { + kafetegia { + data { + attributes { + izenburua + deskribapena + anizkoJogurta { + alergenoak { + apioa + arraina + arrautzak + esnekiak + fruituLehorrak + glutena + kakahueteak + krustazeoak + lupinuak + moluskuak + sesamoa + soja + sulfitoak + ziapea + } + beganoa + ekologikoa + izena + prezioa + id__normalized + } + edariBeroak { + id + ekologikoa + beganoa + izena + prezioa + alergenoak { + apioa + arraina + arrautzak + esnekiak + fruituLehorrak + glutena + kakahueteak + krustazeoak + lupinuak + moluskuak + sesamoa + soja + sulfitoak + ziapea + } + } + edariHotzak { + id + ekologikoa + beganoa + izena + prezioa + alergenoak { + apioa + arraina + arrautzak + esnekiak + fruituLehorrak + glutena + kakahueteak + krustazeoak + lupinuak + moluskuak + sesamoa + soja + sulfitoak + ziapea + } + } + infusioEkologikoak { + id + ekologikoa + beganoa + izena + prezioa + alergenoak { + apioa + arraina + arrautzak + esnekiak + fruituLehorrak + glutena + kakahueteak + krustazeoak + lupinuak + moluskuak + sesamoa + soja + sulfitoak + ziapea + } + } + pikatzekoak { + id + ekologikoa + beganoa + izena + prezioa + alergenoak { + apioa + arraina + arrautzak + esnekiak + fruituLehorrak + glutena + kakahueteak + krustazeoak + lupinuak + moluskuak + sesamoa + soja + sulfitoak + ziapea + } + } + gozoak { + id + ekologikoa + beganoa + izena + prezioa + alergenoak { + apioa + arraina + arrautzak + esnekiak + fruituLehorrak + glutena + kakahueteak + krustazeoak + lupinuak + moluskuak + sesamoa + soja + sulfitoak + ziapea + } + } + tostadak { + id + ekologikoa + beganoa + izena + prezioa + alergenoak { + apioa + arraina + arrautzak + esnekiak + fruituLehorrak + glutena + kakahueteak + krustazeoak + lupinuak + moluskuak + sesamoa + soja + sulfitoak + ziapea + } + } + } + } + } + } + `); + + return ( + <> + + + + + + + + + + + + + + + Edariak + + + + + + + + + + + + + + + + Jakiak + + + + + + + + + + + + + + + + + ); +}; + +const GainburuaWrapper = styled.div` + margin-bottom: ${rem(size.huge)}; +`; + +const TaldeWrapper = styled.section` + &:not(:last-child) { + margin-bottom: ${size.large}px; + } +`; + +const ZerrendaWrapper = styled.div` + &:not(:last-child) { + margin-bottom: ${size.base}px; + } +`; + +const ProduktuZerrenda: React.FC<{ + produktuZerrenda: Produktua[]; + izena: React.ReactNode; +}> = ({ produktuZerrenda, izena }) => ( + + {izena} + + {produktuZerrenda.map(produktua => ( + + + {produktua.beganoa && } + + + {produktua.ekologikoa && ( + + )} + + {produktua.izena} + + {new Intl.NumberFormat('eu-ES', { + style: 'currency', + currency: 'EUR', + }).format(produktua.prezioa)} + + + ))} + +); + +const ProduktuTaula = styled.table` + width: 100%; + table-layout: fixed; + overflow-wrap: break-word; +`; + +const Ezaugarria = styled.td` + width: ${size.medium}px; + height: ${size.medium}px; + padding: 0 ${size.xtiny}px; + vertical-align: top; +`; + +const Izena = styled.td` + text-align: left; + font-weight: ${fontWeight.regular}; + padding: 0 ${size.xtiny}px; + vertical-align: top; +`; + +const Prezioa = styled.td` + min-width: ${size.medium}px; + text-align: right; + font-weight: ${fontWeight.regular}; + padding: 0 ${size.xtiny}px; + vertical-align: top; +`; + +const ProduktuMota = styled.caption` + ${font.large()}; + text-align: left; + padding-left: 67px; + margin-bottom: ${rem(size.mini)}; + + &::after { + content: '.'; + } +`; + +const IzenburuWrapper = styled.div` + display: flex; + justify-content: flex-end; + align-items: center; + margin-bottom: ${rem(size.medium)}; +`; + +const Marra = styled.div` + /* altuera erabiliko den letraren berdina da */ + height: ${rem(41.83)}; + flex-grow: 1; + box-shadow: inset 0px -3px 0px 0px ${colors.beltza}; + margin-right: ${rem(size.tiny)}; +`; + +const Izenburua = styled.h1` + text-align: right; + vertical-align: bottom; + + &:after { + content: '.'; + } + + ${font.gargantuan()}; +`; + +export default Kafetegia; diff --git a/front/src/ui/GlobalStyles.tsx b/front/src/ui/GlobalStyles.tsx index 19cf757..a20425d 100644 --- a/front/src/ui/GlobalStyles.tsx +++ b/front/src/ui/GlobalStyles.tsx @@ -1,5 +1,6 @@ import { createGlobalStyle, css } from 'styled-components'; -import { font } from './theme'; +import { font, fontWeight } from './theme'; +import { colors } from './theme/colors'; /** * Inicializa estilos base @@ -197,12 +198,11 @@ export const GlobalStyles = createGlobalStyle` ${reboot}; body { - font-family: 'Work Sans', sans-serif; + font-family: 'Almarai', sans-serif; ${font.base()} - font-weight: 600; + font-weight: ${fontWeight.bold}; - background-color: #fd3447; - color: #fff; + color: ${colors.beltza}; } `; diff --git a/front/src/ui/theme/colors.ts b/front/src/ui/theme/colors.ts new file mode 100644 index 0000000..edd43ac --- /dev/null +++ b/front/src/ui/theme/colors.ts @@ -0,0 +1,10 @@ +export const colors = { + beltza: '#191919', + urdina: '#8FBBFD', + morea: '#510DFB', + horia: '#FDB201', + gorria: '#FD3647', + zuria: '#FFFFFF', +}; + +export type Color = keyof typeof colors; diff --git a/front/src/ui/theme/fontWeight.ts b/front/src/ui/theme/fontWeight.ts new file mode 100644 index 0000000..753603c --- /dev/null +++ b/front/src/ui/theme/fontWeight.ts @@ -0,0 +1,4 @@ +export const fontWeight = { + regular: 300, + bold: 600, +}; diff --git a/front/src/ui/theme/index.ts b/front/src/ui/theme/index.ts index 6c37743..9432b22 100644 --- a/front/src/ui/theme/index.ts +++ b/front/src/ui/theme/index.ts @@ -2,3 +2,5 @@ export { breakpoints } from './breakpoints'; export { font } from './font'; export { media } from './media'; export { size } from './size'; +export { colors, Color } from './colors'; +export { fontWeight } from './fontWeight'; diff --git a/front/tsconfig.json b/front/tsconfig.json new file mode 100644 index 0000000..165bc7e --- /dev/null +++ b/front/tsconfig.json @@ -0,0 +1,27 @@ +{ + "compileOnSave": false, + "compilerOptions": { + /* Basic Options */ + "target": "es5" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */, + "module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */, + "lib": ["dom", "es2015", "es2017"], // "allowJs": true, /* Allow javascript files to be compiled. */ // "checkJs": true, /* Report errors in .js files. */ + /* Specify library files to be included in the compilation. */ + + "jsx": "react" /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */, + "sourceMap": true /* Generates corresponding '.map' file. */, + + /* Strict Type-Checking Options */ + "strict": true /* Enable all strict type-checking options. */, + "noImplicitAny": true /* Raise error on expressions and declarations with an implied 'any' type. */, + + /* Additional Checks */ + "noUnusedLocals": true /* Report errors on unused locals. */, + "noUnusedParameters": true /* Report errors on unused parameters. */, + // "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */ + "noFallthroughCasesInSwitch": true /* Report errors for fallthrough cases in switch statement. */, + + /* Module Resolution Options */ + "allowSyntheticDefaultImports": true /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */ + }, + "include": ["./src/**/*"] +} diff --git a/yarn.lock b/yarn.lock index f3b7b32..2ec2d0c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1126,12 +1126,12 @@ "@babel/helper-validator-identifier" "^7.16.7" to-fast-properties "^2.0.0" -"@casl/ability@^4.1.5": - version "4.1.6" - resolved "https://registry.yarnpkg.com/@casl/ability/-/ability-4.1.6.tgz#89f263903adfc9316cedff329ad615564662448a" - integrity sha512-ZI30fRacHKCCrWJn1pmxx/+IKUkoycVNz+Mge9EeIH+esDT7nydgWbitVPnlBAbxQXz5eybPAvfPSg3WOa2izw== +"@casl/ability@^5.4.3": + version "5.4.3" + resolved "https://registry.yarnpkg.com/@casl/ability/-/ability-5.4.3.tgz#4f73c8574dafa7bdc67730e1531c1f37e1a96c37" + integrity sha512-X6U79udKkfS7459Y3DCkw58ZQno7BD9VJa5GnTL1rcKRACqERMVDs7qjVMW+JlLUZcT5DB2/GF5uvu0KsudEcA== dependencies: - sift "^13.0.0" + "@ucast/mongo2js" "^1.3.0" "@cypress/request@^2.88.10": version "2.88.10" @@ -1286,10 +1286,10 @@ minimatch "^3.0.4" strip-json-comments "^3.1.1" -"@fingerprintjs/fingerprintjs@3.1.1": - version "3.1.1" - resolved "https://registry.yarnpkg.com/@fingerprintjs/fingerprintjs/-/fingerprintjs-3.1.1.tgz#381842ca0e4bdae5c3f4653601a12fe2b57923a9" - integrity sha512-+nUVhRimx9SgXs78miuSA2Y38k4g24iKpAMgWK5/QuLy9Un3ZSoRk5AXp3b4smUf1XqNTzGAmyWYrc1qG05rOA== +"@fingerprintjs/fingerprintjs@3.3.2": + version "3.3.2" + resolved "https://registry.yarnpkg.com/@fingerprintjs/fingerprintjs/-/fingerprintjs-3.3.2.tgz#8b1d79dfda8b1d9a66958d46894e459faef77c9c" + integrity sha512-CB/n3JWnMvhLWgR49Z6qSr6PShXQKGmIiZ0VAmQeoW8foD5z067xUnCxGG7/Fd9rfwmx6I4+8i549j0ujQEcAQ== dependencies: tslib "^2.0.1" @@ -2182,10 +2182,10 @@ escape-string-regexp "^2.0.0" lodash.deburr "^4.1.0" -"@strapi/admin@4.0.4": - version "4.0.4" - resolved "https://registry.yarnpkg.com/@strapi/admin/-/admin-4.0.4.tgz#10e7b2059b05253ed2ad64264019157be220c303" - integrity sha512-Zj9aAeHm9dFqBmvU7EeuSokrxdzyK0e6KTbhbzfKQRDMT6yAXUDr3tfqs8w2hpk7PbQJSQlf1OXE4YxX0iJfWw== +"@strapi/admin@4.1.5": + version "4.1.5" + resolved "https://registry.yarnpkg.com/@strapi/admin/-/admin-4.1.5.tgz#460551f01e625efd822b456fad235779b18e88a5" + integrity sha512-vT7FEvoKCyHE+QgMSoDoc6HV/cvAGjOsh7I+tTbKvhHpbp4tja/KLB1Pd4v6kWBSvOOEfFz0PuqMPchw69oRQw== dependencies: "@babel/core" "7.16.7" "@babel/plugin-proposal-async-generator-functions" "7.16.7" @@ -2196,18 +2196,18 @@ "@babel/preset-env" "7.16.7" "@babel/preset-react" "7.16.7" "@babel/runtime" "7.16.7" - "@casl/ability" "^4.1.5" - "@fingerprintjs/fingerprintjs" "3.1.1" + "@casl/ability" "^5.4.3" + "@fingerprintjs/fingerprintjs" "3.3.2" "@fortawesome/fontawesome-free" "^5.15.3" "@fortawesome/fontawesome-svg-core" "^1.2.35" "@fortawesome/free-brands-svg-icons" "^5.15.3" "@fortawesome/free-solid-svg-icons" "^5.15.3" "@fortawesome/react-fontawesome" "^0.1.14" - "@strapi/babel-plugin-switch-ee-ce" "4.0.4" - "@strapi/design-system" "0.0.1-alpha.71" - "@strapi/helper-plugin" "4.0.4" - "@strapi/icons" "0.0.1-alpha.71" - "@strapi/utils" "4.0.4" + "@strapi/babel-plugin-switch-ee-ce" "4.1.5" + "@strapi/design-system" "0.0.1-alpha.79" + "@strapi/helper-plugin" "4.1.5" + "@strapi/icons" "0.0.1-alpha.79" + "@strapi/utils" "4.1.5" axios "0.24.0" babel-loader "8.2.3" babel-plugin-styled-components "2.0.2" @@ -2223,7 +2223,7 @@ fast-deep-equal "3.1.3" font-awesome "^4.7.0" formik "^2.2.6" - fs-extra "^9.1.0" + fs-extra "10.0.0" highlight.js "^10.4.1" history "^4.9.0" hoist-non-react-statics "^3.3.0" @@ -2238,12 +2238,12 @@ koa-passport "4.1.4" koa-static "5.0.0" lodash "4.17.21" - markdown-it "^12.0.6" + markdown-it "^12.3.2" markdown-it-abbr "^1.0.4" markdown-it-container "^3.0.0" - markdown-it-deflist "^2.0.3" + markdown-it-deflist "^2.1.0" markdown-it-emoji "^2.0.0" - markdown-it-footnote "^3.0.2" + markdown-it-footnote "^3.0.3" markdown-it-ins "^3.0.1" markdown-it-mark "^3.0.1" markdown-it-sub "^1.0.0" @@ -2283,19 +2283,19 @@ terser-webpack-plugin "5.3.0" webpack "5.65.0" webpack-cli "4.9.1" - webpack-dev-server "4.7.2" + webpack-dev-server "4.7.3" webpackbar "5.0.0-3" yup "^0.32.9" -"@strapi/babel-plugin-switch-ee-ce@4.0.4": - version "4.0.4" - resolved "https://registry.yarnpkg.com/@strapi/babel-plugin-switch-ee-ce/-/babel-plugin-switch-ee-ce-4.0.4.tgz#6a7eaa924ade8aa178154f6ad4afe1993c6822e1" - integrity sha512-ZgLNGKD+xLV9v5ePzNUx8zi9vPfgjI4N2ssjZLAzoakr5B4MrgaDfod10m/ILfuYFNu2sooPqmTnD5j0cdtNFA== +"@strapi/babel-plugin-switch-ee-ce@4.1.5": + version "4.1.5" + resolved "https://registry.yarnpkg.com/@strapi/babel-plugin-switch-ee-ce/-/babel-plugin-switch-ee-ce-4.1.5.tgz#4c0004c3ac41b203e29e08ca256cf4bee596fd90" + integrity sha512-DEXubsaM3wSj8ByplbXpupsd06DmFEQVMncKi/EP/q7D0LjZEywsHJuGqjAGegMxr3fy6iDLnANatE/gz35Elg== -"@strapi/database@4.0.4": - version "4.0.4" - resolved "https://registry.yarnpkg.com/@strapi/database/-/database-4.0.4.tgz#646bd55a0c2935b5472f4bb282aef23b63b3f16d" - integrity sha512-MCFcSEyX31ZpSfa7j1OGOx2djfkidYKPc8vzOl5yipMeOXH8Pqule3aa1Dig+SxGmpi7M+oSn1NQbrtDWUNQDg== +"@strapi/database@4.1.5": + version "4.1.5" + resolved "https://registry.yarnpkg.com/@strapi/database/-/database-4.1.5.tgz#22c5bd623b1bada992824f21710ffe738dc4df58" + integrity sha512-bxyDgpugHG/nj9BIi0536QW2ku2S8nG4+M3gOVtNNRp+KkXRgQvHENH8k5r+uHF/HOTw4HJ31iU8QnhThCxgBg== dependencies: date-fns "2.22.1" debug "4.3.1" @@ -2304,24 +2304,24 @@ lodash "4.17.21" umzug "2.3.0" -"@strapi/design-system@0.0.1-alpha.71": - version "0.0.1-alpha.71" - resolved "https://registry.yarnpkg.com/@strapi/design-system/-/design-system-0.0.1-alpha.71.tgz#558dd1c796a065dee568c48bc73c8d0c71374d55" - integrity sha512-79vGJFtbksKI4SbWNVZtRal1UpQJWNgq8+lvEcsv//PVHYE0GkywAuKEB9Xpz6VJPo1Ty3vLvJFUlrcfBqMkow== +"@strapi/design-system@0.0.1-alpha.79": + version "0.0.1-alpha.79" + resolved "https://registry.yarnpkg.com/@strapi/design-system/-/design-system-0.0.1-alpha.79.tgz#23e6a7f73383b72148c926fa74ed0ba1acc32f0a" + integrity sha512-o/F55Qjwao1HkqKcL8ovQ280QijJH8dLfzP+t3XMNL5Ihh3HBD2wcMS6dOsrnNDGdDE0LWQfG8bDbLPmWHmk1A== dependencies: "@internationalized/number" "^3.0.2" compute-scroll-into-view "^1.0.17" prop-types "^15.7.2" -"@strapi/generate-new@4.0.4": - version "4.0.4" - resolved "https://registry.yarnpkg.com/@strapi/generate-new/-/generate-new-4.0.4.tgz#67f727a6419953b76349ce3bdea7cea9ae95d45e" - integrity sha512-Gn0wbmto57tah9uwi7Y/mg2w0kiyFFOzT0lnbzaBZ/n6M+vCMzbrfyclbasCOOB+Y9tSkMCM8q+5fVSacsqGDQ== +"@strapi/generate-new@4.1.5": + version "4.1.5" + resolved "https://registry.yarnpkg.com/@strapi/generate-new/-/generate-new-4.1.5.tgz#18776c3b4d48042f953ad0f9bab22ea353db784e" + integrity sha512-i9jfFM3bzuIgXoVGI3yQ0RglVp0x/0ksPj7Mbd6aRmVqfjpDpcfrN/S701Ahi0TFCfPaDzdJ/TN4Ss/JAxeJVg== dependencies: "@sentry/node" "6.3.0" chalk "^4.1.1" execa "^1.0.0" - fs-extra "^9.1.0" + fs-extra "10.0.0" inquirer "8.2.0" lodash "4.17.21" node-fetch "^2.6.1" @@ -2330,30 +2330,30 @@ tar "6.1.11" uuid "^3.3.2" -"@strapi/generators@4.0.4": - version "4.0.4" - resolved "https://registry.yarnpkg.com/@strapi/generators/-/generators-4.0.4.tgz#2a23935a0c88cb8b0c5d7949fafc4d9e995397cb" - integrity sha512-HcMm/+e9OKPOS4FeauPLGQ3F7eUxuyV7HHyy1BHyy1D/7/nzR2nqMG41KBi9zF3dFIfn+O6DnsLkgEVGdFLPjg== +"@strapi/generators@4.1.5": + version "4.1.5" + resolved "https://registry.yarnpkg.com/@strapi/generators/-/generators-4.1.5.tgz#d219fe3ce5aa1df4f2b0751e1694b71114bf2427" + integrity sha512-3b1ekYkgP4tLYM03hqDptqFtd923cyTi6lY9oE7ATU1PEGIQ2ZM+LYh8moYoqwMirgHmUfbqMllNz486ulHSfA== dependencies: "@sindresorhus/slugify" "1.1.0" - "@strapi/utils" "4.0.4" + "@strapi/utils" "4.1.5" chalk "4.1.2" fs-extra "10.0.0" node-plop "0.26.3" plop "2.7.6" pluralize "8.0.0" -"@strapi/helper-plugin@4.0.4": - version "4.0.4" - resolved "https://registry.yarnpkg.com/@strapi/helper-plugin/-/helper-plugin-4.0.4.tgz#cac99403b6156a2dcc17f7ac3359275bf2e90cac" - integrity sha512-hGcl6sisgAzDJvlM+flomnzf5wI7OW1vMZOTBxgCYGzF8a+TV3FN3aScFdPkqGP0DJzTc6rSot6RmRaRHmCaJQ== +"@strapi/helper-plugin@4.1.5": + version "4.1.5" + resolved "https://registry.yarnpkg.com/@strapi/helper-plugin/-/helper-plugin-4.1.5.tgz#f6032b38af88a02d64552cbb48ca382bc48c5288" + integrity sha512-Pog53h0W+dgA+QjZpcrPgtt+hkBcRx9LYJ/CAW+BMCtqnqP0qcqQFtP5xPPxSJCkkmPX4GJT3XRWJUnjdPEq/A== dependencies: "@fortawesome/fontawesome-free" "^5.15.2" "@fortawesome/fontawesome-svg-core" "^1.2.35" "@fortawesome/free-brands-svg-icons" "^5.15.2" "@fortawesome/free-solid-svg-icons" "^5.15.3" "@fortawesome/react-fontawesome" "^0.1.14" - axios "0.24.0" + axios "0.25.0" babel-plugin-styled-components "2.0.2" formik "2.2.9" invariant "^2.2.1" @@ -2370,38 +2370,40 @@ styled-components "^5.2.3" whatwg-fetch "^3.6.2" -"@strapi/icons@0.0.1-alpha.71": - version "0.0.1-alpha.71" - resolved "https://registry.yarnpkg.com/@strapi/icons/-/icons-0.0.1-alpha.71.tgz#7348673b25964317fd97fbe4bb938e9acab9fb12" - integrity sha512-fOjcT/shqKZndKwiDI7Y06NXUNzLBAieL/pICrLxKqdYzwo7TguM3rwDxJ7igOtqh/tWDhjqve6FjAqob2yWgA== +"@strapi/icons@0.0.1-alpha.79": + version "0.0.1-alpha.79" + resolved "https://registry.yarnpkg.com/@strapi/icons/-/icons-0.0.1-alpha.79.tgz#eff8790ea3897419489a61cbfd72a436661d1420" + integrity sha512-mIPzpwOir92939rSRuRS22GLWFpLfQDyoK0vMZUsGD7uujNnRon//TUa9DJTjTHjdEjRwWO60JbJOePgJ+2cvg== + dependencies: + rimraf "^3.0.2" -"@strapi/logger@4.0.4": - version "4.0.4" - resolved "https://registry.yarnpkg.com/@strapi/logger/-/logger-4.0.4.tgz#e413402aa89bd4bf9503a3f69e0803877e290836" - integrity sha512-OzlFXyOwqozTcP+4/5qyxiOcRjQ748B3nuQkxgsrOQo+ygybGedaCunXLgwevjfkSho0N4wFXeGkr30Oag1Fvw== +"@strapi/logger@4.1.5": + version "4.1.5" + resolved "https://registry.yarnpkg.com/@strapi/logger/-/logger-4.1.5.tgz#f80aeda35e57a321b16ea8edd3763e10fdcd3d85" + integrity sha512-pbzIKf6E8OBPBMPIfTl0s/yH4HF9EEqhMR5K3lPGwqONsECmmDgk4GfITVSdoPjy1DIMdERpFFBc4hLtrtCRXg== dependencies: lodash "4.17.21" winston "3.3.3" -"@strapi/plugin-content-manager@4.0.4": - version "4.0.4" - resolved "https://registry.yarnpkg.com/@strapi/plugin-content-manager/-/plugin-content-manager-4.0.4.tgz#69e5ddd24c4bc6ae52f99be056f3faf7602973ac" - integrity sha512-1PgUWaJ32+Hzx2pjlRAf7+CstIzljigG7ScFAoFXpJn5+234Qw3B5yIah5xA3GA0fb+9Nyi0hWgRPzR+IRozDA== +"@strapi/plugin-content-manager@4.1.5": + version "4.1.5" + resolved "https://registry.yarnpkg.com/@strapi/plugin-content-manager/-/plugin-content-manager-4.1.5.tgz#5dd122e66df4a859378528f5aea6aa8e2f548551" + integrity sha512-W6Y+uo2bAmky9YpShbBk+UjiIy5gOqaFwqAQpAEmHoeA7wLWbIZAlkqMdkTglHoJNz1O5VusXwAdpJUrOkVgpg== dependencies: "@sindresorhus/slugify" "1.1.0" - "@strapi/utils" "4.0.4" + "@strapi/utils" "4.1.5" lodash "4.17.21" -"@strapi/plugin-content-type-builder@4.0.4": - version "4.0.4" - resolved "https://registry.yarnpkg.com/@strapi/plugin-content-type-builder/-/plugin-content-type-builder-4.0.4.tgz#e4d019a5c0928dc701fc8bc481827f604b64ef15" - integrity sha512-5MPb3nOuXcELY/7570iWFjFCoVvUw/VGFBITxQesw1dlfy2JuI9XCh82arKf3h9C3nIxsRMG2cSgab6EhkhryQ== +"@strapi/plugin-content-type-builder@4.1.5": + version "4.1.5" + resolved "https://registry.yarnpkg.com/@strapi/plugin-content-type-builder/-/plugin-content-type-builder-4.1.5.tgz#0f9689b038599328d4f62e31e4c7cf8ec7880968" + integrity sha512-iGexcsfZ/YyZAlsBBSpT0+Bb/ecSxPBDEfqkj0YkAz8KNZSfSL1D/mt9XhgNGyUhuvSm+L0UR4sztcay9GR3aA== dependencies: "@sindresorhus/slugify" "1.1.0" - "@strapi/generators" "4.0.4" - "@strapi/helper-plugin" "4.0.4" - "@strapi/utils" "4.0.4" - fs-extra "^9.1.0" + "@strapi/generators" "4.1.5" + "@strapi/helper-plugin" "4.1.5" + "@strapi/utils" "4.1.5" + fs-extra "10.0.0" lodash "4.17.21" pluralize "^8.0.0" react "^17.0.2" @@ -2414,33 +2416,34 @@ reselect "^4.0.0" yup "^0.32.9" -"@strapi/plugin-email@4.0.4": - version "4.0.4" - resolved "https://registry.yarnpkg.com/@strapi/plugin-email/-/plugin-email-4.0.4.tgz#2c6ff06b1f829f585fa453ccd381ac79850bd3fa" - integrity sha512-BKRBaf/DC5TsxYWpVYiOZMHftFeg/rqNMJ7t9wcvHSn51BNpaPgAfiKId3fgdblmEkolwHs/PM61w9bdg0X66g== +"@strapi/plugin-email@4.1.5": + version "4.1.5" + resolved "https://registry.yarnpkg.com/@strapi/plugin-email/-/plugin-email-4.1.5.tgz#d0f571b40c1c9ad91707ec9b3476431dfc10e085" + integrity sha512-aYV8/dNhaEzohBYE4dQeGATNDys6SUwVfYMcyXnqPfhckz/26gPTqMuKl8g2ZR2z3DFbujRrT7wZREr9Tg/L/A== dependencies: - "@strapi/provider-email-sendmail" "4.0.4" - "@strapi/utils" "4.0.4" + "@strapi/provider-email-sendmail" "4.1.5" + "@strapi/utils" "4.1.5" lodash "4.17.21" -"@strapi/plugin-i18n@4.0.4": - version "4.0.4" - resolved "https://registry.yarnpkg.com/@strapi/plugin-i18n/-/plugin-i18n-4.0.4.tgz#348bec7144a4d9e4a623f4797b16684f4e2936e9" - integrity sha512-a4YNAy1FjZNdd26GbtDl/H4ceKRx/GbPe/ThUX3ey68RF35F+kgP3bXYKQKYxH2nzYU8p+IRwVqwU0nahLhyyw== +"@strapi/plugin-i18n@4.1.5": + version "4.1.5" + resolved "https://registry.yarnpkg.com/@strapi/plugin-i18n/-/plugin-i18n-4.1.5.tgz#84e0f47b9847fb08a86a0bb50b00d7481c1d69c6" + integrity sha512-gQu0VoSxyGHVKooTbvMt6bxxQdVRFh6KaI29nh44yUenVKQsjSkpUwTUpSUrG9GZvnTr4RsDKPlg8DY+XIUumQ== dependencies: - "@strapi/utils" "4.0.4" + "@strapi/utils" "4.1.5" lodash "4.17.21" -"@strapi/plugin-upload@4.0.4": - version "4.0.4" - resolved "https://registry.yarnpkg.com/@strapi/plugin-upload/-/plugin-upload-4.0.4.tgz#3f5fe7899b3651b3d7f9714f480a5cb0fc3d0d12" - integrity sha512-8w2ZDyLh7qwH3iet19utU8O2S3VVw9U0/ZwlxizdZ3IRblgK6blgZNXI2Mlr9LUy2+RsG2piM5UX49oy2hkkQg== +"@strapi/plugin-upload@4.1.5": + version "4.1.5" + resolved "https://registry.yarnpkg.com/@strapi/plugin-upload/-/plugin-upload-4.1.5.tgz#8f8ec6ba419941cddcf62bec2427f81498a60981" + integrity sha512-EBkbvmJJI+pfh25sDvofQDMxkAtTpql18zfEX5+YA1UePKIMNZ5EL65tKhhKqvCiROx4WVAQWWHib1GSoBCcvg== dependencies: - "@strapi/helper-plugin" "4.0.4" - "@strapi/provider-upload-local" "4.0.4" - "@strapi/utils" "4.0.4" + "@strapi/helper-plugin" "4.1.5" + "@strapi/provider-upload-local" "4.1.5" + "@strapi/utils" "4.1.5" byte-size "7.0.1" cropperjs "1.5.11" + fs-extra "10.0.0" immer "9.0.6" koa-range "0.3.0" koa-static "5.0.0" @@ -2452,16 +2455,16 @@ react-redux "7.2.3" react-router "^5.2.0" react-router-dom "5.2.0" - sharp "0.29.0" + sharp "0.30.1" -"@strapi/plugin-users-permissions@4.0.4": - version "4.0.4" - resolved "https://registry.yarnpkg.com/@strapi/plugin-users-permissions/-/plugin-users-permissions-4.0.4.tgz#e3664d30ceb7a5f9a15f7c05e256ed3d9d4493cd" - integrity sha512-2+U4iQ2GPCw2zMyrnZvy+PxqSyMvJAbSEZKyMkeFOGy+igGljKjnVCKSbEVTQfePKRqjpuLWEAbiawERcQx82w== +"@strapi/plugin-users-permissions@4.1.5": + version "4.1.5" + resolved "https://registry.yarnpkg.com/@strapi/plugin-users-permissions/-/plugin-users-permissions-4.1.5.tgz#ae5e9781a0eeea54363832f685b7ebf8550b70f9" + integrity sha512-/bpZhNUCp8EeOiMUNde9RKwWfWCkFUPUBfGna7aJVzFEsHfYy0xJ7eNA5eUz70l13ZeJcbL+S4HSRjMH4m2Bmg== dependencies: "@purest/providers" "^1.0.2" - "@strapi/helper-plugin" "4.0.4" - "@strapi/utils" "4.0.4" + "@strapi/helper-plugin" "4.1.5" + "@strapi/utils" "4.1.5" bcryptjs "2.4.3" grant-koa "5.4.8" jsonwebtoken "^8.1.0" @@ -2479,38 +2482,38 @@ url-join "4.0.1" uuid "^3.1.0" -"@strapi/provider-email-sendmail@4.0.4": - version "4.0.4" - resolved "https://registry.yarnpkg.com/@strapi/provider-email-sendmail/-/provider-email-sendmail-4.0.4.tgz#e226222c4cbf6b28a61c023a693e6e962f44692d" - integrity sha512-1ptlt/QpZ0nKKeWKU3ta5fAj+4YXa555GOAyMAUv3bWQH3BDsBAYH466F/sjZA97+YPUpjbyiA6cmneZJMdbfg== +"@strapi/provider-email-sendmail@4.1.5": + version "4.1.5" + resolved "https://registry.yarnpkg.com/@strapi/provider-email-sendmail/-/provider-email-sendmail-4.1.5.tgz#756d4044f849a2ccffa0c7fb3d642fff58726b5f" + integrity sha512-mbBfxr5V1vicpUzwy7EIP8NyOzUCE7lcF5mofXffaK0Bn9wx24Wv28hfO6nlI/YDrtj13j03SL3jcfN734AI/g== dependencies: - "@strapi/utils" "4.0.4" + "@strapi/utils" "4.1.5" sendmail "^1.6.1" -"@strapi/provider-upload-local@4.0.4": - version "4.0.4" - resolved "https://registry.yarnpkg.com/@strapi/provider-upload-local/-/provider-upload-local-4.0.4.tgz#6ed17d8d331e420c18b45676939354bd83738569" - integrity sha512-BPD2jzPUY6UqbQejoxuGrUVvNK9fCK6OqqcsRONLxEh1HQ2TcOLK4K3pikIvAUy/xNDfJuN21tt6cTRGXmPAuw== +"@strapi/provider-upload-local@4.1.5": + version "4.1.5" + resolved "https://registry.yarnpkg.com/@strapi/provider-upload-local/-/provider-upload-local-4.1.5.tgz#4f14659ed2a563e76ea6c02ddf94fa1db72c6cef" + integrity sha512-O71yVGG+3xsefwEeugweLhBMk91aHsGgukN7c4vHwl2dbHZSE7sZ8ndFuwvG29CYgNBJuW+K/DhdXotnk64Cjg== dependencies: - "@strapi/utils" "4.0.4" + "@strapi/utils" "4.1.5" -"@strapi/strapi@4.0.4": - version "4.0.4" - resolved "https://registry.yarnpkg.com/@strapi/strapi/-/strapi-4.0.4.tgz#64d903be271d89a3b2ddd89a704a4dbf734aceeb" - integrity sha512-gLA+livE6JK32HQT3t1ik7qMSQyqnGat9n5YufeqASwb3MXpCa8RXla8oGrvphUv2XaCGa33uUYU3FP4DKfDMw== +"@strapi/strapi@4.1.5": + version "4.1.5" + resolved "https://registry.yarnpkg.com/@strapi/strapi/-/strapi-4.1.5.tgz#ed3e17a93a93afe86833f29f69a5c5c406f0b494" + integrity sha512-+67qAaA1AM0I2C1/Y7rBpxHyqlN9g2eFvbt/6hYcbtb98D01Qm5JJV6/qj8+pb/8DJa2mxtQ2kNT65ob9EhtdQ== dependencies: "@koa/cors" "3.1.0" "@koa/router" "10.1.1" - "@strapi/admin" "4.0.4" - "@strapi/database" "4.0.4" - "@strapi/generate-new" "4.0.4" - "@strapi/generators" "4.0.4" - "@strapi/logger" "4.0.4" - "@strapi/plugin-content-manager" "4.0.4" - "@strapi/plugin-content-type-builder" "4.0.4" - "@strapi/plugin-email" "4.0.4" - "@strapi/plugin-upload" "4.0.4" - "@strapi/utils" "4.0.4" + "@strapi/admin" "4.1.5" + "@strapi/database" "4.1.5" + "@strapi/generate-new" "4.1.5" + "@strapi/generators" "4.1.5" + "@strapi/logger" "4.1.5" + "@strapi/plugin-content-manager" "4.1.5" + "@strapi/plugin-content-type-builder" "4.1.5" + "@strapi/plugin-email" "4.1.5" + "@strapi/plugin-upload" "4.1.5" + "@strapi/utils" "4.1.5" bcryptjs "2.4.3" boxen "5.1.2" chalk "4.1.2" @@ -2538,7 +2541,7 @@ koa-session "6.2.0" koa-static "5.0.0" lodash "4.17.21" - node-fetch "2.6.5" + node-fetch "2.6.7" node-machine-id "1.1.12" node-schedule "2.0.0" open "8.2.1" @@ -2548,11 +2551,12 @@ resolve-cwd "3.0.0" semver "7.3.5" statuses "2.0.1" + uuid "^3.3.2" -"@strapi/utils@4.0.4": - version "4.0.4" - resolved "https://registry.yarnpkg.com/@strapi/utils/-/utils-4.0.4.tgz#bfb505319d9615b7e47a98d80bdaa09f02b89802" - integrity sha512-BZoOv1RexOOgsUoDVrGVM88AKuJvHItl9HguR3MDS2Rpsiiw0dCIggb2xSnXzg6qLnPYpDGi8SWh5QeSet0SSA== +"@strapi/utils@4.1.5": + version "4.1.5" + resolved "https://registry.yarnpkg.com/@strapi/utils/-/utils-4.1.5.tgz#3e80f59476cab470ba0fdb42a075b5ae47e998f2" + integrity sha512-Oz7ur7TsoqA4IOPdk6H3YwsVZ+FOi9wp+iRReKao8yfo4YKJjSYlHQlNXUaAqOOlFnT0ol7G3KF+uF8jLcfxDA== dependencies: "@sindresorhus/slugify" "1.1.0" date-fns "2.24.0" @@ -3146,6 +3150,34 @@ "@typescript-eslint/types" "4.33.0" eslint-visitor-keys "^2.0.0" +"@ucast/core@^1.0.0", "@ucast/core@^1.4.1", "@ucast/core@^1.6.1": + version "1.10.1" + resolved "https://registry.yarnpkg.com/@ucast/core/-/core-1.10.1.tgz#03a77a7804bcb5002a5cad3681e86cd1897e2e1f" + integrity sha512-sXKbvQiagjFh2JCpaHUa64P4UdJbOxYeC5xiZFn8y6iYdb0WkismduE+RmiJrIjw/eLDYmIEXiQeIYYowmkcAw== + +"@ucast/js@^3.0.0": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@ucast/js/-/js-3.0.2.tgz#862838ee68112c6c262d4f4693cc592ba83157e0" + integrity sha512-zxNkdIPVvqJjHI7D/iK8Aai1+59yqU+N7bpHFodVmiTN7ukeNiGGpNmmSjQgsUw7eNcEBnPrZHNzp5UBxwmaPw== + dependencies: + "@ucast/core" "^1.0.0" + +"@ucast/mongo2js@^1.3.0": + version "1.3.3" + resolved "https://registry.yarnpkg.com/@ucast/mongo2js/-/mongo2js-1.3.3.tgz#a683a59cea22887a72e4302f3826e41ccf51dbbe" + integrity sha512-sBPtMUYg+hRnYeVYKL+ATm8FaRPdlU9PijMhGYKgsPGjV9J4Ks41ytIjGayvKUnBOEhiCaKUUnY4qPeifdqATw== + dependencies: + "@ucast/core" "^1.6.1" + "@ucast/js" "^3.0.0" + "@ucast/mongo" "^2.4.0" + +"@ucast/mongo@^2.4.0": + version "2.4.2" + resolved "https://registry.yarnpkg.com/@ucast/mongo/-/mongo-2.4.2.tgz#a8a1c32e65ccab623be023e6cedb11d136d50f19" + integrity sha512-/zH1TdBJlYGKKD+Wh0oyD+aBvDSWrwHcD8b4tUL9UgHLhzHtkEnMVFuxbw3SRIRsAa01wmy06+LWt+WoZdj1Bw== + dependencies: + "@ucast/core" "^1.4.1" + "@vercel/webpack-asset-relocator-loader@^1.7.0": version "1.7.0" resolved "https://registry.yarnpkg.com/@vercel/webpack-asset-relocator-loader/-/webpack-asset-relocator-loader-1.7.0.tgz#d3b707e0aba3111719f941dacb2408eff3c27319" @@ -3788,6 +3820,13 @@ axios@0.24.0: dependencies: follow-redirects "^1.14.4" +axios@0.25.0: + version "0.25.0" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.25.0.tgz#349cfbb31331a9b4453190791760a8d35b093e0a" + integrity sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g== + dependencies: + follow-redirects "^1.14.7" + axios@^0.21.1: version "0.21.4" resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575" @@ -4901,6 +4940,14 @@ color@^4.0.1: color-convert "^2.0.1" color-string "^1.9.0" +color@^4.2.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/color/-/color-4.2.1.tgz#498aee5fce7fc982606c8875cab080ac0547c884" + integrity sha512-MFJr0uY4RvTQUKvPq7dh9grVOTYSFeXja2mBXioCGjnjJoXrAp9jJ1NQTDR73c9nwBSAQiNKloKl5zq9WB9UPw== + dependencies: + color-convert "^2.0.1" + color-string "^1.9.0" + colord@^2.9.1: version "2.9.2" resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.2.tgz#25e2bacbbaa65991422c07ea209e2089428effb1" @@ -5385,6 +5432,11 @@ css-loader@^5.2.7: schema-utils "^3.0.0" semver "^7.3.5" +css-mediaquery@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/css-mediaquery/-/css-mediaquery-0.1.2.tgz#6a2c37344928618631c54bd33cedd301da18bea0" + integrity sha1-aiw3NEkoYYYxxUvTPO3TAdoYvqA= + css-minimizer-webpack-plugin@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-2.0.0.tgz#3c42f6624ed4cf4780dd963e23ee649e5a25c1a8" @@ -5703,13 +5755,6 @@ decompress-response@^3.3.0: dependencies: mimic-response "^1.0.0" -decompress-response@^4.2.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-4.2.1.tgz#414023cc7a302da25ce2ec82d0d5238ccafd8986" - integrity sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw== - dependencies: - mimic-response "^2.0.0" - decompress-response@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc" @@ -5893,6 +5938,11 @@ detect-libc@^1.0.2, detect-libc@^1.0.3: resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= +detect-libc@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz#e1897aa88fa6ad197862937fbc0441ef352ee0cd" + integrity sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w== + detect-node@^2.0.4, detect-node@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" @@ -6981,6 +7031,11 @@ fecha@^4.2.0: resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.1.tgz#0a83ad8f86ef62a091e22bb5a039cd03d23eecce" integrity sha512-MMMQ0ludy/nBs1/o0zVOiKTpG7qMbonKUzjJgQFEuvq6INZ1OraKPRAWkBq5vlKLOUMpmNYG1JoN3oDPUQ9m3Q== +fetch-multiple@^1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/fetch-multiple/-/fetch-multiple-1.2.3.tgz#48cf045c1582396da02034be7dfa836bb5dae7b2" + integrity sha1-SM8EXBWCOW2gIDS+ffqDa7Xa57I= + figures@^3.0.0, figures@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af" @@ -7156,6 +7211,11 @@ follow-redirects@^1.0.0, follow-redirects@^1.10.0, follow-redirects@^1.14.0, fol resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685" integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ== +follow-redirects@^1.14.7: + version "1.14.9" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7" + integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w== + font-awesome@^4.7.0: version "4.7.0" resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133" @@ -7404,6 +7464,19 @@ gatsby-cli@^4.5.1: yoga-layout-prebuilt "^1.10.0" yurnalist "^2.1.0" +gatsby-core-utils@^1.10.1: + version "1.10.1" + resolved "https://registry.yarnpkg.com/gatsby-core-utils/-/gatsby-core-utils-1.10.1.tgz#97bed40df3fa79800e7ce0c0491680f0aadd6ce7" + integrity sha512-4P3feGCJckg+DRWWl2beFk7N9c63zmCryEGPaU1OHCp+ZT2bO0ihCBuXywDWuuEp6SYP9PZ1fs0YJ/Rt6q6lag== + dependencies: + ci-info "2.0.0" + configstore "^5.0.1" + fs-extra "^8.1.0" + node-object-hash "^2.0.0" + proper-lockfile "^4.1.1" + tmp "^0.2.1" + xdg-basedir "^4.0.0" + gatsby-core-utils@^2.7.1: version "2.14.0" resolved "https://registry.yarnpkg.com/gatsby-core-utils/-/gatsby-core-utils-2.14.0.tgz#ad0030d11776073cdc6a119f4b81e150f3921aef" @@ -7649,6 +7722,15 @@ gatsby-react-router-scroll@^5.5.0: dependencies: "@babel/runtime" "^7.15.4" +gatsby-source-custom-api@^2.3.5: + version "2.3.5" + resolved "https://registry.yarnpkg.com/gatsby-source-custom-api/-/gatsby-source-custom-api-2.3.5.tgz#f7ce1cf312e55fa178f37af19c1888134ab08802" + integrity sha512-wI25mQNYm61seWfoKvxw0VAVssuxpk0+6v8z9SywAkruWR26iFjB3GvM4LOU8cuSM3Jx27SXwj11lxgqIRRA6A== + dependencies: + gatsby-source-filesystem "^2.0.29" + node-fetch "^2.6.1" + uuid "^3.3.2" + gatsby-source-filesystem@3.7.1: version "3.7.1" resolved "https://registry.yarnpkg.com/gatsby-source-filesystem/-/gatsby-source-filesystem-3.7.1.tgz#11b22ea0ae699163a4372bf95604412a49b4fcc1" @@ -7668,6 +7750,25 @@ gatsby-source-filesystem@3.7.1: valid-url "^1.0.9" xstate "^4.14.0" +gatsby-source-filesystem@^2.0.29: + version "2.11.1" + resolved "https://registry.yarnpkg.com/gatsby-source-filesystem/-/gatsby-source-filesystem-2.11.1.tgz#c90f49c096c4bdafd8e68462966b3a6e21fd746b" + integrity sha512-Ao526Mmhm8KkF+0Tvf9Le5kKnqX7kgC1wecp82BW2KLQgdtG7UIgmHvG6PkjuFNiJ2ghXPC3vRK3J/vDPyLtkA== + dependencies: + "@babel/runtime" "^7.12.5" + better-queue "^3.8.10" + chokidar "^3.4.3" + file-type "^16.0.0" + fs-extra "^8.1.0" + gatsby-core-utils "^1.10.1" + got "^9.6.0" + md5-file "^5.0.0" + mime "^2.4.6" + pretty-bytes "^5.4.1" + progress "^2.0.3" + valid-url "^1.0.9" + xstate "^4.14.0" + gatsby-source-filesystem@^4.5.1: version "4.5.1" resolved "https://registry.yarnpkg.com/gatsby-source-filesystem/-/gatsby-source-filesystem-4.5.1.tgz#4cd34113b83027bd0e97637d14b2dfa77ca6f948" @@ -7687,6 +7788,13 @@ gatsby-source-filesystem@^4.5.1: valid-url "^1.0.9" xstate "^4.26.1" +gatsby-source-rest-api@^0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/gatsby-source-rest-api/-/gatsby-source-rest-api-0.2.3.tgz#1bbe2274a7ec686a5f07d0e5eabc84f537967287" + integrity sha512-cE3fvgOfJQxW+GvHm/GzwFbmMOdQLjiS52l+vvYn1UHeBvpM6COT+vCamNCfFJYrmTddoDUhUJ3xHjZ9O4Ackw== + dependencies: + fetch-multiple "^1.2.3" + gatsby-source-strapi@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/gatsby-source-strapi/-/gatsby-source-strapi-1.0.2.tgz#708b8df4e237aab120f23335cb42803f84de0fe5" @@ -8666,6 +8774,11 @@ human-signals@^2.1.0: resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== +hyphenate-style-name@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz#691879af8e220aea5750e8827db4ef62a54e361d" + integrity sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ== + iconv-lite@0.4.13: version "0.4.13" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2" @@ -10423,7 +10536,7 @@ markdown-it-container@^3.0.0: resolved "https://registry.yarnpkg.com/markdown-it-container/-/markdown-it-container-3.0.0.tgz#1d19b06040a020f9a827577bb7dbf67aa5de9a5b" integrity sha512-y6oKTq4BB9OQuY/KLfk/O3ysFhB3IMYoIWhGJEidXt1NQFocFK2sA2t0NYZAMyMShAGL6x5OPIbrmXPIqaN9rw== -markdown-it-deflist@^2.0.3: +markdown-it-deflist@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/markdown-it-deflist/-/markdown-it-deflist-2.1.0.tgz#50d7a56b9544cd81252f7623bd785e28a8dcef5c" integrity sha512-3OuqoRUlSxJiuQYu0cWTLHNhhq2xtoSFqsZK8plANg91+RJQU1ziQ6lA2LzmFAEes18uPBsHZpcX6We5l76Nzg== @@ -10433,7 +10546,7 @@ markdown-it-emoji@^2.0.0: resolved "https://registry.yarnpkg.com/markdown-it-emoji/-/markdown-it-emoji-2.0.0.tgz#3164ad4c009efd946e98274f7562ad611089a231" integrity sha512-39j7/9vP/CPCKbEI44oV8yoPJTpvfeReTn/COgRhSpNrjWF3PfP/JUxxB0hxV6ynOY8KH8Y8aX9NMDdo6z+6YQ== -markdown-it-footnote@^3.0.2: +markdown-it-footnote@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/markdown-it-footnote/-/markdown-it-footnote-3.0.3.tgz#e0e4c0d67390a4c5f0c75f73be605c7c190ca4d8" integrity sha512-YZMSuCGVZAjzKMn+xqIco9d1cLGxbELHZ9do/TSYVzraooV8ypsppKNmUJ0fVH5ljkCInQAtFpm8Rb3eXSrt5w== @@ -10458,7 +10571,7 @@ markdown-it-sup@1.0.0: resolved "https://registry.yarnpkg.com/markdown-it-sup/-/markdown-it-sup-1.0.0.tgz#cb9c9ff91a5255ac08f3fd3d63286e15df0a1fc3" integrity sha1-y5yf+RpSVawI8/09YyhuFd8KH8M= -markdown-it@^12.0.6: +markdown-it@^12.3.2: version "12.3.2" resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.3.2.tgz#bf92ac92283fe983fe4de8ff8abfb5ad72cd0c90" integrity sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg== @@ -10485,6 +10598,13 @@ match-sorter@^6.0.2: "@babel/runtime" "^7.12.5" remove-accents "0.4.2" +matchmediaquery@^0.3.0: + version "0.3.1" + resolved "https://registry.yarnpkg.com/matchmediaquery/-/matchmediaquery-0.3.1.tgz#8247edc47e499ebb7c58f62a9ff9ccf5b815c6d7" + integrity sha512-Hlk20WQHRIm9EE9luN1kjRjYXAQToHOIAHPJn9buxBwuhfTHoKUcX+lXBbxc85DVQfXYbEQ4HcwQdd128E3qHQ== + dependencies: + css-mediaquery "^0.1.2" + md5-file@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/md5-file/-/md5-file-5.0.0.tgz#e519f631feca9c39e7f9ea1780b63c4745012e20" @@ -10675,11 +10795,6 @@ mimic-response@^1.0.0, mimic-response@^1.0.1: resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== -mimic-response@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz#d13763d35f613d09ec37ebb30bac0469c0ee8f43" - integrity sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA== - mimic-response@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" @@ -11045,13 +11160,6 @@ no-case@^3.0.4: lower-case "^2.0.2" tslib "^2.0.3" -node-abi@^2.21.0: - version "2.30.1" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.30.1.tgz#c437d4b1fe0e285aaf290d45b45d4d7afedac4cf" - integrity sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w== - dependencies: - semver "^5.4.1" - node-abi@^3.3.0: version "3.5.0" resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.5.0.tgz#26e8b7b251c3260a5ac5ba5aef3b4345a0229248" @@ -11064,11 +11172,16 @@ node-addon-api@^3.0.0: resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161" integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A== -node-addon-api@^4.0.0, node-addon-api@^4.2.0: +node-addon-api@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.2.0.tgz#117cbb5a959dff0992e1c586ae0393573e4d2a87" integrity sha512-eazsqzwG2lskuzBqCGPi7Ac2UgOoMz8JVOXVhTvvPDYhthvNpefx8jWD8Np7Gv+2Sz0FlPWZk0nJV0z598Wn8Q== +node-addon-api@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f" + integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ== + node-eta@^0.9.0: version "0.9.0" resolved "https://registry.yarnpkg.com/node-eta/-/node-eta-0.9.0.tgz#9fb0b099bcd2a021940e603c64254dc003d9a7a8" @@ -11079,10 +11192,10 @@ node-fetch@2.6.1: resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== -node-fetch@2.6.5: - version "2.6.5" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.5.tgz#42735537d7f080a7e5f78b6c549b7146be1742fd" - integrity sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ== +node-fetch@2.6.7: + version "2.6.7" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad" + integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ== dependencies: whatwg-url "^5.0.0" @@ -11093,10 +11206,10 @@ node-fetch@^2.6.1, node-fetch@^2.6.6: dependencies: whatwg-url "^5.0.0" -node-forge@^0.10.0: - version "0.10.0" - resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3" - integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA== +node-forge@^1.2.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.0.tgz#37a874ea723855f37db091e6c186e5b67a01d4b2" + integrity sha512-08ARB91bUi6zNKzVmaj3QO7cr397uiDT2nJ63cHjyNtCTWIgvS47j3eT0WfzUwS9+6Z5YshRaoasFkXCKrIYbA== node-gyp-build@^4.2.3: version "4.3.0" @@ -11126,7 +11239,7 @@ node-machine-id@1.1.12, node-machine-id@^1.1.10: resolved "https://registry.yarnpkg.com/node-machine-id/-/node-machine-id-1.1.12.tgz#37904eee1e59b320bb9c5d6c0a59f3b469cb6267" integrity sha512-QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ== -node-object-hash@^2.3.10, node-object-hash@^2.3.9: +node-object-hash@^2.0.0, node-object-hash@^2.3.10, node-object-hash@^2.3.9: version "2.3.10" resolved "https://registry.yarnpkg.com/node-object-hash/-/node-object-hash-2.3.10.tgz#4b0c1a3a8239e955f0db71f8e00b38b5c0b33992" integrity sha512-jY5dPJzw6NHd/KPSfPKJ+IHoFS81/tJ43r34ZeNMXGzCOM8jwQDCD12HYayKIB6MuznrnqIYy2e891NA2g0ibA== @@ -12084,10 +12197,10 @@ pg-int8@1.0.1: resolved "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz#943bd463bf5b71b4170115f80f8efc9a0c0eb78c" integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw== -pg-pool@^3.4.1: - version "3.4.1" - resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.4.1.tgz#0e71ce2c67b442a5e862a9c182172c37eda71e9c" - integrity sha512-TVHxR/gf3MeJRvchgNHxsYsTCHQ+4wm3VIHSS19z8NC0+gioEhq1okDY1sm/TYbfoP6JLFx01s0ShvZ3puP/iQ== +pg-pool@^3.5.1: + version "3.5.1" + resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.5.1.tgz#f499ce76f9bf5097488b3b83b19861f28e4ed905" + integrity sha512-6iCR0wVrro6OOHFsyavV+i6KYL4lVNyYAB9RD18w66xSzN+d8b66HiwuP30Gp1SH5O9T82fckkzsRjlrhD0ioQ== pg-protocol@^1.5.0: version "1.5.0" @@ -12105,15 +12218,15 @@ pg-types@^2.1.0: postgres-date "~1.0.4" postgres-interval "^1.1.0" -pg@^8.7.1: - version "8.7.1" - resolved "https://registry.yarnpkg.com/pg/-/pg-8.7.1.tgz#9ea9d1ec225980c36f94e181d009ab9f4ce4c471" - integrity sha512-7bdYcv7V6U3KAtWjpQJJBww0UEsWuh4yQ/EjNf2HeO/NnvKjpvhEIe/A/TleP6wtmSKnUnghs5A9jUoK6iDdkA== +pg@^8.7.3: + version "8.7.3" + resolved "https://registry.yarnpkg.com/pg/-/pg-8.7.3.tgz#8a5bdd664ca4fda4db7997ec634c6e5455b27c44" + integrity sha512-HPmH4GH4H3AOprDJOazoIcpI49XFsHCe8xlrjHkWiapdbHK+HLtbm/GQzXYAZwmPju/kzKhjaSfMACG+8cgJcw== dependencies: buffer-writer "2.0.0" packet-reader "1.0.0" pg-connection-string "^2.5.0" - pg-pool "^3.4.1" + pg-pool "^3.5.1" pg-protocol "^1.5.0" pg-types "^2.1.0" pgpass "1.x" @@ -12518,10 +12631,10 @@ potrace@^2.1.8: dependencies: jimp "^0.14.0" -prebuild-install@^6.1.4: - version "6.1.4" - resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.4.tgz#ae3c0142ad611d58570b89af4986088a4937e00f" - integrity sha512-Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ== +prebuild-install@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.0.0.tgz#3c5ce3902f1cb9d6de5ae94ca53575e4af0c1574" + integrity sha512-IvSenf33K7JcgddNz2D5w521EgO+4aMMjFt73Uk9FRzQ7P+QZPKrp7qPsDydsSwjGt3T5xRNnM1bj1zMTD5fTA== dependencies: detect-libc "^1.0.3" expand-template "^2.0.3" @@ -12529,20 +12642,20 @@ prebuild-install@^6.1.4: minimist "^1.2.3" mkdirp-classic "^0.5.3" napi-build-utils "^1.0.1" - node-abi "^2.21.0" + node-abi "^3.3.0" npmlog "^4.0.1" pump "^3.0.0" rc "^1.2.7" - simple-get "^3.0.3" + simple-get "^4.0.0" tar-fs "^2.0.0" tunnel-agent "^0.6.0" -prebuild-install@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.0.0.tgz#3c5ce3902f1cb9d6de5ae94ca53575e4af0c1574" - integrity sha512-IvSenf33K7JcgddNz2D5w521EgO+4aMMjFt73Uk9FRzQ7P+QZPKrp7qPsDydsSwjGt3T5xRNnM1bj1zMTD5fTA== +prebuild-install@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.0.1.tgz#c10075727c318efe72412f333e0ef625beaf3870" + integrity sha512-QBSab31WqkyxpnMWQxubYAHR5S9B2+r81ucocew34Fkl98FhvKIF50jIJnNOBmAZfyNV7vE5T6gd3hTVWgY6tg== dependencies: - detect-libc "^1.0.3" + detect-libc "^2.0.0" expand-template "^2.0.3" github-from-package "0.0.0" minimist "^1.2.3" @@ -12655,7 +12768,7 @@ prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, object-assign "^4.1.1" react-is "^16.13.1" -proper-lockfile@^4.1.2: +proper-lockfile@^4.1.1, proper-lockfile@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/proper-lockfile/-/proper-lockfile-4.1.2.tgz#c8b9de2af6b2f1601067f98e01ac66baa223141f" integrity sha512-TjNPblN4BwAWMXU8s9AEz4JmQxnD1NNL7bNOY/AKUzyamc379FWASUhc/K1pL2noVb+XmZKLL68cjzLsiOAMaA== @@ -12760,7 +12873,7 @@ qs@6.9.6: resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.6.tgz#26ed3c8243a431b2924aca84cc90471f35d5a0ee" integrity sha512-TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ== -qs@^6.10.2, qs@^6.4.0, qs@^6.9.4, qs@^6.9.6: +qs@^6.10.2, qs@^6.10.3, qs@^6.4.0, qs@^6.9.4, qs@^6.9.6: version "6.10.3" resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.3.tgz#d6cde1b2ffca87b5aa57889816c5f81535e22e8e" integrity sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ== @@ -13020,6 +13133,16 @@ react-refresh@^0.9.0: resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.9.0.tgz#71863337adc3e5c2f8a6bfddd12ae3bfe32aafbf" integrity sha512-Gvzk7OZpiqKSkxsQvO/mbTN1poglhmAV7gR/DdIrRrSMXraRQQlfikRJOr3Nb9GTMPC5kof948Zy6jJZIFtDvQ== +react-responsive@^9.0.0-beta.6: + version "9.0.0-beta.6" + resolved "https://registry.yarnpkg.com/react-responsive/-/react-responsive-9.0.0-beta.6.tgz#78dcc9c2af3b176dfa4088dae617a73dba8adbe7" + integrity sha512-Flk6UrnpBBByreva6ja/TsbXiXq4BXOlDEKL6Ur+nshUs3CcN5W0BpGe6ClFWrKcORkMZAAYy7A4N4xlMmpgVw== + dependencies: + hyphenate-style-name "^1.0.0" + matchmediaquery "^0.3.0" + prop-types "^15.6.1" + shallow-equal "^1.2.1" + react-router-dom@5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.2.0.tgz#9e65a4d0c45e13289e66c7b17c7e175d0ea15662" @@ -13729,12 +13852,12 @@ select-hose@^2.0.0: resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo= -selfsigned@^1.10.11: - version "1.10.14" - resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.14.tgz#ee51d84d9dcecc61e07e4aba34f229ab525c1574" - integrity sha512-lkjaiAye+wBZDCBsu5BGi0XiLRxeUlsGod5ZP924CRSEoGuZAw/f7y9RKu28rwTfiHVhdavhB0qH0INV6P1lEA== +selfsigned@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.0.0.tgz#e927cd5377cbb0a1075302cff8df1042cc2bce5b" + integrity sha512-cUdFiCbKoa1mZ6osuJs2uDHrs0k0oprsKveFiiaBKCNq3SYyb5gs2HxhQyDNLCmL51ZZThqi4YNDpCK6GOP1iQ== dependencies: - node-forge "^0.10.0" + node-forge "^1.2.0" semver-diff@^3.1.1: version "3.1.1" @@ -13755,7 +13878,7 @@ semver@7.3.5, semver@^7.2.1, semver@^7.3.4, semver@^7.3.5: dependencies: lru-cache "^6.0.0" -semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0: +semver@^5.3.0, semver@^5.5.0, semver@^5.6.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -13918,22 +14041,27 @@ shallow-compare@^1.2.2: resolved "https://registry.yarnpkg.com/shallow-compare/-/shallow-compare-1.2.2.tgz#fa4794627bf455a47c4f56881d8a6132d581ffdb" integrity sha512-LUMFi+RppPlrHzbqmFnINTrazo0lPNwhcgzuAXVVcfy/mqPDrQmHAyz5bvV0gDAuRFrk804V0HpQ6u9sZ0tBeg== +shallow-equal@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/shallow-equal/-/shallow-equal-1.2.1.tgz#4c16abfa56043aa20d050324efa68940b0da79da" + integrity sha512-S4vJDjHHMBaiZuT9NPb616CSmLf618jawtv3sufLl6ivK8WocjAo58cXwbRV1cgqxH0Qbv+iUt6m05eqEa2IRA== + shallowequal@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8" integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ== -sharp@0.29.0: - version "0.29.0" - resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.29.0.tgz#1fa302bd5f60292138c823aa0905609f64d710ba" - integrity sha512-mdN1Up0eN+SwyForPls59dWO0nx64J1XRQYy5ZiKSADAccGYCB10UAGJHSVG9VObzJdhHqrVJzQcq6gx8USyoA== +sharp@0.30.1: + version "0.30.1" + resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.30.1.tgz#203efaf9acfc5c15c8a343800254621e56011c12" + integrity sha512-ycpz81q8AeVjz1pGvvirQBeJcYE2sXAjcLXR/69LWOe/oxavBLOrenZcTzvTXn83jqAGqY+OuwF+2kFXzbKtDA== dependencies: - color "^4.0.1" - detect-libc "^1.0.3" - node-addon-api "^4.0.0" - prebuild-install "^6.1.4" + color "^4.2.0" + detect-libc "^2.0.0" + node-addon-api "^4.3.0" + prebuild-install "^7.0.1" semver "^7.3.5" - simple-get "^3.1.0" + simple-get "^4.0.1" tar-fs "^2.1.1" tunnel-agent "^0.6.0" @@ -14004,11 +14132,6 @@ sift@13.5.2: resolved "https://registry.yarnpkg.com/sift/-/sift-13.5.2.tgz#24a715e13c617b086166cd04917d204a591c9da6" integrity sha512-+gxdEOMA2J+AI+fVsCqeNn7Tgx3M9ZN9jdi95939l1IJ8cZsqS8sqpJyOkic2SJk+1+98Uwryt/gL6XDaV+UZA== -sift@^13.0.0: - version "13.5.4" - resolved "https://registry.yarnpkg.com/sift/-/sift-13.5.4.tgz#7b2a67f724c8b2fca121fcfdef4011bb1ea4e3ef" - integrity sha512-J/d0r/MJlD7vG3j6FZI3/KnN+MxEmPUx2nyKNawysbl2ktisEnAWI5j0AgHM19p4xFA2vDXve4i8TQYYfi9O6Q== - signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.5, signal-exit@^3.0.6: version "3.0.6" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af" @@ -14019,15 +14142,6 @@ simple-concat@^1.0.0: resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f" integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q== -simple-get@^3.0.3, simple-get@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.0.tgz#b45be062435e50d159540b576202ceec40b9c6b3" - integrity sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA== - dependencies: - decompress-response "^4.2.0" - once "^1.3.1" - simple-concat "^1.0.0" - simple-get@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.0.tgz#73fa628278d21de83dadd5512d2cc1f4872bd675" @@ -14037,6 +14151,15 @@ simple-get@^4.0.0: once "^1.3.1" simple-concat "^1.0.0" +simple-get@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.1.tgz#4a39db549287c979d352112fa03fd99fd6bc3543" + integrity sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA== + dependencies: + decompress-response "^6.0.0" + once "^1.3.1" + simple-concat "^1.0.0" + simple-swizzle@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a" @@ -15584,10 +15707,10 @@ webpack-dev-middleware@^5.3.0: range-parser "^1.2.1" schema-utils "^4.0.0" -webpack-dev-server@4.7.2: - version "4.7.2" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.7.2.tgz#324b79046491f2cf0b9d9e275381198c8246b380" - integrity sha512-s6yEOSfPpB6g1T2+C5ZOUt5cQOMhjI98IVmmvMNb5cdiqHoxSUfACISHqU/wZy+q4ar/A9jW0pbNj7sa50XRVA== +webpack-dev-server@4.7.3: + version "4.7.3" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.7.3.tgz#4e995b141ff51fa499906eebc7906f6925d0beaa" + integrity sha512-mlxq2AsIw2ag016nixkzUkdyOE8ST2GTy34uKSABp1c4nhjZvH90D5ZRR+UOLSsG4Z3TFahAi72a3ymRtfRm+Q== dependencies: "@types/bonjour" "^3.5.9" "@types/connect-history-api-fallback" "^1.3.5" @@ -15611,7 +15734,7 @@ webpack-dev-server@4.7.2: p-retry "^4.5.0" portfinder "^1.0.28" schema-utils "^4.0.0" - selfsigned "^1.10.11" + selfsigned "^2.0.0" serve-index "^1.9.1" sockjs "^0.3.21" spdy "^4.0.2"