Compare commits

..

No commits in common. "01b98a0a086e377910029bae5d66791dd4f3fe3f" and "cda903175cb4a4e2a8ec08b6cacc4d631d9f64c3" have entirely different histories.

5 changed files with 57 additions and 59 deletions

1
Jenkinsfile vendored
View File

@ -30,7 +30,6 @@ agent any
// Clean after build // Clean after build
always { always {
cleanWs(cleanWhenNotBuilt: true, cleanWs(cleanWhenNotBuilt: true,
cleanWhenFailure: false,
deleteDirs: true, deleteDirs: true,
disableDeferredWipeout: true, disableDeferredWipeout: true,
// notFailBuild: true, // notFailBuild: true,

View File

@ -44,7 +44,7 @@ export default function LoginForm() {
return ( return (
<main className="flex flex-col items-center justify-around h-60 w-26"> <>
{submitted ? <div className="flex flex-col items-center justify-around h-30 w-26"> {submitted ? <div className="flex flex-col items-center justify-around h-30 w-26">
<h1>Logging in...</h1> <h1>Logging in...</h1>
<Button asChild> <Button asChild>
@ -52,7 +52,7 @@ export default function LoginForm() {
</Button> </Button>
</div> : </div> :
<Form {...form}> <Form {...form}>
<form onSubmit={onSubmit} className="flex flex-col items-center space-y-6"> <form onSubmit={onSubmit} className="mt-20 flex flex-col items-center space-y-6">
<FormField <FormField
control={form.control} control={form.control}
name="email" name="email"
@ -83,7 +83,7 @@ export default function LoginForm() {
</form> </form>
</Form> </Form>
} }
</main> </>
) )
} }

View File

@ -5,6 +5,7 @@ import { Button } from "@/components/ui/button"
import { SubComplete } from "./page" import { SubComplete } from "./page"
import { selectCol } from "app/ui/tables/selectColumn" import { selectCol } from "app/ui/tables/selectColumn"
import TitleContainer from "app/ui/titleContainer" import TitleContainer from "app/ui/titleContainer"
import { CalendarArrowUp } from "lucide"

View File

@ -745,10 +745,6 @@ body {
margin-bottom: auto; margin-bottom: auto;
} }
.mb-6 {
margin-bottom: 1.5rem;
}
.ml-2 { .ml-2 {
margin-left: 0.5rem; margin-left: 0.5rem;
} }
@ -785,6 +781,10 @@ body {
margin-top: 1.5rem; margin-top: 1.5rem;
} }
.mb-6 {
margin-bottom: 1.5rem;
}
.block { .block {
display: block; display: block;
} }
@ -854,10 +854,6 @@ body {
height: 1.25rem; height: 1.25rem;
} }
.h-60 {
height: 15rem;
}
.h-7 { .h-7 {
height: 1.75rem; height: 1.75rem;
} }
@ -891,6 +887,10 @@ body {
height: 100vh; height: 100vh;
} }
.h-60 {
height: 15rem;
}
.max-h-96 { .max-h-96 {
max-height: 24rem; max-height: 24rem;
} }
@ -976,6 +976,14 @@ body {
width: 100vw; width: 100vw;
} }
.w-14 {
width: 3.5rem;
}
.w-20 {
width: 5rem;
}
.min-w-\[8rem\] { .min-w-\[8rem\] {
min-width: 8rem; min-width: 8rem;
} }
@ -1133,6 +1141,10 @@ body {
justify-content: space-around; justify-content: space-around;
} }
.justify-items-center {
justify-items: center;
}
.gap-1 { .gap-1 {
gap: 0.25rem; gap: 0.25rem;
} }
@ -1364,11 +1376,6 @@ body {
background-color: transparent; background-color: transparent;
} }
.bg-white {
--tw-bg-opacity: 1;
background-color: rgb(255 255 255 / var(--tw-bg-opacity));
}
.fill-current { .fill-current {
fill: currentColor; fill: currentColor;
} }
@ -1625,6 +1632,10 @@ body {
color: rgb(255 255 255 / var(--tw-text-opacity)); color: rgb(255 255 255 / var(--tw-text-opacity));
} }
.underline {
text-decoration-line: underline;
}
.underline-offset-4 { .underline-offset-4 {
text-underline-offset: 4px; text-underline-offset: 4px;
} }
@ -1675,10 +1686,6 @@ body {
outline-style: solid; outline-style: solid;
} }
.ring-primary {
--tw-ring-color: hsl(var(--primary));
}
.ring-offset-background { .ring-offset-background {
--tw-ring-offset-color: hsl(var(--background)); --tw-ring-offset-color: hsl(var(--background));
} }

View File

@ -308,19 +308,11 @@ export function DataTable<TData, TValue>({
</TableHeader> </TableHeader>
<TableBody> <TableBody>
{table.getRowModel().rows?.length ? ( {table.getRowModel().rows?.length ? (
table.getRowModel().rows.map((row) => { table.getRowModel().rows.map((row) => (
const classes = () => {
const classes = []
if (row.getValue('response') === "Pending") classes.push("bg-accent")
if (row.getValue('response') === "Acceptance") classes.push("bg-primary")
return classes.join(" ")
}
return (
<ContextMenu key={row.id + "contextMenu"}> <ContextMenu key={row.id + "contextMenu"}>
<ContextMenuTrigger asChild> <ContextMenuTrigger asChild>
<TableRow <TableRow
key={row.id} key={row.id}
className={classes()}
data-state={row.getIsSelected() && "selected"} data-state={row.getIsSelected() && "selected"}
tabIndex={0} tabIndex={0}
onDoubleClick={() => { onDoubleClick={() => {
@ -345,8 +337,7 @@ export function DataTable<TData, TValue>({
</TableRow> </TableRow>
</ContextMenuTrigger> </ContextMenuTrigger>
</ContextMenu> </ContextMenu>
) ))
})
) : ( ) : (
<TableRow> <TableRow>
<TableCell colSpan={columns.length} className="h-24 text-center"> <TableCell colSpan={columns.length} className="h-24 text-center">