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.

Sign up for GitHub

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

Jump to bottom

Minor touchups for smol talk, abilty to go back/forward in browser history #114

Merged
merged 5 commits into from
Aug 7, 2023
Merged

Minor touchups for smol talk, abilty to go back/forward in browser history #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b9ef3ac
add what i have
swyxio Aug 7, 2023
68912d9
Apply prettier changes
swyxio Aug 7, 2023
8440f36
minor ui cleanups
swyxio Aug 7, 2023
a3e382e
Merge branch 'smolGodsRewrite' of https://github.com/smol-ai/menubar …
swyxio Aug 7, 2023
e30e960
Apply prettier changes
swyxio Aug 7, 2023
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
21 changes: 17 additions & 4 deletions index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ body {
}

:root {
--actual-height: calc(100vh - 80px);
--actual-height: calc(100vh - 20px);
}

@media (prefers-color-scheme: dark) {
Expand All @@ -24,13 +24,14 @@ body {

.page {
--superprompt-height: 100px;
--titlebar-height: 20px;

background: #eeeeee;
/* overflow: auto; */
/* disabled because its quite buggy */
/* resize: both; */
width: 100%;
height: calc(100vh - var(--superprompt-height));
height: calc(100vh - var(--superprompt-height) - var(--titlebar-height));
margin-top: 4px;
margin: 0 auto;
position: relative;
Expand Down Expand Up @@ -97,13 +98,25 @@ body {
stroke: rgba(255, 255, 255, 0.8);
}

#webviewContainer {
border-top-left-radius: 8px;
border-top-right-radius: 8px;
display: flex;
height: calc(100vh - 100px);
}

.titlebar {
display: flex;
justify-content: space-around;
}

webview {
/* overflow: hidden; */
position: absolute;
top: 0;
top: 20px;
left: 0;
width: 100%;
height: calc(100vh - var(--superprompt-height));
height: calc(100vh - var(--superprompt-height) - var(--titlebar-height));
display: inline-flex !important;
}

Expand Down
2 changes: 1 addition & 1 deletion index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</head>

<body class="">
<div id="webviewContainer" class="flex split">
<div id="webviewContainer" class="split">
<!-- Panes Go Here -->
</div>
<form id="form" class="">
Expand Down
33 changes: 19 additions & 14 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ const providers = {
Together: require('./providers/together'),
Perplexity: require('./providers/perplexity'),
Phind: require('./providers/phind'),
PerplexityLlama: require('./providers/perplexity-llama.js'),
HuggingChat: require('./providers/huggingchat'),
OobaBooga: require('./providers/oobabooga'),
Smol: require('./providers/smol'),
PerplexityLlama: require('./providers/perplexity-llama.js'),
};

// Getting all the providers in an array
Expand Down Expand Up @@ -80,20 +80,21 @@ app.on('ready', () => {
icon: image,
transparent: path.join(__dirname, `images/iconApp.png`),
autoHideMenuBar: false,
// zoomFactor: 0.8, // handled by webview.setZoomLevel, dont bother setting this
webPreferences: {
webviewTag: true,
nodeIntegration: true,
contextIsolation: false,
enableWebView: true, // from chatgpt
// nativeWindowOpen: true,
},
width: 1200,
width,
height: 750,
},
tray,
showOnAllWorkspaces: false,
preloadWindow: true,
showDockIcon: false,
showDockIcon: true,
icon: image,
});

Expand Down Expand Up @@ -169,9 +170,9 @@ app.on('ready', () => {
});
}

settingsWindow.once('ready-to-show', () => {
mb.hideWindow();
});
// settingsWindow.once('ready-to-show', () => {
// mb.hideWindow();
// });
},
},
];
Expand Down Expand Up @@ -288,15 +289,15 @@ app.on('ready', () => {
const menu = new Menu();

function quickOpen() {
if (window.isVisible()) {
mb.hideWindow();
} else {
mb.showWindow();
if (process.platform == 'darwin') {
mb.app.show();
}
mb.app.focus();
// if (window.isVisible()) {
// mb.hideWindow();
// } else {
mb.showWindow();
if (process.platform == 'darwin') {
mb.app.show();
}
// }
mb.app.focus();
}

globalShortcut.register(
Expand Down Expand Up @@ -364,6 +365,8 @@ app.on('ready', () => {
if (key === 'y') contents.redo();
if (key === 'q') app.quit();
if (key === 'r') contents.reload();
if (key === 'h') contents.goBack();
if (key === 'l') contents.goForward();
});
}
// we can't set the native app menu with "menubar" so need to manually register these events
Expand All @@ -379,6 +382,8 @@ app.on('ready', () => {
if (key === 'y') contents.redo();
if (key === 'q') app.quit();
if (key === 'r') contents.reload();
if (key === 'h') contents.goBack();
if (key === 'l') contents.goForward();
});
});

Expand Down
2 changes: 1 addition & 1 deletion interface.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ const providers = {
Together: require('./providers/together'),
Perplexity: require('./providers/perplexity'),
Phind: require('./providers/phind'),
PerplexityLlama: require('./providers/perplexity-llama.js'),
HuggingChat: require('./providers/huggingchat'),
OobaBooga: require('./providers/oobabooga'),
Smol: require('./providers/smol'),
PerplexityLlama: require('./providers/perplexity-llama.js'),
};

const { drawPanes, updateSplitSizes } = require('./src/panes');
Expand Down
2 changes: 1 addition & 1 deletion providers/huggingchat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class HuggingChat extends Provider {
}

static isEnabled() {
return store.get(`${this.webviewId}Enabled`, true);
return store.get(`${this.webviewId}Enabled`, false);
}
}

