From bb6c8d9c5b20981d6688a1badf4cd7082442e951 Mon Sep 17 00:00:00 2001 From: Eddie Jaoude Date: Sat, 30 Jul 2022 17:10:58 +0100 Subject: [PATCH] fix: refactored layouts #1470 --- components/Footer.js | 8 ++ components/layouts/MultiLayout.js | 5 +- components/layouts/SingleLayout.js | 5 +- components/user/UserPreview.js | 4 +- package-lock.json | 129 ++++++++++++++++++----------- package.json | 2 + pages/[username].js | 2 +- 7 files changed, 96 insertions(+), 59 deletions(-) create mode 100644 components/Footer.js diff --git a/components/Footer.js b/components/Footer.js new file mode 100644 index 00000000000..7467d98a38f --- /dev/null +++ b/components/Footer.js @@ -0,0 +1,8 @@ +export default function Footer() { + return ( + + ); +} diff --git a/components/layouts/MultiLayout.js b/components/layouts/MultiLayout.js index f640061c121..0f01d493209 100644 --- a/components/layouts/MultiLayout.js +++ b/components/layouts/MultiLayout.js @@ -1,13 +1,12 @@ import Navbar from "../navbar/Navbar"; +import Footer from "../Footer"; export default function MultiLayout({ children }) { return ( <>
{children}
- + ); } diff --git a/components/layouts/SingleLayout.js b/components/layouts/SingleLayout.js index 631a1f51812..e244bbca3b6 100644 --- a/components/layouts/SingleLayout.js +++ b/components/layouts/SingleLayout.js @@ -1,9 +1,10 @@ +import Footer from "../Footer"; + export default function SingleLayout({ children }) { return ( <> -

Single layout

{children}
- + ); } diff --git a/components/user/UserPreview.js b/components/user/UserPreview.js index d665e6e2dbb..4cc51bac968 100644 --- a/components/user/UserPreview.js +++ b/components/user/UserPreview.js @@ -14,9 +14,7 @@ export default function UserPreview({ profile }) { className="rounded-full" />
-

- {profile.name}({profile.views}) -

+

{profile.name}

{profile.bio}

diff --git a/package-lock.json b/package-lock.json index e2823badb5e..e23948cfd5f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,12 +9,12 @@ "version": "0.68.8", "license": "MIT", "dependencies": { + "@prisma/client": "^4.1.1", "next": "12.2.0", "react": "18.2.0", "react-dom": "18.2.0" }, "devDependencies": { - "@tailwindcss/typography": "^0.5.2", "autoprefixer": "^10.4.7", "concurrently": "^6.2.2", "cypress": "^8.5.0", @@ -24,6 +24,7 @@ "husky": "^7.0.2", "lint-staged": "^12.1.4", "postcss": "^8.4.14", + "prisma": "^4.1.1", "tailwindcss": "^3.1.4" } }, @@ -2295,6 +2296,38 @@ "node": ">= 8" } }, + "node_modules/@prisma/client": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@prisma/client/-/client-4.1.1.tgz", + "integrity": "sha512-2pXuIUYxHv5H9o6QTa1VIsl4yMgsAjKQOitlo8WVTB+vo73rmMJITBPavdGUZSWUc7adMkFzEV3y5rVTUQr77Q==", + "hasInstallScript": true, + "dependencies": { + "@prisma/engines-version": "4.1.0-48.8d8414deb360336e4698a65aa45a1fbaf1ce13d8" + }, + "engines": { + "node": ">=14.17" + }, + "peerDependencies": { + "prisma": "*" + }, + "peerDependenciesMeta": { + "prisma": { + "optional": true + } + } + }, + "node_modules/@prisma/engines": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-4.1.1.tgz", + "integrity": "sha512-DCw8L/SS0IXqmj5IW/fMxOXiifnsfjBzDfRhf0j3NFWqvMCh9OtfjmXQZxVgI2mwvJLc/5jzXhkiWT39qS09dA==", + "devOptional": true, + "hasInstallScript": true + }, + "node_modules/@prisma/engines-version": { + "version": "4.1.0-48.8d8414deb360336e4698a65aa45a1fbaf1ce13d8", + "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-4.1.0-48.8d8414deb360336e4698a65aa45a1fbaf1ce13d8.tgz", + "integrity": "sha512-cRRJwpHFGFJZvtHbY3GZjMffNBEjjZk68ztn+S2hDgPCGB4H66IK26roK94GJxBodSehwRJ0wGyebC2GoIH1JQ==" + }, "node_modules/@rushstack/eslint-patch": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.1.4.tgz", @@ -2309,20 +2342,6 @@ "tslib": "^2.4.0" } }, - "node_modules/@tailwindcss/typography": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.2.tgz", - "integrity": "sha512-coq8DBABRPFcVhVIk6IbKyyHUt7YTEC/C992tatFB+yEx5WGBQrCgsSFjxHUr8AWXphWckadVJbominEduYBqw==", - "dev": true, - "dependencies": { - "lodash.castarray": "^4.4.0", - "lodash.isplainobject": "^4.0.6", - "lodash.merge": "^4.6.2" - }, - "peerDependencies": { - "tailwindcss": ">=3.0.0 || >= 3.0.0-alpha.1 || insiders" - } - }, "node_modules/@types/json5": { "version": "0.0.29", "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", @@ -6879,12 +6898,6 @@ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "dev": true }, - "node_modules/lodash.castarray": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.castarray/-/lodash.castarray-4.4.0.tgz", - "integrity": "sha512-aVx8ztPv7/2ULbArGJ2Y42bG1mEQ5mGjpdvrbJcJFU3TbYybe+QlLS4pst9zV52ymy2in1KpFPiZnAOATxD4+Q==", - "dev": true - }, "node_modules/lodash.clonedeep": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", @@ -6897,12 +6910,6 @@ "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==", "dev": true }, - "node_modules/lodash.isplainobject": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", - "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==", - "dev": true - }, "node_modules/lodash.memoize": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz", @@ -7910,6 +7917,23 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/prisma": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/prisma/-/prisma-4.1.1.tgz", + "integrity": "sha512-yw50J8If2dKP4wYIi695zthsCASQFHiogGvUHHWd3falx/rpsD6Sb1LMLRV9nO3iGG3lozxNJ2PSINxK7xwdpg==", + "devOptional": true, + "hasInstallScript": true, + "dependencies": { + "@prisma/engines": "4.1.1" + }, + "bin": { + "prisma": "build/index.js", + "prisma2": "build/index.js" + }, + "engines": { + "node": ">=14.17" + } + }, "node_modules/process": { "version": "0.11.10", "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", @@ -11471,6 +11495,25 @@ "fastq": "^1.6.0" } }, + "@prisma/client": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@prisma/client/-/client-4.1.1.tgz", + "integrity": "sha512-2pXuIUYxHv5H9o6QTa1VIsl4yMgsAjKQOitlo8WVTB+vo73rmMJITBPavdGUZSWUc7adMkFzEV3y5rVTUQr77Q==", + "requires": { + "@prisma/engines-version": "4.1.0-48.8d8414deb360336e4698a65aa45a1fbaf1ce13d8" + } + }, + "@prisma/engines": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-4.1.1.tgz", + "integrity": "sha512-DCw8L/SS0IXqmj5IW/fMxOXiifnsfjBzDfRhf0j3NFWqvMCh9OtfjmXQZxVgI2mwvJLc/5jzXhkiWT39qS09dA==", + "devOptional": true + }, + "@prisma/engines-version": { + "version": "4.1.0-48.8d8414deb360336e4698a65aa45a1fbaf1ce13d8", + "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-4.1.0-48.8d8414deb360336e4698a65aa45a1fbaf1ce13d8.tgz", + "integrity": "sha512-cRRJwpHFGFJZvtHbY3GZjMffNBEjjZk68ztn+S2hDgPCGB4H66IK26roK94GJxBodSehwRJ0wGyebC2GoIH1JQ==" + }, "@rushstack/eslint-patch": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.1.4.tgz", @@ -11485,17 +11528,6 @@ "tslib": "^2.4.0" } }, - "@tailwindcss/typography": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.2.tgz", - "integrity": "sha512-coq8DBABRPFcVhVIk6IbKyyHUt7YTEC/C992tatFB+yEx5WGBQrCgsSFjxHUr8AWXphWckadVJbominEduYBqw==", - "dev": true, - "requires": { - "lodash.castarray": "^4.4.0", - "lodash.isplainobject": "^4.0.6", - "lodash.merge": "^4.6.2" - } - }, "@types/json5": { "version": "0.0.29", "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", @@ -15006,12 +15038,6 @@ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "dev": true }, - "lodash.castarray": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.castarray/-/lodash.castarray-4.4.0.tgz", - "integrity": "sha512-aVx8ztPv7/2ULbArGJ2Y42bG1mEQ5mGjpdvrbJcJFU3TbYybe+QlLS4pst9zV52ymy2in1KpFPiZnAOATxD4+Q==", - "dev": true - }, "lodash.clonedeep": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", @@ -15024,12 +15050,6 @@ "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==", "dev": true }, - "lodash.isplainobject": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", - "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==", - "dev": true - }, "lodash.memoize": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz", @@ -15763,6 +15783,15 @@ "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==", "dev": true }, + "prisma": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/prisma/-/prisma-4.1.1.tgz", + "integrity": "sha512-yw50J8If2dKP4wYIi695zthsCASQFHiogGvUHHWd3falx/rpsD6Sb1LMLRV9nO3iGG3lozxNJ2PSINxK7xwdpg==", + "devOptional": true, + "requires": { + "@prisma/engines": "4.1.1" + } + }, "process": { "version": "0.11.10", "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", diff --git a/package.json b/package.json index d49d7c1d3c9..1197f9ccda5 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,7 @@ "private": false, "homepage": "https://linkfree.eddiehub.org", "dependencies": { + "@prisma/client": "^4.1.1", "next": "12.2.0", "react": "18.2.0", "react-dom": "18.2.0" @@ -40,6 +41,7 @@ "husky": "^7.0.2", "lint-staged": "^12.1.4", "postcss": "^8.4.14", + "prisma": "^4.1.1", "tailwindcss": "^3.1.4" }, "cypress-cucumber-preprocessor": { diff --git a/pages/[username].js b/pages/[username].js index c2a28027de5..cbb47bbaa5f 100644 --- a/pages/[username].js +++ b/pages/[username].js @@ -36,7 +36,7 @@ export default function User({ data }) { -
+