Style changes to the main app page

This commit is contained in:
Weves
2023-04-29 23:31:03 -07:00
committed by Chris Weaver
parent e390906ac1
commit 4e96283a0b
11 changed files with 42 additions and 42 deletions

View File

@@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 394 80"><path fill="#000" d="M262 0h68.5v12.7h-27.2v66.6h-13.6V12.7H262V0ZM149 0v12.7H94v20.4h44.3v12.6H94v21h55v12.6H80.5V0h68.7zm34.3 0h-17.8l63.8 79.4h17.9l-32-39.7 32-39.6h-17.9l-23 28.6-23-28.6zm18.3 56.7-9-11-27.1 33.7h17.8l18.3-22.7z"/><path fill="#000" d="M81 79.3 17 0H0v79.3h13.6V17l50.2 62.3H81Zm252.6-.4c-1 0-1.8-.4-2.5-1s-1.1-1.6-1.1-2.6.3-1.8 1-2.5 1.6-1 2.6-1 1.8.3 2.5 1a3.4 3.4 0 0 1 .6 4.3 3.7 3.7 0 0 1-3 1.8zm23.2-33.5h6v23.3c0 2.1-.4 4-1.3 5.5a9.1 9.1 0 0 1-3.8 3.5c-1.6.8-3.5 1.3-5.7 1.3-2 0-3.7-.4-5.3-1s-2.8-1.8-3.7-3.2c-.9-1.3-1.4-3-1.4-5h6c.1.8.3 1.6.7 2.2s1 1.2 1.6 1.5c.7.4 1.5.5 2.4.5 1 0 1.8-.2 2.4-.6a4 4 0 0 0 1.6-1.8c.3-.8.5-1.8.5-3V45.5zm30.9 9.1a4.4 4.4 0 0 0-2-3.3 7.5 7.5 0 0 0-4.3-1.1c-1.3 0-2.4.2-3.3.5-.9.4-1.6 1-2 1.6a3.5 3.5 0 0 0-.3 4c.3.5.7.9 1.3 1.2l1.8 1 2 .5 3.2.8c1.3.3 2.5.7 3.7 1.2a13 13 0 0 1 3.2 1.8 8.1 8.1 0 0 1 3 6.5c0 2-.5 3.7-1.5 5.1a10 10 0 0 1-4.4 3.5c-1.8.8-4.1 1.2-6.8 1.2-2.6 0-4.9-.4-6.8-1.2-2-.8-3.4-2-4.5-3.5a10 10 0 0 1-1.7-5.6h6a5 5 0 0 0 3.5 4.6c1 .4 2.2.6 3.4.6 1.3 0 2.5-.2 3.5-.6 1-.4 1.8-1 2.4-1.7a4 4 0 0 0 .8-2.4c0-.9-.2-1.6-.7-2.2a11 11 0 0 0-2.1-1.4l-3.2-1-3.8-1c-2.8-.7-5-1.7-6.6-3.2a7.2 7.2 0 0 1-2.4-5.7 8 8 0 0 1 1.7-5 10 10 0 0 1 4.3-3.5c2-.8 4-1.2 6.4-1.2 2.3 0 4.4.4 6.2 1.2 1.8.8 3.2 2 4.3 3.4 1 1.4 1.5 3 1.5 5h-5.8z"/></svg>

Before

Width:  |  Height:  |  Size: 1.3 KiB

View File