Expand Down
4 changes: 2 additions & 2 deletions providers/openai.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const store = new Store();

const Provider = require('./provider');

class OpenAi extends Provider {
class OpenAI extends Provider {
static webviewId = 'webviewOAI';
static fullName = 'OpenAI ChatGPT';

Expand Down Expand Up @@ -70,4 +70,4 @@ class OpenAi extends Provider {
}
}

module.exports = OpenAi;
module.exports = OpenAI;
12 changes: 4 additions & 8 deletions providers/phind.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,11 @@ class Phind extends Provider {
inputElement = document.querySelector('textarea[placeholder*="Send message"]');
}

function simulateUserInput(element, text) {
var nativeTextAreaValueSetter = Object.getOwnPropertyDescriptor(window.HTMLTextAreaElement.prototype, "value").set;
var event = new Event('input', { bubbles: true});
var nativeTextAreaValueSetter = Object.getOwnPropertyDescriptor(window.HTMLTextAreaElement.prototype, "value").set;
var event = new Event('input', { bubbles: true});

nativeTextAreaValueSetter.call(inputElement, text);
inputElement.dispatchEvent(event);
}

simulateUserInput(inputElement, "${input}");
nativeTextAreaValueSetter.call(inputElement, "${input}");
inputElement.dispatchEvent(event);
`);
}

Expand Down
33 changes: 24 additions & 9 deletions providers/smol.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,32 @@ class SmolTalk extends Provider {

static handleInput(input) {
this.getWebview().executeJavaScript(`
function simulateUserInput(element, text) {
const inputEvent = new Event('input', { bubbles: true });
element.focus();
element.value = text;
element.dispatchEvent(inputEvent);
}
var inputElement = document.querySelector('#smol-inputbox')
simulateUserInput(inputElement, "${input}");
var inputElement = document.querySelector('#smol-inputbox')
function simulateUserInput(element, text) {
var nativeTextAreaValueSetter = Object.getOwnPropertyDescriptor(window.HTMLTextAreaElement.prototype, "value").set;
var event = new Event('input', { bubbles: true});

nativeTextAreaValueSetter.call(inputElement, text);
inputElement.dispatchEvent(event);
}

simulateUserInput(inputElement, "${input}");
`);
}

static clearCookies() {
this.getWebview().executeJavaScript(`
const cookies = document.cookie.split(";");

for (let i = 0; i < cookies.length; i++) {
const cookie = cookies[i];
const eqPos = cookie.indexOf("=");
const name = eqPos > -1 ? cookie.substr(0, eqPos) : cookie;
document.cookie = name + "=;expires=Thu, 01 Jan 1970 00:00:00 GMT";
}
`);
}

static handleSubmit() {
this.getWebview().executeJavaScript(`

Expand Down Expand Up @@ -72,7 +87,7 @@ class SmolTalk extends Provider {
}

static isEnabled() {
return store.get(`${this.webviewId}Enabled`, false);
return store.get(`${this.webviewId}Enabled`, true);
}
}

Expand Down
17 changes: 16 additions & 1 deletion src/panes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,28 @@ function drawPanes(providers) {
div.className = 'page darwin';
div.id = provider.paneId();

// create a title bar
const titlebar = document.createElement('div');
titlebar.className = 'titlebar';
// add in a h1 with the provider name
const title = document.createElement('span');
title.innerHTML = provider.name;
titlebar.appendChild(title);
// add in a button to toggle dark mode
const darkModeButton = document.createElement('button');
darkModeButton.innerHTML = 'Clear Cookies';
darkModeButton.addEventListener('click', provider.clearCookies);
titlebar.appendChild(darkModeButton);

div.appendChild(titlebar);

// Create a new webview and set its id, source url, and autosize attributes
const webview = document.createElement('webview');
webview.id = provider.webviewId;
webview.src = provider.url;
webview.autosize = 'on';
webview.addEventListener('dom-ready', () => {
webview.setZoomLevel(0); // Set initial zoom level here
webview.setZoomLevel(-1); // Set initial zoom level here
});

// If the provider has a getUserAgent function, set the webview's useragent
Expand Down