Skip to content

Commit cc02a47

Browse files
Jecomo-Alyssa-LynJecomo-Alyssa-Lyn
committed
bot fixes
1 parent e8eb9bd commit cc02a47

12 files changed

Lines changed: 155 additions & 38 deletions

File tree

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ yarn-error.log
3939
## Ignore environment variable files
4040
apps/bot/.env
4141

42+
.next
43+
4244
# BUCK
4345
buck-out/
4446
\.buckd/

‎apps/codebility/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
# next.js
1313
/.next/
1414
/out/
15+
.next
1516

1617
# production
1718
/build

‎apps/codebility/app/(marketing)/_components/MarketingNavigation.tsx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,15 @@ import {
2626
DropdownMenuItem,
2727
DropdownMenuSeparator,
2828
DropdownMenuTrigger,
29-
} from "@codevs/ui/dropdown-menu";
29+
} from "@codevs/ui";
30+
3031
import {
3132
Sheet,
3233
SheetContent,
3334
SheetDescription,
3435
SheetTitle,
3536
SheetTrigger,
36-
} from "@codevs/ui/sheet";
37+
} from "@codevs/ui";
3738

3839
const NAV_ITEMS = [
3940
{ id: "1", title: "Our Services", path: "/services" },

‎apps/codebility/app/(marketing)/_components/marketing_modals/MarketingFaqsModal.tsx‎

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,20 @@
33
import React, { ReactNode, useState } from "react";
44
import { useModal } from "@/hooks/use-modal";
55

6-
import { Dialog, DialogContent, DialogTitle } from "@codevs/ui/dialog";
6+
import { Dialog, DialogContent as DialogContentPrimitive, DialogTitle } from "@codevs/ui";
7+
import { DialogContent } from "@radix-ui/react-dialog";
78

89
function FaqsModal() {
910
const { isOpen, onClose, type } = useModal();
1011
const isModalOpen = isOpen && type === "homeFAQSModal";
1112

1213
return (
1314
<Dialog open={isModalOpen} onOpenChange={onClose}>
14-
<DialogContent className=" bg-black-800 flex max-w-[1260px] flex-col justify-between gap-4 text-white">
15-
<DialogTitle className="sr-only">Frequently Asked Questions</DialogTitle>
16-
17-
<div className="flex max-h-[500px] flex-col gap-2 overflow-hidden overflow-y-scroll ">
15+
<DialogContent className="fixed left-[50%] top-[50%] translate-x-[-50%] translate-y-[-50%] bg-black-800 max-w-[1260px]">
16+
<div className="flex flex-col justify-between gap-4 text-white">
17+
<DialogTitle className="sr-only">Frequently Asked Questions</DialogTitle>
18+
19+
<div className="flex max-h-[500px] flex-col gap-2 overflow-hidden overflow-y-scroll ">
1820

1921
<h1 className="mb-8 text-center text-4xl font-semibold ">
2022
Frequently Asked Questions
@@ -57,22 +59,23 @@ function FaqsModal() {
5759
est vitae porttitor. Nullam magna lacus, bibendum a tristique sit
5860
amet, luctus vitae lorem.
5961
</Accordion>
60-
</div>
62+
</div>
6163

6264

63-
<div className="flex gap-4 self-end">
64-
<button
65-
onClick={onClose}
66-
className="text-semibold rounded-[100px] border border-[#1D1D1E] bg-[#ffffff0D] px-12 py-5"
67-
>
68-
Close
69-
</button>
70-
<button
71-
onClick={onClose}
72-
className="text-semibold rounded-[100px] bg-[#9747FF] px-14 py-5"
73-
>
74-
Ask Question
75-
</button>
65+
<div className="flex gap-4 self-end">
66+
<button
67+
onClick={onClose}
68+
className="text-semibold rounded-[100px] border border-[#1D1D1E] bg-[#ffffff0D] px-12 py-5"
69+
>
70+
Close
71+
</button>
72+
<button
73+
onClick={onClose}
74+
className="text-semibold rounded-[100px] bg-[#9747FF] px-14 py-5"
75+
>
76+
Ask Question
77+
</button>
78+
</div>
7679
</div>
7780
</DialogContent>
7881
</Dialog>

‎apps/codebility/app/(marketing)/_components/marketing_modals/MarketingPrivacyPolicyModal.tsx‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,25 @@ import React, { useState } from "react";
44
import Link from "next/link";
55
import { useModal } from "@/hooks/use-modal";
66

7-
import { Dialog, DialogContent, DialogTitle } from "@codevs/ui/dialog";
7+
import { Dialog, DialogContent, DialogTitle } from "@codevs/ui";
88

99
function PrivacyPolicyModal() {
1010
const { isOpen, onClose, type } = useModal();
1111
const isModalOpen = isOpen && type === "homePrivacyPolicyModal";
1212

1313
return (
1414
<Dialog open={isModalOpen} onOpenChange={onClose}>
15-
<DialogContent className="bg-black-800 flex max-h-full max-w-[1260px] flex-col justify-between text-white">
16-
<DialogTitle className="sr-only">Privacy Policy</DialogTitle>
17-
<div className="flex h-full overflow-hidden rounded-[10px] border border-[#1D1D1E]">
18-
<div className="hidden sm:flex">
19-
<NavBar />
15+
<DialogContent className="p-0 border-none">
16+
<div className="bg-black-800 flex max-h-full max-w-[1260px] flex-col justify-between text-white">
17+
<DialogTitle className="sr-only">Privacy Policy</DialogTitle>
18+
<div className="flex h-full overflow-hidden rounded-[10px] border border-[#1D1D1E]">
19+
<div className="hidden sm:flex">
20+
<NavBar />
21+
</div>
22+
<Content />
2023
</div>
21-
<Content />
24+
<Footer onClose={onClose} />
2225
</div>
23-
<Footer onClose={onClose} />
2426
</DialogContent>
2527
</Dialog>
2628
);

‎apps/codebility/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@
116116
"@total-typescript/ts-reset": "^0.5.1",
117117
"@types/globalize": "^1.5.5",
118118
"@types/hellosign-sdk": "^1.6.15",
119+
"@types/minimatch": "^6.0.0",
119120
"@types/node": "^20",
120121
"@types/nodemailer": "^6.4.15",
121122
"@types/react-big-calendar": "^1.8.7",

‎apps/codebility/tsconfig.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"extends": "@codevs/tsconfig/base.json",
33
"compilerOptions": {
4+
"types": [],
45
"lib": [
56
"dom",
67
"dom.iterable",

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
"packageManager": "pnpm@8.11.0",
6060
"dependencies": {
6161
"@radix-ui/react-alert-dialog": "^1.1.1",
62+
"@radix-ui/react-dropdown-menu": "^2.1.16",
6263
"@supabase/ssr": "^0.5.2",
6364
"@supabase/supabase-js": "^2.55.0",
6465
"@tailwindcss/postcss": "^4.1.16",

‎packages/ui/package.json‎

Lines changed: 57 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,63 @@
1515
"typecheck": "tsc --noEmit"
1616
},
1717
"exports": {
18-
".": {
19-
"types": "./dist/index.d.ts",
20-
"import": "./dist/index.js",
21-
"default": "./src/index.ts"
18+
".": "./src/index.ts",
19+
"./accordion": "./src/accordion.tsx",
20+
"./alert": "./src/alert.tsx",
21+
"./alert-dialog": "./src/alert-dialog.tsx",
22+
"./aspect-ratio": "./src/aspect-ratio.tsx",
23+
"./avatar": "./src/avatar.tsx",
24+
"./badge": "./src/badge.tsx",
25+
"./breadcrumb": "./src/breadcrumb.tsx",
26+
"./button": "./src/button.tsx",
27+
"./calendar": "./src/calendar.tsx",
28+
"./card": "./src/card.tsx",
29+
"./carousel": "./src/carousel.tsx",
30+
"./checkbox": "./src/checkbox.tsx",
31+
"./collapsible": "./src/collapsible.tsx",
32+
"./command": "./src/command.tsx",
33+
"./context-menu": "./src/context-menu.tsx",
34+
"./dialog": "./src/dialog.tsx",
35+
"./drawer": "./src/drawer.tsx",
36+
"./dropdown-menu": "./src/dropdown-menu.tsx",
37+
"./form": "./src/form.tsx",
38+
"./hover-card": "./src/hover-card.tsx",
39+
"./input": "./src/input.tsx",
40+
"./input-otp": "./src/input-otp.tsx",
41+
"./label": "./src/label.tsx",
42+
"./menubar": "./src/menubar.tsx",
43+
"./navigation-menu": "./src/navigation-menu.tsx",
44+
"./popover": "./src/popover.tsx",
45+
"./progress": "./src/progress.tsx",
46+
"./radio-group": "./src/radio-group.tsx",
47+
"./resizable": "./src/resizable.tsx",
48+
"./scroll-area": "./src/scroll-area.tsx",
49+
"./select": "./src/select.tsx",
50+
"./separator": "./src/separator.tsx",
51+
"./sheet": "./src/sheet.tsx",
52+
"./skeleton": "./src/skeleton.tsx",
53+
"./slider": "./src/slider.tsx",
54+
"./switch": "./src/switch.tsx",
55+
"./table": "./src/table.tsx",
56+
"./tabs": "./src/tabs.tsx",
57+
"./textarea": "./src/textarea.tsx",
58+
"./toast": "./src/toast.tsx",
59+
"./toaster": "./src/toaster.tsx",
60+
"./toggle": "./src/toggle.tsx",
61+
"./toggle-group": "./src/toggle-group.tsx",
62+
"./tooltip": "./src/tooltip.tsx",
63+
"./use-toast": "./src/use-toast.ts"
64+
},
65+
"publishConfig": {
66+
"exports": {
67+
".": {
68+
"types": "./dist/index.d.ts",
69+
"import": "./dist/index.js"
70+
},
71+
"./*": {
72+
"types": "./dist/*.d.ts",
73+
"import": "./dist/*.js"
74+
}
2275
}
2376
},
2477
"files": [

‎packages/ui/src/dialog.tsx‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ const DialogContent = React.forwardRef<
4646
<DialogPrimitive.Content
4747
ref={ref}
4848
className={cn(
49-
"data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-&lsqb;state=closed&rsqb;:slide-out-to-top-&lsqb;48%&rsqb; data-[state=open]:slide-in-from-left-1/2 data-&lsqb;state=open&rsqb;:slide-in-from-top-&lsqb;48%&rsqb; fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 sm:rounded-lg",
49+
"data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 sm:rounded-lg",
5050
className,
5151
)}
5252
onPointerDownOutside={(e) => {
@@ -55,10 +55,12 @@ const DialogContent = React.forwardRef<
5555
{...props}
5656
>
5757
{children}
58-
<DialogPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-accent data-[state=open]:text-muted-foreground">
59-
{/* {!hideCloseButton && <X className="h-4 w-4" />} */}
60-
<span className="sr-only">Close</span>
61-
</DialogPrimitive.Close>
58+
{!hideCloseButton && (
59+
<DialogPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-accent data-[state=open]:text-muted-foreground">
60+
<X className="h-4 w-4" />
61+
<span className="sr-only">Close</span>
62+
</DialogPrimitive.Close>
63+
)}
6264
</DialogPrimitive.Content>
6365
</DialogPortal>
6466
));

0 commit comments

Comments
 (0)