Merge branch 'develop' into 901-create-confirmation-dialogs-for-clear-all-stats-and-remove-all-monitors

2026-01-16 06:39:43 -06:00 · 2024-10-15 14:19:33 -04:00
parent 21caca1ffb 8f9fa11b9d
commit 8db6e09a60
10 changed files with 218 additions and 88 deletions
--- a/.prettierrc
+++ 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"
+}
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,69 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in the **bluewave-uptime** project and community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community, especially during Hacktoberfest, where we encourage new contributors to join and feel supported.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our community include:
+
+- Demonstrating empathy and kindness toward other people
+- Being respectful of differing opinions, viewpoints, and experiences
+- Giving and gracefully accepting constructive feedback
+- Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
+- Focusing on what is best not just for us as individuals, but for the overall community
+
+Examples of unacceptable behavior include:
+
+- The use of sexualized language or imagery, and sexual attention or advances of any kind
+- Trolling, insulting or derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or email address, without their explicit permission
+- Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying and enforcing our standards of acceptable behavior and will take appropriate and fair corrective action in response to any behavior that they deem inappropriate, threatening, offensive, or harmful.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned with this Code of Conduct, especially during Hacktoberfest to ensure a positive experience for all contributors.
+
+## Scope
+
+This Code of Conduct applies within all project spaces, and it also applies when an individual is officially representing the project or its community in public spaces. Examples of representing our project include using an official project email address, posting via an official social media account, or acting as an appointed representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at hello@bluewavelabs.ca. All complaints will be reviewed and investigated promptly and fairly.
+
+All project team members are obligated to respect the privacy and security of the reporter of any incident.
+
+## Enforcement Guidelines
+
+Project maintainers will follow these Community Impact Guidelines in determining the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+**Community Impact**: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community.
+**Consequence**: A private, written warning from project maintainers, providing clarity around the nature of the violation and an explanation of why the behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+**Community Impact**: A violation through a single incident or series of actions.
+**Consequence**: A warning with consequences for continued behavior. No interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, for a specified period of time. This includes avoiding interactions in community spaces as well as external channels like social media. Violating these terms may lead to a temporary or permanent ban.
+
+### 3. Temporary Ban
+**Community Impact**: A serious violation of community standards, including sustained inappropriate behavior.
+**Consequence**: A temporary ban from any sort of interaction or public communication with the community for a specified period of time. No public or private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is allowed during this period. Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+**Community Impact**: Demonstrating a pattern of violation of community standards, including sustained inappropriate behavior, harassment of an individual, or aggression toward or disparagement of classes of individuals.
+**Consequence**: A permanent ban from any sort of public interaction within the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant](https://www.contributor-covenant.org), version 2.0, available at https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+---
+
+By following this Code of Conduct, we can ensure a welcoming and inclusive environment, encouraging new contributors to engage with the project and the community. Thank you for helping make **bluewave-uptime** a positive space for all!
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -77,6 +77,7 @@ Once it's filed:
 This section guides you through submitting an enhancement suggestion for the application, **including completely new features and minor improvements to existing functionality**. Following these guidelines will help maintainers and the community understand your enhancements and find related suggestions.

 - Make sure that you are using the latest version.
+- Make sure you run the code locally. The Uptime Manager [documentation](https://bluewavelabs.gitbook.io/uptime-manager) covers it.
 - Find out if the functionality is already covered, maybe by an individual configuration.
 - Perform a [search](/issues) to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one.
 - Find out whether your idea fits with the scope and aims of the project. It's up to you to make a strong case to convince the project's developers of the merits of this feature. Keep in mind that we want features that will be useful to the majority of our users and not just a small subset. If you're just targeting a minority of users, consider writing an add-on/plugin library.
--- a/Client/package-lock.json
+++ b/Client/package-lock.json
@@ -41,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"
      }
    },
@@ -5314,6 +5315,22 @@
        "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==",
+      "dev": true,
+      "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",
--- a/Client/package.json
+++ b/Client/package.json
@@ -43,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"
  }
 }
--- 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;
 }
