From 3d9c091a91ddd70c2030080eabcbfca3840681b1 Mon Sep 17 00:00:00 2001 From: Polarpi Date: Mon, 28 Sep 2020 20:18:05 -0500 Subject: [PATCH 01/22] add @material-ui/core --- client/package.json | 1 + client/yarn.lock | 213 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 212 insertions(+), 2 deletions(-) diff --git a/client/package.json b/client/package.json index f527540..70ab359 100644 --- a/client/package.json +++ b/client/package.json @@ -12,6 +12,7 @@ "eject": "react-scripts eject" }, "dependencies": { + "@material-ui/core": "^4.11.0", "@testing-library/jest-dom": "^4.2.4", "@testing-library/react": "^9.3.2", "@testing-library/user-event": "^7.1.2", diff --git a/client/yarn.lock b/client/yarn.lock index 5eafb46..f715f65 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -1108,7 +1108,7 @@ dependencies: regenerator-runtime "^0.13.4" -"@babel/runtime@^7.0.0", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.3", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.1", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4": +"@babel/runtime@^7.0.0", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.3", "@babel/runtime@^7.3.1", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7": version "7.11.2" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz#f549c13c754cc40b87644b9fa9f09a6a95fe0736" integrity sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw== @@ -1166,6 +1166,11 @@ resolved "https://registry.yarnpkg.com/@csstools/normalize.css/-/normalize.css-10.1.0.tgz#f0950bba18819512d42f7197e56c518aa491cf18" integrity sha512-ij4wRiunFfaJxjB0BdrYHIH8FxBJpOwNPhhAcunlmPdXudL1WQV1qoP9un6JsEBAgQH+7UXyyjh0g7jTxXK6tg== +"@emotion/hash@^0.8.0": + version "0.8.0" + resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413" + integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow== + "@h4iuiuc/eslint-plugin@^1.1.11": version "1.1.11" resolved "https://registry.yarnpkg.com/@h4iuiuc/eslint-plugin/-/eslint-plugin-1.1.11.tgz#3ab4402b0ff14f4507a178d5349d805a2b4bf531" @@ -1381,6 +1386,70 @@ "@types/yargs" "^15.0.0" chalk "^4.0.0" +"@material-ui/core@^4.11.0": + version "4.11.0" + resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.11.0.tgz#b69b26e4553c9e53f2bfaf1053e216a0af9be15a" + integrity sha512-bYo9uIub8wGhZySHqLQ833zi4ZML+XCBE1XwJ8EuUVSpTWWG57Pm+YugQToJNFsEyiKFhPh8DPD0bgupz8n01g== + dependencies: + "@babel/runtime" "^7.4.4" + "@material-ui/styles" "^4.10.0" + "@material-ui/system" "^4.9.14" + "@material-ui/types" "^5.1.0" + "@material-ui/utils" "^4.10.2" + "@types/react-transition-group" "^4.2.0" + clsx "^1.0.4" + hoist-non-react-statics "^3.3.2" + popper.js "1.16.1-lts" + prop-types "^15.7.2" + react-is "^16.8.0" + react-transition-group "^4.4.0" + +"@material-ui/styles@^4.10.0": + version "4.10.0" + resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.10.0.tgz#2406dc23aa358217aa8cc772e6237bd7f0544071" + integrity sha512-XPwiVTpd3rlnbfrgtEJ1eJJdFCXZkHxy8TrdieaTvwxNYj42VnnCyFzxYeNW9Lhj4V1oD8YtQ6S5Gie7bZDf7Q== + dependencies: + "@babel/runtime" "^7.4.4" + "@emotion/hash" "^0.8.0" + "@material-ui/types" "^5.1.0" + "@material-ui/utils" "^4.9.6" + clsx "^1.0.4" + csstype "^2.5.2" + hoist-non-react-statics "^3.3.2" + jss "^10.0.3" + jss-plugin-camel-case "^10.0.3" + jss-plugin-default-unit "^10.0.3" + jss-plugin-global "^10.0.3" + jss-plugin-nested "^10.0.3" + jss-plugin-props-sort "^10.0.3" + jss-plugin-rule-value-function "^10.0.3" + jss-plugin-vendor-prefixer "^10.0.3" + prop-types "^15.7.2" + +"@material-ui/system@^4.9.14": + version "4.9.14" + resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.9.14.tgz#4b00c48b569340cefb2036d0596b93ac6c587a5f" + integrity sha512-oQbaqfSnNlEkXEziDcJDDIy8pbvwUmZXWNqlmIwDqr/ZdCK8FuV3f4nxikUh7hvClKV2gnQ9djh5CZFTHkZj3w== + dependencies: + "@babel/runtime" "^7.4.4" + "@material-ui/utils" "^4.9.6" + csstype "^2.5.2" + prop-types "^15.7.2" + +"@material-ui/types@^5.1.0": + version "5.1.0" + resolved "https://registry.yarnpkg.com/@material-ui/types/-/types-5.1.0.tgz#efa1c7a0b0eaa4c7c87ac0390445f0f88b0d88f2" + integrity sha512-7cqRjrY50b8QzRSYyhSpx4WRw2YuO0KKIGQEVk5J8uoz2BanawykgZGoWEqKm7pVIbzFDN0SpPcVV4IhOFkl8A== + +"@material-ui/utils@^4.10.2", "@material-ui/utils@^4.9.6": + version "4.10.2" + resolved "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.10.2.tgz#3fd5470ca61b7341f1e0468ac8f29a70bf6df321" + integrity sha512-eg29v74P7W5r6a4tWWDAAfZldXIzfyO1am2fIsC39hdUUHm/33k6pGOKPbgDjg/U/4ifmgAePy/1OjkKN6rFRw== + dependencies: + "@babel/runtime" "^7.4.4" + prop-types "^15.7.2" + react-is "^16.8.0" + "@mrmlnc/readdir-enhanced@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde" @@ -1682,6 +1751,13 @@ dependencies: "@types/react" "*" +"@types/react-transition-group@^4.2.0": + version "4.4.0" + resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.0.tgz#882839db465df1320e4753e6e9f70ca7e9b4d46d" + integrity sha512-/QfLHGpu+2fQOqQaXh8MG9q03bFENooTb/it4jr5kKaZlDQfWvjqWZg48AwzPVMBHlRuTRAY7hRHCEOXz5kV6w== + dependencies: + "@types/react" "*" + "@types/react@*": version "16.9.49" resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.49.tgz#09db021cf8089aba0cdb12a49f8021a69cce4872" @@ -3074,6 +3150,11 @@ clone-deep@^4.0.1: kind-of "^6.0.2" shallow-clone "^3.0.0" +clsx@^1.0.4: + version "1.1.1" + resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.1.1.tgz#98b3134f9abbdf23b2663491ace13c5c03a73188" + integrity sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA== + co@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" @@ -3502,6 +3583,14 @@ css-tree@1.0.0-alpha.39: mdn-data "2.0.6" source-map "^0.6.1" +css-vendor@^2.0.8: + version "2.0.8" + resolved "https://registry.yarnpkg.com/css-vendor/-/css-vendor-2.0.8.tgz#e47f91d3bd3117d49180a3c935e62e3d9f7f449d" + integrity sha512-x9Aq0XTInxrkuFeHKbYC7zWY8ai7qJ04Kxd9MnvbC1uO5DagxoHQjm4JvG+vCdXOoFtCjbL2XSZfxmoYa9uQVQ== + dependencies: + "@babel/runtime" "^7.8.3" + is-in-browser "^1.0.2" + css-what@2.1: version "2.1.3" resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2" @@ -3629,6 +3718,11 @@ cssstyle@^1.0.0, cssstyle@^1.1.1: dependencies: cssom "0.3.x" +csstype@^2.5.2: + version "2.6.13" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.13.tgz#a6893015b90e84dd6e85d0e3b442a1e84f2dbe0f" + integrity sha512-ul26pfSQTZW8dcOnD2iiJssfXw0gdNVX9IJDH/X3K5DGPfj+fUYe3kB+swUY6BF3oZDxaID3AJt+9/ojSAE05A== + csstype@^3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.3.tgz#2b410bbeba38ba9633353aff34b05d9755d065f8" @@ -3888,6 +3982,14 @@ dom-converter@^0.2: dependencies: utila "~0.4" +dom-helpers@^5.0.1: + version "5.2.0" + resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.2.0.tgz#57fd054c5f8f34c52a3eeffdb7e7e93cd357d95b" + integrity sha512-Ru5o9+V8CpunKnz5LGgWXkmrH/20cGKwcHwS4m73zIvs54CN9epEmT/HLqFJW3kXpakAFkEdzgy1hzlJe3E4OQ== + dependencies: + "@babel/runtime" "^7.8.7" + csstype "^3.0.2" + dom-serializer@0: version "0.2.2" resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51" @@ -5240,6 +5342,13 @@ hmac-drbg@^1.0.0: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.1" +hoist-non-react-statics@^3.3.2: + version "3.3.2" + resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" + integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw== + dependencies: + react-is "^16.7.0" + hosted-git-info@^2.1.4: version "2.8.8" resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488" @@ -5399,6 +5508,11 @@ https-browserify@^1.0.0: resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= +hyphenate-style-name@^1.0.3: + 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.24, iconv-lite@^0.4.24: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" @@ -5783,6 +5897,11 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1: dependencies: is-extglob "^2.1.1" +is-in-browser@^1.0.2, is-in-browser@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/is-in-browser/-/is-in-browser-1.1.3.tgz#56ff4db683a078c6082eb95dad7dc62e1d04f835" + integrity sha1-Vv9NtoOgeMYILrldrX3GLh0E+DU= + is-negative-zero@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz#9553b121b0fac28869da9ed459e20c7543788461" @@ -6543,6 +6662,76 @@ jsprim@^1.2.2: json-schema "0.2.3" verror "1.10.0" +jss-plugin-camel-case@^10.0.3: + version "10.4.0" + resolved "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.4.0.tgz#46c75ff7fd61c304984c21af5817823f0f501ceb" + integrity sha512-9oDjsQ/AgdBbMyRjc06Kl3P8lDCSEts2vYZiPZfGAxbGCegqE4RnMob3mDaBby5H9vL9gWmyyImhLRWqIkRUCw== + dependencies: + "@babel/runtime" "^7.3.1" + hyphenate-style-name "^1.0.3" + jss "10.4.0" + +jss-plugin-default-unit@^10.0.3: + version "10.4.0" + resolved "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.4.0.tgz#2b10f01269eaea7f36f0f5fd1cfbfcc76ed42854" + integrity sha512-BYJ+Y3RUYiMEgmlcYMLqwbA49DcSWsGgHpVmEEllTC8MK5iJ7++pT9TnKkKBnNZZxTV75ycyFCR5xeLSOzVm4A== + dependencies: + "@babel/runtime" "^7.3.1" + jss "10.4.0" + +jss-plugin-global@^10.0.3: + version "10.4.0" + resolved "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.4.0.tgz#19449425a94e4e74e113139b629fd44d3577f97d" + integrity sha512-b8IHMJUmv29cidt3nI4bUI1+Mo5RZE37kqthaFpmxf5K7r2aAegGliAw4hXvA70ca6ckAoXMUl4SN/zxiRcRag== + dependencies: + "@babel/runtime" "^7.3.1" + jss "10.4.0" + +jss-plugin-nested@^10.0.3: + version "10.4.0" + resolved "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.4.0.tgz#017d0c02c0b6b454fd9d7d3fc33470a15eea9fd1" + integrity sha512-cKgpeHIxAP0ygeWh+drpLbrxFiak6zzJ2toVRi/NmHbpkNaLjTLgePmOz5+67ln3qzJiPdXXJB1tbOyYKAP4Pw== + dependencies: + "@babel/runtime" "^7.3.1" + jss "10.4.0" + tiny-warning "^1.0.2" + +jss-plugin-props-sort@^10.0.3: + version "10.4.0" + resolved "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.4.0.tgz#7110bf0b6049cc2080b220b506532bf0b70c0e07" + integrity sha512-j/t0R40/2fp+Nzt6GgHeUFnHVY2kPGF5drUVlgkcwYoHCgtBDOhTTsOfdaQFW6sHWfoQYgnGV4CXdjlPiRrzwA== + dependencies: + "@babel/runtime" "^7.3.1" + jss "10.4.0" + +jss-plugin-rule-value-function@^10.0.3: + version "10.4.0" + resolved "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.4.0.tgz#7cff4a91e84973536fa49b6ebbdbf7f339b01c82" + integrity sha512-w8504Cdfu66+0SJoLkr6GUQlEb8keHg8ymtJXdVHWh0YvFxDG2l/nS93SI5Gfx0fV29dO6yUugXnKzDFJxrdFQ== + dependencies: + "@babel/runtime" "^7.3.1" + jss "10.4.0" + tiny-warning "^1.0.2" + +jss-plugin-vendor-prefixer@^10.0.3: + version "10.4.0" + resolved "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.4.0.tgz#2a78f3c5d57d1e024fe7ad7c41de34d04e72ecc0" + integrity sha512-DpF+/a+GU8hMh/948sBGnKSNfKkoHg2p9aRFUmyoyxgKjOeH9n74Ht3Yt8lOgdZsuWNJbPrvaa3U4PXKwxVpTQ== + dependencies: + "@babel/runtime" "^7.3.1" + css-vendor "^2.0.8" + jss "10.4.0" + +jss@10.4.0, jss@^10.0.3: + version "10.4.0" + resolved "https://registry.yarnpkg.com/jss/-/jss-10.4.0.tgz#473a6fbe42e85441020a07e9519dac1e8a2e79ca" + integrity sha512-l7EwdwhsDishXzqTc3lbsbyZ83tlUl5L/Hb16pHCvZliA9lRDdNBZmHzeJHP0sxqD0t1mrMmMR8XroR12JBYzw== + dependencies: + "@babel/runtime" "^7.3.1" + csstype "^3.0.2" + is-in-browser "^1.1.3" + tiny-warning "^1.0.2" + jsx-ast-utils@^2.2.1, jsx-ast-utils@^2.2.3, jsx-ast-utils@^2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.4.1.tgz#1114a4c1209481db06c690c2b4f488cc665f657e" @@ -7837,6 +8026,11 @@ pnp-webpack-plugin@1.6.4: dependencies: ts-pnp "^1.1.6" +popper.js@1.16.1-lts: + version "1.16.1-lts" + resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1-lts.tgz#cf6847b807da3799d80ee3d6d2f90df8a3f50b05" + integrity sha512-Kjw8nKRl1m+VrSFCoVGPph93W/qrSO7ZkqPpTf7F4bk/sqcfWK019dWBUpE/fBOsOQY1dks/Bmcbfn1heM/IsA== + portfinder@^1.0.26: version "1.0.28" resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778" @@ -8817,7 +9011,7 @@ react-error-overlay@^6.0.7: resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.7.tgz#1dcfb459ab671d53f660a991513cb2f0a0553108" integrity sha512-TAv1KJFh3RhqxNvhzxj6LeT5NWklP6rDr2a0jaTfsZ5wSZWHOGeqQyejUp3xxLfPt2UpyJEcVQB/zyPcmonNFA== -react-is@^16.12.0, react-is@^16.8.1, react-is@^16.8.4: +react-is@^16.12.0, react-is@^16.7.0, react-is@^16.8.0, react-is@^16.8.1, react-is@^16.8.4: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== @@ -8882,6 +9076,16 @@ react-scripts@3.4.3: optionalDependencies: fsevents "2.1.2" +react-transition-group@^4.4.0: + version "4.4.1" + resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.1.tgz#63868f9325a38ea5ee9535d828327f85773345c9" + integrity sha512-Djqr7OQ2aPUiYurhPalTrVy9ddmFCCzwhqQmtN+J3+3DzLO209Fdr70QrN8Z3DsglWql6iY1lDWAfpFiBtuKGw== + dependencies: + "@babel/runtime" "^7.5.5" + dom-helpers "^5.0.1" + loose-envify "^1.4.0" + prop-types "^15.6.2" + react@^16.13.1: version "16.13.1" resolved "https://registry.yarnpkg.com/react/-/react-16.13.1.tgz#2e818822f1a9743122c063d6410d85c1e3afe48e" @@ -10183,6 +10387,11 @@ timsort@^0.3.0: resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q= +tiny-warning@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754" + integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA== + tmp@^0.0.33: version "0.0.33" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" From ed5e8810327903db1dd0f5b885611aad436ee6a6 Mon Sep 17 00:00:00 2001 From: Polarpi Date: Mon, 28 Sep 2020 21:02:15 -0500 Subject: [PATCH 02/22] add HomeView page --- client/src/pages/HomeView/index.jsx | 10 ++++++++++ client/src/pages/HomeView/styles.css | 0 2 files changed, 10 insertions(+) create mode 100644 client/src/pages/HomeView/index.jsx create mode 100644 client/src/pages/HomeView/styles.css diff --git a/client/src/pages/HomeView/index.jsx b/client/src/pages/HomeView/index.jsx new file mode 100644 index 0000000..a58a810 --- /dev/null +++ b/client/src/pages/HomeView/index.jsx @@ -0,0 +1,10 @@ +import React from "react"; +import "./styles.css"; + +const HomeView = () => ( +
+

Welcome.

+
+); + +export default HomeView; diff --git a/client/src/pages/HomeView/styles.css b/client/src/pages/HomeView/styles.css new file mode 100644 index 0000000..e69de29 From 18e762044918513a5ce096eab1028aad07261016 Mon Sep 17 00:00:00 2001 From: Polarpi Date: Mon, 28 Sep 2020 21:02:43 -0500 Subject: [PATCH 03/22] add HomeView to App --- client/src/App.jsx | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/client/src/App.jsx b/client/src/App.jsx index 7b794e4..ce616aa 100644 --- a/client/src/App.jsx +++ b/client/src/App.jsx @@ -1,24 +1,11 @@ import React from "react"; -import logo from "./logo.svg"; +import HomeView from "./pages/HomeView"; import "./styles/App.css"; function App() { return (
-
- logo -

- Edit src/App.js and save to reload. -

- - Learn React - -
+
); } From 61a0bf65fa2bae82b3d96f8e8000d2d8abbac0d1 Mon Sep 17 00:00:00 2001 From: Polarpi Date: Mon, 28 Sep 2020 21:04:02 -0500 Subject: [PATCH 04/22] add base styling to HomeView --- client/src/pages/HomeView/index.jsx | 2 +- client/src/pages/HomeView/styles.css | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/client/src/pages/HomeView/index.jsx b/client/src/pages/HomeView/index.jsx index a58a810..2dae244 100644 --- a/client/src/pages/HomeView/index.jsx +++ b/client/src/pages/HomeView/index.jsx @@ -3,7 +3,7 @@ import "./styles.css"; const HomeView = () => (
-

Welcome.

+

Welcome

); diff --git a/client/src/pages/HomeView/styles.css b/client/src/pages/HomeView/styles.css index e69de29..bfe8cca 100644 --- a/client/src/pages/HomeView/styles.css +++ b/client/src/pages/HomeView/styles.css @@ -0,0 +1,11 @@ +body { + background-color: rgb(255, 250, 250); +} + +.title { + padding-top: 100px; + color: #231d31; + font-family: Roboto; + font-size: 48px; + font-weight: normal; +} \ No newline at end of file From c05d5bb96baa649a17154514db0f86005b1bba3c Mon Sep 17 00:00:00 2001 From: Polarpi Date: Mon, 28 Sep 2020 21:04:37 -0500 Subject: [PATCH 05/22] add Closegap logo to imgs folder --- client/public/imgs/logo-white.png | Bin 0 -> 2044 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 client/public/imgs/logo-white.png diff --git a/client/public/imgs/logo-white.png b/client/public/imgs/logo-white.png new file mode 100644 index 0000000000000000000000000000000000000000..afbcd7a2f6963c38589d2aa147d4da69a3dcfdc1 GIT binary patch literal 2044 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 literal 0 HcmV?d00001 From 7442288461f4685e5584d0e23ab742a9040f0d44 Mon Sep 17 00:00:00 2001 From: Polarpi Date: Mon, 28 Sep 2020 21:05:07 -0500 Subject: [PATCH 06/22] remove unused index.js in components folder --- client/src/components/index.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 client/src/components/index.js diff --git a/client/src/components/index.js b/client/src/components/index.js deleted file mode 100644 index e69de29..0000000 From f05f0efc368e03688c46920cafd5d316c924fcea Mon Sep 17 00:00:00 2001 From: Polarpi Date: Mon, 28 Sep 2020 21:07:11 -0500 Subject: [PATCH 07/22] add Navbar component with Closegap logo --- client/src/components/Navbar/index.jsx | 18 ++++++++++++++++++ client/src/components/Navbar/styles.css | 8 ++++++++ 2 files changed, 26 insertions(+) create mode 100644 client/src/components/Navbar/index.jsx create mode 100644 client/src/components/Navbar/styles.css diff --git a/client/src/components/Navbar/index.jsx b/client/src/components/Navbar/index.jsx new file mode 100644 index 0000000..9644533 --- /dev/null +++ b/client/src/components/Navbar/index.jsx @@ -0,0 +1,18 @@ +import React from "react"; +import AppBar from "@material-ui/core/AppBar"; +import Toolbar from "@material-ui/core/Toolbar"; +import "./styles.css"; + +const Navbar = () => { + return ( +
+ + + + + +
+ ); +}; + +export default Navbar; diff --git a/client/src/components/Navbar/styles.css b/client/src/components/Navbar/styles.css new file mode 100644 index 0000000..606dd5b --- /dev/null +++ b/client/src/components/Navbar/styles.css @@ -0,0 +1,8 @@ +.nav { + background-color: rgb(37, 0, 50); + justify-content: space-between; +} + +#nav-logo { + padding: 20px 10px; +} \ No newline at end of file From 9a7d60294297a53337d51cb072c0bab84213ea59 Mon Sep 17 00:00:00 2001 From: Polarpi Date: Mon, 28 Sep 2020 21:07:37 -0500 Subject: [PATCH 08/22] add @material-ui/icons package --- client/package.json | 1 + client/yarn.lock | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/client/package.json b/client/package.json index 70ab359..9431a95 100644 --- a/client/package.json +++ b/client/package.json @@ -13,6 +13,7 @@ }, "dependencies": { "@material-ui/core": "^4.11.0", + "@material-ui/icons": "^4.9.1", "@testing-library/jest-dom": "^4.2.4", "@testing-library/react": "^9.3.2", "@testing-library/user-event": "^7.1.2", diff --git a/client/yarn.lock b/client/yarn.lock index f715f65..777b23b 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -1404,6 +1404,13 @@ react-is "^16.8.0" react-transition-group "^4.4.0" +"@material-ui/icons@^4.9.1": + version "4.9.1" + resolved "https://registry.yarnpkg.com/@material-ui/icons/-/icons-4.9.1.tgz#fdeadf8cb3d89208945b33dbc50c7c616d0bd665" + integrity sha512-GBitL3oBWO0hzBhvA9KxqcowRUsA0qzwKkURyC8nppnC3fw54KPKZ+d4V1Eeg/UnDRSzDaI9nGCdel/eh9AQMg== + dependencies: + "@babel/runtime" "^7.4.4" + "@material-ui/styles@^4.10.0": version "4.10.0" resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.10.0.tgz#2406dc23aa358217aa8cc772e6237bd7f0544071" From d2d2f3b685c291845ec4a2dd00889dfc8f8401f1 Mon Sep 17 00:00:00 2001 From: Polarpi Date: Mon, 28 Sep 2020 21:08:24 -0500 Subject: [PATCH 09/22] add right side of navbar + add to App --- client/src/App.jsx | 2 ++ client/src/components/Navbar/index.jsx | 45 ++++++++++++++++++++++++- client/src/components/Navbar/styles.css | 40 ++++++++++++++++++++++ 3 files changed, 86 insertions(+), 1 deletion(-) diff --git a/client/src/App.jsx b/client/src/App.jsx index ce616aa..f8133ef 100644 --- a/client/src/App.jsx +++ b/client/src/App.jsx @@ -1,10 +1,12 @@ import React from "react"; import HomeView from "./pages/HomeView"; +import Navbar from "./components/Navbar"; import "./styles/App.css"; function App() { return (
+
); diff --git a/client/src/components/Navbar/index.jsx b/client/src/components/Navbar/index.jsx index 9644533..a5ae31a 100644 --- a/client/src/components/Navbar/index.jsx +++ b/client/src/components/Navbar/index.jsx @@ -1,14 +1,57 @@ -import React from "react"; +import React, { useState } from "react"; import AppBar from "@material-ui/core/AppBar"; +import PermIdentityIcon from "@material-ui/icons/PermIdentityOutlined"; import Toolbar from "@material-ui/core/Toolbar"; import "./styles.css"; +const LoginLink = () => { + return ( + + Login + + ); +}; + +const LogoutLink = () => { + return ( + + Logout + + ); +}; + +const ProfileLink = () => { + const [name, setName] = useState("Person"); + return ( + + ); +}; + const Navbar = () => { + const [isLoggedIn, setIsLoggedIn] = useState(false); + let rightNav; + + if (isLoggedIn) { + rightNav = ( +
+ + +
+ ); + } else { + rightNav = ; + } return (
+ {rightNav}
diff --git a/client/src/components/Navbar/styles.css b/client/src/components/Navbar/styles.css index 606dd5b..dfe79ea 100644 --- a/client/src/components/Navbar/styles.css +++ b/client/src/components/Navbar/styles.css @@ -5,4 +5,44 @@ #nav-logo { padding: 20px 10px; +} + +.right-nav { + display: flex; + flex-direction: column; + align-items: flex-end; +} + +#nav-login { + color: #ffffff; + text-transform: uppercase; + text-decoration: none; + font-family: Roboto; +} + +#nav-logout { + padding-top: 4px; + color: rgb(233, 87, 62); + text-transform: uppercase; + text-decoration: none; + font-family: Roboto; + font-size: 14px; +} + +#nav-profile { + display: flex; + align-items: center; +} + +#nav-profile-icon { + color: rgb(233, 87, 62); +} + +#nav-profile-link { + padding-left: 4px; + color: #ffffff; + text-decoration: none; + font-family: Roboto; + font-size: 18px; + font-weight: 500; } \ No newline at end of file From 78a9cb5b90c999efbea49265d2a23f1a7f7d7ce8 Mon Sep 17 00:00:00 2001 From: Polarpi Date: Mon, 28 Sep 2020 21:14:53 -0500 Subject: [PATCH 10/22] format css files with Prettier --- client/src/components/Navbar/styles.css | 52 ++++++++++++------------- client/src/pages/HomeView/styles.css | 14 +++---- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/client/src/components/Navbar/styles.css b/client/src/components/Navbar/styles.css index dfe79ea..fc29a84 100644 --- a/client/src/components/Navbar/styles.css +++ b/client/src/components/Navbar/styles.css @@ -1,48 +1,48 @@ .nav { - background-color: rgb(37, 0, 50); - justify-content: space-between; + background-color: rgb(37, 0, 50); + justify-content: space-between; } #nav-logo { - padding: 20px 10px; + padding: 20px 10px; } .right-nav { - display: flex; - flex-direction: column; - align-items: flex-end; + display: flex; + flex-direction: column; + align-items: flex-end; } #nav-login { - color: #ffffff; - text-transform: uppercase; - text-decoration: none; - font-family: Roboto; + color: #ffffff; + text-transform: uppercase; + text-decoration: none; + font-family: Roboto; } #nav-logout { - padding-top: 4px; - color: rgb(233, 87, 62); - text-transform: uppercase; - text-decoration: none; - font-family: Roboto; - font-size: 14px; + padding-top: 4px; + color: rgb(233, 87, 62); + text-transform: uppercase; + text-decoration: none; + font-family: Roboto; + font-size: 14px; } #nav-profile { - display: flex; - align-items: center; + display: flex; + align-items: center; } #nav-profile-icon { - color: rgb(233, 87, 62); + color: rgb(233, 87, 62); } #nav-profile-link { - padding-left: 4px; - color: #ffffff; - text-decoration: none; - font-family: Roboto; - font-size: 18px; - font-weight: 500; -} \ No newline at end of file + padding-left: 4px; + color: #ffffff; + text-decoration: none; + font-family: Roboto; + font-size: 18px; + font-weight: 500; +} diff --git a/client/src/pages/HomeView/styles.css b/client/src/pages/HomeView/styles.css index bfe8cca..df393d3 100644 --- a/client/src/pages/HomeView/styles.css +++ b/client/src/pages/HomeView/styles.css @@ -1,11 +1,11 @@ body { - background-color: rgb(255, 250, 250); + background-color: rgb(255, 250, 250); } .title { - padding-top: 100px; - color: #231d31; - font-family: Roboto; - font-size: 48px; - font-weight: normal; -} \ No newline at end of file + padding-top: 100px; + color: #231d31; + font-family: Roboto; + font-size: 48px; + font-weight: normal; +} From d0465216310c8ff963858b6a7b54bd4112b33b07 Mon Sep 17 00:00:00 2001 From: Yousef Ahmed Date: Thu, 1 Oct 2020 14:58:07 -0500 Subject: [PATCH 11/22] Fix some minor linting issues --- client/src/components/Navbar/index.jsx | 8 +++++--- client/src/pages/HomeView/index.jsx | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/client/src/components/Navbar/index.jsx b/client/src/components/Navbar/index.jsx index a5ae31a..18611dd 100644 --- a/client/src/components/Navbar/index.jsx +++ b/client/src/components/Navbar/index.jsx @@ -5,7 +5,7 @@ import Toolbar from "@material-ui/core/Toolbar"; import "./styles.css"; const LoginLink = () => { - return ( + ( Login @@ -13,7 +13,7 @@ const LoginLink = () => { }; const LogoutLink = () => { - return ( + ( Logout @@ -21,6 +21,7 @@ const LogoutLink = () => { }; const ProfileLink = () => { + // eslint-disable-next-line const [name, setName] = useState("Person"); return (