TZGyn
/
next-dashboard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: TZGyn:73920ed1648183ce4293c9fad58f5abdcde8b46d
Branches Tags
TZGyn:master
..
compare: TZGyn:3c0323bf83215f7c0782645ae4713730c63fa38b
Branches Tags
TZGyn:master

No commits in common. '73920ed1648183ce4293c9fad58f5abdcde8b46d' and '3c0323bf83215f7c0782645ae4713730c63fa38b' have entirely different histories.
73920ed164 ... 3c0323bf83

7 changed files with 27 additions and 302 deletions
Show Stats

97
app/categories/table.tsx
Unescape Escape View File

@ -8,18 +8,14 @@ import {
TableRow, TableRow,
TableCell, TableCell,
Tooltip, Tooltip,
Select,
SelectItem,
Selection,
} from '@nextui-org/react' } from '@nextui-org/react'
import { DeleteIcon, EditIcon } from '@/components/icons' import { DeleteIcon, EditIcon } from '@/components/icons'
import { BookmarkCategory, BookmarkCategoryWithBookmarks } from '@/types' import { BookmarkCategoryWithBookmarks } from '@/types'
import { useRouter } from 'next/navigation' import { useRouter } from 'next/navigation'
const columns = [ const columns = [
{ name: 'NAME', uid: 'name' }, { name: 'NAME', uid: 'name' },
{ name: 'POSITION', uid: 'position' },
{ name: 'BOOKMARK COUNT', uid: 'bookmarkcount' }, { name: 'BOOKMARK COUNT', uid: 'bookmarkcount' },
{ name: 'ACTIONS', uid: 'actions' }, { name: 'ACTIONS', uid: 'actions' },
] ]
@ -45,26 +41,6 @@ export default function TableComponent({
return return
} }
const updateCategory = async (
bookmark_category: BookmarkCategory,
position: Selection
) => {
if (position === 'all') return
const body = {
...bookmark_category,
position: parseInt(position.values().next().value),
}
await fetch('/api/bookmark_category', {
method: 'PATCH',
body: JSON.stringify(body),
})
router.refresh()
return
}
return ( return (
<> <>
<Table> <Table>
@ -76,51 +52,32 @@ export default function TableComponent({
)} )}
</TableHeader> </TableHeader>
<TableBody items={bookmarkCategories}> <TableBody items={bookmarkCategories}>
{(item) => { {(item) => (
const { bookmark: _, ...category } = item <TableRow key={item.id}>
return ( <TableCell>{item.name}</TableCell>
<TableRow key={item.id}> <TableCell>{item.bookmark.length}</TableCell>
<TableCell>{item.name}</TableCell> <TableCell>
<TableCell> <div className='relative flex items-center gap-2'>
<Select <Tooltip content='Edit Category'>
placeholder='Select position' <span className='cursor-pointer text-lg text-default-400 active:opacity-50'>
selectedKeys={item.position.toString()} <EditIcon />
onSelectionChange={(key) => { </span>
updateCategory(category, key) </Tooltip>
}}> <Tooltip
{bookmarkCategories.map((_, index) => ( color='danger'
<SelectItem content='Delete Category'>
key={index + 1} <span
value={index + 1}> className='cursor-pointer text-lg text-danger active:opacity-50'
{(index + 1).toString()} onClick={() =>
</SelectItem> deleteCategory(item.id)
))} }>
</Select> <DeleteIcon />
</TableCell> </span>
<TableCell>{item.bookmark.length}</TableCell> </Tooltip>
<TableCell> </div>
<div className='relative flex items-center gap-2'> </TableCell>
<Tooltip content='Edit Category'> </TableRow>
<span className='cursor-pointer text-lg text-default-400 active:opacity-50'> )}
<EditIcon />
</span>
</Tooltip>
<Tooltip
color='danger'
content='Delete Category'>
<span
className='cursor-pointer text-lg text-danger active:opacity-50'
onClick={() =>
deleteCategory(item.id)
}>
<DeleteIcon />
</span>
</Tooltip>
</div>
</TableCell>
</TableRow>
)
}}
</TableBody> </TableBody>
</Table> </Table>
</> </>

1
app/dashboard/page.tsx
Unescape Escape View File

@ -19,7 +19,6 @@ export default async function DashboardPage() {
with: { with: {
bookmark: true, bookmark: true,
}, },
orderBy: (bookmark, { asc }) => [asc(bookmark.position)],
}) })
const bookmarkCategoryWithBookmarks = bookmarkCategoryWithBookmarksSchema const bookmarkCategoryWithBookmarks = bookmarkCategoryWithBookmarksSchema

1
drizzle/0004_majestic_vivisector.sql
Unescape Escape View File

@ -1 +0,0 @@
ALTER TABLE "bookmark_categories" ADD COLUMN "position" integer;

220
drizzle/meta/0004_snapshot.json
Unescape Escape View File

