devops/encoach_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature-paypal-simple

Browse Source
This commit is contained in:
Joao Ramos
2024-03-05 14:45:51 +00:00
parent a86ed9f76c 20b52d049d
commit 2a27fbd02f
16 changed files with 1588 additions and 1000 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pages/(exam)/ExamPage.tsx
View File

@@ -424,7 +424,7 @@ export default function ExamPage({page}: Props) {
<AbandonPopup
isOpen={showAbandonPopup}
abandonPopupTitle="Leave Exercise"
abandonPopupDescription="Are you sure you want to leave the exercise? You will lose all your progress."
abandonPopupDescription="Are you sure you want to leave the exercise? Your progress will be saved and this exam can be resumed on the Dashboard."
abandonConfirmButtonText="Confirm"
onAbandon={() => {
reset();

30
src/pages/api/payments/paypal.ts Normal file
View File

@@ -0,0 +1,30 @@
// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
import type { NextApiRequest, NextApiResponse } from "next";
import { app } from "@/firebase";
import {
getFirestore,
getDocs,
collection,
} from "firebase/firestore";
import { withIronSessionApiRoute } from "iron-session/next";
import { sessionOptions } from "@/lib/session";
const db = getFirestore(app);
export default withIronSessionApiRoute(handler, sessionOptions);
async function get(req: NextApiRequest, res: NextApiResponse) {
const payments = await getDocs(collection(db, "paypalpayments"));
const data = payments.docs.map((doc) => doc.data());
res.status(200).json(data);
}
async function handler(req: NextApiRequest, res: NextApiResponse) {
if (!req.session.user) {
res.status(401).json({ ok: false });
return;
}
if (req.method === "GET") await get(req, res);
}

19
src/pages/api/paypal/approve.ts
View File

@@ -73,6 +73,25 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
},
{ merge: true }
);
try {
await setDoc(
doc(db, 'paypalpayments', v4()),
{
orderId: id,
userId: req.session.user.id,
status: request.data.status,
createdAt: new Date().toISOString(),
value: request.data.purchase_units[0].payments.captures[0].amount.value,
currency: request.data.purchase_units[0].payments.captures[0].amount.currency_code,
subscriptionDuration: duration,
subscriptionDurationUnit: duration_unit,
subscriptionExpirationDate: updatedExpirationDate.toISOString(),
}
);
} catch(err) {
console.error('Failed to insert paypal payment!', err);
}
if (user.type === "corporate") {
const snapshot = await getDocs(collection(db, "groups"));

2
src/pages/api/storage/insert.ts
View File

@@ -28,7 +28,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
}
const audioFile = files.audio;
const audioFileRef = ref(storage, `${fields.root}/${(audioFile as any).path.split("/").pop()!.replace("upload_", "")}`);
const audioFileRef = ref(storage, `${fields.root}/${(audioFile as any).path.replace("upload_", "")}`);
const binary = fs.readFileSync((audioFile as any).path).buffer;
const snapshot = await uploadBytes(audioFileRef, binary);

43
src/pages/api/tickets/index.ts
View File

@@ -1,7 +1,7 @@
// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
import { sendEmail } from "@/email";
import { app } from "@/firebase";
import { Ticket, TicketTypeLabel } from "@/interfaces/ticket";
import { Ticket, TicketTypeLabel, TicketWithCorporate } from "@/interfaces/ticket";
import { sessionOptions } from "@/lib/session";
import {
collection,
@@ -9,11 +9,14 @@ import {
getDocs,
getFirestore,
setDoc,
where,
query,
} from "firebase/firestore";
import { withIronSessionApiRoute } from "iron-session/next";
import moment from "moment";
import type { NextApiRequest, NextApiResponse } from "next";
import ShortUniqueId from "short-unique-id";
import { Group, CorporateUser } from "@/interfaces/user";
const db = getFirestore(app);
@@ -44,12 +47,38 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
async function get(req: NextApiRequest, res: NextApiResponse) {
const snapshot = await getDocs(collection(db, "tickets"));
res.status(200).json(
snapshot.docs.map((doc) => ({
id: doc.id,
...doc.data(),
}))
);
const docs = snapshot.docs.map((doc) => ({
id: doc.id,
...doc.data(),
})) as Ticket[];
// fetch all groups for these users
const reporters = [...new Set(docs.map((d) => d.reporter.id).filter((id) => id))];
const groupsSnapshot = await getDocs(query(collection(db, "groups"), where("participants", "array-contains-any", reporters)));
const groups = groupsSnapshot.docs.map((doc) => doc.data()) as Group[];
// based on the admin of each group, verify if it exists and it's of type corporate
const groupsAdmins = [...new Set(groups.map((g) => g.admin).filter((id) => id))];
const adminsSnapshot = await getDocs(query(collection(db, "users"), where("id", "in", groupsAdmins), where("type", "==", "corporate")));
const admins = adminsSnapshot.docs.map((doc) => doc.data());
const docsWithAdmins = docs.map((d) => {
const group = groups.find((g) => g.participants.includes(d.reporter.id));
const admin = admins.find((a) => a.id === group?.admin) as CorporateUser;
if(admin) {
return {
...d,
corporate: admin.corporateInformation?.companyInformation?.name,
};
}
return d;
}) as TicketWithCorporate[];
res.status(200).json(docsWithAdmins);
}
async function post(req: NextApiRequest, res: NextApiResponse) {

8
src/pages/api/users/agents/[code].ts
View File

@@ -23,7 +23,7 @@ interface Contact {
number: string;
}
async function get(req: NextApiRequest, res: NextApiResponse) {
const { code } = req.query as { code: string };
const { code, language = 'en' } = req.query as { code: string, language: string};
const usersQuery = query(
collection(db, "users"),
@@ -43,9 +43,11 @@ async function get(req: NextApiRequest, res: NextApiResponse) {
return newUser;
}) as Contact[];
const country = countryCodes.findOne("countryCode" as any, code);
const country = countryCodes.findOne("countryCode" as any, code.toUpperCase());
const key = language === 'ar' ? 'countryNameLocal' : 'countryNameEn';
res.json({
label: country.countryNameEn,
label: country[key],
entries,
});
}

7
src/pages/api/users/agents/index.ts
View File

@@ -23,6 +23,8 @@ interface Contact {
number: string;
}
async function get(req: NextApiRequest, res: NextApiResponse) {
const { language = 'en' } = req.query as { language: string };
const usersQuery = query(
collection(db, "users"),
where("type", "==", "agent")
@@ -49,9 +51,10 @@ async function get(req: NextApiRequest, res: NextApiResponse) {
) as Record<string, Contact[]>;
const result = Object.keys(data).map((code) => {
const country = countryCodes.findOne("countryCode" as any, code);
const country = countryCodes.findOne("countryCode" as any, code.toUpperCase());
const key = language === 'ar' ? 'countryNameLocal' : 'countryNameEn';
return {
label: country.countryNameEn,
label: country[key],
key: code,
entries: data[code],
};

2347
src/pages/payment-record.tsx
View File

File diff suppressed because it is too large Load Diff

62
src/pages/tickets.tsx
View File

@@ -11,6 +11,7 @@ import {
TicketStatusLabel,
TicketType,
TicketTypeLabel,
TicketWithCorporate,
} from "@/interfaces/ticket";
import { sessionOptions } from "@/lib/session";
import { shouldRedirectHome } from "@/utils/navigation.disabled";
@@ -28,7 +29,7 @@ import { useEffect, useState } from "react";
import { BsArrowDown, BsArrowUp } from "react-icons/bs";
import { ToastContainer } from "react-toastify";
const columnHelper = createColumnHelper<Ticket>();
const columnHelper = createColumnHelper<TicketWithCorporate>();
export const getServerSideProps = withIronSessionSsr(({ req, res }) => {
const user = req.session.user;
@@ -75,10 +76,26 @@ const TypesClassNames: { [key in TicketType]: string } = {
help: "bg-mti-blue-light",
};
const escapedURL = process.env.NEXT_PUBLIC_WEBSITE_URL || ''.replace(
/[.*+?^${}()|[\]\\]/g,
"\\$&"
);
const fromHomepage = [new RegExp(`^${escapedURL}`), /\/contact$/];
type Source = "webpage" | "platform" | "";
const SOURCE_OPTIONS = [
{ value: "", label: "All" },
{ value: "webpage", label: "Webpage" },
{ value: "platform", label: "Platform" },
]
export default function Tickets() {
const [filteredTickets, setFilteredTickets] = useState<Ticket[]>([]);
const [selectedTicket, setSelectedTicket] = useState<Ticket>();
const [assigneeFilter, setAssigneeFilter] = useState<string>();
const [sourceFilter, setSourceFilter] = useState<Source>("");
const [dateSorting, setDateSorting] = useState<"asc" | "desc">("desc");
const [typeFilter, setTypeFilter] = useState<TicketType>();
@@ -90,7 +107,7 @@ export default function Tickets() {
const sortByDate = (a: Ticket, b: Ticket) => {
return moment((dateSorting === "desc" ? b : a).date).diff(
moment((dateSorting === "desc" ? a : b).date),
moment((dateSorting === "desc" ? a : b).date)
);
};
@@ -102,11 +119,16 @@ export default function Tickets() {
if (statusFilter) filters.push((x: Ticket) => x.status === statusFilter);
if (assigneeFilter)
filters.push((x: Ticket) => x.assignedTo === assigneeFilter);
if (sourceFilter) {
if (sourceFilter === "webpage")
filters.push((x: Ticket) => fromHomepage.some((r) => r.test(x.reportedFrom)));
if (sourceFilter === "platform")
filters.push((x: Ticket) => !fromHomepage.some((r) => r.test(x.reportedFrom)));
}
setFilteredTickets(
[...filters.reduce((d, f) => d.filter(f), tickets)].sort(sortByDate),
[...filters.reduce((d, f) => d.filter(f), tickets)].sort(sortByDate)
);
}, [tickets, typeFilter, statusFilter, assigneeFilter, dateSorting, user]);
}, [tickets, typeFilter, statusFilter, assigneeFilter, dateSorting, user, sourceFilter]);
const columns = [
columnHelper.accessor("id", {
@@ -119,7 +141,7 @@ export default function Tickets() {
<span
className={clsx(
"rounded-lg p-1 px-2 text-white",
TypesClassNames[info.getValue()],
TypesClassNames[info.getValue()]
)}
>
{TicketTypeLabel[info.getValue()]}
@@ -164,7 +186,7 @@ export default function Tickets() {
<span
className={clsx(
"rounded-lg p-1 px-2 text-white",
StatusClassNames[info.getValue()],
StatusClassNames[info.getValue()]
)}
>
{TicketStatusLabel[info.getValue()]}
@@ -175,6 +197,10 @@ export default function Tickets() {
header: "Assignee",
cell: (info) => users.find((x) => x.id === info.getValue())?.name || "",
}),
columnHelper.accessor("corporate", {
header: "Corporate",
cell: (info) => info.getValue(),
}),
];
const getAssigneeValue = () => {
@@ -290,7 +316,7 @@ export default function Tickets() {
{ value: "me", label: "Assigned to me" },
...users
.filter((x) =>
["admin", "developer", "agent"].includes(x.type),
["admin", "developer", "agent"].includes(x.type)
)
.map((u) => ({
value: u.id,
@@ -302,7 +328,7 @@ export default function Tickets() {
onChange={(value) =>
value
? setAssigneeFilter(
value.value === "me" ? user.id : value.value,
value.value === "me" ? user.id : value.value
)
: setAssigneeFilter(undefined)
}
@@ -310,6 +336,18 @@ export default function Tickets() {
isClearable
/>
</div>
<div className="flex w-full flex-col gap-3">
<label className="text-mti-gray-dim text-base font-normal">
Source
</label>
<Select
options={SOURCE_OPTIONS}
disabled={user.type === "agent"}
value={SOURCE_OPTIONS.find((x) => x.value === sourceFilter)}
onChange={(value) => setSourceFilter(value?.value as Source)
}
/>
</div>
</div>
<table className="bg-mti-purple-ultralight/40 w-full rounded-xl">
@@ -322,7 +360,7 @@ export default function Tickets() {
? null
: flexRender(
header.column.columnDef.header,
header.getContext(),
header.getContext()
)}
</th>
))}
@@ -334,7 +372,7 @@ export default function Tickets() {
<tr
className={clsx(
"even:bg-mti-purple-ultralight/40 hover:bg-mti-purple-ultralight cursor-pointer rounded-lg py-2 odd:bg-white",
"transition duration-300 ease-in-out",
"transition duration-300 ease-in-out"
)}
onClick={() => setSelectedTicket(row.original)}
key={row.id}
@@ -343,7 +381,7 @@ export default function Tickets() {
<td className="w-fit items-center px-4 py-2" key={cell.id}>
{flexRender(
cell.column.columnDef.cell,
cell.getContext(),
cell.getContext()
)}
</td>
))}