Skip to content

refactor(ui): all unnecessary ui removed #48

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
developerEhsan merged 1 commit into from
Feb 20, 2025
Merged

refactor(ui): all unnecessary ui removed #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,9 @@
},
"[json]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
}
},
"cSpell.words": [
"treo",
"unnesaccary"
]
}
4 changes: 2 additions & 2 deletions electron-builder.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
appId: com.electron.app
productName: Notebook
productName: Treo
Copy link
Contributor

@coderabbitai coderabbitai bot Feb 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Verification agent

🧩 Analysis chain

Verify branding consistency across the application.

The product and executable names have been updated to "Treo". Ensure all references to "Notebook" have been updated across:

  1. Window titles
  2. Documentation
  3. User-facing messages
  4. Package metadata

Also applies to: 15-15

🏁 Script executed:

#!/bin/bash
# Search for any remaining references to "Notebook"
rg -i "notebook" --type-not yml

Length of output: 59

Verify branding consistency across the application.

The product and executable names have been updated to "Treo". To ensure branding consistency, please verify that there are no lingering references to "Notebook" in:

  • Window titles
  • Documentation
  • User-facing messages
  • Package metadata

Note: The previous command encountered an error due to an unrecognized file type argument. The updated command above should check all files for any reference to "Notebook".

🏁 Script executed:

#!/bin/bash
# Re-run the search for any remaining references to "Notebook" across the entire codebase.
# This command searches all files without filtering by file type.
rg -i "notebook"

Length of output: 209

Action Required: Update All Branding References to "Treo"

The product name in electron-builder.yml has been updated correctly to "Treo". However, our search uncovered a residual reference to "Notebook" in the UI code. Specifically, in src/renderer/src/components/app-sidebar.tsx, the import and usage of NotebookTabsIcon still refer to the old branding. Please update these references (and verify any similar ones across window titles, documentation, user-facing messages, and package metadata) to ensure complete branding consistency.

  • File: electron-builder.yml (line 2): productName: Treo
  • File: src/renderer/src/components/app-sidebar.tsx: Update or verify usage of NotebookTabsIcon

