Skip to content

Commit fa7efdd

Browse files
fixed duplicate import from react-router-dom
1 parent ba30f9e commit fa7efdd

3 files changed

Lines changed: 94 additions & 7 deletions

File tree

frontend/.eslintcache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"/home/manan/college_project/TPC-website/frontend/src/index.js":"1","/home/manan/college_project/TPC-website/frontend/src/App.js":"2","/home/manan/college_project/TPC-website/frontend/src/reportWebVitals.js":"3","/home/manan/college_project/TPC-website/frontend/src/components/homePage/index.jsx":"4","/home/manan/college_project/TPC-website/frontend/src/components/nav/index.jsx":"5","/home/manan/college_project/TPC-website/frontend/src/components/svgbackground/index.js":"6","/home/manan/college_project/TPC-website/frontend/src/components/homeNav/index.jsx":"7","/home/manan/college_project/TPC-website/frontend/src/components/navLinks/index.jsx":"8","/home/manan/college_project/TPC-website/frontend/src/components/shortcuts/index.jsx":"9"},{"size":544,"mtime":1610621102610,"results":"10","hashOfConfig":"11"},{"size":380,"mtime":1610621996960,"results":"12","hashOfConfig":"11"},{"size":362,"mtime":1610619648767,"results":"13","hashOfConfig":"11"},{"size":748,"mtime":1610619648767,"results":"14","hashOfConfig":"11"},{"size":1147,"mtime":1610623199933,"results":"15","hashOfConfig":"11"},{"size":880,"mtime":1610623252138,"results":"16","hashOfConfig":"11"},{"size":520,"mtime":1610623162512,"results":"17","hashOfConfig":"11"},{"size":677,"mtime":1610621500813,"results":"18","hashOfConfig":"11"},{"size":867,"mtime":1610623215745,"results":"19","hashOfConfig":"11"},{"filePath":"20","messages":"21","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1vo1m0q",{"filePath":"22","messages":"23","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"24","messages":"25","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"26","messages":"27","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"28","messages":"29","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"30","messages":"31","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"32","messages":"33","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"34","messages":"35","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"36","messages":"37","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"/home/manan/college_project/TPC-website/frontend/src/index.js",[],"/home/manan/college_project/TPC-website/frontend/src/App.js",[],"/home/manan/college_project/TPC-website/frontend/src/reportWebVitals.js",[],"/home/manan/college_project/TPC-website/frontend/src/components/homePage/index.jsx",[],"/home/manan/college_project/TPC-website/frontend/src/components/nav/index.jsx",[],"/home/manan/college_project/TPC-website/frontend/src/components/svgbackground/index.js",[],"/home/manan/college_project/TPC-website/frontend/src/components/homeNav/index.jsx",[],"/home/manan/college_project/TPC-website/frontend/src/components/navLinks/index.jsx",[],"/home/manan/college_project/TPC-website/frontend/src/components/shortcuts/index.jsx",[]]
1+
[{"D:\\code\\web\\github\\TPC-website\\frontend\\src\\index.js":"1","D:\\code\\web\\github\\TPC-website\\frontend\\src\\components\\shortcuts\\index.jsx":"2","D:\\code\\web\\github\\TPC-website\\frontend\\src\\components\\homeNav\\index.jsx":"3","D:\\code\\web\\github\\TPC-website\\frontend\\src\\App.js":"4","D:\\code\\web\\github\\TPC-website\\frontend\\src\\components\\navLinks\\index.jsx":"5","D:\\code\\web\\github\\TPC-website\\frontend\\src\\components\\svgbackground\\index.js":"6"},{"size":562,"mtime":1610799279502,"results":"7","hashOfConfig":"8"},{"size":887,"mtime":1610799279502,"results":"9","hashOfConfig":"8"},{"size":538,"mtime":1610799279502,"results":"10","hashOfConfig":"8"},{"size":362,"mtime":1611075338030,"results":"11","hashOfConfig":"8"},{"size":706,"mtime":1610799279502,"results":"12","hashOfConfig":"8"},{"size":898,"mtime":1610799279502,"results":"13","hashOfConfig":"8"},{"filePath":"14","messages":"15","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"t5wa8d",{"filePath":"16","messages":"17","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"18","messages":"19","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"20","messages":"21","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"22","messages":"23","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"24","messages":"25","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"D:\\code\\web\\github\\TPC-website\\frontend\\src\\index.js",[],"D:\\code\\web\\github\\TPC-website\\frontend\\src\\components\\shortcuts\\index.jsx",[],"D:\\code\\web\\github\\TPC-website\\frontend\\src\\components\\homeNav\\index.jsx",[],"D:\\code\\web\\github\\TPC-website\\frontend\\src\\App.js",[],"D:\\code\\web\\github\\TPC-website\\frontend\\src\\components\\navLinks\\index.jsx",[],"D:\\code\\web\\github\\TPC-website\\frontend\\src\\components\\svgbackground\\index.js",[]]

frontend/src/App.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
import { Route } from 'react-router-dom';
21
import './App.css';
32
import HomePage from "./components/homePage";
43
import Nav from "./components/nav";
5-
import { Switch } from 'react-router-dom';
4+
import { Route, Switch } from 'react-router-dom';
65

76
function App() {
87
return (

frontend/yarn.lock

Lines changed: 92 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1085,7 +1085,7 @@
10851085
dependencies:
10861086
regenerator-runtime "^0.13.4"
10871087

1088-
"@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
1088+
"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
10891089
version "7.12.5"
10901090
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e"
10911091
integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==
@@ -5391,6 +5391,18 @@ hex-color-regex@^1.1.0:
53915391
resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"
53925392
integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
53935393

5394+
history@^4.9.0:
5395+
version "4.10.1"
5396+
resolved "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz#33371a65e3a83b267434e2b3f3b1b4c58aad4cf3"
5397+
integrity sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==
5398+
dependencies:
5399+
"@babel/runtime" "^7.1.2"
5400+
loose-envify "^1.2.0"
5401+
resolve-pathname "^3.0.0"
5402+
tiny-invariant "^1.0.2"
5403+
tiny-warning "^1.0.0"
5404+
value-equal "^1.0.1"
5405+
53945406
hmac-drbg@^1.0.0:
53955407
version "1.0.1"
53965408
resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
@@ -5400,6 +5412,13 @@ hmac-drbg@^1.0.0:
54005412
minimalistic-assert "^1.0.0"
54015413
minimalistic-crypto-utils "^1.0.1"
54025414

5415+
hoist-non-react-statics@^3.1.0:
5416+
version "3.3.2"
5417+
resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
5418+
integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
5419+
dependencies:
5420+
react-is "^16.7.0"
5421+
54035422
hoopy@^0.1.4:
54045423
version "0.1.4"
54055424
resolved "https://registry.yarnpkg.com/hoopy/-/hoopy-0.1.4.tgz#609207d661100033a9a9402ad3dea677381c1b1d"
@@ -6067,6 +6086,11 @@ is-wsl@^2.1.1, is-wsl@^2.2.0:
60676086
dependencies:
60686087
is-docker "^2.0.0"
60696088

6089+
isarray@0.0.1:
6090+
version "0.0.1"
6091+
resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
6092+
integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
6093+
60706094
isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
60716095
version "1.0.0"
60726096
resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
@@ -6903,7 +6927,7 @@ loglevel@^1.6.8:
69036927
resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.0.tgz#728166855a740d59d38db01cf46f042caa041bb0"
69046928
integrity sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ==
69056929

6906-
loose-envify@^1.1.0, loose-envify@^1.4.0:
6930+
loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
69076931
version "1.4.0"
69086932
resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
69096933
integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
@@ -7114,6 +7138,14 @@ min-indent@^1.0.0:
71147138
resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
71157139
integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
71167140

7141+
mini-create-react-context@^0.4.0:
7142+
version "0.4.1"
7143+
resolved "https://registry.yarnpkg.com/mini-create-react-context/-/mini-create-react-context-0.4.1.tgz#072171561bfdc922da08a60c2197a497cc2d1d5e"
7144+
integrity sha512-YWCYEmd5CQeHGSAKrYvXgmzzkrvssZcuuQDDeqkT+PziKGMgE+0MCCtcKbROzocGBG1meBLl2FotlRwf4gAzbQ==
7145+
dependencies:
7146+
"@babel/runtime" "^7.12.1"
7147+
tiny-warning "^1.0.3"
7148+
71177149
mini-css-extract-plugin@0.11.3:
71187150
version "0.11.3"
71197151
resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.11.3.tgz#15b0910a7f32e62ffde4a7430cfefbd700724ea6"
@@ -7866,6 +7898,13 @@ path-to-regexp@0.1.7:
78667898
resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
78677899
integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
78687900

7901+
path-to-regexp@^1.7.0:
7902+
version "1.8.0"
7903+
resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a"
7904+
integrity sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==
7905+
dependencies:
7906+
isarray "0.0.1"
7907+
78697908
path-type@^2.0.0:
78707909
version "2.0.0"
78717910
resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
@@ -8722,7 +8761,7 @@ prompts@2.4.0, prompts@^2.0.1:
87228761
kleur "^3.0.3"
87238762
sisteransi "^1.0.5"
87248763

8725-
prop-types@^15.7.2:
8764+
prop-types@^15.6.2, prop-types@^15.7.2:
87268765
version "15.7.2"
87278766
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
87288767
integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
@@ -8932,7 +8971,7 @@ react-error-overlay@^6.0.8:
89328971
resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.8.tgz#474ed11d04fc6bda3af643447d85e9127ed6b5de"
89338972
integrity sha512-HvPuUQnLp5H7TouGq3kzBeioJmXms1wHy9EGjz2OURWBp4qZO6AfGEcnxts1D/CbwPLRAgTMPCEgYhA3sEM4vw==
89348973

8935-
react-is@^16.8.1:
8974+
react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1:
89368975
version "16.13.1"
89378976
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
89388977
integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
@@ -8947,6 +8986,35 @@ react-refresh@^0.8.3:
89478986
resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.8.3.tgz#721d4657672d400c5e3c75d063c4a85fb2d5d68f"
89488987
integrity sha512-X8jZHc7nCMjaCqoU+V2I0cOhNW+QMBwSUkeXnTi8IPe6zaRWfn60ZzvFDZqWPfmSJfjub7dDW1SP0jaHWLu/hg==
89498988

8989+
react-router-dom@^5.2.0:
8990+
version "5.2.0"
8991+
resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.2.0.tgz#9e65a4d0c45e13289e66c7b17c7e175d0ea15662"
8992+
integrity sha512-gxAmfylo2QUjcwxI63RhQ5G85Qqt4voZpUXSEqCwykV0baaOTQDR1f0PmY8AELqIyVc0NEZUj0Gov5lNGcXgsA==
8993+
dependencies:
8994+
"@babel/runtime" "^7.1.2"
8995+
history "^4.9.0"
8996+
loose-envify "^1.3.1"
8997+
prop-types "^15.6.2"
8998+
react-router "5.2.0"
8999+
tiny-invariant "^1.0.2"
9000+
tiny-warning "^1.0.0"
9001+
9002+
react-router@5.2.0:
9003+
version "5.2.0"
9004+
resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.2.0.tgz#424e75641ca8747fbf76e5ecca69781aa37ea293"
9005+
integrity sha512-smz1DUuFHRKdcJC0jobGo8cVbhO3x50tCL4icacOlcwDOEQPq4TMqwx3sY1TP+DvtTgz4nm3thuo7A+BK2U0Dw==
9006+
dependencies:
9007+
"@babel/runtime" "^7.1.2"
9008+
history "^4.9.0"
9009+
hoist-non-react-statics "^3.1.0"
9010+
loose-envify "^1.3.1"
9011+
mini-create-react-context "^0.4.0"
9012+
path-to-regexp "^1.7.0"
9013+
prop-types "^15.6.2"
9014+
react-is "^16.6.0"
9015+
tiny-invariant "^1.0.2"
9016+
tiny-warning "^1.0.0"
9017+
89509018
react-scripts@4.0.1:
89519019
version "4.0.1"
89529020
resolved "https://registry.yarnpkg.com/react-scripts/-/react-scripts-4.0.1.tgz#34974c0f4cfdf1655906c95df6a04d80db8b88f0"
@@ -9306,6 +9374,11 @@ resolve-from@^5.0.0:
93069374
resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
93079375
integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
93089376

9377+
resolve-pathname@^3.0.0:
9378+
version "3.0.0"
9379+
resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-3.0.0.tgz#99d02224d3cf263689becbb393bc560313025dcd"
9380+
integrity sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng==
9381+
93099382
resolve-url-loader@^3.1.2:
93109383
version "3.1.2"
93119384
resolved "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-3.1.2.tgz#235e2c28e22e3e432ba7a5d4e305c59a58edfc08"
@@ -10405,6 +10478,16 @@ timsort@^0.3.0:
1040510478
resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4"
1040610479
integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=
1040710480

10481+
tiny-invariant@^1.0.2:
10482+
version "1.1.0"
10483+
resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.1.0.tgz#634c5f8efdc27714b7f386c35e6760991d230875"
10484+
integrity sha512-ytxQvrb1cPc9WBEI/HSeYYoGD0kWnGEOR8RY6KomWLBVhqz0RgTwVO9dLrGz7dC+nN9llyI7OKAgRq8Vq4ZBSw==
10485+
10486+
tiny-warning@^1.0.0, tiny-warning@^1.0.3:
10487+
version "1.0.3"
10488+
resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754"
10489+
integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==
10490+
1040810491
tmpl@1.0.x:
1040910492
version "1.0.4"
1041010493
resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
@@ -10822,6 +10905,11 @@ validate-npm-package-license@^3.0.1:
1082210905
spdx-correct "^3.0.0"
1082310906
spdx-expression-parse "^3.0.0"
1082410907

10908+
value-equal@^1.0.1:
10909+
version "1.0.1"
10910+
resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-1.0.1.tgz#1e0b794c734c5c0cade179c437d356d931a34d6c"
10911+
integrity sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw==
10912+
1082510913
vary@~1.1.2:
1082610914
version "1.1.2"
1082710915
resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"

0 commit comments

Comments
 (0)