From 0c9bcd1bd52d11d8029bae36fe0b17b0dc92047a Mon Sep 17 00:00:00 2001 From: Caio Cabral Date: Tue, 8 Oct 2024 11:57:08 -0400 Subject: [PATCH 1/3] chore: adding prettierrc file --- Server/package-lock.json | 2 ++ Server/package.json | 1 + Server/routes/authRoute.js | 39 ++++++++++++-------------------------- 3 files changed, 15 insertions(+), 27 deletions(-) diff --git a/Server/package-lock.json b/Server/package-lock.json index d4147c7d1..80bfd9c6e 100644 --- a/Server/package-lock.json +++ b/Server/package-lock.json @@ -26,6 +26,7 @@ "multer": "1.4.5-lts.1", "nodemailer": "^6.9.14", "ping": "0.4.4", + "prettier": "^3.3.3", "sharp": "0.33.4", "ssl-checker": "2.0.10", "swagger-ui-express": "5.0.1", @@ -4610,6 +4611,7 @@ "version": "3.3.3", "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz", "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==", + "license": "MIT", "bin": { "prettier": "bin/prettier.cjs" }, diff --git a/Server/package.json b/Server/package.json index 75d3b1cc2..f6f90819f 100644 --- a/Server/package.json +++ b/Server/package.json @@ -28,6 +28,7 @@ "multer": "1.4.5-lts.1", "nodemailer": "^6.9.14", "ping": "0.4.4", + "prettier": "^3.3.3", "sharp": "0.33.4", "ssl-checker": "2.0.10", "swagger-ui-express": "5.0.1", diff --git a/Server/routes/authRoute.js b/Server/routes/authRoute.js index ce6ec440e..57067f564 100644 --- a/Server/routes/authRoute.js +++ b/Server/routes/authRoute.js @@ -7,39 +7,24 @@ const upload = multer(); const User = require("../db/models/User"); const { - registerUser, - loginUser, - editUser, - requestRecovery, - validateRecovery, - resetPassword, - checkSuperadminExists, - getAllUsers, - deleteUser, + registerUser, + loginUser, + editUser, + requestRecovery, + validateRecovery, + resetPassword, + checkSuperadminExists, + getAllUsers, + deleteUser, } = require("../controllers/authController"); //Auth routes router.post("/register", upload.single("profileImage"), registerUser); router.post("/login", loginUser); -router.put( - "/user/:userId", - upload.single("profileImage"), - verifyJWT, - editUser -); +router.put("/user/:userId", upload.single("profileImage"), verifyJWT, editUser); router.get("/users/superadmin", checkSuperadminExists); -router.get( - "/users", - verifyJWT, - isAllowed(["admin", "superadmin"]), - getAllUsers -); -router.delete( - "/user/:userId", - verifyJWT, - verifyOwnership(User, "userId"), - deleteUser -); +router.get("/users", verifyJWT, isAllowed(["admin", "superadmin"]), getAllUsers); +router.delete("/user/:userId", verifyJWT, verifyOwnership(User, "userId"), deleteUser); //Recovery routes router.post("/recovery/request", requestRecovery); From db941d246cf7bc61f174f8a3974618848fe6c587 Mon Sep 17 00:00:00 2001 From: Caio Cabral Date: Tue, 8 Oct 2024 12:01:19 -0400 Subject: [PATCH 2/3] fix: committing from root folder --- .prettierrc | 16 +++++++++ Client/package-lock.json | 16 +++++++++ Client/package.json | 1 + Client/src/App.css | 4 +-- Client/src/App.jsx | 73 ++++++++++++++++++++++++++++++---------- 5 files changed, 91 insertions(+), 19 deletions(-) create mode 100644 .prettierrc diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 000000000..399423a21 --- /dev/null +++ b/.prettierrc @@ -0,0 +1,16 @@ +{ + "printWidth": 90, + "useTabs": true, + "tabWidth": 2, + "singleQuote": false, + "bracketSpacing": true, + "proseWrap": "preserve", + "bracketSameLine": false, + "singleAttributePerLine": true, + "semi": true, + "jsx-single-quote": false, + "quoteProps": "as-needed", + "arrowParens": "always", + "trailingComma": "es5", + "htmlWhitespaceSensitivity": "css" +} diff --git a/Client/package-lock.json b/Client/package-lock.json index 4077ce2bf..e6b50b53b 100644 --- a/Client/package-lock.json +++ b/Client/package-lock.json @@ -23,6 +23,7 @@ "dayjs": "1.11.11", "joi": "17.13.1", "jwt-decode": "^4.0.0", + "prettier": "^3.3.3", "react": "^18.2.0", "react-dom": "^18.2.0", "react-redux": "9.1.2", @@ -5314,6 +5315,21 @@ "node": ">= 0.8.0" } }, + "node_modules/prettier": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz", + "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==", + "license": "MIT", + "bin": { + "prettier": "bin/prettier.cjs" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, "node_modules/prop-types": { "version": "15.8.1", "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", diff --git a/Client/package.json b/Client/package.json index 22f15f7f9..e0621a455 100644 --- a/Client/package.json +++ b/Client/package.json @@ -25,6 +25,7 @@ "dayjs": "1.11.11", "joi": "17.13.1", "jwt-decode": "^4.0.0", + "prettier": "^3.3.3", "react": "^18.2.0", "react-dom": "^18.2.0", "react-redux": "9.1.2", diff --git a/Client/src/App.css b/Client/src/App.css index bf3d4ea92..44e06cd5f 100644 --- a/Client/src/App.css +++ b/Client/src/App.css @@ -1,7 +1,7 @@ .card { - padding: 2em; + padding: 2em; } .read-the-docs { - color: #888; + color: #888; } diff --git a/Client/src/App.jsx b/Client/src/App.jsx index 56c279e78..647ee2d44 100644 --- a/Client/src/App.jsx +++ b/Client/src/App.jsx @@ -70,7 +70,11 @@ function App() { - }> + } + > - } + element={} /> } + element={ + + } /> } + element={ + + } /> } + element={ + + } /> - } + element={} /> - } /> + } + /> - } /> - } /> + } + /> + } + /> {/* } /> */} - } /> - } /> - } /> - } /> + } + /> + } + /> + } + /> + } + /> } From 38b837d3b0dbdf54b3f41208fddfcc239821acd4 Mon Sep 17 00:00:00 2001 From: Caio Cabral Date: Tue, 15 Oct 2024 07:45:59 -0400 Subject: [PATCH 3/3] fix: setting prettier as dev dependency --- Client/package-lock.json | 3 ++- Client/package.json | 2 +- Server/package-lock.json | 4 ++-- Server/package.json | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Client/package-lock.json b/Client/package-lock.json index e6b50b53b..c78e9e33a 100644 --- a/Client/package-lock.json +++ b/Client/package-lock.json @@ -23,7 +23,6 @@ "dayjs": "1.11.11", "joi": "17.13.1", "jwt-decode": "^4.0.0", - "prettier": "^3.3.3", "react": "^18.2.0", "react-dom": "^18.2.0", "react-redux": "9.1.2", @@ -42,6 +41,7 @@ "eslint-plugin-react": "^7.34.1", "eslint-plugin-react-hooks": "^4.6.0", "eslint-plugin-react-refresh": "^0.4.6", + "prettier": "^3.3.3", "vite": "^5.2.0" } }, @@ -5319,6 +5319,7 @@ "version": "3.3.3", "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz", "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==", + "dev": true, "license": "MIT", "bin": { "prettier": "bin/prettier.cjs" diff --git a/Client/package.json b/Client/package.json index e0621a455..948114e35 100644 --- a/Client/package.json +++ b/Client/package.json @@ -25,7 +25,6 @@ "dayjs": "1.11.11", "joi": "17.13.1", "jwt-decode": "^4.0.0", - "prettier": "^3.3.3", "react": "^18.2.0", "react-dom": "^18.2.0", "react-redux": "9.1.2", @@ -44,6 +43,7 @@ "eslint-plugin-react": "^7.34.1", "eslint-plugin-react-hooks": "^4.6.0", "eslint-plugin-react-refresh": "^0.4.6", + "prettier": "^3.3.3", "vite": "^5.2.0" } } diff --git a/Server/package-lock.json b/Server/package-lock.json index 80bfd9c6e..3a6b104f0 100644 --- a/Server/package-lock.json +++ b/Server/package-lock.json @@ -26,14 +26,14 @@ "multer": "1.4.5-lts.1", "nodemailer": "^6.9.14", "ping": "0.4.4", - "prettier": "^3.3.3", "sharp": "0.33.4", "ssl-checker": "2.0.10", "swagger-ui-express": "5.0.1", "winston": "^3.13.0" }, "devDependencies": { - "nodemon": "3.1.0" + "nodemon": "3.1.0", + "prettier": "^3.3.3" } }, "node_modules/@babel/code-frame": { diff --git a/Server/package.json b/Server/package.json index f6f90819f..af196402e 100644 --- a/Server/package.json +++ b/Server/package.json @@ -28,13 +28,13 @@ "multer": "1.4.5-lts.1", "nodemailer": "^6.9.14", "ping": "0.4.4", - "prettier": "^3.3.3", "sharp": "0.33.4", "ssl-checker": "2.0.10", "swagger-ui-express": "5.0.1", "winston": "^3.13.0" }, "devDependencies": { - "nodemon": "3.1.0" + "nodemon": "3.1.0", + "prettier": "^3.3.3" } }