Skip to content

Devika is the first open-source implementation of an Agentic Software Engineer. Initially started as an open-source alternative to Devin.

Python

refactor: continue refactoring more components into the Dropdown component

Andrew Bastin1e39cb1a874d
diff --git a/ui/src/App.svelte b/ui/src/App.svelte
new file mode 100644
index 0000000..2295256
--- /dev/null
+++ b/ui/src/App.svelte
@@ -0,0 +1,76 @@
+<script>
+ import { onMount } from "svelte";
+ import Sidebar from "./components/Sidebar.svelte";
+ import ControlPanel from "./components/ControlPanel.svelte";
+ import MessageContainer from "./components/MessageContainer.svelte";
+ import InternalMonologue from "./components/InternalMonologue.svelte";
+ import MessageInput from "./components/MessageInput.svelte";
+ import BrowserWidget from "./components/BrowserWidget.svelte";
+ import TerminalWidget from "./components/TerminalWidget.svelte";
+ import {
+ fetchProjectList,
+ fetchModelList,
+ fetchAgentState,
+ fetchMessages,
+ checkInternetStatus,
+ } from "./api";
+
+ onMount(() => {
+ localStorage.clear();
+
+ const intervalId = setInterval(async () => {
+ await fetchProjectList();
+ await fetchModelList();
+ await fetchAgentState();
+ await fetchMessages();
+ await checkInternetStatus();
+ }, 1000);
+
+ return () => clearInterval(intervalId);
+ });
+</script>
+
+<div class="flex h-screen">
+ <Sidebar />
+
+ <div class="flex flex-col flex-1 p-4">
+ <ControlPanel />
+
+ <div class="flex h-full space-x-4">
+ <div class="flex flex-col w-1/2">
+ <MessageContainer />
+ <InternalMonologue />
+ <MessageInput />
+ </div>
+
+ <div class="flex flex-col w-1/2 space-y-4">
+ <BrowserWidget />
+ <TerminalWidget />
+ </div>
+ </div>
+ </div>
+</div>
+
+<style>
+ @import "tailwindcss/base";
+ @import "tailwindcss/components";
+ @import "tailwindcss/utilities";
+
+ :global(::-webkit-scrollbar) {
+ width: 10px;
+ }
+
+ :global(::-webkit-scrollbar-track) {
+ background: #2d3748;
+ border-radius: 10px;
+ }
+
+ :global(::-webkit-scrollbar-thumb) {
+ background: #4a5568;
+ border-radius: 10px;
+ }
+
+ :global(::-webkit-scrollbar-thumb:hover) {
+ background: #6b7280;
+ }
+</style>
diff --git a/ui/src/components/ui/Dropdown.svelte b/ui/src/components/ui/Dropdown.svelte
index c5f153e..e586c64 100644
--- a/ui/src/components/ui/Dropdown.svelte
+++ b/ui/src/components/ui/Dropdown.svelte
@@ -3,7 +3,7 @@
export let label;
/** @type {string | null | undefined} **/
- export let selection = null;
+ export let selection = undefined;
/** @type {Record<string, string>} **/
export let options;
@@ -51,6 +51,10 @@
function closeDropdown() {
open = false;
}
+
+ $: {
+ console.log("selection: ", selection, "label: ", label);
+ }
</script>
<div class="dropdown-menu relative inline-block">
@@ -61,7 +65,10 @@
aria-haspopup="true"
on:click={() => open = !open}
>
- <span id="selected-project">{selection ? options[selection] : label}</span>
+ <span>
+ {selection ? options[selection] : label}
+ </span>
+
<svg
class="-mr-1 h-5 w-5 text-gray-400"
viewBox="0 0 20 20"
diff --git a/ui/src/lib/components/ControlPanel.svelte b/ui/src/lib/components/ControlPanel.svelte
index 34f51d8..ef5cf6d 100644
--- a/ui/src/lib/components/ControlPanel.svelte
+++ b/ui/src/lib/components/ControlPanel.svelte
@@ -1,7 +1,6 @@
<script>
import { onMount } from 'svelte';
import { selectedProject, selectedModel, projectList, modelList, internet } from '$lib/store';
- import { projectList, modelList, internet } from "$lib/store";
import { createProject, fetchProjectList, getTokenUsage } from "$lib/api";
import Dropdown from "./ui/Dropdown.svelte";
@@ -11,44 +10,23 @@
tokenUsage = await getTokenUsage();
}
- function selectProject(project) {
- $selectedProject = project;
- }
-
- function selectModel(model) {
- $selectedModel = `${model[1]}`;
- }
-
async function createNewProject() {
const projectName = prompt('Enter the project name:');
if (projectName) {
await createProject(projectName);
await fetchProjectList();
- selectProject(projectName);
+
+ selectedProject.set(projectName);
}
}
onMount(() => {
setInterval(updateTokenUsage, 1000);
-
- selectedProject = localStorage.getItem("selectedProject");
- selectedModel = localStorage.getItem("selectedModel") || "Select Model";
-
- document
- .getElementById("model-button")
- .addEventListener("click", function () {
- const dropdown = document.getElementById("model-dropdown");
- dropdown.classList.toggle("hidden");
- });
-
- return () => {
- document.removeEventListener('click', closeDropdowns);
- };
});
</script>
<div class="control-panel bg-slate-900 border border-indigo-700 rounded">
- <Dropdown options={Object.fromEntries($projectList.map((x) => [x, x]))} label="Select Project" bind:selection={selectedProject}>
+ <Dropdown options={Object.fromEntries($projectList.map((x) => [x, x]))} label="Select Project" bind:selection={$selectedProject}>
<div slot="prefix-entries" let:closeDropdown={close}>
<button
class="text-white block px-4 py-2 text-sm hover:bg-slate-700 w-full text-left overflow-clip"
@@ -61,8 +39,10 @@
</button>
</div>
</Dropdown>
-
- <div class="right-controls" style="display: flex; align-items: center; gap: 20px">
+ <div
+ class="right-controls"
+ style="display: flex; align-items: center; gap: 20px"
+ >
<div class="flex items-center space-x-2">
<span>Internet:</span>
<div id="internet-status" class="internet-status" class:online={$internet} class:offline={!$internet} />
@@ -70,49 +50,14 @@
</div>
<div class="flex items-center space-x-2">
<span>Token Usage:</span>
- <span id="token-count" class="token-count-animation">{tokenUsage}</span>
+ <span class="token-count-animation">{tokenUsage}</span>
</div>
<div class="relative inline-block text-left">
- <div>
- <button
- type="button"
- class="inline-flex w-full justify-center gap-x-1.5 rounded-md bg-slate-900 px-3 py-2 text-sm font-semibold text-white shadow-sm ring-1 ring-inset ring-indigo-700 hover:bg-slate-800"
- id="model-button"
- aria-expanded="true"
- aria-haspopup="true"
- >
- <span id="selected-model">{$selectedModel}</span>
- <svg class="-mr-1 h-5 w-5 text-gray-400" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
- <path
- fill-rule="evenodd"
- d="M5.23 7.21a.75.75 0 011.06.02L10 11.168l3.71-3.938a.75.75 0 111.08 1.04l-4.25 4.5a.75.75 0 01-1.08 0l-4.25-4.5a.75.75 0 01.02-1.06z"
- clip-rule="evenodd"
- />
- </svg>
- </button>
- </div>
-
- <div
- id="model-dropdown"
- class="absolute right-0 z-10 mt-2 w-full origin-top-right rounded-md bg-slate-800 shadow-lg ring-1 ring-indigo-700 ring-opacity-5 focus:outline-none hidden"
- role="menu"
- aria-orientation="vertical"
- aria-labelledby="model-button"
- tabindex="-1"
- >
- <div class="py-1" role="none">
- {#if $modelList.length > 0}
- {#each $modelList as model}
- <button
- class="text-white block px-4 py-2 text-sm hover:bg-slate-700"
- on:click={() => selectModel(model)}
- >
- {model[0]} ({model[1]})
- </button>
- {/each}
- {/if}
- </div>
- </div>
+ <Dropdown
+ options={Object.fromEntries($modelList.map(([name, id]) => [id, `${name} (${id})`]))}
+ label="Select Model"
+ bind:selection={$selectedModel}
+ />
</div>
</div>
</div>
diff --git a/ui/src/lib/store.js b/ui/src/lib/store.js
index dcd6950..ba51f2a 100644
--- a/ui/src/lib/store.js
+++ b/ui/src/lib/store.js
@@ -36,4 +36,4 @@ selectedModel.subscribe((value) => {
if (typeof window !== 'undefined' && window.localStorage) {
localStorage.setItem('selectedModel', value);
}
-});
\ No newline at end of file
+});