diff --git a/client/package-lock.json b/client/package-lock.json index 792b216..f356831 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -11,9 +11,18 @@ "@testing-library/jest-dom": "^5.17.0", "@testing-library/react": "^13.4.0", "@testing-library/user-event": "^13.5.0", + "axios": "^1.5.0", + "bootstrap": "^5.3.1", + "bootstrap-icons": "^1.11.0", "react": "^18.2.0", + "react-bootstrap": "^2.8.0", "react-dom": "^18.2.0", + "react-icons": "^4.11.0", + "react-router-dom": "^6.15.0", "react-scripts": "5.0.1", + "react-social-icons": "^6.4.0", + "react-spinners": "^0.13.8", + "react-toastify": "^9.1.3", "web-vitals": "^2.1.4" }, "devDependencies": { @@ -3249,6 +3258,76 @@ } } }, + "node_modules/@popperjs/core": { + "version": "2.11.8", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz", + "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/popperjs" + } + }, + "node_modules/@react-aria/ssr": { + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/@react-aria/ssr/-/ssr-3.8.0.tgz", + "integrity": "sha512-Y54xs483rglN5DxbwfCPHxnkvZ+gZ0LbSYmR72LyWPGft8hN/lrl1VRS1EW2SMjnkEWlj+Km2mwvA3kEHDUA0A==", + "dependencies": { + "@swc/helpers": "^0.5.0" + }, + "engines": { + "node": ">= 12" + }, + "peerDependencies": { + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" + } + }, + "node_modules/@remix-run/router": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.9.0.tgz", + "integrity": "sha512-bV63itrKBC0zdT27qYm6SDZHlkXwFL1xMBuhkn+X7l0+IIhNaH5wuuvZKp6eKhCD4KFhujhfhCT1YxXW6esUIA==", + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@restart/hooks": { + "version": "0.4.11", + "resolved": "https://registry.npmjs.org/@restart/hooks/-/hooks-0.4.11.tgz", + "integrity": "sha512-Ft/ncTULZN6ldGHiF/k5qt72O8JyRMOeg0tApvCni8LkoiEahO+z3TNxfXIVGy890YtWVDvJAl662dVJSJXvMw==", + "dependencies": { + "dequal": "^2.0.3" + }, + "peerDependencies": { + "react": ">=16.8.0" + } + }, + "node_modules/@restart/ui": { + "version": "1.6.6", + "resolved": "https://registry.npmjs.org/@restart/ui/-/ui-1.6.6.tgz", + "integrity": "sha512-eC3puKuWE1SRYbojWHXnvCNHGgf3uzHCb6JOhnF4OXPibOIPEkR1sqDSkL643ydigxwh+ruCa1CmYHlzk7ikKA==", + "dependencies": { + "@babel/runtime": "^7.21.0", + "@popperjs/core": "^2.11.6", + "@react-aria/ssr": "^3.5.0", + "@restart/hooks": "^0.4.9", + "@types/warning": "^3.0.0", + "dequal": "^2.0.3", + "dom-helpers": "^5.2.0", + "uncontrollable": "^8.0.1", + "warning": "^4.0.3" + }, + "peerDependencies": { + "react": ">=16.14.0", + "react-dom": ">=16.14.0" + } + }, + "node_modules/@restart/ui/node_modules/uncontrollable": { + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/uncontrollable/-/uncontrollable-8.0.4.tgz", + "integrity": "sha512-ulRWYWHvscPFc0QQXvyJjY6LIXU56f0h8pQFvhxiKk5V1fcI8gp9Ht9leVAhrVjzqMw0BgjspBINx9r6oyJUvQ==", + "peerDependencies": { + "react": ">=16.14.0" + } + }, "node_modules/@rollup/plugin-babel": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz", @@ -3567,6 +3646,14 @@ "url": "https://github.com/sponsors/gregberge" } }, + "node_modules/@swc/helpers": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.2.tgz", + "integrity": "sha512-E4KcWTpoLHqwPHLxidpOqQbcrZVgi0rsmmZXUle1jXmJfuIf/UWpczUJ7MZZ5tlxytgJXyp0w4PGkkeLiuIdZw==", + "dependencies": { + "tslib": "^2.4.0" + } + }, "node_modules/@testing-library/dom": { "version": "9.3.3", "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-9.3.3.tgz", @@ -4357,6 +4444,14 @@ "@types/react": "*" } }, + "node_modules/@types/react-transition-group": { + "version": "4.4.7", + "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.7.tgz", + "integrity": "sha512-ICCyBl5mvyqYp8Qeq9B5G/fyBSRC0zx3XM3sCC6KkcMsNeAHqXBKkmat4GqdJET5jtYUpZXrxI5flve5qhi2Eg==", + "dependencies": { + "@types/react": "*" + } + }, "node_modules/@types/resolve": { "version": "1.17.1", "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz", @@ -4433,6 +4528,11 @@ "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.4.tgz", "integrity": "sha512-IDaobHimLQhjwsQ/NMwRVfa/yL7L/wriQPMhw1ZJall0KX6E1oxk29XMDeilW5qTIg5aoiqf5Udy8U/51aNoQQ==" }, + "node_modules/@types/warning": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@types/warning/-/warning-3.0.1.tgz", + "integrity": "sha512-ywJmriP+nvjBKNBEMaNZgj2irZHoxcKeYcyMLbqhYKbDVn8yCIULy2Ol/tvIb37O3IBeZj3RU4tXqQTtGwoAMg==" + }, "node_modules/@types/ws": { "version": "8.5.6", "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.6.tgz", @@ -5293,6 +5393,29 @@ "node": ">=4" } }, + "node_modules/axios": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz", + "integrity": "sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==", + "dependencies": { + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, + "node_modules/axios/node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/axobject-query": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.2.1.tgz", @@ -5698,6 +5821,39 @@ "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==" }, + "node_modules/bootstrap": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.2.tgz", + "integrity": "sha512-D32nmNWiQHo94BKHLmOrdjlL05q1c8oxbtBphQFb9Z5to6eGRDCm0QgeaZ4zFBHzfg2++rqa2JkqCcxDy0sH0g==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/twbs" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/bootstrap" + } + ], + "peerDependencies": { + "@popperjs/core": "^2.11.8" + } + }, + "node_modules/bootstrap-icons": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.11.1.tgz", + "integrity": "sha512-F0DDp7nKUX+x/QtpfRZ+XHFya60ng9nfdpdS59vDDfs4Uhuxp7zym/QavMsu/xx51txkoM9eVmpE7D08N35blw==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/twbs" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/bootstrap" + } + ] + }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -5962,6 +6118,11 @@ "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz", "integrity": "sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==" }, + "node_modules/classnames": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz", + "integrity": "sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==" + }, "node_modules/clean-css": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.2.tgz", @@ -5991,6 +6152,14 @@ "wrap-ansi": "^7.0.0" } }, + "node_modules/clsx": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz", + "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==", + "engines": { + "node": ">=6" + } + }, "node_modules/co": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", @@ -6924,6 +7093,15 @@ "utila": "~0.4" } }, + "node_modules/dom-helpers": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz", + "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==", + "dependencies": { + "@babel/runtime": "^7.8.7", + "csstype": "^3.0.2" + } + }, "node_modules/dom-serializer": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz", @@ -9292,6 +9470,14 @@ "node": ">= 0.4" } }, + "node_modules/invariant": { + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", + "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", + "dependencies": { + "loose-envify": "^1.0.0" + } + }, "node_modules/ipaddr.js": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.1.0.tgz", @@ -14373,6 +14559,23 @@ "react-is": "^16.13.1" } }, + "node_modules/prop-types-extra": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/prop-types-extra/-/prop-types-extra-1.1.1.tgz", + "integrity": "sha512-59+AHNnHYCdiC+vMwY52WmvP5dM3QLeoumYuEyceQDi9aEhtwN9zIQ2ZNo25sMyXnbh32h+P1ezDsUpUH3JAew==", + "dependencies": { + "react-is": "^16.3.2", + "warning": "^4.0.0" + }, + "peerDependencies": { + "react": ">=0.14.0" + } + }, + "node_modules/prop-types-extra/node_modules/react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" + }, "node_modules/prop-types/node_modules/react-is": { "version": "16.13.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", @@ -14398,6 +14601,11 @@ "node": ">= 0.10" } }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, "node_modules/psl": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", @@ -14547,6 +14755,35 @@ "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==" }, + "node_modules/react-bootstrap": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-2.9.0.tgz", + "integrity": "sha512-dGh6fGjqR9MBzPOp2KbXJznt1Zy6SWepXYUdxMT18Zu/wJ73HCU8JNZe9dfzjmVssZYsJH9N3HHE4wAtQvNz7g==", + "dependencies": { + "@babel/runtime": "^7.22.5", + "@restart/hooks": "^0.4.9", + "@restart/ui": "^1.6.6", + "@types/react-transition-group": "^4.4.6", + "classnames": "^2.3.2", + "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.5", + "uncontrollable": "^7.2.1", + "warning": "^4.0.3" + }, + "peerDependencies": { + "@types/react": ">=16.14.8", + "react": ">=16.14.0", + "react-dom": ">=16.14.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, "node_modules/react-dev-utils": { "version": "12.0.1", "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-12.0.1.tgz", @@ -14681,11 +14918,24 @@ "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz", "integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg==" }, + "node_modules/react-icons": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.11.0.tgz", + "integrity": "sha512-V+4khzYcE5EBk/BvcuYRq6V/osf11ODUM2J8hg2FDSswRrGvqiYUYPRy4OdrWaQOBj4NcpJfmHZLNaD+VH0TyA==", + "peerDependencies": { + "react": "*" + } + }, "node_modules/react-is": { "version": "17.0.2", "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==" }, + "node_modules/react-lifecycles-compat": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz", + "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" + }, "node_modules/react-refresh": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.11.0.tgz", @@ -14694,6 +14944,36 @@ "node": ">=0.10.0" } }, + "node_modules/react-router": { + "version": "6.16.0", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.16.0.tgz", + "integrity": "sha512-VT4Mmc4jj5YyjpOi5jOf0I+TYzGpvzERy4ckNSvSh2RArv8LLoCxlsZ2D+tc7zgjxcY34oTz2hZaeX5RVprKqA==", + "dependencies": { + "@remix-run/router": "1.9.0" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "react": ">=16.8" + } + }, + "node_modules/react-router-dom": { + "version": "6.16.0", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.16.0.tgz", + "integrity": "sha512-aTfBLv3mk/gaKLxgRDUPbPw+s4Y/O+ma3rEN1u8EgEpLpPe6gNjIsWt9rxushMHHMb7mSwxRGdGlGdvmFsyPIg==", + "dependencies": { + "@remix-run/router": "1.9.0", + "react-router": "6.16.0" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "react": ">=16.8", + "react-dom": ">=16.8" + } + }, "node_modules/react-scripts": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-5.0.1.tgz", @@ -14766,6 +15046,56 @@ } } }, + "node_modules/react-social-icons": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/react-social-icons/-/react-social-icons-6.4.0.tgz", + "integrity": "sha512-8kLSp7yWB4GjWk9mDZc+u7qAkAF5lxuWLnolwRQ7KoUgQfjnxpFcuSSyda/Klt+HkqtFMiOJ+/Qtgq73vwc6BQ==", + "dependencies": { + "@babel/runtime": "^7.22.11", + "react": "^18.2.0", + "react-dom": "^18.2.0" + }, + "peerDependencies": { + "react": "15.x.x || 16.x.x || 17.x.x || 18.x.x", + "react-dom": "15.x.x || 16.x.x || 17.x.x || 18.x.x" + } + }, + "node_modules/react-spinners": { + "version": "0.13.8", + "resolved": "https://registry.npmjs.org/react-spinners/-/react-spinners-0.13.8.tgz", + "integrity": "sha512-3e+k56lUkPj0vb5NDXPVFAOkPC//XyhKPJjvcGjyMNPWsBKpplfeyialP74G7H7+It7KzhtET+MvGqbKgAqpZA==", + "peerDependencies": { + "react": "^16.0.0 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.0.0 || ^17.0.0 || ^18.0.0" + } + }, + "node_modules/react-toastify": { + "version": "9.1.3", + "resolved": "https://registry.npmjs.org/react-toastify/-/react-toastify-9.1.3.tgz", + "integrity": "sha512-fPfb8ghtn/XMxw3LkxQBk3IyagNpF/LIKjOBflbexr2AWxAH1MJgvnESwEwBn9liLFXgTKWgBSdZpw9m4OTHTg==", + "dependencies": { + "clsx": "^1.1.1" + }, + "peerDependencies": { + "react": ">=16", + "react-dom": ">=16" + } + }, + "node_modules/react-transition-group": { + "version": "4.4.5", + "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz", + "integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==", + "dependencies": { + "@babel/runtime": "^7.5.5", + "dom-helpers": "^5.0.1", + "loose-envify": "^1.4.0", + "prop-types": "^15.6.2" + }, + "peerDependencies": { + "react": ">=16.6.0", + "react-dom": ">=16.6.0" + } + }, "node_modules/read-cache": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz", @@ -16692,6 +17022,20 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/uncontrollable": { + "version": "7.2.1", + "resolved": "https://registry.npmjs.org/uncontrollable/-/uncontrollable-7.2.1.tgz", + "integrity": "sha512-svtcfoTADIB0nT9nltgjujTi7BzVmwjZClOmskKu/E8FW9BXzg9os8OLr4f8Dlnk0rYWJIWr4wv9eKUXiQvQwQ==", + "dependencies": { + "@babel/runtime": "^7.6.3", + "@types/react": ">=16.9.11", + "invariant": "^2.2.4", + "react-lifecycles-compat": "^3.0.4" + }, + "peerDependencies": { + "react": ">=15.0.0" + } + }, "node_modules/underscore": { "version": "1.12.1", "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.12.1.tgz", @@ -16914,6 +17258,14 @@ "makeerror": "1.0.12" } }, + "node_modules/warning": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz", + "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==", + "dependencies": { + "loose-envify": "^1.0.0" + } + }, "node_modules/watchpack": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz", diff --git a/client/package.json b/client/package.json index 2f13628..eb780f5 100644 --- a/client/package.json +++ b/client/package.json @@ -6,9 +6,18 @@ "@testing-library/jest-dom": "^5.17.0", "@testing-library/react": "^13.4.0", "@testing-library/user-event": "^13.5.0", + "axios": "^1.5.0", + "bootstrap": "^5.3.1", + "bootstrap-icons": "^1.11.0", "react": "^18.2.0", + "react-bootstrap": "^2.8.0", "react-dom": "^18.2.0", + "react-icons": "^4.11.0", + "react-router-dom": "^6.15.0", "react-scripts": "5.0.1", + "react-social-icons": "^6.4.0", + "react-spinners": "^0.13.8", + "react-toastify": "^9.1.3", "web-vitals": "^2.1.4" }, "scripts": { diff --git a/client/src/App.js b/client/src/App.js index 3784575..92f83f8 100644 --- a/client/src/App.js +++ b/client/src/App.js @@ -1,23 +1,14 @@ -import logo from './logo.svg'; -import './App.css'; +import { Hero, DescriptionComp } from "./components"; function App() { return ( -
-
- logo -

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

- - Learn React - -
+
+
+ +
+
+ +
); } diff --git a/client/src/App.test.js b/client/src/App.test.js deleted file mode 100644 index 1f03afe..0000000 --- a/client/src/App.test.js +++ /dev/null @@ -1,8 +0,0 @@ -import { render, screen } from '@testing-library/react'; -import App from './App'; - -test('renders learn react link', () => { - render(); - const linkElement = screen.getByText(/learn react/i); - expect(linkElement).toBeInTheDocument(); -}); diff --git a/client/src/assets/Facebook.png b/client/src/assets/Facebook.png new file mode 100644 index 0000000..db9f8c2 Binary files /dev/null and b/client/src/assets/Facebook.png differ diff --git a/client/src/assets/LinkedIn.png b/client/src/assets/LinkedIn.png new file mode 100644 index 0000000..5806d14 Binary files /dev/null and b/client/src/assets/LinkedIn.png differ diff --git a/client/src/assets/Twitter.png b/client/src/assets/Twitter.png new file mode 100644 index 0000000..c31e5af Binary files /dev/null and b/client/src/assets/Twitter.png differ diff --git a/client/src/assets/WhatsApp.png b/client/src/assets/WhatsApp.png new file mode 100644 index 0000000..715e2dd Binary files /dev/null and b/client/src/assets/WhatsApp.png differ diff --git a/client/src/assets/bg.png b/client/src/assets/bg.png new file mode 100644 index 0000000..25456dc Binary files /dev/null and b/client/src/assets/bg.png differ diff --git a/client/src/assets/bg_blackcover.png b/client/src/assets/bg_blackcover.png new file mode 100644 index 0000000..469c216 Binary files /dev/null and b/client/src/assets/bg_blackcover.png differ diff --git a/client/src/assets/index.js b/client/src/assets/index.js new file mode 100644 index 0000000..d508a99 --- /dev/null +++ b/client/src/assets/index.js @@ -0,0 +1,7 @@ +// export { default as stop } from "./stop.png"; +export { default as bg } from "./bg.png"; +export { default as bgblackcover } from "./bg_blackcover.png"; +export { default as Facebook } from "./Facebook.png"; +export { default as LinkedIn } from "./LinkedIn.png"; +export { default as Twitter } from "./Twitter.png"; +export { default as WhatsApp } from "./WhatsApp.png"; diff --git a/client/src/components/DescriptionComp/DescriptionComp.css b/client/src/components/DescriptionComp/DescriptionComp.css new file mode 100644 index 0000000..74c0675 --- /dev/null +++ b/client/src/components/DescriptionComp/DescriptionComp.css @@ -0,0 +1,45 @@ +.desc-header { + color: #000; + /* Heading */ + font-family: var(--font-family); + font-size: 24px; + font-style: normal; + font-weight: 700; + line-height: normal; +} + +.desc-para { + color: var(--gray-600, #7E7E7E); + /* Body Text */ + font-family: var(--font-family); + font-size: 16px; + font-style: normal; + font-weight: 400; + line-height: normal; + text-align: start; +} + +.time { + color: var(--Primary, #7848F4); + /* Sub-Heading */ + font-family: var(--font-family); + font-size: 18px; + font-style: normal; + font-weight: 700; + line-height: normal; + padding: 20px; +} + +.tags { + display: inline-flex; + padding: 10px; + justify-content: center; + align-items: center; + gap: 10px; + border-radius: 5px; + background: var(--Background-Grey, #F8F8FA); +} + +.social-icons { + margin: 0; +} \ No newline at end of file diff --git a/client/src/components/DescriptionComp/DescriptionComp.jsx b/client/src/components/DescriptionComp/DescriptionComp.jsx new file mode 100644 index 0000000..1cdbb8c --- /dev/null +++ b/client/src/components/DescriptionComp/DescriptionComp.jsx @@ -0,0 +1,56 @@ +import React from 'react' +import './DescriptionComp.css' +import { SocialIcon } from 'react-social-icons' + +const DescriptionComp = () => { + return ( +
+
+
+ + DesignHub organized a 3D Modeling Workshop using Blender on 16th February at 5 PM. The workshop taught participants the magic of creating stunning 3D models and animations using Blender. It was suitable for both beginners and experienced users. The event was followed by a blender-render competition, which added to the excitement.

