Skip to content

🎨 Add minor UI tweaks in Skeletons and other components #1507

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 21, 2025
Merged

🎨 Add minor UI tweaks in Skeletons and other components #1507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b91265
Tweaks
alejsdev Feb 21, 2025
c1970ec
Delete playwright/.auth/user.json
alejsdev Feb 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions frontend/src/components/Common/UserMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,7 @@ const UserMenu = () => {
<Flex>
<MenuRoot>
<MenuTrigger asChild p={2}>
<Button
data-testid="user-menu"
variant="solid"
maxW="150px"
truncate
>
<Button data-testid="user-menu" variant="solid" maxW="sm" truncate>
<FaUserAstronaut fontSize="18" />
<Text>{user?.full_name || "User"}</Text>
</Button>
Expand Down
19 changes: 10 additions & 9 deletions frontend/src/components/Pending/PendingItems.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,30 @@
import { Skeleton, Table } from "@chakra-ui/react"
import { Table } from "@chakra-ui/react"
import { SkeletonText } from "../ui/skeleton"

const PendingItems = () => (
<Table.Root size={{ base: "sm", md: "md" }}>
<Table.Header>
<Table.Row>
<Table.ColumnHeader w="30%">ID</Table.ColumnHeader>
<Table.ColumnHeader w="30%">Title</Table.ColumnHeader>
<Table.ColumnHeader w="30%">Description</Table.ColumnHeader>
<Table.ColumnHeader w="10%">Actions</Table.ColumnHeader>
<Table.ColumnHeader w="sm">ID</Table.ColumnHeader>
<Table.ColumnHeader w="sm">Title</Table.ColumnHeader>
<Table.ColumnHeader w="sm">Description</Table.ColumnHeader>
<Table.ColumnHeader w="sm">Actions</Table.ColumnHeader>
</Table.Row>
</Table.Header>
<Table.Body>
{[...Array(5)].map((_, index) => (
<Table.Row key={index}>
<Table.Cell>
<Skeleton h="20px" />
<SkeletonText noOfLines={1} />
</Table.Cell>
<Table.Cell>
<Skeleton h="20px" />
<SkeletonText noOfLines={1} />
</Table.Cell>
<Table.Cell>
<Skeleton h="20px" />
<SkeletonText noOfLines={1} />
</Table.Cell>
<Table.Cell>
<Skeleton h="20px" />
<SkeletonText noOfLines={1} />
</Table.Cell>
</Table.Row>
))}
Expand Down
23 changes: 12 additions & 11 deletions frontend/src/components/Pending/PendingUsers.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,34 @@
import { Skeleton, Table } from "@chakra-ui/react"
import { Table } from "@chakra-ui/react"
import { SkeletonText } from "../ui/skeleton"

const PendingUsers = () => (
<Table.Root size={{ base: "sm", md: "md" }}>
<Table.Header>
<Table.Row>
<Table.ColumnHeader w="20%">Full name</Table.ColumnHeader>
<Table.ColumnHeader w="25%">Email</Table.ColumnHeader>
<Table.ColumnHeader w="15%">Role</Table.ColumnHeader>
<Table.ColumnHeader w="20%">Status</Table.ColumnHeader>
<Table.ColumnHeader w="20%">Actions</Table.ColumnHeader>
<Table.ColumnHeader w="sm">Full name</Table.ColumnHeader>
<Table.ColumnHeader w="sm">Email</Table.ColumnHeader>
<Table.ColumnHeader w="sm">Role</Table.ColumnHeader>
<Table.ColumnHeader w="sm">Status</Table.ColumnHeader>
<Table.ColumnHeader w="sm">Actions</Table.ColumnHeader>
</Table.Row>
</Table.Header>
<Table.Body>
{[...Array(5)].map((_, index) => (
<Table.Row key={index}>
<Table.Cell>
<Skeleton h="20px" />
<SkeletonText noOfLines={1} />
</Table.Cell>
<Table.Cell>
<Skeleton h="20px" />
<SkeletonText noOfLines={1} />
</Table.Cell>
<Table.Cell>
<Skeleton h="20px" />
<SkeletonText noOfLines={1} />
</Table.Cell>
<Table.Cell>
<Skeleton h="20px" />
<SkeletonText noOfLines={1} />
</Table.Cell>
<Table.Cell>
<Skeleton h="20px" />
<SkeletonText noOfLines={1} />
</Table.Cell>
</Table.Row>
))}
Expand Down
5 changes: 1 addition & 4 deletions frontend/src/components/UserSettings/ChangePassword.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,7 @@ const ChangePassword = () => {
<Heading size="sm" py={4}>
Change Password
</Heading>
<Box
as="form"
onSubmit={handleSubmit(onSubmit)}
>
<Box as="form" onSubmit={handleSubmit(onSubmit)}>
<VStack gap={4} w={{ base: "100%", md: "sm" }}>
<PasswordInput
type="current_password"
Expand Down
7 changes: 6 additions & 1 deletion frontend/src/main.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
import { MutationCache, QueryCache, QueryClient, QueryClientProvider } from "@tanstack/react-query"
import {
MutationCache,
QueryCache,
QueryClient,
QueryClientProvider,
} from "@tanstack/react-query"
import { RouterProvider, createRouter } from "@tanstack/react-router"
import React, { StrictMode } from "react"
import ReactDOM from "react-dom/client"
Expand Down
24 changes: 12 additions & 12 deletions frontend/src/routes/_layout/admin.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,32 +61,32 @@ function UsersTable() {
<Table.Root size={{ base: "sm", md: "md" }}>
<Table.Header>
<Table.Row>
<Table.ColumnHeader w="20%">Full name</Table.ColumnHeader>
<Table.ColumnHeader w="25%">Email</Table.ColumnHeader>
<Table.ColumnHeader w="15%">Role</Table.ColumnHeader>
<Table.ColumnHeader w="20%">Status</Table.ColumnHeader>
<Table.ColumnHeader w="20%">Actions</Table.ColumnHeader>
<Table.ColumnHeader w="sm">Full name</Table.ColumnHeader>
<Table.ColumnHeader w="sm">Email</Table.ColumnHeader>
<Table.ColumnHeader w="sm">Role</Table.ColumnHeader>
<Table.ColumnHeader w="sm">Status</Table.ColumnHeader>
<Table.ColumnHeader w="sm">Actions</Table.ColumnHeader>
</Table.Row>
</Table.Header>
<Table.Body>
{users?.map((user) => (
<Table.Row key={user.id} opacity={isPlaceholderData ? 0.5 : 1}>
<Table.Cell w="20%" color={!user.full_name ? "gray" : "inherit"}>
<Table.Cell color={!user.full_name ? "gray" : "inherit"}>
{user.full_name || "N/A"}
{currentUser?.id === user.id && (
<Badge ml="1" colorScheme="teal">
You
</Badge>
)}
</Table.Cell>
<Table.Cell w="25%">{user.email}</Table.Cell>
<Table.Cell w="15%">
{user.is_superuser ? "Superuser" : "User"}
<Table.Cell truncate maxW="sm">
{user.email}
</Table.Cell>
<Table.Cell w="20%">
{user.is_active ? "Active" : "Inactive"}
<Table.Cell>
{user.is_superuser ? "Superuser" : "User"}
</Table.Cell>
<Table.Cell w="20%">
<Table.Cell>{user.is_active ? "Active" : "Inactive"}</Table.Cell>
<Table.Cell>
<UserActionsMenu
user={user}
disabled={currentUser?.id === user.id}
Expand Down
14 changes: 7 additions & 7 deletions frontend/src/routes/_layout/items.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,19 +85,19 @@ function ItemsTable() {
<Table.Root size={{ base: "sm", md: "md" }}>
<Table.Header>
<Table.Row>
<Table.ColumnHeader w="30%">ID</Table.ColumnHeader>
<Table.ColumnHeader w="30%">Title</Table.ColumnHeader>
<Table.ColumnHeader w="30%">Description</Table.ColumnHeader>
<Table.ColumnHeader w="10%">Actions</Table.ColumnHeader>
<Table.ColumnHeader w="sm">ID</Table.ColumnHeader>
<Table.ColumnHeader w="sm">Title</Table.ColumnHeader>
<Table.ColumnHeader w="sm">Description</Table.ColumnHeader>
<Table.ColumnHeader w="sm">Actions</Table.ColumnHeader>
</Table.Row>
</Table.Header>
<Table.Body>
{items?.map((item) => (
<Table.Row key={item.id} opacity={isPlaceholderData ? 0.5 : 1}>
<Table.Cell truncate maxW="30%">
<Table.Cell truncate maxW="sm">
{item.id}
</Table.Cell>
<Table.Cell truncate maxW="30%">
<Table.Cell truncate maxW="sm">
{item.title}
</Table.Cell>
<Table.Cell
Expand All @@ -107,7 +107,7 @@ function ItemsTable() {
>
{item.description || "N/A"}
</Table.Cell>
<Table.Cell width="10%">
<Table.Cell>
<ItemActionsMenu item={item} />
</Table.Cell>
</Table.Row>
Expand Down
2 changes: 1 addition & 1 deletion frontend/tests/login.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,4 +124,4 @@ test("Redirects to /login when token is wrong", async ({ page }) => {
await page.goto("/settings")
await page.waitForURL("/login")
await expect(page).toHaveURL("/login")
})
})