Applicant Profile
+ {['admin'].includes(userInformation.role) && ( +Application Statuses
-
+ getApplicant(applicant._id)}>
+ Refresh
+
+
+
+ Personal Information
+Personal Information
-Application Status
+
+ handleStatUpdate(status.key)}
+ className="ms-2"
+ >
+ Update
+
+ ) : (
+
+
+ {status.label}
+
+ {['admin', 'manager'].includes(userInformation.role) ? (
+
+ {applicant?.statuses?.journey &&
+ status.key in applicant.statuses.journey
+ ? applicant.statuses.journey[status.key]
+ ? 'Yes'
+ : 'No'
+ : 'N/A'}
+
+ No Permission
+ )} +Work Information
Pre-employment Requirements
+Required Documents
+
+ {['admin', 'manager', 'recruiter'].includes(userInformation.role) && (
+ handleDelete(applicant._id)}
+ >
+ Delete
+
+ )}
+ {['admin', 'manager', 'recruiter'].includes(userInformation.role) && (
+ handleReject(applicant._id)}
+ disabled={isRejectLoading}
+ >
+ {isRejectLoading ? 'Loading...' : 'Reject'}
+
+ )}
+
+ {/*
Recent Interviews
@@ -299,7 +299,7 @@ const Interviews = () => { setIsInterviewFormVisible(true) }} > - Manage + Issue a Job Offer?Joboffers
@@ -210,6 +253,7 @@ const Joboffers = () => { }} state={jobofferFormState} joboffer={jobOffer} + applicantData={applicant} />Personal Information
Eligible for Job Offer
+
+
+
+ No eligible applicants found
+
+ + {applicant.lastname}, {applicant.firstname} {applicant.middlename}{' '} + {applicant.suffix && applicant.suffix} +
+
+ Approved Date: {formatDate(jobofferData.approvedDate)}
+
+ Approved By:{' '}
+ {(jobofferData.approvedBy.lastname, jobofferData.approvedBy.firstname)}
+
{j.title}
- Responsibilities:{' '}
+ Author:
+ {typeof job.author === 'string'
+ ? job.author // If it's a string, display it as is
+ : job.author && job.author.firstname // If it's an object, display full name
+ ? `${job.author.firstname} ${job.author.lastname}`
+ : 'Unknown'}
+
+
+ Responsibilities:
{trimString(j.responsibilities, 50)}
- Requirements:{' '} + Requirements: {trimString(j.requirements, 50)}
- Qualifications:{' '} + Qualifications: {trimString(j.qualifications, 50)}
@@ -863,7 +871,7 @@ const ScreeningForm = ({ isVisible, onClose, state, applicant }) => {
+ handleOpen(key)}>
+ View
+
+ handleUploadClick(key)}>
+ Reupload
+
+
+ ) : (
+
@@ -165,33 +164,12 @@ const Login = () => {
)}
-
+
+
+ {successMessage} }
+ {submissionError && {submissionError} }
+
+
+
+
+
+
+
+
+ )
+}
+
+export default OTPPage
diff --git a/client/src/views/dashboard/MainChart.jsx b/client/src/views/dashboard/MainChart.jsx
index 922c0d02..c0dafa13 100644
--- a/client/src/views/dashboard/MainChart.jsx
+++ b/client/src/views/dashboard/MainChart.jsx
@@ -1,133 +1,101 @@
-import React, { useEffect, useRef } from 'react'
-
+import React, { useEffect, useRef, useMemo } from 'react'
+import PropTypes from 'prop-types'
import { CChartLine } from '@coreui/react-chartjs'
import { getStyle } from '@coreui/utils'
-const MainChart = () => {
+const MainChart = ({ labels, datasets }) => {
const chartRef = useRef(null)
+ // Dynamically calculate the max and stepSize for Y-axis
+ const { maxY, stepSize } = useMemo(() => {
+ const allDataPoints = datasets.flatMap(dataset => dataset.data)
+ const max = Math.max(...allDataPoints, 0)
+ const roundedMax = Math.ceil(max / 50) * 50 || 250
+ return {
+ maxY: roundedMax,
+ stepSize: Math.ceil(roundedMax / 5),
+ }
+ }, [datasets])
+
useEffect(() => {
- document.documentElement.addEventListener('ColorSchemeChange', () => {
+ const updateColors = () => {
if (chartRef.current) {
- setTimeout(() => {
- chartRef.current.options.scales.x.grid.borderColor = getStyle(
- '--cui-border-color-translucent',
- )
- chartRef.current.options.scales.x.grid.color = getStyle('--cui-border-color-translucent')
- chartRef.current.options.scales.x.ticks.color = getStyle('--cui-body-color')
- chartRef.current.options.scales.y.grid.borderColor = getStyle(
- '--cui-border-color-translucent',
- )
- chartRef.current.options.scales.y.grid.color = getStyle('--cui-border-color-translucent')
- chartRef.current.options.scales.y.ticks.color = getStyle('--cui-body-color')
- chartRef.current.update()
- })
+ const xGrid = chartRef.current.options.scales.x.grid
+ const xTicks = chartRef.current.options.scales.x.ticks
+ const yGrid = chartRef.current.options.scales.y.grid
+ const yTicks = chartRef.current.options.scales.y.ticks
+
+ xGrid.borderColor = getStyle('--cui-border-color-translucent')
+ xGrid.color = getStyle('--cui-border-color-translucent')
+ xTicks.color = getStyle('--cui-body-color')
+
+ yGrid.borderColor = getStyle('--cui-border-color-translucent')
+ yGrid.color = getStyle('--cui-border-color-translucent')
+ yTicks.color = getStyle('--cui-body-color')
+
+ chartRef.current.update()
}
- })
- }, [chartRef])
+ }
- const random = () => Math.round(Math.random() * 100)
+ document.documentElement.addEventListener('ColorSchemeChange', updateColors)
+ return () => document.documentElement.removeEventListener('ColorSchemeChange', updateColors)
+ }, [])
return (
- <>
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ {journeyProgression && (
+
+
+
+ {currentStages.map((item, i) => (
+
+
+
+
+
+
+ ))}
+
+
+
+
+ */}
+ {/*
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {progress.map((item, index, items) => (
+
+
+ ))}
+
+
+
+
+
+ {/*
+ {currentStages.map((item, i) => (
+
+
+
+
+
-
-
+ ))}
+
+
+
+
+
+
+
+
+
+
+
+ {/* ID */}
+ User
+ Qualification
+ Experience
+ Job Applied For
+ Activity
+ Actions
+
+
+
+ {recentApplicants.map((applicant, index) => (
+
+
+ {/*
+ {/* {applicant._id} */}
+ {`${applicant.firstname} ${applicant.lastname}`}
+ {applicant.highestQualification}
+ {applicant.yearsOfExperience} years
+ {applicant.jobAppliedFor}
+
+ Last updated: {formatDate(applicant.createdAt)}
+
+
+ gotoApplicant(applicant)}>
+ Manage
+
+
+
+ ))}
+
+
+
+
+
+
+ Top Jobs Applied For
+
+
+
+
+
+
+
+ Top Qualifications
+
+
+
+
+
+
+
+ Graduation Year Distribution
+
+
+
+
+
+
+
+ Experience Breakdown
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Total Job Postings
+
+
+
+
+
+
+
+ Active Job Postings
+
+
+
+
+
+
+
+ Expired Job Postings
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Title
+ Type
+ Location
+ Salary Range
+ Status
+ Created At
+ Actions
+
+
+
+ {recentJobs.map((job, index) => (
+
+ {job.title}
+ {job.type}
+ {job.location}
+ {formatCurrency(job.salary_min)} - {formatCurrency(job.salary_max)}
+ {job.status || '—'}
+ {formatDate(job.createdAt)}
+
+
+ Manage
+
+
+
+ ))}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Name
+ Type
+ Date
+ Available
+ Facility
+ Created At
+ {/* Actions */}
+
+
+
+ {recentEvents.map((job, index) => (
+
+ {job.name}
+ {job.type}
+ {formatDate(job.date)}
+ {job.isAvailable ? 'Yes' : 'No'}
+ {job.facility.name}
+ {formatDate(job.createdAt)}
+ {/*
+
+ Manage
+
+ */}
+
+ ))}
+
+
+
)
}
diff --git a/client/src/views/facility/modals/EventForm.jsx b/client/src/views/facility/modals/EventForm.jsx
index 623670da..fafcf93e 100644
--- a/client/src/views/facility/modals/EventForm.jsx
+++ b/client/src/views/facility/modals/EventForm.jsx
@@ -24,13 +24,15 @@ import {
CFormLabel,
CFormSelect,
CFormSwitch,
+ CInputGroupText,
+ CInputGroup,
} from '@coreui/react'
import React, { useContext, useEffect, useState } from 'react'
import propTypes from 'prop-types'
import { AppContext } from '../../../context/appContext'
import { z } from 'zod'
-import { useForm } from 'react-hook-form'
+import { useFieldArray, useForm } from 'react-hook-form'
import { zodResolver } from '@hookform/resolvers/zod'
import { del, get, post, put } from '../../../api/axios'
import { config } from '../../../config'
@@ -41,6 +43,29 @@ import InterviewForm from './InterviewForm'
import ConfirmationDialog from '../../../components/ConfirmationDialog'
+const EVENT_TYPES = [
+ 'Initial Interview',
+ 'Final Interview',
+ 'Technical Interview',
+ 'Panel Interview',
+ 'Behavioral Interview',
+ 'Orientation',
+ 'Other',
+]
+
+const EventSchema = z.object({
+ name: z.string().min(3).max(50),
+ description: z.string().optional(),
+ capacity: z.number().int().positive(),
+ type: z.enum(EVENT_TYPES, {
+ errorMap: () => ({ message: 'Invalid Event Type' }),
+ }),
+ isApproved: z
+ .union([z.boolean(), z.object({ status: z.boolean() })])
+ .transform((val) => (typeof val === 'boolean' ? val : val.status))
+ .default(false),
+})
+
const EventForm = ({ isVisible, onClose, slot, state }) => {
const { addToast } = useContext(AppContext)
const { userInformation } = useContext(AuthContext)
@@ -49,7 +74,6 @@ const EventForm = ({ isVisible, onClose, slot, state }) => {
const [isEventLoading, setIsEventLoading] = useState(false)
const [eventFormState, setEventFormState] = useState('view')
const [isReadOnly, setIsReadOnly] = useState(true)
- const [eventTypes, setEventTypes] = useState(['Initial Interview', 'Final Interview', 'Other'])
const [isSubmitLoading, setIsSubmitLoading] = useState(false)
const [isRemoveLoading, setIsRemoveLoading] = useState(false)
@@ -95,21 +119,9 @@ const EventForm = ({ isVisible, onClose, slot, state }) => {
}
}
- const EventSchema = z.object({
- name: z.string().min(3).max(50),
- description: z.string().optional(),
- capacity: z.number().int().positive(),
- type: z.enum(eventTypes, {
- errorMap: () => ({ message: 'Invalid Event Type' }),
- }),
- isApproved: z
- .union([z.boolean(), z.object({ status: z.boolean() })])
- .transform((val) => (typeof val === 'boolean' ? val : val.status))
- .default(false),
- })
-
const {
register,
+ control,
watch,
handleSubmit,
reset: formReset,
@@ -130,12 +142,21 @@ const EventForm = ({ isVisible, onClose, slot, state }) => {
const handleEventSubmit = async (data) => {
try {
setIsSubmitLoading(true)
- const formData = new FormData()
- formData.append('name', data.name)
- formData.append('description', data.description)
- formData.append('capacity', data.capacity)
- formData.append('type', data.type)
- formData.append('isApproved', data.isApproved)
+ // const formData = new FormData()
+ // formData.append('name', data.name)
+ // formData.append('description', data.description)
+ // formData.append('capacity', data.capacity)
+ // formData.append('type', data.type)
+ // formData.append('isApproved', data.isApproved)
+
+ const formData = {
+ name: data.name,
+ description: data.description,
+ requirements: data.requirements,
+ capacity: data.capacity,
+ type: data.type,
+ isApproved: data.isApproved,
+ }
console.log('Event Form', formData)
@@ -406,7 +427,7 @@ const EventForm = ({ isVisible, onClose, slot, state }) => {
disabled={isReadOnly}
>
- {eventTypes.map((eventType) => (
+ {EVENT_TYPES.map((eventType) => (
diff --git a/client/src/views/facility/modals/FacilityForm.jsx b/client/src/views/facility/modals/FacilityForm.jsx
index 7f62f49b..6ab207a5 100644
--- a/client/src/views/facility/modals/FacilityForm.jsx
+++ b/client/src/views/facility/modals/FacilityForm.jsx
@@ -24,56 +24,84 @@ import {
CModalBody,
CModalFooter,
CFormTextarea,
+ CFormLabel,
} from '@coreui/react'
import React, { useContext, useEffect, useState } from 'react'
import propTypes from 'prop-types'
import { AppContext } from '../../../context/appContext'
import { z } from 'zod'
-import { useForm } from 'react-hook-form'
+import { useFieldArray, useForm } from 'react-hook-form'
import { zodResolver } from '@hookform/resolvers/zod'
import { post, put } from '../../../api/axios'
import { config } from '../../../config'
+import { AuthContext } from '../../../context/authContext'
+
+const RequirementSchema = z.object({
+ title: z.string().min(1, 'Title is required'),
+ description: z.string().optional(),
+})
+
+const formSchema = z.object({
+ name: z.string().nonempty('Name is required'),
+ type: z.string().nonempty('Type is required'),
+ description: z.string().nonempty('Description is required'),
+ requirements: z.array(RequirementSchema).optional(),
+ location: z.string().nonempty('Location is required'),
+})
const FacilityForm = ({ isVisible, onClose, isEdit, facilityData }) => {
const { addToast } = useContext(AppContext)
+ const { userInformation } = useContext(AuthContext)
const [isSubmitLoading, setIsSubmitLoading] = useState(false)
- const formSchema = z.object({
- name: z.string().nonempty('Name is required'),
- type: z.string().nonempty('Type is required'),
- description: z.string().nonempty('Description is required'),
- location: z.string().nonempty('Location is required'),
- })
-
const {
register,
+ control,
handleSubmit,
+ setValue,
reset: formReset,
formState: { errors },
} = useForm({
resolver: zodResolver(formSchema),
+ defaultValues: facilityData || { requirements: [] }, // Ensure default values are set on load
+ })
+
+ const { fields, append, remove } = useFieldArray({
+ control,
+ name: 'requirements',
})
const handleFormSubmit = async (data) => {
console.log('Form data:', data)
try {
setIsSubmitLoading(true)
- const formData = new FormData()
- formData.append('name', data.name)
- formData.append('type', data.type)
- formData.append('description', data.description)
- formData.append('location', data.location)
+
+ const formData = {
+ name: data.name,
+ type: data.type,
+ description: data.description,
+ requirements: data.requirements || [],
+ location: data.location,
+ }
const res = isEdit
? await put(`/facilities/update/${facilityData._id}`, formData)
- : await post('/facilities/create', data)
+ : await post('/facilities/create', formData)
+
if (res.status === 200 || res.status === 201) {
addToast('Success', 'Facility Added Successfully', 'success')
}
+
+ // Update form values with the response data
+ setValue('name', res.data.data.name)
+ setValue('type', res.data.data.type)
+ setValue('description', res.data.data.description)
+ setValue('requirements', res.data.data.requirements || [])
+ setValue('location', res.data.data.location)
+
setIsSubmitLoading(false)
- formReset()
onClose()
} catch (error) {
console.error(error)
@@ -87,6 +115,7 @@ const FacilityForm = ({ isVisible, onClose, isEdit, facilityData }) => {
type: 'Facility Type',
description: 'Facility Description',
location: 'Facility Location',
+ requirements: [{ title: 'Requirement 1', description: 'Description 1' }],
})
}
@@ -95,15 +124,16 @@ const FacilityForm = ({ isVisible, onClose, isEdit, facilityData }) => {
formReset()
}
- if (isEdit) {
+ if (isEdit && facilityData) {
formReset({
name: facilityData?.name,
type: facilityData?.type,
description: facilityData?.description,
location: facilityData?.location,
+ requirements: facilityData?.requirements || [], // Default empty array if no requirements
})
}
- }, [isVisible, isEdit])
+ }, [isVisible, isEdit, facilityData, formReset])
return (
{
label="Facility Name"
placeholder="Facility Name"
{...register('name')}
- defaultValue={facilityData?.name}
invalid={!!errors?.name}
/>
{errors.name &&
+
+ Requirements
+
+
+
+
+ {fields.map((item, index) => (
+ append({ title: '', description: '' })}
+ >
+ Add Requirement
+
+ )}
+
+
{
label="Location"
placeholder="Location"
{...register('location')}
- defaultValue={facilityData?.location}
invalid={!!errors?.location}
/>
{errors.location &&
@@ -717,8 +717,8 @@ const Jobposting = () => {
*/}
- - By continuing, you agree to our - navigate('/PolicyTerms')} className="link-primary"> - {' '} - Privacy Policy{' '} - - and - navigate('/PolicyTerms')} className="link-primary"> - {' '} - Terms of Service - - . - -
- -
+
{!isLoading ? (
- <>
-
- Login
-
- navigate('/register')}>
- Signup
-
-
+
+ Login
+
) : (
+
+ handleGoogleLogin()} />
- {config.env === 'development' && (
-
-
-
-
- )}
-
-
-
-
)
diff --git a/client/src/views/auth/Otp.jsx b/client/src/views/auth/Otp.jsx
new file mode 100644
index 00000000..66a870fb
--- /dev/null
+++ b/client/src/views/auth/Otp.jsx
@@ -0,0 +1,154 @@
+import React, { useState, useEffect, useContext } from 'react'
+import {
+ CContainer,
+ CRow,
+ CCol,
+ CForm,
+ CFormLabel,
+ CFormInput,
+ CButton,
+ CAlert,
+ CFormFeedback,
+} from '@coreui/react'
+import { useForm } from 'react-hook-form'
+import { z } from 'zod'
+import { zodResolver } from '@hookform/resolvers/zod'
+import { AuthContext } from '../../context/authContext'
+import { post } from '../../api/axios'
+import { useNavigate } from 'react-router-dom'
+
+// Zod schema
+const otpSchema = z.object({
+ otp: z
+ .string()
+ .min(6, 'OTP must be 6 digits')
+ .max(6, 'OTP must be 6 digits')
+ .regex(/^\d+$/, 'OTP must only contain numbers'),
+})
+
+const OTPPage = () => {
+ const {
+ register,
+ handleSubmit,
+ formState: { errors },
+ reset,
+ } = useForm({
+ resolver: zodResolver(otpSchema),
+ })
+
+ const navigate = useNavigate()
+ const { userInformation } = useContext(AuthContext)
+
+ const [resendTimer, setResendTimer] = useState(0)
+ const [resendMessage, setResendMessage] = useState('')
+ const [submissionError, setSubmissionError] = useState('')
+ const [successMessage, setSuccessMessage] = useState('')
+
+ const onSubmit = async (data) => {
+ try {
+ const formData = new FormData()
+ formData.append('username', userInformation.username)
+ formData.append('otp', data.otp)
+
+ const res = await post('/auth/verify-otp', formData)
+
+ if (res.status === 200) {
+ setSuccessMessage('OTP Verified Successfully!')
+ setSubmissionError('')
+ setTimeout(() => navigate('/dashboard'), 1500)
+ }
+ } catch (error) {
+ console.error(error)
+ setSubmissionError(error?.response?.data?.message || 'Verification failed. Please try again.')
+ }
+ }
+
+ const handleResendOtp = async () => {
+ try {
+ const formData = new FormData()
+ formData.append('username', userInformation.username)
+
+ const res = await post('/auth/send-otp', formData)
+
+ if (res.status === 200) {
+ setResendMessage('A new OTP has been sent to your email.')
+ setResendTimer(60)
+ reset()
+ }
+ } catch (error) {
+ console.error(error)
+ setResendMessage('Failed to resend OTP. Please try again later.')
+ }
+ }
+
+ useEffect(() => {
+ if (resendTimer === 0) return
+ const interval = setInterval(() => {
+ setResendTimer((prev) => prev - 1)
+ }, 1000)
+ return () => clearInterval(interval)
+ }, [resendTimer])
+
+ return (
+
+
+
+ OR
+Developer Build
-
-
- {config.appVersion}
-
-
- Verify One-Time Password
+ + {successMessage &&+ Welcome back {userInformation.username}! We sent an OTP to your email to confirm your + information. +
+ + +
+ Enter OTP
+
+ {errors.otp.message}
+
+ )}
+
+
+
+ Verify OTP
+
+
+
+ 0}
+ onClick={handleResendOtp}
+ >
+ {resendTimer > 0 ? `Resend OTP in ${resendTimer}s` : 'Resend OTP'}
+
+ {resendMessage && (
+
+ {resendMessage}
+
+ )}
+
+ Loading...
// Optionally show a loading state while data is being fetched
+ }
+
+ const gotoApplicant = (applicant) => {
+ try {
+ const applicantId = applicant._id
+ navigate(`/applicant/profile/${applicantId}`)
+ // window.open(`/applicant/profile/${applicantId}`)
+ } catch (error) {
+ console.error(error)
+ }
+ }
+
+ const prepareChartData = (applicantsPerDay) => {
+ const now = new Date()
+ const daysInMonth = new Date(now.getFullYear(), now.getMonth() + 1, 0).getDate()
+
+ const dayMap = {}
+ applicantsPerDay.forEach(entry => {
+ const date = new Date(entry._id)
+ const day = date.getDate()
+ dayMap[day] = entry.count
+ })
+
+ const labels = Array.from({ length: daysInMonth }, (_, i) => `${i + 1}`)
+ const data = labels.map(day => dayMap[parseInt(day)] || 0)
+
+ return {
+ labels,
+ datasets: [
+ {
+ label: 'Applicants per Day',
+ backgroundColor: `rgba(0, 123, 255, 0.1)`,
+ borderColor: '#007bff',
+ pointHoverBackgroundColor: '#007bff',
+ borderWidth: 2,
+ data,
+ fill: true,
+ },
+ ],
+ }
+ }
+
+ const prepareEventData = (eventsPerDay) => {
+ const now = new Date()
+ const daysInMonth = new Date(now.getFullYear(), now.getMonth() + 1, 0).getDate()
+
+ const dayMap = {}
+ eventsPerDay.forEach(entry => {
+ const date = new Date(entry._id)
+ const day = date.getDate()
+ dayMap[day] = entry.count
+ })
+
+ const labels = Array.from({ length: daysInMonth }, (_, i) => `${i + 1}`)
+ const data = labels.map(day => dayMap[parseInt(day)] || 0)
+
+ return {
+ labels,
+ datasets: [
+ {
+ label: 'Events per Day',
+ backgroundColor: `rgba(255, 99, 132, 0.1)`,
+ borderColor: '#ff6384',
+ pointHoverBackgroundColor: '#ff6384',
+ borderWidth: 2,
+ data,
+ fill: true,
+ },
+ ],
+ }
+ }
+
+ const combineChartData = (applicantsPerDay, eventsPerDay) => {
+ const applicantsData = prepareChartData(applicantsPerDay)
+ const eventsData = prepareEventData(eventsPerDay)
+
+ return {
+ labels: applicantsData.labels, // Same labels for both
+ datasets: [
+ ...applicantsData.datasets, // Add applicants dataset
+ ...eventsData.datasets, // Add events dataset
+ ],
+ }
+ }
+
+ // Extract actual data
+ const {
+ applicants: {
+ totalApplicants,
+ recentApplicants,
+ applicantsPerDay,
+ applicantsThisMonth,
+ currentStages
+ },
+ jobpostings: {
+ totalJobPostings,
+ recentJobs,
+ activeJobPostings,
+ expiredJobPostings,
+ jobTypes,
+ },
+ events: {
+ totalEvents,
+ recentEvents,
+ eventsPerDay,
+ eventsThisMonth,
+ eventTypes,
+ eventApprovalStatus,
+ eventParticipants,
+ eventCapacityUtilization
+ }
+ } = data
+
+
+ // Prepare progress data based on actual data
+ const progress = [
+ { title: 'Total Applicants', value: `${totalApplicants} Applicants`, color: 'success' }, // assuming 1000 is your goal
+ { title: 'Recent Applicants', value: `${recentApplicants.length} Applicants`, percent: (recentApplicants.length / totalApplicants) * 100, color: 'warning' },
+ { title: 'Applicants This Month', value: `${applicantsThisMonth} Applicants`, percent: (applicantsThisMonth / totalApplicants) * 100, color: 'info' },
+
+ { title: 'Total Events', value: `${totalEvents} Events`, color: 'warning' },
+ { title: 'Recent Events', value: `${recentEvents.length} Recent Events`, percent: (recentEvents.length / totalApplicants) * 100, color: 'success' },
+ { title: 'Events This Month', value: `${eventsThisMonth} Events`, percent: (eventsThisMonth / totalEvents) * 100, color: 'info' },
+ ];
+
+ // Extract user data dynamically from recentApplicants
+ const table = recentApplicants.map((applicant, index) => ({
+ user: {
+ _id: applicant._id,
+ name: `${applicant.firstname} ${applicant.lastname}`, // Full name
+ qualification: applicant.highestQualification,
+ experience: applicant.yearsOfExperience, // Experience in years
+ },
+ jobAppliedFor: applicant.jobAppliedFor, // Job applied for
+ activity: `Last updated: ${new Date(applicant.createdAt).toLocaleString()}`, // Last updated timestamp
+ })) || []
+
return (
<>
- Dashboard
- {/* - - */} -- Page is still under construction. Please check back later. -
+ {/*+ Journey Stages Over Time +
+{item.count}
+ {item._id}
+ + Applicant and Events Overview +
+
+ {`${startOfMonth.toLocaleString('default', { month: 'long' })} ${startOfMonth.getFullYear()}`}
+
+
+ +
{item.title}
+
+ {item.value} {item.percent ? `(` + item.percent.toFixed(0) + `%)` : ''}
+
+ {
+ item.percent
+ ? {item.count}
+ {item._id}
+ Recent Applicants
+
+ Job Title
+ Applicants
+
+ {data.applicants?.histograms.jobAppliedFor.map((item, index) => (
+
+ {item._id || 'Unknown'}
+ {item.count}
+
+ ))}
+
+ Qualification
+ Applicants
+
+ {data.applicants?.histograms.qualifications.map((item, index) => (
+
+ {item._id || 'Unknown'}
+ {item.count}
+
+ ))}
+
+ Year
+ Applicants
+
+ {data.applicants?.histograms.graduationYear.map((item, index) => (
+
+ {item._id}
+ {item.count}
+
+ ))}
+
+ Years
+ Applicants
+
+ {data.applicants?.histograms.yearsOfExperience.map((item, index) => (
+
+ {item._id}
+ {item.count}
+
+ ))}
+ Jobpostings Overview
+{totalJobPostings}
+ All job postings created
+ {activeJobPostings}
+ Currently published and accepting applicants
+ {expiredJobPostings}
+ No longer active
+ Recent Job Postings
+Events Overview
+Upcoming / Recent Events
+{errors.name.message}
}
@@ -142,7 +171,6 @@ const FacilityForm = ({ isVisible, onClose, isEdit, facilityData }) => {
label="Type"
placeholder="Type"
{...register('type')}
- defaultValue={facilityData?.type}
invalid={!!errors?.type}
/>
{errors.type && {errors.type.message}
}
@@ -156,7 +184,6 @@ const FacilityForm = ({ isVisible, onClose, isEdit, facilityData }) => {
label="Description"
placeholder="Description"
{...register('description')}
- defaultValue={facilityData?.description}
invalid={!!errors?.description}
/>
{errors.description && (
@@ -164,6 +191,52 @@ const FacilityForm = ({ isVisible, onClose, isEdit, facilityData }) => {
)}
+
+
+ ))}
+
+ {['admin', 'manager', 'interviewer'].includes(userInformation.role) && (
+
+ Title
+
+ remove(index)}>
+ Remove
+
+ )}
+
+
+
+
+ {errors.location.message}
}
diff --git a/client/src/views/facility/modals/InterviewForm.jsx b/client/src/views/facility/modals/InterviewForm.jsx
index 3d2e884f..8968e6e1 100644
--- a/client/src/views/facility/modals/InterviewForm.jsx
+++ b/client/src/views/facility/modals/InterviewForm.jsx
@@ -45,6 +45,7 @@ const interviewSchema = z.object({
date: z.string().nonempty('Date is required'),
job: z.string().min(1, { message: 'Job is required' }),
type: z.enum(['Phone', 'Video', 'In-Person']),
+ interviewType: z.string().optional(),
general: z.object({
communication: z.coerce.number().min(1).max(5).default(1),
technical: z.coerce.number().min(1).max(5).default(1),
@@ -141,10 +142,30 @@ const InterviewForm = ({ isVisible, onClose, state, eventData, applicantData })
const onSubmit = async (data) => {
try {
+ const formData = {
+ date: data.date,
+ job: data.job,
+ type: data.type,
+ interviewType: eventData.type,
+ general: {
+ communication: data.general.communication,
+ technical: data.general.technical,
+ problemSolving: data.general.problemSolving,
+ culturalFit: data.general.culturalFit,
+ workExperienceRelevance: data.general.workExperienceRelevance,
+ leadership: data.general.leadership,
+ },
+ questions: data.questions || [],
+ salaryExpectation: data.salaryExpectation,
+ strength: data.strength,
+ weakness: data.weakness,
+ recommendation: data.recommendation,
+ finalComments: data.finalComments,
+ }
const res =
formState === 'edit'
- ? await put(`/applicant/interview/${interview._id}`, data)
- : await post(`/applicant/interview/${applicantData._id}/${eventData._id}`, data)
+ ? await put(`/applicant/interview/${interview._id}`, formData)
+ : await post(`/applicant/interview/${applicantData._id}/${eventData._id}`, formData)
if (res.status === 200 || res.status === 201) {
addToast('Success', 'Interview saved successfully', 'success')
@@ -162,6 +183,7 @@ const InterviewForm = ({ isVisible, onClose, state, eventData, applicantData })
date: item.date ? item.date.split('T')[0] : '',
job: item.job ? item.job : '',
type: item.type || 'Phone',
+ interviewType: eventData?.type,
general: {
communication: item.general?.communication || 1,
technical: item.general?.technical || 1,
@@ -186,6 +208,7 @@ const InterviewForm = ({ isVisible, onClose, state, eventData, applicantData })
job: '',
date: '',
type: 'Phone',
+ interviewType: 'initialInterview',
general: {
communication: 1,
technical: 1,
diff --git a/client/src/views/facility/modals/ManageFacilityForm.jsx b/client/src/views/facility/modals/ManageFacilityForm.jsx
index cd4bb109..28598786 100644
--- a/client/src/views/facility/modals/ManageFacilityForm.jsx
+++ b/client/src/views/facility/modals/ManageFacilityForm.jsx
@@ -100,9 +100,10 @@ const ManageFacilityForm = ({ isVisible, onClose, facility = {} }) => {
console.log('Parsing States', JSON.stringify(facilityData, null, 2))
if (facilityData.timeslots) {
const dates = facilityData.timeslots.map((slot) => new Date(slot.date))
- const hasSlots = dates.map(
- (date) => new Date(date.getTime() - date.getTimezoneOffset() * 60000),
- )
+ // const hasSlots = dates.map(
+ // (date) => new Date(date.getTime() - date.getTimezoneOffset() * 60000),
+ // )
+ const hasSlots = dates.map((date) => new Date(date))
setHasSlots(hasSlots)
}
}
@@ -186,12 +187,20 @@ const ManageFacilityForm = ({ isVisible, onClose, facility = {} }) => {
const handleTimeslotSubmit = async (data) => {
try {
setIsSubmitLoading(true)
- const formdata = new FormData()
- formdata.append('date', new Date(defaultDate))
- formdata.append('start', data.start)
- formdata.append('end', data.end)
+ // const formData = new FormData()
+ // formData.append('date', new Date(defaultDate))
+ // formData.append('start', data.start)
+ // formData.append('end', data.end)
+
+ // console.info(formData)
+
+ const formData = {
+ date: new Date(defaultDate),
+ start: data.start,
+ end: data.end,
+ }
- const res = await post(`/facilities/timeslot/create/${facilityData._id}`, formdata)
+ const res = await post(`/facilities/timeslot/create/${facilityData._id}`, formData)
if (res.status === 404) {
setIsSubmitLoading(false)
getFacilityData()
diff --git a/client/src/views/job/Jobs.jsx b/client/src/views/job/Jobs.jsx
index 8e169aac..4a27c85d 100644
--- a/client/src/views/job/Jobs.jsx
+++ b/client/src/views/job/Jobs.jsx
@@ -62,7 +62,7 @@ const JobPage = () => {
setIsJobLoading(false)
setJobs(res.data.data)
setCurrentPage(res.data.currentPage)
- setItemsPerPage(res.data.itemsPerPage)
+ setTotalItems(res.data.totalItems)
setTotalPages(res.data.totalPages)
break
case 404:
@@ -171,7 +171,7 @@ const JobPage = () => {
? job.author // If it's a string, display it as is
: job.author && job.author.firstname // If it's an object, display full name
? `${job.author.firstname} ${job.author.lastname}`
- : 'Unknown'}{' '}
+ : 'Unknown'}
diff --git a/client/src/views/recruitment/Jobposter.jsx b/client/src/views/recruitment/Jobposter.jsx
index 12e246af..106fa614 100644
--- a/client/src/views/recruitment/Jobposter.jsx
+++ b/client/src/views/recruitment/Jobposter.jsx
@@ -45,7 +45,7 @@ import { faTwitter } from '@fortawesome/free-brands-svg-icons'
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
import { AppContext } from '../../context/appContext'
-import { formatCurency, formatDate, trimString } from '../../utils'
+import { formatCurrency, formatDate, trimString } from '../../utils'
const Jobposter = () => {
const sectionRefs = {}
@@ -280,13 +280,13 @@ const Jobposter = () => {
*/}
*/}
@@ -717,8 +717,8 @@ const Jobposting = () => {
*/}
diff --git a/server/package-lock.json b/server/package-lock.json index 7a823988..e61af0a2 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -11,21 +11,25 @@ "dependencies": { "@anthropic-ai/sdk": "^0.39.0", "@types/bcryptjs": "^2.4.6", - "@types/express-session": "^1.18.0", + "@types/express-session": "^1.18.1", + "bcrypt": "^5.1.1", "bcryptjs": "^2.4.3", "cheerio": "^1.0.0", "connect-mongo": "^5.1.0", "cors": "^2.8.5", - "dotenv": "^16.4.5", + "dotenv": "^16.5.0", "env-cmd": "^10.1.0", "express": "^4.19.2", "express-mongo-sanitize": "^2.2.0", "express-rate-limit": "^7.4.0", - "express-session": "^1.18.0", + "express-session": "^1.18.1", + "express-useragent": "^1.0.15", "express-validator": "^7.2.0", + "googleapis": "^148.0.0", "helmet": "^7.1.0", "jsonwebtoken": "^9.0.2", "mammoth": "^1.8.0", + "module-alias": "^2.2.3", "moment": "^2.30.1", "mongodb": "^6.8.0", "mongoose": "^8.5.4", @@ -45,6 +49,7 @@ "@types/cors": "^2.8.17", "@types/eslint__js": "^8.42.3", "@types/express": "^4.17.21", + "@types/express-useragent": "^1.0.5", "@types/jsonwebtoken": "^9.0.6", "@types/morgan": "^1.9.9", "@types/multer": "^1.4.12", @@ -58,8 +63,10 @@ "javascript-obfuscator": "^4.1.1", "pino-pretty": "^11.2.2", "prettier": "3.3.3", + "ts-node": "^10.9.2", "ts-node-dev": "^2.0.0", "tsc-alias": "^1.8.10", + "tsconfig-paths": "^4.2.0", "typescript": "^5.8.2", "typescript-eslint": "^8.8.0" } @@ -393,6 +400,42 @@ "@jridgewell/sourcemap-codec": "^1.4.10" } }, + "node_modules/@mapbox/node-pre-gyp": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz", + "integrity": "sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==", + "license": "BSD-3-Clause", + "dependencies": { + "detect-libc": "^2.0.0", + "https-proxy-agent": "^5.0.0", + "make-dir": "^3.1.0", + "node-fetch": "^2.6.7", + "nopt": "^5.0.0", + "npmlog": "^5.0.1", + "rimraf": "^3.0.2", + "semver": "^7.3.5", + "tar": "^6.1.11" + }, + "bin": { + "node-pre-gyp": "bin/node-pre-gyp" + } + }, + "node_modules/@mapbox/node-pre-gyp/node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", + "license": "ISC", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/@mongodb-js/saslprep": { "version": "1.1.9", "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.1.9.tgz", @@ -561,9 +604,20 @@ } }, "node_modules/@types/express-session": { - "version": "1.18.0", - "resolved": "https://registry.npmjs.org/@types/express-session/-/express-session-1.18.0.tgz", - "integrity": "sha512-27JdDRgor6PoYlURY+Y5kCakqp5ulC0kmf7y+QwaY+hv9jEFuQOThgkjyA53RP3jmKuBsH5GR6qEfFmvb8mwOA==", + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/@types/express-session/-/express-session-1.18.1.tgz", + "integrity": "sha512-S6TkD/lljxDlQ2u/4A70luD8/ZxZcrU5pQwI1rVXCiaVIywoFgbA+PIUNDjPhQpPdK0dGleLtYc/y7XWBfclBg==", + "license": "MIT", + "dependencies": { + "@types/express": "*" + } + }, + "node_modules/@types/express-useragent": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@types/express-useragent/-/express-useragent-1.0.5.tgz", + "integrity": "sha512-G1zPW6jDj7oGJvMvB8UCIAWznCOafcksYzOg8LINfYmvrXlSGJ6nsJ7O7GlmYMjrgGYvobYaI8IhRCkAKslPJA==", + "dev": true, + "license": "MIT", "dependencies": { "@types/express": "*" } @@ -1012,6 +1066,12 @@ "node": ">=10.0.0" } }, + "node_modules/abbrev": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", + "license": "ISC" + }, "node_modules/abort-controller": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", @@ -1068,6 +1128,41 @@ "node": ">=0.4.0" } }, + "node_modules/agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "license": "MIT", + "dependencies": { + "debug": "4" + }, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/agent-base/node_modules/debug": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", + "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/agent-base/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "license": "MIT" + }, "node_modules/agentkeepalive": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.6.0.tgz", @@ -1100,7 +1195,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, "engines": { "node": ">=8" } @@ -1138,6 +1232,40 @@ "resolved": "https://registry.npmjs.org/append-field/-/append-field-1.0.0.tgz", "integrity": "sha512-klpgFSWLW1ZEs8svjfb7g4qWY0YS5imI82dTg+QahUvJ8YqAY0P10Uk8tTyh9ZGuYEZEMaeJYCF5BFuX552hsw==" }, + "node_modules/aproba": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz", + "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==", + "license": "ISC" + }, + "node_modules/are-we-there-yet": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz", + "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==", + "deprecated": "This package is no longer supported.", + "license": "ISC", + "dependencies": { + "delegates": "^1.0.0", + "readable-stream": "^3.6.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/are-we-there-yet/node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "license": "MIT", + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/arg": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", @@ -1239,8 +1367,7 @@ "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" }, "node_modules/base64-js": { "version": "1.5.1", @@ -1277,11 +1404,34 @@ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, + "node_modules/bcrypt": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-5.1.1.tgz", + "integrity": "sha512-AGBHOG5hPYZ5Xl9KXzU5iKq9516yEmvCKDg3ecP5kX2aB6UqTeXZxk2ELnDgDm6BQSMlLt9rDB4LoSMx0rYwww==", + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "@mapbox/node-pre-gyp": "^1.0.11", + "node-addon-api": "^5.0.0" + }, + "engines": { + "node": ">= 10.0.0" + } + }, "node_modules/bcryptjs": { "version": "2.4.3", "resolved": "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz", "integrity": "sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ==" }, + "node_modules/bignumber.js": { + "version": "9.2.1", + "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.2.1.tgz", + "integrity": "sha512-+NzaKgOUvInq9TIUZ1+DRspzf/HApkCwD4btfuasFTdrfnOxqx853TgDpMolp+uv4RpRp7bPcEU2zKr9+fRmyw==", + "license": "MIT", + "engines": { + "node": "*" + } + }, "node_modules/binary-extensions": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", @@ -1343,7 +1493,6 @@ "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -1568,6 +1717,15 @@ "fsevents": "~2.3.2" } }, + "node_modules/chownr": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", + "license": "ISC", + "engines": { + "node": ">=10" + } + }, "node_modules/class-validator": { "version": "0.14.1", "resolved": "https://registry.npmjs.org/class-validator/-/class-validator-0.14.1.tgz", @@ -1597,6 +1755,15 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "node_modules/color-support": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", + "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", + "license": "ISC", + "bin": { + "color-support": "bin.js" + } + }, "node_modules/colorette": { "version": "2.0.20", "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", @@ -1627,8 +1794,7 @@ "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" }, "node_modules/concat-stream": { "version": "1.6.2", @@ -1708,6 +1874,12 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, + "node_modules/console-control-strings": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==", + "license": "ISC" + }, "node_modules/content-disposition": { "version": "0.5.4", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", @@ -1879,6 +2051,12 @@ "node": ">=0.4.0" } }, + "node_modules/delegates": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==", + "license": "MIT" + }, "node_modules/depd": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", @@ -1896,6 +2074,15 @@ "npm": "1.2.8000 || >= 1.4.16" } }, + "node_modules/detect-libc": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz", + "integrity": "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==", + "license": "Apache-2.0", + "engines": { + "node": ">=8" + } + }, "node_modules/diff": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", @@ -1978,9 +2165,10 @@ } }, "node_modules/dotenv": { - "version": "16.4.5", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz", - "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==", + "version": "16.5.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.5.0.tgz", + "integrity": "sha512-m/C+AwOAr9/W1UOIZUo232ejMNnJAJtYQjUbHoNTBNTJSvqzzDh7vnrei3o3r3m9blf6ZoDkvcw0VmozNRFJxg==", + "license": "BSD-2-Clause", "engines": { "node": ">=12" }, @@ -2032,6 +2220,12 @@ "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, + "node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "license": "MIT" + }, "node_modules/encodeurl": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", @@ -2598,6 +2792,7 @@ "version": "1.18.1", "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.18.1.tgz", "integrity": "sha512-a5mtTqEaZvBCL9A9aqkrtfz+3SMDhOVUnjafjo+s7A9Txkq+SVX2DLvSp1Zrv4uCXa3lMSK3viWnh9Gg07PBUA==", + "license": "MIT", "dependencies": { "cookie": "0.7.2", "cookie-signature": "1.0.7", @@ -2625,6 +2820,15 @@ "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.7.tgz", "integrity": "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==" }, + "node_modules/express-useragent": { + "version": "1.0.15", + "resolved": "https://registry.npmjs.org/express-useragent/-/express-useragent-1.0.15.tgz", + "integrity": "sha512-eq5xMiYCYwFPoekffMjvEIk+NWdlQY9Y38OsTyl13IvA728vKT+q/CSERYWzcw93HGBJcIqMIsZC5CZGARPVdg==", + "license": "MIT", + "engines": { + "node": ">=4.5" + } + }, "node_modules/express-validator": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/express-validator/-/express-validator-7.2.0.tgz", @@ -2637,6 +2841,12 @@ "node": ">= 8.0.0" } }, + "node_modules/extend": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", + "license": "MIT" + }, "node_modules/fast-copy": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/fast-copy/-/fast-copy-3.0.2.tgz", @@ -2841,11 +3051,34 @@ "node": ">= 0.6" } }, + "node_modules/fs-minipass": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", + "license": "ISC", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/fs-minipass/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" }, "node_modules/fsevents": { "version": "2.3.3", @@ -2869,6 +3102,133 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/gauge": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz", + "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==", + "deprecated": "This package is no longer supported.", + "license": "ISC", + "dependencies": { + "aproba": "^1.0.3 || ^2.0.0", + "color-support": "^1.1.2", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.1", + "object-assign": "^4.1.1", + "signal-exit": "^3.0.0", + "string-width": "^4.2.3", + "strip-ansi": "^6.0.1", + "wide-align": "^1.1.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/gaxios": { + "version": "6.7.1", + "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-6.7.1.tgz", + "integrity": "sha512-LDODD4TMYx7XXdpwxAVRAIAuB0bzv0s+ywFonY46k126qzQHT9ygyoa9tncmOiQmmDrik65UYsEkv3lbfqQ3yQ==", + "license": "Apache-2.0", + "dependencies": { + "extend": "^3.0.2", + "https-proxy-agent": "^7.0.1", + "is-stream": "^2.0.0", + "node-fetch": "^2.6.9", + "uuid": "^9.0.1" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/gaxios/node_modules/agent-base": { + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz", + "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==", + "license": "MIT", + "engines": { + "node": ">= 14" + } + }, + "node_modules/gaxios/node_modules/debug": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", + "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/gaxios/node_modules/https-proxy-agent": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz", + "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==", + "license": "MIT", + "dependencies": { + "agent-base": "^7.1.2", + "debug": "4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/gaxios/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "license": "MIT" + }, + "node_modules/gaxios/node_modules/uuid": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", + "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], + "license": "MIT", + "bin": { + "uuid": "dist/bin/uuid" + } + }, + "node_modules/gcp-metadata": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-5.3.0.tgz", + "integrity": "sha512-FNTkdNEnBdlqF2oatizolQqNANMrcqJt6AAYt99B3y1aLLC8Hc5IOBb+ZnnzllodEEf6xMBp6wRcBbc16fa65w==", + "license": "Apache-2.0", + "optional": true, + "peer": true, + "dependencies": { + "gaxios": "^5.0.0", + "json-bigint": "^1.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/gcp-metadata/node_modules/gaxios": { + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-5.1.3.tgz", + "integrity": "sha512-95hVgBRgEIRQQQHIbnxBXeHbW4TqFk4ZDJW7wmVtvYar72FdhRIo1UGOLS2eRAKCPEdPBWu+M7+A33D9CdX9rA==", + "license": "Apache-2.0", + "optional": true, + "peer": true, + "dependencies": { + "extend": "^3.0.2", + "https-proxy-agent": "^5.0.0", + "is-stream": "^2.0.0", + "node-fetch": "^2.6.9" + }, + "engines": { + "node": ">=12" + } + }, "node_modules/get-caller-file": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", @@ -2919,7 +3279,6 @@ "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", "deprecated": "Glob versions prior to v9 are no longer supported", - "dev": true, "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -2979,6 +3338,110 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/google-auth-library": { + "version": "9.15.1", + "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-9.15.1.tgz", + "integrity": "sha512-Jb6Z0+nvECVz+2lzSMt9u98UsoakXxA2HGHMCxh+so3n90XgYWkq5dur19JAJV7ONiJY22yBTyJB1TSkvPq9Ng==", + "license": "Apache-2.0", + "dependencies": { + "base64-js": "^1.3.0", + "ecdsa-sig-formatter": "^1.0.11", + "gaxios": "^6.1.1", + "gcp-metadata": "^6.1.0", + "gtoken": "^7.0.0", + "jws": "^4.0.0" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/google-auth-library/node_modules/gcp-metadata": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-6.1.1.tgz", + "integrity": "sha512-a4tiq7E0/5fTjxPAaH4jpjkSv/uCaU2p5KC6HVGrvl0cDjA8iBZv4vv1gyzlmK0ZUKqwpOyQMKzZQe3lTit77A==", + "license": "Apache-2.0", + "dependencies": { + "gaxios": "^6.1.1", + "google-logging-utils": "^0.0.2", + "json-bigint": "^1.0.0" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/google-auth-library/node_modules/jwa": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz", + "integrity": "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==", + "license": "MIT", + "dependencies": { + "buffer-equal-constant-time": "1.0.1", + "ecdsa-sig-formatter": "1.0.11", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/google-auth-library/node_modules/jws": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz", + "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==", + "license": "MIT", + "dependencies": { + "jwa": "^2.0.0", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/google-logging-utils": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/google-logging-utils/-/google-logging-utils-0.0.2.tgz", + "integrity": "sha512-NEgUnEcBiP5HrPzufUkBzJOD/Sxsco3rLNo1F1TNf7ieU8ryUzBhqba8r756CjLX7rn3fHl6iLEwPYuqpoKgQQ==", + "license": "Apache-2.0", + "engines": { + "node": ">=14" + } + }, + "node_modules/googleapis": { + "version": "148.0.0", + "resolved": "https://registry.npmjs.org/googleapis/-/googleapis-148.0.0.tgz", + "integrity": "sha512-8PDG5VItm6E1TdZWDqtRrUJSlBcNwz0/MwCa6AL81y/RxPGXJRUwKqGZfCoVX1ZBbfr3I4NkDxBmeTyOAZSWqw==", + "license": "Apache-2.0", + "dependencies": { + "google-auth-library": "^9.0.0", + "googleapis-common": "^7.0.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/googleapis-common": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/googleapis-common/-/googleapis-common-7.2.0.tgz", + "integrity": "sha512-/fhDZEJZvOV3X5jmD+fKxMqma5q2Q9nZNSF3kn1F18tpxmA86BcTxAGBQdM0N89Z3bEaIs+HVznSmFJEAmMTjA==", + "license": "Apache-2.0", + "dependencies": { + "extend": "^3.0.2", + "gaxios": "^6.0.3", + "google-auth-library": "^9.7.0", + "qs": "^6.7.0", + "url-template": "^2.0.8", + "uuid": "^9.0.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/googleapis-common/node_modules/uuid": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", + "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], + "license": "MIT", + "bin": { + "uuid": "dist/bin/uuid" + } + }, "node_modules/gopd": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", @@ -2997,6 +3460,40 @@ "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", "dev": true }, + "node_modules/gtoken": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-7.1.0.tgz", + "integrity": "sha512-pCcEwRi+TKpMlxAQObHDQ56KawURgyAf6jtIY046fJ5tIv3zDe/LEIubckAO8fj6JnAxLdmWkUfNyulQ2iKdEw==", + "license": "MIT", + "dependencies": { + "gaxios": "^6.0.0", + "jws": "^4.0.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/gtoken/node_modules/jwa": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz", + "integrity": "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==", + "license": "MIT", + "dependencies": { + "buffer-equal-constant-time": "1.0.1", + "ecdsa-sig-formatter": "1.0.11", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/gtoken/node_modules/jws": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz", + "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==", + "license": "MIT", + "dependencies": { + "jwa": "^2.0.0", + "safe-buffer": "^5.0.1" + } + }, "node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -3043,6 +3540,12 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/has-unicode": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==", + "license": "ISC" + }, "node_modules/hasown": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", @@ -3102,6 +3605,42 @@ "node": ">= 0.8" } }, + "node_modules/https-proxy-agent": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", + "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "license": "MIT", + "dependencies": { + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/https-proxy-agent/node_modules/debug": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", + "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/https-proxy-agent/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "license": "MIT" + }, "node_modules/humanize-ms": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz", @@ -3185,7 +3724,6 @@ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", - "dev": true, "dependencies": { "once": "^1.3.0", "wrappy": "1" @@ -3280,6 +3818,15 @@ "node": ">=0.10.0" } }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/is-generator-function": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", @@ -3341,6 +3888,18 @@ "node": ">=8" } }, + "node_modules/is-stream": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/is-typed-array": { "version": "1.1.13", "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz", @@ -3471,6 +4030,15 @@ "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", "dev": true }, + "node_modules/json-bigint": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz", + "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==", + "license": "MIT", + "dependencies": { + "bignumber.js": "^9.0.0" + } + }, "node_modules/json-buffer": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", @@ -3489,6 +4057,19 @@ "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", "dev": true }, + "node_modules/json5": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "dev": true, + "license": "MIT", + "bin": { + "json5": "lib/cli.js" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/jsonwebtoken": { "version": "9.0.2", "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz", @@ -3698,6 +4279,30 @@ "underscore": "^1.13.1" } }, + "node_modules/make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "license": "MIT", + "dependencies": { + "semver": "^6.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/make-dir/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + } + }, "node_modules/make-error": { "version": "1.3.6", "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", @@ -3838,7 +4443,6 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, "dependencies": { "brace-expansion": "^1.1.7" }, @@ -3854,11 +4458,44 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/minipass": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", + "license": "ISC", + "engines": { + "node": ">=8" + } + }, + "node_modules/minizlib": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "license": "MIT", + "dependencies": { + "minipass": "^3.0.0", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/minizlib/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/mkdirp": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "dev": true, "bin": { "mkdirp": "bin/cmd.js" }, @@ -3866,6 +4503,12 @@ "node": ">=10" } }, + "node_modules/module-alias": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/module-alias/-/module-alias-2.2.3.tgz", + "integrity": "sha512-23g5BFj4zdQL/b6tor7Ji+QY4pEfNH784BMslY9Qb0UnJWRAt+lQGLYmRaM0KDBwIG23ffEBELhZDP2rhi9f/Q==", + "license": "MIT" + }, "node_modules/moment": { "version": "2.30.1", "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz", @@ -4101,6 +4744,12 @@ "node": ">= 0.6" } }, + "node_modules/node-addon-api": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-5.1.0.tgz", + "integrity": "sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA==", + "license": "MIT" + }, "node_modules/node-cron": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/node-cron/-/node-cron-3.0.3.tgz", @@ -4187,6 +4836,21 @@ "node": ">=6.0.0" } }, + "node_modules/nopt": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", + "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", + "license": "ISC", + "dependencies": { + "abbrev": "1" + }, + "bin": { + "nopt": "bin/nopt.js" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", @@ -4196,6 +4860,19 @@ "node": ">=0.10.0" } }, + "node_modules/npmlog": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz", + "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==", + "deprecated": "This package is no longer supported.", + "license": "ISC", + "dependencies": { + "are-we-there-yet": "^2.0.0", + "console-control-strings": "^1.1.0", + "gauge": "^3.0.0", + "set-blocking": "^2.0.0" + } + }, "node_modules/nth-check": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", @@ -4283,7 +4960,6 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dev": true, "dependencies": { "wrappy": "1" } @@ -4985,6 +5661,12 @@ "node": ">= 0.8.0" } }, + "node_modules/set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", + "license": "ISC" + }, "node_modules/set-function-length": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", @@ -5052,6 +5734,12 @@ "resolved": "https://registry.npmjs.org/sift/-/sift-17.1.3.tgz", "integrity": "sha512-Rtlj66/b0ICeFzYTuNvX/EF1igRbbnGSvEyT79McoZa/DeGhMyC5pWKOEsZKnpkqtSeovd5FL/bjHWC3CIIvCQ==" }, + "node_modules/signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "license": "ISC" + }, "node_modules/slash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", @@ -5140,6 +5828,20 @@ "integrity": "sha512-SLqR3GBUXuoPP5MmYtD7ompvXiG87QjT6lzOszyXjTM86Uu7At7vNnt2xgyTLq5o9T4IxTYFyGxcULqpsmsfdg==", "dev": true }, + "node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/stringz": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/stringz/-/stringz-2.1.0.tgz", @@ -5153,7 +5855,6 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, "dependencies": { "ansi-regex": "^5.0.1" }, @@ -5225,6 +5926,23 @@ "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==", "dev": true }, + "node_modules/tar": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", + "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", + "license": "ISC", + "dependencies": { + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "minipass": "^5.0.0", + "minizlib": "^2.1.1", + "mkdirp": "^1.0.3", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/tdigest": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/tdigest/-/tdigest-0.1.2.tgz", @@ -5305,6 +6023,7 @@ "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz", "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==", "dev": true, + "license": "MIT", "dependencies": { "@cspotcode/source-map-support": "^0.8.0", "@tsconfig/node10": "^1.0.7", @@ -5415,6 +6134,21 @@ "strip-json-comments": "^2.0.0" } }, + "node_modules/tsconfig-paths": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz", + "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==", + "dev": true, + "license": "MIT", + "dependencies": { + "json5": "^2.2.2", + "minimist": "^1.2.6", + "strip-bom": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/tslib": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", @@ -5539,6 +6273,12 @@ "punycode": "^2.1.0" } }, + "node_modules/url-template": { + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/url-template/-/url-template-2.0.8.tgz", + "integrity": "sha512-XdVKMF4SJ0nP/O7XIPB0JwAEuT9lDIYnNsK8yGVe43y0AWoKeJNdv3ZNWh7ksJ6KqQFjOO6ox/VEitLnaVNufw==", + "license": "BSD" + }, "node_modules/util": { "version": "0.12.5", "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz", @@ -5690,6 +6430,15 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/wide-align": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", + "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", + "license": "ISC", + "dependencies": { + "string-width": "^1.0.2 || 2 || 3 || 4" + } + }, "node_modules/word-wrap": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", @@ -5702,8 +6451,7 @@ "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" }, "node_modules/xmlbuilder": { "version": "10.1.1", @@ -5721,6 +6469,12 @@ "node": ">=0.4" } }, + "node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "license": "ISC" + }, "node_modules/yn": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", diff --git a/server/package.json b/server/package.json index f4a7d195..208a7866 100644 --- a/server/package.json +++ b/server/package.json @@ -5,9 +5,9 @@ "main": "index.js", "scripts": { "test": "echo \"Error: no test specified\" && exit 1", - "dev": "ts-node-dev --respawn --transpile-only --ignore-watch node_modules src/index.ts", + "dev": "npx ts-node-dev --respawn --transpile-only --ignore-watch node_modules src/index.ts", "start": "env-cmd -f .env node dist/index.js", - "start:dev": "env-cmd -f .env.development ts-node-dev --respawn --transpile-only --ignore-watch node_modules src/index.ts", + "start:dev": "env-cmd -f .env.development npx ts-node-dev --respawn --transpile-only --ignore-watch node_modules src/index.ts", "build": "tsc", "build:alias": "tsc-alias -p tsconfig.json", "build:obfuscate": "ts-node --transpile-only ./src/obfuscate.ts", @@ -23,21 +23,25 @@ "dependencies": { "@anthropic-ai/sdk": "^0.39.0", "@types/bcryptjs": "^2.4.6", - "@types/express-session": "^1.18.0", + "@types/express-session": "^1.18.1", + "bcrypt": "^5.1.1", "bcryptjs": "^2.4.3", "cheerio": "^1.0.0", "connect-mongo": "^5.1.0", "cors": "^2.8.5", - "dotenv": "^16.4.5", + "dotenv": "^16.5.0", "env-cmd": "^10.1.0", "express": "^4.19.2", "express-mongo-sanitize": "^2.2.0", "express-rate-limit": "^7.4.0", - "express-session": "^1.18.0", + "express-session": "^1.18.1", + "express-useragent": "^1.0.15", "express-validator": "^7.2.0", + "googleapis": "^148.0.0", "helmet": "^7.1.0", "jsonwebtoken": "^9.0.2", "mammoth": "^1.8.0", + "module-alias": "^2.2.3", "moment": "^2.30.1", "mongodb": "^6.8.0", "mongoose": "^8.5.4", @@ -57,6 +61,7 @@ "@types/cors": "^2.8.17", "@types/eslint__js": "^8.42.3", "@types/express": "^4.17.21", + "@types/express-useragent": "^1.0.5", "@types/jsonwebtoken": "^9.0.6", "@types/morgan": "^1.9.9", "@types/multer": "^1.4.12", @@ -70,8 +75,10 @@ "javascript-obfuscator": "^4.1.1", "pino-pretty": "^11.2.2", "prettier": "3.3.3", + "ts-node": "^10.9.2", "ts-node-dev": "^2.0.0", "tsc-alias": "^1.8.10", + "tsconfig-paths": "^4.2.0", "typescript": "^5.8.2", "typescript-eslint": "^8.8.0" } diff --git a/server/src/config.ts b/server/src/config.ts index 0cf9a58d..51c62775 100644 --- a/server/src/config.ts +++ b/server/src/config.ts @@ -42,6 +42,12 @@ export const config = { google: { key: process.env.GOOGLE_FORMS_KEY, + oauth2: { + id: process.env.GOOGLE_CLIENT_ID, + secret: process.env.GOOGLE_CLIENT_SECRET, + redirectURI: process.env.GOOGLE_REDIRECT_URI, + clientRedirect: process.env.GOOGLE_CLIENT_REDIRECT, + }, smtp: { host: process.env.SMTP_HOST, port: process.env.SMTP_PORT, diff --git a/server/src/config/v1/google.ts b/server/src/config/v1/google.ts new file mode 100644 index 00000000..81deb571 --- /dev/null +++ b/server/src/config/v1/google.ts @@ -0,0 +1,17 @@ +// config/google.ts +import { google } from 'googleapis'; +import { config } from '../../config'; + +export const oauth2Client = new google.auth.OAuth2( + config.google.oauth2.id, + config.google.oauth2.secret, + config.google.oauth2.redirectURI, + // 'http://localhost:8000/api/v1/auth/google/callback', +); + +// scopes: profile and email +export const googleAuthUrl = oauth2Client.generateAuthUrl({ + access_type: 'offline', + prompt: 'consent', + scope: ['profile', 'email'], +}); \ No newline at end of file diff --git a/server/src/database/v1/controllers/apiKeyController.ts b/server/src/database/v1/controllers/apiKeyController.ts index cb0d65eb..7812d247 100644 --- a/server/src/database/v1/controllers/apiKeyController.ts +++ b/server/src/database/v1/controllers/apiKeyController.ts @@ -1,14 +1,9 @@ -import { Request as res, Response as req } from "express"; +import { Request as req, Response as res } from "express"; import apiKey from "../models/apikeyModel"; import logger from "../../../middlewares/logger"; -interface CustomRequest extends res { - permissions?: string[]; - user?: { _id: string }; -} - -export const generateApikey = async (req: CustomRequest, res: req) => { +export const generateApikey = async (req: req, res: res) => { try { if (!req.user) { return res.status(400).json({ @@ -17,7 +12,9 @@ export const generateApikey = async (req: CustomRequest, res: req) => { message: "User not authenticated", }); } - const apiKeyData = await apiKey.find({ owner: req.user._id }); + + const userId = req.session.user?._id + const apiKeyData = await apiKey.find({ owner: userId }); return res.status(200).json({ statusCode: 200, @@ -34,7 +31,7 @@ export const generateApikey = async (req: CustomRequest, res: req) => { } }; -export const updateApikey = async (req: CustomRequest, res: req) => { +export const updateApikey = async (req: req, res: res) => { try { const { permissions, expiresAt } = req.body; const { id } = req.params; @@ -69,14 +66,16 @@ export const updateApikey = async (req: CustomRequest, res: req) => { } }; -export const createApikey = async (req: CustomRequest, res: req) => { +export const createApikey = async (req: req, res: res) => { try { const { permissions, expiresAt } = req.body; const key = Math.random().toString(36).substring(7); + const userId = req.session.user?._id + const apiKeyData = await apiKey.create({ key: key, - owner: req.user ? req.user._id : undefined, + owner: req.user ? userId : undefined, permissions: permissions || [], expiresAt: expiresAt || new Date(), }); diff --git a/server/src/database/v1/controllers/applicantController.ts b/server/src/database/v1/controllers/applicantController.ts index 3dcc7123..e8185541 100644 --- a/server/src/database/v1/controllers/applicantController.ts +++ b/server/src/database/v1/controllers/applicantController.ts @@ -5,39 +5,14 @@ import fs from "fs/promises"; import path from "path"; -import { Request, Response } from "express"; +import { Request as req, Response as res } from "express"; import logger from "../../../middlewares/logger"; -import { upload } from "../../../utils/fileUploadHandler"; - import Applicant, { IApplicant } from "../models/applicantModel"; import { config } from "../../../config"; +import { sendEmail } from "../../../utils/mailHandler"; -export const handleFileUpload = (req: Request, res: Response) => { - return new Promise((resolve, reject) => { - upload("applicants").single("file")(req, res, (err) => { - if (err) { - reject(err); - } - resolve(req.file); - }); - }); -}; - -export const addNewResume = async (req: Request, res: Response) => { +export const addApplicant = async (req: req, res: res) => { try { - console.log(req.body); - // const file = (await handleFileUpload(req, res)) as Express.Multer.File; - // if (!file) { - // return res.status(400).json({ - // statusCode: 400, - // success: false, - // message: "Please upload a file", - // }); - // } - - // const childDir = "applicants"; - // const filePath = `/${childDir}/${file.filename}`; - if (req.body.tags) { req.body.tags = req.body.tags.split(","); } @@ -53,7 +28,6 @@ export const addNewResume = async (req: Request, res: Response) => { preferredWorkLocation: req.body.preferredWorkLocation, linkedInProfile: req.body.linkedInProfile, portfolioLink: req.body.portfolioLink, - // resumeFileLoc: filePath, yearsOfExperience: req.body.yearsOfExperience, currentMostRecentJob: req.body.currentMostRecentJob, highestQualification: req.body.highestQualification, @@ -74,225 +48,242 @@ export const addNewResume = async (req: Request, res: Response) => { const newApplicant = await Applicant.create(data); return res.status(201).json({ - statusCode: 201, - success: true, message: "Applicant created successfully", data: newApplicant, }); } catch (error) { logger.error(error); res.status(500).json({ - statusCode: 500, - success: false, message: "An error occurred", error, }); } }; -export const updateResume = async (req: Request, res: Response) => { +export const updateApplicant = async (req: req, res: res) => { try { const applicant = await Applicant.findById(req.params.id); if (!applicant) { - return res.status(404).json({ - statusCode: 404, - success: false, - message: "Applicant not found", - }); + return res.status(404).json({ message: "Applicant not found" }); } - if (req.body.tags) { - req.body.tags = req.body.tags.split(","); + // Handle tags, if provided + if (req.body.tags && typeof req.body.tags === "string") { + req.body.tags = req.body.tags.split(",").map((tag: string) => tag.trim()); } - const data = { - firstname: req.body.firstname, - lastname: req.body.lastname, - middlename: req.body.middlename, - suffix: req.body.suffix, - email: req.body.email, - phone: req.body.phone, - address: req.body.address, - preferredWorkLocation: req.body.preferredWorkLocation, - linkedInProfile: req.body.linkedInProfile, - portfolioLink: req.body.portfolioLink, - // resumeFileLoc: req.body.resumeFileLoc, - yearsOfExperience: req.body.yearsOfExperience, - currentMostRecentJob: req.body.currentMostRecentJob, - highestQualification: req.body.highestQualification, - majorFieldOfStudy: req.body.majorFieldOfStudy, - institution: req.body.institution, - graduationYear: req.body.graduationYear, - keySkills: req.body.keySkills, - softwareProficiency: req.body.softwareProficiency, - certifications: req.body.certifications, - coverLetter: req.body.coverLetter, - salaryExpectation: req.body.salaryExpectation, - availability: req.body.availability, - jobAppliedFor: req.body.jobAppliedFor, - whyInterestedInRole: req.body.whyInterestedInRole, - tags: req.body.tags, + const files = req.files as { [key: string]: Express.Multer.File[] } | undefined; + + // If no files are uploaded, respond with an error + // if (!files) { + // return res.status(400).json({ message: "No files uploaded" }); + // } + + // Build file name map + const fileNames: Record
+
diff --git a/server/src/public/templates/eventEmail.html b/server/src/public/templates/eventEmail.html
index be5a82ff..1222039a 100644
--- a/server/src/public/templates/eventEmail.html
+++ b/server/src/public/templates/eventEmail.html
@@ -1,65 +1,115 @@
-
+
+
+
+
+
-
-
+
+
+ Dear {{fullName}},
-Dear {{fullName}},
+Thank you for applying for the {{jobTitle}} position. We have received your application and appreciate your interest in joining our team.
-Thank you for applying for the {{jobTitle}} position. We have received your application and appreciate your interest in joining our team.
+| Position Applied | +{{jobTitle}} | +
|---|---|
| Application Date | +{{applicationDate}} | +
| Reference Number | +{{referenceNumber}} | +
| Position Applied: | -{{jobTitle}} | -
| Application Date: | -{{applicationDate}} | -
| Reference Number: | -{{referenceNumber}} | -
Our hiring team will review your qualifications, and we will contact you if your application is shortlisted for the next stage of the selection process. If you do not hear from us within {{responseTimeframe}}, please feel free to follow up.
-Our hiring team will review your qualifications, and we will contact you if your application is shortlisted for the next stage of the selection process. If you do not hear from us within {{responseTimeframe}}, please feel free to follow up.
+We appreciate your time and effort in applying and wish you the best in your job search.
-We appreciate your time and effort in applying and wish you the best in your job search.
- -Best regards,
The HR Team
{{companyName}}
Best regards,
The HR Team
+
Dear {{fullName}},
+
+
diff --git a/server/src/public/templates/jobofferEmail.html b/server/src/public/templates/jobofferEmail.html
index 1980911e..55b4a38c 100644
--- a/server/src/public/templates/jobofferEmail.html
+++ b/server/src/public/templates/jobofferEmail.html
@@ -1,36 +1,65 @@
-
+
+
+
+
- Event Invitation: {{eventName}}
+We are pleased to invite you to {{eventName}} on {{eventDate}}. Below are the event details:
+
+
-
+
+
-
+
+ Dear {{fullName}},
-| Event Name: | -{{eventName}} | -
| Date: | -{{eventDate}} | -
| Time: | -{{startTime}} - {{endTime}} | -
| Venue: | -{{facilityName}} | -
| Address: | -{{facilityLocation}} | -
| Type: | -{{eventType}} | -
We are pleased to invite you to attend {{eventName}} on {{eventDate}}. Below are the event details:
-Please confirm your attendance at your earliest convenience.
+| Event Name | +{{eventName}} | +
|---|---|
| Date | +{{eventDate}} | +
| Time | +{{startTime}} - {{endTime}} | +
| Venue | +{{facilityName}} | +
| Address | +{{facilityLocation}} | +
| Type | +{{eventType}} | +
Best regards,
The HR Team
Please confirm your attendance at your earliest convenience.
+
+
diff --git a/server/src/public/templates/newDeviceAlert.html b/server/src/public/templates/newDeviceAlert.html
new file mode 100644
index 00000000..08a8698d
--- /dev/null
+++ b/server/src/public/templates/newDeviceAlert.html
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
-
+
+
+ Dear {{fullName}},
-Dear {{fullName}},
+We are thrilled to extend a formal job offer to you for the position of {{jobTitle}} at Axleshift.
-We are thrilled to extend a formal job offer to you for the position of {{jobTitle}} at Axleshift.
+Here are the details of your offer:
-Here are the details of your offer:
+Position: {{jobTitle}}
+Salary: {{salaryAmount}} {{currency}} per {{salaryUnit}}
+Start Date: {{startDate}}
-| Position: | -{{jobTitle}} | -
| Salary: | -{{salaryAmount}} {{currency}} per {{salaryUnit}} | -
| Start Date: | -{{startDate}} | -
Please let us know if you accept this offer by {{responseDeadline}} by replying to this email. We look forward to welcoming you to the team.
-Please let us know if you accept this offer by {{responseDeadline}} by replying to this email. We look forward to welcoming you to the team.
+If you have any issues, questions, or concerns, feel free to include it to your reply.
-If you have any questions, feel free to contact us at hr2axleshift@gmail.com.
- -Best regards,
The HR Team
Best regards,
The HR Team
+
+
+
diff --git a/server/src/public/templates/otpEmail.html b/server/src/public/templates/otpEmail.html
new file mode 100644
index 00000000..db2ba8c9
--- /dev/null
+++ b/server/src/public/templates/otpEmail.html
@@ -0,0 +1,91 @@
+
+
+
+
+
+ New Login Detected
+We’ve noticed a login to your account from a new device.
+
+
+ Device: {{userAgent}}
+IP Address: {{userIP}}
+Time: {{time}}
+If this wasn't you, please secure your account immediately.
+ +
+
+
+
diff --git a/server/src/public/templates/rejectionEmail.html b/server/src/public/templates/rejectionEmail.html
new file mode 100644
index 00000000..af06fa64
--- /dev/null
+++ b/server/src/public/templates/rejectionEmail.html
@@ -0,0 +1,61 @@
+
+
+
+
+
+
+
+ One-Time Password (OTP) for Your Account
+
+
+
+ Hello {{userName}},
+We’ve received a request to verify your identity. To complete the process, please use the following One-Time Password (OTP):
+
+ {{otp}}
+
+ This OTP will expire in 10 minutes. If you did not request this, please disregard this email.
+Request Details:
+
+
+ IP Address: {{ipAddress}}
+Device Info: {{userAgent}}
+
+
+
+
diff --git a/server/src/routes/v1/account.ts b/server/src/routes/v1/account.ts
index 11add385..f9df13eb 100644
--- a/server/src/routes/v1/account.ts
+++ b/server/src/routes/v1/account.ts
@@ -16,27 +16,22 @@ router.get(
"/all",
verifySession({
permissions: ["admin"],
- },
- true,
- ),
+ }),
getAllAccounts
);
+
router.get(
"/:id",
verifySession({
permissions: ["admin"],
- },
- true,
- ),
+ }),
getAccountById
);
router.put(
"/:id",
verifySession({
permissions: ["admin"],
- },
- true,
- ),
+ }),
updateAccount
);
export default {
diff --git a/server/src/routes/v1/api.ts b/server/src/routes/v1/api.ts
index a0ca3b62..5d817ce4 100644
--- a/server/src/routes/v1/api.ts
+++ b/server/src/routes/v1/api.ts
@@ -12,7 +12,6 @@ router.get(
verifySession({
permissions: ["admin"],
},
- true,
),
updateApikey
);
diff --git a/server/src/routes/v1/applicant.ts b/server/src/routes/v1/applicant.ts
index 88312776..e36ff221 100644
--- a/server/src/routes/v1/applicant.ts
+++ b/server/src/routes/v1/applicant.ts
@@ -1,50 +1,72 @@
-import { Router } from "express";
+import { Request as req, Response as res, NextFunction as next, Router } from "express";
const router = Router();
import verifySession from "../../middlewares/verifySession";
import {
- addNewResume,
- updateResume,
- getAllResumeData,
+ addApplicant,
+ updateApplicant,
+ getAllApplicant,
getApplicantByDocumentCategory,
- getResumeById,
- deleteResume,
- searchResume,
- getResumeFile,
+ getApplicantById,
+ deleteApplicant,
+ searchApplicant,
+ getFile,
updateStat,
+ getEligibleForJobOffer,
+ uploadFile,
+ rejectApplicant,
} from "../../database/v1/controllers/applicantController";
import { createScreening, getAllScreening, screenApplicantViaAI, updateScreening } from "../../database/v1/controllers/screeningController";
import { createInterview, getAllInterview, getAllRecentInterviews, updateInterview } from "../../database/v1/controllers/interviewController";
import { getAllApplicantFacilityEvents } from "../../database/v1/controllers/facilityController";
-import { createJoboffer, getAllJoboffer, getAllRecentJoboffer, getJobofferById, sendJobOfferMail, updateJoboffer } from "../../database/v1/controllers/jobofferController";
+import { createJoboffer, getApplicantJoboffer, getAllRecentJoboffer, getJobofferById, sendJobOfferMail, updateJoboffer } from "../../database/v1/controllers/jobofferController";
+import { upload } from "../../utils/fileUploadHandler";
+import multer from "multer";
+
+const uploader = upload('applicants')
router.post(
"/",
verifySession({
permissions: ["applicant", "admin", "manager"],
- },
- true,
- ),
- addNewResume
+ }),
+ addApplicant
);
router.put(
"/:id",
verifySession({
permissions: ["applicant", "admin", "manager", "recruiter", "interviewer"],
+ }),
+ uploader.fields([
+ { name: "resume", maxCount: 1 },
+ { name: "medCert", maxCount: 1 },
+ { name: "birthCert", maxCount: 1 },
+ { name: "NBIClearance", maxCount: 1 },
+ { name: "policeClearance", maxCount: 1 },
+ { name: "TOR", maxCount: 1 },
+ { name: "idPhoto", maxCount: 1 },
+ ]),
+ (err: { message: unknown; }, req: req, res: res, next: next) => {
+ if (err) {
+ // Check for specific Multer errors
+ if (err instanceof multer.MulterError) {
+ // Handle Multer specific errors
+ return res.status(400).send({ message: err.message });
+ }
+ // Handle general errors
+ return res.status(500).send({ message: "Something went wrong!" });
+ }
+ next();
},
- true,
- ),
- updateResume
+ updateApplicant
);
router.put(
"/status/:applicantId/:stat",
verifySession({
permissions: ["applicant", "admin", "manager", "recruiter", "interviewer"],
- },
- true,
- ),
+ }),
updateStat
)
@@ -52,60 +74,49 @@ router.get(
"/all",
verifySession({
permissions: ["admin", "manager", "recruiter"],
- },
- true,
- ),
- getAllResumeData
+ }),
+ getAllApplicant
);
router.get(
"/category/:category",
verifySession({
permissions: ["admin", "manager", "recruiter"],
- },
- true,
- ),
+ }),
getApplicantByDocumentCategory
);
router.get(
- "/download/:id",
+ "/search",
verifySession({
- permissions: ["admin", "manager", "recruiter", "interviewer"],
- },
- true,
- ),
- getResumeFile
+ permissions: ["admin", "manager", "recruiter"],
+ }),
+ searchApplicant
);
router.get(
- "/search",
+ "/:id",
verifySession({
- permissions: ["admin", "manager", "recruiter"],
- },
- true,
- ),
- searchResume
+ permissions: ["admin", "manager", "recruiter", "interviewer", "applicant"],
+ }),
+ getApplicantById
);
router.get(
- "/:id",
+ "/:id/reject",
verifySession({
permissions: ["admin", "manager", "recruiter", "interviewer", "applicant"],
- },
- true,
- ),
- getResumeById
+ }),
+ rejectApplicant
);
+
router.delete(
"/:id",
verifySession({
permissions: ["admin", "manager"],
- },
- true,
- ),
- deleteResume
+ }),
+ deleteApplicant
);
// Events
@@ -113,9 +124,7 @@ router.get(
"/events/:applicantId",
verifySession({
permissions: ["admin", "manager", "recruiter", "interviewer", "applicant"],
- },
- true,
- ),
+ }),
getAllApplicantFacilityEvents
)
@@ -125,9 +134,7 @@ router.post(
"/screen/:applicantId",
verifySession({
permissions: ["admin", "manager", "recruiter", "interviewer", "applicant"],
- },
- true,
- ),
+ }),
createScreening
)
@@ -135,9 +142,7 @@ router.put(
"/screen/:screeningId",
verifySession({
permissions: ["admin", "manager", "recruiter", "interviewer", "applicant"],
- },
- true,
- ),
+ }),
updateScreening
)
@@ -145,9 +150,7 @@ router.get(
"/screen/ai/:applicantId/:jobId",
verifySession({
permissions: ["admin", "manager", "recruiter", "interviewer", "applicant"],
- },
- true,
- ),
+ }),
screenApplicantViaAI
)
@@ -155,9 +158,7 @@ router.get(
"/screen/ai/:applicantId/:jobId/:screeningId",
verifySession({
permissions: ["admin", "manager", "recruiter", "interviewer", "applicant"],
- },
- true,
- ),
+ }),
screenApplicantViaAI
)
@@ -165,9 +166,7 @@ router.get(
"/screen/all/:applicantId",
verifySession({
permissions: ["admin", "manager", "recruiter", "interviewer", "applicant"],
- },
- true,
- ),
+ }),
getAllScreening
)
@@ -177,9 +176,7 @@ router.post(
"/interview/:applicantId/:eventId",
verifySession({
permissions: ["admin", "manager", "recruiter", "interviewer", "applicant"],
- },
- true,
- ),
+ }),
createInterview
)
@@ -187,9 +184,7 @@ router.put(
"/interview/:interviewId",
verifySession({
permissions: ["admin", "manager", "recruiter", "interviewer", "applicant"],
- },
- true,
- ),
+ }),
updateInterview
)
@@ -197,9 +192,7 @@ router.get(
"/interview/all/:applicantId",
verifySession({
permissions: ["admin", "manager", "recruiter", "interviewer", "applicant"],
- },
- true,
- ),
+ }),
getAllInterview
)
@@ -207,9 +200,7 @@ router.get(
"/interview/recent",
verifySession({
permissions: ["admin", "manager", "recruiter", "interviewer"],
- },
- true,
- ),
+ }),
getAllRecentInterviews
)
@@ -218,9 +209,7 @@ router.get(
"/interview/:interviewId",
verifySession({
permissions: ["admin", "manager", "recruiter", "interviewer"],
- },
- true,
- ),
+ }),
getAllInterview
)
@@ -229,9 +218,7 @@ router.post(
"/joboffer/:applicantId/",
verifySession({
permissions: ["admin", "manager", "recruiter"],
- },
- true,
- ),
+ }),
createJoboffer
)
@@ -239,9 +226,7 @@ router.post(
"/joboffer/send-email/:jobofferId",
verifySession({
permissions: ["admin", "manager", "recruiter"],
- },
- true,
- ),
+ }),
sendJobOfferMail
)
@@ -249,29 +234,31 @@ router.put(
"/joboffer/:jobofferId/",
verifySession({
permissions: ["admin", "manager", "recruiter"],
- },
- true,
- ),
+ }),
updateJoboffer
)
+router.get(
+ "/joboffer/all/",
+ verifySession({
+ permissions: ["admin", "manager", "recruiter"],
+ }),
+ getEligibleForJobOffer
+)
+
router.get(
"/joboffer/all/:applicantId/",
verifySession({
permissions: ["admin", "manager", "recruiter"],
- },
- true,
- ),
- getAllJoboffer
+ }),
+ getApplicantJoboffer
)
router.get(
"/joboffer/recent/",
verifySession({
permissions: ["admin", "manager", "recruiter"],
- },
- true,
- ),
+ }),
getAllRecentJoboffer
)
@@ -279,12 +266,29 @@ router.get(
"/joboffer/:applicantId",
verifySession({
permissions: ["admin", "manager", "recruiter"],
- },
- true,
- ),
+ }),
getJobofferById
)
+//
+
+router.get(
+ "/:applicantId/file/:fileType",
+ verifySession({
+ permissions: ["admin", "manager", "recruiter", "interviewer"],
+ }),
+ getFile
+);
+
+router.post(
+ "/file/:applicantId/interview/:fileType",
+ verifySession({
+ permissions: ["admin", "manager", "recruiter", "interviewer"],
+ }),
+ upload('applicants').single('file'),
+ uploadFile
+);
+
export default {
metadata: {
path: "/applicant",
diff --git a/server/src/routes/v1/auth.ts b/server/src/routes/v1/auth.ts
index 3b74f265..c52d0ece 100644
--- a/server/src/routes/v1/auth.ts
+++ b/server/src/routes/v1/auth.ts
@@ -1,44 +1,53 @@
-import { Router } from "express";
+import { Router } from 'express';
const router = Router();
-import dotenv from "dotenv";
+import dotenv from 'dotenv';
dotenv.config();
-import verifySession from "../../middlewares/verifySession";
-import { createUser, login, logout, verify } from "../../database/v1/controllers/authController";
-
+// import verifySession from '../../middlewares/verifySession';
+import { createUser, logout, verify, googleAuth, googleCallback, login, sendOTP, verifyOTP } from '../../database/v1/controllers/authController';
router.post(
- "/register",
- verifySession({
- permissions: []
- },true),
+ '/register',
createUser
);
+
router.post(
- "/login",
- verifySession({
- permissions: []
- },true),
+ '/login',
login
);
+
router.get(
- "/logout",
- verifySession({
- permissions: []
- },true),
+ '/logout',
logout
);
+
router.get(
- "/verify",
- verifySession({
- permissions: []
- },true),
+ '/me',
verify
);
+router.post(
+ '/send-otp',
+ sendOTP
+)
+
+router.post(
+ '/verify-otp',
+ verifyOTP
+)
+
+// Google OAuth
+router.get('/google',
+ googleAuth
+);
+
+router.get('/google/callback',
+ googleCallback
+);
+
export default {
metadata: {
- path: "/auth",
- description: "This route is used to register, login, logout and verify user",
+ path: '/auth',
+ description: 'This route is used to register, login, logout, and verify user',
},
router,
};
diff --git a/server/src/routes/v1/facilities.ts b/server/src/routes/v1/facilities.ts
index ceee572d..cc662c63 100644
--- a/server/src/routes/v1/facilities.ts
+++ b/server/src/routes/v1/facilities.ts
@@ -38,9 +38,7 @@ router.post(
"/create",
verifySession({
permissions: ["admin", "manager"],
- },
- true,
- ),
+ }),
createFacility
);
@@ -48,9 +46,7 @@ router.put(
"/update/:facilityId",
verifySession({
permissions: ["admin", "manager"],
- },
- true,
- ),
+ }),
updateFacility
);
@@ -58,9 +54,7 @@ router.get(
"/all",
verifySession({
permissions: ["admin", "manager", "recruiter"],
- },
- true,
- ),
+ }),
getAllFacilities
);
@@ -68,9 +62,7 @@ router.get(
"/:facilityId",
verifySession({
permissions: ["admin", "manager", "recruiter"],
- },
- true,
- ),
+ }),
getFacilityById
);
@@ -78,9 +70,7 @@ router.delete(
"/delete/:facilityId",
verifySession({
permissions: ["admin", "manager"],
- },
- true,
- ),
+ }),
removeFacility
);
@@ -89,9 +79,7 @@ router.post(
"/timeslot/create/:facilityId",
verifySession({
permissions: ["admin", "manager"],
- },
- true,
- ),
+ }),
createFacilityTimeslot
);
@@ -108,9 +96,7 @@ router.delete(
"/timeslot/delete/:timeslotId",
verifySession({
permissions: ["admin", "manager"],
- },
- true,
- ),
+ }),
removeFacilityTimeslot
);
@@ -119,9 +105,7 @@ router.post(
"/event/:timeslotId",
verifySession({
permissions: ["admin", "manager", "recruiter"],
- },
- true,
- ),
+ }),
createFacilityEvent
);
@@ -129,9 +113,7 @@ router.put(
"/event/:timeslotId",
verifySession({
permissions: ["admin", "manager"]
- },
- true,
- ),
+ }),
updateFacilityEvent
);
@@ -139,9 +121,7 @@ router.delete(
"/event/:timeslotId",
verifySession({
permissions: ["admin", "manager"]
- },
- true,
- ),
+ }),
deleteFacilityEvent
);
@@ -149,9 +129,7 @@ router.get(
"/events/:eventId/calendar-states",
verifySession({
permissions: ["admin", "manager", "recruiter", "interviewer"],
- },
- true,
- ),
+ }),
getFacilityCalendarStates
);
@@ -159,9 +137,7 @@ router.get(
"/event/:eventId",
verifySession({
permissions: ["admin", "manager", "recruiter", "interviewer"]
- },
- true,
- ),
+ }),
getFacilityEventByID
);
@@ -169,9 +145,7 @@ router.get(
"/events/:eventId/:date",
verifySession({
permissions: ["admin", "manager", "recruiter", "interviewer"],
- },
- true,
- ),
+ }),
getFacilityEventsForDate
);
@@ -179,20 +153,16 @@ router.get(
"/events/upcoming",
verifySession({
permissions: ["admin", "manager", "recruiter", "interviewer"],
- },
- true,
- ),
+ }),
getUpcomingEvents
);
// Booking
router.post(
- "/events/:eventId/book",
+ "/events/:eventId/book/applicant/:applicantId",
verifySession({
permissions: ["admin", "manager", "recruiter"],
- },
- true,
- ),
+ }),
bookApplicantToEvent
);
@@ -200,9 +170,7 @@ router.post(
"/events/:eventId/send-email",
verifySession({
permissions: ["admin", "manager"],
- },
- true,
- ),
+ }),
SendEmailToFacilityEventParticipants
);
@@ -210,9 +178,7 @@ router.delete(
"/events/:eventId/unbook",
verifySession({
permissions: ["admin", "manager", "recruiter"],
- },
- true,
- ),
+ }),
unbookApplicantFromEvent
);
diff --git a/server/src/routes/v1/health.ts b/server/src/routes/v1/health.ts
index fb688784..281874b0 100644
--- a/server/src/routes/v1/health.ts
+++ b/server/src/routes/v1/health.ts
@@ -11,9 +11,7 @@ router.get(
verifySession(
{
permissions: ["user", "admin"],
- },
- true,
- ),
+ }),
(req, res) => {
res.send("OK");
}
diff --git a/server/src/routes/v1/job.ts b/server/src/routes/v1/job.ts
index 79cb9f7e..97e71c76 100644
--- a/server/src/routes/v1/job.ts
+++ b/server/src/routes/v1/job.ts
@@ -14,9 +14,7 @@ router.post(
verifySession(
{
permissions: ["admin", "manager", "recruiter"],
- },
- true,
- ),
+ }),
createJob
);
@@ -25,9 +23,7 @@ router.put(
verifySession(
{
permissions: ["admin", "manager", "recruiter"],
- },
- true,
- ),
+ }),
updateJob
);
@@ -36,9 +32,7 @@ router.get(
verifySession(
{
permissions: ["admin", "manager", "recruiter"],
- },
- true,
- ),
+ }),
getAllJob
);
@@ -47,9 +41,7 @@ router.get(
verifySession(
{
permissions: ["admin", "manager", "recruiter"],
- },
- true,
- ),
+ }),
getJobById
);
@@ -58,9 +50,7 @@ router.delete(
verifySession(
{
permissions: ["admin", "manager", "recruiter"],
- },
- true,
- ),
+ }),
(req, res) => {
res.send("OK");
}
diff --git a/server/src/routes/v1/jobposter.ts b/server/src/routes/v1/jobposter.ts
index 50dbcbb0..5f336c2b 100644
--- a/server/src/routes/v1/jobposter.ts
+++ b/server/src/routes/v1/jobposter.ts
@@ -10,30 +10,25 @@ import { createJobposter, getJobposterByRefId, getAllJobposters, removeJobposter
router.post("/:id/post",
verifySession({
permissions: ["admin", "manager", "recruiter"],
- },
- true,
- ),
+ }),
createJobposter);
+
router.get("/all",
verifySession({
permissions: ["admin", "manager", "recruiter"],
- },
- true,
- ),
+ }),
getAllJobposters);
+
router.get("/:id",
verifySession({
permissions: ["admin", "manager", "recruiter"],
- },
- true,
- ),
+ }),
getJobposterByRefId);
+
router.delete("/:id",
verifySession({
permissions: ["admin", "manager", "recruiter"],
- },
- true,
- ),
+ }),
removeJobposter);
export default {
diff --git a/server/src/routes/v1/jobposting.ts b/server/src/routes/v1/jobposting.ts
index a323cfc0..2521d2c3 100644
--- a/server/src/routes/v1/jobposting.ts
+++ b/server/src/routes/v1/jobposting.ts
@@ -11,9 +11,7 @@ router.post(
"/",
verifySession({
permissions: ["admin", "manager", "recruiter"],
- },
- true,
- ),
+ }),
createJobposting
);
@@ -21,54 +19,42 @@ router.get(
"/search",
verifySession({
permissions: ["admin", "manager", "recruiter"],
- },
- true,
- ),
+ }),
searchJobpostings
);
router.get(
"/",
verifySession({
permissions: ["admin", "manager", "recruiter"],
- },
- true,
- ),
+ }),
getAllJobpostings
);
router.get(
"/scheduled",
verifySession({
permissions: ["admin", "manager", "recruiter"],
- },
- true,
- ),
+ }),
getAllScheduledJobpostings
);
router.get(
"/:id",
verifySession({
permissions: ["admin", "manager", "recruiter"],
- },
- true,
- ),
+ }),
getJobpostingById
);
router.put(
"/:id",
verifySession({
permissions: ["admin", "manager", "recruiter"],
- },
- true,
- ),
+ }),
updateJobposting
);
router.delete(
"/:id",
verifySession({
permissions: ["user", "admin"],
- },
- true,
- ),
+ }),
deleteJobposting
);
diff --git a/server/src/routes/v1/stats.ts b/server/src/routes/v1/stats.ts
new file mode 100644
index 00000000..66893c5f
--- /dev/null
+++ b/server/src/routes/v1/stats.ts
@@ -0,0 +1,23 @@
+import { Router } from "express";
+const router = Router();
+
+import dotenv from "dotenv";
+import verifySession from "../../middlewares/verifySession";
+import { statistics } from "../../database/v1/controllers/statisticController";
+dotenv.config();
+
+router.get(
+ "/",
+ verifySession({
+ permissions: ["admin", "manager", "recruiter"],
+ }),
+ statistics
+);
+
+export default {
+ metadata: {
+ path: "/stats",
+ description: "Test route",
+ },
+ router,
+};
diff --git a/server/src/routes/v1/tags.ts b/server/src/routes/v1/tags.ts
index c8f739c7..281e63af 100644
--- a/server/src/routes/v1/tags.ts
+++ b/server/src/routes/v1/tags.ts
@@ -11,63 +11,55 @@ router.post(
"/",
verifySession({
permissions: ["admin", "manager"],
- },
- true,
- ),
+ }),
createTag
);
+
router.get(
"/all",
verifySession({
permissions: ["admin", "manager"],
- },
- true,
- ),
+ }),
getAllTags
);
+
router.get(
"/search",
verifySession({
permissions: ["admin", "manager"],
- },
- true,
- ),
+ }),
searchTags
);
+
router.get(
"/category/:category",
verifySession({
permissions: ["admin", "manager"],
- },
- true,
- ),
+ }),
getTagByCategory
);
+
router.get(
"/:id",
verifySession({
permissions: ["admin", "manager"],
- },
- true,
- ),
+ }),
getTagById
);
+
router.put(
"/:id",
verifySession({
permissions: ["admin", "manager"],
- },
- true,
- ),
+ }),
updateTag
);
+
router.delete(
"/:id",
verifySession({
permissions: ["admin", "manager"],
- },
- true,
- ),
+ }),
deleteTag
);
diff --git a/server/src/types/express-session.d.ts b/server/src/types/express-session.d.ts
index a0ed07b2..99363a32 100644
--- a/server/src/types/express-session.d.ts
+++ b/server/src/types/express-session.d.ts
@@ -1,20 +1,23 @@
import "express-session";
export interface SessionUser {
- _id: string;
- username: string;
- role: string;
- email: string;
- status: string;
- token: string;
- emailVerifiedAt: Date | null;
- // permissions: string[];
+ _id: string;
+ firstname: string;
+ lastname: string;
+ username: string;
+ role: string;
+ email: string;
+ status: string;
+ emailVerifiedAt?: Date | null;
}
+// Represents a pending device fingerprint (user-agent + IP hash or string)
+export type PendingDevice = string | null;
+
// Extend the express-session SessionData interface
declare module "express-session" {
- interface SessionData {
- user?: SessionUser; // Use `user?` to make it optional since it may not exist in some cases (e.g., if not logged in)
- csrfToken?: string; // Optional CSRF token in session
- }
+ interface SessionData {
+ user?: SessionUser;
+ pendingDevice?: PendingDevice;
+ }
}
diff --git a/server/src/utils/fileUploadHandler.ts b/server/src/utils/fileUploadHandler.ts
index 24c28996..819ee0b7 100644
--- a/server/src/utils/fileUploadHandler.ts
+++ b/server/src/utils/fileUploadHandler.ts
@@ -11,38 +11,36 @@ import { config } from "../config";
// Create the main upload directory if it doesn't exist
const dest = path.join(config.fileServer.dir);
if (!fs.existsSync(dest)) {
- fs.mkdirSync(dest, { recursive: true });
+ fs.mkdirSync(dest, { recursive: true });
}
// Setup storage engine for uploaded files
-export const upload = (childDir: string) => {
- const storage = multer.diskStorage({
- destination: (req, file, cb) => {
- const uploadPath = path.join(dest, childDir);
+export const upload = (baseDir: string) => {
+ const storage = multer.diskStorage({
+ destination: (req, file, cb) => {
+ const uploadPath = path.join(dest, baseDir, file.fieldname);
+ if (!fs.existsSync(uploadPath)) {
+ fs.mkdirSync(uploadPath, { recursive: true });
+ }
- // Create the child directory if it doesn't exist
- if (!fs.existsSync(uploadPath)) {
- fs.mkdirSync(uploadPath, { recursive: true });
- }
+ cb(null, uploadPath);
+ },
+ filename: (req, file, cb) => {
+ cb(null, `${Date.now()}-${file.originalname.replace(/\s/g, "-").toLowerCase()}`);
+ },
+ });
- cb(null, uploadPath);
- },
- filename: (req, file, cb) => {
- cb(null, `${Date.now()}-${file.originalname.replace(/\s/g, "-").toLowerCase()}`);
- },
- });
-
- return multer({
- storage: storage,
- fileFilter: (req, file, cb) => {
- const filetypes = /pdf|doc|docx/;
- const extname = filetypes.test(path.extname(file.originalname).toLowerCase());
- const mimetype = filetypes.test(file.mimetype);
- if (extname && mimetype) {
- return cb(null, true);
- } else {
- cb(new Error("File type not supported"));
- }
- },
- });
+ return multer({
+ storage,
+ fileFilter: (req, file, cb) => {
+ const filetypes = /pdf|doc|docx|jpg|jpeg|png/;
+ const extname = filetypes.test(path.extname(file.originalname).toLowerCase());
+ const mimetype = filetypes.test(file.mimetype);
+ if (extname && mimetype) {
+ return cb(null, true);
+ } else {
+ cb(new Error("File type not supported"));
+ }
+ },
+ });
};
diff --git a/server/tsconfig.json b/server/tsconfig.json
index bd678b28..a67a7054 100644
--- a/server/tsconfig.json
+++ b/server/tsconfig.json
@@ -28,17 +28,18 @@
"module": "commonjs" /* Specify what module code is generated. */,
"rootDir": "./src" /* Specify the root folder within your source files. */,
// "moduleResolution": "node10", /* Specify how TypeScript looks up a file from a given module specifier. */
- "baseUrl": "./" /* Specify the base directory to resolve non-relative module names. */,
+ "baseUrl": "." /* Specify the base directory to resolve non-relative module names. */,
"paths": {
"*": ["node_modules/*"],
"@src/*": ["./src/*"],
"@types/*": ["./src/types/*"],
"@middlewares/*": ["./src/middlewares/*"],
"@v1/controllers/*": ["./src/database/v1/controllers/*"],
- "@v1/models/*": ["./src/database/v1/models/*"]
+ "@v1/models/*": ["./src/database/v1/models/*"],
+ "@v1/config/*": ["./src/config/v1/*"]
} /* Specify a set of entries that re-map imports to additional lookup locations. */,
// "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */
- "typeRoots": ["./node_modules/@types", "./src/types"] /* Specify multiple folders that act like './node_modules/@types'. */,
+ "typeRoots": ["./node_modules/@types", "./src/types", "./dist/types"] /* Specify multiple folders that act like './node_modules/@types'. */,
// "types": [], /* Specify type package names to be included without being referenced in a source file. */
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */
// "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */
+
+
+
+ Dear {{fullName}},
+ +Thank you for taking the time to apply for the position of {{jobTitle}} at Axleshift. We appreciate the opportunity to learn more about you and your qualifications.
+ +After careful consideration, we regret to inform you that we will not be moving forward with your application at this time.
+ +Please know that this decision was not easy, as we had many strong candidates. We truly appreciate your interest in joining our team and encourage you to apply again for future openings that match your skills and experience.
+ +We wish you all the best in your job search and professional journey.
+ +Best regards,
The HR Team