-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #38 from CS222-UIUC/aden/connectmainpage
Fix <MainPage /> component in wrong place. Add id to apartment object
- Loading branch information
Showing
9 changed files
with
408 additions
and
14 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -19,7 +19,6 @@ function App() { | |
</Route> | ||
</Routes> | ||
</BrowserRouter> | ||
<MainPage /> | ||
</div> | ||
); | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1033,7 +1033,7 @@ | |
"core-js-pure" "^3.25.1" | ||
"regenerator-runtime" "^0.13.4" | ||
|
||
"@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.16.3", "@babel/runtime@^7.18.3", "@babel/runtime@^7.18.9", "@babel/runtime@^7.19.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": | ||
"@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.16.3", "@babel/runtime@^7.17.2", "@babel/runtime@^7.18.3", "@babel/runtime@^7.18.9", "@babel/runtime@^7.19.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": | ||
"integrity" "sha512-EXpLCrk55f+cYqmHsSR+yD/0gAIMxxA9QK9lnQWzhMCvt+YmoBN7Zx94s++Kv0+unHk39vxNO8t+CMA2WSS3wA==" | ||
"resolved" "https://registry.npmjs.org/@babel/runtime/-/runtime-7.19.4.tgz" | ||
"version" "7.19.4" | ||
|
@@ -1835,16 +1835,45 @@ | |
"schema-utils" "^3.0.0" | ||
"source-map" "^0.7.3" | ||
|
||
"@popperjs/core@^2.11.6": | ||
"@popperjs/core@^2.11.5", "@popperjs/core@^2.11.6": | ||
"integrity" "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==" | ||
"resolved" "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz" | ||
"version" "2.11.6" | ||
|
||
"@react-aria/ssr@^3.2.0": | ||
"integrity" "sha512-yNqUDuOVZIUGP81R87BJVi/ZUZp/nYOBXbPsRe7oltJOfErQZD+UezMpw4vM2KRz18cURffvmC8tJ6JTeyDtaQ==" | ||
"resolved" "https://registry.npmjs.org/@react-aria/ssr/-/ssr-3.3.0.tgz" | ||
"version" "3.3.0" | ||
dependencies: | ||
"@babel/runtime" "^7.6.2" | ||
|
||
"@remix-run/[email protected]": | ||
"integrity" "sha512-GRSOFhJzjGN+d4sKHTMSvNeUPoZiDHWmRnXfzaxrqe7dE/Nzlc8BiMSJdLDESZlndM7jIUrZ/F4yWqVYlI0rwQ==" | ||
"resolved" "https://registry.npmjs.org/@remix-run/router/-/router-1.0.2.tgz" | ||
"version" "1.0.2" | ||
|
||
"@restart/hooks@^0.4.6", "@restart/hooks@^0.4.7": | ||
"integrity" "sha512-ZbjlEHcG+FQtpDPHd7i4FzNNvJf2enAwZfJbpM8CW7BhmOAbsHpZe3tsHwfQUrBuyrxWqPYp2x5UMnilWcY22A==" | ||
"resolved" "https://registry.npmjs.org/@restart/hooks/-/hooks-0.4.7.tgz" | ||
"version" "0.4.7" | ||
dependencies: | ||
"dequal" "^2.0.2" | ||
|
||
"@restart/ui@^1.3.1": | ||
"integrity" "sha512-5dDj5uDzUgK1iijWPRg6AnxjkHM04XhTQDJirM1h/8tIc7KyLtF9YyjcCpNEn259hPMXswpkfXKNgiag0skPFg==" | ||
"resolved" "https://registry.npmjs.org/@restart/ui/-/ui-1.4.0.tgz" | ||
"version" "1.4.0" | ||
dependencies: | ||
"@babel/runtime" "^7.18.3" | ||
"@popperjs/core" "^2.11.5" | ||
"@react-aria/ssr" "^3.2.0" | ||
"@restart/hooks" "^0.4.7" | ||
"@types/warning" "^3.0.0" | ||
"dequal" "^2.0.2" | ||
"dom-helpers" "^5.2.0" | ||
"uncontrollable" "^7.2.1" | ||
"warning" "^4.0.3" | ||
|
||
"@rollup/plugin-babel@^5.2.0": | ||
"integrity" "sha512-WFfdLWU/xVWKeRQnKmIAQULUI7Il0gZnBIH/ZFO069wYIfPu+8zrfp/KMW0atmELoRDq8FbiP3VCss9MhCut7Q==" | ||
"resolved" "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz" | ||
|
@@ -2310,14 +2339,14 @@ | |
dependencies: | ||
"@types/react" "*" | ||
|
||
"@types/react-transition-group@^4.2.0", "@types/react-transition-group@^4.4.5": | ||
"@types/react-transition-group@^4.2.0", "@types/react-transition-group@^4.4.4", "@types/react-transition-group@^4.4.5": | ||
"integrity" "sha512-juKD/eiSM3/xZYzjuzH6ZwpP+/lejltmiS3QEzV/vmb/Q8+HfDmxu+Baga8UEMGBqV88Nbg4l2hY/K2DkyaLLA==" | ||
"resolved" "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.5.tgz" | ||
"version" "4.4.5" | ||
dependencies: | ||
"@types/react" "*" | ||
|
||
"@types/react@*", "@types/react@^18.0.21": | ||
"@types/react@*", "@types/react@^18.0.21", "@types/react@>=16.9.11": | ||
"integrity" "sha512-7QUCOxvFgnD5Jk8ZKlUAhVcRj7GuJRjnjjiY/IUBWKgOlnvDvTMLD4RTF7NPyVmbRhNrbomZiOepg7M/2Kj1mA==" | ||
"resolved" "https://registry.npmjs.org/@types/react/-/react-18.0.21.tgz" | ||
"version" "18.0.21" | ||
|
@@ -2401,6 +2430,11 @@ | |
"resolved" "https://registry.npmjs.org/@types/underscore/-/underscore-1.11.4.tgz" | ||
"version" "1.11.4" | ||
|
||
"@types/warning@^3.0.0": | ||
"integrity" "sha512-t/Tvs5qR47OLOr+4E9ckN8AmP2Tf16gWq+/qA4iUGS/OOyHVO8wv2vjJuX8SNOUTJyWb+2t7wJm6cXILFnOROA==" | ||
"resolved" "https://registry.npmjs.org/@types/warning/-/warning-3.0.0.tgz" | ||
"version" "3.0.0" | ||
|
||
"@types/ws@^8.5.1": | ||
"integrity" "sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==" | ||
"resolved" "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz" | ||
|
@@ -3198,6 +3232,11 @@ | |
"resolved" "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz" | ||
"version" "1.0.0" | ||
|
||
"bootstrap@^5.2.2": | ||
"integrity" "sha512-dEtzMTV71n6Fhmbg4fYJzQsw1N29hJKO1js5ackCgIpDcGid2ETMGC6zwSYw09v05Y+oRdQ9loC54zB1La3hHQ==" | ||
"resolved" "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.2.tgz" | ||
"version" "5.2.2" | ||
|
||
"brace-expansion@^1.1.7": | ||
"integrity" "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==" | ||
"resolved" "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz" | ||
|
@@ -3426,6 +3465,11 @@ | |
"resolved" "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz" | ||
"version" "1.2.2" | ||
|
||
"classnames@^2.3.1": | ||
"integrity" "sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==" | ||
"resolved" "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz" | ||
"version" "2.3.2" | ||
|
||
"clean-css@^5.2.2": | ||
"integrity" "sha512-lCr8OHhiWCTw4v8POJovCoh4T7I9U11yVsPjMWWnnMmp9ZowCxyad1Pathle/9HjaDp+fdQKjO9fQydE6RHTZg==" | ||
"resolved" "https://registry.npmjs.org/clean-css/-/clean-css-5.3.1.tgz" | ||
|
@@ -4001,6 +4045,11 @@ | |
"resolved" "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz" | ||
"version" "2.0.0" | ||
|
||
"dequal@^2.0.2": | ||
"integrity" "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==" | ||
"resolved" "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz" | ||
"version" "2.0.3" | ||
|
||
"[email protected]": | ||
"integrity" "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==" | ||
"resolved" "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz" | ||
|
@@ -4093,7 +4142,7 @@ | |
dependencies: | ||
"utila" "~0.4" | ||
|
||
"dom-helpers@^5.0.1": | ||
"dom-helpers@^5.0.1", "dom-helpers@^5.2.0", "dom-helpers@^5.2.1": | ||
"integrity" "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==" | ||
"resolved" "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz" | ||
"version" "5.2.1" | ||
|
@@ -4972,6 +5021,11 @@ | |
"resolved" "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" | ||
"version" "1.0.0" | ||
|
||
"fsevents@^2.3.2", "fsevents@~2.3.2": | ||
"integrity" "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==" | ||
"resolved" "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz" | ||
"version" "2.3.2" | ||
|
||
"function-bind@^1.1.1": | ||
"integrity" "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" | ||
"resolved" "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz" | ||
|
@@ -5435,6 +5489,13 @@ | |
"has" "^1.0.3" | ||
"side-channel" "^1.0.4" | ||
|
||
"invariant@^2.2.4": | ||
"integrity" "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==" | ||
"resolved" "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz" | ||
"version" "2.2.4" | ||
dependencies: | ||
"loose-envify" "^1.0.0" | ||
|
||
"ipaddr.js@^2.0.1": | ||
"integrity" "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==" | ||
"resolved" "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz" | ||
|
@@ -6503,7 +6564,7 @@ | |
"resolved" "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz" | ||
"version" "4.17.21" | ||
|
||
"loose-envify@^1.1.0", "loose-envify@^1.4.0": | ||
"loose-envify@^1.0.0", "loose-envify@^1.1.0", "loose-envify@^1.4.0": | ||
"integrity" "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==" | ||
"resolved" "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz" | ||
"version" "1.4.0" | ||
|
@@ -7719,6 +7780,14 @@ | |
"kleur" "^3.0.3" | ||
"sisteransi" "^1.0.5" | ||
|
||
"prop-types-extra@^1.1.0": | ||
"integrity" "sha512-59+AHNnHYCdiC+vMwY52WmvP5dM3QLeoumYuEyceQDi9aEhtwN9zIQ2ZNo25sMyXnbh32h+P1ezDsUpUH3JAew==" | ||
"resolved" "https://registry.npmjs.org/prop-types-extra/-/prop-types-extra-1.1.1.tgz" | ||
"version" "1.1.1" | ||
dependencies: | ||
"react-is" "^16.3.2" | ||
"warning" "^4.0.0" | ||
|
||
"prop-types@^15.6.2", "prop-types@^15.7.2", "prop-types@^15.8.1": | ||
"integrity" "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==" | ||
"resolved" "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz" | ||
|
@@ -7819,6 +7888,24 @@ | |
"regenerator-runtime" "^0.13.9" | ||
"whatwg-fetch" "^3.6.2" | ||
|
||
"react-bootstrap@^2.5.0": | ||
"integrity" "sha512-j/aLR+okzbYk61TM3eDOU1NqOqnUdwyVrF+ojoCRUxPdzc2R0xXvqyRsjSoyRoCo7n82Fs/LWjPCin/QJNdwvA==" | ||
"resolved" "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-2.5.0.tgz" | ||
"version" "2.5.0" | ||
dependencies: | ||
"@babel/runtime" "^7.17.2" | ||
"@restart/hooks" "^0.4.6" | ||
"@restart/ui" "^1.3.1" | ||
"@types/react-transition-group" "^4.4.4" | ||
"classnames" "^2.3.1" | ||
"dom-helpers" "^5.2.1" | ||
"invariant" "^2.2.4" | ||
"prop-types" "^15.8.1" | ||
"prop-types-extra" "^1.1.0" | ||
"react-transition-group" "^4.4.2" | ||
"uncontrollable" "^7.2.1" | ||
"warning" "^4.0.3" | ||
|
||
"react-dev-utils@^12.0.1": | ||
"integrity" "sha512-84Ivxmr17KjUupyqzFode6xKhjwuEJDROWKJy/BthkL7Wn6NJ8h4WE6k/exAv6ImS+0oZLRRW5j/aINMHyeGeQ==" | ||
"resolved" "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-12.0.1.tgz" | ||
|
@@ -7874,6 +7961,11 @@ | |
"resolved" "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz" | ||
"version" "16.13.1" | ||
|
||
"react-is@^16.3.2": | ||
"integrity" "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" | ||
"resolved" "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz" | ||
"version" "16.13.1" | ||
|
||
"react-is@^16.7.0": | ||
"integrity" "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" | ||
"resolved" "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz" | ||
|
@@ -7894,6 +7986,11 @@ | |
"resolved" "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz" | ||
"version" "18.2.0" | ||
|
||
"react-lifecycles-compat@^3.0.4": | ||
"integrity" "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" | ||
"resolved" "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz" | ||
"version" "3.0.4" | ||
|
||
"react-refresh@^0.11.0": | ||
"integrity" "sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A==" | ||
"resolved" "https://registry.npmjs.org/react-refresh/-/react-refresh-0.11.0.tgz" | ||
|
@@ -7969,7 +8066,7 @@ | |
optionalDependencies: | ||
"fsevents" "^2.3.2" | ||
|
||
"react-transition-group@^4.4.0", "react-transition-group@^4.4.5": | ||
"react-transition-group@^4.4.0", "react-transition-group@^4.4.2", "react-transition-group@^4.4.5": | ||
"integrity" "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==" | ||
"resolved" "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz" | ||
"version" "4.4.5" | ||
|
@@ -9139,6 +9236,16 @@ | |
"has-symbols" "^1.0.3" | ||
"which-boxed-primitive" "^1.0.2" | ||
|
||
"uncontrollable@^7.2.1": | ||
"integrity" "sha512-svtcfoTADIB0nT9nltgjujTi7BzVmwjZClOmskKu/E8FW9BXzg9os8OLr4f8Dlnk0rYWJIWr4wv9eKUXiQvQwQ==" | ||
"resolved" "https://registry.npmjs.org/uncontrollable/-/uncontrollable-7.2.1.tgz" | ||
"version" "7.2.1" | ||
dependencies: | ||
"@babel/runtime" "^7.6.3" | ||
"@types/react" ">=16.9.11" | ||
"invariant" "^2.2.4" | ||
"react-lifecycles-compat" "^3.0.4" | ||
|
||
"underscore@^1.13.6": | ||
"integrity" "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==" | ||
"resolved" "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz" | ||
|
@@ -9287,6 +9394,13 @@ | |
dependencies: | ||
"makeerror" "1.0.12" | ||
|
||
"warning@^4.0.0", "warning@^4.0.3": | ||
"integrity" "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==" | ||
"resolved" "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz" | ||
"version" "4.0.3" | ||
dependencies: | ||
"loose-envify" "^1.0.0" | ||
|
||
"watchpack@^2.4.0": | ||
"integrity" "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==" | ||
"resolved" "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz" | ||
|
4b23703
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Coverage Report
4b23703
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Coverage Report
4b23703
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Coverage Report