From 1ccbd6d08aab58c9b2c84909c22468d7358618fb Mon Sep 17 00:00:00 2001 From: Simon Westlin Green Date: Fri, 26 Jan 2024 21:03:20 +0100 Subject: [PATCH 1/3] =?UTF-8?q?Centered=20a=20div=20=F0=9F=92=80=20(and=20?= =?UTF-8?q?also=20made=20the=20navbar=20slimmer)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/package-lock.json | 138 +++++++++++++----- backend/package.json | 6 +- .../src/common/components/header/index.jsx | 12 +- 3 files changed, 110 insertions(+), 46 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index 931131f..48e6c8e 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -12,7 +12,7 @@ "@graphql-tools/load-files": "^6.3.2", "@graphql-tools/merge": "^7.0.0", "@graphql-tools/schema": "^8.0.3", - "@prisma/client": "^3.15.0", + "@prisma/client": "^5.9.0-dev.58", "axios": "^0.21.1", "connect-redis": "^6.0.0", "express": "^4.17.1", @@ -45,7 +45,7 @@ "eslint-plugin-node": "^11.1.0", "eslint-plugin-promise": "^5.1.0", "mocha": "^9.0.3", - "prisma": "^3.15.2", + "prisma": "^5.9.0-dev.58", "ts-node-dev": "^1.1.8", "typescript": "^4.3.5" } @@ -366,15 +366,12 @@ } }, "node_modules/@prisma/client": { - "version": "3.15.2", - "resolved": "https://registry.npmjs.org/@prisma/client/-/client-3.15.2.tgz", - "integrity": "sha512-ErqtwhX12ubPhU4d++30uFY/rPcyvjk+mdifaZO5SeM21zS3t4jQrscy8+6IyB0GIYshl5ldTq6JSBo1d63i8w==", + "version": "5.9.0-dev.58", + "resolved": "https://registry.npmjs.org/@prisma/client/-/client-5.9.0-dev.58.tgz", + "integrity": "sha512-Zl3uAxBOjOQxZaRt7ltTEMXxIhyLZprrqXABWPIQzovoCe7EfG6PbjoholfdCYv4loos5j1yeUC6WUX8Gc11Cg==", "hasInstallScript": true, - "dependencies": { - "@prisma/engines-version": "3.15.1-1.461d6a05159055555eb7dfb337c9fb271cbd4d7e" - }, "engines": { - "node": ">=12.6" + "node": ">=16.13" }, "peerDependencies": { "prisma": "*" @@ -385,17 +382,50 @@ } } }, + "node_modules/@prisma/debug": { + "version": "5.9.0-dev.58", + "resolved": "https://registry.npmjs.org/@prisma/debug/-/debug-5.9.0-dev.58.tgz", + "integrity": "sha512-0aAYOY2YX90Dmtp2icENmO4qozCZEqpxkxtA/QqBBsysk5WHuC1ET6jPUUf58JwNbmWznaVbJhdIls4nD7kdRw==", + "devOptional": true + }, "node_modules/@prisma/engines": { - "version": "3.15.1-1.461d6a05159055555eb7dfb337c9fb271cbd4d7e", - "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-3.15.1-1.461d6a05159055555eb7dfb337c9fb271cbd4d7e.tgz", - "integrity": "sha512-NHlojO1DFTsSi3FtEleL9QWXeSF/UjhCW0fgpi7bumnNZ4wj/eQ+BJJ5n2pgoOliTOGv9nX2qXvmHap7rJMNmg==", + "version": "5.9.0-dev.58", + "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-5.9.0-dev.58.tgz", + "integrity": "sha512-KdkIT/ZdudNYLgQxesIMkQjtYzV4gGCDxS+XrQF7sFaxRUH5EveFntTagVni3PCzQ4aK6jmSznIoJP33n2Pztw==", "devOptional": true, - "hasInstallScript": true + "hasInstallScript": true, + "dependencies": { + "@prisma/debug": "5.9.0-dev.58", + "@prisma/engines-version": "5.9.0-27.6248b507d344261d8c98c3096bd082ad09b3750b", + "@prisma/fetch-engine": "5.9.0-dev.58", + "@prisma/get-platform": "5.9.0-dev.58" + } }, "node_modules/@prisma/engines-version": { - "version": "3.15.1-1.461d6a05159055555eb7dfb337c9fb271cbd4d7e", - "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-3.15.1-1.461d6a05159055555eb7dfb337c9fb271cbd4d7e.tgz", - "integrity": "sha512-e3k2Vd606efd1ZYy2NQKkT4C/pn31nehyLhVug6To/q8JT8FpiMrDy7zmm3KLF0L98NOQQcutaVtAPhzKhzn9w==" + "version": "5.9.0-27.6248b507d344261d8c98c3096bd082ad09b3750b", + "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-5.9.0-27.6248b507d344261d8c98c3096bd082ad09b3750b.tgz", + "integrity": "sha512-CdAyHsvdlgDofbZOON4YdNNPpadXBJjAFuYfSpEU6SPQbHSIjQrmXj6W7wyAx7/1s3WI91XgQ70IBW5+BBQrtQ==", + "devOptional": true + }, + "node_modules/@prisma/fetch-engine": { + "version": "5.9.0-dev.58", + "resolved": "https://registry.npmjs.org/@prisma/fetch-engine/-/fetch-engine-5.9.0-dev.58.tgz", + "integrity": "sha512-AOZn87wjlc2gpSv0b+NapToFCEy7Y1CiF5iDYQ0GXplb3t+WZDOufis524rwHn2SUsTSC1UqsOfjbqwOT/CxeQ==", + "devOptional": true, + "dependencies": { + "@prisma/debug": "5.9.0-dev.58", + "@prisma/engines-version": "5.9.0-27.6248b507d344261d8c98c3096bd082ad09b3750b", + "@prisma/get-platform": "5.9.0-dev.58" + } + }, + "node_modules/@prisma/get-platform": { + "version": "5.9.0-dev.58", + "resolved": "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-5.9.0-dev.58.tgz", + "integrity": "sha512-UO6QXFht6fIDZdWtNryrlWgVvNxoZG4CtBnH+Hex/qCOAHnF70L6wgItRbAwifNiFXN7wxW3LgVtTlLZ0R81yg==", + "devOptional": true, + "dependencies": { + "@prisma/debug": "5.9.0-dev.58" + } }, "node_modules/@testdeck/core": { "version": "0.1.2", @@ -3697,20 +3727,19 @@ } }, "node_modules/prisma": { - "version": "3.15.2", - "resolved": "https://registry.npmjs.org/prisma/-/prisma-3.15.2.tgz", - "integrity": "sha512-nMNSMZvtwrvoEQ/mui8L/aiCLZRCj5t6L3yujKpcDhIPk7garp8tL4nMx2+oYsN0FWBacevJhazfXAbV1kfBzA==", + "version": "5.9.0-dev.58", + "resolved": "https://registry.npmjs.org/prisma/-/prisma-5.9.0-dev.58.tgz", + "integrity": "sha512-dAz5V9Wg0fXKKvfXreDc7ckO/sX1ZJXa3aCkGSjgoD799AJz3e6DSR4QmsTcVaHzCp0h5Ocs3Fu/BFyHjJxgCQ==", "devOptional": true, "hasInstallScript": true, "dependencies": { - "@prisma/engines": "3.15.1-1.461d6a05159055555eb7dfb337c9fb271cbd4d7e" + "@prisma/engines": "5.9.0-dev.58" }, "bin": { - "prisma": "build/index.js", - "prisma2": "build/index.js" + "prisma": "build/index.js" }, "engines": { - "node": ">=12.6" + "node": ">=16.13" } }, "node_modules/progress": { @@ -5152,23 +5181,54 @@ } }, "@prisma/client": { - "version": "3.15.2", - "resolved": "https://registry.npmjs.org/@prisma/client/-/client-3.15.2.tgz", - "integrity": "sha512-ErqtwhX12ubPhU4d++30uFY/rPcyvjk+mdifaZO5SeM21zS3t4jQrscy8+6IyB0GIYshl5ldTq6JSBo1d63i8w==", + "version": "5.9.0-dev.58", + "resolved": "https://registry.npmjs.org/@prisma/client/-/client-5.9.0-dev.58.tgz", + "integrity": "sha512-Zl3uAxBOjOQxZaRt7ltTEMXxIhyLZprrqXABWPIQzovoCe7EfG6PbjoholfdCYv4loos5j1yeUC6WUX8Gc11Cg==", + "requires": {} + }, + "@prisma/debug": { + "version": "5.9.0-dev.58", + "resolved": "https://registry.npmjs.org/@prisma/debug/-/debug-5.9.0-dev.58.tgz", + "integrity": "sha512-0aAYOY2YX90Dmtp2icENmO4qozCZEqpxkxtA/QqBBsysk5WHuC1ET6jPUUf58JwNbmWznaVbJhdIls4nD7kdRw==", + "devOptional": true + }, + "@prisma/engines": { + "version": "5.9.0-dev.58", + "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-5.9.0-dev.58.tgz", + "integrity": "sha512-KdkIT/ZdudNYLgQxesIMkQjtYzV4gGCDxS+XrQF7sFaxRUH5EveFntTagVni3PCzQ4aK6jmSznIoJP33n2Pztw==", + "devOptional": true, "requires": { - "@prisma/engines-version": "3.15.1-1.461d6a05159055555eb7dfb337c9fb271cbd4d7e" + "@prisma/debug": "5.9.0-dev.58", + "@prisma/engines-version": "5.9.0-27.6248b507d344261d8c98c3096bd082ad09b3750b", + "@prisma/fetch-engine": "5.9.0-dev.58", + "@prisma/get-platform": "5.9.0-dev.58" } }, - "@prisma/engines": { - "version": "3.15.1-1.461d6a05159055555eb7dfb337c9fb271cbd4d7e", - "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-3.15.1-1.461d6a05159055555eb7dfb337c9fb271cbd4d7e.tgz", - "integrity": "sha512-NHlojO1DFTsSi3FtEleL9QWXeSF/UjhCW0fgpi7bumnNZ4wj/eQ+BJJ5n2pgoOliTOGv9nX2qXvmHap7rJMNmg==", + "@prisma/engines-version": { + "version": "5.9.0-27.6248b507d344261d8c98c3096bd082ad09b3750b", + "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-5.9.0-27.6248b507d344261d8c98c3096bd082ad09b3750b.tgz", + "integrity": "sha512-CdAyHsvdlgDofbZOON4YdNNPpadXBJjAFuYfSpEU6SPQbHSIjQrmXj6W7wyAx7/1s3WI91XgQ70IBW5+BBQrtQ==", "devOptional": true }, - "@prisma/engines-version": { - "version": "3.15.1-1.461d6a05159055555eb7dfb337c9fb271cbd4d7e", - "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-3.15.1-1.461d6a05159055555eb7dfb337c9fb271cbd4d7e.tgz", - "integrity": "sha512-e3k2Vd606efd1ZYy2NQKkT4C/pn31nehyLhVug6To/q8JT8FpiMrDy7zmm3KLF0L98NOQQcutaVtAPhzKhzn9w==" + "@prisma/fetch-engine": { + "version": "5.9.0-dev.58", + "resolved": "https://registry.npmjs.org/@prisma/fetch-engine/-/fetch-engine-5.9.0-dev.58.tgz", + "integrity": "sha512-AOZn87wjlc2gpSv0b+NapToFCEy7Y1CiF5iDYQ0GXplb3t+WZDOufis524rwHn2SUsTSC1UqsOfjbqwOT/CxeQ==", + "devOptional": true, + "requires": { + "@prisma/debug": "5.9.0-dev.58", + "@prisma/engines-version": "5.9.0-27.6248b507d344261d8c98c3096bd082ad09b3750b", + "@prisma/get-platform": "5.9.0-dev.58" + } + }, + "@prisma/get-platform": { + "version": "5.9.0-dev.58", + "resolved": "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-5.9.0-dev.58.tgz", + "integrity": "sha512-UO6QXFht6fIDZdWtNryrlWgVvNxoZG4CtBnH+Hex/qCOAHnF70L6wgItRbAwifNiFXN7wxW3LgVtTlLZ0R81yg==", + "devOptional": true, + "requires": { + "@prisma/debug": "5.9.0-dev.58" + } }, "@testdeck/core": { "version": "0.1.2", @@ -7603,12 +7663,12 @@ "dev": true }, "prisma": { - "version": "3.15.2", - "resolved": "https://registry.npmjs.org/prisma/-/prisma-3.15.2.tgz", - "integrity": "sha512-nMNSMZvtwrvoEQ/mui8L/aiCLZRCj5t6L3yujKpcDhIPk7garp8tL4nMx2+oYsN0FWBacevJhazfXAbV1kfBzA==", + "version": "5.9.0-dev.58", + "resolved": "https://registry.npmjs.org/prisma/-/prisma-5.9.0-dev.58.tgz", + "integrity": "sha512-dAz5V9Wg0fXKKvfXreDc7ckO/sX1ZJXa3aCkGSjgoD799AJz3e6DSR4QmsTcVaHzCp0h5Ocs3Fu/BFyHjJxgCQ==", "devOptional": true, "requires": { - "@prisma/engines": "3.15.1-1.461d6a05159055555eb7dfb337c9fb271cbd4d7e" + "@prisma/engines": "5.9.0-dev.58" } }, "progress": { diff --git a/backend/package.json b/backend/package.json index 00be562..faa4bab 100644 --- a/backend/package.json +++ b/backend/package.json @@ -16,7 +16,7 @@ "@graphql-tools/load-files": "^6.3.2", "@graphql-tools/merge": "^7.0.0", "@graphql-tools/schema": "^8.0.3", - "@prisma/client": "^3.15.0", + "@prisma/client": "^5.9.0-dev.58", "axios": "^0.21.1", "connect-redis": "^6.0.0", "express": "^4.17.1", @@ -49,8 +49,8 @@ "eslint-plugin-node": "^11.1.0", "eslint-plugin-promise": "^5.1.0", "mocha": "^9.0.3", - "prisma": "^3.15.2", + "prisma": "^5.9.0-dev.58", "ts-node-dev": "^1.1.8", "typescript": "^4.3.5" } -} \ No newline at end of file +} diff --git a/frontend/src/common/components/header/index.jsx b/frontend/src/common/components/header/index.jsx index 9b945ef..fb7643b 100644 --- a/frontend/src/common/components/header/index.jsx +++ b/frontend/src/common/components/header/index.jsx @@ -8,11 +8,15 @@ const Header = ({ children }) => { title="" mainPadding="0" renderHeader={() => ( - - - +
+ + + +
+ +
+
)} - renderToolbar={Tabs} renderMain={() => <>{children}} /> ); From a35dd3748ef3159b4cb9ec6235188f029dc64aff Mon Sep 17 00:00:00 2001 From: Simon Westlin Green Date: Fri, 26 Jan 2024 21:25:08 +0100 Subject: [PATCH 2/3] added dev_setup.sh script for frontend since the program won't run without legacy openssl --- frontend/dev_setup.sh | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 frontend/dev_setup.sh diff --git a/frontend/dev_setup.sh b/frontend/dev_setup.sh new file mode 100644 index 0000000..1f5a35a --- /dev/null +++ b/frontend/dev_setup.sh @@ -0,0 +1,3 @@ +export NODE_OPTIONS=--openssl-legacy-provider + +npm i From 1b082b7c8531dc7818bc1ef2f0aabd953100c486 Mon Sep 17 00:00:00 2001 From: Simon Westlin Green Date: Fri, 26 Jan 2024 21:26:13 +0100 Subject: [PATCH 3/3] edited README to make it easier to run a dev env without having to google for solutions for why openssl doesn't work for 30 minutes --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 97b48ee..76fa8f1 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,7 @@ Frontend ```sh cd frontend +source dev_setup.sh npm i npm start ```