diff --git a/frontend/assets/css/fonts.css b/frontend/assets/css/fonts.css new file mode 100644 index 000000000000..5ce1be56571e --- /dev/null +++ b/frontend/assets/css/fonts.css @@ -0,0 +1,378 @@ +/* cyrillic-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 100; + font-display: swap; + src: url('/assets/fonts/Roboto-100-cyrillic-ext1.woff2') format('woff2'); + unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; +} +/* cyrillic */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 100; + font-display: swap; + src: url('/assets/fonts/Roboto-100-cyrillic2.woff2') format('woff2'); + unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; +} +/* greek-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 100; + font-display: swap; + src: url('/assets/fonts/Roboto-100-greek-ext3.woff2') format('woff2'); + unicode-range: U+1F00-1FFF; +} +/* greek */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 100; + font-display: swap; + src: url('/assets/fonts/Roboto-100-greek4.woff2') format('woff2'); + unicode-range: U+0370-03FF; +} +/* vietnamese */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 100; + font-display: swap; + src: url('/assets/fonts/Roboto-100-vietnamese5.woff2') format('woff2'); + unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB; +} +/* latin-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 100; + font-display: swap; + src: url('/assets/fonts/Roboto-100-latin-ext6.woff2') format('woff2'); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 100; + font-display: swap; + src: url('/assets/fonts/Roboto-100-latin7.woff2') format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +/* cyrillic-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 300; + font-display: swap; + src: url('/assets/fonts/Roboto-300-cyrillic-ext8.woff2') format('woff2'); + unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; +} +/* cyrillic */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 300; + font-display: swap; + src: url('/assets/fonts/Roboto-300-cyrillic9.woff2') format('woff2'); + unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; +} +/* greek-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 300; + font-display: swap; + src: url('/assets/fonts/Roboto-300-greek-ext10.woff2') format('woff2'); + unicode-range: U+1F00-1FFF; +} +/* greek */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 300; + font-display: swap; + src: url('/assets/fonts/Roboto-300-greek11.woff2') format('woff2'); + unicode-range: U+0370-03FF; +} +/* vietnamese */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 300; + font-display: swap; + src: url('/assets/fonts/Roboto-300-vietnamese12.woff2') format('woff2'); + unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB; +} +/* latin-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 300; + font-display: swap; + src: url('/assets/fonts/Roboto-300-latin-ext13.woff2') format('woff2'); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 300; + font-display: swap; + src: url('/assets/fonts/Roboto-300-latin14.woff2') format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +/* cyrillic-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url('/assets/fonts/Roboto-400-cyrillic-ext15.woff2') format('woff2'); + unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; +} +/* cyrillic */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url('/assets/fonts/Roboto-400-cyrillic16.woff2') format('woff2'); + unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; +} +/* greek-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url('/assets/fonts/Roboto-400-greek-ext17.woff2') format('woff2'); + unicode-range: U+1F00-1FFF; +} +/* greek */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url('/assets/fonts/Roboto-400-greek18.woff2') format('woff2'); + unicode-range: U+0370-03FF; +} +/* vietnamese */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url('/assets/fonts/Roboto-400-vietnamese19.woff2') format('woff2'); + unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB; +} +/* latin-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url('/assets/fonts/Roboto-400-latin-ext20.woff2') format('woff2'); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url('/assets/fonts/Roboto-400-latin21.woff2') format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +/* cyrillic-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 500; + font-display: swap; + src: url('/assets/fonts/Roboto-500-cyrillic-ext22.woff2') format('woff2'); + unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; +} +/* cyrillic */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 500; + font-display: swap; + src: url('/assets/fonts/Roboto-500-cyrillic23.woff2') format('woff2'); + unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; +} +/* greek-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 500; + font-display: swap; + src: url('/assets/fonts/Roboto-500-greek-ext24.woff2') format('woff2'); + unicode-range: U+1F00-1FFF; +} +/* greek */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 500; + font-display: swap; + src: url('/assets/fonts/Roboto-500-greek25.woff2') format('woff2'); + unicode-range: U+0370-03FF; +} +/* vietnamese */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 500; + font-display: swap; + src: url('/assets/fonts/Roboto-500-vietnamese26.woff2') format('woff2'); + unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB; +} +/* latin-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 500; + font-display: swap; + src: url('/assets/fonts/Roboto-500-latin-ext27.woff2') format('woff2'); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 500; + font-display: swap; + src: url('/assets/fonts/Roboto-500-latin28.woff2') format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +/* cyrillic-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 700; + font-display: swap; + src: url('/assets/fonts/Roboto-700-cyrillic-ext29.woff2') format('woff2'); + unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; +} +/* cyrillic */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 700; + font-display: swap; + src: url('/assets/fonts/Roboto-700-cyrillic30.woff2') format('woff2'); + unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; +} +/* greek-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 700; + font-display: swap; + src: url('/assets/fonts/Roboto-700-greek-ext31.woff2') format('woff2'); + unicode-range: U+1F00-1FFF; +} +/* greek */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 700; + font-display: swap; + src: url('/assets/fonts/Roboto-700-greek32.woff2') format('woff2'); + unicode-range: U+0370-03FF; +} +/* vietnamese */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 700; + font-display: swap; + src: url('/assets/fonts/Roboto-700-vietnamese33.woff2') format('woff2'); + unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB; +} +/* latin-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 700; + font-display: swap; + src: url('/assets/fonts/Roboto-700-latin-ext34.woff2') format('woff2'); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 700; + font-display: swap; + src: url('/assets/fonts/Roboto-700-latin35.woff2') format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +/* cyrillic-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 900; + font-display: swap; + src: url('/assets/fonts/Roboto-900-cyrillic-ext36.woff2') format('woff2'); + unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; +} +/* cyrillic */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 900; + font-display: swap; + src: url('/assets/fonts/Roboto-900-cyrillic37.woff2') format('woff2'); + unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; +} +/* greek-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 900; + font-display: swap; + src: url('/assets/fonts/Roboto-900-greek-ext38.woff2') format('woff2'); + unicode-range: U+1F00-1FFF; +} +/* greek */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 900; + font-display: swap; + src: url('/assets/fonts/Roboto-900-greek39.woff2') format('woff2'); + unicode-range: U+0370-03FF; +} +/* vietnamese */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 900; + font-display: swap; + src: url('/assets/fonts/Roboto-900-vietnamese40.woff2') format('woff2'); + unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB; +} +/* latin-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 900; + font-display: swap; + src: url('/assets/fonts/Roboto-900-latin-ext41.woff2') format('woff2'); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 900; + font-display: swap; + src: url('/assets/fonts/Roboto-900-latin42.woff2') format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} diff --git a/frontend/assets/main.css b/frontend/assets/css/main.css similarity index 100% rename from frontend/assets/main.css rename to frontend/assets/css/main.css diff --git a/frontend/assets/fonts/Roboto-100-cyrillic-ext1.woff2 b/frontend/assets/fonts/Roboto-100-cyrillic-ext1.woff2 new file mode 100644 index 000000000000..f8d7a0d4946b Binary files /dev/null and b/frontend/assets/fonts/Roboto-100-cyrillic-ext1.woff2 differ diff --git a/frontend/assets/fonts/Roboto-100-cyrillic2.woff2 b/frontend/assets/fonts/Roboto-100-cyrillic2.woff2 new file mode 100644 index 000000000000..122ac2c7a19b Binary files /dev/null and b/frontend/assets/fonts/Roboto-100-cyrillic2.woff2 differ diff --git a/frontend/assets/fonts/Roboto-100-greek-ext3.woff2 b/frontend/assets/fonts/Roboto-100-greek-ext3.woff2 new file mode 100644 index 000000000000..11c7018c20a9 Binary files /dev/null and b/frontend/assets/fonts/Roboto-100-greek-ext3.woff2 differ diff --git a/frontend/assets/fonts/Roboto-100-greek4.woff2 b/frontend/assets/fonts/Roboto-100-greek4.woff2 new file mode 100644 index 000000000000..72fc02143e29 Binary files /dev/null and b/frontend/assets/fonts/Roboto-100-greek4.woff2 differ diff --git a/frontend/assets/fonts/Roboto-100-latin-ext6.woff2 b/frontend/assets/fonts/Roboto-100-latin-ext6.woff2 new file mode 100644 index 000000000000..02a27ead761d Binary files /dev/null and b/frontend/assets/fonts/Roboto-100-latin-ext6.woff2 differ diff --git a/frontend/assets/fonts/Roboto-100-latin7.woff2 b/frontend/assets/fonts/Roboto-100-latin7.woff2 new file mode 100644 index 000000000000..71c9bb7d8506 Binary files /dev/null and b/frontend/assets/fonts/Roboto-100-latin7.woff2 differ diff --git a/frontend/assets/fonts/Roboto-100-vietnamese5.woff2 b/frontend/assets/fonts/Roboto-100-vietnamese5.woff2 new file mode 100644 index 000000000000..24a1bfd3532c Binary files /dev/null and b/frontend/assets/fonts/Roboto-100-vietnamese5.woff2 differ diff --git a/frontend/assets/fonts/Roboto-300-cyrillic-ext8.woff2 b/frontend/assets/fonts/Roboto-300-cyrillic-ext8.woff2 new file mode 100644 index 000000000000..0f6e60b8eaad Binary files /dev/null and b/frontend/assets/fonts/Roboto-300-cyrillic-ext8.woff2 differ diff --git a/frontend/assets/fonts/Roboto-300-cyrillic9.woff2 b/frontend/assets/fonts/Roboto-300-cyrillic9.woff2 new file mode 100644 index 000000000000..9d7fb7f8780e Binary files /dev/null and b/frontend/assets/fonts/Roboto-300-cyrillic9.woff2 differ diff --git a/frontend/assets/fonts/Roboto-300-greek-ext10.woff2 b/frontend/assets/fonts/Roboto-300-greek-ext10.woff2 new file mode 100644 index 000000000000..87711c048c61 Binary files /dev/null and b/frontend/assets/fonts/Roboto-300-greek-ext10.woff2 differ diff --git a/frontend/assets/fonts/Roboto-300-greek11.woff2 b/frontend/assets/fonts/Roboto-300-greek11.woff2 new file mode 100644 index 000000000000..b289f0029261 Binary files /dev/null and b/frontend/assets/fonts/Roboto-300-greek11.woff2 differ diff --git a/frontend/assets/fonts/Roboto-300-latin-ext13.woff2 b/frontend/assets/fonts/Roboto-300-latin-ext13.woff2 new file mode 100644 index 000000000000..91231c9c46f4 Binary files /dev/null and b/frontend/assets/fonts/Roboto-300-latin-ext13.woff2 differ diff --git a/frontend/assets/fonts/Roboto-300-latin14.woff2 b/frontend/assets/fonts/Roboto-300-latin14.woff2 new file mode 100644 index 000000000000..60681387e7bf Binary files /dev/null and b/frontend/assets/fonts/Roboto-300-latin14.woff2 differ diff --git a/frontend/assets/fonts/Roboto-300-vietnamese12.woff2 b/frontend/assets/fonts/Roboto-300-vietnamese12.woff2 new file mode 100644 index 000000000000..c009987852d2 Binary files /dev/null and b/frontend/assets/fonts/Roboto-300-vietnamese12.woff2 differ diff --git a/frontend/assets/fonts/Roboto-400-cyrillic-ext15.woff2 b/frontend/assets/fonts/Roboto-400-cyrillic-ext15.woff2 new file mode 100644 index 000000000000..22ddee9c93c8 Binary files /dev/null and b/frontend/assets/fonts/Roboto-400-cyrillic-ext15.woff2 differ diff --git a/frontend/assets/fonts/Roboto-400-cyrillic16.woff2 b/frontend/assets/fonts/Roboto-400-cyrillic16.woff2 new file mode 100644 index 000000000000..47da362999e3 Binary files /dev/null and b/frontend/assets/fonts/Roboto-400-cyrillic16.woff2 differ diff --git a/frontend/assets/fonts/Roboto-400-greek-ext17.woff2 b/frontend/assets/fonts/Roboto-400-greek-ext17.woff2 new file mode 100644 index 000000000000..72ce0e98409f Binary files /dev/null and b/frontend/assets/fonts/Roboto-400-greek-ext17.woff2 differ diff --git a/frontend/assets/fonts/Roboto-400-greek18.woff2 b/frontend/assets/fonts/Roboto-400-greek18.woff2 new file mode 100644 index 000000000000..fc71d944a583 Binary files /dev/null and b/frontend/assets/fonts/Roboto-400-greek18.woff2 differ diff --git a/frontend/assets/fonts/Roboto-400-latin-ext20.woff2 b/frontend/assets/fonts/Roboto-400-latin-ext20.woff2 new file mode 100644 index 000000000000..8a8de615eb2f Binary files /dev/null and b/frontend/assets/fonts/Roboto-400-latin-ext20.woff2 differ diff --git a/frontend/assets/fonts/Roboto-400-latin21.woff2 b/frontend/assets/fonts/Roboto-400-latin21.woff2 new file mode 100644 index 000000000000..020729ef8d35 Binary files /dev/null and b/frontend/assets/fonts/Roboto-400-latin21.woff2 differ diff --git a/frontend/assets/fonts/Roboto-400-vietnamese19.woff2 b/frontend/assets/fonts/Roboto-400-vietnamese19.woff2 new file mode 100644 index 000000000000..6284d2e3bc4f Binary files /dev/null and b/frontend/assets/fonts/Roboto-400-vietnamese19.woff2 differ diff --git a/frontend/assets/fonts/Roboto-500-cyrillic-ext22.woff2 b/frontend/assets/fonts/Roboto-500-cyrillic-ext22.woff2 new file mode 100644 index 000000000000..8571683e543a Binary files /dev/null and b/frontend/assets/fonts/Roboto-500-cyrillic-ext22.woff2 differ diff --git a/frontend/assets/fonts/Roboto-500-cyrillic23.woff2 b/frontend/assets/fonts/Roboto-500-cyrillic23.woff2 new file mode 100644 index 000000000000..cb5834ff837e Binary files /dev/null and b/frontend/assets/fonts/Roboto-500-cyrillic23.woff2 differ diff --git a/frontend/assets/fonts/Roboto-500-greek-ext24.woff2 b/frontend/assets/fonts/Roboto-500-greek-ext24.woff2 new file mode 100644 index 000000000000..064e94b789bf Binary files /dev/null and b/frontend/assets/fonts/Roboto-500-greek-ext24.woff2 differ diff --git a/frontend/assets/fonts/Roboto-500-greek25.woff2 b/frontend/assets/fonts/Roboto-500-greek25.woff2 new file mode 100644 index 000000000000..0933dfe8719a Binary files /dev/null and b/frontend/assets/fonts/Roboto-500-greek25.woff2 differ diff --git a/frontend/assets/fonts/Roboto-500-latin-ext27.woff2 b/frontend/assets/fonts/Roboto-500-latin-ext27.woff2 new file mode 100644 index 000000000000..68f094cde5f0 Binary files /dev/null and b/frontend/assets/fonts/Roboto-500-latin-ext27.woff2 differ diff --git a/frontend/assets/fonts/Roboto-500-latin28.woff2 b/frontend/assets/fonts/Roboto-500-latin28.woff2 new file mode 100644 index 000000000000..29342a8de253 Binary files /dev/null and b/frontend/assets/fonts/Roboto-500-latin28.woff2 differ diff --git a/frontend/assets/fonts/Roboto-500-vietnamese26.woff2 b/frontend/assets/fonts/Roboto-500-vietnamese26.woff2 new file mode 100644 index 000000000000..6b0b4afef954 Binary files /dev/null and b/frontend/assets/fonts/Roboto-500-vietnamese26.woff2 differ diff --git a/frontend/assets/fonts/Roboto-700-cyrillic-ext29.woff2 b/frontend/assets/fonts/Roboto-700-cyrillic-ext29.woff2 new file mode 100644 index 000000000000..639955285d3d Binary files /dev/null and b/frontend/assets/fonts/Roboto-700-cyrillic-ext29.woff2 differ diff --git a/frontend/assets/fonts/Roboto-700-cyrillic30.woff2 b/frontend/assets/fonts/Roboto-700-cyrillic30.woff2 new file mode 100644 index 000000000000..1bb7737cdc95 Binary files /dev/null and b/frontend/assets/fonts/Roboto-700-cyrillic30.woff2 differ diff --git a/frontend/assets/fonts/Roboto-700-greek-ext31.woff2 b/frontend/assets/fonts/Roboto-700-greek-ext31.woff2 new file mode 100644 index 000000000000..a0d68e2b4f2d Binary files /dev/null and b/frontend/assets/fonts/Roboto-700-greek-ext31.woff2 differ diff --git a/frontend/assets/fonts/Roboto-700-greek32.woff2 b/frontend/assets/fonts/Roboto-700-greek32.woff2 new file mode 100644 index 000000000000..cb9bfa71feaf Binary files /dev/null and b/frontend/assets/fonts/Roboto-700-greek32.woff2 differ diff --git a/frontend/assets/fonts/Roboto-700-latin-ext34.woff2 b/frontend/assets/fonts/Roboto-700-latin-ext34.woff2 new file mode 100644 index 000000000000..94ab5fb01ce4 Binary files /dev/null and b/frontend/assets/fonts/Roboto-700-latin-ext34.woff2 differ diff --git a/frontend/assets/fonts/Roboto-700-latin35.woff2 b/frontend/assets/fonts/Roboto-700-latin35.woff2 new file mode 100644 index 000000000000..771fbeccc691 Binary files /dev/null and b/frontend/assets/fonts/Roboto-700-latin35.woff2 differ diff --git a/frontend/assets/fonts/Roboto-700-vietnamese33.woff2 b/frontend/assets/fonts/Roboto-700-vietnamese33.woff2 new file mode 100644 index 000000000000..3c4501118e82 Binary files /dev/null and b/frontend/assets/fonts/Roboto-700-vietnamese33.woff2 differ diff --git a/frontend/assets/fonts/Roboto-900-cyrillic-ext36.woff2 b/frontend/assets/fonts/Roboto-900-cyrillic-ext36.woff2 new file mode 100644 index 000000000000..f041fde398db Binary files /dev/null and b/frontend/assets/fonts/Roboto-900-cyrillic-ext36.woff2 differ diff --git a/frontend/assets/fonts/Roboto-900-cyrillic37.woff2 b/frontend/assets/fonts/Roboto-900-cyrillic37.woff2 new file mode 100644 index 000000000000..1d173f2a0aa5 Binary files /dev/null and b/frontend/assets/fonts/Roboto-900-cyrillic37.woff2 differ diff --git a/frontend/assets/fonts/Roboto-900-greek-ext38.woff2 b/frontend/assets/fonts/Roboto-900-greek-ext38.woff2 new file mode 100644 index 000000000000..9eda94a2ceab Binary files /dev/null and b/frontend/assets/fonts/Roboto-900-greek-ext38.woff2 differ diff --git a/frontend/assets/fonts/Roboto-900-greek39.woff2 b/frontend/assets/fonts/Roboto-900-greek39.woff2 new file mode 100644 index 000000000000..81848e2c24e6 Binary files /dev/null and b/frontend/assets/fonts/Roboto-900-greek39.woff2 differ diff --git a/frontend/assets/fonts/Roboto-900-latin-ext41.woff2 b/frontend/assets/fonts/Roboto-900-latin-ext41.woff2 new file mode 100644 index 000000000000..cf61b8899c31 Binary files /dev/null and b/frontend/assets/fonts/Roboto-900-latin-ext41.woff2 differ diff --git a/frontend/assets/fonts/Roboto-900-latin42.woff2 b/frontend/assets/fonts/Roboto-900-latin42.woff2 new file mode 100644 index 000000000000..067cb32233d1 Binary files /dev/null and b/frontend/assets/fonts/Roboto-900-latin42.woff2 differ diff --git a/frontend/assets/fonts/Roboto-900-vietnamese40.woff2 b/frontend/assets/fonts/Roboto-900-vietnamese40.woff2 new file mode 100644 index 000000000000..53b8d0dcfed3 Binary files /dev/null and b/frontend/assets/fonts/Roboto-900-vietnamese40.woff2 differ diff --git a/frontend/nuxt.config.js b/frontend/nuxt.config.js index 9bb0319d840f..53a7d030c462 100644 --- a/frontend/nuxt.config.js +++ b/frontend/nuxt.config.js @@ -38,7 +38,7 @@ export default { }, // Global CSS: https://go.nuxtjs.dev/config-css - css: [{ src: "~/assets/main.css" }, { src: "~/assets/style-overrides.scss" }], + css: [{ src: "~/assets/css/main.css" }, { src: "~/assets/css/main.css" }, { src: "~/assets/style-overrides.scss" }], // Plugins to run before rendering page: https://go.nuxtjs.dev/config-plugins plugins: ["~/plugins/globals.ts", "~/plugins/theme.ts", "~/plugins/toast.client.ts", "~/plugins/dark-mode.client.ts"], @@ -94,6 +94,8 @@ export default { ], googleFonts: { + fontsPath: "/assets/fonts", + download: true, families: { Roboto: [100, 300, 400, 500, 700, 900], }, @@ -301,10 +303,10 @@ export default { text: "recipe_import_url", }, }, - workbox: { - /* workbox options */ - skipWaiting: "true", - }, + workbox: { + /* workbox options */ + skipWaiting: "true", + }, }, icons: [ { diff --git a/frontend/package.json b/frontend/package.json index a23b52fb10d5..a118938111c4 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -38,17 +38,17 @@ "@nuxt/typescript-build": "^2.1.0", "@nuxtjs/composition-api": "^0.32.0", "@nuxtjs/eslint-config-typescript": "^10.0.0", - "@nuxtjs/eslint-module": "^3.0.2", - "@nuxtjs/google-fonts": "^1.3.0", + "@nuxtjs/eslint-module": "3.1.0", + "@nuxtjs/google-fonts": "2.0.0", "@nuxtjs/vuetify": "^1.12.1", "@types/sortablejs": "^1.13.0", "@vue/runtime-dom": "^3.2.37", - "eslint": "^8.16.0", + "eslint": "^8.21.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-nuxt": "^3.2.0", "eslint-plugin-prettier": "^4.0.0", - "eslint-plugin-vue": "^9.0.1", - "lint-staged": "^13.0.2", + "eslint-plugin-vue": "9.3.0", + "lint-staged": "^13.0.3", "nuxt-vite": "0.2.3", "prettier": "^2.7.1", "vue2-script-setup-transform": "^0.3.5" diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 4d49267888a1..06b23e79cb8b 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -1224,15 +1224,20 @@ resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.2.tgz#30aa825f11d438671d585bd44e7fd564535fc210" integrity sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw== -"@humanwhocodes/config-array@^0.9.2": - version "0.9.5" - resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.9.5.tgz#2cbaf9a89460da24b5ca6531b8bbfc23e1df50c7" - integrity sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw== +"@humanwhocodes/config-array@^0.10.4": + version "0.10.4" + resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.10.4.tgz#01e7366e57d2ad104feea63e72248f22015c520c" + integrity sha512-mXAIHxZT3Vcpg83opl1wGlVZ9xydbfZO3r5YfRSH6Gpp2J/PfdBP0wbDa2sO6/qRbcalpoevVyW6A/fI6LfeMw== dependencies: "@humanwhocodes/object-schema" "^1.2.1" debug "^4.1.1" minimatch "^3.0.4" +"@humanwhocodes/gitignore-to-minimatch@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz#316b0a63b91c10e53f242efb4ace5c3b34e8728d" + integrity sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA== + "@humanwhocodes/object-schema@^1.2.1": version "1.2.1" resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" @@ -1757,21 +1762,23 @@ eslint-plugin-unicorn "^42.0.0" eslint-plugin-vue "^8.7.1" -"@nuxtjs/eslint-module@^3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@nuxtjs/eslint-module/-/eslint-module-3.0.2.tgz#45208e6e1b486beb6d0854777faf124751971bc6" - integrity sha512-9q6/bMSvUU2L7Vhy5LUmghW3BQZMReQAvywBwZtX7s62W6dIL7IdD1T3u2zc8JW90grtJK84Ocx3dyYTj/Oavw== - dependencies: - consola "^2.15.0" - eslint-webpack-plugin "^2.4.1" - -"@nuxtjs/google-fonts@^1.3.0": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@nuxtjs/google-fonts/-/google-fonts-1.3.0.tgz#36cefee4aef4f8b772180c7ed7cc902f02f585c4" - integrity sha512-xIleOl4nASOzFpJ/+g08ENlYZPdxqGEw6Yx7catNEKft5ZtFtTX8RUTj7y7ctQKpUgJgvujVL/phnP1lMtHg2A== +"@nuxtjs/eslint-module@3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@nuxtjs/eslint-module/-/eslint-module-3.1.0.tgz#3e7d241f4b53fbc6ab59932054d11dd22a828a40" + integrity sha512-9bK8AOJBflWmbQeL77SHIsgyGzhiW2b1BdwOtZ53Yyfa7Km3XMMVd8CtLA7z4+03eS+4TVQMxw62yRpJH5icZA== dependencies: consola "^2.15.3" - google-fonts-helper "^1.2.0" + defu "^6.0.0" + eslint-webpack-plugin "^2.6.0" + +"@nuxtjs/google-fonts@2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@nuxtjs/google-fonts/-/google-fonts-2.0.0.tgz#a0a97b3f0d2f86b4ec2ec08077e11105c07b71e8" + integrity sha512-ddcv0/+e5YKK2/ivE1v6I7aGXoNfcuGjNydbJz3q+zXkucftbQDBtph8AoYcqRbTIwUpCsr4aHov8P2HXyZSbg== + dependencies: + consola "^2.15.3" + defu "^6.0.0" + google-fonts-helper "^2.0.1" "@nuxtjs/i18n@7.0.3": version "7.0.3" @@ -1985,10 +1992,10 @@ dependencies: "@types/trusted-types" "*" -"@types/eslint@^7.2.6": - version "7.28.0" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.28.0.tgz#7e41f2481d301c68e14f483fe10b017753ce8d5a" - integrity sha512-07XlgzX0YJUn4iG1ocY4IX9DzKSmMGUs6ESKlxWhZRaa0fatIWaHWUVapcuGa8r5HFnTqzj+4OCjd5f7EZ/i/A== +"@types/eslint@^7.29.0": + version "7.29.0" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.29.0.tgz#e56ddc8e542815272720bb0b4ccc2aff9c3e1c78" + integrity sha512-VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng== dependencies: "@types/estree" "*" "@types/json-schema" "*" @@ -2793,6 +2800,11 @@ acorn@^8.5.0, acorn@^8.7.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30" integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A== +acorn@^8.8.0: + version "8.8.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8" + integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w== + agent-base@6: version "6.0.2" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" @@ -4456,6 +4468,11 @@ defu@^5.0.1: resolved "https://registry.yarnpkg.com/defu/-/defu-5.0.1.tgz#a034278f9b032bf0845d261aa75e9ad98da878ac" integrity sha512-EPS1carKg+dkEVy3qNTqIdp2qV7mUP08nIsupfwQpz++slCVRw7qbQyWvSTig+kFPwz2XXp5/kIIkH+CwrJKkQ== +defu@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/defu/-/defu-6.0.0.tgz#b397a6709a2f3202747a3d9daf9446e41ad0c5fc" + integrity sha512-t2MZGLf1V2rV4VBZbWIaXKdX/mUcYW0n2znQZoADBkGGxYL8EWqCuCZBmJPJ/Yy9fofJkyuuSuo5GSwo0XdEgw== + delayed-stream@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" @@ -5109,6 +5126,19 @@ eslint-plugin-unicorn@^42.0.0: semver "^7.3.5" strip-indent "^3.0.0" +eslint-plugin-vue@9.3.0: + version "9.3.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-9.3.0.tgz#c3f5ce515dae387e062428725c5cf96098d9da0b" + integrity sha512-iscKKkBZgm6fGZwFt6poRoWC0Wy2dQOlwUPW++CiPoQiw1enctV2Hj5DBzzjJZfyqs+FAXhgzL4q0Ww03AgSmQ== + dependencies: + eslint-utils "^3.0.0" + natural-compare "^1.4.0" + nth-check "^2.0.1" + postcss-selector-parser "^6.0.9" + semver "^7.3.5" + vue-eslint-parser "^9.0.1" + xml-name-validator "^4.0.0" + eslint-plugin-vue@^8.5.0, eslint-plugin-vue@^8.7.1: version "8.7.1" resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-8.7.1.tgz#f13c53547a0c9d64588a675cc5ecc6ccaf63703f" @@ -5121,19 +5151,6 @@ eslint-plugin-vue@^8.5.0, eslint-plugin-vue@^8.7.1: semver "^7.3.5" vue-eslint-parser "^8.0.1" -eslint-plugin-vue@^9.0.1: - version "9.0.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-9.0.1.tgz#66ba4a6e4085a26a724adcde06eaf72b178285c9" - integrity sha512-/w/9/vzz+4bSYtp5UqXgJ0CfycXTMtpp6lkz7/fMp0CcJxPWyRP6Pr88ihhrsNEcVt2ZweMupWRNYa+5Md41LQ== - dependencies: - eslint-utils "^3.0.0" - natural-compare "^1.4.0" - nth-check "^2.0.1" - postcss-selector-parser "^6.0.9" - semver "^7.3.5" - vue-eslint-parser "^9.0.1" - xml-name-validator "^4.0.0" - eslint-scope@^4.0.3: version "4.0.3" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848" @@ -5187,25 +5204,26 @@ eslint-visitor-keys@^3.1.0, eslint-visitor-keys@^3.3.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826" integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA== -eslint-webpack-plugin@^2.4.1: - version "2.5.4" - resolved "https://registry.yarnpkg.com/eslint-webpack-plugin/-/eslint-webpack-plugin-2.5.4.tgz#473b84932f1a8e2c2b8e66a402d0497bf440b986" - integrity sha512-7rYh0m76KyKSDE+B+2PUQrlNS4HJ51t3WKpkJg6vo2jFMbEPTG99cBV0Dm7LXSHucN4WGCG65wQcRiTFrj7iWw== +eslint-webpack-plugin@^2.6.0: + version "2.7.0" + resolved "https://registry.yarnpkg.com/eslint-webpack-plugin/-/eslint-webpack-plugin-2.7.0.tgz#0525793a4f8c652c1c6d863995ce1e0f2dcbd143" + integrity sha512-bNaVVUvU4srexGhVcayn/F4pJAz19CWBkKoMx7aSQ4wtTbZQCnG5O9LHCE42mM+JSKOUp7n6vd5CIwzj7lOVGA== dependencies: - "@types/eslint" "^7.2.6" + "@types/eslint" "^7.29.0" arrify "^2.0.1" - jest-worker "^26.6.2" - micromatch "^4.0.2" + jest-worker "^27.5.1" + micromatch "^4.0.5" normalize-path "^3.0.0" - schema-utils "^3.0.0" + schema-utils "^3.1.1" -eslint@^8.16.0: - version "8.16.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.16.0.tgz#6d936e2d524599f2a86c708483b4c372c5d3bbae" - integrity sha512-MBndsoXY/PeVTDJeWsYj7kLZ5hQpJOfMYLsF6LicLHQWbRDG19lK5jOix4DPl8yY4SUFcE3txy86OzFLWT+yoA== +eslint@^8.21.0: + version "8.21.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.21.0.tgz#1940a68d7e0573cef6f50037addee295ff9be9ef" + integrity sha512-/XJ1+Qurf1T9G2M5IHrsjp+xrGT73RZf23xA1z5wB1ZzzEAWSZKvRwhWxTFp1rvkvCfwcvAUNAP31bhKTTGfDA== dependencies: "@eslint/eslintrc" "^1.3.0" - "@humanwhocodes/config-array" "^0.9.2" + "@humanwhocodes/config-array" "^0.10.4" + "@humanwhocodes/gitignore-to-minimatch" "^1.0.2" ajv "^6.10.0" chalk "^4.0.0" cross-spawn "^7.0.2" @@ -5215,14 +5233,17 @@ eslint@^8.16.0: eslint-scope "^7.1.1" eslint-utils "^3.0.0" eslint-visitor-keys "^3.3.0" - espree "^9.3.2" + espree "^9.3.3" esquery "^1.4.0" esutils "^2.0.2" fast-deep-equal "^3.1.3" file-entry-cache "^6.0.1" + find-up "^5.0.0" functional-red-black-tree "^1.0.1" glob-parent "^6.0.1" globals "^13.15.0" + globby "^11.1.0" + grapheme-splitter "^1.0.4" ignore "^5.2.0" import-fresh "^3.0.0" imurmurhash "^0.1.4" @@ -5249,6 +5270,15 @@ espree@^9.0.0, espree@^9.3.1, espree@^9.3.2: acorn-jsx "^5.3.2" eslint-visitor-keys "^3.3.0" +espree@^9.3.3: + version "9.3.3" + resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.3.tgz#2dd37c4162bb05f433ad3c1a52ddf8a49dc08e9d" + integrity sha512-ORs1Rt/uQTqUKjDdGCyrtYxbazf5umATSf/K4qxjmZHORR6HJk+2s/2Pqe+Kk49HHINC/xNIrGfgh8sZcll0ng== + dependencies: + acorn "^8.8.0" + acorn-jsx "^5.3.2" + eslint-visitor-keys "^3.3.0" + esprima@^4.0.0, esprima@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" @@ -5562,6 +5592,14 @@ find-up@^4.0.0, find-up@^4.1.0: locate-path "^5.0.0" path-exists "^4.0.0" +find-up@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" + integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== + dependencies: + locate-path "^6.0.0" + path-exists "^4.0.0" + flat-cache@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" @@ -5669,7 +5707,7 @@ fs-extra@^8.1.0: jsonfile "^4.0.0" universalify "^0.1.0" -fs-extra@^9.0.0, fs-extra@^9.0.1, fs-extra@^9.1.0: +fs-extra@^9.0.0, fs-extra@^9.1.0: version "9.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== @@ -5878,19 +5916,19 @@ globby@^11.0.3, globby@^11.0.4, globby@^11.1.0: merge2 "^1.4.1" slash "^3.0.0" -google-fonts-helper@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/google-fonts-helper/-/google-fonts-helper-1.2.0.tgz#32eb8ebf9816dbb2ec8acda81ad03a021ed44050" - integrity sha512-ojpHo6uwaqI2/tpXcCBY9u/3erd++Wjpf1UQkmb+ZUa/oMztiospubmQCwDQ0AHhFUkBMW1+R12am1kxQFqymg== +google-fonts-helper@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/google-fonts-helper/-/google-fonts-helper-2.0.1.tgz#ac6859272a572c516bbd83decaea50f6f4f24535" + integrity sha512-qlk3in9FYYYHX6tR8O9pPBbO4KqjBLtyfuSBxz/soY+xhUruzT6yKzPT1Z+aqH8KFoquwaRCxROok9ntg2kqiw== dependencies: deepmerge "^4.2.2" - fs-extra "^9.0.1" - got "^11.8.1" + fs-extra "^9.1.0" + got "^11.8.2" -got@^11.8.1: - version "11.8.3" - resolved "https://registry.yarnpkg.com/got/-/got-11.8.3.tgz#f496c8fdda5d729a90b4905d2b07dbd148170770" - integrity sha512-7gtQ5KiPh1RtGS9/Jbv1ofDpBFuq42gyfEib+ejaRBJuj/3tQFeR5+gw57e4ipaU8c/rCjvX6fkQz2lyDlGAOg== +got@^11.8.2: + version "11.8.5" + resolved "https://registry.yarnpkg.com/got/-/got-11.8.5.tgz#ce77d045136de56e8f024bebb82ea349bc730046" + integrity sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ== dependencies: "@sindresorhus/is" "^4.0.0" "@szmarczak/http-timer" "^4.0.5" @@ -5909,6 +5947,11 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6 resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96" integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ== +grapheme-splitter@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e" + integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ== + gzip-size@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-6.0.0.tgz#065367fd50c239c0671cbcbad5be3e2eeb10e462" @@ -6776,7 +6819,7 @@ javascript-natural-sort@^0.7.1: resolved "https://registry.yarnpkg.com/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz#f9e2303d4507f6d74355a73664d1440fb5a0ef59" integrity sha1-+eIwPUUH9tdDVac2ZNFED7Wg71k= -jest-worker@^26.5.0, jest-worker@^26.6.2: +jest-worker@^26.5.0: version "26.6.2" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed" integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ== @@ -6785,6 +6828,15 @@ jest-worker@^26.5.0, jest-worker@^26.6.2: merge-stream "^2.0.0" supports-color "^7.0.0" +jest-worker@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0" + integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg== + dependencies: + "@types/node" "*" + merge-stream "^2.0.0" + supports-color "^8.0.0" + jimp-compact@^0.16.1: version "0.16.1" resolved "https://registry.yarnpkg.com/jimp-compact/-/jimp-compact-0.16.1.tgz#9582aea06548a2c1e04dd148d7c3ab92075aefa3" @@ -7050,10 +7102,10 @@ linkify-it@^3.0.1: dependencies: uc.micro "^1.0.1" -lint-staged@^13.0.2: - version "13.0.2" - resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-13.0.2.tgz#35a1c57130e9ad5b1dea784972a40777ba433dd5" - integrity sha512-qQLfLTh9z34eMzfEHENC+QBskZfxjomrf+snF3xJ4BzilORbD989NLqQ00ughsF/A+PT41e87+WsMFabf9++pQ== +lint-staged@^13.0.3: + version "13.0.3" + resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-13.0.3.tgz#d7cdf03a3830b327a2b63c6aec953d71d9dc48c6" + integrity sha512-9hmrwSCFroTSYLjflGI8Uk+GWAwMB4OlpU4bMJEAT5d/llQwtYKoim4bLOyLCuWFAhWEupE0vkIFqtw/WIsPug== dependencies: cli-truncate "^3.1.0" colorette "^2.0.17" @@ -7134,6 +7186,13 @@ locate-path@^5.0.0: dependencies: p-locate "^4.1.0" +locate-path@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" + integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw== + dependencies: + p-locate "^5.0.0" + lodash._reinterpolate@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" @@ -8165,6 +8224,13 @@ p-locate@^4.1.0: dependencies: p-limit "^2.2.0" +p-locate@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" + integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw== + dependencies: + p-limit "^3.0.2" + p-map@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" @@ -9806,7 +9872,7 @@ schema-utils@^2.0.0, schema-utils@^2.6.5, schema-utils@^2.7.0, schema-utils@^2.7 ajv "^6.12.4" ajv-keywords "^3.5.2" -schema-utils@^3.0.0: +schema-utils@^3.0.0, schema-utils@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw== @@ -10433,6 +10499,13 @@ supports-color@^7.0.0, supports-color@^7.1.0: dependencies: has-flag "^4.0.0" +supports-color@^8.0.0: + version "8.1.1" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" + integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== + dependencies: + has-flag "^4.0.0" + supports-preserve-symlinks-flag@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" diff --git a/poetry.lock b/poetry.lock index 5009f5fcc1aa..4319a8acd82b 100644 --- a/poetry.lock +++ b/poetry.lock @@ -358,7 +358,7 @@ cli = ["requests"] [[package]] name = "fastapi" -version = "0.78.0" +version = "0.79.0" description = "FastAPI framework, high performance, easy to learn, fast to code, ready for production" category = "main" optional = false @@ -1619,7 +1619,7 @@ pgsql = ["psycopg2-binary"] [metadata] lock-version = "1.1" python-versions = "^3.10" -content-hash = "8eeaaa2bd62d5448fc93d003c6c132056ab40c31f63a5b9fdd558bbaa2cab63e" +content-hash = "60ee6aaf41670daa9db6cf8efcb1c42abd2ed11d82ce13487b886a6bf4807cdc" [metadata.files] aiofiles = [ @@ -1772,8 +1772,8 @@ extruct = [ {file = "extruct-0.13.0.tar.gz", hash = "sha256:50a5b5bac4c5e19ecf682bf63a28fde0b1bb57433df7057371f60b58c94a2c64"}, ] fastapi = [ - {file = "fastapi-0.78.0-py3-none-any.whl", hash = "sha256:15fcabd5c78c266fa7ae7d8de9b384bfc2375ee0503463a6febbe3bab69d6f65"}, - {file = "fastapi-0.78.0.tar.gz", hash = "sha256:3233d4a789ba018578658e2af1a4bb5e38bdd122ff722b313666a9b2c6786a83"}, + {file = "fastapi-0.79.0-py3-none-any.whl", hash = "sha256:d337563424ceada23857f73d5abe8dae0c28e4cccb53b2af06e78b7bb4a1c7d7"}, + {file = "fastapi-0.79.0.tar.gz", hash = "sha256:cf0ff6db25b91d321050c4112baab0908c90f19b40bf257f9591d2f9780d1f22"}, ] filelock = [] flake8 = [ diff --git a/pyproject.toml b/pyproject.toml index 0643eea515ca..503fdc1ed40e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,7 +13,7 @@ python = "^3.10" aiofiles = "0.5.0" aniso8601 = "7.0.0" appdirs = "1.4.4" -fastapi = "^0.78.0" +fastapi = "^0.79.0" uvicorn = {extras = ["standard"], version = "^0.13.0"} SQLAlchemy = "^1.4.29" alembic = "^1.7.5" @@ -30,7 +30,7 @@ passlib = "^1.7.4" lxml = "^4.7.1" Pillow = "^8.2.0" apprise = "^0.9.6" -recipe-scrapers = "^14.3.1" +recipe-scrapers = "^14.11.0" psycopg2-binary = {version = "^2.9.1", optional = true} gunicorn = "^20.1.0" emails = "^0.6"