@@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="40" height="31" fill="none"><g opacity=".9"><path fill="url(#a)" d="M13 .4v29.3H7V6.3h-.2L0 10.5V5L7.2.4H13Z"/><path fill="url(#b)" d="M28.8 30.1c-2.2 0-4-.3-5.7-1-1.7-.8-3-1.8-4-3.1a7.7 7.7 0 0 1-1.4-4.6h6.2c0 .8.3 1.4.7 2 .4.5 1 .9 1.7 1.2.7.3 1.6.4 2.5.4 1 0 1.7-.2 2.5-.5.7-.3 1.3-.8 1.7-1.4.4-.6.6-1.2.6-2s-.2-1.5-.7-2.1c-.4-.6-1-1-1.8-1.4-.8-.4-1.8-.5-2.9-.5h-2.7v-4.6h2.7a6 6 0 0 0 2.5-.5 4 4 0 0 0 1.7-1.3c.4-.6.6-1.3.6-2a3.5 3.5 0 0 0-2-3.3 5.6 5.6 0 0 0-4.5 0 4 4 0 0 0-1.7 1.2c-.4.6-.6 1.2-.6 2h-6c0-1.7.6-3.2 1.5-4.5 1-1.3 2.2-2.3 3.8-3C25 .4 26.8 0 28.8 0s3.8.4 5.3 1.1c1.5.7 2.7 1.7 3.6 3a7.2 7.2 0 0 1 1.2 4.2c0 1.6-.5 3-1.5 4a7 7 0 0 1-4 2.2v.2c2.2.3 3.8 1 5 2.2a6.4 6.4 0 0 1 1.6 4.6c0 1.7-.5 3.1-1.4 4.4a9.7 9.7 0 0 1-4 3.1c-1.7.8-3.7 1.1-5.8 1.1Z"/></g><defs><linearGradient id="a" x1="20" x2="20" y1="0" y2="30.1" gradientUnits="userSpaceOnUse"><stop/><stop offset="1" stop-color="#3D3D3D"/></linearGradient><linearGradient id="b" x1="20" x2="20" y1="0" y2="30.1" gradientUnits="userSpaceOnUse"><stop/><stop offset="1" stop-color="#3D3D3D"/></linearGradient></defs></svg>

Before

Width:  |  Height:  |  Size: 1.1 KiB

View File

@@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 283 64"><path fill="black" d="M141 16c-11 0-19 7-19 18s9 18 20 18c7 0 13-3 16-7l-7-5c-2 3-6 4-9 4-5 0-9-3-10-7h28v-3c0-11-8-18-19-18zm-9 15c1-4 4-7 9-7s8 3 9 7h-18zm117-15c-11 0-19 7-19 18s9 18 20 18c6 0 12-3 16-7l-8-5c-2 3-5 4-8 4-5 0-9-3-11-7h28l1-3c0-11-8-18-19-18zm-10 15c2-4 5-7 10-7s8 3 9 7h-19zm-39 3c0 6 4 10 10 10 4 0 7-2 9-5l8 5c-3 5-9 8-17 8-11 0-19-7-19-18s8-18 19-18c8 0 14 3 17 8l-8 5c-2-3-5-5-9-5-6 0-10 4-10 10zm83-29v46h-9V5h9zM37 0l37 64H0L37 0zm92 5-27 48L74 5h10l18 30 17-30h10zm59 12v10l-3-1c-6 0-10 4-10 10v15h-9V17h9v9c0-5 6-9 13-9z"/></svg>

Before

Width:  |  Height:  |  Size: 629 B

View File

@@ -15,7 +15,7 @@ export default function Home() {
<h1 className="text-4xl font-bold mb-4">Slack</h1>
</div>
<h2 className="text-3xl font-bold mb-4 ml-auto mr-auto">Config</h2>
<SlackForm onSubmit={(success) => console.log(success)}/>
<SlackForm onSubmit={(success) => console.log(success)} />
</div>
</>
);

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

View File

