Merge pull request #181 from Peppermint-Lab/next

🚀 next release
Peppermint-Lab · Nov 25, 2023 · 6e92afd · 6e92afd
2 parents 4e7a895 + ab1e1a1
commit 6e92afd
Show file tree

Hide file tree

Showing 26 changed files with 1,223 additions and 573 deletions.
diff --git a/README.md b/README.md
@@ -44,14 +44,16 @@ Check out the getting started guide if this is the first time you've used Pepper
 version: "3.1"
 
 services:
-  postgres:
+  peppermint_postgres:
+    container_name: peppermint_postgres
     profiles:
       - prod
       - dev
       - test
-    container_name: postgres
     image: postgres:latest
     restart: always
+    ports:
+      - 5432:5432
     volumes:
       - pgdata:/var/lib/postgresql/data
     environment:
@@ -60,13 +62,16 @@ services:
       POSTGRES_DB: peppermint
 
   peppermint:
-    profiles:
-      - prod
     container_name: peppermint
     image: pepperlabs/peppermint:latest
     ports:
-      - 5001:5001
+      - 3000:3000
+      - 5003:5003
     restart: always
+    depends_on:
+      - peppermint_postgres
+    profiles:
+      - prod
     depends_on:
       - postgres
     healthcheck:
@@ -75,20 +80,19 @@ services:
       timeout: 10s
       retries: 3
     environment:
-      PORT: 5001
-      DB_USERNAME: peppermint
-      DB_PASSWORD: 1234
-      DB_HOST: postgres
+      DB_USERNAME: "peppermint"
+      DB_PASSWORD: "1234"
+      DB_HOST: "peppermint_postgres"
       SECRET: 'peppermint4life'
       
-
 volumes:
  pgdata:
 ```
 
 Once this is completed then you can go to your base_url which was added to the compose file and login.
 
 The default login credentials are
+
 ```
 [email protected]
 1234
@@ -123,11 +127,8 @@ Give a ⭐️ if this project helped you!
 
 ## Star History
 
