From 0b2141211ddcc0e277cae5a97fd183fb2bef3234 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Tue, 2 Feb 2021 03:33:20 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A8=20Fix=20some=20bugs=20caused=20by?= =?UTF-8?q?=20the=20bluelib-react=20update?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 84 ++++++++------------------- package.json | 2 +- src/App.js | 7 ++- src/App.module.css | 5 ++ src/index.css | 8 ++- src/routes/Gestinfo/abbr/API.js | 1 - src/routes/Gestinfo/abbr/Glob.js | 1 - src/routes/Gestinfo/abbr/IC.js | 1 - src/routes/Gestinfo/abbr/IDF.js | 3 +- src/routes/Gestinfo/abbr/IR.js | 1 - src/routes/Gestinfo/abbr/Ononimi.js | 1 - src/routes/Gestinfo/abbr/Predicato.js | 1 - src/routes/Gestinfo/abbr/RSV.js | 1 - src/routes/Gestinfo/abbr/Regex.js | 1 - src/routes/Gestinfo/abbr/TF.js | 3 +- src/routes/Gestinfo/abbr/TFIDF.js | 3 +- src/routes/Gestinfo/abbr/UIN.js | 1 - src/routes/Gestinfo/index.js | 3 +- 18 files changed, 49 insertions(+), 78 deletions(-) create mode 100644 src/App.module.css diff --git a/package-lock.json b/package-lock.json index 1603aa1..7706f81 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1740,6 +1740,11 @@ } } }, + "@matejmazur/react-katex": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/@matejmazur/react-katex/-/react-katex-3.1.3.tgz", + "integrity": "sha512-rBp7mJ9An7ktNoU653BWOYdO4FoR4YNwofHZi+vaytX/nWbIlmHVIF+X8VFOn6c3WYmrLT5FFBjKqCZ1sjR5uQ==" + }, "@nodelib/fs.scandir": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz", @@ -3530,15 +3535,16 @@ "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, "bluelib": { - "version": "0.24.3", - "resolved": "https://registry.npmjs.org/bluelib/-/bluelib-0.24.3.tgz", - "integrity": "sha512-+JcxeqPPZy32KDnWgDwkQB32f9LJa3dl/Ry6yBBFyOXhpWUFN3sfkdzIzVlvAcM7NvZoJlREznMVhSX0h/MEvA==", + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/bluelib/-/bluelib-0.25.0.tgz", + "integrity": "sha512-x1KJEP3yTaOTEga4ut+2P2ZGnHrmFqLc1RlgYW5bdsM0ReRJZ8Mps7T47VUuryBtbjJlmh9Sa6VnsSlPP6C0wQ==", "requires": { "@babel/preset-env": "^7.12.11", "@babel/preset-react": "^7.12.10", + "@matejmazur/react-katex": "^3.1.3", "@reach/router": "^1.3.4", "classnames": "^2.2.6", - "mathjax-react": "^1.0.6", + "katex": "^0.12.0", "prop-types": "^15.7.2", "react": "^17.0.1", "react-dom": "^17.0.1", @@ -5996,11 +6002,6 @@ } } }, - "esm": { - "version": "3.2.25", - "resolved": "https://registry.npmjs.org/esm/-/esm-3.2.25.tgz", - "integrity": "sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==" - }, "espree": { "version": "7.3.1", "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz", @@ -9686,6 +9687,21 @@ "object.assign": "^4.1.2" } }, + "katex": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/katex/-/katex-0.12.0.tgz", + "integrity": "sha512-y+8btoc/CK70XqcHqjxiGWBOeIL8upbS0peTPXTvgrh21n1RiWWcIpSWM+4uXq+IAgNh9YYQWdc7LVDPDAEEAg==", + "requires": { + "commander": "^2.19.0" + }, + "dependencies": { + "commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" + } + } + }, "killable": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz", @@ -9928,24 +9944,6 @@ "object-visit": "^1.0.0" } }, - "mathjax-full": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/mathjax-full/-/mathjax-full-3.1.2.tgz", - "integrity": "sha512-jFCwRFdFwIOa8J7r6VZT0AIv9ZwbLQ9aPc9YZp695NTvv7XKU2NunJodA+zDWzElIFJ7mTsImyfe5R3QyRNZjw==", - "requires": { - "esm": "^3.2.25", - "mj-context-menu": "^0.6.1", - "speech-rule-engine": "^3.1.1" - } - }, - "mathjax-react": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/mathjax-react/-/mathjax-react-1.0.6.tgz", - "integrity": "sha512-GlkPAhaY0FKc95TMdo33mxNZHb+3xRgfgc3YcnQ0cZxvnM1UaF0o8mRI5y5xIwi3JnioeYuukZJWCbIZkACIVw==", - "requires": { - "mathjax-full": "^3.0.4" - } - }, "md5.js": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", @@ -10227,11 +10225,6 @@ } } }, - "mj-context-menu": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/mj-context-menu/-/mj-context-menu-0.6.1.tgz", - "integrity": "sha512-7NO5s6n10TIV96d4g2uDpG7ZDpIhMh0QNfGdJw/W47JswFcosz457wqz/b5sAKvl12sxINGFCn80NZHKwxQEXA==" - }, "mkdirp": { "version": "0.5.5", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", @@ -14082,23 +14075,6 @@ "wbuf": "^1.7.3" } }, - "speech-rule-engine": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/speech-rule-engine/-/speech-rule-engine-3.1.1.tgz", - "integrity": "sha512-FGX8B44yI3yGhmcw8nZ/by2ffUlZG6m5b/O3RULXsSiwhL/evL+jwQ6BXQxV3gGtOYptOFalTVCAFknAJgBKAg==", - "requires": { - "commander": "^6.0.0", - "wicked-good-xpath": "^1.3.0", - "xmldom-sre": "^0.1.31" - }, - "dependencies": { - "commander": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz", - "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==" - } - } - }, "split-string": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", @@ -16452,11 +16428,6 @@ "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" }, - "wicked-good-xpath": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/wicked-good-xpath/-/wicked-good-xpath-1.3.0.tgz", - "integrity": "sha1-gbDpXoZQ5JyUsiKY//hoa1VTz2w=" - }, "word-wrap": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", @@ -16739,11 +16710,6 @@ "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==" }, - "xmldom-sre": { - "version": "0.1.31", - "resolved": "https://registry.npmjs.org/xmldom-sre/-/xmldom-sre-0.1.31.tgz", - "integrity": "sha512-f9s+fUkX04BxQf+7mMWAp5zk61pciie+fFLC9hX9UVvCeJQfNHRHXpeo5MPcR0EUf57PYLdt+ZO4f3Ipk2oZUw==" - }, "xtend": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", diff --git a/package.json b/package.json index e7404c5..52e129c 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "@testing-library/jest-dom": "^5.11.9", "@testing-library/react": "^11.2.3", "@testing-library/user-event": "^12.6.2", - "bluelib": "^0.24.3", + "bluelib": "^0.25.0", "classnames": "^2.2.6", "prop-types": "^15.7.2", "react": "^17.0.1", diff --git a/src/App.js b/src/App.js index a3a15e8..d32c6c1 100644 --- a/src/App.js +++ b/src/App.js @@ -1,13 +1,16 @@ -import React from "react"; +import React, {useState} from "react"; import {Bluelib} from "bluelib/lib/components"; import {Router} from "@reach/router"; import Home from "./routes/Home"; import Error404 from "./routes/Error404"; import Gestinfo from "./routes/Gestinfo"; +import style from "./App.module.css"; export default function App() { + const [skin, setSkin] = useState("rygblue"); + return ( - + diff --git a/src/App.module.css b/src/App.module.css new file mode 100644 index 0000000..4e497c1 --- /dev/null +++ b/src/App.module.css @@ -0,0 +1,5 @@ +.app { + padding: 4px; + min-width: calc(100vw - 8px); + min-height: calc(100vh - 8px); +} \ No newline at end of file diff --git a/src/index.css b/src/index.css index 2ce148d..0431c09 100644 --- a/src/index.css +++ b/src/index.css @@ -1,4 +1,8 @@ body { - background-color: #0d193b; - color: #a0ccff; + margin: 0; +} + +#root { + min-width: 100vw; + min-height: 100vh; } diff --git a/src/routes/Gestinfo/abbr/API.js b/src/routes/Gestinfo/abbr/API.js index 6743779..2633392 100644 --- a/src/routes/Gestinfo/abbr/API.js +++ b/src/routes/Gestinfo/abbr/API.js @@ -1,6 +1,5 @@ import React from "react"; import {Help} from "bluelib/lib/components"; -import PropTypes from "prop-types"; export default function API() { diff --git a/src/routes/Gestinfo/abbr/Glob.js b/src/routes/Gestinfo/abbr/Glob.js index cf68d86..c98e163 100644 --- a/src/routes/Gestinfo/abbr/Glob.js +++ b/src/routes/Gestinfo/abbr/Glob.js @@ -1,6 +1,5 @@ import React from "react"; import {Help} from "bluelib/lib/components"; -import PropTypes from "prop-types"; export default function Glob() { diff --git a/src/routes/Gestinfo/abbr/IC.js b/src/routes/Gestinfo/abbr/IC.js index 95bd6f6..3a6b4db 100644 --- a/src/routes/Gestinfo/abbr/IC.js +++ b/src/routes/Gestinfo/abbr/IC.js @@ -1,6 +1,5 @@ import React from "react"; import {Help} from "bluelib/lib/components"; -import PropTypes from "prop-types"; export default function IC() { diff --git a/src/routes/Gestinfo/abbr/IDF.js b/src/routes/Gestinfo/abbr/IDF.js index 8fc2c3f..5b4aa05 100644 --- a/src/routes/Gestinfo/abbr/IDF.js +++ b/src/routes/Gestinfo/abbr/IDF.js @@ -1,5 +1,6 @@ import React from "react"; -import {LatexMath, Help} from "bluelib/lib/components"; +import {Help} from "bluelib/lib/components"; +import LatexMath from "bluelib/lib/components/LatexMath"; export default function IDF() { diff --git a/src/routes/Gestinfo/abbr/IR.js b/src/routes/Gestinfo/abbr/IR.js index ae2dabe..36cbb76 100644 --- a/src/routes/Gestinfo/abbr/IR.js +++ b/src/routes/Gestinfo/abbr/IR.js @@ -1,6 +1,5 @@ import React from "react"; import {Help} from "bluelib/lib/components"; -import PropTypes from "prop-types"; export default function IR() { diff --git a/src/routes/Gestinfo/abbr/Ononimi.js b/src/routes/Gestinfo/abbr/Ononimi.js index ac998cb..080eb0e 100644 --- a/src/routes/Gestinfo/abbr/Ononimi.js +++ b/src/routes/Gestinfo/abbr/Ononimi.js @@ -1,6 +1,5 @@ import React from "react"; import {Help} from "bluelib/lib/components"; -import PropTypes from "prop-types"; export default function Ononimi() { diff --git a/src/routes/Gestinfo/abbr/Predicato.js b/src/routes/Gestinfo/abbr/Predicato.js index fbca882..d926685 100644 --- a/src/routes/Gestinfo/abbr/Predicato.js +++ b/src/routes/Gestinfo/abbr/Predicato.js @@ -1,6 +1,5 @@ import React from "react"; import {Help} from "bluelib/lib/components"; -import PropTypes from "prop-types"; export default function Predicato() { diff --git a/src/routes/Gestinfo/abbr/RSV.js b/src/routes/Gestinfo/abbr/RSV.js index 6ed9f08..a198fbb 100644 --- a/src/routes/Gestinfo/abbr/RSV.js +++ b/src/routes/Gestinfo/abbr/RSV.js @@ -1,6 +1,5 @@ import React from "react"; import {Help} from "bluelib/lib/components"; -import PropTypes from "prop-types"; export default function RSV() { diff --git a/src/routes/Gestinfo/abbr/Regex.js b/src/routes/Gestinfo/abbr/Regex.js index ee99967..27a2dca 100644 --- a/src/routes/Gestinfo/abbr/Regex.js +++ b/src/routes/Gestinfo/abbr/Regex.js @@ -1,6 +1,5 @@ import React from "react"; import {Help} from "bluelib/lib/components"; -import PropTypes from "prop-types"; export default function Regex() { diff --git a/src/routes/Gestinfo/abbr/TF.js b/src/routes/Gestinfo/abbr/TF.js index 748ef29..a5edcb5 100644 --- a/src/routes/Gestinfo/abbr/TF.js +++ b/src/routes/Gestinfo/abbr/TF.js @@ -1,5 +1,6 @@ import React from "react"; -import {LatexMath, Help} from "bluelib/lib/components"; +import {Help} from "bluelib/lib/components"; +import LatexMath from "bluelib/lib/components/LatexMath"; export default function TF() { diff --git a/src/routes/Gestinfo/abbr/TFIDF.js b/src/routes/Gestinfo/abbr/TFIDF.js index 565ca42..0e16de6 100644 --- a/src/routes/Gestinfo/abbr/TFIDF.js +++ b/src/routes/Gestinfo/abbr/TFIDF.js @@ -1,12 +1,11 @@ import React from "react"; import {Help} from "bluelib/lib/components"; -import PropTypes from "prop-types"; export default function TFIDF() { return ( tf-idf - ) + ); } TFIDF.propTypes = {} diff --git a/src/routes/Gestinfo/abbr/UIN.js b/src/routes/Gestinfo/abbr/UIN.js index 7883d10..819d851 100644 --- a/src/routes/Gestinfo/abbr/UIN.js +++ b/src/routes/Gestinfo/abbr/UIN.js @@ -1,6 +1,5 @@ import React from "react"; import {Help} from "bluelib/lib/components"; -import PropTypes from "prop-types"; export default function UIN() { diff --git a/src/routes/Gestinfo/index.js b/src/routes/Gestinfo/index.js index 3f44b79..80be9ef 100644 --- a/src/routes/Gestinfo/index.js +++ b/src/routes/Gestinfo/index.js @@ -1,5 +1,6 @@ import React from "react"; -import {Split, Aside, Anchor, LatexMath, Help, Blockquote, Title, Separator, Code, Color, Underline as U, BaseLink as A, Paragraph as P, Bold as B, Italic as I, ListItem as LI, Table} from "bluelib/lib/components"; +import {Split, Aside, Anchor, Help, Blockquote, Title, Separator, Code, Color, Underline as U, BaseLink as A, Paragraph as P, Bold as B, Italic as I, ListItem as LI, Table} from "bluelib/lib/components"; +import LatexMath from "bluelib/lib/components/LatexMath"; import Page from "../../components/Page"; import TitleSplit from "../../components/TitleSplit"; import TitleBox from "../../components/TitleBox";