@@ -1,8 +1,8 @@
import "./globals.css";
export const metadata = {
title: "Create Next App",
description: "Generated by create next app",
title: "Danswer",
description: "Question answering for your documents",
};
export default function RootLayout({

View File

@@ -9,7 +9,9 @@ export default function Home() {
<>
<Header />
<div className="p-24 flex flex-col items-center min-h-screen bg-gray-900 text-gray-100">
<SearchSection />
<div className="max-w-[800px] w-full">
<SearchSection />
</div>
</div>
</>
);

View File

@@ -7,7 +7,7 @@ import { SearchResultsDisplay } from "./SearchResultsDisplay";
import { SearchResponse } from "./types";
const BACKEND_URL =
process.env.NEXT_PUBLIC_BACKEND_URL || "http://localhost:8000"; // "http://servi-lb8a1-jhqpsz92kbm2-1605938866.us-east-2.elb.amazonaws.com/direct-qa";
process.env.NEXT_PUBLIC_BACKEND_URL || "http://localhost:8080"; // "http://servi-lb8a1-jhqpsz92kbm2-1605938866.us-east-2.elb.amazonaws.com/direct-qa";
const searchRequest = async (query: string): Promise<SearchResponse> => {
const response = await fetch(BACKEND_URL + "/direct-qa", {
@@ -36,7 +36,9 @@ export const SearchSection: React.FC<{}> = () => {
});
}}
/>
<SearchResultsDisplay data={answer} isFetching={isFetching} />
<div className="mt-2">
<SearchResultsDisplay data={answer} isFetching={isFetching} />
</div>
</>
);
};
@@ -74,8 +76,8 @@ const SearchBar: React.FC<SearchBarProps> = ({ onSearch }) => {
};
return (
<div className="flex justify-center p-4">
<div className="flex items-center w-[800px] border-2 border-gray-300 rounded px-4 py-2 focus-within:border-blue-500">
<div className="flex justify-center py-4">
<div className="flex items-center w-full border-2 border-gray-600 rounded px-4 py-2 focus-within:border-blue-500">
<MagnifyingGlass className="text-gray-400" />
<textarea
className="flex-grow ml-2 h-6 bg-transparent outline-none placeholder-gray-400 overflow-hidden whitespace-normal resize-none"

View File

@@ -9,14 +9,17 @@ interface SearchResultsDisplayProps {
isFetching: boolean;
}
const ICON_SIZE = "16";
const ICON_STYLE = "text-blue-600 my-auto mr-1";
const getSourceIcon = (sourceType: string) => {
switch (sourceType) {
case "Web":
return <Globe className="text-blue-600" />;
return <Globe size={ICON_SIZE} className={ICON_STYLE} />;
case "Slack":
return <SlackLogo className="text-blue-600" />;
return <SlackLogo size={ICON_SIZE} className={ICON_STYLE} />;
case "Google Drive":
return <GoogleDriveLogo className="text-blue-600" />;
return <GoogleDriveLogo size={ICON_SIZE} className={ICON_STYLE} />;
default:
return null;
}
@@ -41,33 +44,25 @@ export const SearchResultsDisplay: React.FC<SearchResultsDisplayProps> = ({
}
return (
<div className="p-4">
<h2 className="text-2xl font-bold mb-4">Answer</h2>
<p className="mb-6">{answer}</p>
<div className="p-4 border rounded-md border-gray-700">
<h2 className="text-sm font-bold mb-2">Answer</h2>
<p className="mb-4 text-sm">{answer}</p>
<h2 className="text-2xl font-bold mb-4">Quotes</h2>
<ul>
{Object.entries(quotes).map(([quoteText, quoteInfo]) => (
<li key={quoteInfo.document_id} className="mb-4">
<blockquote className="italic text-lg mb-2">{quoteText}</blockquote>
<p>
<strong>Source:</strong> {getSourceIcon(quoteInfo.source_type)}{" "}
{quoteInfo.source_type}
</p>
<p>
<strong>Link:</strong>{" "}
<a
href={quoteInfo.link}
target="_blank"
rel="noopener noreferrer"
className="text-blue-600"
>
{quoteInfo.link}
</a>
</p>
</li>
<h2 className="text-xs font-bold mb-2">Sources</h2>
<div className="flex">
{Object.entries(quotes).map(([_, quoteInfo]) => (
<a
key={quoteInfo.document_id}
className="p-2 border border-gray-800 rounded-lg text-xs flex max-w-[200px] hover:bg-gray-800"
href={quoteInfo.link}
target="_blank"
rel="noopener noreferrer"
>
{getSourceIcon(quoteInfo.source_type)}
<p className="truncate break-all">{quoteInfo.document_id}</p>
</a>
))}
</ul>
</div>
</div>
);
};

View File

@@ -24,8 +24,10 @@ export const ThinkingAnimation: React.FC = () => {
}, []);
return (
<div className="thinking-animation">
Thinking<span className="dots">{dots}</span>
<div className="thinking-animation flex">
<div className="mx-auto">
Thinking<span className="dots">{dots}</span>
</div>
</div>
);
};

View File

@@ -12,7 +12,9 @@ interface FormData {
const validationSchema = Yup.object().shape({
slack_bot_token: Yup.string().required("Please enter your Slack Bot Token"),
workspace_id: Yup.string().required("Please enter your Workspace ID"),
pull_frequency: Yup.number().required("Please enter a pull frequency (in minutes). 0 => no pulling from slack"),
pull_frequency: Yup.number().required(
"Please enter a pull frequency (in minutes). 0 => no pulling from slack"
),
});
const getConfig = async (): Promise<FormData> => {