@ -1,220 +0,0 @@
{
"version": "5",
"dialect": "pg",
"id": "b830bd5b-b143-444a-87e6-c36a918276e7",
"prevId": "8ee9d2e6-45d6-45ac-8552-b3e40c39b90e",
"tables": {
"bookmarks": {
"name": "bookmarks",
"schema": "",
"columns": {
"id": {
"name": "id",
"type": "serial",
"primaryKey": true,
"notNull": true
},
"user_id": {
"name": "user_id",
"type": "integer",
"primaryKey": false,
"notNull": false
},
"category_id": {
"name": "category_id",
"type": "integer",
"primaryKey": false,
"notNull": false
},
"name": {
"name": "name",
"type": "text",
"primaryKey": false,
"notNull": false
},
"link": {
"name": "link",
"type": "text",
"primaryKey": false,
"notNull": false
},
"description": {
"name": "description",
"type": "text",
"primaryKey": false,
"notNull": false
},
"url": {
"name": "url",
"type": "text",
"primaryKey": false,
"notNull": false
}
},
"indexes": {},
"foreignKeys": {
"bookmarks_user_id_users_id_fk": {
"name": "bookmarks_user_id_users_id_fk",
"tableFrom": "bookmarks",
"tableTo": "users",
"columnsFrom": [
"user_id"
],
"columnsTo": [
"id"
],
"onDelete": "no action",
"onUpdate": "no action"
}
},
"compositePrimaryKeys": {},
"uniqueConstraints": {}
},
"bookmark_categories": {
"name": "bookmark_categories",
"schema": "",
"columns": {
"id": {
"name": "id",
"type": "serial",
"primaryKey": true,
"notNull": true
},
"position": {
"name": "position",
"type": "integer",
"primaryKey": false,
"notNull": false
},
"user_id": {
"name": "user_id",
"type": "integer",
"primaryKey": false,
"notNull": true,
"default": 0
},
"name": {
"name": "name",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'Other'"
}
},
"indexes": {},
"foreignKeys": {
"bookmark_categories_user_id_users_id_fk": {
"name": "bookmark_categories_user_id_users_id_fk",
"tableFrom": "bookmark_categories",
"tableTo": "users",
"columnsFrom": [
"user_id"
],
"columnsTo": [
"id"
],
"onDelete": "no action",
"onUpdate": "no action"
}
},
"compositePrimaryKeys": {},
"uniqueConstraints": {}
},
"session": {
"name": "session",
"schema": "",
"columns": {
"sessionToken": {
"name": "sessionToken",
"type": "text",
"primaryKey": true,
"notNull": true
},
"user_id": {
"name": "user_id",
"type": "integer",
"primaryKey": false,
"notNull": true
},
"expires": {
"name": "expires",
"type": "timestamp",
"primaryKey": false,
"notNull": true
}
},
"indexes": {},
"foreignKeys": {
"session_user_id_users_id_fk": {
"name": "session_user_id_users_id_fk",
"tableFrom": "session",
"tableTo": "users",
"columnsFrom": [
"user_id"
],
"columnsTo": [
"id"
],
"onDelete": "cascade",
"onUpdate": "no action"
}
},
"compositePrimaryKeys": {},
"uniqueConstraints": {}
},
"users": {
"name": "users",
"schema": "",
"columns": {
"id": {
"name": "id",
"type": "serial",
"primaryKey": true,
"notNull": true
},
"name": {
"name": "name",
"type": "text",
"primaryKey": false,
"notNull": false
},
"email": {
"name": "email",
"type": "text",
"primaryKey": false,
"notNull": false
},
"password": {
"name": "password",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "''"
},
"created_at": {
"name": "created_at",
"type": "timestamp",
"primaryKey": false,
"notNull": false
},
"updated_at": {
"name": "updated_at",
"type": "timestamp",
"primaryKey": false,
"notNull": false
}
},
"indexes": {},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {}
}
},
"enums": {},
"schemas": {},
"_meta": {
"schemas": {},
"tables": {},
"columns": {}
}
}

7
drizzle/meta/_journal.json
Unescape Escape View File

@ -29,13 +29,6 @@
"when": 1693043001584, "when": 1693043001584,
"tag": "0003_same_texas_twister", "tag": "0003_same_texas_twister",
"breakpoints": true "breakpoints": true
},
{
"idx": 4,
"version": "5",
"when": 1694384709378,
"tag": "0004_majestic_vivisector",
"breakpoints": true
} }
] ]
} }

1
lib/schema.ts
Unescape Escape View File

@ -38,7 +38,6 @@ export const bookmarkRelations = relations(bookmark, ({ one }) => ({
export const bookmarkCategory = pgTable('bookmark_categories', { export const bookmarkCategory = pgTable('bookmark_categories', {
id: serial('id').primaryKey(), id: serial('id').primaryKey(),
position: integer('position'),
userId: integer('user_id') userId: integer('user_id')
.references(() => user.id) .references(() => user.id)
.notNull() .notNull()

2
types/index.ts
Unescape Escape View File

@ -26,7 +26,6 @@ export type Bookmark = z.infer<typeof bookmarkSchema>
const bookmarkCategory = { const bookmarkCategory = {
name: z.string().nonempty(), name: z.string().nonempty(),
position: z.number(),
} }
export const newBookmarkCategorySchema = z.object({ export const newBookmarkCategorySchema = z.object({
@ -43,7 +42,6 @@ export type BookmarkCategory = z.infer<typeof bookmarkCategorySchema>
export const bookmarkCategoryWithBookmarksSchema = z.object({ export const bookmarkCategoryWithBookmarksSchema = z.object({
id: z.number(), id: z.number(),
userId: z.number(),
...bookmarkCategory, ...bookmarkCategory,
bookmark: bookmarkSchema.array(), bookmark: bookmarkSchema.array(),
}) })

Write Preview
Loading…
Cancel
Save