From 540fbf022828e21c7eb26523f6881c8695bdbf71 Mon Sep 17 00:00:00 2001 From: Jake Rosenberg Date: Mon, 30 Jan 2023 09:26:51 -0600 Subject: [PATCH] Tweaks: Projects layout, Vite upgrade; replace react-table with explicit markup (#118) * styling tweaks; vite upgrade; replace react-table with explicit markup * fix tests --- apps/tup-ui/src/pages/Projects/Projects.tsx | 6 +- apps/tup-ui/vite.config.ts | 2 +- libs/tup-components/src/news/UserNews.tsx | 2 +- .../src/projects/ProjectLayout.test.tsx | 2 +- .../ProjectsListing/ProjectsListing.test.tsx | 2 +- .../src/projects/ProjectsTable.test.tsx | 2 +- .../src/projects/ProjectsTable.tsx | 82 +- .../header/ProjectHeader/ProjectHeader.tsx | 12 +- .../header/ProjectHeader/Projects.module.css | 6 +- .../users/UserDetail/UserDetail.module.css | 2 + .../projects/users/UserDetail/UserDetail.tsx | 95 +- .../projects/users/UserList/ManageTeam.tsx | 57 + .../src/projects/users/UserList/UserList.tsx | 8 +- .../TicketDetailModal/TicketReplyForm.tsx | 1 + libs/tup-components/src/tickets/Tickets.tsx | 13 +- .../src/tickets/TicketsTable.global.css | 5 + .../src/tickets/TicketsTable.test.tsx | 7 +- .../src/tickets/TicketsTable.tsx | 111 +- libs/tup-hooks/src/requests.ts | 3 +- libs/tup-hooks/src/useProjectUsers.ts | 2 +- package-lock.json | 1718 ++++++++++------- package.json | 5 +- 22 files changed, 1313 insertions(+), 830 deletions(-) create mode 100644 libs/tup-components/src/projects/users/UserList/ManageTeam.tsx diff --git a/apps/tup-ui/src/pages/Projects/Projects.tsx b/apps/tup-ui/src/pages/Projects/Projects.tsx index 15eaad72f..196b14cf0 100644 --- a/apps/tup-ui/src/pages/Projects/Projects.tsx +++ b/apps/tup-ui/src/pages/Projects/Projects.tsx @@ -5,15 +5,13 @@ import { ProjectsNavbar, ProjectsListing, } from '@tacc/tup-components'; -import styles from './Projects.module.css'; +import { SectionHeader } from '@tacc/core-components'; const Layout: React.FC = () => { return ( Projects & Allocations - } + top={Projects & Allocations} left={} right={} > diff --git a/apps/tup-ui/vite.config.ts b/apps/tup-ui/vite.config.ts index b91f01fac..531681ec3 100644 --- a/apps/tup-ui/vite.config.ts +++ b/apps/tup-ui/vite.config.ts @@ -1,5 +1,5 @@ import { defineConfig, PluginOption } from 'vite'; -import react from '@vitejs/plugin-react'; +import react from '@vitejs/plugin-react-swc'; import path from 'path'; function localFsPlugin(): PluginOption { diff --git a/libs/tup-components/src/news/UserNews.tsx b/libs/tup-components/src/news/UserNews.tsx index 982875b8e..07c43d272 100644 --- a/libs/tup-components/src/news/UserNews.tsx +++ b/libs/tup-components/src/news/UserNews.tsx @@ -20,7 +20,7 @@ const UserNews: React.FC = () => {