Skip to content
Draft
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
2 changes: 1 addition & 1 deletion apps/desktop/src/routes/app/main/_layout.index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ function Component() {

return (
<div
className="flex h-full gap-1 overflow-hidden p-1"
className="flex h-full gap-1 overflow-hidden bg-stone-50 p-1"
data-testid="main-app-shell"
>
{leftsidebar.expanded && !isOnboarding && <LeftSidebar />}
Expand Down
2 changes: 1 addition & 1 deletion apps/desktop/src/session/components/shared.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export function useCurrentNoteTab(
}

export function RecordingIcon() {
return <div className="size-2 rounded-full bg-red-500" />;
return <div className="size-3 rounded-full bg-red-500" />;
}

export function useListenButtonState(sessionId: string) {
Expand Down
14 changes: 12 additions & 2 deletions apps/desktop/src/shared/tabs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,18 @@ const accentColors: Record<
}
> = {
neutral: {
selected: ["bg-neutral-50", "text-black", "border-stone-400"],
unselected: ["bg-neutral-50", "text-neutral-500", "border-transparent"],
selected: [
"bg-neutral-50",
"text-black",
"border-stone-400",
"hover:bg-stone-100",
],
unselected: [
"bg-neutral-50",
"text-neutral-500",
"border-transparent",
"hover:bg-stone-100",
],
hover: {
selected: "text-neutral-700 hover:text-neutral-900",
unselected: "text-neutral-500 hover:text-neutral-700",
Expand Down
8 changes: 4 additions & 4 deletions apps/desktop/src/sidebar/profile/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ export function ProfileSection({ onExpandChange }: ProfileSectionProps = {}) {
transition={{ duration: 0.2, ease: "easeInOut" }}
className="absolute right-0 bottom-full left-0 mb-1"
>
<div className="overflow-hidden rounded-xl border bg-neutral-50 shadow-xs">
<div className="overflow-hidden rounded-xl border bg-white shadow-xs">
<div className="py-1">
<AnimatePresence mode="wait">
{currentView === "main" ? (
Expand Down Expand Up @@ -269,7 +269,7 @@ export function ProfileSection({ onExpandChange }: ProfileSectionProps = {}) {
)}
</AnimatePresence>

<div className="overflow-hidden rounded-xl bg-neutral-50">
<div className="overflow-hidden">
<ProfileButton
isExpanded={isExpanded}
onClick={() => setIsExpanded(!isExpanded)}
Expand Down Expand Up @@ -316,8 +316,8 @@ function ProfileButton({
"px-4 py-2",
"text-left",
"transition-all duration-300",
"hover:bg-neutral-100",
isExpanded && "border-t border-neutral-100 bg-neutral-50",
"rounded-lg hover:bg-neutral-200/50",
isExpanded && "border-neutral-300 bg-neutral-200/50",
])}
onClick={onClick}
>
Expand Down
12 changes: 2 additions & 10 deletions apps/desktop/src/sidebar/timeline/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -210,10 +210,7 @@ export function TimelineView() {
<div
ref={containerRef}
onContextMenu={showContextMenu}
className={cn([
"scrollbar-hide flex h-full flex-col overflow-y-auto",
"rounded-xl bg-neutral-50",
])}
className={cn(["scrollbar-hide flex h-full flex-col overflow-y-auto"])}
>
{buckets.map((bucket, index) => {
const isToday = bucket.label === "Today";
Expand All @@ -225,12 +222,7 @@ export function TimelineView() {
{shouldRenderIndicatorBefore && (
<CurrentTimeIndicator ref={setCurrentTimeIndicatorRef} />
)}
<div
className={cn([
"sticky top-0 z-10",
"bg-neutral-50 py-1 pr-1 pl-3",
])}
>
<div className={cn(["sticky top-0 z-10", "py-1 pr-1 pl-3"])}>
<div className="text-base font-bold text-neutral-900">
{bucket.label}
</div>
Expand Down
2 changes: 1 addition & 1 deletion apps/desktop/src/sidebar/timeline/item.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ function ItemBase({
"w-full cursor-pointer rounded-lg px-3 py-2 text-left",
multiSelected && "bg-neutral-200",
!multiSelected && selected && "bg-neutral-200",
!multiSelected && !selected && "hover:bg-neutral-100",
!multiSelected && !selected && "hover:bg-neutral-200/50",
ignored && "opacity-40",
])}
>
Expand Down
19 changes: 15 additions & 4 deletions apps/desktop/src/store/zustand/tabs/basic.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export type BasicState = {

export type BasicActions = {
openCurrent: (tab: TabInput) => void;
openNew: (tab: TabInput) => void;
openNew: (tab: TabInput, options?: { position?: "start" | "end" }) => void;
select: (tab: Tab) => void;
selectNext: () => void;
selectPrev: () => void;
Expand Down Expand Up @@ -72,9 +72,9 @@ export const createBasicSlice = <
view: tab.type,
});
},
openNew: (tab) => {
openNew: (tab, options) => {
const { tabs, history, addRecentlyOpened } = get();
set(openTab(tabs, tab, history, true));
set(openTab(tabs, tab, history, true, options?.position));

if (tab.type === "sessions") {
addRecentlyOpened(tab.id);
Expand Down Expand Up @@ -271,6 +271,7 @@ const openTab = <T extends BasicState & NavigationState>(
newTab: TabInput,
history: Map<string, TabHistory>,
forceNewTab: boolean,
position?: "start" | "end",
): Partial<T> => {
const tabWithDefaults: Tab = {
...getDefaultState(newTab),
Expand Down Expand Up @@ -317,7 +318,17 @@ const openTab = <T extends BasicState & NavigationState>(
} else {
activeTab = { ...tabWithDefaults, active: true, slotId: id() };
const deactivated = deactivateAll(tabs);
nextTabs = [...deactivated, activeTab];

if (position === "start") {
const pinnedCount = deactivated.filter((t) => t.pinned).length;
nextTabs = [
...deactivated.slice(0, pinnedCount),
activeTab,
...deactivated.slice(pinnedCount),
];
} else {
nextTabs = [...deactivated, activeTab];
}

return updateWithHistory(nextTabs, activeTab, history);
}
Expand Down
4 changes: 2 additions & 2 deletions plugins/tray/src/menu_items/tray_start.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ impl MenuItemHandler for TrayStart {
const ID: &'static str = "hypr_tray_start";

fn build(app: &AppHandle<tauri::Wry>) -> Result<MenuItemKind<tauri::Wry>> {
let item = MenuItem::with_id(app, Self::ID, "Start a new recording", true, None::<&str>)?;
let item = MenuItem::with_id(app, Self::ID, "Start a new meeting", true, None::<&str>)?;
Ok(MenuItemKind::MenuItem(item))
}

Expand Down Expand Up @@ -42,7 +42,7 @@ impl TrayStart {
MenuItem::with_id(
app,
Self::ID,
"Start a new recording",
"Start a new meeting",
!disabled,
None::<&str>,
)
Expand Down
Loading