Skip to content
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.

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

Nav Menu Upgrades and Minor UX Improvements #869

Merged
merged 120 commits into from
Jul 27, 2024
Merged
Show file tree
Hide file tree
Changes from 102 commits
Commits
Show all changes
120 commits
Select commit Hold shift + click to select a range
8ba79fc
V1 of the new automations page
sabaimran Jul 12, 2024
05bf911
Improve notice of which email address is being delivered to
sabaimran Jul 12, 2024
a8d4b8f
Fix validation bugs in the edit form
sabaimran Jul 13, 2024
ce99c48
Remove console logs for debugging
sabaimran Jul 13, 2024
9c553b9
Fix spacing in page css
sabaimran Jul 13, 2024
eaab311
Fix spaving in nav menu
sabaimran Jul 13, 2024
a830839
Remove syntax import for highlight.js in code
sabaimran Jul 13, 2024
0213848
Manually insert preferred styling for light/dark mode from highlight.…
sabaimran Jul 13, 2024
6ea3746
Fix copy button rendering issue (it disappears if you've hovered on t…
sabaimran Jul 13, 2024
f3c5deb
Fix some linting errors with unescaped characters on the automations …
sabaimran Jul 13, 2024
eaf924e
Add an alert pane showing the email, location for automations
sabaimran Jul 13, 2024
201a5d7
Merge branch 'features/chat-ui-updates-big' of github.com:khoj-ai/kho…
sabaimran Jul 13, 2024
05b616d
Add more icons and add a left bar for styling on each individual auto…
sabaimran Jul 13, 2024
ccbfc4a
Add support for setting color and icons on the agents in the backend
sabaimran Jul 13, 2024
07ead01
Migrate agents page to use the new shadcn component library and the c…
sabaimran Jul 13, 2024
4f7fe3e
Update styling of cards
sabaimran Jul 13, 2024
2e43c2e
Fix dark/light mode toggle rendering bug
sabaimran Jul 13, 2024
a22c1da
Remove dead styling
sabaimran Jul 13, 2024
d2afe26
Navigate nav urls within same page, add an info piece to the agents page
sabaimran Jul 14, 2024
4243419
Merge branch 'features/big-upgrade-chat-ux' of github.com:khoj-ai/kho…
sabaimran Jul 14, 2024
a69e3e3
Merge branch 'features/big-upgrade-chat-ux' of github.com:khoj-ai/kho…
sabaimran Jul 15, 2024
c976315
Revert packages removed in merging
sabaimran Jul 15, 2024
a771c6f
Merge branch 'features/big-upgrade-chat-ux' of github.com:khoj-ai/kho…
sabaimran Jul 15, 2024
9288fb1
Merge branch 'features/update-automations-page' of github.com:khoj-ai…
sabaimran Jul 15, 2024
ccc145c
simplify conditional with ternary operator
sabaimran Jul 15, 2024
7945471
Merge branch 'features/big-upgrade-chat-ux' of github.com:khoj-ai/kho…
sabaimran Jul 15, 2024
3de92b0
rough draft of khoj homepage finished!
MythicalCow Jul 15, 2024
a5f91a9
Merge remote-tracking branch 'upstream/features/big-upgrade-chat-ux' …
MythicalCow Jul 16, 2024
da11415
UI completed and ready for review. working on mechanics
MythicalCow Jul 16, 2024
ca2b430
bugs on some things
MythicalCow Jul 17, 2024
60fc4d5
UI cleanup and phosphor icons integration. backend in progress but hi…
MythicalCow Jul 18, 2024
c621548
agents fix causing chat flow issue
MythicalCow Jul 18, 2024
c207940
removing localConversationId trial
MythicalCow Jul 18, 2024
ac3cdb9
removing localConversationId trial
MythicalCow Jul 18, 2024
0529001
fixed new conversation gen from homepage
MythicalCow Jul 18, 2024
76eb8fc
homepage changes?
MythicalCow Jul 18, 2024
4c116d5
non crashing homepage. (currently non-functional)
MythicalCow Jul 18, 2024
94b0fe5
working new page screen
MythicalCow Jul 18, 2024
2dfa092
removed debug button
MythicalCow Jul 18, 2024
1f996af
added support for autofilling text based suggestions
MythicalCow Jul 18, 2024
b8b4c1e
added small local storage fix
MythicalCow Jul 18, 2024
7b0c7da
fixed double message glitch
MythicalCow Jul 18, 2024
203b4db
made connection status in side panel connected for homepage
MythicalCow Jul 18, 2024
56d306c
changed menu icon based on figma
MythicalCow Jul 18, 2024
80a36f3
added side panel new conversation button
MythicalCow Jul 18, 2024
5d4c132
added centering for main page items
MythicalCow Jul 18, 2024
00791a6
homepage mostly finished. agents still isn't getting sent over during…
MythicalCow Jul 19, 2024
eb716c3
homepage finished! code cleanup remains
MythicalCow Jul 19, 2024
3368742
code cleaned up :)
MythicalCow Jul 19, 2024
85e811b
placed home page on / instead of /home for debugging. /home functional
MythicalCow Jul 19, 2024
784edd8
removed old agentShortcut
MythicalCow Jul 19, 2024
5f68731
removed excessive logging
MythicalCow Jul 19, 2024
a08e58f
additional code cleaning
MythicalCow Jul 19, 2024
1668f8d
small fix for suggestions
MythicalCow Jul 19, 2024
4eae39f
Remove yarn.lock
sabaimran Jul 21, 2024
eccb849
resolve updates with latest yarn.lock
sabaimran Jul 21, 2024
20c7b9c
Small updates to overall styling and components usage for homepage
sabaimran Jul 21, 2024
68b3801
Resolve merge conflicts
sabaimran Jul 21, 2024
e56ee3b
Implement mobile-friendly view for homepage
sabaimran Jul 21, 2024
08dbc25
Fix issue of new conversations being created when selected agent is c…
sabaimran Jul 21, 2024
8442fe6
Improve center of the homepage experience
sabaimran Jul 21, 2024
6fcbbfb
Fix showing agent during first chat experience
sabaimran Jul 21, 2024
82750d3
update profile card in chat history to use tooltip
sabaimran Jul 21, 2024
bae2164
Fix errors for missing key prop react
sabaimran Jul 22, 2024
9f4374d
removed legacy svgs and moved /home page to /
MythicalCow Jul 22, 2024
2da12a8
Merge branch 'homescreen-ui' of https://github.com/MythicalCow/khoj i…
MythicalCow Jul 22, 2024
f276352
removing weird formatting errors
MythicalCow Jul 22, 2024
22e96fe
dark mode upgrades
MythicalCow Jul 22, 2024
b650d1f
agent highlighting simplification
MythicalCow Jul 22, 2024
7610906
dark mode gradient updates
MythicalCow Jul 23, 2024
546af11
fixed mobile width issues and used cards for agents
MythicalCow Jul 23, 2024
b810a21
fixed mobile width issues and used cards for agents!
MythicalCow Jul 23, 2024
67902a2
merge mobile changes
MythicalCow Jul 23, 2024
7636e70
mobile changes merge conflict resolution
MythicalCow Jul 23, 2024
1ebec5e
moved icon and tailwind color functionalities into util imports
MythicalCow Jul 23, 2024
264a016
moved util files to /common
MythicalCow Jul 23, 2024
8dc0ca8
agents ui mostly done. side panel to be added, dark mode to be checked
MythicalCow Jul 24, 2024
b97aa11
Merge remote-tracking branch 'khoj-ai/features/big-upgrade-chat-ux' i…
MythicalCow Jul 24, 2024
f398650
removed duplications
MythicalCow Jul 24, 2024
87e2bbd
agents page ready for PR
MythicalCow Jul 24, 2024
991746e
removed deprecated color styling
MythicalCow Jul 24, 2024
4e64ff2
navMenu completed
MythicalCow Jul 24, 2024
c7b75ac
added autoresizing chat input area
MythicalCow Jul 25, 2024
5ff0db0
updated chatMenu UI based on feedback
MythicalCow Jul 25, 2024
73c83fd
added dynamic homepage messages
MythicalCow Jul 25, 2024
c3c82bf
added user's photo as icon for menu/settings toggle
MythicalCow Jul 25, 2024
46a0e5c
icon size adjustment
MythicalCow Jul 25, 2024
f13279f
added navMenu mobile support and authentication check
MythicalCow Jul 25, 2024
19a388f
triggered auto window refresh after conversation is deleted to update…
MythicalCow Jul 25, 2024
7a933ff
Updated side panel icons to stay in row format during collapse
MythicalCow Jul 25, 2024
7b157a8
fixed edge case for delete conversation refreshing
MythicalCow Jul 25, 2024
2842642
fixe comparison logic for conversation deletion
MythicalCow Jul 25, 2024
5549bfe
added highlighting in side panel for currently selected conversation
MythicalCow Jul 25, 2024
564b9a3
create new agent changed to tooltip
MythicalCow Jul 25, 2024
330314f
create new agent changed to tooltip hover fix
MythicalCow Jul 25, 2024
59c9e38
cleaned up colorUtils
MythicalCow Jul 25, 2024
d27f711
prevented welcome message from rerendering on every button click
MythicalCow Jul 25, 2024
eb8f1a8
fixed small bug in weekday generation
MythicalCow Jul 25, 2024
b3ca365
Use standard colors for icon text color
sabaimran Jul 26, 2024
3aa4674
Add side panel to automations page
sabaimran Jul 26, 2024
cfd048e
Use /static/ path for loading the khoj svg
sabaimran Jul 26, 2024
01be729
Use Image tag rather than img for khoj svg
sabaimran Jul 26, 2024
8beb90f
colored icons for chat
MythicalCow Jul 26, 2024
46e78b3
Merge branch 'nav-upgrades' of https://github.com/MythicalCow/khoj in…
MythicalCow Jul 26, 2024
c0ea9d5
color coded side bands based on selected agent in conversation
MythicalCow Jul 26, 2024
743df3e
dark mode white border removal
MythicalCow Jul 26, 2024
a88666f
fixed issue with three dot menu in side panel
MythicalCow Jul 26, 2024
7bdbd55
Replace the khoj logo svg with a component that loads color dynamically
sabaimran Jul 27, 2024
cbf6e31
Update primary color to an orange base, rather than blue/purple
sabaimran Jul 27, 2024
4cf183a
Import new khoj logo in chat history side panel
sabaimran Jul 27, 2024
9081da4
Improve loading state and mobile rendering in the automations view
sabaimran Jul 27, 2024
0d20a42
Add the KhojLogo import in the nav menu and use a default user profil…
sabaimran Jul 27, 2024
b5fc1a1
Get rid of custom --box-shadow CSS variable
sabaimran Jul 27, 2024
abb2eb0
Pass the agent metadat through the chat body data in order to style t…
sabaimran Jul 27, 2024
b3e4823
Add login to the unauthenticated login view, redirecto to home if con…
sabaimran Jul 27, 2024
71f6fc9
Set a max height for the input text area
sabaimran Jul 27, 2024
9cefc34
Merge branch 'features/big-upgrade-chat-ux' of github.com:khoj-ai/kho…
sabaimran Jul 27, 2024
73ce239
Simplify tailwind class names
sabaimran Jul 27, 2024
cc5f1a1
Fresh yarn.lock file
sabaimran Jul 27, 2024
1c503f5
Remove the userprofilecomponent from the side panel
sabaimran Jul 27, 2024
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
16 changes: 13 additions & 3 deletions src/interface/web/app/agents/agents.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ div.titleBar {
.agentPersonality p {
white-space: inherit;
overflow: hidden;
height: 78px;
height: 77px;
line-height: 1.5;
}

Expand All @@ -16,6 +16,16 @@ div.agentPersonality {
overflow: hidden;
}

div.sidePanel {
position: fixed;
height: 100%;
}

div.pageLayout {
display: grid;
grid-template-columns: auto 1fr;
gap: 1rem;
}


button.infoButton {
Expand All @@ -30,7 +40,7 @@ button.infoButton {
div.agentList {
display: grid;
gap: 20px;
padding: 20px;
padding-top: 30px;
margin-right: auto;
grid-auto-flow: row;
grid-template-columns: 1fr 1fr;
Expand All @@ -40,7 +50,7 @@ div.agentList {

@media only screen and (max-width: 700px) {
div.agentList {
width: 90%;
width: 100%;
padding: 0;
margin-right: auto;
margin-left: auto;
Expand Down
10 changes: 0 additions & 10 deletions src/interface/web/app/agents/agentsLayout.module.css

This file was deleted.

30 changes: 20 additions & 10 deletions src/interface/web/app/agents/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@

import type { Metadata } from "next";
import NavMenu from '../components/navMenu/navMenu';
import styles from './agentsLayout.module.css';

import { Noto_Sans } from "next/font/google";
import "../globals.css";

const inter = Noto_Sans({ subsets: ["latin"] });

export const metadata: Metadata = {
title: "Khoj AI - Agents",
description: "Use Agents with Khoj AI for deeper, more personalized queries.",
title: "Khoj AI - Chat",
description: "Use this page to chat with Khoj AI.",
icons: {
sabaimran marked this conversation as resolved.
Show resolved Hide resolved
icon: '/static/favicon.ico',
},
Expand All @@ -19,9 +18,20 @@ export default function RootLayout({
children: React.ReactNode;
}>) {
return (
<div className={`${styles.agentsLayout}`}>
<NavMenu selected="Agents" showLogo={true} />
{children}
</div>
<html lang="en">
<meta httpEquiv="Content-Security-Policy"
content="default-src 'self' https://assets.khoj.dev;
media-src * blob:;
script-src 'self' https://assets.khoj.dev 'unsafe-inline' 'unsafe-eval';
connect-src 'self' https://ipapi.co/json ws://localhost:42110;
style-src 'self' https://assets.khoj.dev 'unsafe-inline' https://fonts.googleapis.com;
img-src 'self' data: https://*.khoj.dev https://*.googleusercontent.com https://*.google.com/ https://*.gstatic.com;
font-src 'self' https://assets.khoj.dev https://fonts.gstatic.com;
child-src 'none';
object-src 'none';"></meta>
<body className={inter.className}>
{children}
</body>
</html>
);
}
245 changes: 104 additions & 141 deletions src/interface/web/app/agents/page.tsx

Large diffs are not rendered by default.

15 changes: 15 additions & 0 deletions src/interface/web/app/automations/automations.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,23 @@ div.automationCard {
grid-template-rows: auto 1fr auto;
}

div.pageLayout {
max-width: 60vw;
margin: auto;
margin-bottom: 2rem;
}

div.sidePanel {
position: fixed;
height: 100%;
}

@media screen and (max-width: 768px) {
div.automationsLayout {
grid-template-columns: 1fr;
}

div.pageLayout {
max-width: 90vw;
}
}
11 changes: 0 additions & 11 deletions src/interface/web/app/automations/automationsLayout.module.css

This file was deleted.

5 changes: 1 addition & 4 deletions src/interface/web/app/automations/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import type { Metadata } from "next";
import NavMenu from '../components/navMenu/navMenu';
import styles from './automationsLayout.module.css';
import { Toaster } from "@/components/ui/toaster";

import "../globals.css";
Expand All @@ -20,8 +18,7 @@ export default function RootLayout({
children: React.ReactNode;
}>) {
return (
<div className={`${styles.automationsLayout}`}>
<NavMenu selected="Automations" showLogo={true} />
<div>
{children}
<Toaster />
</div>
Expand Down
Loading
Loading