From 54bbd757306627850532ff45734580999265abfa Mon Sep 17 00:00:00 2001 From: Nikolai R Kristiansen Date: Sat, 5 Mar 2022 20:00:03 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A5=20Remove=20all=20things=20bootstra?= =?UTF-8?q?p?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/package-lock.json | 98 ------------------- frontend/package.json | 3 - frontend/src/App.tsx | 1 - frontend/src/components/Header.tsx | 52 +++------- .../src/components/ProductCard.module.css | 8 ++ frontend/src/components/Toast.tsx | 26 ++--- frontend/src/components/UserCard.module.css | 6 ++ frontend/src/components/UserCard.tsx | 7 +- .../src/features/deposit/Deposit.module.css | 2 + frontend/src/features/deposit/Deposit.tsx | 6 +- frontend/src/features/log/Log.tsx | 20 ++-- .../src/features/register/Register.module.css | 1 + frontend/src/features/register/Register.tsx | 6 +- frontend/src/features/stats/Stats.module.css | 1 + frontend/src/features/stats/StatsView.tsx | 12 +-- frontend/src/features/users/UserDetail.tsx | 20 ++-- frontend/src/features/users/UserList.tsx | 6 +- 17 files changed, 73 insertions(+), 202 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 9e10e21..755b929 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -12,8 +12,6 @@ "@nivo/bar": "^0.79.1", "@nivo/line": "^0.79.1", "@nivo/pie": "^0.79.1", - "bootstrap": "^5.1.3", - "bootstrap-icons": "^1.8.1", "clsx": "^1.1.1", "date-fns": "^2.28.0", "graphql": "^16.3.0", @@ -28,7 +26,6 @@ "@graphql-codegen/typed-document-node": "^2.2.3", "@graphql-codegen/typescript-operations": "^2.3.0", "@graphql-typed-document-node/core": "^3.1.1", - "@types/bootstrap": "^5.1.9", "@types/react": "^17.0.39", "@types/react-dom": "^17.0.11", "@types/react-router-dom": "^5.3.3", @@ -2588,15 +2585,6 @@ "node": ">= 8" } }, - "node_modules/@popperjs/core": { - "version": "2.11.2", - "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.2.tgz", - "integrity": "sha512-92FRmppjjqz29VMJ2dn+xdyXZBrMlE42AV6Kq6BwjWV7CNUW1hs2FtxSNLQE+gJhaZ6AAmYuO9y8dshhcBl7vA==", - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/popperjs" - } - }, "node_modules/@react-spring/animated": { "version": "9.3.2", "resolved": "https://registry.npmjs.org/@react-spring/animated/-/animated-9.3.2.tgz", @@ -2785,16 +2773,6 @@ "@babel/types": "^7.3.0" } }, - "node_modules/@types/bootstrap": { - "version": "5.1.9", - "resolved": "https://registry.npmjs.org/@types/bootstrap/-/bootstrap-5.1.9.tgz", - "integrity": "sha512-Tembe6lt7819EUzV5LSG9uuwULm4hdEGV9LZ8QBYpWc0J+a+9DdmJEwZ4FMaXGVJWwumTPSkJ8JQF0/KDAmXYg==", - "dev": true, - "dependencies": { - "@popperjs/core": "^2.9.2", - "@types/jquery": "*" - } - }, "node_modules/@types/graceful-fs": { "version": "4.1.5", "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz", @@ -2834,15 +2812,6 @@ "@types/istanbul-lib-report": "*" } }, - "node_modules/@types/jquery": { - "version": "3.5.13", - "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.13.tgz", - "integrity": "sha512-ZxJrup8nz/ZxcU0vantG+TPdboMhB24jad2uSap50zE7Q9rUeYlCF25kFMSmHR33qoeOgqcdHEp3roaookC0Sg==", - "dev": true, - "dependencies": { - "@types/sizzle": "*" - } - }, "node_modules/@types/js-yaml": { "version": "4.0.5", "resolved": "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-4.0.5.tgz", @@ -2959,12 +2928,6 @@ "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==", "dev": true }, - "node_modules/@types/sizzle": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", - "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==", - "dev": true - }, "node_modules/@types/stack-utils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz", @@ -3737,26 +3700,6 @@ "readable-stream": "^3.4.0" } }, - "node_modules/bootstrap": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.1.3.tgz", - "integrity": "sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q==", - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/bootstrap" - }, - "peerDependencies": { - "@popperjs/core": "^2.10.2" - } - }, - "node_modules/bootstrap-icons": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.8.1.tgz", - "integrity": "sha512-IXUqislddPJfwq6H+2nTkHyr9epO9h6u1AG0OZCx616w+TgzeoCjfmI3qJMQqt1J586gN2IxzB4M99Ip4sTZ1w==", - "engines": { - "node": ">=10" - } - }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -14527,11 +14470,6 @@ "fastq": "^1.6.0" } }, - "@popperjs/core": { - "version": "2.11.2", - "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.2.tgz", - "integrity": "sha512-92FRmppjjqz29VMJ2dn+xdyXZBrMlE42AV6Kq6BwjWV7CNUW1hs2FtxSNLQE+gJhaZ6AAmYuO9y8dshhcBl7vA==" - }, "@react-spring/animated": { "version": "9.3.2", "resolved": "https://registry.npmjs.org/@react-spring/animated/-/animated-9.3.2.tgz", @@ -14680,16 +14618,6 @@ "@babel/types": "^7.3.0" } }, - "@types/bootstrap": { - "version": "5.1.9", - "resolved": "https://registry.npmjs.org/@types/bootstrap/-/bootstrap-5.1.9.tgz", - "integrity": "sha512-Tembe6lt7819EUzV5LSG9uuwULm4hdEGV9LZ8QBYpWc0J+a+9DdmJEwZ4FMaXGVJWwumTPSkJ8JQF0/KDAmXYg==", - "dev": true, - "requires": { - "@popperjs/core": "^2.9.2", - "@types/jquery": "*" - } - }, "@types/graceful-fs": { "version": "4.1.5", "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz", @@ -14729,15 +14657,6 @@ "@types/istanbul-lib-report": "*" } }, - "@types/jquery": { - "version": "3.5.13", - "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.13.tgz", - "integrity": "sha512-ZxJrup8nz/ZxcU0vantG+TPdboMhB24jad2uSap50zE7Q9rUeYlCF25kFMSmHR33qoeOgqcdHEp3roaookC0Sg==", - "dev": true, - "requires": { - "@types/sizzle": "*" - } - }, "@types/js-yaml": { "version": "4.0.5", "resolved": "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-4.0.5.tgz", @@ -14854,12 +14773,6 @@ "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==", "dev": true }, - "@types/sizzle": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", - "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==", - "dev": true - }, "@types/stack-utils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz", @@ -15407,17 +15320,6 @@ "readable-stream": "^3.4.0" } }, - "bootstrap": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.1.3.tgz", - "integrity": "sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q==", - "requires": {} - }, - "bootstrap-icons": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.8.1.tgz", - "integrity": "sha512-IXUqislddPJfwq6H+2nTkHyr9epO9h6u1AG0OZCx616w+TgzeoCjfmI3qJMQqt1J586gN2IxzB4M99Ip4sTZ1w==" - }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", diff --git a/frontend/package.json b/frontend/package.json index 7c2a297..f8d48f9 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -20,8 +20,6 @@ "@nivo/bar": "^0.79.1", "@nivo/line": "^0.79.1", "@nivo/pie": "^0.79.1", - "bootstrap": "^5.1.3", - "bootstrap-icons": "^1.8.1", "clsx": "^1.1.1", "date-fns": "^2.28.0", "graphql": "^16.3.0", @@ -36,7 +34,6 @@ "@graphql-codegen/typed-document-node": "^2.2.3", "@graphql-codegen/typescript-operations": "^2.3.0", "@graphql-typed-document-node/core": "^3.1.1", - "@types/bootstrap": "^5.1.9", "@types/react": "^17.0.39", "@types/react-dom": "^17.0.11", "@types/react-router-dom": "^5.3.3", diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index bebd471..d619bb3 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -1,7 +1,6 @@ import { ApolloProvider } from "@apollo/client"; import React from "react"; import { BrowserRouter as Router } from "react-router-dom"; -import "bootstrap/dist/css/bootstrap.min.css"; import styles from "./App.module.css"; import { Routes } from "./Routes"; diff --git a/frontend/src/components/Header.tsx b/frontend/src/components/Header.tsx index d34814b..c00c600 100644 --- a/frontend/src/components/Header.tsx +++ b/frontend/src/components/Header.tsx @@ -1,7 +1,3 @@ -import { ReactComponent as BarChart } from "bootstrap-icons/icons/bar-chart.svg"; -import { ReactComponent as CardList } from "bootstrap-icons/icons/card-list.svg"; -import { ReactComponent as House } from "bootstrap-icons/icons/house.svg"; -import { ReactComponent as PeopleIcon } from "bootstrap-icons/icons/people.svg"; import React from "react"; import { NavLink } from "react-router-dom"; @@ -15,71 +11,49 @@ const navLinkStyles = ({ isActive }: { isActive: boolean }) => (isActive ? "nav- export const Header: React.FC = () => { return (
-