+ Press n or j to go to the next uncovered block, b, p or k for the previous block. +
+ +| File | ++ | Statements | ++ | Branches | ++ | Functions | ++ | Lines | ++ |
|---|---|---|---|---|---|---|---|---|---|
| src | +
+
+ |
+ 94.44% | +17/18 | +83.33% | +15/18 | +100% | +2/2 | +94.44% | +17/18 | +
| src/models | +
+
+ |
+ 26.11% | +70/268 | +15.38% | +6/39 | +13.63% | +6/44 | +27.13% | +70/258 | +
| src/utils | +
+
+ |
+ 84.61% | +22/26 | +41.66% | +5/12 | +66.66% | +6/9 | +87.5% | +21/24 | +
+ Press n or j to go to the next uncovered block, b, p or k for the previous block. +
+ +| 1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +12 +13 +14 +15 +16 | 2x + +2x +2x +2x + +2x +2x +2x +2x +2x +2x +2x + + + | require("dotenv").config() //dotenv package to parse the environment variables from the .env file
+
+export const PORT = process.env.PORT ? Number(process.env.PORT) : 3001;
+export const SECRET_KEY = process.env.SECRET_KEY || "secret";
+export const BCRYPT_WORK_FACTOR = 13;
+
+export function getDatabaseURI(){
+ const dbUser = process.env.DATABASE_USER || "postgres"
+ const dbPass = process.env.DATABASE_PASS ? encodeURI(process.env.DATABASE_PASS) : "postgres"
+ const dbHost = process.env.DATABASE_HOST || "localhost"
+ const dbPort = process.env.DATABASE_PORT || 5432
+ const dbProdName = process.env.DATABASE_NAME || "volunteerverse"
+ return process.env.DATABASE_URL || `postgresql://${dbUser}:${dbPass}@${dbHost}:${dbPort}/${dbProdName}`
+}
+
+ |
+ Press n or j to go to the next uncovered block, b, p or k for the previous block. +
+ +| 1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +12 +13 +14 +15 +16 +17 +18 +19 +20 +21 +22 | 2x +2x + +2x + + + + + + +2x +1x + + + + + + + +2x + + | import {Pool} from "pg";
+import { getDatabaseURI } from "./config";
+
+const db = new Pool({
+ connectionString: getDatabaseURI(),
+});
+
+// db.connect();
+
+
+db.connect((err: { stack: any }) => {
+ Iif (err) {
+ console.error("connection error", err.stack);
+ } else {
+ // console.log("Successfully connected to postgres database!");
+
+ }
+});
+
+export default db
+
+ |
+ Press n or j to go to the next uncovered block, b, p or k for the previous block. +
+ ++ Press n or j to go to the next uncovered block, b, p or k for the previous block. +
+ +| File | ++ | Statements | ++ | Branches | ++ | Functions | ++ | Lines | ++ |
|---|---|---|---|---|---|---|---|---|---|
| organization.ts | +
+
+ |
+ 30.92% | +30/97 | +10% | +2/20 | +20% | +2/10 | +31.91% | +30/94 | +
| projects.ts | +
+
+ |
+ 8.21% | +6/73 | +0% | +0/8 | +0% | +0/16 | +8.69% | +6/69 | +
| volunteer.ts | +
+
+ |
+ 34.69% | +34/98 | +36.36% | +4/11 | +22.22% | +4/18 | +35.78% | +34/95 | +
+ Press n or j to go to the next uncovered block, b, p or k for the previous block. +
+ +| 1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +12 +13 +14 +15 +16 +17 +18 +19 +20 +21 +22 +23 +24 +25 +26 +27 +28 +29 +30 +31 +32 +33 +34 +35 +36 +37 +38 +39 +40 +41 +42 +43 +44 +45 +46 +47 +48 +49 +50 +51 +52 +53 +54 +55 +56 +57 +58 +59 +60 +61 +62 +63 +64 +65 +66 +67 +68 +69 +70 +71 +72 +73 +74 +75 +76 +77 +78 +79 +80 +81 +82 +83 +84 +85 +86 +87 +88 +89 +90 +91 +92 +93 +94 +95 +96 +97 +98 +99 +100 +101 +102 +103 +104 +105 +106 +107 +108 +109 +110 +111 +112 +113 +114 +115 +116 +117 +118 +119 +120 +121 +122 +123 +124 +125 +126 +127 +128 +129 +130 +131 +132 +133 +134 +135 +136 +137 +138 +139 +140 +141 +142 +143 +144 +145 +146 +147 +148 +149 +150 +151 +152 +153 +154 +155 +156 +157 +158 +159 +160 +161 +162 +163 +164 +165 +166 +167 +168 +169 +170 +171 +172 +173 +174 +175 +176 +177 +178 +179 +180 +181 +182 +183 +184 +185 +186 +187 +188 +189 +190 +191 +192 +193 +194 +195 +196 +197 +198 +199 +200 +201 +202 +203 +204 +205 +206 +207 +208 +209 +210 +211 +212 +213 +214 +215 +216 +217 +218 +219 +220 +221 +222 +223 +224 +225 +226 +227 +228 +229 +230 +231 +232 +233 +234 +235 +236 +237 +238 +239 +240 +241 +242 +243 +244 +245 +246 +247 +248 +249 +250 +251 +252 +253 +254 +255 +256 +257 +258 +259 +260 +261 +262 +263 +264 +265 +266 +267 +268 +269 +270 +271 +272 +273 +274 +275 +276 +277 +278 +279 +280 +281 +282 +283 +284 +285 +286 +287 +288 +289 +290 +291 +292 +293 +294 +295 +296 +297 +298 +299 +300 +301 +302 +303 +304 +305 +306 +307 +308 +309 +310 +311 +312 +313 +314 +315 +316 +317 +318 +319 +320 +321 +322 +323 +324 +325 +326 +327 +328 +329 +330 +331 +332 +333 +334 +335 +336 +337 +338 +339 +340 +341 +342 +343 +344 +345 +346 +347 +348 +349 +350 +351 +352 +353 +354 +355 +356 +357 +358 +359 +360 +361 +362 +363 +364 +365 +366 +367 +368 +369 +370 +371 +372 +373 +374 +375 +376 +377 +378 +379 +380 +381 +382 +383 +384 +385 +386 +387 +388 +389 +390 +391 +392 +393 +394 +395 +396 +397 +398 +399 +400 +401 +402 | 2x +2x +2x + + + + + +2x +2x +2x + + + +2x + + + + + + + + + + + + + + + + + + + + + + + +3x + + + + + + + + + +3x +3x + + + + + +1x + + + +2x +2x +1x + + +1x +1x +1x +1x + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +1x +1x + +1x + + + + + + + + + + + + + + + +1x + +1x + + + + + + + + + + + + + + + + + + + + + + + + + +1x + + + + + + + + + + + + + + + + +1x + +1x + + + + + + + + + +1x + +1x +1x +1x + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | import db from "../db";
+import bcrypt from "bcrypt";
+import {
+ BadRequestError,
+ ExpressError,
+ UnauthorizedError,
+} from "../utils/errors";
+
+import { BCRYPT_WORK_FACTOR } from "../config";
+import { Volunteer } from "./volunteer";
+import { validateFields } from "../utils/validate";
+/**
+ * @todo: change get org by email function or refactor
+ */
+export class Organization {
+ /**
+ * Convert a user from the database into a user object that can be viewed publically.
+ * Don't show user's password
+ *
+ *
+ * @param {Organization} organization - user from database
+ * @returns public organization
+ */
+
+
+ static async register(creds: {
+ email: string;
+ password: string;
+ orgName: string;
+ founders: string;
+ orgDescription: string;
+ logoUrl?: string;
+ orgWebsite: string;
+ userType: string;
+
+
+ })
+ {
+ const requiredInfo = [
+ "orgName",
+ "orgDescription",
+ "email",
+ "logoUrl",
+ "userType",
+ "password",
+ "founders",
+ "orgWebsite",
+ ];
+ try {
+ validateFields({
+ required: requiredInfo,
+ obj: creds,
+ location: "org registration",
+ });
+ } catch (error) {
+ throw error;
+ }
+
+ const existingOrganizationWithEmail =
+ await Organization.fetchOrganizationByEmail(creds.email);
+ if (existingOrganizationWithEmail) {
+ throw new BadRequestError(`Duplicate email: ${creds.email}`);
+ }
+
+ const salt = await bcrypt.genSalt(BCRYPT_WORK_FACTOR);
+ const hashedPassword = await bcrypt.hash(creds.password, salt);
+ const normalizedOrgEmail = creds.email.toLowerCase().trim();
+ const orgResult = await db.query(
+ `INSERT INTO organizations (
+ organization_name,
+ organization_description,
+ organization_email,
+ logo_url,
+ founders,
+ website
+ )
+ VALUES ($1, $2, $3, $4, $5, $6)
+ RETURNING id,
+ organization_name,
+ organization_description,
+ organization_email,
+ logo_url,
+ founders,
+ website
+ `,
+ [
+ creds.orgName,
+ creds.orgDescription,
+ normalizedOrgEmail,
+ creds.logoUrl,
+ creds.founders,
+ creds.orgWebsite,
+ ]
+ );
+
+ const {
+ id,
+ organization_email,
+ organization_name,
+ logo_url,
+ founders,
+ organization_description,
+ website,
+ } = orgResult.rows[0];
+ console.log(orgResult.rows[0], organization_name)
+
+ const authResult = await db.query(
+ `INSERT INTO authentication (
+ email,
+ password,
+ user_type
+ )
+ VALUES ($1, $2, $3)
+ RETURNING
+ email,
+ password,
+ user_type
+ `,
+
+ [normalizedOrgEmail, hashedPassword, "organization"]
+ );
+
+ const { user_type } = authResult.rows[0];
+
+ return {
+ id: id,
+ email: organization_email,
+ orgName: organization_name,
+ orgDescription: organization_description,
+ logoUrl: logo_url,
+ founders: founders,
+ userType: user_type,
+ orgWebsite: website,
+ };
+ }
+ static async fetchInterestedVolunteersByEmail(email) {
+ // returns volunteer info based on email
+ const interestedVolunteersInfo = await db.query(
+ `SELECT *
+ FROM interested_volunteers
+ WHERE email = $1`,
+ [email.toLowerCase()]
+ );
+
+ return interestedVolunteersInfo.rows[0]
+ }
+
+ static async fetchOrganizationByEmail(org_email: string) {
+ // this is querying the organization table, going through the rows to find the
+ // item(that is access it) in the bracket(email in this case)
+ const org_result = await db.query(
+ `SELECT
+ id,
+ organization_name AS "orgName",
+ organization_description AS "orgDesc",
+ organization_email AS "email",
+ logo_url AS "imageUrl",
+ founders
+ FROM organizations
+ WHERE organization_email = $1`, // this does to filtering to make sure we are being
+ // specific to the item in the bracket we are looking for
+ // by checking if the item we passed in is equal to the row info already
+ // in the table
+ [org_email.toLowerCase()] // and this is assigning whatever is in the bracket to the row
+ // in that table after we find it
+ );
+
+ console.log("org res", org_result.rows);
+
+ const auth_result = await db.query(
+ `SELECT
+
+ user_type as "userType"
+
+ FROM authentication
+ WHERE email = $1`,
+ [org_email.toLowerCase()]
+ );
+
+ console.log("auth res", auth_result.rows[0]);
+
+ if (org_result.rows.length) {
+ console.log("returning org user: ", { ...org_result.rows[0], userType: "organization" })
+ return { ...org_result.rows[0], userType: "organization" };
+ }
+ return null;
+ }
+
+ // static async createOrganizationProject (projectInfo) {
+ // console.log("project info in create function: ", projectInfo)
+ // const result = await db.query(
+ // `INSERT INTO projects(
+ // org_id,
+ // project_name,
+ // project_description,
+ // image_url,
+ // requested_people,
+ // approved_people)
+ // VALUES ($1, $2, $3, $4, $5, $6)
+
+ // RETURNING org_id, project_name, project_description, image_url, requested_people, approved_people`,
+ // [projectInfo.org_id , projectInfo.project_name,projectInfo.project_description,projectInfo.image_url,projectInfo.requested_people,projectInfo.approved_people])
+
+ // return result.rows[0]
+ // }
+ static async toggleStateOfOrgProject(projectId, orgId) {
+
+ const activeResult = await db.query(`SELECT active FROM projects
+ WHERE id = $1 `,
+ [projectId])
+
+ console.log("active result", activeResult.rows[0].active)
+
+ const orgResult = await db.query(
+ `SELECT * FROM projects WHERE org_id = $1 AND id = $2`,
+ [orgId, projectId]
+ )
+ if (orgResult.rows.length !== 0) {
+ const result = await db.query(
+ `UPDATE "projects" SET "active" = $1
+ WHERE "id" = $2 AND "org_id" = $3
+ RETURNING *`,
+ [!activeResult.rows[0].active, projectId, orgId]
+ );
+ return result.rows;
+ } else {
+ throw new UnauthorizedError("Organization/Project not found");
+ }
+ }
+
+ static async deleteOrganizationProject(project_id, orgId) {
+ const orgResult = await db.query(
+ `SELECT * FROM projects WHERE org_id = $1 AND id = $2`,
+ [orgId, project_id]
+ );
+ if (orgResult.rows.length !== 0) {
+ const result = await db.query(
+ `DELETE FROM "projects" WHERE "id" = $1`,
+ [project_id]);
+ return true;
+ } else {
+ throw new UnauthorizedError("Organization/Project not found");
+ }
+ }
+
+ static async updateApprovedVolunteers(approved, email, project_id, org_id, initial_approval_state) {
+ // to check if the volunteer exist(if this does interestedVoluteersInfo will be populated)
+ const interestedVolunteersInfo =
+ await this.fetchInterestedVolunteersByEmail(email);
+
+ // to check if the project and( / for the )org exists if it does orgResult will be populated
+ const orgResult = await db.query(
+ `SELECT * FROM projects WHERE org_id = $1 AND id = $2`,
+ [org_id, project_id]
+ );
+ console.log("orgResult is here", orgResult);
+ // to check if the volunteer exist
+ if (interestedVolunteersInfo.length !== 0) {
+ console.log(
+ "the info of the volunteer if they exist",
+ interestedVolunteersInfo
+ );
+
+ // to check if the project and( / for the )org exists
+ if (orgResult.rows.length !== 0) {
+ // handles setting initial approval state and toggling given approval state
+ const approvalState = approved === null ? initial_approval_state : !approved
+ const result = await db.query(
+ `UPDATE "interested_volunteers" SET "approved" = $1
+ WHERE "email" = $2 AND "project_id" = $3
+ RETURNING *`,
+ [approvalState, email, project_id]
+
+ );
+ console.log("updating approved works!", result.rows)
+
+ return result.rows[0];
+
+ } else {
+ throw new UnauthorizedError("Organization/Project not found");
+ }
+ } else {
+ throw new UnauthorizedError("Volunteer Email not found");
+ }
+
+ }
+
+ static async incrementAndDecrementApprovedVolunteers(email, projectId, orgId, initialApprovalState) {
+ const approvedResult = await db.query(`SELECT approved FROM interested_volunteers
+ WHERE project_id = $1 AND email = $2`,
+ [projectId, email])
+
+ const approvedPeopleResult = await db.query(`SELECT approved_people FROM projects
+ WHERE id = $1 AND org_id = $2`,
+ [projectId, orgId])
+
+
+ console.log("approvedResult", approvedResult.rows[0])
+ console.log("approvedPeopleResult", approvedPeopleResult.rows[0])
+
+ const approvedVolunteerState = await this.updateApprovedVolunteers(approvedResult.rows[0].approved, email, projectId, orgId, initialApprovalState )
+
+ console.log("bringing volunteer state into incre/decre works!", approvedVolunteerState.approved)
+
+ console.log("approvedPeopleohhhhhh", approvedPeopleResult.rows[0].approved_people)
+ if (approvedVolunteerState.approved === true) {
+
+ console.log("here works!", approvedVolunteerState.approved)
+ const result = await db.query(
+ `UPDATE "projects" SET "approved_people" = $1
+ WHERE "org_id" = $2 AND "id" = $3
+ RETURNING *`,
+ [approvedPeopleResult.rows[0].approved_people + 1, orgId, projectId]
+
+ );
+ console.log(" the if in incre/decre works!", approvedVolunteerState.approved)
+ return approvedVolunteerState.approved;
+
+ } else if (approvedVolunteerState.approved === false) {
+ // reset number of approved back to 0 if number becomes negative
+ let numberOfApproved = approvedPeopleResult.rows[0].approved_people;
+ numberOfApproved = numberOfApproved < 0 ? 0 : numberOfApproved;
+
+ console.log("approved is false", typeof approvedPeopleResult.rows[0].approved_people)
+ const result = await db.query(
+ `UPDATE "projects" SET "approved_people" = $1
+ WHERE "org_id" = $2 AND "id" = $3
+ RETURNING *`,
+ [approvedPeopleResult.rows[0].approved_people - 1, orgId, projectId]
+
+ );
+ return approvedVolunteerState.approved;
+
+ } else {
+ throw new BadRequestError("Volunteer increment/decrement failed");
+ }
+ }
+
+
+
+ static async fetchAllOrganizationProjectsById(org_id) {
+ const result = await db.query(
+ // make sure this matches spelling in the table too!!
+ `SELECT
+ id,
+ org_id AS "orgId",
+ project_name AS "title",
+ project_description AS "description",
+ image_url as "imageUrl",
+ requested_people as "requestedPeople",
+ approved_people as "approvedPeople",
+ created_at as "createdAt",
+ active
+ FROM projects
+ WHERE org_id = $1`,
+ [org_id]
+ );
+
+ Iif (!result) {
+ throw new BadRequestError();
+ }
+ return result.rows;
+ }
+
+ static async fetchInterestedVolunteersByProjectId(projectId) {
+ const result = await db.query(
+ // make sure this matches spelling in the table too!!
+ // if this was insert, we would have assigned the data from insomnia
+ //to it but since it is select, we would be taking the data under the rows from
+ //the table we said
+ `SELECT
+ email, approved
+ FROM interested_volunteers
+ WHERE project_id = $1`,
+ [projectId]
+ // then project_id will then equal what we put in and then using that we can filter
+ // what we want from the table!
+ //which we then assign to result back in the route and then convert to json.
+ );
+
+ const interestedVolunteers = []
+ for await (const volunteerInfo of result.rows) {
+ // for each volunteer, we add an additional approved field
+ const volunteer = await Volunteer.getVolunteerByEmail(volunteerInfo.email);
+ console.log("retrieved volunteer: ", volunteer)
+ volunteer["approved"] = volunteerInfo.approved;
+ interestedVolunteers.push(volunteer)
+ }
+ return interestedVolunteers;
+ }
+
+ static async getOrgById(orgId: number) {
+ const query = `SELECT * FROM organizations WHERE id=$1`;
+ const result = await db.query(query, [orgId]);
+ const org = result.rows[0];
+ Iif (org) {
+ return org;
+ }
+ return null;
+ }
+}
+ |
+ Press n or j to go to the next uncovered block, b, p or k for the previous block. +
+ +| 1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +12 +13 +14 +15 +16 +17 +18 +19 +20 +21 +22 +23 +24 +25 +26 +27 +28 +29 +30 +31 +32 +33 +34 +35 +36 +37 +38 +39 +40 +41 +42 +43 +44 +45 +46 +47 +48 +49 +50 +51 +52 +53 +54 +55 +56 +57 +58 +59 +60 +61 +62 +63 +64 +65 +66 +67 +68 +69 +70 +71 +72 +73 +74 +75 +76 +77 +78 +79 +80 +81 +82 +83 +84 +85 +86 +87 +88 +89 +90 +91 +92 +93 +94 +95 +96 +97 +98 +99 +100 +101 +102 +103 +104 +105 +106 +107 +108 +109 +110 +111 +112 +113 +114 +115 +116 +117 +118 +119 +120 +121 +122 +123 +124 +125 +126 +127 +128 +129 +130 +131 +132 +133 +134 +135 +136 +137 +138 +139 +140 +141 +142 +143 +144 +145 +146 +147 +148 +149 +150 +151 +152 +153 +154 +155 +156 +157 +158 +159 +160 +161 +162 +163 +164 +165 +166 +167 +168 +169 +170 +171 +172 +173 +174 +175 +176 +177 +178 +179 +180 +181 +182 +183 +184 +185 +186 +187 +188 +189 +190 +191 +192 +193 +194 +195 +196 +197 +198 +199 +200 +201 +202 +203 +204 +205 +206 +207 +208 +209 +210 +211 +212 +213 +214 +215 +216 +217 +218 +219 +220 +221 +222 +223 +224 +225 +226 +227 +228 +229 +230 +231 +232 +233 +234 +235 +236 +237 +238 +239 +240 +241 +242 | +2x +2x +2x +2x +2x + + + + + + + + + + + + + +2x + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | import e from "express";
+import db from "../db";
+import { validateFields } from "../utils/validate";
+import { BadRequestError, NotFoundError } from "../utils/errors";
+import { Organization } from "./organization";
+import { Volunteer } from "./volunteer";
+export interface ProjectCardProp {
+ id: number,
+ title: string,
+ orgName: string,
+ founders: string,
+ orgUrl?: string,
+ description: string,
+ createdAt: string | number,
+ imageUrl: string,
+ requestedVolunteers: number,
+ approvedVolunteers: number,
+ tags: string[],
+}
+export class Projects {
+ /**
+ * Inserts a project and the info into the database
+ * @param projectInfo
+ */
+ static async registerProject(projectInfo: {
+ orgId: number;
+ name: string;
+ desc: string;
+ imageUrl?: string;
+ requestedPeople: number;
+ tags: string[];
+ orgName: string;
+ }) {
+ const requiredInfo = [
+ "orgId",
+ "name",
+ "desc",
+ "requestedPeople",
+ "tags",
+ "orgName",
+ ];
+ console.log(projectInfo);
+ try {
+ validateFields({
+ required: requiredInfo,
+ obj: projectInfo,
+ location: "project registration",
+ });
+ } catch (error) {
+ throw error;
+ }
+ const query = `INSERT into projects
+ (
+ org_id,
+ project_name,
+ project_description,
+ image_url,
+ requested_people,
+ org_name,
+ approved_people
+ )
+ VALUES($1,$2,$3,$4,$5,$6, $7)
+ RETURNING *`;
+ const result = await db.query(query, [
+ projectInfo.orgId,
+ projectInfo.name,
+ projectInfo.desc,
+ projectInfo.imageUrl || null,
+ projectInfo.requestedPeople,
+ projectInfo.orgName,
+ 0
+ ]);
+ console.log("made query in projects");
+ const { id } = result.rows[0];
+
+ projectInfo.tags.forEach((tag) => {
+ this.insertTag(id, tag);
+ });
+
+ return result.rows[0];
+ }
+
+ /**
+ * Get a list of volunteers that are interested in specific project
+ * @param id
+ */
+ static async getInterestedVolunteers(id: number) {}
+
+ /**
+ * Get a list of approved volunteers for a specific project
+ * @param id
+ */
+ static async getApprovedVolunteers(id: number) {}
+
+ /**
+ * Insert a project and corresponding tag into the project_tags table
+ * @param id
+ * @param tag
+ */
+ static async insertTag(id: number, tag: string) {
+ const query = `INSERT into project_tags(project_id, tag_name) VALUES ($1,$2) RETURNING *`;
+ await db.query(query, [id, tag]);
+ }
+
+ /**
+ * Get's all projects from database with info
+ * (currently only for volunteers )
+ * @returns
+ */
+ static async getAllProjects() : Promise<ProjectCardProp[]>{
+ const allProjects = []
+ const allProjectIds = (await db.query(`SELECT project_id FROM project_tags`)).rows;
+ console.log("project ids found", allProjectIds);
+
+ for await (const {project_id} of allProjectIds) {
+ const project = await this.fetchProjectByProjectId(project_id, "volunteer");
+ console.log("retrieved project: ", project);
+ allProjects.push(project);
+ }
+
+ return allProjects;
+ }
+
+ /**
+ * Returns project information given the project id
+ * (using the ProjectCardProp)
+ * @param id
+ */
+ static async fetchProjectByProjectId(
+ projectId: number,
+ userType: string,
+ email?: string
+ ) : Promise<ProjectCardProp> {
+ const query = `SELECT * FROM projects WHERE id=$1`;
+ const result = await db.query(query, [projectId]);
+ //destructure to extract important info about project
+ Iif (result.rows.length > 0) {
+ const {
+ id,
+ org_id,
+ project_name,
+ project_description,
+ created_at,
+ image_url,
+ requested_people,
+ approved_people,
+ } = result.rows[0];
+ const tags = await this.getProjectTags(id);
+ const { organization_name, founders, website, organization_description, logo_url } =
+ await Organization.getOrgById(org_id);
+ let projectCard = {
+ id: id,
+ orgName: organization_name,
+ orgDescription: organization_description,
+ orgLogoUrl: logo_url,
+ founders: founders,
+ orgUrl: website,
+ title: project_name,
+ description: project_description,
+ createdAt: created_at,
+ imageUrl: image_url,
+ requestedVolunteers: requested_people,
+ approvedVolunteers: approved_people,
+ tags: tags,
+ };
+
+ Iif (userType == "volunteer") {
+ // includes interested field only for volunteers
+ projectCard["interested"] = await Volunteer.expressedInterest(
+ projectId,
+ email
+ );
+ }
+ return projectCard;
+ }
+ throw new BadRequestError("Project not found");
+ }
+
+ static async getProjectsWithTag(tag: string) {
+ const query = `SELECT project_id FROM project_tags WHERE tag_name=$1`;
+ const result = await db.query(query, [tag]);
+
+ if (result.rows.length === 0) {
+ // Return an empty array if no projects are found with the given tag
+ return [];
+ } else {
+ const projectIds = result.rows.map((row: any) => row.project_id);
+ const projects = await Promise.all(
+ projectIds.map((projectId: number) =>
+ this.fetchProjectByProjectId(projectId, "volunteer")
+ )
+ );
+ return projects;
+ }
+ }
+
+ /**
+ * Get the tags of a project
+ * @param projectId
+ */
+ static async getProjectTags(projectId: number) {
+ const query = `SELECT tag_name FROM project_tags WHERE project_id=$1`;
+ const result = await db.query(query, [projectId]);
+ const tags = [];
+ Iif (result) {
+ result.rows.forEach((row: any) => {
+ tags.push(row.tag_name);
+ });
+ return tags;
+ }
+ }
+
+ static async getAllProjectTags() {
+ const query = `SELECT DISTINCT tag_name FROM project_tags`;
+ const result = await db.query(query, []);
+ const tags = [];
+ result.rows.forEach((row: any) => {
+ tags.push(row.tag_name);
+ });
+ return tags;
+ }
+
+ /**
+ * searches through the projects table - filtering by a search term
+ * @param term
+ * @returns array of projects results
+ */
+ static async searchProjects(term: string) {
+ const query = `SELECT * FROM projects WHERE project_name ILIKE $1`;
+ const searchTerm = `%${term}%`;
+ const result = await db.query(query, [searchTerm]);
+ console.log(result.rows);
+ const projectResults = [];
+ Iif (result) {
+ result.rows.forEach((row: any) => {
+ projectResults.push(row);
+ });
+ return projectResults;
+ }
+ }
+}
+ |
+ Press n or j to go to the next uncovered block, b, p or k for the previous block. +
+ +| 1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +12 +13 +14 +15 +16 +17 +18 +19 +20 +21 +22 +23 +24 +25 +26 +27 +28 +29 +30 +31 +32 +33 +34 +35 +36 +37 +38 +39 +40 +41 +42 +43 +44 +45 +46 +47 +48 +49 +50 +51 +52 +53 +54 +55 +56 +57 +58 +59 +60 +61 +62 +63 +64 +65 +66 +67 +68 +69 +70 +71 +72 +73 +74 +75 +76 +77 +78 +79 +80 +81 +82 +83 +84 +85 +86 +87 +88 +89 +90 +91 +92 +93 +94 +95 +96 +97 +98 +99 +100 +101 +102 +103 +104 +105 +106 +107 +108 +109 +110 +111 +112 +113 +114 +115 +116 +117 +118 +119 +120 +121 +122 +123 +124 +125 +126 +127 +128 +129 +130 +131 +132 +133 +134 +135 +136 +137 +138 +139 +140 +141 +142 +143 +144 +145 +146 +147 +148 +149 +150 +151 +152 +153 +154 +155 +156 +157 +158 +159 +160 +161 +162 +163 +164 +165 +166 +167 +168 +169 +170 +171 +172 +173 +174 +175 +176 +177 +178 +179 +180 +181 +182 +183 +184 +185 +186 +187 +188 +189 +190 +191 +192 +193 +194 +195 +196 +197 +198 +199 +200 +201 +202 +203 +204 +205 +206 +207 +208 +209 +210 +211 +212 +213 +214 +215 +216 +217 +218 +219 +220 +221 +222 +223 +224 +225 +226 +227 +228 +229 +230 +231 +232 +233 +234 +235 +236 +237 +238 +239 +240 +241 +242 +243 +244 +245 +246 +247 +248 +249 +250 +251 +252 +253 +254 +255 +256 +257 +258 +259 +260 +261 +262 +263 +264 +265 +266 +267 +268 +269 +270 +271 +272 +273 +274 +275 +276 +277 +278 +279 +280 +281 +282 +283 +284 +285 +286 +287 +288 +289 +290 +291 +292 +293 +294 +295 +296 +297 +298 +299 +300 +301 +302 +303 +304 +305 +306 +307 +308 +309 +310 +311 +312 +313 +314 +315 +316 +317 +318 +319 +320 +321 +322 +323 +324 +325 +326 +327 +328 +329 +330 +331 +332 +333 +334 +335 +336 +337 +338 +339 +340 +341 +342 +343 +344 +345 +346 +347 +348 +349 +350 +351 +352 +353 +354 +355 +356 +357 +358 +359 | 2x +2x +2x +2x +2x +2x + + + + + +2x + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +3x + + + + + + + + +3x +3x + + + + + +1x + + +2x + + +2x +1x + + +1x + + + +1x + +1x + + + + + + + + + + + + + + +1x + + + + + + + +1x + +1x + + +1x + + + + + +1x + +1x +1x + +1x + + + + + + + + + +1x + + + + + + + + + + + + + + + + +2x +2x + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +2x +2x +2x +2x +1x + +1x + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | import { BCRYPT_WORK_FACTOR } from "../config";
+import db from "../db";
+import { ExpressError, BadRequestError } from "../utils/errors";
+import { validateFields } from "../utils/validate";
+import bcrypt from "bcrypt";
+import { Projects } from "./projects";
+
+interface VolunteerInterface{
+
+}
+
+export class Volunteer {
+
+ // Static method to make a volunteer object
+ static async createPublicVolunteer(volunteer: {
+ id: number;
+ email: string;
+ first_name: string;
+ last_name: string;
+ bio: string;
+ image_url: string;
+ }) {
+ const skills = await this.fetchAllVolunteerSkills(volunteer.email);
+ const approvedProjects = await this.getApprovedProjects(volunteer.email);
+
+ return {
+ id: volunteer.id,
+ firstName: volunteer.first_name,
+ lastName: volunteer.last_name,
+ email: volunteer.email,
+ bio: volunteer.bio,
+ imageUrl: volunteer.image_url,
+ skills: skills,
+ approvedProjects: approvedProjects,
+ userType: "volunteer",
+ };
+ }
+
+
+
+ //interface??? could be useful to define types
+
+ /**
+ * Register volunteer with their information in the database
+ * @param volunteerInfo
+ */
+ static async register(volunteerInfo: {
+ email: string;
+ password: string;
+ firstName: string;
+ lastName: string;
+ imageUrl?: string;
+ bio: string;
+ skills: string[];
+ userType: string;
+ }) {
+ const requiredInfo = [
+ "email",
+ "password",
+ "firstName",
+ "lastName",
+ "bio",
+ "skills",
+ "userType",
+ ];
+ try {
+ validateFields({
+ required: requiredInfo,
+ obj: volunteerInfo,
+ location: "user registration",
+ });
+ } catch (error) {
+ throw error;
+ }
+
+ const existingVolunteer = await this.fetchVolunteerByEmail(
+ volunteerInfo.email
+ );
+ if (existingVolunteer != null) {
+ throw new BadRequestError(`Duplicate email: ${volunteerInfo.email}`);
+ }
+
+ const hashedPassword = await bcrypt.hash(
+ volunteerInfo.password,
+ BCRYPT_WORK_FACTOR
+ );
+ const normalizedEmail = volunteerInfo.email.toLowerCase();
+
+ const query = `INSERT INTO volunteers(
+ email,
+ first_name,
+ last_name,
+ bio,
+ image_url
+ )
+ VALUES ($1, $2, $3, $4, $5)
+ RETURNING id,
+ email,
+ first_name AS "firstName",
+ last_name AS "lastName",
+ bio,
+ image_url as "imageUrl"`;
+
+ const result = await db.query(query, [
+ normalizedEmail,
+ volunteerInfo.firstName,
+ volunteerInfo.lastName,
+ volunteerInfo.bio,
+ volunteerInfo.imageUrl || null,
+ ]);
+
+ const { id, email, firstName, lastName, bio, imageUrl } = result.rows[0];
+
+ const queryPassword = `INSERT into authentication (email, password, user_type)
+ VALUES($1, $2, $3) RETURNING id, email, password,user_type as "userType"`;
+
+ const passwordResult = await db.query(queryPassword, [
+ normalizedEmail,
+ hashedPassword,
+ volunteerInfo.userType,
+ ]);
+
+ const { userType } = passwordResult.rows[0];
+
+ volunteerInfo.skills.forEach((skill) => {
+ this.insertSkill(volunteerInfo.email, skill);
+ });
+ console.log({
+ id: id,
+ email: email,
+ firstName: firstName,
+ lastName: lastName,
+ imageUrl: imageUrl,
+ bio: bio,
+ skills: volunteerInfo.skills,
+ userType: userType,
+ })
+ return {
+ id: id,
+ email: email,
+ firstName: firstName,
+ lastName: lastName,
+ imageUrl: imageUrl,
+ bio: bio,
+ skills: volunteerInfo.skills,
+ userType: userType,
+ };
+ }
+
+ /**
+ * Adds a skill corresponding with the volunteer in the volunteer_skills database
+ */
+
+ static async insertSkill(emailInput: string, skillInput: string) {
+ const query = `INSERT into volunteer_skills(email, skill) VALUES ($1, $2) RETURNING *`;
+ const result = await db.query(query, [emailInput, skillInput]);
+ }
+
+ /**
+ * Gets all the skills logged for the volunteer
+ * @param email
+ */
+
+ static async fetchAllVolunteerSkills(email: string) {
+ const query = `SELECT skill FROM volunteer_skills WHERE email=$1`;
+ const result = await db.query(query, [email]);
+ const skills = [];
+ result.rows.forEach((row) => {
+ skills.push(row.skill);
+ });
+ return skills;
+ }
+
+ /**
+ * Get all the projects the volunteer has applied for or expressed interest in
+ * @param email
+ * @returns
+ */
+
+ static async getInterestedProjects(email: string) {
+ // retrieve all project ids for a given user
+ const query = `SELECT project_id FROM interested_volunteers WHERE email=$1 and approved=$2`;
+ const result = await db.query(query, [email, false]);
+ // getting all interested projects
+ const interestedProjects = [];
+
+ for await (const {project_id} of result.rows) {
+ // for each project id, retrieve the project object for a volunteer
+ const project = await Projects.fetchProjectByProjectId(project_id, "volunteer");
+ interestedProjects.push(project);
+ }
+
+ return interestedProjects;
+ }
+
+ /**
+ * Get all the currently approved projects for a specific student
+ * @param email
+ * @returns
+ */
+
+ static async getApprovedProjects(email: string) {
+ const query = `SELECT project_id FROM interested_volunteers WHERE email=$1 AND approved=TRUE`;
+ const result = await db.query(query, [email]);
+
+ Iif (result) {
+ return result.rows;
+ }
+ return null;
+ }
+
+ /**
+ * Fetch a volunteer in the database by email
+ * @param email
+ * @returns volunteer if found, null if not
+ */
+
+ static async fetchVolunteerByEmail(email: string) {
+ const query = `SELECT * FROM volunteers WHERE email=$1`;
+ const result = await db.query(query, [email]);
+ const volunteer = result.rows[0];
+ if (volunteer) {
+ return volunteer;
+ }
+ return null;
+ }
+
+ // add a check to make sure that the user type IS volunteer (middleware). do the same for organization
+
+ /**
+ * When a volunteer expresses interest in a project, log it into database
+ * @param projectId
+ * @param email
+ */
+ static async expressInterest(projectId: number, email: string) {
+ const volunteerCheck = await this.expressedInterest(projectId, email);
+ Iif (volunteerCheck) {
+ throw new BadRequestError("Already expressed interest")
+ }
+ const query = ` INSERT into interested_volunteers(email, project_id, approved)
+ VALUES ($1,$2,$3)
+ RETURNING
+ email,
+ project_id as "projectId",
+ approved`;
+ const result = await db.query(query, [email, projectId, null]);
+ return true ;
+ }
+ static async expressUninterest(projectId: number, email: string) {
+ // first check if user hasn't already expressed interest
+ const existingInterestedVolunteer = await db.query(
+ `SELECT * FROM interested_volunteers WHERE email=$1`, [email]
+ )
+ Iif (existingInterestedVolunteer.rows > 0) {
+ throw new BadRequestError("User is already not interested")
+ }
+ // then remove volunteer from table
+ const query = ` DELETE FROM interested_volunteers
+ WHERE project_id=$1 AND email=$2`;
+
+ const result = await db.query(query, [projectId, email]);
+ return true;
+ }
+
+ /**
+ *
+ * @param email
+ * @returns ranked projects based on a volunteers skills tags
+ */
+ static async getVolunteersProjectFeed(email: string) {
+ // needs error catching to avoid server breaking (long-term: needs code refactoring)
+ const projects = new Set<any>();
+ const volunteerSkills = await this.fetchAllVolunteerSkills(email);
+
+ await Promise.all(
+ volunteerSkills.map(async (tag: string) => {
+ const tagProjects = await Projects.getProjectsWithTag(tag);
+ tagProjects.forEach((project) => {
+ projects.add(project); // Use add() to add unique project objects to the Set
+ });
+ })
+ )
+
+ // add remaing projects to the end
+ const remainingProjects = await Projects.getAllProjects()
+ console.log("found remaining Projects: ", remainingProjects);
+ remainingProjects.forEach((remainingProject) => {
+ Iif (!projects.has(remainingProject)){
+ projects.add(remainingProject);
+ }
+ })
+
+ // get all remaining projects and return them
+
+ return Array.from(projects);
+ }
+
+
+
+
+/**
+ * Returns a boolean indicating whether a volunteer has expressed interest in a specific project
+ * @param projectId
+ * @param email
+ * @returns boolean
+ */
+static async expressedInterest(projectId:number, email:string){
+ const query = `SELECT * FROM interested_volunteers WHERE email=$1 AND project_id=$2`;
+ const result = await db.query(query, [email, projectId]);
+ Iif (result.rows[0]){
+ return true;
+ }
+ return false;
+}
+
+/**
+ * Returns a boolean indicating whether a volunteer was approved for a specific project
+ * @param projectId
+ * @param email
+ * @returns boolean
+ * @throws BadRequestError
+ */
+
+static async checkStatusProject(projectId:number, email:string){
+ const query = `SELECT * FROM interested_volunteers WHERE email=$1 AND project_id=$2`;
+ const result = await db.query(query, [email, projectId]);
+ Iif (result.rows[0]){
+ return result.rows[0].approved;
+ }
+ throw new BadRequestError(`${email} has not expressed interest in project ${projectId}`);
+}
+
+/**
+ * returns volunteer info from the volunteers table
+ * @param email email of the volunteer
+ * @returns all columns from the volunteer table
+ */
+static async getVolunteerByEmail(email : string){
+ const query = `SELECT
+ id,
+ bio,
+ email,
+ first_name as "firstName",
+ last_name as "lastName",
+ image_url as "imageUrl"
+
+ FROM volunteers
+ WHERE email=$1`;
+ const result = await db.query(query, [email]);
+
+ console.log("fetching volunteer by email: ", result.rows)
+ Iif (result.rows.length > 0){
+ return result.rows[0];
+ }
+ throw new BadRequestError(`no volunteer exists with the following email: ${email}`);
+
+}
+
+} |
+ Press n or j to go to the next uncovered block, b, p or k for the previous block. +
+ +| 1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +12 +13 +14 +15 +16 +17 +18 +19 +20 +21 +22 +23 +24 +25 +26 +27 +28 +29 +30 +31 +32 +33 +34 +35 +36 +37 +38 +39 +40 +41 +42 +43 +44 +45 +46 +47 +48 +49 +50 +51 +52 +53 +54 +55 | 2x + + + + +6x +6x +6x + + + + + +2x + +4x + + + + + +2x + + + + + + + +2x + + + + + + + +2x + + + + + + + +2x + +2x + + + + + + + | export class ExpressError extends Error {
+ public message: string;
+ public status: number;
+
+ constructor(message: string, status: number) {
+ super();
+ this.message = message;
+ this.status = status;
+ }
+}
+
+/** 400 BAD REQUEST error. */
+
+export class BadRequestError extends ExpressError {
+ constructor(message = "Bad Request") {
+ super(message, 400)
+ }
+}
+
+/** 401 UNAUTHORIZED error. */
+
+export class UnauthorizedError extends ExpressError {
+ constructor(message = "Unauthorized") {
+ super(message, 401)
+ }
+}
+
+/** 403 Forbidden error. */
+
+export class ForbiddenError extends ExpressError {
+ constructor(message = "Forbidden") {
+ super(message, 403)
+ }
+}
+
+/** 404 NOT FOUND error. */
+
+export class NotFoundError extends ExpressError {
+ constructor(message = "Not Found") {
+ super(message, 404)
+ }
+}
+
+/** 422 Unprocessable Entity error */
+
+export class UnprocessableEntityError extends ExpressError {
+ constructor(message = "Unprocessable Entity") {
+ super(message, 422)
+ }
+ }
+
+
+
+
+ |
+ Press n or j to go to the next uncovered block, b, p or k for the previous block. +
+ +| File | ++ | Statements | ++ | Branches | ++ | Functions | ++ | Lines | ++ |
|---|---|---|---|---|---|---|---|---|---|
| errors.ts | +
+
+ |
+ 78.57% | +11/14 | +0% | +0/5 | +50% | +3/6 | +78.57% | +11/14 | +
| validate.ts | +
+
+ |
+ 91.66% | +11/12 | +71.42% | +5/7 | +100% | +3/3 | +100% | +10/10 | +
+ Press n or j to go to the next uncovered block, b, p or k for the previous block. +
+ +| 1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +12 +13 +14 +15 +16 +17 +18 +19 +20 +21 +22 +23 +24 +25 +26 | 2x + +2x +34x + + + + + + + +2x + +6x +6x +34x +34x +2x + + + + + + +2x + | import { UnprocessableEntityError } from "./errors";
+
+const isNil = (value: any): boolean =>
+ value === null || typeof value === "undefined" || String(value).trim() === "";
+
+interface ValidateFieldsOptions {
+ required: string[];
+ obj: Record<string, any>;
+ location?: string;
+}
+
+const validateFields = ({ required, obj, location }: ValidateFieldsOptions): void => {
+
+ Iif (!obj) throw new UnprocessableEntityError(`Missing object for validation.`);
+ required.forEach((item) => {
+ console.log("item: ", obj[item])
+ if (isNil(obj[item])) {
+ throw new UnprocessableEntityError(
+ `Required field - ${item} missing${location ? ` at ${location}` : ""}`
+ );
+ }
+ });
+};
+
+export { validateFields, isNil };
+ |
The specified file was not found on this website. Please check the URL for mistakes and try again.
+This page was generated by the Firebase Command-Line Interface. To modify it, edit the 404.html file in your project's configured public directory.
The specified file was not found on this website. Please check the URL for mistakes and try again.
+This page was generated by the Firebase Command-Line Interface. To modify it, edit the 404.html file in your project's configured public directory.
You're seeing this because you've successfully setup Firebase Hosting. Now it's time to go build something extraordinary!
+ Open Hosting Documentation +Firebase SDK Loading…
+ + + + diff --git a/volunteerverse-ui/public/vite.svg b/volunteerverse-ui/public/vite.svg new file mode 100644 index 00000000..e7b8dfb1 --- /dev/null +++ b/volunteerverse-ui/public/vite.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/volunteerverse-ui/src/.env b/volunteerverse-ui/src/.env new file mode 100644 index 00000000..e69de29b diff --git a/volunteerverse-ui/src/App.css b/volunteerverse-ui/src/App.css new file mode 100644 index 00000000..4b5080ca --- /dev/null +++ b/volunteerverse-ui/src/App.css @@ -0,0 +1,43 @@ +#root { + /* max-width: 1280px; */ + margin: 0 auto; + /* padding: 2rem; */ + text-align: center; + max-width: auto; +} + +.logo { + height: 6em; + padding: 1.5em; + will-change: filter; + transition: filter 300ms; +} +.logo:hover { + filter: drop-shadow(0 0 2em #646cffaa); +} +.logo.react:hover { + filter: drop-shadow(0 0 2em #61dafbaa); +} + +@keyframes logo-spin { + from { + transform: rotate(0deg); + } + to { + transform: rotate(360deg); + } +} + +@media (prefers-reduced-motion: no-preference) { + a:nth-of-type(2) .logo { + animation: logo-spin infinite 20s linear; + } +} + +.card { + padding: 2em; +} + +.read-the-docs { + color: #888; +} diff --git a/volunteerverse-ui/src/App.tsx b/volunteerverse-ui/src/App.tsx new file mode 100644 index 00000000..43e79d8b --- /dev/null +++ b/volunteerverse-ui/src/App.tsx @@ -0,0 +1,93 @@ +import { AppShell, MantineProvider } from '@mantine/core'; +import { Notifications } from '@mantine/notifications'; +import { BrowserRouter, Route, Routes } from "react-router-dom"; +import './App.css'; +import Navbar from './components/Navbar'; +import { AuthenticationContext } from './context/AuthenicationContext'; +import Landing from './pages/Landing/Landing'; +import Login from './pages/Login'; +import NotFound from './pages/NotFound'; +import CreateProject from './pages/Org/CreateProject'; +import OrgHome from './pages/Org/Home/OrgHome'; +import OrgProjectDetailsTabs from './pages/Org/OrgProjectDetails/OrgProjectTabs'; +import SignUp from './pages/SignUp/SignUp'; +import VolunteerHome from './pages/Volunteer/Home/VolunteerHome'; +import MyProjects from './pages/Volunteer/MyProjects'; +import VolunteerProjectDetails from './pages/Volunteer/VolunteerProjectDetails'; +import { useAuthentication } from './services/hooks/useAuthentication'; + +function App() { + /** + * @todo: + * implement loader states as well + * test login + * start building first all functional pages for the volunteer + * then styling each one by one. + * then switch to organization + * then look into stretch features: + * start web scraping data from democracy lab + * email validation, password security, photo image hosting + */ + // Appshell is used to navbar overlay across all pages + const authProps = useAuthentication(); + console.log(authProps) + const { isValidOrg, isAuth } = authProps; + return ( + <> +