-
 [![Star History Chart](https://api.star-history.com/svg?repos=Peppermint-Lab/peppermint&type=Date)](https://star-history.com/#Peppermint-Lab/peppermint&Date)
 
-
-
 ## Author
 
 👤 **Jack Andrews**

diff --git a/apps/api/package.json b/apps/api/package.json
@@ -25,9 +25,10 @@
   "dependencies": {
     "@fastify/cookie": "^9.0.4",
     "@fastify/cors": "^8.3.0",
+    "@fastify/rate-limit": "^9.0.0",
     "@fastify/session": "^10.4.0",
     "@fastify/swagger": "^8.10.0",
-    "@prisma/client": "^5.2.0",
+    "@prisma/client": "5.2.0",
     "axios": "^1.5.0",
     "bcrypt": "^5.0.1",
     "dotenv": "^16.0.0",

diff --git a/apps/api/src/controllers/auth.ts b/apps/api/src/controllers/auth.ts
@@ -136,6 +136,20 @@ export function authRoutes(fastify: FastifyInstance) {
     }
   );
 
+  // Delete a user
+  fastify.delete(
+    "/api/v1/auth/user/:id",
+    async (request: FastifyRequest, reply: FastifyReply) => {
+      const { id } = request.params as { id: string };
+
+      await prisma.user.delete({
+        where: { id },
+      });
+
+      reply.send({ success: true });
+    }
+  );
+
   // User Profile
   fastify.get(
     "/api/v1/auth/profile",

diff --git a/apps/api/src/controllers/ticket.ts b/apps/api/src/controllers/ticket.ts
@@ -11,8 +11,18 @@ export function ticketRoutes(fastify: FastifyInstance) {
     "/api/v1/ticket/create",
 
     async (request: FastifyRequest, reply: FastifyReply) => {
-      const { name, company, detail, title, priority, email, engineer }: any =
-        request.body;
+      const {
+        name,
+        company,
+        detail,
+        title,
+        priority,
+        email,
+        engineer,
+        type,
+      }: any = request.body;
+
+      console.log(request.body);
 
       const ticket: any = await prisma.ticket.create({
         data: {
@@ -21,10 +31,11 @@ export function ticketRoutes(fastify: FastifyInstance) {
           detail,
           priority: priority ? priority : "low",
           email,
+          type: type ? type.toLowerCase() : "support",
           client:
             company !== undefined
               ? {
-                  connect: { id: company.id },
+                  connect: { id: company.id || company },
                 }
               : undefined,
           fromImap: false,
@@ -62,6 +73,7 @@ export function ticketRoutes(fastify: FastifyInstance) {
       reply.status(200).send({
         message: "Ticket created correctly",
         success: true,
+        id: ticket.id,
       });
     }
   );

diff --git a/apps/api/src/main.ts b/apps/api/src/main.ts
@@ -59,6 +59,11 @@ server.register(require("@fastify/swagger"), {
   },
 });
 
+server.register(import("@fastify/rate-limit"), {
+  max: 20,
+  timeWindow: "1 minute",
+});
+
 // register all routes
 registerRoutes(server);
 
@@ -122,7 +127,7 @@ const start = async () => {
 
         client.capture({
           event: "server_started",
-          distinctId: "api_server",
+          distinctId: "uuid",
         });
 
         await client.shutdownAsync();

diff --git a/apps/api/src/prisma/migrations/20231125042344_/migration.sql b/apps/api/src/prisma/migrations/20231125042344_/migration.sql
@@ -0,0 +1,5 @@
+-- CreateEnum
+CREATE TYPE "TicketType" AS ENUM ('bug', 'feature', 'support', 'incident', 'service', 'maintenance', 'access', 'feedback');
+
+-- AlterTable
+ALTER TABLE "Ticket" ADD COLUMN     "type" "TicketType" NOT NULL DEFAULT 'support';
diff --git a/apps/api/src/prisma/schema.prisma b/apps/api/src/prisma/schema.prisma
@@ -105,6 +105,7 @@ model Ticket {
   fromImap   Boolean
   Number     Int          @default(autoincrement())
   status     TicketStatus @default(needs_support)
+  type       TicketType   @default(support)
 
   TicketFile   TicketFile[]
   Comment      Comment[]
@@ -298,3 +299,14 @@ enum TicketStatus {
   in_review
   done
 }
+
+enum TicketType {
+  bug
+  feature
+  support
+  incident
+  service
+  maintenance
+  access
+  feedback
+}
diff --git a/apps/client/components/TicketViews/assigned.tsx b/apps/client/components/TicketViews/assigned.tsx
@@ -1,6 +1,6 @@
 import moment from "moment";
 import { useRouter } from "next/router";
-import React from "react";
+import React, { useMemo } from "react";
 import { useQuery } from "react-query";
 import {
   useFilters,
@@ -221,7 +221,7 @@ export default function AssignedTickets() {
   const low = "bg-blue-100 text-blue-800";
   const normal = "bg-green-100 text-green-800";
 
-  const columns = React.useMemo(
+  const columns = useMemo(
     () => [
       {
         Header: "Type",
@@ -236,7 +236,7 @@ export default function AssignedTickets() {
         Cell: ({ row, value }: any) => {
           return (
             <>
-              <span className="max-w-[240px] truncate">{value}</span>
+              <span className=" max-w-[240px] truncate">{value}</span>
             </>
           );
         },
@@ -245,7 +245,19 @@ export default function AssignedTickets() {
         Header: "Assignee",
         accessor: "assignedTo.name",
         id: "assignee",
-        Cell: ({ row, value }) => {
+        Cell: ({ row, value }: any) => {
+          return (
+            <>
+              <span className="w-[80px] truncate">{value ? value : "n/a"}</span>
+            </>
+          );
+        },
+      },
+      {
+        Header: "Client",
+        accessor: "client.name",
+        id: "client",
+        Cell: ({ row, value }: any) => {
           return (
             <>
               <span className="w-[80px] truncate">{value ? value : "n/a"}</span>
@@ -274,7 +286,7 @@ export default function AssignedTickets() {
           return (
             <>
               <span
-                className={`inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium ${badge}`}
+                className={`inline-flex items-center rounded-md justify-center w-1/2 px-2 py-1 text-xs font-medium ring-1 ring-inset ${badge}`}
               >
                 {value}
               </span>
@@ -284,28 +296,19 @@ export default function AssignedTickets() {
       },
       {
         Header: "Status",
-        accessor: "priority",
+        accessor: "status",
         id: "status",
         Cell: ({ row, value }) => {
           let p = value;
           let badge;
 
-          if (p === "Low") {
-            badge = low;
-          }
-          if (p === "Normal") {
-            badge = normal;
-          }
-          if (p === "High") {
-            badge = high;
-          }
-
           return (
             <>
-              <span
-                className={`inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium ${badge}`}
-              >
-                {value}
+              <span className="inline-flex items-center rounded-md bg-yellow-50 px-2 py-1 text-xs font-medium text-yellow-700 ring-1 ring-inset ring-red-600/10">
+                {value === "needs_support" && <span>Needs Support</span>}
+                {value === "in_progress" && <span>In Progress</span>}
+                {value === "in_review" && <span>In Review</span>}
+                {value === "done" && <span>Done</span>}
               </span>
             </>
           );
@@ -324,18 +327,6 @@ export default function AssignedTickets() {
           );
         },
       },
-      // {
-      //   Header: "",
-      //   id: "actions",
-      //   Cell: ({ row, value }) => {
-      //     console.log(row)
-      //     return (
-      //       <>
-      //         <Link href={`/tickets/${row.original.id}`}>View</Link>
-      //       </>
-      //     );
-      //   },
-      // },
     ],
     []
   );