Skip to content
Open
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
32 changes: 16 additions & 16 deletions js/app/packages/app/component/Launcher.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ import { createControlledOpenSignal } from '@core/util/createControlledOpenSigna
import { isErr, ok } from '@core/util/maybeResult';
import { Dialog } from '@kobalte/core/dialog';
import PixelArrowRight from '@macro-icons/pixel/arrow-right.svg';
import WideChat from '@macro-icons/wide/chat.svg';
import WideDiagram from '@macro-icons/wide/diagram.svg';
import WideEmail from '@macro-icons/wide/email.svg';
import WideFileCode from '@macro-icons/wide/file-code.svg';
import WideFileMd from '@macro-icons/wide/file-md.svg';
import WideFolder from '@macro-icons/wide/folder.svg';
import WideStar from '@macro-icons/wide/star.svg';
import WideTask from '@macro-icons/wide/task.svg';
import WideChatBold from '@macro-icons/wide/chat-bold.svg';
import WideDiagramBold from '@macro-icons/wide/diagram-bold.svg';
import WideEmailBold from '@macro-icons/wide/email-bold.svg';
import WideFileCodeBold from '@macro-icons/wide/file-code-bold.svg';
import WideFileMdBold from '@macro-icons/wide/file-md-bold.svg';
import WideFolderBold from '@macro-icons/wide/folder-bold.svg';
import WideStarBold from '@macro-icons/wide/star-bold.svg';
import WideTaskBold from '@macro-icons/wide/task-bold.svg';
import { useCreateProject } from '@service-storage/projects';
import { createEffect, createSignal, For, onMount, Show } from 'solid-js';
import { type FocusableElement, tabbable } from 'tabbable';
Expand Down Expand Up @@ -106,7 +106,7 @@ type CreatableBlock = Omit<HotkeyRegistrationOptions, 'scopeId'> & {
export const CREATABLE_BLOCKS: CreatableBlock[] = [
{
label: 'Docs',
icon: () => <WideFileMd />,
icon: () => <WideFileMdBold />,
description: 'Create doc',
blockName: 'md',
hotkeyToken: TOKENS.create.note,
Expand All @@ -131,7 +131,7 @@ export const CREATABLE_BLOCKS: CreatableBlock[] = [
? [
{
label: 'Task',
icon: () => <WideTask />,
icon: () => <WideTaskBold />,
description: 'Create task',
blockName: 'task' as BlockName,
hotkeyToken: TOKENS.create.task,
Expand All @@ -149,7 +149,7 @@ export const CREATABLE_BLOCKS: CreatableBlock[] = [
: []),
{
label: 'Email',
icon: () => <WideEmail />,
icon: () => <WideEmailBold />,
description: 'Create email',
blockName: 'email',
hotkeyToken: TOKENS.create.email,
Expand All @@ -165,7 +165,7 @@ export const CREATABLE_BLOCKS: CreatableBlock[] = [
},
{
label: 'Message',
icon: () => <WideChat />,
icon: () => <WideChatBold />,
description: 'Create message',
blockName: 'channel',
hotkeyToken: TOKENS.create.message,
Expand All @@ -181,7 +181,7 @@ export const CREATABLE_BLOCKS: CreatableBlock[] = [
},
{
label: 'AI',
icon: () => <WideStar />,
icon: () => <WideStarBold />,
description: 'Create AI chat',
blockName: 'chat' as BlockName,
hotkeyToken: TOKENS.create.chat,
Expand All @@ -204,7 +204,7 @@ export const CREATABLE_BLOCKS: CreatableBlock[] = [
},
{
label: 'Canvas',
icon: () => <WideDiagram />,
icon: () => <WideDiagramBold />,
description: 'Create canvas',
blockName: 'canvas',
hotkeyToken: TOKENS.create.canvas,
Expand All @@ -230,7 +230,7 @@ export const CREATABLE_BLOCKS: CreatableBlock[] = [
},
{
label: 'Folder',
icon: () => <WideFolder />,
icon: () => <WideFolderBold />,
description: 'Create folder',
blockName: 'project',
hotkeyToken: TOKENS.create.project,
Expand All @@ -250,7 +250,7 @@ export const CREATABLE_BLOCKS: CreatableBlock[] = [
},
{
label: 'Code',
icon: () => <WideFileCode />,
icon: () => <WideFileCodeBold />,
description: 'Create code file',
blockName: 'code',
hotkeyToken: TOKENS.create.code,
Expand Down
2 changes: 1 addition & 1 deletion js/app/packages/app/component/Soup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ function EntityTypeIconFilter() {
<div class="flex items-center shrink-0">
<For each={ENTITY_TYPE_FILTERS.filter((f) => f.enabled)}>
{(filter) => {
const iconConfig = () => getIconConfig(filter.iconType);
const iconConfig = () => getIconConfig(filter.iconType, filter.iconWeight);
return (
<FilterButton
icon={iconConfig().icon}
Expand Down
10 changes: 10 additions & 0 deletions js/app/packages/app/component/Soup/utils/filterConfigs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export type EntityTypeFilterConfig =
type: ExpandedEntityType;
label: string;
iconType: string;
iconWeight: 'regular' | 'bold';
enabled: boolean;
shortcut: string;
}
Expand All @@ -20,6 +21,7 @@ export type EntityTypeFilterConfig =
channelCategory: 'people' | 'groups';
label: string;
iconType: string;
iconWeight: 'regular' | 'bold';
enabled: boolean;
shortcut: string;
}
Expand All @@ -29,6 +31,7 @@ export type EntityTypeFilterConfig =
documentTypes: DocumentTypeFilter[];
label: string;
iconType: string;
iconWeight: 'regular' | 'bold';
enabled: boolean;
shortcut: string;
};
Expand All @@ -44,6 +47,7 @@ export const ENTITY_TYPE_FILTERS: EntityTypeFilterConfig[] = [
documentTypes: ['md', 'canvas'],
label: 'Docs',
iconType: 'md',
iconWeight: 'regular',
enabled: true,
shortcut: 'd',
},
Expand All @@ -52,6 +56,7 @@ export const ENTITY_TYPE_FILTERS: EntityTypeFilterConfig[] = [
type: 'chat',
label: 'Agents',
iconType: 'chat',
iconWeight: 'regular',
enabled: true,
shortcut: 'a',
},
Expand All @@ -60,6 +65,7 @@ export const ENTITY_TYPE_FILTERS: EntityTypeFilterConfig[] = [
channelCategory: 'people',
label: 'People',
iconType: 'channel',
iconWeight: 'regular',
enabled: true,
shortcut: 'p',
},
Expand All @@ -68,6 +74,7 @@ export const ENTITY_TYPE_FILTERS: EntityTypeFilterConfig[] = [
channelCategory: 'groups',
label: 'Teams',
iconType: 'directMessage',
iconWeight: 'regular',
enabled: true,
shortcut: 'm',
},
Expand All @@ -76,6 +83,7 @@ export const ENTITY_TYPE_FILTERS: EntityTypeFilterConfig[] = [
type: 'task',
label: 'Tasks',
iconType: 'task',
iconWeight: 'regular',
enabled: ENABLE_TASKS_TABS,
shortcut: 't',
},
Expand All @@ -84,6 +92,7 @@ export const ENTITY_TYPE_FILTERS: EntityTypeFilterConfig[] = [
type: 'email',
label: 'Mail',
iconType: 'email',
iconWeight: 'regular',
enabled: true,
shortcut: 'l',
},
Expand All @@ -93,6 +102,7 @@ export const ENTITY_TYPE_FILTERS: EntityTypeFilterConfig[] = [
documentTypes: ['code', 'image', 'pdf', 'unknown'],
label: 'Files',
iconType: 'project',
iconWeight: 'regular',
enabled: true,
shortcut: 'f',
},
Expand Down
20 changes: 10 additions & 10 deletions js/app/packages/app/component/mobile/MobileDock.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import WideChannel from '@macro-icons/wide/channel.svg';
import WideEmail from '@macro-icons/wide/email.svg';
import WideCode from '@macro-icons/wide/file-code.svg';
import WidePlus from '@macro-icons/wide/plus.svg';
import WideTask from '@macro-icons/wide/task.svg';
import WideChannelBold from '@macro-icons/wide/channel-bold.svg';
import WideEmailBold from '@macro-icons/wide/email-bold.svg';
import WideCodeBold from '@macro-icons/wide/file-code-bold.svg';
import WidePlusBold from '@macro-icons/wide/plus-bold.svg';
import WideTaskBold from '@macro-icons/wide/task-bold.svg';
import type { Component, JSX } from 'solid-js';
import { setCreateMenuOpen } from '../Launcher';
import { useSplitPanelOrThrow } from '../split-layout/layoutUtils';
Expand Down Expand Up @@ -59,7 +59,7 @@ export function MobileDock() {
return (
<div class="flex flex-row justify-between bg-linear-to-t from-page to-panel border-t border-edge-muted">
<MobileDockButton
icon={WideCode}
icon={WideCodeBold}
label="Search"
active={selectedView() === VIEWCONFIG_DEFAULTS_IDS_ENUM.all}
onClick={() => {
Expand All @@ -69,7 +69,7 @@ export function MobileDock() {
}}
/>
<MobileDockButton
icon={WideEmail}
icon={WideEmailBold}
label="Inbox"
active={selectedView() === VIEWCONFIG_DEFAULTS_IDS_ENUM.signal}
onClick={() => {
Expand All @@ -78,7 +78,7 @@ export function MobileDock() {
}}
/>
<MobileDockButton
icon={WideChannel}
icon={WideChannelBold}
label="People"
active={selectedView() === VIEWCONFIG_DEFAULTS_IDS_ENUM.people}
onClick={() => {
Expand All @@ -87,7 +87,7 @@ export function MobileDock() {
}}
/>
<MobileDockButton
icon={WideTask}
icon={WideTaskBold}
label="Tasks"
active={selectedView() === VIEWCONFIG_DEFAULTS_IDS_ENUM.tasks}
onClick={() => {
Expand All @@ -96,7 +96,7 @@ export function MobileDock() {
}}
/>
<MobileDockButton
icon={WidePlus}
icon={WidePlusBold}
label="Create"
onClick={() => {
setCreateMenuOpen(true);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import { useRenameSplit } from './SplitModalContext';
export function StaticSplitLabel(props: {
label: string;
iconType?: EntityIconSelector;
iconWeight?: 'regular' | 'bold';
icon?: JSX.Element;
badges?: JSX.Element;
}) {
Expand All @@ -39,6 +40,7 @@ export function StaticSplitLabel(props: {
<EntityIcon
class="shrink-0"
targetType={props.iconType}
weight={props.iconWeight}
size="xs"
theme="monochrome"
/>
Expand Down
Loading