sij/khoj
1
0
Fork 0
mirror of https://github.com/khoj-ai/khoj.git synced 2024-11-23 23:48:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 16

Align Config Web UI Code Layout, API with the rest of the application

Browse source 
- Put code to configure app via web interface under `src/interface/web` directory with the rest of the web interface code
- Make config web UI available under `/config` instead of at the generic `/ui` endpoint
- Rename `/config` API endpoint (that gets/sets config from/to yaml file) to `/config/data`
- Add Khoj App title, favicon to config web page
This commit is contained in:
Debanjum 2022-08-01 01:53:21 +03:00 committed by GitHub
commit 06499da0c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
views/style.css → src/interface/web/assets/config.css
View file

9
views/scripts/config.js → src/interface/web/assets/config.js
View file

@ -10,7 +10,7 @@ var emptyValueDefault = "🖊️";
/**
* Fetch the existing config file.
*/
fetch("/config")
fetch("/config/data")
.then(response => response.json())
.then(data => {
rawConfig = data;
@ -26,15 +26,16 @@ fetch("/config")
configForm.addEventListener("submit", (event) => {
event.preventDefault();
console.log(rawConfig);
const response = fetch("/config", {
fetch("/config/data", {
method: "POST",
credentials: "same-origin",
headers: {
'Content-Type': 'application/json'
},
body: JSON.stringify(rawConfig)
}).then(response => response.json())
.then((data) => console.log(data));
})
.then(response => response.json())
.then(data => console.log(data));
});
});

14
src/interface/web/config.html Normal file
View file

@ -0,0 +1,14 @@
<!DOCTYPE html>
<head>
<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="stylesheet" href="static/assets/config.css">
<title>Khoj - Configure App</title>
</head>
<body>
<form id="config-form">
</form>
<button id="config-regenerate">regenerate</button>
</body>
<script src="static/assets/config.js"></script>
</html>

2
src/interface/web/index.html
View file

@ -85,7 +85,7 @@
function populate_type_dropdown() {
// Populate type dropdown field with enabled search types only
var possible_search_types = ["org", "markdown", "ledger", "music", "image"];
fetch("/config")
fetch("/config/data")
.then(response => response.json())
.then(data => {
document.getElementById("type").innerHTML =

9
src/main.py
View file

@ -34,22 +34,21 @@ app = FastAPI()
web_directory = f'src/interface/web/'
app.mount("/static", StaticFiles(directory=web_directory), name="static")
app.mount("/views", StaticFiles(directory="views"), name="views")
templates = Jinja2Templates(directory="views/")
templates = Jinja2Templates(directory=web_directory)
@app.get("/", response_class=FileResponse)
def index():
return FileResponse(web_directory + "index.html")
@app.get('/ui', response_class=HTMLResponse)
@app.get('/config', response_class=HTMLResponse)
def ui(request: Request):
return templates.TemplateResponse("config.html", context={'request': request})
@app.get('/config', response_model=FullConfig)
@app.get('/config/data', response_model=FullConfig)
def config_data():
return config
@app.post('/config')
@app.post('/config/data')
async def config_data(updated_config: FullConfig):
global config
config = updated_config

12
views/config.html
View file

@ -1,12 +0,0 @@
<!DOCTYPE html>
<head>
<title>Set directories for your config file.</title>
<link rel="stylesheet" href="views/style.css">
</head>
<body>
<form id="config-form">
</form>
<button id="config-regenerate">regenerate</button>
</body>
<script src="views/scripts/config.js"></script>
</html>