DesignHub organized a 3D Modeling Workshop using Blender on 16th February at 5 PM. The workshop taught participants the magic of creating stunning 3D models and animations using Blender. It was suitable for both beginners and experienced users. The event was followed by a blender-render competition, which added to the excitement. +
+
+ + Weekdays hour:7PM - 10PM + Sunday hour:7PM - 10PM +
+
+ + Please go to www.solvifynmit.com and refer the FAQ section for more detail +
+
+
+
+ +
+ {/* */} + NMIT Basketball court +
+
+
+ +
+ NMIT event + Solvify club + UI + Solvify event + Seminar + Jaskaran event +
+
+
+ +
+ + + + +
+
+
+
+ ) +} + +export default DescriptionComp \ No newline at end of file diff --git a/client/src/App.css b/client/src/components/Footer/Footer.css similarity index 100% rename from client/src/App.css rename to client/src/components/Footer/Footer.css diff --git a/client/src/components/Footer/Footer.jsx b/client/src/components/Footer/Footer.jsx new file mode 100644 index 0000000..a4ca1c2 --- /dev/null +++ b/client/src/components/Footer/Footer.jsx @@ -0,0 +1,10 @@ +import React from 'react' +import './Footer.css' + +const Footer = () => { + return ( +
Footer
+ ) +} + +export default Footer \ No newline at end of file diff --git a/client/src/components/Hero/Hero.css b/client/src/components/Hero/Hero.css new file mode 100644 index 0000000..27a1122 --- /dev/null +++ b/client/src/components/Hero/Hero.css @@ -0,0 +1,122 @@ +.heroDiv { + background-image: url("../../assets/bg.png"), url("../../assets/bg_blackcover.png"); + /* background-color: #fff; */ + background-blend-mode: multiply; + background-size: cover; + background-position: center; + background-repeat: no-repeat; + width: 100%; + height: 595px; + /* opacity: 0.8; */ +} + +.main-heading { + color: var(--White, #FFF); + font-family: var(--font-family); + font-size: 64px; + font-style: normal; + font-weight: 700; + line-height: normal; +} + +.rsvp { + width: 385px; + height: 338px; + border-radius: 10px; + background: var(--White, #FFF); + /* margin-top: 129px; */ + + /* Shadow / 4 px */ + box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.10); +} + +.heading { + color: var(--White, #FFF); + + /* Big-Heading */ + font-family: var(--font-family); + font-size: 36px; + font-style: normal; + font-weight: 700; + line-height: normal; +} + +.para { + color: var(--White, #FFF); + + /* Body Text */ + font-family: var(--font-family); + font-size: 16px; + font-style: normal; + font-weight: 400; + line-height: normal; +} + +.heading3 { + color: #000; + + /* Heading */ + font-family: var(--font-family); + font-size: 24px; + font-style: normal; + font-weight: 700; + line-height: normal; + padding-top: 30px; + padding-left: 30px; + padding-bottom: 20px; +} + +.date-time { + color: var(--gray-600, #7E7E7E); + font-family: var(--font-family); + font-size: 18px; + font-style: normal; + font-weight: 400; + line-height: normal; + padding-left: 30px; +} + +.price { + color: var(--main-design-primary-color, #00296B); + + /* Body Text */ + font-family: var(--font-family); + font-size: 20px; + font-style: normal; + font-weight: 600; + line-height: normal; + padding-left: 30px; +} + +.register { + display: flex; + padding: 15px 40px; + justify-content: center; + align-items: center; + gap: 10px; + border-radius: 5px; + background: var(--main-design-primary-color, #00296B); + color: white; + margin: 30px; +} + +.calender { + color: var(--gray-600, #7E7E7E); + text-align: center; + + /* Body Text */ + font-family: Product Sans; + font-size: 16px; + font-style: normal; + font-weight: 400; + line-height: normal; + color: var(--gray-600, #7E7E7E); + text-align: center; + + /* Body Text */ + font-family: var(--font-family); + font-size: 16px; + font-style: normal; + font-weight: 400; + line-height: normal; +} \ No newline at end of file diff --git a/client/src/components/Hero/Hero.jsx b/client/src/components/Hero/Hero.jsx new file mode 100644 index 0000000..6f80d77 --- /dev/null +++ b/client/src/components/Hero/Hero.jsx @@ -0,0 +1,31 @@ +import React from 'react' +import './Hero.css' + +const Hero = () => { + return ( +
+
+ + Dream world wide + in NMIT +

Solvify

+

DesignHub organized a 3D Modeling Workshop using Blender on 16th February at 5 PM. The workshop taught participants the magic of creating stunning 3D models and animations using Blender. It was suitable for both beginners and experienced users. The event was followed by a blender-render competition, which added to the excitement.

+
+
+
+

Date & time

+

Saturday, March 18 2023, 9.30PM

+

Price - Rs 50

+ + Register + +

Add to calendar

+
+
+
+ ) +} + +export default Hero \ No newline at end of file diff --git a/client/src/components/NavBar/NavBar.css b/client/src/components/NavBar/NavBar.css new file mode 100644 index 0000000..e69de29 diff --git a/client/src/components/NavBar/NavBar.jsx b/client/src/components/NavBar/NavBar.jsx new file mode 100644 index 0000000..33a4dec --- /dev/null +++ b/client/src/components/NavBar/NavBar.jsx @@ -0,0 +1,10 @@ +import React from 'react' +import './NavBar.css' + +const NavBar = () => { + return ( +
NavBar
+ ) +} + +export default NavBar \ No newline at end of file diff --git a/client/src/components/index.js b/client/src/components/index.js new file mode 100644 index 0000000..987ad3a --- /dev/null +++ b/client/src/components/index.js @@ -0,0 +1,11 @@ +import NavBar from './NavBar/NavBar'; +import Hero from './Hero/Hero'; +import Footer from './Footer/Footer'; +import DescriptionComp from './DescriptionComp/DescriptionComp'; + +export { + NavBar, + Hero, + Footer, + DescriptionComp +} \ No newline at end of file diff --git a/client/src/index.css b/client/src/index.css index bd6213e..01a28b3 100644 --- a/client/src/index.css +++ b/client/src/index.css @@ -1,3 +1,48 @@ @tailwind base; @tailwind components; -@tailwind utilities; \ No newline at end of file +@tailwind utilities; + + + @import url('https://fonts.googleapis.com/css2?family=PT+Sans:wght@400;700&family=Poppins:wght@100;200;300;400;600;700&display=swap'); + + +/* @font-face { + font-family: 'Lucida'; + src: url('../src/assets/fonts/Lucida_font.ttf') format('truetype'); + font-weight: normal; + font-style: normal; +} */ + +:root { + --font-family: 'PT Sans', sans-serif; + --color-black: #0C0C0C; + --color-white: #FFFFFF; + --gradient: #699BF7; + --scroll: #EFEFEF; +} + +* { + box-sizing: border-box; + padding: 0; + margin: 0; + scroll-behavior: smooth; +} + +a { + color: unset; + text-decoration: none; +} + +/* body { + margin: 0; + font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', + 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', + sans-serif; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + } + + code { + font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', + monospace; + } */ \ No newline at end of file diff --git a/client/src/index.js b/client/src/index.js index d563c0f..5bad849 100644 --- a/client/src/index.js +++ b/client/src/index.js @@ -2,16 +2,11 @@ import React from 'react'; import ReactDOM from 'react-dom/client'; import './index.css'; import App from './App'; -import reportWebVitals from './reportWebVitals'; +import 'bootstrap/dist/css/bootstrap.min.css' const root = ReactDOM.createRoot(document.getElementById('root')); root.render( -); - -// If you want to start measuring performance in your app, pass a function -// to log results (for example: reportWebVitals(console.log)) -// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals -reportWebVitals(); +); \ No newline at end of file diff --git a/client/src/logo.svg b/client/src/logo.svg deleted file mode 100644 index 9dfc1c0..0000000 --- a/client/src/logo.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/client/src/pages/LandingPage/LandingPage.css b/client/src/pages/LandingPage/LandingPage.css new file mode 100644 index 0000000..e69de29 diff --git a/client/src/pages/LandingPage/LandingPage.jsx b/client/src/pages/LandingPage/LandingPage.jsx new file mode 100644 index 0000000..1e4e179 --- /dev/null +++ b/client/src/pages/LandingPage/LandingPage.jsx @@ -0,0 +1,10 @@ +import React from 'react' +import './LandingPage.css' + +const LandingPage = () => { + return ( +
LandingPage
+ ) +} + +export default LandingPage \ No newline at end of file diff --git a/client/src/reportWebVitals.js b/client/src/reportWebVitals.js deleted file mode 100644 index 5253d3a..0000000 --- a/client/src/reportWebVitals.js +++ /dev/null @@ -1,13 +0,0 @@ -const reportWebVitals = onPerfEntry => { - if (onPerfEntry && onPerfEntry instanceof Function) { - import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => { - getCLS(onPerfEntry); - getFID(onPerfEntry); - getFCP(onPerfEntry); - getLCP(onPerfEntry); - getTTFB(onPerfEntry); - }); - } -}; - -export default reportWebVitals; diff --git a/client/src/setupTests.js b/client/src/setupTests.js deleted file mode 100644 index 8f2609b..0000000 --- a/client/src/setupTests.js +++ /dev/null @@ -1,5 +0,0 @@ -// jest-dom adds custom jest matchers for asserting on DOM nodes. -// allows you to do things like: -// expect(element).toHaveTextContent(/react/i) -// learn more: https://github.com/testing-library/jest-dom -import '@testing-library/jest-dom'; diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..1906871 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,6 @@ +{ + "name": "UniEvents", + "lockfileVersion": 3, + "requires": true, + "packages": {} +} diff --git a/server/.gitignore b/server/.gitignore new file mode 100644 index 0000000..796cdf1 --- /dev/null +++ b/server/.gitignore @@ -0,0 +1,3 @@ +/node_modules +/package-lock.json +.env \ No newline at end of file diff --git a/server/index.js b/server/index.js new file mode 100644 index 0000000..a6b691e --- /dev/null +++ b/server/index.js @@ -0,0 +1,17 @@ +const express = require('express'); +const app = express(); +// const dotenv = require('dotenv'); + +// dotenv.config({ path: './.env' }) +// require('./db/conn'); + +// app.use(express.json()); + +// app.use(require('./router/auth')); + +const PORT = 3001; +// const PORT = process.env.PORT; + +app.listen(PORT, () => { + console.log(`server is running at port ${PORT}`) +}); \ No newline at end of file diff --git a/server/package.json b/server/package.json new file mode 100644 index 0000000..d565238 --- /dev/null +++ b/server/package.json @@ -0,0 +1,24 @@ +{ + "name": "server", + "version": "1.0.0", + "description": "", + "main": "app.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1", + "start": "nodemon app.js" + }, + "keywords": [], + "author": "", + "license": "ISC", + "dependencies": { + "bcryptjs": "^2.4.3", + "cookie-parser": "^1.4.5", + "dotenv": "^16.0.3", + "express": "^4.17.1", + "jsonwebtoken": "^8.5.1", + "mongoose": "^5.12.3", + "multer": "^1.4.5-lts.1", + "nodemon": "^2.0.7", + "unirest": "^0.6.0" + } +}