From 5ce52f82a64f42bfd2b635c2cf3d91e6de1c8290 Mon Sep 17 00:00:00 2001 From: Sorin Iordosopol Date: Sat, 30 Sep 2023 12:49:58 -0400 Subject: [PATCH] Changed favicon src --- client/index.html | 2 +- client/package-lock.json | 19 ++------ client/package.json | 2 +- client/public/favicon.ico | Bin 0 -> 15406 bytes client/src/pages/Login/Login.tsx | 14 +++++- service/package-lock.json | 72 ++++++++++++------------------- service/package.json | 2 +- 7 files changed, 47 insertions(+), 64 deletions(-) create mode 100644 client/public/favicon.ico diff --git a/client/index.html b/client/index.html index 8fdf47d..fca14b1 100644 --- a/client/index.html +++ b/client/index.html @@ -2,7 +2,7 @@ - + Hack The Tunnels Project diff --git a/client/package-lock.json b/client/package-lock.json index 31e5e65..65a2c4b 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -15,7 +15,7 @@ "react-dom": "^18.2.0", "react-router-dom": "^6.15.0", "sass": "^1.66.1", - "sort-by": "^1.2.0" + "sort-by": "^0.0.2" }, "devDependencies": { "@types/react": "^18.2.15", @@ -2452,14 +2452,6 @@ "node": ">=0.10.0" } }, - "node_modules/object-path": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.6.0.tgz", - "integrity": "sha512-fxrwsCFi3/p+LeLOAwo/wyRMODZxdGBtUlWRzsEpsUVrisZbEfZ21arxLGfaWfcnqb8oHPNihIb4XPE8CQPN5A==", - "engines": { - "node": ">=0.8.0" - } - }, "node_modules/once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -2938,12 +2930,9 @@ } }, "node_modules/sort-by": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/sort-by/-/sort-by-1.2.0.tgz", - "integrity": "sha512-aRyW65r3xMnf4nxJRluCg0H/woJpksU1dQxRtXYzau30sNBOmf5HACpDd9MZDhKh7ALQ5FgSOfMPwZEtUmMqcg==", - "dependencies": { - "object-path": "0.6.0" - } + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/sort-by/-/sort-by-0.0.2.tgz", + "integrity": "sha512-iOX5oHA4a0eqTMFiWrHYqv924UeRKFBLhym7iwSVG37Egg2wApgZKAjyzM9WZjMwKv6+8Zi+nIaJ7FYsO9EkoA==" }, "node_modules/source-map-js": { "version": "1.0.2", diff --git a/client/package.json b/client/package.json index 0e381f5..b094ea5 100644 --- a/client/package.json +++ b/client/package.json @@ -18,7 +18,7 @@ "react-dom": "^18.2.0", "react-router-dom": "^6.15.0", "sass": "^1.66.1", - "sort-by": "^1.2.0" + "sort-by": "^0.0.2" }, "devDependencies": { "@types/react": "^18.2.15", diff --git a/client/public/favicon.ico b/client/public/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..83e0edc53e74c471485940e50cc9c3ffcc966306 GIT binary patch literal 15406 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 literal 0 HcmV?d00001 diff --git a/client/src/pages/Login/Login.tsx b/client/src/pages/Login/Login.tsx index 5a0e9d3..d4cbcf9 100644 --- a/client/src/pages/Login/Login.tsx +++ b/client/src/pages/Login/Login.tsx @@ -5,13 +5,16 @@ import { useAccountContext } from "../../context"; import "./Login.style.scss"; function Login() { + const [email, setEmail] = useState("email"); + const [password, setPassword] = useState("password"); const [message, setMessage] = useState(null); + const { loggedIn, login } = useAccountContext(); const navigate = useNavigate(); const attemptLogin = async () => { try { - const message = await login("admin@email.com", "password"); + const message = await login(email, password); setMessage(message); } catch (error) { console.log(error); @@ -31,6 +34,15 @@ function Login() { + +
+ setEmail(e.target.value)} value={email}/> +
+ +
+ setPassword(e.target.value)} value={password}/> +
+ {message &&

{message}

} diff --git a/service/package-lock.json b/service/package-lock.json index 410e0b8..31825ac 100644 --- a/service/package-lock.json +++ b/service/package-lock.json @@ -30,7 +30,7 @@ "@types/supertest": "^2.0.12", "@typescript-eslint/eslint-plugin": "^5.59.9", "@typescript-eslint/parser": "^5.59.9", - "nodemon": "^2.0.22", + "nodemon": "^3.0.1", "prettier": "3.0.2", "prisma": "^5.1.1", "supertest": "^6.3.3", @@ -115,9 +115,9 @@ "peer": true }, "node_modules/@babel/core/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "peer": true, "bin": { @@ -176,9 +176,9 @@ } }, "node_modules/@babel/helper-compilation-targets/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "peer": true, "bin": { @@ -3952,9 +3952,9 @@ } }, "node_modules/istanbul-lib-instrument/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "peer": true, "bin": { @@ -4826,9 +4826,9 @@ } }, "node_modules/make-dir/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "bin": { "semver": "bin/semver.js" } @@ -5101,9 +5101,9 @@ "peer": true }, "node_modules/nodemon": { - "version": "2.0.22", - "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.22.tgz", - "integrity": "sha512-B8YqaKMmyuCO7BowF1Z1/mkPqLk6cs/l63Ojtd6otKjMx47Dq1utxfRxcavH1I7VSaL8n5BUaoutadnsX3AAVQ==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.0.1.tgz", + "integrity": "sha512-g9AZ7HmkhQkqXkRc20w+ZfQ73cHLbE8hnPbtaFbFtCumZsjyMhKk9LajQ07U5Ux28lvFjZ5X7HvWR1xzU8jHVw==", "dev": true, "dependencies": { "chokidar": "^3.5.2", @@ -5111,8 +5111,8 @@ "ignore-by-default": "^1.0.1", "minimatch": "^3.1.2", "pstree.remy": "^1.1.8", - "semver": "^5.7.1", - "simple-update-notifier": "^1.0.7", + "semver": "^7.5.3", + "simple-update-notifier": "^2.0.0", "supports-color": "^5.5.0", "touch": "^3.1.0", "undefsafe": "^2.0.5" @@ -5121,7 +5121,7 @@ "nodemon": "bin/nodemon.js" }, "engines": { - "node": ">=8.10.0" + "node": ">=10" }, "funding": { "type": "opencollective", @@ -5146,15 +5146,6 @@ "node": ">=4" } }, - "node_modules/nodemon/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true, - "bin": { - "semver": "bin/semver" - } - }, "node_modules/nodemon/node_modules/supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", @@ -6016,24 +6007,15 @@ "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" }, "node_modules/simple-update-notifier": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz", - "integrity": "sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz", + "integrity": "sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==", "dev": true, "dependencies": { - "semver": "~7.0.0" + "semver": "^7.5.3" }, "engines": { - "node": ">=8.10.0" - } - }, - "node_modules/simple-update-notifier/node_modules/semver": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz", - "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==", - "dev": true, - "bin": { - "semver": "bin/semver.js" + "node": ">=10" } }, "node_modules/sisteransi": { @@ -6685,9 +6667,9 @@ } }, "node_modules/word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", "dev": true, "peer": true, "engines": { diff --git a/service/package.json b/service/package.json index bfa3597..84d94fd 100644 --- a/service/package.json +++ b/service/package.json @@ -46,7 +46,7 @@ "@types/supertest": "^2.0.12", "@typescript-eslint/eslint-plugin": "^5.59.9", "@typescript-eslint/parser": "^5.59.9", - "nodemon": "^2.0.22", + "nodemon": "^3.0.1", "prettier": "3.0.2", "prisma": "^5.1.1", "supertest": "^6.3.3",