--- a/Client/src/App.jsx
+++ b/Client/src/App.jsx
@@ -70,7 +70,11 @@ function App() {
    <ThemeProvider theme={mode === "light" ? lightTheme : darkTheme}>
      <CssBaseline />
      <Routes>
-        <Route exact path="/" element={<HomeLayout />}>
+        <Route
+          exact
+          path="/"
+          element={<HomeLayout />}
+        >
          <Route
            exact
            path="/"
@@ -119,21 +123,34 @@ function App() {
          />
          <Route
            path="advanced-settings"
-            element={
-              <ProtectedRoute Component={AdvancedSettingsWithAdminProp} />
-            }
+            element={<ProtectedRoute Component={AdvancedSettingsWithAdminProp} />}
          />
          <Route
            path="account/profile"
-            element={<ProtectedRoute Component={Account} open="profile" />}
+            element={
+              <ProtectedRoute
+                Component={Account}
+                open="profile"
+              />
+            }
          />
          <Route
            path="account/password"
-            element={<ProtectedRoute Component={Account} open="password" />}
+            element={
+              <ProtectedRoute
+                Component={Account}
+                open="password"
+              />
+            }
          />
          <Route
            path="account/team"
-            element={<ProtectedRoute Component={Account} open="team" />}
+            element={
+              <ProtectedRoute
+                Component={Account}
+                open="team"
+              />
+            }
          />
          <Route
            path="pagespeed"
@@ -145,9 +162,7 @@ function App() {
          />
          <Route
            path="pagespeed/:monitorId"
-            element={
-              <ProtectedRoute Component={PageSpeedDetailsWithAdminProp} />
-            }
+            element={<ProtectedRoute Component={PageSpeedDetailsWithAdminProp} />}
          />
          <Route
            path="pagespeed/configure/:monitorId"
@@ -155,15 +170,39 @@ function App() {
          />
        </Route>

-        <Route exact path="/login" element={<Login />} />
+        <Route
+          exact
+          path="/login"
+          element={<Login />}
+        />

-        <Route exact path="/register" element={<AdminCheckedRegister />} />
-        <Route exact path="/register/:token" element={<Register />} />
+        <Route
+          exact
+          path="/register"
+          element={<AdminCheckedRegister />}
+        />
+        <Route
+          exact
+          path="/register/:token"
+          element={<Register />}
+        />
        {/* <Route path="/toast" element={<ToastComponent />} /> */}
-        <Route path="*" element={<NotFound />} />
-        <Route path="/forgot-password" element={<ForgotPassword />} />
-        <Route path="/check-email" element={<CheckEmail />} />
-        <Route path="/set-new-password/:token" element={<SetNewPassword />} />
+        <Route
+          path="*"
+          element={<NotFound />}
+        />
+        <Route
+          path="/forgot-password"
+          element={<ForgotPassword />}
+        />
+        <Route
+          path="/check-email"
+          element={<CheckEmail />}
+        />
+        <Route
+          path="/set-new-password/:token"
+          element={<SetNewPassword />}
+        />
        <Route
          path="/new-password-confirmed"
          element={<NewPasswordConfirmed />}
--- a/Server/package-lock.json
+++ b/Server/package-lock.json
@@ -6554,6 +6554,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"
      },
--- a/Server/package.json
+++ b/Server/package.json
@@ -1,44 +1,45 @@
 {
-  "name": "server",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "nyc mocha",
-    "dev": "nodemon index.js"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "@sendgrid/mail": "^8.1.3",
-    "axios": "^1.7.2",
-    "bcrypt": "^5.1.1",
-    "bullmq": "5.7.15",
-    "chai": "5.1.1",
-    "cors": "^2.8.5",
-    "dotenv": "^16.4.5",
-    "express": "^4.19.2",
-    "handlebars": "^4.7.8",
-    "helmet": "^7.1.0",
-    "joi": "^17.13.1",
-    "jsonwebtoken": "9.0.2",
-    "mailersend": "^2.2.0",
-    "mjml": "^5.0.0-alpha.4",
-    "mocha": "10.7.3",
-    "mongoose": "^8.3.3",
-    "multer": "1.4.5-lts.1",
-    "nodemailer": "^6.9.14",
-    "ping": "0.4.4",
-    "sharp": "0.33.4",
-    "ssl-checker": "2.0.10",
-    "swagger-ui-express": "5.0.1",
-    "winston": "^3.13.0"
-  },
-  "devDependencies": {
-    "nodemon": "3.1.0",
-    "nyc": "17.1.0",
-    "proxyquire": "2.1.3",
-    "sinon": "19.0.2"
-  }
+	"name": "server",
+	"version": "1.0.0",
+	"description": "",
+	"main": "index.js",
+	"scripts": {
+		"test": "nyc mocha",
+		"dev": "nodemon index.js"
+	},
+	"keywords": [],
+	"author": "",
+	"license": "ISC",
+	"dependencies": {
+		"@sendgrid/mail": "^8.1.3",
+		"axios": "^1.7.2",
+		"bcrypt": "^5.1.1",
+		"bullmq": "5.7.15",
+		"chai": "5.1.1",
+		"cors": "^2.8.5",
+		"dotenv": "^16.4.5",
+		"express": "^4.19.2",
+		"handlebars": "^4.7.8",
+		"helmet": "^7.1.0",
+		"joi": "^17.13.1",
+		"jsonwebtoken": "9.0.2",
+		"mailersend": "^2.2.0",
+		"mjml": "^5.0.0-alpha.4",
+		"mocha": "10.7.3",
+		"mongoose": "^8.3.3",
+		"multer": "1.4.5-lts.1",
+		"nodemailer": "^6.9.14",
+		"ping": "0.4.4",
+		"sharp": "0.33.4",
+		"ssl-checker": "2.0.10",
+		"swagger-ui-express": "5.0.1",
+		"winston": "^3.13.0"
+	},
+	"devDependencies": {
+		"nodemon": "3.1.0",
+		"prettier": "^3.3.3",
+		"nyc": "17.1.0",
+		"proxyquire": "2.1.3",
+		"sinon": "19.0.2"
+	}
 }
--- 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);