From f5c2e0ce3f0337b986f2fa5eff0a919020ba3495 Mon Sep 17 00:00:00 2001 From: kadoshita Date: Thu, 23 Jan 2020 21:23:29 +0900 Subject: [PATCH 1/5] add new toppage --- ClientApp/package-lock.json | 37 ++++++++++++++++++++++++++++ ClientApp/package.json | 4 +++ ClientApp/public/index.html | 4 +-- ClientApp/public/screenshot.png | Bin 0 -> 260326 bytes ClientApp/src/components/Editor.js | 2 +- ClientApp/src/components/Home.js | 37 +++++++++++++++------------- ClientApp/src/components/Layout.js | 14 +++++++---- ClientApp/src/components/NavMenu.js | 2 +- ClientApp/src/custom.css | 2 +- ClientApp/src/theme.js | 9 +++++++ 10 files changed, 84 insertions(+), 27 deletions(-) create mode 100644 ClientApp/public/screenshot.png create mode 100644 ClientApp/src/theme.js diff --git a/ClientApp/package-lock.json b/ClientApp/package-lock.json index ab6b95b..3b36cc9 100644 --- a/ClientApp/package-lock.json +++ b/ClientApp/package-lock.json @@ -941,6 +941,43 @@ "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.7.4.tgz", "integrity": "sha512-fxfMSBMX3tlIbKUdtGKxqB1fyrH6gVrX39Gsv3y8lRYKUqlgDt3UMqQyGnR1bQMa2B8aGnhLZokZgg8vT0Le+A==" }, + "@fortawesome/fontawesome-common-types": { + "version": "0.2.26", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.26.tgz", + "integrity": "sha512-CcM/fIFwZlRdiWG/25xE/wHbtyUuCtqoCTrr6BsWw7hH072fR++n4L56KPydAr3ANgMJMjT8v83ZFIsDc7kE+A==" + }, + "@fortawesome/fontawesome-svg-core": { + "version": "1.2.26", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.26.tgz", + "integrity": "sha512-3Dfd/v2IztP1TxKOxZiB5+4kaOZK9mNy0KU1vVK7nFlPWz3gzxrCWB+AloQhQUoJ8HhGqbzjliK89Vl7PExGbw==", + "requires": { + "@fortawesome/fontawesome-common-types": "^0.2.26" + } + }, + "@fortawesome/free-brands-svg-icons": { + "version": "5.12.0", + "resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-5.12.0.tgz", + "integrity": "sha512-50uCFzVUki3wfmFmrMNLFhOt8dP6YZ53zwR4dK9FR7Lwq1IVHXnSBb8MtGLe3urLJ2sA+CSu7Pc7s3i6/zLxmA==", + "requires": { + "@fortawesome/fontawesome-common-types": "^0.2.26" + } + }, + "@fortawesome/free-solid-svg-icons": { + "version": "5.12.0", + "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.12.0.tgz", + "integrity": "sha512-CnpsWs6GhTs9ekNB3d8rcO5HYqRkXbYKf2YNiAlTWbj5eVlPqsd/XH1F9If8jkcR1aegryAbln/qYeKVZzpM0g==", + "requires": { + "@fortawesome/fontawesome-common-types": "^0.2.26" + } + }, + "@fortawesome/react-fontawesome": { + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.8.tgz", + "integrity": "sha512-I5h9YQg/ePA3Br9ISS18fcwOYmzQYDSM1ftH03/8nHkiqIVHtUyQBw482+60dnzvlr82gHt3mGm+nDUp159FCw==", + "requires": { + "prop-types": "^15.5.10" + } + }, "@hapi/address": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@hapi/address/-/address-2.0.0.tgz", diff --git a/ClientApp/package.json b/ClientApp/package.json index 9367364..be8ec2e 100644 --- a/ClientApp/package.json +++ b/ClientApp/package.json @@ -3,6 +3,10 @@ "version": "0.1.0", "private": true, "dependencies": { + "@fortawesome/fontawesome-svg-core": "^1.2.26", + "@fortawesome/free-brands-svg-icons": "^5.12.0", + "@fortawesome/free-solid-svg-icons": "^5.12.0", + "@fortawesome/react-fontawesome": "^0.1.8", "@material-ui/core": "^4.8.1", "@material-ui/icons": "^4.5.1", "@microsoft/signalr": "^3.1.0", diff --git a/ClientApp/public/index.html b/ClientApp/public/index.html index 7df5187..51f8cb2 100644 --- a/ClientApp/public/index.html +++ b/ClientApp/public/index.html @@ -15,11 +15,11 @@ - + - +