starred/linsa-linsa-io
1
0
Fork 0
mirror of https://github.com/linsa-io/linsa.git synced 2026-01-11 14:30:26 +01:00
Code Issues 2 Packages Projects Releases Wiki Activity

fix: conflict

Browse Source
This commit is contained in:
Aslam H
2024-09-28 00:56:48 +07:00
parent 4a365bdfe5 34d69be960
commit 07a1996d31
5 changed files with 207 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
web/app/(pages)/tasks/page.tsx
View File

@@ -1,5 +1,15 @@
import { TaskRoute } from "@/components/routes/task/TaskRoute"
import { currentUser } from "@clerk/nextjs/server"
import { notFound } from "next/navigation"
import { get } from "ronin"
export default async function TaskPage() {
const user = await currentUser()
const flag = await get.featureFlag.with.name("TASK")
if (!user?.emailAddresses.some(email => flag?.emails.includes(email.emailAddress))) {
notFound()
}
export default function TaskPage() {
return <TaskRoute />
}

13
web/app/actions.ts
View File

@@ -10,6 +10,19 @@ import { ZSAError } from "zsa"
const MAX_FILE_SIZE = 1 * 1024 * 1024
const ALLOWED_FILE_TYPES = ["image/jpeg", "image/png", "image/gif", "image/webp"]
export const getFeatureFlag = authedProcedure
.input(
z.object({
name: z.string()
})
)
.handler(async ({ input }) => {
const { name } = input
const flag = await get.featureFlag.with.name(name)
return { flag }
})
export const sendFeedback = authedProcedure
.input(
z.object({

46
web/components/custom/sidebar/partial/task-section.tsx
View File

@@ -1,9 +1,11 @@
import Link from "next/link"
import { usePathname } from "next/navigation"
import { useAccount } from "@/lib/providers/jazz-provider"
import { cn } from "@/lib/utils"
import { ListOfTasks } from "@/lib/schema/tasks"
import { LaIcon } from "../../la-icon"
import { useEffect, useState } from "react"
import { useAuth, useUser } from "@clerk/nextjs"
import { getFeatureFlag } from "@/app/actions"
export const TaskSection: React.FC<{ pathname: string }> = ({ pathname }) => {
const me = { root: { tasks: [{ id: "1", title: "Test Task" }] } }
@@ -11,12 +13,52 @@ export const TaskSection: React.FC<{ pathname: string }> = ({ pathname }) => {
const taskCount = me?.root.tasks?.length || 0
const isActive = pathname === "/tasks"
const [isFetching, setIsFetching] = useState(false)
const [isFeatureActive, setIsFeatureActive] = useState(false)
const { isLoaded, isSignedIn } = useAuth()
const { user } = useUser()
useEffect(() => {
async function checkFeatureFlag() {
setIsFetching(true)
if (isLoaded && isSignedIn) {
const [data, err] = await getFeatureFlag({ name: "TASK" })
if (err) {
console.error(err)
setIsFetching(false)
return
}
if (user?.emailAddresses.some(email => data.flag?.emails.includes(email.emailAddress))) {
setIsFeatureActive(true)
}
setIsFetching(false)
}
}
checkFeatureFlag()
}, [isLoaded, isSignedIn, user])
if (!isLoaded || !isSignedIn) {
return <div className="py-2 text-center text-gray-500">Loading...</div>
}
if (!me) return null
if (!isFeatureActive) {
return null
}
return (
<div className="group/tasks flex flex-col gap-px py-2">
<TaskSectionHeader taskCount={taskCount} isActive={isActive} />
<List tasks={me.root.tasks as ListOfTasks} />
{isFetching ? (
<div className="py-2 text-center text-gray-500">Fetching tasks...</div>
) : (
<List tasks={me.root.tasks as ListOfTasks} />
)}
</div>
)
}

29
web/components/custom/sidebar/sidebar.tsx
View File

@@ -115,23 +115,20 @@ const SidebarContent: React.FC = React.memo(() => {
const pathname = usePathname()
return (
<>
<nav className="bg-background relative flex h-full w-full shrink-0 flex-col">
<div>
<LogoAndSearch />
</div>
<div className="relative mb-0.5 mt-1.5 flex grow flex-col overflow-y-auto rounded-md px-3 outline-none">
<div className="h-2 shrink-0" />
{me._type === "Account" && <LinkSection pathname={pathname} />}
{me._type === "Account" && <TopicSection pathname={pathname} />}
{/* {me._type === "Account" && <TaskSection pathname={pathname} />} */}
<TaskSection pathname={pathname} />
{me._type === "Account" && <PageSection pathname={pathname} />}
</div>
<nav className="bg-background relative flex h-full w-full shrink-0 flex-col">
<div>
<LogoAndSearch />
</div>
<div className="relative mb-0.5 mt-1.5 flex grow flex-col overflow-y-auto rounded-md px-3 outline-none">
<div className="h-2 shrink-0" />
{me._type === "Account" && <LinkSection pathname={pathname} />}
{me._type === "Account" && <TopicSection pathname={pathname} />}
{me._type === "Account" && <TaskSection pathname={pathname} />}
{me._type === "Account" && <PageSection pathname={pathname} />}
</div>
<ProfileSection />
</nav>
</>
<ProfileSection />
</nav>
)
})

252
web/package.json
View File

@@ -1,128 +1,128 @@
{
"name": "web",
"version": "0.1.0",
"scripts": {
"dev": "next dev",
"build": "next build",
"start": "next start",
"lint": "next lint",
"test": "jest"
},
"dependencies": {
"@clerk/nextjs": "^5.6.0",
"@dnd-kit/core": "^6.1.0",
"@dnd-kit/modifiers": "^7.0.0",
"@dnd-kit/sortable": "^8.0.0",
"@hookform/resolvers": "^3.9.0",
"@nothing-but/force-graph": "^0.9.5",
"@nothing-but/utils": "^0.16.0",
"@omit/react-confirm-dialog": "^1.1.5",
"@omit/react-fancy-switch": "^0.1.3",
"@radix-ui/react-alert-dialog": "^1.1.1",
"@radix-ui/react-avatar": "^1.1.0",
"@radix-ui/react-checkbox": "^1.1.1",
"@radix-ui/react-context-menu": "^2.2.1",
"@radix-ui/react-dialog": "^1.1.1",
"@radix-ui/react-dismissable-layer": "^1.1.0",
"@radix-ui/react-dropdown-menu": "^2.1.1",
"@radix-ui/react-focus-scope": "^1.1.0",
"@radix-ui/react-icons": "^1.3.0",
"@radix-ui/react-label": "^2.1.0",
"@radix-ui/react-popover": "^1.1.1",
"@radix-ui/react-scroll-area": "^1.1.0",
"@radix-ui/react-select": "^2.1.1",
"@radix-ui/react-separator": "^1.1.0",
"@radix-ui/react-slot": "^1.1.0",
"@radix-ui/react-switch": "^1.1.0",
"@radix-ui/react-toggle": "^1.1.0",
"@radix-ui/react-toggle-group": "^1.1.0",
"@radix-ui/react-tooltip": "^1.1.2",
"@sentry/nextjs": "^8.30.0",
"@tanstack/react-virtual": "^3.10.8",
"@tiptap/core": "^2.7.2",
"@tiptap/extension-blockquote": "^2.7.2",
"@tiptap/extension-bold": "^2.7.2",
"@tiptap/extension-bullet-list": "^2.7.2",
"@tiptap/extension-code": "^2.7.2",
"@tiptap/extension-code-block-lowlight": "^2.7.2",
"@tiptap/extension-color": "^2.7.2",
"@tiptap/extension-document": "^2.7.2",
"@tiptap/extension-dropcursor": "^2.7.2",
"@tiptap/extension-focus": "^2.7.2",
"@tiptap/extension-gapcursor": "^2.7.2",
"@tiptap/extension-hard-break": "^2.7.2",
"@tiptap/extension-heading": "^2.7.2",
"@tiptap/extension-history": "^2.7.2",
"@tiptap/extension-horizontal-rule": "^2.7.2",
"@tiptap/extension-image": "^2.7.2",
"@tiptap/extension-italic": "^2.7.2",
"@tiptap/extension-link": "^2.7.2",
"@tiptap/extension-list-item": "^2.7.2",
"@tiptap/extension-ordered-list": "^2.7.2",
"@tiptap/extension-paragraph": "^2.7.2",
"@tiptap/extension-placeholder": "^2.7.2",
"@tiptap/extension-strike": "^2.7.2",
"@tiptap/extension-task-item": "^2.7.2",
"@tiptap/extension-task-list": "^2.7.2",
"@tiptap/extension-text": "^2.7.2",
"@tiptap/extension-typography": "^2.7.2",
"@tiptap/pm": "^2.7.2",
"@tiptap/react": "^2.7.2",
"@tiptap/starter-kit": "^2.7.2",
"@tiptap/suggestion": "^2.7.2",
"axios": "^1.7.7",
"cheerio": "1.0.0",
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.1",
"cmdk": "^1.0.0",
"date-fns": "^3.6.0",
"framer-motion": "^11.5.6",
"geist": "^1.3.1",
"jazz-browser-auth-clerk": "0.8.0",
"jazz-react": "0.8.0",
"jazz-react-auth-clerk": "0.8.0",
"jazz-tools": "0.8.0",
"jotai": "^2.10.0",
"lowlight": "^3.1.0",
"lucide-react": "^0.429.0",
"next": "14.2.10",
"next-themes": "^0.3.0",
"nuqs": "^1.19.1",
"query-string": "^9.1.0",
"react": "^18.3.1",
"react-day-picker": "^8.10.1",
"react-dom": "^18.3.1",
"react-hook-form": "^7.53.0",
"react-textarea-autosize": "^8.5.3",
"ronin": "^4.3.1",
"slugify": "^1.6.6",
"sonner": "^1.5.0",
"streaming-markdown": "^0.0.14",
"tailwind-merge": "^2.5.2",
"tailwindcss-animate": "^1.0.7",
"vaul": "^0.9.4",
"zod": "^3.23.8",
"zsa": "^0.6.0",
"zsa-react": "^0.2.3"
},
"devDependencies": {
"@ronin/learn-anything": "0.0.0-3452357373461",
"@testing-library/jest-dom": "^6.5.0",
"@testing-library/react": "^16.0.1",
"@types/jest": "^29.5.13",
"@types/node": "^22.5.5",
"@types/react": "^18.3.8",
"@types/react-dom": "^18.3.0",
"dotenv": "^16.4.5",
"eslint": "^8.57.1",
"eslint-config-next": "14.2.5",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"postcss": "^8.4.47",
"prettier-plugin-tailwindcss": "^0.6.6",
"tailwindcss": "^3.4.12",
"ts-jest": "^29.2.5",
"ts-node": "^10.9.2",
"typescript": "^5.6.2"
}
"name": "web",
"version": "0.1.0",
"scripts": {
"dev": "next dev",
"build": "next build",
"start": "next start",
"lint": "next lint",
"test": "jest"
},
"dependencies": {
"@clerk/nextjs": "^5.6.0",
"@dnd-kit/core": "^6.1.0",
"@dnd-kit/modifiers": "^7.0.0",
"@dnd-kit/sortable": "^8.0.0",
"@hookform/resolvers": "^3.9.0",
"@nothing-but/force-graph": "^0.9.5",
"@nothing-but/utils": "^0.16.0",
"@omit/react-confirm-dialog": "^1.1.5",
"@omit/react-fancy-switch": "^0.1.3",
"@radix-ui/react-alert-dialog": "^1.1.1",
"@radix-ui/react-avatar": "^1.1.0",
"@radix-ui/react-checkbox": "^1.1.1",
"@radix-ui/react-context-menu": "^2.2.1",
"@radix-ui/react-dialog": "^1.1.1",
"@radix-ui/react-dismissable-layer": "^1.1.0",
"@radix-ui/react-dropdown-menu": "^2.1.1",
"@radix-ui/react-focus-scope": "^1.1.0",
"@radix-ui/react-icons": "^1.3.0",
"@radix-ui/react-label": "^2.1.0",
"@radix-ui/react-popover": "^1.1.1",
"@radix-ui/react-scroll-area": "^1.1.0",
"@radix-ui/react-select": "^2.1.1",
"@radix-ui/react-separator": "^1.1.0",
"@radix-ui/react-slot": "^1.1.0",
"@radix-ui/react-switch": "^1.1.0",
"@radix-ui/react-toggle": "^1.1.0",
"@radix-ui/react-toggle-group": "^1.1.0",
"@radix-ui/react-tooltip": "^1.1.2",
"@sentry/nextjs": "^8.31.0",
"@tanstack/react-virtual": "^3.10.8",
"@tiptap/core": "^2.7.2",
"@tiptap/extension-blockquote": "^2.7.2",
"@tiptap/extension-bold": "^2.7.2",
"@tiptap/extension-bullet-list": "^2.7.2",
"@tiptap/extension-code": "^2.7.2",
"@tiptap/extension-code-block-lowlight": "^2.7.2",
"@tiptap/extension-color": "^2.7.2",
"@tiptap/extension-document": "^2.7.2",
"@tiptap/extension-dropcursor": "^2.7.2",
"@tiptap/extension-focus": "^2.7.2",
"@tiptap/extension-gapcursor": "^2.7.2",
"@tiptap/extension-hard-break": "^2.7.2",
"@tiptap/extension-heading": "^2.7.2",
"@tiptap/extension-history": "^2.7.2",
"@tiptap/extension-horizontal-rule": "^2.7.2",
"@tiptap/extension-image": "^2.7.2",
"@tiptap/extension-italic": "^2.7.2",
"@tiptap/extension-link": "^2.7.2",
"@tiptap/extension-list-item": "^2.7.2",
"@tiptap/extension-ordered-list": "^2.7.2",
"@tiptap/extension-paragraph": "^2.7.2",
"@tiptap/extension-placeholder": "^2.7.2",
"@tiptap/extension-strike": "^2.7.2",
"@tiptap/extension-task-item": "^2.7.2",
"@tiptap/extension-task-list": "^2.7.2",
"@tiptap/extension-text": "^2.7.2",
"@tiptap/extension-typography": "^2.7.2",
"@tiptap/pm": "^2.7.2",
"@tiptap/react": "^2.7.2",
"@tiptap/starter-kit": "^2.7.2",
"@tiptap/suggestion": "^2.7.2",
"axios": "^1.7.7",
"cheerio": "1.0.0",
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.1",
"cmdk": "^1.0.0",
"date-fns": "^3.6.0",
"framer-motion": "^11.5.6",
"geist": "^1.3.1",
"jazz-browser-auth-clerk": "0.8.0",
"jazz-react": "0.8.0",
"jazz-react-auth-clerk": "0.8.0",
"jazz-tools": "0.8.0",
"jotai": "^2.10.0",
"lowlight": "^3.1.0",
"lucide-react": "^0.429.0",
"next": "14.2.10",
"next-themes": "^0.3.0",
"nuqs": "^1.19.2",
"query-string": "^9.1.0",
"react": "^18.3.1",
"react-day-picker": "^8.10.1",
"react-dom": "^18.3.1",
"react-hook-form": "^7.53.0",
"react-textarea-autosize": "^8.5.3",
"ronin": "^4.3.1",
"slugify": "^1.6.6",
"sonner": "^1.5.0",
"streaming-markdown": "^0.0.14",
"tailwind-merge": "^2.5.2",
"tailwindcss-animate": "^1.0.7",
"vaul": "^0.9.4",
"zod": "^3.23.8",
"zsa": "^0.6.0",
"zsa-react": "^0.2.3"
},
"devDependencies": {
"@ronin/learn-anything": "^0.0.0-3453250405724",
"@testing-library/jest-dom": "^6.5.0",
"@testing-library/react": "^16.0.1",
"@types/jest": "^29.5.13",
"@types/node": "^22.6.1",
"@types/react": "^18.3.8",
"@types/react-dom": "^18.3.0",
"dotenv": "^16.4.5",
"eslint": "^8.57.1",
"eslint-config-next": "14.2.5",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"postcss": "^8.4.47",
"prettier-plugin-tailwindcss": "^0.6.6",
"tailwindcss": "^3.4.13",
"ts-jest": "^29.2.5",
"ts-node": "^10.9.2",
"typescript": "^5.6.2"
}
}