directories:
buildResources: build
files:
Expand All @@ -12,7 +12,7 @@ files:
asarUnpack:
- resources/**
win:
executableName: Notebook
executableName: Treo
nsis:
artifactName: ${name}-${version}-setup.${ext}
shortcutName: ${productName}
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "notebook",
"name": "treo",
"version": "1.1.4",
"description": "An Electron application with React and TypeScript",
"main": "./out/main/index.js",
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<meta charset="UTF-8" />
<title>Notebook</title>
<title>Treo</title>
<!-- https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP -->
<meta
http-equiv="Content-Security-Policy"
Expand Down
132 changes: 8 additions & 124 deletions src/renderer/src/components/app-sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,112 +1,36 @@
import {
AudioWaveform,
BookOpen,
Bot,
Command,
Frame,
GalleryVerticalEnd,
Map,
PieChart,
Settings2,
SquareTerminal
} from 'lucide-react'
import {
Sidebar,
SidebarContent,
SidebarFooter,
SidebarHeader,
SidebarRail,
useSidebar
} from './ui/sidebar'
import { NotebookTabsIcon, Settings2, TextSelectIcon } from 'lucide-react'
import { Sidebar, SidebarContent, SidebarHeader, SidebarRail, useSidebar } from './ui/sidebar'
import { TeamSwitcher } from './team-switcher'
import { NavMain } from './nav-main'
import { NavProjects } from './nav-projects'
import { NavUser } from './nav-secondary'

// This is sample data.
const data = {
user: {
name: 'shadcn',
name: 'username',
email: '[email protected]',
avatar: '/avatars/shadcn.jpg'
},
teams: [
{
name: 'Acme Inc',
logo: GalleryVerticalEnd,
plan: 'Enterprise'
},
{
name: 'Acme Corp.',
logo: AudioWaveform,
plan: 'Startup'
},
{
name: 'Evil Corp.',
logo: Command,
name: 'Default Team',
logo: TextSelectIcon,
plan: 'Free'
}
],
navMain: [
{
title: 'Playground',
title: 'Notes',
url: '#',
icon: SquareTerminal,
icon: NotebookTabsIcon,
isActive: true,
items: [
{
title: 'History',
title: 'View All',
url: '#'
},
{
title: 'Starred',
url: '#'
},
{
title: 'Settings',
url: '/settings/profile'
}
]
},
{
title: 'Models',
url: '#',
icon: Bot,
items: [
{
title: 'Genesis',
url: '#'
},
{
title: 'Explorer',
url: '#'
},
{
title: 'Quantum',
url: '#'
}
]
},
{
title: 'Documentation',
url: '#',
icon: BookOpen,
items: [
{
title: 'Introduction',
url: '#'
},
{
title: 'Get Started',
url: '#'
},
{
title: 'Tutorials',
url: '#'
},
{
title: 'Changelog',
url: '#'
}
]
},
Expand All @@ -115,45 +39,12 @@ const data = {
url: '#',
icon: Settings2,
items: [
{
title: 'Profile',
url: '/settings/profile'
},
{
title: 'Account',
url: '/settings/account'
},
{
title: 'Appearance',
url: '/settings/appearance'
},
{
title: 'Notifications',
url: '/settings/notifications'
},
{
title: 'Display',
url: '/settings/display'
}
]
}
],
projects: [
{
name: 'Design Engineering',
url: '#',
icon: Frame
},
{
name: 'Sales & Marketing',
url: '#',
icon: PieChart
},
{
name: 'Travel',
url: '#',
icon: Map
}
]
}

Expand All @@ -167,14 +58,7 @@ export function AppSidebar({ ...props }: React.ComponentProps<typeof Sidebar>):

<SidebarContent>
<NavMain items={data.navMain} />

<NavProjects projects={data.projects} />
</SidebarContent>

<SidebarFooter>
<NavUser user={data.user} />
</SidebarFooter>

<SidebarRail onMouseEnter={() => toggleSidebar()} />
</Sidebar>
)
Expand Down
126 changes: 2 additions & 124 deletions src/renderer/src/components/home/components/notes-nav-actions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,6 @@
import React from 'react'
import {
ArrowDown,
ArrowUp,
Bell,
Copy,
CornerUpLeft,
CornerUpRight,
FileText,
GalleryVerticalEnd,
LineChart,
Link,
MoreHorizontal,
Settings2,
Star,
Trash,
Trash2
} from 'lucide-react'
import { Star } from 'lucide-react'
import { Button } from '../../ui/button'
import {
SidebarContent,
SidebarGroup,
SidebarGroupContent,
SidebarMenu,
SidebarMenuItem,
SidebarMenuButton,
Sidebar
} from '../../ui/sidebar'
import { Popover, PopoverContent, PopoverTrigger } from '../../ui/popover'
import { formatDistanceToNow } from 'date-fns'
import { useQueryClient } from '@tanstack/react-query'
import { useLocation } from '@tanstack/react-router'
Expand All @@ -36,69 +10,6 @@ import { mutationKeys } from '@renderer/constants/mutation-keys'
import { Tooltip, TooltipContent, TooltipTrigger } from '@renderer/components/ui/tooltip'
import { cn } from '@renderer/utils'

const data = [
[
{
label: 'Customize Page',
icon: Settings2
},
{
label: 'Turn into wiki',
icon: FileText
}
],
[
{
label: 'Copy Link',
icon: Link
},
{
label: 'Duplicate',
icon: Copy
},
{
label: 'Move to',
icon: CornerUpRight
},
{
label: 'Move to Trash',
icon: Trash2
}
],
[
{
label: 'Undo',
icon: CornerUpLeft
},
{
label: 'View analytics',
icon: LineChart
},
{
label: 'Version History',
icon: GalleryVerticalEnd
},
{
label: 'Show delete pages',
icon: Trash
},
{
label: 'Notifications',
icon: Bell
}
],
[
{
label: 'Import',
icon: ArrowUp
},
{
label: 'Export',
icon: ArrowDown
}
]
]

export function NotesNavActions(): React.JSX.Element {
const queryClient = useQueryClient()
const { pathname } = useLocation()
Expand All @@ -118,53 +29,20 @@ export function NotesNavActions(): React.JSX.Element {
includeSeconds: true
})}`}
</div>

<Button variant="ghost" size="icon" className="h-7 w-7">
<Star size={16} />
</Button>

<Tooltip>
<TooltipTrigger>
<div
className={cn(
'h-2 w-2 rounded-full',
'h-3 w-3 rounded-full',
isMutatingNote > 0 ? 'bg-blue-500' : 'bg-green-500'
)}
/>
</TooltipTrigger>

<TooltipContent>Saved</TooltipContent>
</Tooltip>

<Popover>
<PopoverTrigger asChild>
<Button variant="ghost" size="icon" className="h-7 w-7 data-[state=open]:bg-accent">
<MoreHorizontal size={16} />
</Button>
</PopoverTrigger>

<PopoverContent className="w-56 overflow-hidden rounded-lg p-0" align="end">
<Sidebar collapsible="none" className="bg-transparent">
<SidebarContent>
{data.map((group, index) => (
<SidebarGroup key={index} className="border-b last:border-none">
<SidebarGroupContent className="gap-0">
<SidebarMenu>
{group.map((item, index) => (
<SidebarMenuItem key={index}>
<SidebarMenuButton>
<item.icon /> <span>{item.label}</span>
</SidebarMenuButton>
</SidebarMenuItem>
))}
</SidebarMenu>
</SidebarGroupContent>
</SidebarGroup>
))}
</SidebarContent>
</Sidebar>
</PopoverContent>
</Popover>
</div>
)
}
Loading
Loading