Permissions
-{children}
;
+}
diff --git a/apps/nextjs/src/app/api/project/[id]/route.ts b/apps/nextjs/src/app/api/project/[id]/route.ts
index 11339e7..3398c59 100644
--- a/apps/nextjs/src/app/api/project/[id]/route.ts
+++ b/apps/nextjs/src/app/api/project/[id]/route.ts
@@ -1,7 +1,63 @@
-//TODO: the ablility for our landing site to fetch project data
+import { and, eq } from "@amaxa/db";
+import { db } from "@amaxa/db/client";
+import { project_tracker, Projects, User } from "@amaxa/db/schema";
+import { NextApiRequest } from "next";
+import { NextResponse } from "next/server";
-export const GET = async () => {
- // find the data
- //TODO: find the project with this id, do a join and group the users by their roles, and parse that into an object then return it as json (users must have the isPublic option set to true)
- // return: { project: { name: string, users: { [role: string]: User[] }, coaches: { [role: string]: User } } }
-};
+export async function GET(req: NextApiRequest) {
+ try {
+ const { id } = req.query
+
+ if (!id) {
+ return NextResponse.json({ error: "Project ID is required" }, { status: 400 });
+ }
+
+ const projectId = String(id);
+
+ const result = await db.transaction(async (tx) => {
+ const project = await tx.query.Projects.findFirst({
+ where: eq(Projects.id, projectId)
+ });
+
+ if (!project) {
+ return null;
+ }
+
+ const users = await tx.select({
+ id: User.id,
+ name: User.name,
+ role: User.role,
+ image: User.image
+ }).from(project_tracker)
+ .where(and(eq(project_tracker.projectId, projectId)))
+ .innerJoin(User, eq(project_tracker.userId, User.id))
+ .innerJoin(Projects, eq(project_tracker.projectId, Projects.id));
+
+ const coaches = await tx.select({
+ id: User.id,
+ name: User.name,
+ role: User.role,
+ image: User.image
+ }).from(project_tracker)
+ .where(and(eq(project_tracker.projectId, projectId)))
+ .innerJoin(User, eq(project_tracker.userId, User.id))
+ .innerJoin(Projects, eq(project_tracker.projectId, Projects.id));
+
+ return { project, users, coaches };
+ });
+
+ if (!result) {
+ return NextResponse.json({ error: "Project not found" }, { status: 404 });
+ }
+
+ return NextResponse.json({
+ ...result.project,
+ users: result.users,
+ coaches: result.coaches
+ });
+
+ } catch (error) {
+ console.error("Error fetching project data:", error);
+ return NextResponse.json({ error: "Internal Server Error" }, { status: 500 });
+ }
+}
diff --git a/packages/api/src/root.ts b/packages/api/src/root.ts
index 11dacbd..04f973c 100644
--- a/packages/api/src/root.ts
+++ b/packages/api/src/root.ts
@@ -1,11 +1,13 @@
import { authRouter } from "./router/auth";
import { projectsRouter } from "./router/projects";
import { tasksRouter } from "./router/tasks";
+import { userRouter } from "./router/users";
import { createTRPCRouter } from "./trpc";
export const appRouter = createTRPCRouter({
auth: authRouter,
projects: projectsRouter,
+ users: userRouter,
tasks: tasksRouter,
});
diff --git a/packages/api/src/router/users.ts b/packages/api/src/router/users.ts
new file mode 100644
index 0000000..198d5c3
--- /dev/null
+++ b/packages/api/src/router/users.ts
@@ -0,0 +1,32 @@
+import { TRPCRouterRecord } from "@trpc/server";
+import { createTRPCRouter, protectedProcedure } from "../trpc";
+import { z } from "zod";
+import { project_tracker, User } from "@amaxa/db/schema";
+import { and, eq, isNull } from "@amaxa/db";
+
+
+
+export const userRouter = createTRPCRouter({
+ usersNotInProject: protectedProcedure
+ .input(z.object({
+ projectId: z.string(),
+ }))
+ .mutation(async ({ ctx, input }) => {
+ const { projectId } = input;
+
+ return await ctx.db
+ .select({
+ id: User.id,
+ name: User.name,
+ email: User.email,
+ })
+ .from(User)
+ .leftJoin(project_tracker, eq(User.id, project_tracker.userId))
+ .where(
+ and(
+ eq(project_tracker.projectId, projectId),
+ isNull(project_tracker.userId)
+ )
+ );
+ })
+})
diff --git a/packages/auth/src/actions.ts b/packages/auth/src/actions.ts
new file mode 100644
index 0000000..5937ad3
--- /dev/null
+++ b/packages/auth/src/actions.ts
@@ -0,0 +1,48 @@
+import { eq, sql } from "drizzle-orm";
+
+import { db } from "@amaxa/db/client";
+import { project_tracker, ProjectPermission, User } from "@amaxa/db/schema";
+
+const preparedGetUserInfo = db
+ .select({
+ status: User.status,
+ role: User.role,
+ })
+ .from(User)
+ .where(eq(User.id, sql.placeholder("id")))
+ .prepare("getUserInfo");
+
+const preparedGetUserProjectTrackers = db
+ .select({
+ projectId: project_tracker.projectId,
+ permission: project_tracker.permission,
+ createdAt: project_tracker.createdAt,
+ })
+ .from(project_tracker)
+ .where(eq(project_tracker.userId, sql.placeholder("userId")))
+ .prepare("getUserProjectTrackers");
+
+async function getUserInformation(id: string) {
+ const userData = await preparedGetUserInfo.execute({ id });
+ const user = userData[0] || {
+ status: "Unverified",
+ role: "Student",
+ };
+
+ const projectTrackersData = await preparedGetUserProjectTrackers.execute({
+ userId: id,
+ });
+
+ const project_permissions: Record
-
-
-
-
+
+
-
)
}
diff --git a/apps/nextjs/src/app/(dashboard)/project/[id]/(root)/permissions/page.tsx b/apps/nextjs/src/app/(dashboard)/project/[id]/(root)/permissions/page.tsx
index 683cc00..c075f06 100644
--- a/apps/nextjs/src/app/(dashboard)/project/[id]/(root)/permissions/page.tsx
+++ b/apps/nextjs/src/app/(dashboard)/project/[id]/(root)/permissions/page.tsx
@@ -33,6 +33,7 @@ import {
} from "@amaxa/ui/table";
import PermissionsModal from "./_components/permissions-dialog";
+import { AddUser } from "./_components/add-user";
export default function Page({
params,
@@ -46,6 +47,7 @@ export default function Page({
Permissions
+
+ {title ? (
+
+ );
+};
+const SidebarLink = ({
+ link,
+ active,
+}: {
+ link: SidebarLink;
+ active: boolean;
+}) => {
+ return (
+
+ + {title} +
+ ) : null} +-
+ {links.map((link) => (
+
-
+
+
+ ))}
+
+
+
+
+ );
+}
diff --git a/apps/nextjs/src/app/(home)/_components/sidebar.tsx b/apps/nextjs/src/app/(home)/_components/sidebar.tsx
new file mode 100644
index 0000000..1ffe53c
--- /dev/null
+++ b/apps/nextjs/src/app/(home)/_components/sidebar.tsx
@@ -0,0 +1,64 @@
+import Link from "next/link";
+
+import SidebarItems from "./sidebar-items";
+import { Poppins } from 'next/font/google';
+import { memo } from "react";
+import { auth, Session } from "@amaxa/auth";
+import { Avatar, AvatarFallback } from "@amaxa/ui/avatar";
+
+const poppins = Poppins({
+ subsets: ['latin'],
+ display: 'swap',
+ variable: '--font-poppins',
+ weight: ['100', '200', '300', '400', '500', '600', '700', '800', '900']
+});
+
+const Sidebar = async () => {
+ const session = await auth();
+ if (session === null) return null;
+
+ return (
+
+ );
+};
+
+export default memo(Sidebar);
+
+const UserDetails = ({ session }: { session: Session }) => {
+ if (session === null) return null;
+ const user = session.user;
+
+ if (!user?.name || user.name.length == 0) return null;
+
+ return (
+
+
+
+
+ {user.name
+ ? user.name
+ ?.split(" ")
+ .map((word) => word[0]!.toUpperCase())
+ .join("")
+ : "~"}
+
+
+
+
+ );
+}
diff --git a/apps/nextjs/src/app/(home)/action-guides/[id]/page.tsx b/apps/nextjs/src/app/(home)/action-guides/[id]/page.tsx
new file mode 100644
index 0000000..262bdab
--- /dev/null
+++ b/apps/nextjs/src/app/(home)/action-guides/[id]/page.tsx
@@ -0,0 +1,25 @@
+import { notFound } from 'next/navigation'
+import React from 'react'
+import { Com } from '../com'
+import { db } from '@amaxa/db/client'
+
+export default async function Page(props: {
+ params: {
+ id: string
+ }
+}) {
+
+ const { id } = props.params
+ const data = await db.query.guides.findFirst({
+ where: (actionGuides, { eq }) => eq(actionGuides.id, parseInt(id))
+ })
+
+ if (!data) return notFound()
+
+ return (
+
+
+ {user.name ?? "John Doe"}
++ {user.email ?? "john@doe.com"} +
+
+
+ )
+}
diff --git a/apps/nextjs/src/app/(home)/action-guides/com.tsx b/apps/nextjs/src/app/(home)/action-guides/com.tsx
new file mode 100644
index 0000000..bc19170
--- /dev/null
+++ b/apps/nextjs/src/app/(home)/action-guides/com.tsx
@@ -0,0 +1,19 @@
+import React from 'react'
+import "react-notion/src/styles.css";
+import { BlockMapType, NotionRenderer } from 'react-notion'
+
+export const Com = async (props: {
+ id: string
+}) => {
+ const data = await fetch(
+ `https://notion-api.splitbee.io/v1/page/${props.id}`
+ ).then(res => res.json()) as BlockMapType
+
+ return (
+
+
+ )
+}
diff --git a/apps/nextjs/src/app/(home)/action-guides/filters/PickerForm.tsx b/apps/nextjs/src/app/(home)/action-guides/filters/PickerForm.tsx
new file mode 100644
index 0000000..3bc1725
--- /dev/null
+++ b/apps/nextjs/src/app/(home)/action-guides/filters/PickerForm.tsx
@@ -0,0 +1,85 @@
+"use client";
+import { Button } from "@/components/ui/button";
+import {
+ Command,
+ CommandEmpty,
+ CommandGroup,
+ CommandInput,
+ CommandItem,
+} from "@/components/ui/command";
+import {
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
+} from "@/components/ui/popover";
+import { cn } from "@/lib/utils";
+import { CaretSortIcon } from "@radix-ui/react-icons";
+import { CheckIcon } from "lucide-react";
+import { usePathname, useRouter, useSearchParams } from "next/navigation";
+import React from "react";
+
+type CourseData = {
+ value: number;
+ label: string;
+};
+
+export function PickerForm(props: { data: CourseData[], idx: string }) {
+ const [open, setOpen] = React.useState(false);
+ const router = useRouter();
+ const pathname = usePathname();
+ const searchParams = useSearchParams();
+ const { data, idx } = props;
+ const [value, setValue] = React.useState(searchParams.get(idx) ?? "");
+
+ function handleChange(value: string) {
+ if (value == "" || value == " " || value == null || value === "clear") {
+ return router.push(pathname);
+ }
+ setValue(value);
+ router.push(`${pathname}/?${idx}=${value}`);
+ }
+
+ return (
+
+
+ );
+}
diff --git a/apps/nextjs/src/app/(home)/action-guides/filters/skill.tsx b/apps/nextjs/src/app/(home)/action-guides/filters/skill.tsx
new file mode 100644
index 0000000..a62589d
--- /dev/null
+++ b/apps/nextjs/src/app/(home)/action-guides/filters/skill.tsx
@@ -0,0 +1,18 @@
+import React from 'react'
+import { PickerForm } from './PickerForm';
+import { api } from '@/trpc/server';
+
+export const FilterSkill = async () => {
+ const data = await api.actionGuides.skillNames.query();
+ const courseData = data.map((course) => ({
+ value: course.id,
+ label: course.name,
+ }));
+
+ return (
+
+
+ );
+
+}
diff --git a/apps/nextjs/src/app/(home)/action-guides/page.tsx b/apps/nextjs/src/app/(home)/action-guides/page.tsx
new file mode 100644
index 0000000..f5621a4
--- /dev/null
+++ b/apps/nextjs/src/app/(home)/action-guides/page.tsx
@@ -0,0 +1,73 @@
+import { unstable_noStore as noStore } from "next/cache";
+import Link from "next/link";
+
+import { checkAuth, getUserAuth } from "@/server/auth";
+import { api } from "@/trpc/server";
+import { z } from "zod";
+import Search from "@/components/Search";
+import Image from "next/image"
+import { Card, CardContent, CardFooter } from "@/components/ui/card";
+import { CreateProjects } from "@/components/CreateProjects";
+import { FilterProject } from "./filters/project";
+import { FilterSkill } from "./filters/skill";
+import { CreateActionGuide } from "@/components/CreateActionGuide";
+
+
+const searchParamsSchema = z.object({
+ name: z.string().optional(),
+ projectId: z.string().optional(),
+ skillId: z.string().optional(),
+});
+
+
+export default async function Home(props: {
+
+ searchParams: Record
+
+ );
+
+}
diff --git a/apps/nextjs/src/app/(home)/events/_components/CreateEvent.tsx b/apps/nextjs/src/app/(home)/events/_components/CreateEvent.tsx
new file mode 100644
index 0000000..9a8ce8a
--- /dev/null
+++ b/apps/nextjs/src/app/(home)/events/_components/CreateEvent.tsx
@@ -0,0 +1,157 @@
+"use client"
+import { Button } from '@amaxa/ui/button'
+import { format } from "date-fns";
+import { zodResolver } from "@hookform/resolvers/zod"
+import { Dialog, DialogTrigger, DialogContent, DialogHeader, DialogTitle, DialogDescription, DialogFooter } from '@amaxa/ui/dialog'
+import { TimePickerDemo } from "@amaxa/ui/time-picker/time-picker-demo"
+import { Calendar } from "@amaxa/ui/calendar"
+import { useForm } from 'react-hook-form'
+import { Input } from '@amaxa/ui/input'
+import { toast } from '@amaxa/ui/toast'
+import { useRouter } from 'next/navigation'
+import React from 'react'
+import { showErrorToast } from '~/lib/handle-error'
+import { api } from '~/trpc/react'
+import { createEventSchema } from '@amaxa/db/schema'
+import { z } from 'zod'
+import { Form, FormControl, FormDescription, FormField, FormItem, FormLabel, FormMessage } from '@amaxa/ui/form'
+import { Textarea } from '@amaxa/ui/textarea'
+import { Popover, PopoverContent, PopoverTrigger } from '@amaxa/ui/popover'
+import { cn } from '@amaxa/ui'
+import { CalendarIcon } from 'lucide-react'
+
+type CreateEventProps = z.infer
+
+
+
+
+
+
+ ) : null
+ }
+
+ {data.map((subject) => {
+ return (
+
+
+
+ {subject.name} Lorem ipsum dolor sit amet, qui minim labore adipisicing minim sint cillum sint consectetur cupidatat.
+
+
+
+
+
+ );
+ })}
+
+
+
+
+ )
+}
+
diff --git a/apps/nextjs/src/app/(home)/events/_components/EventCard.tsx b/apps/nextjs/src/app/(home)/events/_components/EventCard.tsx
new file mode 100644
index 0000000..fdf4961
--- /dev/null
+++ b/apps/nextjs/src/app/(home)/events/_components/EventCard.tsx
@@ -0,0 +1,40 @@
+import { RouterOutputs } from "@amaxa/api"
+import { Button } from "@amaxa/ui/button"
+import { Card } from "@amaxa/ui/card"
+import { CalendarIcon, MapPinIcon } from "lucide-react"
+import Link from "next/link"
+
+export function EventCard({
+ event
+}: {
+ event: RouterOutputs['events']['all'][0]
+}) {
+ return (
+
+
+
+
+
+ {event.name}
+Join us for a day of team building and strategic planning.
+
+
+
+
+
+ {event.time.toLocaleTimeString()}
+
+
+
+
+ {event.isVirtual ? "Online" : "In-Person"}
+
+ Join Event
+
+
+
+
+ )
+}
diff --git a/apps/nextjs/src/app/(home)/events/page.tsx b/apps/nextjs/src/app/(home)/events/page.tsx
new file mode 100644
index 0000000..f3745fd
--- /dev/null
+++ b/apps/nextjs/src/app/(home)/events/page.tsx
@@ -0,0 +1,60 @@
+import { unstable_noStore as noStore } from "next/cache";
+import { z } from "zod";
+
+import Image from "next/image"
+import { CreateEvent } from "./_components/CreateEvent";
+import { api } from "~/trpc/server";
+import { Button } from "@amaxa/ui/button";
+import { Card, CardContent } from "@amaxa/ui/card";
+import { EventCard } from "./_components/EventCard";
+import { NoEvents } from "./_components/NoEvents";
+
+const searchParamsSchema = z.object({
+ name: z.string().optional(),
+});
+
+
+export default async function Home(props: {
+ searchParams: Record
+
+ + There are no events yet +
++ You can add a new event by clicking the button below +
+ + +
+
+
+ )}
+
+ )
+}
+
diff --git a/apps/nextjs/src/app/(home)/layout.tsx b/apps/nextjs/src/app/(home)/layout.tsx
index 20d9ed1..ca8a6f0 100644
--- a/apps/nextjs/src/app/(home)/layout.tsx
+++ b/apps/nextjs/src/app/(home)/layout.tsx
@@ -1,9 +1,15 @@
import React from "react";
+import Sidebar from "./_components/sidebar";
export default function Layout({ children }: { children?: React.ReactNode }) {
return (
+
+ {data.length === 0 && (
+ Events
+RSVP to upcoming events
+
+
+
+
+ {
+ data.length > 0 && (
+
+
+
+
+
+
+ {data.map((event) => (
+
+
- {children}
+
);
}
diff --git a/apps/nextjs/src/lib/nav.tsx b/apps/nextjs/src/lib/nav.tsx
new file mode 100644
index 0000000..7a03e17
--- /dev/null
+++ b/apps/nextjs/src/lib/nav.tsx
@@ -0,0 +1,25 @@
+import { BookIcon, Calendar, HomeIcon } from "lucide-react";
+import { SidebarLink } from "~/app/(home)/_components/sidebar-items";
+
+type AdditionalLinks = {
+ title: string;
+ links: SidebarLink[];
+};
+
+export function getLink() {
+ const defaultLinks: SidebarLink[] = [
+ { href: "/", title: "Home", icon: HomeIcon },
+ {
+ href: "/events",
+ title: "Events",
+ icon: Calendar
+ },
+ {
+ href: "/action-guides",
+ title: "Action Guides",
+ icon: BookIcon
+ },
+ ];
+ return defaultLinks
+}
+export const additionalLinks: AdditionalLinks[] = [];
diff --git a/packages/api/src/root.ts b/packages/api/src/root.ts
index 04f973c..bd27739 100644
--- a/packages/api/src/root.ts
+++ b/packages/api/src/root.ts
@@ -1,4 +1,5 @@
import { authRouter } from "./router/auth";
+import { eventsRouter } from "./router/events";
import { projectsRouter } from "./router/projects";
import { tasksRouter } from "./router/tasks";
import { userRouter } from "./router/users";
@@ -9,6 +10,7 @@ export const appRouter = createTRPCRouter({
projects: projectsRouter,
users: userRouter,
tasks: tasksRouter,
+ events: eventsRouter
});
// export type definition of API
diff --git a/packages/api/src/router/events.ts b/packages/api/src/router/events.ts
new file mode 100644
index 0000000..8707821
--- /dev/null
+++ b/packages/api/src/router/events.ts
@@ -0,0 +1,26 @@
+import { z } from "zod";
+import { createTRPCRouter, protectedProcedure, publicProcedure } from "../trpc";
+import { createEventSchema, events } from "@amaxa/db/schema";
+
+export const eventsRouter = createTRPCRouter({
+ all: publicProcedure
+ .input(z.object({
+ name: z.string().optional(),
+ }))
+ .query(async ({ ctx, input }) => {
+ const { name } = input;
+ return await ctx.db.query.events.findMany({
+ where: (events, {
+ and,
+ ilike
+ }) => and(
+ name ? ilike(events.name, name) : undefined
+ )
+ })
+ }),
+ create: protectedProcedure
+ .input(createEventSchema)
+ .mutation(async ({ ctx, input }) => {
+ await ctx.db.insert(events).values(input)
+ }),
+})
diff --git a/packages/api/src/router/tasks.ts b/packages/api/src/router/tasks.ts
index c977e32..211738d 100644
--- a/packages/api/src/router/tasks.ts
+++ b/packages/api/src/router/tasks.ts
@@ -46,7 +46,7 @@ export const tasksRouter = createTRPCRouter({
const formattedNodes = tasks.map((node) => ({
id: node.id,
type: node.type,
- parentId: node.parent.id,
+ parentId: node?.parent?.id ?? "tbd",
position: {
x: node.position.x,
y: node.position.y,
diff --git a/packages/api/src/router/users.ts b/packages/api/src/router/users.ts
index 198d5c3..5b8b405 100644
--- a/packages/api/src/router/users.ts
+++ b/packages/api/src/router/users.ts
@@ -1,32 +1,14 @@
-import { TRPCRouterRecord } from "@trpc/server";
import { createTRPCRouter, protectedProcedure } from "../trpc";
-import { z } from "zod";
-import { project_tracker, User } from "@amaxa/db/schema";
-import { and, eq, isNull } from "@amaxa/db";
-
-
+import { User } from "@amaxa/db/schema";
export const userRouter = createTRPCRouter({
usersNotInProject: protectedProcedure
- .input(z.object({
- projectId: z.string(),
- }))
- .mutation(async ({ ctx, input }) => {
- const { projectId } = input;
-
+ .mutation(async ({ ctx }) => {
return await ctx.db
.select({
id: User.id,
name: User.name,
- email: User.email,
})
.from(User)
- .leftJoin(project_tracker, eq(User.id, project_tracker.userId))
- .where(
- and(
- eq(project_tracker.projectId, projectId),
- isNull(project_tracker.userId)
- )
- );
})
})
diff --git a/packages/db/src/schema.ts b/packages/db/src/schema.ts
index 08bbe96..166d306 100644
--- a/packages/db/src/schema.ts
+++ b/packages/db/src/schema.ts
@@ -231,3 +231,39 @@ export const projectTrackerRelations = relations(project_tracker, ({ one }) => (
}));
export type ProjectTracker = typeof project_tracker.$inferSelect;
export type ProjectPermission = ProjectTracker["permission"];
+
+const typeOfGuide = [
+ 'fundraising',
+]
+
+export const guides = pgTable("guides", {
+ id: text("id").primaryKey().$defaultFn(() => createId()),
+ name: text("name"),
+ type: text("type").array().$type
+
+ {children}
+
+
+
+ );
+}
diff --git a/packages/ui/src/time-picker/time-picker-input.tsx b/packages/ui/src/time-picker/time-picker-input.tsx
new file mode 100644
index 0000000..d188936
--- /dev/null
+++ b/packages/ui/src/time-picker/time-picker-input.tsx
@@ -0,0 +1,131 @@
+import React from "react";
+
+import { cn } from "..";
+import { Input } from "../input";
+import {
+ getArrowByType,
+ getDateByType,
+ Period,
+ setDateByType,
+ TimePickerType,
+} from "./time-picker-utils";
+
+export interface TimePickerInputProps
+ extends React.InputHTMLAttributes
+
+ minuteRef.current?.focus()}
+ />
+
+
+
+ hourRef.current?.focus()}
+ onRightFocus={() => secondRef.current?.focus()}
+ />
+
+
+
+ minuteRef.current?.focus()}
+ />
+
+
+
+
+
+ )
+}
diff --git a/apps/nextjs/src/app/(home)/@modal/(...)guide/[id]/page.tsx b/apps/nextjs/src/app/(home)/@modal/(...)guide/[id]/page.tsx
new file mode 100644
index 0000000..7bd88c7
--- /dev/null
+++ b/apps/nextjs/src/app/(home)/@modal/(...)guide/[id]/page.tsx
@@ -0,0 +1,17 @@
+import React from 'react'
+import { Com } from './com'
+
+export default async function Page(props: {
+ params: {
+ id: string
+ }
+}) {
+ const { id } = props.params
+
+ return (
+
+
+ )
+}
+
diff --git a/apps/nextjs/src/app/(home)/@modal/default.tsx b/apps/nextjs/src/app/(home)/@modal/default.tsx
new file mode 100644
index 0000000..86b9e9a
--- /dev/null
+++ b/apps/nextjs/src/app/(home)/@modal/default.tsx
@@ -0,0 +1,3 @@
+export default function Default() {
+ return null
+}
diff --git a/apps/nextjs/src/app/(home)/action-guides/_components/GuideCard.tsx b/apps/nextjs/src/app/(home)/action-guides/_components/GuideCard.tsx
new file mode 100644
index 0000000..9b99d61
--- /dev/null
+++ b/apps/nextjs/src/app/(home)/action-guides/_components/GuideCard.tsx
@@ -0,0 +1,104 @@
+//@ts-nocheck
+"use client"
+
+import { Card, CardHeader, CardTitle, CardContent, CardFooter } from "@amaxa/ui/card"
+import Link from "next/link"
+import { Input } from "@amaxa/ui/input"
+import { Badge } from "@amaxa/ui/badge"
+import { useState, useMemo } from "react"
+
+export default function Guides() {
+ const [search, setSearch] = useState("")
+ const [selectedTags, setSelectedTags] = useState([])
+ const actionGuides = [
+ {
+ id: 1,
+ title: "Test Action Guide 1",
+ description:
+ "Lorem ipsum dolor sit amet, qui minim labore adipisicing minim sint cillum sint consectetur cupidatat.",
+ tags: ["Fundraising"],
+ embedId: "Opening-Guide-Copy-7acb2eb37957405694b19afa43ae7b9c"
+ },
+ {
+ id: 2,
+ title: "Test Action Guide 2",
+ description:
+ "Lorem ipsum dolor sit amet, qui minim labore adipisicing minim sint cillum sint consectetur cupidatat.",
+ tags: ["Impact Outreach"],
+ embedId: "Opening-Guide-Copy-7acb2eb37957405694b19afa43ae7b9c"
+ },
+ ]
+
+ const filteredGuides = useMemo(() => {
+ return actionGuides.filter((guide) => {
+ const titleMatch = guide.title.toLowerCase().includes(search.toLowerCase())
+ const tagMatch = selectedTags.every((tag) => guide.tags.includes(tag))
+ return titleMatch && tagMatch
+ })
+ }, [search, selectedTags])
+ const handleSearch = (e: any) => {
+ setSearch(e.target.value)
+ }
+ const handleTagClick = (tag: never) => {
+ if (selectedTags.includes(tag)) {
+ setSelectedTags(selectedTags.filter((t) => t !== tag))
+ } else {
+ setSelectedTags([...selectedTags, tag])
+ }
+ }
+ const allTags = useMemo(() => {
+ return [...new Set(actionGuides.flatMap((guide) => guide.tags))]
+ }, [actionGuides])
+
+ return (
+
+
+ )
+}
diff --git a/apps/nextjs/src/app/(home)/action-guides/_components/GuideCardNonLegacy.tsx b/apps/nextjs/src/app/(home)/action-guides/_components/GuideCardNonLegacy.tsx
new file mode 100644
index 0000000..92c2546
--- /dev/null
+++ b/apps/nextjs/src/app/(home)/action-guides/_components/GuideCardNonLegacy.tsx
@@ -0,0 +1,74 @@
+//@ts-nocheck
+"use client"
+
+import { Card, CardContent, CardFooter, CardHeader, CardTitle } from "@amaxa/ui/card"
+import { Input } from "@amaxa/ui/input"
+import { Badge } from "lucide-react"
+import { useState, useMemo } from "react"
+
+
+export const TagToggle = ({
+ tag,
+ handleTagClick,
+}: {
+ tag: string
+ handleTagClick: (tag: string) => void
+}) => {
+ return (
+ Action Guides
+
+
+
+
+
+ Filter by Skill
+
+ {allTags.map((tag: string) => (
+ handleTagClick(tag)}
+ className="cursor-pointer"
+ >
+ {tag}
+
+ ))}
+
+
+ {filteredGuides.map((guide) => (
+
+
+
+ {guide.title}
+
+
+
+
+
+
+
+ ))}
+
+ {guide.description}
+
+ {guide.tags.map((tag) => (
+
+ {tag}
+
+ ))}
+
+
+
+ )
+}
+
+export const GuideCard = () => {
+ return (
+ Action Guides
+
+
+
+
+
+ Filter by Skill
+
+ {/* Tags */}
+
+
+ {guides.map((guide) => (
+ ))}
+
+ {guide.description}
+
+ {guide.tags.map((tag) => (
+
+ {tag}
+
+ ))}
+
+
- (
+
+ Registration Link
+
+
+
+ Link for event registration
+
+ )}
+ />
{
)}
/>
+
+ (
+
+
+
+
+ )}
+ />
+
+ (
+
+ Event Image URL
+
+
+
+ URL for the event image
+
+ )}
+ />
+
+ (
+
+
+
+
+ )}
+ />
+
+
+
+
-
-
-
-
-
-
-
- ) : null
- }
-
- {data.map((subject) => {
- return (
-
-
-
- {subject.name} Lorem ipsum dolor sit amet, qui minim labore adipisicing minim sint cillum sint consectetur cupidatat.
-
-
-
-
-
- );
- })}
-
+
+
- );
-
+ )
}
+
diff --git a/apps/nextjs/src/app/(home)/events/_components/CreateEvent.tsx b/apps/nextjs/src/app/(home)/events/_components/CreateEvent.tsx
index 9a8ce8a..1f508f3 100644
--- a/apps/nextjs/src/app/(home)/events/_components/CreateEvent.tsx
+++ b/apps/nextjs/src/app/(home)/events/_components/CreateEvent.tsx
@@ -7,6 +7,7 @@ import { TimePickerDemo } from "@amaxa/ui/time-picker/time-picker-demo"
import { Calendar } from "@amaxa/ui/calendar"
import { useForm } from 'react-hook-form'
import { Input } from '@amaxa/ui/input'
+import { Switch } from '@amaxa/ui/switch'
import { toast } from '@amaxa/ui/toast'
import { useRouter } from 'next/navigation'
import React from 'react'
@@ -78,6 +79,20 @@ export const CreateEvent = () => {
)}
/>
+
+ Public Event
+
+ Make this event visible to the public
+
+
+
+ Virtual Event
+
+ Is this a virtual event?
+
+
+ {event.name}
-Join us for a day of team building and strategic planning.
+{event.desc}
- {event.time.toLocaleTimeString()}
+ {event.time.toLocaleDateString()} {event.time.toLocaleTimeString()}
diff --git a/apps/nextjs/src/app/(home)/events/page.tsx b/apps/nextjs/src/app/(home)/events/page.tsx
index f3745fd..04db359 100644
--- a/apps/nextjs/src/app/(home)/events/page.tsx
+++ b/apps/nextjs/src/app/(home)/events/page.tsx
@@ -1,11 +1,8 @@
import { unstable_noStore as noStore } from "next/cache";
import { z } from "zod";
-import Image from "next/image"
import { CreateEvent } from "./_components/CreateEvent";
import { api } from "~/trpc/server";
-import { Button } from "@amaxa/ui/button";
-import { Card, CardContent } from "@amaxa/ui/card";
import { EventCard } from "./_components/EventCard";
import { NoEvents } from "./_components/NoEvents";
@@ -26,9 +23,11 @@ export default async function Home(props: {
return (
-
-
Events
-RSVP to upcoming events
+
+
+
Events
+RSVP to upcoming events
+
@@ -48,7 +47,7 @@ export default async function Home(props: {
)}
-
+
{data.map((event) => (
(),
+ title: text("title"),
+ desc: text("description").notNull(),
embedId: text("embed_id"),
createdAt: timestamp("created_at")
.default(sql`CURRENT_TIMESTAMP`)
@@ -247,6 +276,10 @@ export const guides = pgTable("guides", {
updatedAt: timestamp("updatedAt"),
})
+export const guidesRelations = relations(guides, ({ many }) => ({
+ skills: many(skillsToGuide),
+}))
+
export const events = pgTable("events", {
id: text("id").primaryKey().$defaultFn(() => createId()),
name: varchar("name", { length: 256 }).notNull(),
diff --git a/packages/ui/package.json b/packages/ui/package.json
index d41f933..27a3b12 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -32,6 +32,7 @@
"@radix-ui/react-progress": "^1.1.0",
"@radix-ui/react-select": "^2.1.1",
"@radix-ui/react-slot": "^1.1.0",
+ "@radix-ui/react-switch": "^1.1.0",
"@radix-ui/react-tabs": "^1.1.0",
"@radix-ui/react-tooltip": "^1.1.2",
"class-variance-authority": "^0.7.0",
diff --git a/packages/ui/src/badge.tsx b/packages/ui/src/badge.tsx
index f8a0927..af6d990 100644
--- a/packages/ui/src/badge.tsx
+++ b/packages/ui/src/badge.tsx
@@ -2,7 +2,7 @@ import type { VariantProps } from "class-variance-authority";
import * as React from "react";
import { cva } from "class-variance-authority";
-import { cn } from ".";
+import { cn } from "@amaxa/ui";
const badgeVariants = cva(
"inline-flex items-center rounded-md border px-2.5 py-0.5 text-xs font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2",
diff --git a/packages/ui/src/calendar.tsx b/packages/ui/src/calendar.tsx
index bc5d1d4..a14e40c 100644
--- a/packages/ui/src/calendar.tsx
+++ b/packages/ui/src/calendar.tsx
@@ -3,10 +3,11 @@
import * as React from "react";
import { ChevronLeftIcon, ChevronRightIcon } from "@radix-ui/react-icons";
import { DayPicker } from "react-day-picker";
-import { buttonVariants } from "./button";
import { cn } from "@amaxa/ui";
+import { buttonVariants } from "./button";
+
export type CalendarProps = React.ComponentProps;
function Calendar({
diff --git a/packages/ui/src/switch.tsx b/packages/ui/src/switch.tsx
new file mode 100644
index 0000000..1a20b27
--- /dev/null
+++ b/packages/ui/src/switch.tsx
@@ -0,0 +1,29 @@
+"use client";
+
+import * as React from "react";
+import * as SwitchPrimitives from "@radix-ui/react-switch";
+
+import { cn } from ".";
+
+const Switch = React.forwardRef<
+ React.ElementRef,
+ React.ComponentPropsWithoutRef
+>(({ className, ...props }, ref) => (
+
+
+));
+Switch.displayName = SwitchPrimitives.Root.displayName;
+
+export { Switch };
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7745d1a..063d4e0 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -127,6 +127,9 @@ importers:
react-dom:
specifier: 18.3.1
version: 18.3.1(react@18.3.1)
+ react-notion:
+ specifier: ^0.10.0
+ version: 0.10.0(react@18.3.1)
reactflow:
specifier: ^11.11.4
version: 11.11.4(@types/react@18.3.3)(react-dom@18.3.1)(react@18.3.1)
@@ -435,6 +438,9 @@ importers:
'@radix-ui/react-slot':
specifier: ^1.1.0
version: 1.1.0(@types/react@18.3.3)(react@18.3.1)
+ '@radix-ui/react-switch':
+ specifier: ^1.1.0
+ version: 1.1.0(@types/react@18.3.3)(react-dom@18.3.1)(react@18.3.1)
'@radix-ui/react-tabs':
specifier: ^1.1.0
version: 1.1.0(@types/react@18.3.3)(react-dom@18.3.1)(react@18.3.1)
@@ -3224,6 +3230,31 @@ packages:
react: 18.3.1
dev: false
+ /@radix-ui/react-switch@1.1.0(@types/react@18.3.3)(react-dom@18.3.1)(react@18.3.1):
+ resolution: {integrity: sha512-OBzy5WAj641k0AOSpKQtreDMe+isX0MQJ1IVyF03ucdF3DunOnROVrjWs8zsXUxC3zfZ6JL9HFVCUlMghz9dJw==}
+ peerDependencies:
+ '@types/react': '*'
+ '@types/react-dom': '*'
+ react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+ react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+ peerDependenciesMeta:
+ '@types/react':
+ optional: true
+ '@types/react-dom':
+ optional: true
+ dependencies:
+ '@radix-ui/primitive': 1.1.0
+ '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.3)(react@18.3.1)
+ '@radix-ui/react-context': 1.1.0(@types/react@18.3.3)(react@18.3.1)
+ '@radix-ui/react-primitive': 2.0.0(@types/react@18.3.3)(react-dom@18.3.1)(react@18.3.1)
+ '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.3)(react@18.3.1)
+ '@radix-ui/react-use-previous': 1.1.0(@types/react@18.3.3)(react@18.3.1)
+ '@radix-ui/react-use-size': 1.1.0(@types/react@18.3.3)(react@18.3.1)
+ '@types/react': 18.3.3
+ react: 18.3.1
+ react-dom: 18.3.1(react@18.3.1)
+ dev: false
+
/@radix-ui/react-tabs@1.1.0(@types/react@18.3.3)(react-dom@18.3.1)(react@18.3.1):
resolution: {integrity: sha512-bZgOKB/LtZIij75FSuPzyEti/XBhJH52ExgtdVqjCIh+Nx/FW+LhnbXtbCzIi34ccyMsyOja8T0thCzoHFXNKA==}
peerDependencies:
@@ -8913,6 +8944,11 @@ packages:
resolution: {integrity: sha512-WuxUnVtlWL1OfZFQFuqvnvs6MiAGk9UNsBostyBOB0Is9wb5uRESevA6rnl/rkksXaGX3GzZhPup5d6Vp1nFew==}
dev: false
+ /prismjs@1.29.0:
+ resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+ engines: {node: '>=6'}
+ dev: false
+
/process-nextick-args@2.0.1:
resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==}
dev: true
@@ -9192,6 +9228,16 @@ packages:
resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==}
dev: false
+ /react-notion@0.10.0(react@18.3.1):
+ resolution: {integrity: sha512-i5lVAxzSs7GnTpIbKtivPQWxGZiKCO5xmCmMJyn6F91y8X1IIJqnypkK+31F2acb1l1Qd8Yv0ktuvXwz9g49NQ==}
+ engines: {node: '>=10'}
+ peerDependencies:
+ react: '>=16'
+ dependencies:
+ prismjs: 1.29.0
+ react: 18.3.1
+ dev: false
+
/react-remove-scroll-bar@2.3.6(@types/react@18.3.3)(react@18.3.1):
resolution: {integrity: sha512-DtSYaao4mBmX+HDo5YWYdBWQwYIQQshUV/dVxFxK+KM26Wjwp1gZ6rv6OC3oujI6Bfu6Xyg3TwK533AQutsn/g==}
engines: {node: '>=10'}
From 887751509e69a84834bb4c594eecc4c331d0fbe2 Mon Sep 17 00:00:00 2001
From: xiften <108333567+not-ani@users.noreply.github.com>
Date: Tue, 30 Jul 2024 18:23:17 -0600
Subject: [PATCH 4/7] fix: eslint errors
---
apps/nextjs/src/app/(home)/_components/sidebar.tsx | 7 ++++---
apps/nextjs/src/app/(home)/action-guides/com.tsx | 3 ++-
.../src/app/(home)/action-guides/filters/PickerForm.tsx | 4 ++--
.../src/app/(home)/events/_components/CreateEvent.tsx | 2 +-
.../src/app/(home)/events/_components/EventCard.tsx | 2 +-
apps/nextjs/src/app/api/project/[id]/route.ts | 2 +-
apps/nextjs/src/lib/nav.tsx | 6 +++---
packages/api/src/router/tasks.ts | 2 +-
packages/auth/src/actions.ts | 3 ++-
packages/auth/src/config.ts | 9 +++++----
packages/db/src/schema.ts | 5 +----
11 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/apps/nextjs/src/app/(home)/_components/sidebar.tsx b/apps/nextjs/src/app/(home)/_components/sidebar.tsx
index 1ffe53c..0c05cf3 100644
--- a/apps/nextjs/src/app/(home)/_components/sidebar.tsx
+++ b/apps/nextjs/src/app/(home)/_components/sidebar.tsx
@@ -3,7 +3,8 @@ import Link from "next/link";
import SidebarItems from "./sidebar-items";
import { Poppins } from 'next/font/google';
import { memo } from "react";
-import { auth, Session } from "@amaxa/auth";
+import type { Session } from "@amaxa/auth";
+import { auth } from "@amaxa/auth";
import { Avatar, AvatarFallback } from "@amaxa/ui/avatar";
const poppins = Poppins({
@@ -37,7 +38,7 @@ const UserDetails = ({ session }: { session: Session }) => {
if (session === null) return null;
const user = session.user;
- if (!user?.name || user.name.length == 0) return null;
+ if (!user.name || user.name.length == 0) return null;
return (
@@ -52,7 +53,7 @@ const UserDetails = ({ session }: { session: Session }) => {
{user.name
? user.name
- ?.split(" ")
+ .split(" ")
.map((word) => word[0]!.toUpperCase())
.join("")
: "~"}
diff --git a/apps/nextjs/src/app/(home)/action-guides/com.tsx b/apps/nextjs/src/app/(home)/action-guides/com.tsx
index bc19170..47cdfcc 100644
--- a/apps/nextjs/src/app/(home)/action-guides/com.tsx
+++ b/apps/nextjs/src/app/(home)/action-guides/com.tsx
@@ -1,6 +1,7 @@
import React from 'react'
import "react-notion/src/styles.css";
-import { BlockMapType, NotionRenderer } from 'react-notion'
+import type { BlockMapType} from 'react-notion';
+import { NotionRenderer } from 'react-notion'
export const Com = async (props: {
id: string
diff --git a/apps/nextjs/src/app/(home)/action-guides/filters/PickerForm.tsx b/apps/nextjs/src/app/(home)/action-guides/filters/PickerForm.tsx
index 3bc1725..5170a9c 100644
--- a/apps/nextjs/src/app/(home)/action-guides/filters/PickerForm.tsx
+++ b/apps/nextjs/src/app/(home)/action-guides/filters/PickerForm.tsx
@@ -18,10 +18,10 @@ import { CheckIcon } from "lucide-react";
import { usePathname, useRouter, useSearchParams } from "next/navigation";
import React from "react";
-type CourseData = {
+interface CourseData {
value: number;
label: string;
-};
+}
export function PickerForm(props: { data: CourseData[], idx: string }) {
const [open, setOpen] = React.useState(false);
diff --git a/apps/nextjs/src/app/(home)/events/_components/CreateEvent.tsx b/apps/nextjs/src/app/(home)/events/_components/CreateEvent.tsx
index 1f508f3..5e2d976 100644
--- a/apps/nextjs/src/app/(home)/events/_components/CreateEvent.tsx
+++ b/apps/nextjs/src/app/(home)/events/_components/CreateEvent.tsx
@@ -14,7 +14,7 @@ import React from 'react'
import { showErrorToast } from '~/lib/handle-error'
import { api } from '~/trpc/react'
import { createEventSchema } from '@amaxa/db/schema'
-import { z } from 'zod'
+import type { z } from 'zod'
import { Form, FormControl, FormDescription, FormField, FormItem, FormLabel, FormMessage } from '@amaxa/ui/form'
import { Textarea } from '@amaxa/ui/textarea'
import { Popover, PopoverContent, PopoverTrigger } from '@amaxa/ui/popover'
diff --git a/apps/nextjs/src/app/(home)/events/_components/EventCard.tsx b/apps/nextjs/src/app/(home)/events/_components/EventCard.tsx
index 3c6bb44..89da34d 100644
--- a/apps/nextjs/src/app/(home)/events/_components/EventCard.tsx
+++ b/apps/nextjs/src/app/(home)/events/_components/EventCard.tsx
@@ -1,4 +1,4 @@
-import { RouterOutputs } from "@amaxa/api"
+import type { RouterOutputs } from "@amaxa/api"
import { Button } from "@amaxa/ui/button"
import { Card } from "@amaxa/ui/card"
import { CalendarIcon, MapPinIcon } from "lucide-react"
diff --git a/apps/nextjs/src/app/api/project/[id]/route.ts b/apps/nextjs/src/app/api/project/[id]/route.ts
index 3398c59..cdeafdd 100644
--- a/apps/nextjs/src/app/api/project/[id]/route.ts
+++ b/apps/nextjs/src/app/api/project/[id]/route.ts
@@ -1,7 +1,7 @@
import { and, eq } from "@amaxa/db";
import { db } from "@amaxa/db/client";
import { project_tracker, Projects, User } from "@amaxa/db/schema";
-import { NextApiRequest } from "next";
+import type { NextApiRequest } from "next";
import { NextResponse } from "next/server";
export async function GET(req: NextApiRequest) {
diff --git a/apps/nextjs/src/lib/nav.tsx b/apps/nextjs/src/lib/nav.tsx
index 7a03e17..0f9c213 100644
--- a/apps/nextjs/src/lib/nav.tsx
+++ b/apps/nextjs/src/lib/nav.tsx
@@ -1,10 +1,10 @@
import { BookIcon, Calendar, HomeIcon } from "lucide-react";
-import { SidebarLink } from "~/app/(home)/_components/sidebar-items";
+import type { SidebarLink } from "~/app/(home)/_components/sidebar-items";
-type AdditionalLinks = {
+interface AdditionalLinks {
title: string;
links: SidebarLink[];
-};
+}
export function getLink() {
const defaultLinks: SidebarLink[] = [
diff --git a/packages/api/src/router/tasks.ts b/packages/api/src/router/tasks.ts
index 211738d..26ab8db 100644
--- a/packages/api/src/router/tasks.ts
+++ b/packages/api/src/router/tasks.ts
@@ -46,7 +46,7 @@ export const tasksRouter = createTRPCRouter({
const formattedNodes = tasks.map((node) => ({
id: node.id,
type: node.type,
- parentId: node?.parent?.id ?? "tbd",
+ parentId: node.parent.id ?? "tbd",
position: {
x: node.position.x,
y: node.position.y,
diff --git a/packages/auth/src/actions.ts b/packages/auth/src/actions.ts
index 5937ad3..b0cb1d8 100644
--- a/packages/auth/src/actions.ts
+++ b/packages/auth/src/actions.ts
@@ -1,7 +1,8 @@
import { eq, sql } from "drizzle-orm";
import { db } from "@amaxa/db/client";
-import { project_tracker, ProjectPermission, User } from "@amaxa/db/schema";
+import type { ProjectPermission} from "@amaxa/db/schema";
+import { project_tracker, User } from "@amaxa/db/schema";
const preparedGetUserInfo = db
.select({
diff --git a/packages/auth/src/config.ts b/packages/auth/src/config.ts
index 7069ddd..0ed8579 100644
--- a/packages/auth/src/config.ts
+++ b/packages/auth/src/config.ts
@@ -9,13 +9,14 @@ import { DrizzleAdapter } from "@auth/drizzle-adapter";
import Google from "next-auth/providers/google";
import { db } from "@amaxa/db/client";
+import type {
+ ProjectPermission,
+ UserRole,
+ UserStatus} from "@amaxa/db/schema";
import {
Account,
- ProjectPermission,
Session,
- User,
- UserRole,
- UserStatus,
+ User
} from "@amaxa/db/schema";
import { env } from "../env";
diff --git a/packages/db/src/schema.ts b/packages/db/src/schema.ts
index 96a67cd..ac15136 100644
--- a/packages/db/src/schema.ts
+++ b/packages/db/src/schema.ts
@@ -12,7 +12,7 @@ import {
varchar,
} from "drizzle-orm/pg-core";
import { createInsertSchema, createSelectSchema } from "drizzle-zod";
-import { Permission } from "./perms";
+import type { Permission } from "./perms";
export const User = pgTable("user", {
id: text("id")
@@ -232,9 +232,6 @@ export const projectTrackerRelations = relations(project_tracker, ({ one }) => (
export type ProjectTracker = typeof project_tracker.$inferSelect;
export type ProjectPermission = ProjectTracker["permission"];
-const typeOfGuide = [
- 'fundraising',
-]
export const skills = pgTable("skills", {
id: text("id").primaryKey().$defaultFn(() => createId()),
From 8bccf550dc9e6ea2609f090135f274521eba7c63 Mon Sep 17 00:00:00 2001
From: xiften <108333567+not-ani@users.noreply.github.com>
Date: Tue, 30 Jul 2024 18:45:31 -0600
Subject: [PATCH 5/7] fix: action guides modal
---
.../app/(home)/@modal/(...)guide/[id]/com.tsx | 18 +++++++---
.../(home)/@modal/(...)guide/[id]/page.tsx | 6 ++--
.../action-guides/_components/GuideCard.tsx | 2 +-
packages/ui/src/modal.tsx | 33 +++++++++++++++++++
4 files changed, 51 insertions(+), 8 deletions(-)
create mode 100644 packages/ui/src/modal.tsx
diff --git a/apps/nextjs/src/app/(home)/@modal/(...)guide/[id]/com.tsx b/apps/nextjs/src/app/(home)/@modal/(...)guide/[id]/com.tsx
index 52e7065..c08fc3b 100644
--- a/apps/nextjs/src/app/(home)/@modal/(...)guide/[id]/com.tsx
+++ b/apps/nextjs/src/app/(home)/@modal/(...)guide/[id]/com.tsx
@@ -1,6 +1,7 @@
import React from 'react'
import "react-notion/src/styles.css";
import { NotionRenderer } from 'react-notion'
+import { Card, CardContent, CardHeader, CardTitle } from '@amaxa/ui/card';
export const Com = async (props: {
id: string
@@ -10,10 +11,17 @@ export const Com = async (props: {
).then(res => res.json())
return (
-
+
+
+ Action Guide
+
+
+
+
+
)
}
diff --git a/apps/nextjs/src/app/(home)/@modal/(...)guide/[id]/page.tsx b/apps/nextjs/src/app/(home)/@modal/(...)guide/[id]/page.tsx
index 7bd88c7..ee30a0e 100644
--- a/apps/nextjs/src/app/(home)/@modal/(...)guide/[id]/page.tsx
+++ b/apps/nextjs/src/app/(home)/@modal/(...)guide/[id]/page.tsx
@@ -1,5 +1,6 @@
import React from 'react'
import { Com } from './com'
+import Modal from "@amaxa/ui/modal"
export default async function Page(props: {
params: {
@@ -7,11 +8,12 @@ export default async function Page(props: {
}
}) {
const { id } = props.params
+ console.log(id)
return (
-
@@ -9,6 +9,7 @@ export default function Layout({ children }: { children?: React.ReactNode }) {
{children}
+ {modal}
-
+
+
+
)
}
diff --git a/apps/nextjs/src/app/(home)/action-guides/_components/GuideCard.tsx b/apps/nextjs/src/app/(home)/action-guides/_components/GuideCard.tsx
index 9b99d61..44e52d8 100644
--- a/apps/nextjs/src/app/(home)/action-guides/_components/GuideCard.tsx
+++ b/apps/nextjs/src/app/(home)/action-guides/_components/GuideCard.tsx
@@ -78,7 +78,7 @@ export default function Guides() {
{filteredGuides.map((guide) => (
-
+
{guide.title}
diff --git a/packages/ui/src/modal.tsx b/packages/ui/src/modal.tsx
new file mode 100644
index 0000000..ead562e
--- /dev/null
+++ b/packages/ui/src/modal.tsx
@@ -0,0 +1,33 @@
+"use client";
+
+import * as Dialog from "@radix-ui/react-dialog";
+import type { FC, ReactNode } from "react";
+import { useRouter } from "next/navigation";
+
+interface ModalProps {
+ children: ReactNode;
+}
+
+const Modal: FC = ({ children }) => {
+ const router = useRouter();
+
+ const handleOnOpenChange = (open: boolean) => {
+ if (!open) {
+ router.back();
+ }
+ };
+
+ return (
+
+
+
+ {children}
+
+
+
+ );
+};
+
+export default Modal;
From 5179e498969fdcfac0c8a5dea2b5447427be4e76 Mon Sep 17 00:00:00 2001
From: xiften <108333567+not-ani@users.noreply.github.com>
Date: Tue, 30 Jul 2024 19:22:00 -0600
Subject: [PATCH 6/7] fix: all the errors
---
apps/nextjs/package.json | 2 +-
apps/nextjs/src/app/(auth)/sign-in/page.tsx | 76 +++++-----
apps/nextjs/src/app/(auth)/sign-out/page.tsx | 78 +++++-----
.../permissions/_components/add-user-form.tsx | 47 +++---
.../permissions/_components/add-user.tsx | 14 +-
.../project/[id]/(root)/permissions/page.tsx | 2 +-
.../app/(home)/@modal/(...)guide/[id]/com.tsx | 30 ++--
.../(home)/@modal/(...)guide/[id]/page.tsx | 21 +--
apps/nextjs/src/app/(home)/@modal/default.tsx | 2 +-
.../app/(home)/_components/sidebar-items.tsx | 35 ++---
.../src/app/(home)/_components/sidebar.tsx | 26 ++--
.../app/(home)/action-guides/[id]/page.tsx | 25 ----
.../action-guides/_components/GuideCard.tsx | 73 ++++++----
.../_components/GuideCardNonLegacy.tsx | 74 ----------
.../src/app/(home)/action-guides/com.tsx | 26 ++--
.../action-guides/filters/PickerForm.tsx | 85 -----------
.../(home)/action-guides/filters/project.tsx | 18 ---
.../(home)/action-guides/filters/skill.tsx | 18 ---
.../src/app/(home)/action-guides/page.tsx | 7 +-
.../(home)/events/_components/CreateEvent.tsx | 134 ++++++++++--------
.../(home)/events/_components/EventCard.tsx | 29 ++--
.../(home)/events/_components/NoEvents.tsx | 13 +-
apps/nextjs/src/app/(home)/events/page.tsx | 18 +--
apps/nextjs/src/app/(home)/layout.tsx | 11 +-
apps/nextjs/src/app/api/project/[id]/route.ts | 50 ++++---
apps/nextjs/src/lib/nav.tsx | 7 +-
packages/api/src/root.ts | 3 +-
packages/api/src/router/action-guides.ts | 26 ++--
packages/api/src/router/events.ts | 26 ++--
packages/api/src/router/tasks.ts | 2 +-
packages/api/src/router/users.ts | 22 +--
packages/auth/src/actions.ts | 4 +-
packages/auth/src/config.ts | 13 +-
packages/db/src/schema.ts | 111 +++++++++------
packages/ui/src/modal.tsx | 2 +-
packages/validators/src/index.ts | 3 +-
turbo.json | 3 +-
37 files changed, 494 insertions(+), 642 deletions(-)
delete mode 100644 apps/nextjs/src/app/(home)/action-guides/[id]/page.tsx
delete mode 100644 apps/nextjs/src/app/(home)/action-guides/_components/GuideCardNonLegacy.tsx
delete mode 100644 apps/nextjs/src/app/(home)/action-guides/filters/PickerForm.tsx
delete mode 100644 apps/nextjs/src/app/(home)/action-guides/filters/project.tsx
delete mode 100644 apps/nextjs/src/app/(home)/action-guides/filters/skill.tsx
diff --git a/apps/nextjs/package.json b/apps/nextjs/package.json
index 43e821b..b96fa43 100644
--- a/apps/nextjs/package.json
+++ b/apps/nextjs/package.json
@@ -6,7 +6,7 @@
"scripts": {
"build": "pnpm with-env next build",
"clean": "git clean -xdf .next .turbo node_modules",
- "dev": "pnpm with-env next dev ",
+ "dev": "pnpm with-env next dev",
"format": "prettier --check . --ignore-path ../../.gitignore",
"lint": "eslint",
"start": "pnpm with-env next start",
diff --git a/apps/nextjs/src/app/(auth)/sign-in/page.tsx b/apps/nextjs/src/app/(auth)/sign-in/page.tsx
index dfe0ac4..0f04bc4 100644
--- a/apps/nextjs/src/app/(auth)/sign-in/page.tsx
+++ b/apps/nextjs/src/app/(auth)/sign-in/page.tsx
@@ -1,15 +1,22 @@
-import { signIn } from "@amaxa/auth"
-import { Button } from "@amaxa/ui/button"
-import { Card, CardHeader, CardTitle, CardDescription, CardContent } from "@amaxa/ui/card"
-import { Input } from "@amaxa/ui/input"
-import { Label } from "@amaxa/ui/label"
-import Link from "next/link"
-import { env } from "~/env"
+import Link from "next/link";
+import { signIn } from "@amaxa/auth";
+import { Button } from "@amaxa/ui/button";
+import {
+ Card,
+ CardContent,
+ CardDescription,
+ CardHeader,
+ CardTitle,
+} from "@amaxa/ui/card";
+import { Input } from "@amaxa/ui/input";
+import { Label } from "@amaxa/ui/label";
+
+import { env } from "~/env";
export default function LoginForm() {
return (
-
+
Login
@@ -19,35 +26,32 @@ export default function LoginForm() {
- {
- env.NODE_ENV === "development" ? (
- <>
-
-
-
- ) : null
- }
+ {env.NODE_ENV === "development" ? (
+ <>
+
+
+ ) : null}
- )
+ );
}
diff --git a/apps/nextjs/src/app/(auth)/sign-out/page.tsx b/apps/nextjs/src/app/(auth)/sign-out/page.tsx
index c5a0d02..5691f40 100644
--- a/apps/nextjs/src/app/(auth)/sign-out/page.tsx
+++ b/apps/nextjs/src/app/(auth)/sign-out/page.tsx
@@ -1,16 +1,23 @@
-import { signIn } from '@amaxa/auth'
-import { Button } from '@amaxa/ui/button'
-import { Card, CardHeader, CardTitle, CardDescription, CardContent } from '@amaxa/ui/card'
-import { Input } from '@amaxa/ui/input'
-import { Label } from '@amaxa/ui/label'
-import Link from 'next/link'
-import { env } from '~/env'
-import React from 'react'
+import React from "react";
+import Link from "next/link";
+import { signIn } from "@amaxa/auth";
+import { Button } from "@amaxa/ui/button";
+import {
+ Card,
+ CardContent,
+ CardDescription,
+ CardHeader,
+ CardTitle,
+} from "@amaxa/ui/card";
+import { Input } from "@amaxa/ui/input";
+import { Label } from "@amaxa/ui/label";
+
+import { env } from "~/env";
export default function LoginForm() {
return (
-
+
Login
@@ -20,35 +27,32 @@ export default function LoginForm() {
+type AddUserForm = z.infer;
export default function AddUserForm({
userMap,
@@ -29,14 +37,14 @@ export default function AddUserForm({
userMap: {
value: string;
label: string;
- }[]
+ }[];
}) {
const form = useForm({
resolver: zodResolver(addUserSchema),
- })
+ });
function onSubmit(data: AddUserForm) {
- console.log(data)
+ console.log(data);
}
return (
@@ -57,12 +65,11 @@ export default function AddUserForm({
User
-
- Select a user to add to the project
+
+ Select a user to add to the project
+
)}
@@ -72,5 +79,5 @@ export default function AddUserForm({
- )
+ );
}
diff --git a/apps/nextjs/src/app/(dashboard)/project/[id]/(root)/permissions/_components/add-user.tsx b/apps/nextjs/src/app/(dashboard)/project/[id]/(root)/permissions/_components/add-user.tsx
index c5ef4cc..06c5203 100644
--- a/apps/nextjs/src/app/(dashboard)/project/[id]/(root)/permissions/_components/add-user.tsx
+++ b/apps/nextjs/src/app/(dashboard)/project/[id]/(root)/permissions/_components/add-user.tsx
@@ -1,25 +1,19 @@
import { api } from "~/trpc/server";
import AddUserForm from "./add-user-form";
-
export async function AddUser() {
const data = await api.users.usersNotInProject();
- console.log(data)
- // take the result and map it to {
- // value: id,
- // label: name
- // }[]
const userMap = data.map((user) => {
return {
value: user.id,
- label: user.name!
- }
- })
+ label: user.name ?? "No Name User",
+ };
+ });
return (
-
- Action Guide
-
+ Action Guide
-
- )
-}
+ );
+};
diff --git a/apps/nextjs/src/app/(home)/@modal/(...)guide/[id]/page.tsx b/apps/nextjs/src/app/(home)/@modal/(...)guide/[id]/page.tsx
index ee30a0e..e21eb9d 100644
--- a/apps/nextjs/src/app/(home)/@modal/(...)guide/[id]/page.tsx
+++ b/apps/nextjs/src/app/(home)/@modal/(...)guide/[id]/page.tsx
@@ -1,19 +1,20 @@
-import React from 'react'
-import { Com } from './com'
-import Modal from "@amaxa/ui/modal"
+import React from "react";
-export default async function Page(props: {
+import Modal from "@amaxa/ui/modal";
+
+import { Com } from "./com";
+
+export default function Page(props: {
params: {
- id: string
- }
+ id: string;
+ };
}) {
- const { id } = props.params
- console.log(id)
+ const { id } = props.params;
+ console.log(id);
return (
- )
+ );
}
-
diff --git a/apps/nextjs/src/app/(home)/@modal/default.tsx b/apps/nextjs/src/app/(home)/@modal/default.tsx
index 86b9e9a..6ddf1b7 100644
--- a/apps/nextjs/src/app/(home)/@modal/default.tsx
+++ b/apps/nextjs/src/app/(home)/@modal/default.tsx
@@ -1,3 +1,3 @@
export default function Default() {
- return null
+ return null;
}
diff --git a/apps/nextjs/src/app/(home)/_components/sidebar-items.tsx b/apps/nextjs/src/app/(home)/_components/sidebar-items.tsx
index cfcd7b7..ed8c919 100644
--- a/apps/nextjs/src/app/(home)/_components/sidebar-items.tsx
+++ b/apps/nextjs/src/app/(home)/_components/sidebar-items.tsx
@@ -1,12 +1,12 @@
"use client";
+import type { LucideIcon } from "lucide-react";
import Link from "next/link";
import { usePathname } from "next/navigation";
-import type { LucideIcon } from "lucide-react";
-import { getLink, additionalLinks } from "~/lib/nav";
import { cn } from "@amaxa/ui";
+import { additionalLinks, getLink } from "~/lib/nav";
export interface SidebarLink {
title: string;
@@ -15,19 +15,19 @@ export interface SidebarLink {
}
const SidebarItems = () => {
- const defaultLinks = getLink()
+ const defaultLinks = getLink();
return (
<>
- {
- env.NODE_ENV === "development" ? (
- <>
-
-
-
- ) : null
- }
+ {env.NODE_ENV === "development" ? (
+ <>
+
+
+ ) : null}
- )
+ );
}
diff --git a/apps/nextjs/src/app/(dashboard)/project/[id]/(root)/permissions/_components/add-user-form.tsx b/apps/nextjs/src/app/(dashboard)/project/[id]/(root)/permissions/_components/add-user-form.tsx
index e2b9ba9..114faa5 100644
--- a/apps/nextjs/src/app/(dashboard)/project/[id]/(root)/permissions/_components/add-user-form.tsx
+++ b/apps/nextjs/src/app/(dashboard)/project/[id]/(root)/permissions/_components/add-user-form.tsx
@@ -1,9 +1,19 @@
-"use client"
-import React from 'react'
-import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogTrigger } from '@amaxa/ui/dialog'
-import { useForm } from "react-hook-form"
-import { zodResolver } from "@hookform/resolvers/zod"
-import { z } from 'zod'
+"use client";
+
+import React from "react";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { useForm } from "react-hook-form";
+import { z } from "zod";
+
+import { Button } from "@amaxa/ui/button";
+import { Combobox } from "@amaxa/ui/combobox";
+import {
+ Dialog,
+ DialogContent,
+ DialogHeader,
+ DialogTitle,
+ DialogTrigger,
+} from "@amaxa/ui/dialog";
import {
Form,
FormControl,
@@ -12,16 +22,14 @@ import {
FormItem,
FormLabel,
FormMessage,
-} from "@amaxa/ui/form"
-import { Combobox } from '@amaxa/ui/combobox'
-import { Button } from '@amaxa/ui/button'
+} from "@amaxa/ui/form";
const addUserSchema = z.object({
userId: z.string(),
permissions: z.array(z.string()),
-})
+});
-type AddUserForm = z.infer
+
{title ? (
-
+