Skip to content
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.

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

show stars instead of plan on OSS version #300

Merged
merged 1 commit into from
Dec 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions apps/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@
"react-dnd-html5-backend": "^16.0.1",
"react-dom": "^18",
"react-dropzone": "^14.2.3",
"react-github-btn": "^1.4.0",
"react-grid-layout": "^1.2.5",
"react-hook-form": "^7.47.0",
"react-hotkeys-hook": "^4.5.0",
Expand Down
14 changes: 1 addition & 13 deletions apps/web/src/components/BlinkingSignal.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import { useDataSources } from '@/hooks/useDatasources'
import { useStringQuery } from '@/hooks/useQueryArgs'
import clsx from 'clsx'

interface Props {
Expand All @@ -26,17 +24,7 @@ function BlinkingSignal(props: Props) {
)
}

export const DataSourceBlinkingSignal = () => {
const workspaceId = useStringQuery('workspaceId') ?? ''
const [{ datasources: allDataSources, isLoading }] =
useDataSources(workspaceId)

const userDataSources = allDataSources.filter((ds) => !ds.config.data.isDemo)

if (isLoading || !userDataSources || userDataSources.size > 0) {
return null
}

export function ConfigurationsMenuBlinkingSignal() {
return (
<BlinkingSignal
position="top-0.5 left-1 translate-x-full"
Expand Down
66 changes: 66 additions & 0 deletions apps/web/src/components/ConfigurationsMenuItem.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
import clsx from 'clsx'
import Link from 'next/link'
import router from 'next/router'
import { ConfigurationsMenuBlinkingSignal } from './BlinkingSignal'

type BaseConfigurationsMenuProps = {
icon: React.ElementType
text: string
blink?: boolean
}

type ConfigurationsMenuLinkProps = BaseConfigurationsMenuProps & {
href: string
}

type ConfigurationsMenuButtonProps = BaseConfigurationsMenuProps & {
onClick: () => void
}

const ConfigurationsMenuLink = (props: ConfigurationsMenuLinkProps) => {
return (
<Link
href={props.href}
className={clsx(
router.pathname.startsWith(props.href)
? 'text-gray-800 bg-ceramic-100/50'
: 'text-gray-500 hover:bg-ceramic-100/80',
'group text-sm font-medium leading-6 w-full flex py-1 hover:text-ceramic-600'
)}
>
<div className="w-full flex items-center gap-x-2 px-4 relative">
{props.blink && <ConfigurationsMenuBlinkingSignal />}
<props.icon
strokeWidth={1}
className="h-4 w-4 shrink-0"
aria-hidden="true"
/>
<span className="mt-0.5">{props.text}</span>
</div>
</Link>
)
}

const ConfigurationsMenuButton = (props: ConfigurationsMenuButtonProps) => {
return (
<button
onClick={props.onClick}
className={clsx(
'group text-sm font-medium leading-6 w-full flex py-1 hover:text-ceramic-600',
'text-gray-500 hover:bg-ceramic-100/80'
)}
>
<div className="w-full flex items-center gap-x-2 px-4 relative">
{props.blink && <ConfigurationsMenuBlinkingSignal />}
<props.icon
strokeWidth={1}
className="h-4 w-4 shrink-0"
aria-hidden="true"
/>
<span className="mt-0.5">{props.text}</span>
</div>
</button>
)
}

export { ConfigurationsMenuLink, ConfigurationsMenuButton }
8 changes: 4 additions & 4 deletions apps/web/src/components/DataSourceIcons.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ const DataSourceBlock = ({ name, icon, href }: DataSourceBlockProps) => {
return (
<Link
href={href}
className="h-24 w-24 py-3 px-6 border border-gray-200 rounded-md flex flex-col items-center justify-between bg-gray-50 hover:bg-ceramic-50 hover:border-gray-300"
className="h-32 w-32 p-2 border border-gray-200 rounded-md flex flex-col items-center justify-around bg-gray-50 hover:bg-ceramic-50 hover:border-gray-300"
>
<img src={icon} alt="" className="h-10 w-10" />
<img src={icon} alt="" className="h-12 w-12" />
<span className="text-sm">{name}</span>
</Link>
)
Expand Down Expand Up @@ -69,9 +69,9 @@ export const DataSourceIcons = ({
/>
<button
onClick={onCSV}
className="h-24 w-24 py-3 px-6 border border-gray-200 rounded-md flex flex-col items-center justify-between bg-gray-50 hover:bg-ceramic-50 hover:border-gray-300"
className="h-32 w-32 py-3 px-6 border border-gray-200 rounded-md flex flex-col items-center justify-around bg-gray-50 hover:bg-ceramic-50 hover:border-gray-300"
>
<img src="/icons/csv.png" alt="" className="h-10 w-10" />
<img src="/icons/csv.png" alt="" className="h-12 w-12" />
<span className="text-sm">Files</span>
</button>
</div>
Expand Down
84 changes: 55 additions & 29 deletions apps/web/src/components/Layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import {
AdjustmentsHorizontalIcon,
PuzzlePieceIcon,
MagnifyingGlassIcon,
RocketLaunchIcon,
} from '@heroicons/react/24/outline'
import clsx from 'clsx'
import Link from 'next/link'
Expand All @@ -31,18 +32,24 @@ import { Page } from '@/components/PagePath'
import { useDocuments } from '@/hooks/useDocuments'
import { useFavorites } from '@/hooks/useFavorites'
import { useStringQuery } from '@/hooks/useQueryArgs'
import { SessionUser, useSession, useSignout } from '@/hooks/useAuth'
import { CpuChipIcon } from '@heroicons/react/24/solid'
import { CpuChipIcon, SparklesIcon } from '@heroicons/react/24/solid'
import type { UserWorkspaceRole } from '@briefer/database'
import ReactDOM from 'react-dom'
import useDropdownPosition from '@/hooks/dropdownPosition'
import DocumentTree from './DocumentsTree'
import useSideBar from '@/hooks/useSideBar'
import { SubscriptionBadge } from './SubscriptionBadge'
import MobileWarning from './MobileWarning'
import { DataSourceBlinkingSignal } from './BlinkingSignal'
import CommandPalette from './commandPalette'
import { useHotkeys } from 'react-hotkeys-hook'
import Onboarding from './onboarding'
import GitHubButton from 'react-github-btn'
import { useDataSources } from '@/hooks/useDatasources'
import {
ConfigurationsMenuButton,
ConfigurationsMenuLink,
} from './ConfigurationsMenuItem'
import { FeaturesDialog } from './SubscriptionBadge'
import { SessionUser, useSignout } from '@/hooks/useAuth'

const syne = Syne({ subsets: ['latin'] })

Expand All @@ -54,6 +61,7 @@ type ConfigItem = {
hidden?: boolean
allowedRoles: Set<UserWorkspaceRole>
}

const configs = (workspaceId: string): ConfigItem[] => [
{
id: 'environments',
Expand Down Expand Up @@ -134,6 +142,11 @@ export default function Layout({
const workspaceId = useStringQuery('workspaceId')
const documentId = useStringQuery('documentId')

const [{ datasources: allDataSources, isLoading: isLoadingDataSources }] =
useDataSources(workspaceId)
const userDataSources = allDataSources.filter((ds) => !ds.config.data.isDemo)
const hasUserDataSource = !isLoadingDataSources && userDataSources.size > 0

const [
documentsState,
{
Expand Down Expand Up @@ -285,6 +298,8 @@ export default function Layout({
}
}, [workspaceId, scrollRef])

const [isUpgradeDialogOpen, setUpgradeDialogOpen] = useState(false)

return (
<div className={`flex w-full h-full ${syne.className}`}>
<MobileWarning />
Expand All @@ -295,14 +310,33 @@ export default function Layout({
setOpen={setSearchOpen}
/>

<FeaturesDialog
open={isUpgradeDialogOpen}
setOpen={setUpgradeDialogOpen}
currentPlan="open-source"
/>

{!hideOnboarding && <Onboarding />}

{isSideBarOpen && (
<div className="flex flex-col h-full bg-ceramic-50/60 min-w-[33%] max-w-[33%] lg:min-w-[25%] lg:max-w-[25%] overflow-auto border-r border-gray-200">
<div className="flex items-center justify-between pt-4 px-5">
<span className="font-trap tracking-tight font-semibold text-2xl antialiased text-gray-800">
briefer
</span>
<div className="flex items-center justify-between pt-0.5 pl-4 pr-5">
<div className="font-trap tracking-tight text-2xl antialiased text-gray-800 flex items-center gap-x-1 scale-90">
<SparklesIcon className="h-4 w-4" />
<span className="leading-4 mt-1">briefer</span>
</div>

<SubscriptionBadge planName="open-source" />
<div className="mt-2.5 scale-90 flex items-center">
<GitHubButton
href="https://github.com/briefercloud/briefer"
data-color-scheme="no-preference: light; light: light; dark: dark;"
data-size="large"
data-show-count="true"
aria-label="Star briefercloud/briefer on GitHub"
>
Star
</GitHubButton>
</div>
</div>

<div className="flex-1 overflow-y-auto" ref={scrollRef}>
Expand Down Expand Up @@ -386,31 +420,23 @@ export default function Layout({
Configurations
</div>
<ul role="list">
<li>
<ConfigurationsMenuButton
text="Upgrade Briefer"
icon={RocketLaunchIcon}
onClick={() => setUpgradeDialogOpen(true)}
/>
</li>
{configs(workspaceId)
.filter(showConfigItem)
.map((item) => (
<li key={item.name}>
<Link
<ConfigurationsMenuLink
href={item.href}
className={clsx(
router.pathname.startsWith(item.href)
? 'text-gray-800 bg-ceramic-100/50'
: 'text-gray-500 hover:bg-ceramic-100/80',
'group text-sm font-medium leading-6 w-full flex py-1 hover:text-ceramic-600'
)}
>
<div className="w-full flex items-center gap-x-2 px-4 relative">
{item.id === 'data-sources' && (
<DataSourceBlinkingSignal />
)}
<item.icon
strokeWidth={1}
className="h-4 w-4 shrink-0"
aria-hidden="true"
/>
<span className="mt-0.5">{item.name}</span>
</div>
</Link>
text={item.name}
icon={item.icon}
blink={item.id === 'data-sources' && !hasUserDataSource}
/>
</li>
))}

Expand Down
Loading
Loading