diff --git a/server/.gitignore b/server/.gitignore index 4d29575de80483b005c29bfcac5061cd2f45313e..e1153d480ebd46fd4f6e7f2c8941fc884cd98460 100644 --- a/server/.gitignore +++ b/server/.gitignore @@ -20,4 +20,8 @@ npm-debug.log* yarn-debug.log* +<<<<<<< HEAD yarn-error.log* +======= +yarn-error.log* +>>>>>>> origin/rkyoung7 diff --git a/server/client/package-lock.json b/server/client/package-lock.json index 2d2e7f34c4a4c810768581412ed9d93f4c52ecfa..90bb0cb745c17bb53f42923c3a36070091ccaa51 100644 --- a/server/client/package-lock.json +++ b/server/client/package-lock.json @@ -7791,11 +7791,14 @@ } } }, +<<<<<<< HEAD "jquery": { "version": "3.5.1", "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz", "integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==" }, +======= +>>>>>>> origin/rkyoung7 "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -9430,11 +9433,14 @@ "ts-pnp": "^1.1.6" } }, +<<<<<<< HEAD "popper.js": { "version": "1.16.1", "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz", "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==" }, +======= +>>>>>>> origin/rkyoung7 "portfinder": { "version": "1.0.28", "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz", diff --git a/server/client/package.json b/server/client/package.json index bcfac1e7b9ee1faeb2721f92944fd476ad50e2b7..85a85c2fca14ea65942d73e6118151f13bbd1c35 100644 --- a/server/client/package.json +++ b/server/client/package.json @@ -9,8 +9,11 @@ "axios": "^0.20.0", "bootstrap": "^4.5.2", "formik": "^2.1.5", +<<<<<<< HEAD "jquery": "^3.5.1", "popper.js": "^1.16.1", +======= +>>>>>>> origin/rkyoung7 "react": "^16.13.1", "react-dom": "^16.13.1", "react-router-dom": "^5.2.0", @@ -22,8 +25,12 @@ "start": "react-scripts start", "build": "react-scripts build", "test": "react-scripts test", +<<<<<<< HEAD "eject": "react-scripts eject", "proxy": "http://localhost:3030" +======= + "eject": "react-scripts eject" +>>>>>>> origin/rkyoung7 }, "eslintConfig": { "extends": "react-app" diff --git a/server/client/src/index.js b/server/client/src/index.js index dd72a8bbe2705354cc5899b3e63c2b54d911863d..444b9b57223c66447a88e8541a91f437587284a0 100644 --- a/server/client/src/index.js +++ b/server/client/src/index.js @@ -4,22 +4,30 @@ import * as serviceWorker from './serviceWorker'; import { BrowserRouter as Router, Route, Redirect, Switch } from 'react-router-dom'; import 'bootstrap/dist/css/bootstrap.css'; +<<<<<<< HEAD import Login from './Pages/LoginPage'; import Home from './Pages/HomePage'; import Signup from './Pages/SignupPage'; import Apply from './Pages/ApplyPage'; import Check from './Pages/CheckPage'; import Notice from './Pages/NoticePage'; +======= +import Login from './Pages/Login'; +import Home from './Pages/Home'; +>>>>>>> origin/rkyoung7 ReactDOM.render( +<<<<<<< HEAD +======= +>>>>>>> origin/rkyoung7 , document.getElementById('root') @@ -29,3 +37,7 @@ ReactDOM.render( // unregister() to register() below. Note this comes with some pitfalls. // Learn more about service workers: https://bit.ly/CRA-PWA serviceWorker.unregister(); +<<<<<<< HEAD +======= + +>>>>>>> origin/rkyoung7 diff --git a/server/package-lock.json b/server/package-lock.json index 82aaebdab7e4a29007afd77d86adf46a4e73fd53..ff15786a742cab29d3a9252d05949e2605ff4807 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -4,6 +4,7 @@ "lockfileVersion": 1, "requires": true, "dependencies": { +<<<<<<< HEAD "@types/babel-types": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.9.tgz", @@ -17,11 +18,14 @@ "@types/babel-types": "*" } }, +======= +>>>>>>> origin/rkyoung7 "abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" }, +<<<<<<< HEAD "accepts": { "version": "1.3.7", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", @@ -66,6 +70,8 @@ "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=" }, +======= +>>>>>>> origin/rkyoung7 "ansi-regex": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", @@ -85,6 +91,7 @@ "readable-stream": "^2.0.6" } }, +<<<<<<< HEAD "array-flatten": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", @@ -120,11 +127,14 @@ "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==" }, +======= +>>>>>>> origin/rkyoung7 "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" }, +<<<<<<< HEAD "basic-auth": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz", @@ -140,6 +150,8 @@ } } }, +======= +>>>>>>> origin/rkyoung7 "bcrypt": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-5.0.0.tgz", @@ -163,6 +175,7 @@ "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz", "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==" }, +<<<<<<< HEAD "body-parser": { "version": "1.18.3", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz", @@ -190,6 +203,8 @@ } } }, +======= +>>>>>>> origin/rkyoung7 "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -204,6 +219,7 @@ "resolved": "https://registry.npmjs.org/bson/-/bson-1.1.5.tgz", "integrity": "sha512-kDuEzldR21lHciPQAIulLs1LZlCXdLziXI6Mb/TDkwXhb//UORJNPXgcRs2CuO4H0DcMkpfT3/ySsP3unoZjBg==" }, +<<<<<<< HEAD "buffer-equal-constant-time": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", @@ -236,11 +252,14 @@ "is-regex": "^1.0.3" } }, +======= +>>>>>>> origin/rkyoung7 "chownr": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==" }, +<<<<<<< HEAD "clean-css": { "version": "3.4.28", "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-3.4.28.tgz", @@ -260,11 +279,14 @@ "wordwrap": "0.0.2" } }, +======= +>>>>>>> origin/rkyoung7 "code-point-at": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" }, +<<<<<<< HEAD "commander": { "version": "2.8.1", "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz", @@ -273,6 +295,8 @@ "graceful-readlink": ">= 1.0.0" } }, +======= +>>>>>>> origin/rkyoung7 "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -283,6 +307,7 @@ "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" }, +<<<<<<< HEAD "constantinople": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/constantinople/-/constantinople-3.1.2.tgz", @@ -328,11 +353,14 @@ "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz", "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==" }, +======= +>>>>>>> origin/rkyoung7 "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, +<<<<<<< HEAD "debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -353,6 +381,8 @@ "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" }, +======= +>>>>>>> origin/rkyoung7 "deep-extend": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", @@ -368,6 +398,7 @@ "resolved": "https://registry.npmjs.org/denque/-/denque-1.4.1.tgz", "integrity": "sha512-OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ==" }, +<<<<<<< HEAD "depd": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", @@ -378,21 +409,27 @@ "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" }, +======= +>>>>>>> origin/rkyoung7 "detect-libc": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=" }, +<<<<<<< HEAD "doctypes": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/doctypes/-/doctypes-1.1.0.tgz", "integrity": "sha1-6oCxBqh1OHdOijpKWv4pPeSJ4Kk=" }, +======= +>>>>>>> origin/rkyoung7 "dotenv": { "version": "8.2.0", "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz", "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==" }, +<<<<<<< HEAD "ecdsa-sig-formatter": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", @@ -499,6 +536,8 @@ "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=" }, +======= +>>>>>>> origin/rkyoung7 "fs-minipass": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz", @@ -540,6 +579,7 @@ "path-is-absolute": "^1.0.0" } }, +<<<<<<< HEAD "graceful-readlink": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", @@ -550,11 +590,14 @@ "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==" }, +======= +>>>>>>> origin/rkyoung7 "has-unicode": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=" }, +<<<<<<< HEAD "http-errors": { "version": "1.6.3", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", @@ -573,6 +616,8 @@ } } }, +======= +>>>>>>> origin/rkyoung7 "iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", @@ -608,6 +653,7 @@ "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==" }, +<<<<<<< HEAD "ipaddr.js": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", @@ -634,6 +680,8 @@ } } }, +======= +>>>>>>> origin/rkyoung7 "is-fullwidth-code-point": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", @@ -642,6 +690,7 @@ "number-is-nan": "^1.0.0" } }, +<<<<<<< HEAD "is-promise": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz", @@ -655,11 +704,14 @@ "has-symbols": "^1.0.1" } }, +======= +>>>>>>> origin/rkyoung7 "isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" }, +<<<<<<< HEAD "js-stringify": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/js-stringify/-/js-stringify-1.0.2.tgz", @@ -710,11 +762,14 @@ "safe-buffer": "^5.0.1" } }, +======= +>>>>>>> origin/rkyoung7 "kareem": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.3.1.tgz", "integrity": "sha512-l3hLhffs9zqoDe8zjmb/mAN4B8VT3L56EUvKNqLFVs9YlFA+zx7ke1DO8STAdDyYNkeSo1nKmjuvQeI12So8Xw==" }, +<<<<<<< HEAD "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", @@ -778,12 +833,15 @@ "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=" }, +======= +>>>>>>> origin/rkyoung7 "memory-pager": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz", "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==", "optional": true }, +<<<<<<< HEAD "merge-descriptors": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", @@ -812,6 +870,8 @@ "mime-db": "1.44.0" } }, +======= +>>>>>>> origin/rkyoung7 "minimatch": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", @@ -886,6 +946,7 @@ "resolved": "https://registry.npmjs.org/mongoose-legacy-pluralize/-/mongoose-legacy-pluralize-1.0.2.tgz", "integrity": "sha512-Yo/7qQU4/EyIS8YDFSeenIvXxZN+ld7YdV9LqFVQJzTLye8unujAWPZ4NWKfFA+RNjh+wvTWKY9Z3E5XM6ZZiQ==" }, +<<<<<<< HEAD "morgan": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.9.1.tgz", @@ -898,6 +959,8 @@ "on-headers": "~1.0.1" } }, +======= +>>>>>>> origin/rkyoung7 "mpath": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/mpath/-/mpath-0.7.0.tgz", @@ -960,11 +1023,14 @@ } } }, +<<<<<<< HEAD "negotiator": { "version": "0.6.2", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==" }, +======= +>>>>>>> origin/rkyoung7 "node-addon-api": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.0.0.tgz", @@ -1040,6 +1106,7 @@ "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" }, +<<<<<<< HEAD "on-finished": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", @@ -1053,6 +1120,8 @@ "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==" }, +======= +>>>>>>> origin/rkyoung7 "once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -1080,16 +1149,20 @@ "os-tmpdir": "^1.0.0" } }, +<<<<<<< HEAD "parseurl": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==" }, +======= +>>>>>>> origin/rkyoung7 "path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, +<<<<<<< HEAD "path-parse": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", @@ -1100,11 +1173,14 @@ "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" }, +======= +>>>>>>> origin/rkyoung7 "process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" }, +<<<<<<< HEAD "promise": { "version": "7.3.1", "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", @@ -1267,6 +1343,8 @@ } } }, +======= +>>>>>>> origin/rkyoung7 "rc": { "version": "1.2.8", "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", @@ -1299,21 +1377,27 @@ } } }, +<<<<<<< HEAD "regenerator-runtime": { "version": "0.11.1", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==" }, +======= +>>>>>>> origin/rkyoung7 "regexp-clone": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/regexp-clone/-/regexp-clone-1.0.0.tgz", "integrity": "sha512-TuAasHQNamyyJ2hb97IuBEif4qBHGjPHBS64sZwytpLEqtBQ1gPJTnOaQ6qmpET16cK14kkjbazl6+p0RRv0yw==" }, +<<<<<<< HEAD "repeat-string": { "version": "1.6.1", "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=" }, +======= +>>>>>>> origin/rkyoung7 "require_optional": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz", @@ -1323,6 +1407,7 @@ "semver": "^5.1.0" } }, +<<<<<<< HEAD "resolve": { "version": "1.17.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", @@ -1331,11 +1416,14 @@ "path-parse": "^1.0.6" } }, +======= +>>>>>>> origin/rkyoung7 "resolve-from": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz", "integrity": "sha1-lICrIOlP+h2egKgEx+oUdhGWa1c=" }, +<<<<<<< HEAD "right-align": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", @@ -1344,6 +1432,8 @@ "align-text": "^0.1.1" } }, +======= +>>>>>>> origin/rkyoung7 "rimraf": { "version": "2.7.1", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", @@ -1381,6 +1471,7 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" }, +<<<<<<< HEAD "send": { "version": "0.16.2", "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz", @@ -1419,16 +1510,21 @@ "send": "0.16.2" } }, +======= +>>>>>>> origin/rkyoung7 "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" }, +<<<<<<< HEAD "setprototypeof": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==" }, +======= +>>>>>>> origin/rkyoung7 "sift": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/sift/-/sift-7.0.1.tgz", @@ -1444,6 +1540,7 @@ "resolved": "https://registry.npmjs.org/sliced/-/sliced-1.0.1.tgz", "integrity": "sha1-CzpmK10Ewxd7GSa+qCsD+Dei70E=" }, +<<<<<<< HEAD "source-map": { "version": "0.4.4", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", @@ -1452,6 +1549,8 @@ "amdefine": ">=0.0.4" } }, +======= +>>>>>>> origin/rkyoung7 "sparse-bitfield": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz", @@ -1461,11 +1560,14 @@ "memory-pager": "^1.0.2" } }, +<<<<<<< HEAD "statuses": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz", "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==" }, +======= +>>>>>>> origin/rkyoung7 "string-width": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", @@ -1518,6 +1620,7 @@ "yallist": "^3.0.3" } }, +<<<<<<< HEAD "to-fast-properties": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", @@ -1565,11 +1668,14 @@ "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=" }, +======= +>>>>>>> origin/rkyoung7 "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, +<<<<<<< HEAD "utils-merge": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", @@ -1585,6 +1691,8 @@ "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz", "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=" }, +======= +>>>>>>> origin/rkyoung7 "wide-align": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", @@ -1593,6 +1701,7 @@ "string-width": "^1.0.2 || 2" } }, +<<<<<<< HEAD "window-size": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", @@ -1612,6 +1721,8 @@ "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=" }, +======= +>>>>>>> origin/rkyoung7 "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", @@ -1621,6 +1732,7 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" +<<<<<<< HEAD }, "yargs": { "version": "3.10.0", @@ -1632,6 +1744,8 @@ "decamelize": "^1.0.0", "window-size": "0.1.0" } +======= +>>>>>>> origin/rkyoung7 } } } diff --git a/server/package.json b/server/package.json index 7ab083d2fcdb0dbda6a7b6822c6c8901cd113762..34b10b20cebbb384815c7e814da8b0fa13b79868 100644 --- a/server/package.json +++ b/server/package.json @@ -12,7 +12,10 @@ "dotenv": "^8.2.0", "express": "~4.16.1", "http-errors": "~1.6.3", +<<<<<<< HEAD "jsonwebtoken": "^8.5.1", +======= +>>>>>>> origin/rkyoung7 "mongoose": "^5.10.5", "morgan": "~1.9.1", "pug": "2.0.0-beta11" diff --git a/server/schemas/index.js b/server/schemas/index.js index b88c183c9756af7e9299dd8ad0ea8774ca1df1a8..823e5a1e0f0e3b4cc785f3453df68da7b6093c33 100644 --- a/server/schemas/index.js +++ b/server/schemas/index.js @@ -5,7 +5,11 @@ module.exports = () => { if (process.env.NODE_ENV !== 'production') { mongoose.set('debug', true); } +<<<<<<< HEAD mongoose.connect('mongodb://hijinju:highlight@localhost:27017/admin', { +======= + mongoose.connect('mongodb://rkyoung7:rkdud127@localhost:27017/admin', { +>>>>>>> origin/rkyoung7 dbName: 'KU_Rental', }, (error) => { if (error) { @@ -26,4 +30,8 @@ module.exports = () => { require('./user'); require('./reserve'); +<<<<<<< HEAD }; +======= +}; +>>>>>>> origin/rkyoung7 diff --git a/server/schemas/reserve.js b/server/schemas/reserve.js index c4d05a045a4aaf7b4a0b2ff1e636182d66b85a6c..196ffe7232dd798aad317ce232ffa6028d341464 100644 --- a/server/schemas/reserve.js +++ b/server/schemas/reserve.js @@ -41,4 +41,8 @@ const reserveSchema = new Schema({ }); +<<<<<<< HEAD module.exports = mongoose.model('Reserve', reserveSchema); +======= +module.exports = mongoose.model('Reserve', reserveSchema); +>>>>>>> origin/rkyoung7 diff --git a/server/views/error.pug b/server/views/error.pug new file mode 100644 index 0000000000000000000000000000000000000000..51ec12c6a26323d9f5bc51fb98cb1324a739ea4c --- /dev/null +++ b/server/views/error.pug @@ -0,0 +1,6 @@ +extends layout + +block content + h1= message + h2= error.status + pre #{error.stack} diff --git a/server/views/index.pug b/server/views/index.pug new file mode 100644 index 0000000000000000000000000000000000000000..3d63b9a044a859b59259d5e23dd4e68ec8e1f2be --- /dev/null +++ b/server/views/index.pug @@ -0,0 +1,5 @@ +extends layout + +block content + h1= title + p Welcome to #{title} diff --git a/server/views/layout.pug b/server/views/layout.pug new file mode 100644 index 0000000000000000000000000000000000000000..15af079bf7c34e638ba14844efd979ac9111628b --- /dev/null +++ b/server/views/layout.pug @@ -0,0 +1,7 @@ +doctype html +html + head + title= title + link(rel='stylesheet', href='/stylesheets/style.css') + body + block content