Skip to content

Commit

Permalink
chore: update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
idabblewith committed Nov 21, 2024
1 parent c571e9c commit a13c882
Show file tree
Hide file tree
Showing 10 changed files with 882 additions and 1,089 deletions.
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
The React-based frontend for the science projects app.

Based on original SPMS made by Florian Mayer: https://github.com/dbca-wa/sdis
Based on original SPMS made by Florian Mayer: https://github.com/dbca-wa/sdis

See https://github.com/dbca-wa/science-projects-service for the backend.
395 changes: 189 additions & 206 deletions dist/assets/index-D9yy0BKb.js → dist/assets/index-B4p9O-cc.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/assets/index-CdOPMJBH.css

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion dist/assets/index-v9_Ad0PY.css

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions dist/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<link rel="icon" type="image/jpg" href="/dbca.jpg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>DBCA</title>
<script type="module" crossorigin src="/assets/index-D9yy0BKb.js"></script>
<link rel="stylesheet" crossorigin href="/assets/index-v9_Ad0PY.css">
<script type="module" crossorigin src="/assets/index-B4p9O-cc.js"></script>
<link rel="stylesheet" crossorigin href="/assets/index-CdOPMJBH.css">
</head>

<body>
Expand Down
1,494 changes: 651 additions & 843 deletions package-lock.json

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
"@dnd-kit/utilities": "^3.2.1",
"@emotion/react": "^11.11.0",
"@emotion/styled": "^11.11.0",
"@lexical/link": "^0.19.0",
"@lexical/markdown": "^0.19.0",
"@lexical/react": "^0.19.0",
"@lexical/link": "^0.20.0",
"@lexical/markdown": "^0.20.0",
"@lexical/react": "^0.20.0",
"@radix-ui/react-accordion": "^1.2.0",
"@radix-ui/react-aspect-ratio": "^1.1.0",
"@radix-ui/react-checkbox": "^1.1.1",
Expand All @@ -33,7 +33,7 @@
"@radix-ui/react-select": "^2.1.1",
"@radix-ui/react-separator": "^1.1.0",
"@radix-ui/react-slot": "^1.1.0",
"@react-email/components": "^0.0.26",
"@react-email/components": "^0.0.28",
"@react-email/render": "^1.0.0",
"@tanstack/react-query": "^5.32.1",
"@tanstack/react-table": "^8.17.3",
Expand All @@ -50,13 +50,14 @@
"date-fns": "^3.6.0",
"dayjs": "^1.11.10",
"dompurify": "^3.1.6",
"eslint-plugin-react-hooks": "^5.0.0",
"framer-motion": "^11.0.3",
"github-slugger": "^2.0.0",
"js-cookie": "^3.0.5",
"lexical": "^0.19.0",
"lexical": "^0.20.0",
"lodash": "^4.17.21",
"lodash-es": "^4.17.21",
"lucide-react": "^0.446.0",
"lucide-react": "^0.460.0",
"npm": "^10.2.5",
"react": "^18.3.1",
"react-beautiful-dnd": "^13.1.1",
Expand All @@ -74,7 +75,7 @@
"react-tooltip": "^5.21.4",
"tailwind-merge": "^2.3.0",
"tailwindcss-animate": "^1.0.7",
"uuid": "^10.0.0",
"uuid": "^11.0.3",
"vaul": "^1.0.0"
},
"devDependencies": {
Expand All @@ -85,7 +86,6 @@
"@types/react-helmet": "^6.1.6",
"@vitejs/plugin-react-swc": "^3.0.0",
"autoprefixer": "^10.4.19",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.5",
"postcss": "^8.4.38",
"prettier": "^3.3.2",
Expand Down
30 changes: 15 additions & 15 deletions src/components/ui/button.tsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
import * as React from "react";
import { Slot } from "@radix-ui/react-slot";
import { cva, type VariantProps } from "class-variance-authority";
import * as React from "react"
import { Slot } from "@radix-ui/react-slot"
import { cva, type VariantProps } from "class-variance-authority"

import { cn } from "@/lib/utils";
import { cn } from "@/lib/utils"

const buttonVariants = cva(
"inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50",
"inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0",
{
variants: {
variant: {
default: "bg-primary text-primary-foreground hover:bg-primary/90",
destructive:
"bg-destructive text-destructive-foreground hover:bg-destructive/90",
outline:
"border border-input hover:bg-accent hover:text-accent-foreground",
"border border-input bg-background hover:bg-accent hover:text-accent-foreground",
secondary:
"bg-secondary text-secondary-foreground hover:bg-secondary/80",
ghost: "hover:bg-accent hover:text-accent-foreground",
Expand All @@ -30,27 +30,27 @@ const buttonVariants = cva(
variant: "default",
size: "default",
},
},
);
}
)

export interface ButtonProps
extends React.ButtonHTMLAttributes<HTMLButtonElement>,
VariantProps<typeof buttonVariants> {
asChild?: boolean;
asChild?: boolean
}

const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
({ className, variant, size, asChild = false, ...props }, ref) => {
const Comp = asChild ? Slot : "button";
const Comp = asChild ? Slot : "button"
return (
<Comp
className={cn(buttonVariants({ variant, size, className }))}
ref={ref}
{...props}
/>
);
},
);
Button.displayName = "Button";
)
}
)
Button.displayName = "Button"

