Skip to content

This PR aims at improving the webui and making it actually usable on a telephone #101

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

Open
jolavillette wants to merge 8 commits into
base: master
Choose a base branch
from
Open

This PR aims at improving the webui and making it actually usable on a telephone #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
15b0d16
V1: makes chat usable, fetch history, add logout and reload buttons, …
jolavillette Feb 16, 2026
e007e90
fix search events, fonts and login; improve Files labels and search r…
jolavillette Feb 17, 2026
f867e31
improve search results aesthetics and fix mobile download button visi…
jolavillette Feb 18, 2026
5438bba
implement distant chat
jolavillette Feb 19, 2026
b227cde
various small UI improvements
jolavillette Feb 19, 2026
d861873
Merge master into ImproveWebui: resolve rsMsgs to rsChats/rsMail refa…
jolavillette Mar 8, 2026
de4d237
Merge master into ImproveWebui: resolve endpoint update conflicts
jolavillette Mar 9, 2026
71d79ab
rebuild CSS after merge
jolavillette Mar 9, 2026
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
702 changes: 491 additions & 211 deletions webui-src/app/chat/chat.js
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions webui-src/app/files/files_downloads.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,24 +149,24 @@ const Component = () => {
Downloads.resetSearch();
},
view: () => [
m('.widget__body-heading', [
m('h3', `Downloads (${Downloads.hashes ? Downloads.hashes.length : 0} files)`),
m('.action', [
m('.widget__body-heading', { style: { display: 'flex', flexDirection: 'column', alignItems: 'flex-start' } }, [
m('.action', { style: { marginBottom: '10px' } }, [
m('button', { onclick: () => widget.popupMessage(m(NewFileDialog)) }, 'Add new file'),
m('button', { onclick: clearFileCompleted }, 'Clear completed'),
]),
m('h3', `Downloads (${Downloads.hashes ? Downloads.hashes.length : 0} files)`),
]),
m('.widget__body-content', [
Downloads.statusMap &&
Object.keys(Downloads.statusMap).map((hash) =>
m(util.File, {
info: Downloads.statusMap[hash],
strategy: Downloads.strategies[hash],
direction: 'down',
transferred: Downloads.statusMap[hash].transfered.xint64,
chunksInfo: Downloads.chunksMap[hash],
})
),
Object.keys(Downloads.statusMap).map((hash) =>
m(util.File, {
info: Downloads.statusMap[hash],
strategy: Downloads.strategies[hash],
direction: 'down',
transferred: Downloads.statusMap[hash].transfered.xint64,
chunksInfo: Downloads.chunksMap[hash],
})
),
]),
],
};
Expand Down
157 changes: 78 additions & 79 deletions webui-src/app/files/files_manager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,10 @@ function loadSharedDirectories() {
// Update Shared Directories when there is a corresponding event
rs.events[rs.RsEventsType.SHARED_DIRECTORIES] = {
handler: (event) => {
console.log('Shared Directories Event: ', event);
switch(event.mEventCode) {
case futil.RsSharedDirectoriesEventCode.SHARED_DIRS_LIST_CHANGED:
loadSharedDirectories();
break;
switch (event.mEventCode) {
case futil.RsSharedDirectoriesEventCode.SHARED_DIRS_LIST_CHANGED:
loadSharedDirectories();
break;
}
},
};
Expand Down Expand Up @@ -156,85 +155,85 @@ const ShareDirTable = () => {
m(
'tbody.share-manager__table_body',
sharedDirArr.length &&
sharedDirArr.map((sharedDirItem, index) => {
const {
filename,
virtualname,
shareflags,
parent_groups: parentGroups,
} = sharedDirItem;
const sharedFlags = futil.calcIndividualFlags(shareflags);
return m('tr', [
m(
'td',
m('input[type=text]', {
value: filename,
disabled: isEditDisabled,
oninput: (e) => {
sharedDirArr[index].filename = e.target.value;
},
})
),
m(
'td',
m('input[type=text]', {
value: virtualname,
disabled: isEditDisabled,
oninput: (e) => {
sharedDirArr[index].virtualname = e.target.value;
},
})
),
m(
'td.share-flags',
Object.keys(sharedFlags).map((flag) => {
return [
m(`input.share-flags-check[type=checkbox][id=${flag}]`, {
checked: sharedFlags[flag],
disabled: isEditDisabled,
}),
m(
`label.share-flags-label[for=${flag}]`,
{
onclick: () => {
if (isEditDisabled) return;
sharedFlags[flag] = !sharedFlags[flag];
sharedDirArr[index].shareflags = futil.calcShareFlagsValue(sharedFlags);
},
style: isEditDisabled && { color: '#7D7D7D' },
sharedDirArr.map((sharedDirItem, index) => {
const {
filename,
virtualname,
shareflags,
parent_groups: parentGroups,
} = sharedDirItem;
const sharedFlags = futil.calcIndividualFlags(shareflags);
return m('tr', [
m(
'td',
m('input[type=text]', {
value: filename,
disabled: isEditDisabled,
oninput: (e) => {
sharedDirArr[index].filename = e.target.value;
},
})
),
m(
'td',
m('input[type=text]', {
value: virtualname,
disabled: isEditDisabled,
oninput: (e) => {
sharedDirArr[index].virtualname = e.target.value;
},
})
),
m(
'td.share-flags',
Object.keys(sharedFlags).map((flag) => {
return [
m(`input.share-flags-check[type=checkbox][id=${flag}]`, {
checked: sharedFlags[flag],
disabled: isEditDisabled,
}),
m(
`label.share-flags-label[for=${flag}]`,
{
onclick: () => {
if (isEditDisabled) return;
sharedFlags[flag] = !sharedFlags[flag];
sharedDirArr[index].shareflags = futil.calcShareFlagsValue(sharedFlags);
},
m(
// check the flag type then if its value is true then only render the icon
flag === 'isAnonymousSearch'
? sharedFlags[flag]
? 'i.fas.fa-search'
: 'span'
: flag === 'isAnonymousDownload'
style: isEditDisabled && { color: '#7D7D7D' },
},
m(
// check the flag type then if its value is true then only render the icon
flag === 'isAnonymousSearch'
? sharedFlags[flag]
? 'i.fas.fa-search'
: 'span'
: flag === 'isAnonymousDownload'
? sharedFlags[flag]
? 'i.fas.fa-download'
: 'span'
: sharedFlags[flag]
? 'i.fas.fa-eye'
: 'span'
)
),
];
})
),
m(
'td',
{
// since this is not an input element, manually change color
style: { color: isEditDisabled ? '#6D6D6D' : 'black' },
onclick: () =>
!isEditDisabled && widget.popupMessage(m(ManageVisibility, { parentGroups })),
},
parentGroups.length === 0
? 'All Friend nodes'
: parentGroups.map((groupFlag) => futil.RsNodeGroupId[groupFlag]).join(', ')
),
]);
})
? 'i.fas.fa-eye'
: 'span'
)
),
];
})
),
m(
'td',
{
// since this is not an input element, manually change color
style: { color: isEditDisabled ? '#6D6D6D' : 'black' },
onclick: () =>
!isEditDisabled && widget.popupMessage(m(ManageVisibility, { parentGroups })),
},
parentGroups.length === 0
? 'All Friend nodes'
: parentGroups.map((groupFlag) => futil.RsNodeGroupId[groupFlag]).join(', ')
),
]);
})
),
]);
},
Expand Down
11 changes: 8 additions & 3 deletions webui-src/app/files/files_proxy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,19 @@ const fileProxyObj = futil.createProxy({}, () => {

rs.events[rs.RsEventsType.FILE_TRANSFER] = {
handler: (event) => {
console.log('search results : ', event);

// if request item doesn't already exists in Object then create new item
if (!Object.prototype.hasOwnProperty.call(fileProxyObj, event.mRequestId)) {
fileProxyObj[event.mRequestId] = [];
}

fileProxyObj[event.mRequestId].push(...event.mResults);
event.mResults.forEach((newRes) => {
const isAlt = fileProxyObj[event.mRequestId].some(
(oldRes) => oldRes.fHash === newRes.fHash && oldRes.fName === newRes.fName
);
if (!isAlt) {
fileProxyObj[event.mRequestId].push(newRes);
}
});
},
};

Expand Down
Loading