diff --git a/web/public/Confluence.svg b/web/public/Confluence.svg new file mode 100644 index 0000000000..3a52be355e --- /dev/null +++ b/web/public/Confluence.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/web/public/Github.png b/web/public/Github.png new file mode 100644 index 0000000000..50b8175227 Binary files /dev/null and b/web/public/Github.png differ diff --git a/web/public/GoogleDrive.png b/web/public/GoogleDrive.png new file mode 100644 index 0000000000..f562c23905 Binary files /dev/null and b/web/public/GoogleDrive.png differ diff --git a/web/public/Jira.svg b/web/public/Jira.svg new file mode 100644 index 0000000000..09956020ae --- /dev/null +++ b/web/public/Jira.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/web/public/Notion.png b/web/public/Notion.png new file mode 100644 index 0000000000..391051679c Binary files /dev/null and b/web/public/Notion.png differ diff --git a/web/public/Productboard.webp b/web/public/Productboard.webp new file mode 100644 index 0000000000..2f19fdd766 Binary files /dev/null and b/web/public/Productboard.webp differ diff --git a/web/public/SlabLogo.png b/web/public/SlabLogo.png new file mode 100644 index 0000000000..265f4e20f1 Binary files /dev/null and b/web/public/SlabLogo.png differ diff --git a/web/public/SlabLogoBlue.png b/web/public/SlabLogoBlue.png deleted file mode 100644 index 7857c1bf34..0000000000 Binary files a/web/public/SlabLogoBlue.png and /dev/null differ diff --git a/web/public/Slack.png b/web/public/Slack.png new file mode 100644 index 0000000000..e425969bcb Binary files /dev/null and b/web/public/Slack.png differ diff --git a/web/src/app/admin/connectors/bookstack/page.tsx b/web/src/app/admin/connectors/bookstack/page.tsx index d0cb13acfe..70a7a7f427 100644 --- a/web/src/app/admin/connectors/bookstack/page.tsx +++ b/web/src/app/admin/connectors/bookstack/page.tsx @@ -237,7 +237,7 @@ export default function Page() {
- +

BookStack

diff --git a/web/src/app/admin/connectors/confluence/page.tsx b/web/src/app/admin/connectors/confluence/page.tsx index 789a5cef26..c34261f8e9 100644 --- a/web/src/app/admin/connectors/confluence/page.tsx +++ b/web/src/app/admin/connectors/confluence/page.tsx @@ -271,7 +271,7 @@ export default function Page() {
- +

Confluence

diff --git a/web/src/app/admin/connectors/file/page.tsx b/web/src/app/admin/connectors/file/page.tsx index 330bb9e867..f74eb29c2f 100644 --- a/web/src/app/admin/connectors/file/page.tsx +++ b/web/src/app/admin/connectors/file/page.tsx @@ -75,7 +75,7 @@ export default function File() {
- +

File

{popup && } diff --git a/web/src/app/admin/connectors/github/page.tsx b/web/src/app/admin/connectors/github/page.tsx index 817b16954f..68ea8bd943 100644 --- a/web/src/app/admin/connectors/github/page.tsx +++ b/web/src/app/admin/connectors/github/page.tsx @@ -220,7 +220,7 @@ export default function Page() {
- +

Github PRs

diff --git a/web/src/app/admin/connectors/google-drive/page.tsx b/web/src/app/admin/connectors/google-drive/page.tsx index 404ff5e2cd..1c2d00c5af 100644 --- a/web/src/app/admin/connectors/google-drive/page.tsx +++ b/web/src/app/admin/connectors/google-drive/page.tsx @@ -497,7 +497,7 @@ export default function Page() {
- +

Google Drive

diff --git a/web/src/app/admin/connectors/jira/page.tsx b/web/src/app/admin/connectors/jira/page.tsx index 40ea528919..250e94e173 100644 --- a/web/src/app/admin/connectors/jira/page.tsx +++ b/web/src/app/admin/connectors/jira/page.tsx @@ -264,7 +264,7 @@ export default function Page() {
- +

Jira

diff --git a/web/src/app/admin/connectors/notion/page.tsx b/web/src/app/admin/connectors/notion/page.tsx index 9dae184f35..57c68d4ff0 100644 --- a/web/src/app/admin/connectors/notion/page.tsx +++ b/web/src/app/admin/connectors/notion/page.tsx @@ -220,7 +220,7 @@ export default function Page() {
- +

Notion

diff --git a/web/src/app/admin/connectors/productboard/page.tsx b/web/src/app/admin/connectors/productboard/page.tsx index 2c0c05a47f..5f51aecd0c 100644 --- a/web/src/app/admin/connectors/productboard/page.tsx +++ b/web/src/app/admin/connectors/productboard/page.tsx @@ -230,7 +230,7 @@ export default function Page() {
- +

Productboard

diff --git a/web/src/app/admin/connectors/slab/page.tsx b/web/src/app/admin/connectors/slab/page.tsx index df374c1b35..a0cfed89ac 100644 --- a/web/src/app/admin/connectors/slab/page.tsx +++ b/web/src/app/admin/connectors/slab/page.tsx @@ -255,7 +255,7 @@ export default function Page() {
- +

Slab

diff --git a/web/src/app/admin/connectors/slack/page.tsx b/web/src/app/admin/connectors/slack/page.tsx index 99b71f543f..5a9cc2de1f 100644 --- a/web/src/app/admin/connectors/slack/page.tsx +++ b/web/src/app/admin/connectors/slack/page.tsx @@ -206,7 +206,7 @@ export default function Page() {
- +

Slack

diff --git a/web/src/app/admin/connectors/web/page.tsx b/web/src/app/admin/connectors/web/page.tsx index 16b5dc8ff3..beae38402d 100644 --- a/web/src/app/admin/connectors/web/page.tsx +++ b/web/src/app/admin/connectors/web/page.tsx @@ -37,7 +37,7 @@ export default function Web() {
- +

Web

diff --git a/web/src/app/admin/indexing/status/page.tsx b/web/src/app/admin/indexing/status/page.tsx index 64799dc581..33d92b681c 100644 --- a/web/src/app/admin/indexing/status/page.tsx +++ b/web/src/app/admin/indexing/status/page.tsx @@ -106,7 +106,7 @@ function Main() { if (connectorIndexingStatus.connector.disabled) { statusDisplay = (
- + Disabled
); @@ -135,7 +135,7 @@ function Main() { className="text-blue-500 flex" href={sourceMetadata.adminPageLink} > - {sourceMetadata.icon({ size: "20" })} + {sourceMetadata.icon({ size: 20 })}
{getSourceDisplay(connectorIndexingStatus)}
@@ -184,7 +184,7 @@ export default function Status() {
- +

Indexing Status

diff --git a/web/src/app/admin/keys/openai/page.tsx b/web/src/app/admin/keys/openai/page.tsx index 8cafb38171..f581ccaaeb 100644 --- a/web/src/app/admin/keys/openai/page.tsx +++ b/web/src/app/admin/keys/openai/page.tsx @@ -50,7 +50,7 @@ const Page = () => { return (
- +

OpenAI Keys

diff --git a/web/src/app/admin/layout.tsx b/web/src/app/admin/layout.tsx index 63e5d5cd83..b9e3b43a08 100644 --- a/web/src/app/admin/layout.tsx +++ b/web/src/app/admin/layout.tsx @@ -48,7 +48,7 @@ export default async function AdminLayout({ { name: (
- +
Status
), @@ -62,7 +62,7 @@ export default async function AdminLayout({ { name: (
- +
Slack
), @@ -71,7 +71,7 @@ export default async function AdminLayout({ { name: (
- +
Github
), @@ -80,7 +80,7 @@ export default async function AdminLayout({ { name: (
- +
Google Drive
), @@ -89,16 +89,7 @@ export default async function AdminLayout({ { name: (
- -
BookStack
-
- ), - link: "/admin/connectors/bookstack", - }, - { - name: ( -
- +
Confluence
), @@ -107,7 +98,7 @@ export default async function AdminLayout({ { name: (
- +
Jira
), @@ -116,7 +107,7 @@ export default async function AdminLayout({ { name: (
- +
Productboard
), @@ -125,7 +116,7 @@ export default async function AdminLayout({ { name: (
- +
Slab
), @@ -134,7 +125,25 @@ export default async function AdminLayout({ { name: (
- + +
Notion
+
+ ), + link: "/admin/connectors/notion", + }, + { + name: ( +
+ +
BookStack
+
+ ), + link: "/admin/connectors/bookstack", + }, + { + name: ( +
+
Web
), @@ -143,21 +152,12 @@ export default async function AdminLayout({ { name: (
- +
File
), link: "/admin/connectors/file", }, - { - name: ( -
- -
Notion
-
- ), - link: "/admin/connectors/notion", - }, ], }, { @@ -166,7 +166,7 @@ export default async function AdminLayout({ { name: (
- +
OpenAI
), diff --git a/web/src/app/user/connectors/GoogleDriveCard.tsx b/web/src/app/user/connectors/GoogleDriveCard.tsx index d2cc5f17a0..ee304779d2 100644 --- a/web/src/app/user/connectors/GoogleDriveCard.tsx +++ b/web/src/app/user/connectors/GoogleDriveCard.tsx @@ -31,7 +31,7 @@ export const GoogleDriveCard = ({ return (
- {" "} + {" "} Google Drive
diff --git a/web/src/app/user/connectors/page.tsx b/web/src/app/user/connectors/page.tsx index b91262df9a..86cf9ac7fa 100644 --- a/web/src/app/user/connectors/page.tsx +++ b/web/src/app/user/connectors/page.tsx @@ -126,7 +126,7 @@ export default function Page() {
- +

Personal Connectors

diff --git a/web/src/app/user/layout.tsx b/web/src/app/user/layout.tsx index 7991f26be8..759ffa6601 100644 --- a/web/src/app/user/layout.tsx +++ b/web/src/app/user/layout.tsx @@ -1,14 +1,4 @@ import { Header } from "@/components/Header"; -import { Sidebar } from "@/components/admin/connectors/Sidebar"; -import { - NotebookIcon, - GithubIcon, - GlobeIcon, - GoogleDriveIcon, - SlackIcon, - KeyIcon, - ConfluenceIcon, -} from "@/components/icons/icons"; import { DISABLE_AUTH } from "@/lib/constants"; import { getCurrentUserSS } from "@/lib/userSS"; import { redirect } from "next/navigation"; diff --git a/web/src/components/icons/icons.tsx b/web/src/components/icons/icons.tsx index b8cee724b3..da56d7431a 100644 --- a/web/src/components/icons/icons.tsx +++ b/web/src/components/icons/icons.tsx @@ -11,132 +11,102 @@ import { Plug, Brain, } from "@phosphor-icons/react"; -import { - SiBookstack, - SiConfluence, - SiGithub, - SiGoogledrive, - SiJira, - SiNotion, - SiSlack, -} from "react-icons/si"; +import { SiBookstack } from "react-icons/si"; import { FaFile, FaGlobe } from "react-icons/fa"; import Image from "next/image"; +import jiraSVG from "../../../public/Jira.svg"; +import confluenceSVG from "../../../public/Confluence.svg"; interface IconProps { - size?: string; + size?: number; className?: string; } -const defaultTailwindCSS = "text-blue-400 my-auto flex flex-shrink-0"; +const defaultTailwindCSS = "my-auto flex flex-shrink-0 text-blue-400"; export const PlugIcon = ({ - size = "16", + size = 16, className = defaultTailwindCSS, }: IconProps) => { return ; }; export const NotebookIcon = ({ - size = "16", + size = 16, className = defaultTailwindCSS, }: IconProps) => { return ; }; export const KeyIcon = ({ - size = "16", + size = 16, className = defaultTailwindCSS, }: IconProps) => { return ; }; export const TrashIcon = ({ - size = "16", + size = 16, className = defaultTailwindCSS, }: IconProps) => { return ; }; export const LinkBreakIcon = ({ - size = "16", + size = 16, className = defaultTailwindCSS, }: IconProps) => { return ; }; export const LinkIcon = ({ - size = "16", + size = 16, className = defaultTailwindCSS, }: IconProps) => { return ; }; export const XSquareIcon = ({ - size = "16", + size = 16, className = defaultTailwindCSS, }: IconProps) => { return ; }; export const GlobeIcon = ({ - size = "16", + size = 16, className = defaultTailwindCSS, }: IconProps) => { return ; }; export const FileIcon = ({ - size = "16", + size = 16, className = defaultTailwindCSS, }: IconProps) => { return ; }; +export const InfoIcon = ({ + size = 16, + className = defaultTailwindCSS, +}: IconProps) => { + return ; +}; + +export const BrainIcon = ({ + size = 16, + className = defaultTailwindCSS, +}: IconProps) => { + return ; +}; + +// +// COMPANY LOGOS +// + export const SlackIcon = ({ - size = "16", - className = defaultTailwindCSS, -}: IconProps) => { - return ; -}; - -export const GithubIcon = ({ - size = "16", - className = defaultTailwindCSS, -}: IconProps) => { - return ; -}; - -export const GoogleDriveIcon = ({ - size = "16", - className = defaultTailwindCSS, -}: IconProps) => { - return ; -}; - -export const BookstackIcon = ({ - size = "16", - className = defaultTailwindCSS, -}: IconProps) => { - return ; -}; - -export const ConfluenceIcon = ({ - size = "16", - className = defaultTailwindCSS, -}: IconProps) => { - return ; -}; - -export const JiraIcon = ({ - size = "16", - className = defaultTailwindCSS, -}: IconProps) => { - return ; -}; - -export const ProductboardIcon = ({ - size = "16", + size = 16, className = defaultTailwindCSS, }: IconProps) => { return ( @@ -144,47 +114,110 @@ export const ProductboardIcon = ({ style={{ width: `${size}px`, height: `${size}px` }} className={`w-[${size}px] h-[${size}px] ` + className} > - - - - - + Logo +
+ ); +}; + +export const GithubIcon = ({ + size = 16, + className = defaultTailwindCSS, +}: IconProps) => { + return ( +
+ Logo +
+ ); +}; + +export const GoogleDriveIcon = ({ + size = 16, + className = defaultTailwindCSS, +}: IconProps) => { + return ( +
+ Logo +
+ ); +}; + +export const BookstackIcon = ({ + size = 16, + className = defaultTailwindCSS, +}: IconProps) => { + return ; +}; + +export const ConfluenceIcon = ({ + size = 16, + className = defaultTailwindCSS, +}: IconProps) => { + return ( +
+ Logo +
+ ); +}; + +export const JiraIcon = ({ + size = 16, + className = defaultTailwindCSS, +}: IconProps) => { + // Jira Icon has a bit more surrounding whitespace than other icons, which is why we need to adjust it here + return ( +
+ Logo +
+ ); +}; +export const ProductboardIcon = ({ + size = 16, + className = defaultTailwindCSS, +}: IconProps) => { + return ( +
+ Logo
); }; export const SlabIcon = ({ - size = "16", + size = 16, className = defaultTailwindCSS, }: IconProps) => (
- Logo + Logo
); -export const InfoIcon = ({ - size = "16", - className = defaultTailwindCSS, -}: IconProps) => { - return ; -}; - -export const BrainIcon = ({ - size = "16", - className = defaultTailwindCSS, -}: IconProps) => { - return ; -}; - export const NotionIcon = ({ - size = "16", + size = 16, className = defaultTailwindCSS, }: IconProps) => { - return ; + return ( +
+ Logo +
+ ); }; diff --git a/web/src/components/search/Filters.tsx b/web/src/components/search/Filters.tsx index 57c7037821..49b30c3e60 100644 --- a/web/src/components/search/Filters.tsx +++ b/web/src/components/search/Filters.tsx @@ -60,7 +60,7 @@ export function SourceSelector({ } onClick={() => handleSelect(source)} > - {getSourceIcon(source.internalName, "16")} + {getSourceIcon(source.internalName, 16)} {source.displayName} diff --git a/web/src/components/search/SearchHelper.tsx b/web/src/components/search/SearchHelper.tsx index bbbc131058..f3464b9654 100644 --- a/web/src/components/search/SearchHelper.tsx +++ b/web/src/components/search/SearchHelper.tsx @@ -130,7 +130,7 @@ export const SearchHelper: React.FC = (props) => { return (
- + AI Assistant
diff --git a/web/src/components/search/SearchResultsDisplay.tsx b/web/src/components/search/SearchResultsDisplay.tsx index 278d8fb0dc..07e8ad0d4b 100644 --- a/web/src/components/search/SearchResultsDisplay.tsx +++ b/web/src/components/search/SearchResultsDisplay.tsx @@ -98,7 +98,7 @@ export const SearchResultsDisplay: React.FC = ({ target="_blank" rel="noopener noreferrer" > - {getSourceIcon(quoteInfo.source_type, "20")} + {getSourceIcon(quoteInfo.source_type, 20)}

{quoteInfo.semantic_identifier || quoteInfo.document_id} @@ -108,7 +108,7 @@ export const SearchResultsDisplay: React.FC = ({ ) : (

@@ -130,7 +130,7 @@ export const SearchResultsDisplay: React.FC = ({ shouldDisplayQA && (
@@ -158,7 +158,7 @@ export const SearchResultsDisplay: React.FC = ({ target="_blank" rel="noopener noreferrer" > - {getSourceIcon(doc.source_type, "20")} + {getSourceIcon(doc.source_type, 20)}

{doc.semantic_identifier || doc.document_id}

diff --git a/web/src/components/source.tsx b/web/src/components/source.tsx index 151ba9ec72..24854fd72e 100644 --- a/web/src/components/source.tsx +++ b/web/src/components/source.tsx @@ -14,7 +14,7 @@ import { } from "./icons/icons"; interface SourceMetadata { - icon: React.FC<{ size?: string; className?: string }>; + icon: React.FC<{ size?: number; className?: string }>; displayName: string; adminPageLink: string; } @@ -92,7 +92,7 @@ export const getSourceMetadata = (sourceType: ValidSources): SourceMetadata => { } }; -export const getSourceIcon = (sourceType: ValidSources, iconSize: string) => { +export const getSourceIcon = (sourceType: ValidSources, iconSize: number) => { return getSourceMetadata(sourceType).icon({ size: iconSize, });