export { Button, buttonVariants };
export { Button, buttonVariants }
24 changes: 12 additions & 12 deletions src/components/ui/calendar.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import * as React from "react"
import { ChevronLeft, ChevronRight } from "lucide-react"
import { DayPicker } from "react-day-picker"
import * as React from "react";
import { ChevronLeft, ChevronRight } from "lucide-react";
import { DayPicker } from "react-day-picker";

import { cn } from "@/lib/utils"
import { buttonVariants } from "@/components/ui/button"
import { cn } from "@/lib/utils";
import { buttonVariants } from "@/components/ui/button";

export type CalendarProps = React.ComponentProps<typeof DayPicker>
export type CalendarProps = React.ComponentProps<typeof DayPicker>;

function Calendar({
className,
Expand All @@ -25,7 +25,7 @@ function Calendar({
nav: "space-x-1 flex items-center",
nav_button: cn(
buttonVariants({ variant: "outline" }),
"h-7 w-7 bg-transparent p-0 opacity-50 hover:opacity-100"
"h-7 w-7 bg-transparent p-0 opacity-50 hover:opacity-100",
),
nav_button_previous: "absolute left-1",
nav_button_next: "absolute right-1",
Expand All @@ -37,14 +37,14 @@ function Calendar({
cell: "h-9 w-9 text-center text-sm p-0 relative [&:has([aria-selected].day-range-end)]:rounded-r-md [&:has([aria-selected].day-outside)]:bg-accent/50 [&:has([aria-selected])]:bg-accent first:[&:has([aria-selected])]:rounded-l-md last:[&:has([aria-selected])]:rounded-r-md focus-within:relative focus-within:z-20",
day: cn(
buttonVariants({ variant: "ghost" }),
"h-9 w-9 p-0 font-normal aria-selected:opacity-100"
"h-9 w-9 p-0 font-normal aria-selected:opacity-100",
),
day_range_end: "day-range-end",
day_selected:
"bg-primary text-primary-foreground hover:bg-primary hover:text-primary-foreground focus:bg-primary focus:text-primary-foreground",
day_today: "bg-accent text-accent-foreground",
day_outside:
"day-outside text-muted-foreground opacity-50 aria-selected:bg-accent/50 aria-selected:text-muted-foreground aria-selected:opacity-30",
"day-outside text-muted-foreground aria-selected:bg-accent/50 aria-selected:text-muted-foreground",
day_disabled: "text-muted-foreground opacity-50",
day_range_middle:
"aria-selected:bg-accent aria-selected:text-accent-foreground",
Expand All @@ -57,8 +57,8 @@ function Calendar({
}}
{...props}
/>
)
);
}
Calendar.displayName = "Calendar"
Calendar.displayName = "Calendar";

export { Calendar }
export { Calendar };

0 comments on commit a13c882

Please sign in to comment.