Address misc PR comments and update logo in all clients

- Rename the new logo to reflect accuracy on size (e.g., 128x128)
- Update the icns file for Mac
- Update nomenclature in settings pages
This commit is contained in:
sabaimran
2023-06-18 08:34:58 -07:00
parent aad7f825e0
commit 81183a1fe1
17 changed files with 19 additions and 36 deletions

View File

@@ -50,7 +50,7 @@ pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher)
if system() != 'Darwin': if system() != 'Darwin':
# Add Splash screen to show on app launch # Add Splash screen to show on app launch
splash = Splash( splash = Splash(
'src/khoj/interface/web/assets/icons/favicon-144x144.png', 'src/khoj/interface/web/assets/icons/favicon-128x128.png',
binaries=a.binaries, binaries=a.binaries,
datas=a.datas, datas=a.datas,
text_pos=(10, 160), text_pos=(10, 160),
@@ -82,7 +82,7 @@ if system() != 'Darwin':
target_arch='x86_64', target_arch='x86_64',
codesign_identity=None, codesign_identity=None,
entitlements_file=None, entitlements_file=None,
icon='src/khoj/interface/web/assets/icons/favicon-144x144.ico', icon='src/khoj/interface/web/assets/icons/favicon-128x128.ico',
) )
else: else:
exe = EXE( exe = EXE(

View File

@@ -49,7 +49,7 @@ class MainWindow(QtWidgets.QMainWindow):
self.setFixedWidth(600) self.setFixedWidth(600)
# Set Window Icon # Set Window Icon
icon_path = constants.web_directory / "assets/icons/favicon-144x144.png" icon_path = constants.web_directory / "assets/icons/favicon-128x128.png"
self.setWindowIcon(QtGui.QIcon(f"{icon_path.absolute()}")) self.setWindowIcon(QtGui.QIcon(f"{icon_path.absolute()}"))
# Initialize Configure Window Layout # Initialize Configure Window Layout

View File

@@ -17,7 +17,7 @@ def create_system_tray(gui: QtWidgets.QApplication, main_window: MainWindow):
""" """
# Create the system tray with icon # Create the system tray with icon
icon_path = constants.web_directory / "assets/icons/favicon-144x144.png" icon_path = constants.web_directory / "assets/icons/favicon-128x128.png"
icon = QtGui.QIcon(f"{icon_path.absolute()}") icon = QtGui.QIcon(f"{icon_path.absolute()}")
tray = QtWidgets.QSystemTrayIcon(icon) tray = QtWidgets.QSystemTrayIcon(icon)
tray.setVisible(True) tray.setVisible(True)

View File

Before

Width:  |  Height:  |  Size: 200 KiB

After

Width:  |  Height:  |  Size: 200 KiB

View File

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

View File

@@ -1,14 +1,14 @@
<!DOCTYPE html> <!DOCTYPE html>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<link rel="icon" href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 100 100%22><text y=%22.9em%22 font-size=%2290%22>🦅</text></svg>"> <link rel="icon" type="image/png" sizes="128x128" href="/static/assets/icons/favicon-128x128.png">
<title>Khoj - Configure App</title> <title>Khoj - Settings</title>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@picocss/pico@1/css/pico.min.css"> <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@picocss/pico@1/css/pico.min.css">
</head> </head>
<body class="khoj-configure"> <body class="khoj-configure">
<header> <header>
<div> <div>
<h1>Configure Khoj</h1> <h1>Khoj Settings</h1>
<p>Check out our <a href="https://github.com/debanjum/khoj">source code on Github</a></p> <p>Check out our <a href="https://github.com/debanjum/khoj">source code on Github</a></p>
</div> </div>
<div> <div>

View File

@@ -1,7 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>Khoj: Configuration for data integrations</title> <title>Khoj: Data Settings</title>
<link rel=”stylesheet” href=”static/styles.css”> <link rel=”stylesheet” href=”static/styles.css”>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@picocss/pico@1/css/pico.min.css"> <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@picocss/pico@1/css/pico.min.css">
</head> </head>

View File

@@ -1,7 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>Khoj: Configuration for processor integrations</title> <title>Khoj: Processor Settings</title>
<link rel=”stylesheet” href=”static/styles.css”> <link rel=”stylesheet” href=”static/styles.css”>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@picocss/pico@1/css/pico.min.css"> <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@picocss/pico@1/css/pico.min.css">
</head> </head>

View File

@@ -4,8 +4,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0 maximum-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0 maximum-scale=1.0">
<title>Khoj</title> <title>Khoj</title>
<link rel="icon" href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 144 144%22><text y=%22.86em%22 font-size=%22144%22>🦅</text></svg>"> <link rel="icon" type="image/png" sizes="128x128" href="/static/assets/icons/favicon-128x128.png">
<link rel="icon" type="image/png" sizes="144x144" href="/static/assets/icons/favicon-144x144.png">
<link rel="manifest" href="/static/khoj_chat.webmanifest"> <link rel="manifest" href="/static/khoj_chat.webmanifest">
</head> </head>
<script> <script>

View File

@@ -3,21 +3,21 @@
<h2>Content Types</h2> <h2>Content Types</h2>
<div id="content-configuration"> <div id="content-configuration">
<button onclick="window.location.href='/config/content_type/pdf';"> <button onclick="window.location.href='/config/content_type/pdf';">
Configure PDF PDF
</button> </button>
<button onclick="window.location.href='/config/content_type/markdown';"> <button onclick="window.location.href='/config/content_type/markdown';">
Configure Markdown Markdown
</button> </button>
<button onclick="window.location.href='/config/content_type/org';"> <button onclick="window.location.href='/config/content_type/org';">
Configure Org Org
</button> </button>
<button onclick="window.location.href='/config/content_type/ledger';"> <button onclick="window.location.href='/config/content_type/ledger';">
Configure Ledger Ledger
</button> </button>
</div> </div>
<h2>Processors</h2> <h2>Processors</h2>
<button onclick="window.location.href='/config/processor/conversation/';"> <button onclick="window.location.href='/config/processor/conversation/';">
Configure Conversation Conversation
</button> </button>
<h1>Finalize</h1> <h1>Finalize</h1>
<button id="regenerate" type="submit">Regenerate</button> <button id="regenerate" type="submit">Regenerate</button>

View File

@@ -3,10 +3,6 @@
<h2>{{ content_type }}</h2> <h2>{{ content_type }}</h2>
<form id="config-form"> <form id="config-form">
<table> <table>
<tr>
<th>Field</th>
<th>Value</th>
</tr>
<tr> <tr>
<td> <td>
<label for="input-files">Input Files</label> <label for="input-files">Input Files</label>
@@ -46,10 +42,6 @@
<h4>You probably don't need to edit these.</h4> <h4>You probably don't need to edit these.</h4>
<table> <table>
<tr>
<th>Field</th>
<th>Value</th>
</tr>
<tr> <tr>
<td> <td>
<label for="compressed-jsonl">Compressed JSONL (Output)</label> <label for="compressed-jsonl">Compressed JSONL (Output)</label>

View File

@@ -4,8 +4,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0 maximum-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0 maximum-scale=1.0">
<title>Khoj</title> <title>Khoj</title>
<link rel="icon" href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 144 144%22><text y=%22.86em%22 font-size=%22144%22>🦅</text></svg>"> <link rel="icon" type="image/png" sizes="128x128" href="/static/assets/icons/favicon-128x128.png">
<link rel="icon" type="image/png" sizes="144x144" href="/static/assets/icons/favicon-144x144.png">
<link rel="manifest" href="/static/khoj.webmanifest"> <link rel="manifest" href="/static/khoj.webmanifest">
</head> </head>
<script type="text/javascript" src="static/assets/org.min.js"></script> <script type="text/javascript" src="static/assets/org.min.js"></script>

View File

@@ -4,7 +4,7 @@
"description": "An AI search assistant for your digital brain", "description": "An AI search assistant for your digital brain",
"icons": [ "icons": [
{ {
"src": "/static/assets/icons/favicon-144x144.png", "src": "/static/assets/icons/favicon-128x128.png",
"sizes": "128x128", "sizes": "128x128",
"type": "image/png" "type": "image/png"
} }

View File

@@ -4,7 +4,7 @@
"description": "An AI personal assistant for your digital brain", "description": "An AI personal assistant for your digital brain",
"icons": [ "icons": [
{ {
"src": "/static/assets/icons/favicon-144x144.png", "src": "/static/assets/icons/favicon-128x128.png",
"sizes": "128x128", "sizes": "128x128",
"type": "image/png" "type": "image/png"
} }

View File

@@ -5,7 +5,7 @@
<table> <table>
<tr> <tr>
<td> <td>
<label for="openai-api-key">Open AI API key</label> <label for="openai-api-key">OpenAI API key</label>
</td> </td>
<td> <td>
<input type="text" id="openai-api-key" name="openai-api-key" value="{{ current_config['openai_api_key'] }}"> <input type="text" id="openai-api-key" name="openai-api-key" value="{{ current_config['openai_api_key'] }}">

View File

@@ -11,8 +11,6 @@ from khoj.utils import constants, state
import logging import logging
import json import json
logger = logging.getLogger("khoj")
# Initialize Router # Initialize Router
web_client = APIRouter() web_client = APIRouter()
@@ -32,11 +30,6 @@ def config_page(request: Request):
return templates.TemplateResponse("config.html", context={"request": request}) return templates.TemplateResponse("config.html", context={"request": request})
@web_client.get("/test-child", response_class=HTMLResponse)
def test_child(request: Request):
return templates.TemplateResponse("child0.html", context={"request": request, "config": constants.default_config})
@web_client.get("/config/content_type/{content_type}", response_class=HTMLResponse) @web_client.get("/config/content_type/{content_type}", response_class=HTMLResponse)
def content_config_page(request: Request, content_type: str): def content_config_page(request: Request, content_type: str):
if content_type not in VALID_CONTENT_TYPES: if content_type not in VALID_CONTENT_TYPES: