vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix(minor): add website in app switcher

Browse source
This commit is contained in:
Rushabh Mehta 2024-09-03 09:58:21 +05:30
parent c2652fed39
commit bbe563ca60
7 changed files with 75 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
frappe/public/icons/espresso/icons.svg
View file

@ -1694,5 +1694,10 @@
<path fill="var(--icon-stroke)" fill-rule="evenodd" d="M7.201 2.436A4.024 4.024 0 0 1 8 3.173a3.41 3.41 0 0 1 .244-.272 4.037 4.037 0 0 1 1.873-1.066 4.084 4.084 0 0 1 1.776-.05c.768.15 1.502.521 2.097 1.116 1.587 1.586 1.658 3.968.012 5.733l-.008.007-.009.01-5.636 5.497a.5.5 0 0 1-.698 0L2.013 8.651a.501.501 0 0 1-.02-.02C.447 6.94.413 4.495 2.01 2.9a4.052 4.052 0 0 1 3.648-1.116 4.04 4.04 0 0 1 1.544.651Z" class="Union" clip-rule="evenodd"/>
</g>
</symbol>
<symbol id="es-web" viewBox="0 0 16 16">
<g class="es-web">
<path fill="var(--icon-stroke)" fill-rule="evenodd" d="M2.02062 7.49896C2.49506 7.49716 2.97742 7.4933 3.47006 7.48935C3.94277 7.48556 4.42495 7.48169 4.9187 7.47951C4.97589 6.3862 5.14998 5.23014 5.51484 4.17085C5.76241 3.45208 6.1023 2.76557 6.56226 2.17336C4.09972 2.77895 2.23508 4.90491 2.02062 7.49896ZM8 2.1204C7.29452 2.69277 6.79592 3.52219 6.46032 4.49652C6.13931 5.4285 5.97681 6.46734 5.92025 7.4779C6.5896 7.47899 7.28127 7.485 8 7.49989C8.7546 7.48425 9.43077 7.47841 10.0797 7.47777C10.0232 6.46725 9.86068 5.42846 9.53968 4.49651C9.20408 3.52219 8.70548 2.69277 8 2.1204ZM10.0822 8.47771C10.0279 9.50221 9.8654 10.5578 9.53968 11.5035C9.20409 12.4778 8.70548 13.3072 8.00001 13.8796C7.29453 13.3072 6.79592 12.4778 6.46032 11.5035C6.13462 10.5579 5.9721 9.5023 5.91784 8.47784C6.58355 8.47892 7.27164 8.48494 7.98959 8.49989C7.99653 8.50004 8.00347 8.50004 8.01042 8.49989C8.76493 8.48417 9.43715 8.47833 10.0822 8.47771ZM4.91661 8.47951C4.43411 8.48168 3.962 8.48548 3.49714 8.48922C2.99784 8.49323 2.50691 8.49718 2.02045 8.49899C2.2341 11.094 4.09907 13.2209 6.56227 13.8266C6.1023 13.2344 5.76241 12.5479 5.51484 11.8291C5.14541 10.7566 4.97157 9.58487 4.91661 8.47951ZM9.43774 13.8266C9.89771 13.2344 10.2376 12.5479 10.4852 11.8291C10.8545 10.7569 11.0283 9.58549 11.0834 8.48039C11.4269 8.48234 11.771 8.48511 12.1244 8.48796C12.7045 8.49264 13.3098 8.49752 13.9795 8.4993C13.7658 11.0941 11.9008 13.2209 9.43774 13.8266ZM13.9794 7.49928C13.3241 7.49751 12.7264 7.49271 12.1508 7.48809C11.7885 7.48518 11.435 7.48234 11.0814 7.48037C11.0242 6.38681 10.8501 5.23042 10.4852 4.17085C10.2376 3.45208 9.89771 2.76557 9.43774 2.17336C11.9004 2.77897 13.7651 4.90509 13.9794 7.49928ZM1 8C1 4.13401 4.13401 1 8 1C11.866 1 15 4.13401 15 8C15 11.866 11.866 15 8 15C4.13401 15 1 11.866 1 8Z" class="Union" clip-rule="evenodd"/>
</g>
</symbol>
</defs>
</svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 198 KiB

After

Width:  |  Height:  |  Size: 200 KiB

4
frappe/public/icons/timeless/icons.svg
View file

@ -1003,5 +1003,7 @@
<symbol viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg" id="icon-clipboard">
<path fill-rule="evenodd" clip-rule="evenodd" d="M5.5 4.0029C5.28752 4.00587 5.11559 4.01186 4.96784 4.02393C4.69617 4.04612 4.59545 4.0838 4.54601 4.10899C4.35785 4.20487 4.20487 4.35785 4.10899 4.54601C4.0838 4.59545 4.04612 4.69617 4.02393 4.96784C4.00078 5.25117 4 5.62345 4 6.2V10.8C4 11.3766 4.00078 11.7488 4.02393 12.0322C4.04612 12.3038 4.0838 12.4045 4.10899 12.454C4.20487 12.6422 4.35785 12.7951 4.54601 12.891C4.59545 12.9162 4.69617 12.9539 4.96784 12.9761C5.25117 12.9992 5.62345 13 6.2 13H9.8C10.3766 13 10.7488 12.9992 11.0322 12.9761C11.3038 12.9539 11.4045 12.9162 11.454 12.891C11.6422 12.7951 11.7951 12.6422 11.891 12.454C11.9162 12.4045 11.9539 12.3038 11.9761 12.0322C11.9992 11.7488 12 11.3766 12 10.8V6.2C12 5.62345 11.9992 5.25117 11.9761 4.96784C11.9539 4.69617 11.9162 4.59545 11.891 4.54601C11.7951 4.35785 11.6422 4.20487 11.454 4.10899C11.4045 4.0838 11.3038 4.04612 11.0322 4.02393C10.8844 4.01186 10.7125 4.00587 10.5 4.0029C10.4984 4.82999 9.82746 5.5 9 5.5H7C6.17254 5.5 5.50157 4.82999 5.5 4.0029ZM10.2924 3.00087C11.0944 3.00548 11.548 3.03457 11.908 3.21799C12.2843 3.40973 12.5903 3.71569 12.782 4.09202C13 4.51984 13 5.0799 13 6.2V10.8C13 11.9201 13 12.4802 12.782 12.908C12.5903 13.2843 12.2843 13.5903 11.908 13.782C11.4802 14 10.9201 14 9.8 14H6.2C5.0799 14 4.51984 14 4.09202 13.782C3.71569 13.5903 3.40973 13.2843 3.21799 12.908C3 12.4802 3 11.9201 3 10.8V6.2C3 5.07989 3 4.51984 3.21799 4.09202C3.40973 3.71569 3.71569 3.40973 4.09202 3.21799C4.45199 3.03457 4.90558 3.00548 5.70764 3.00087C6.09322 2.11745 6.9745 1.5 8 1.5C9.0255 1.5 9.90678 2.11745 10.2924 3.00087ZM6.5 4C6.5 3.17157 7.17157 2.5 8 2.5C8.82843 2.5 9.5 3.17157 9.5 4C9.5 4.27614 9.27614 4.5 9 4.5H7C6.72386 4.5 6.5 4.27614 6.5 4Z" stroke="none" fill="var(--icon-stroke)"/>
</symbol>
<symbol viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg" id="icon-web">
<path fill="var(--icon-stroke)" fill-rule="evenodd" d="M2.02062 7.49896C2.49506 7.49716 2.97742 7.4933 3.47006 7.48935C3.94277 7.48556 4.42495 7.48169 4.9187 7.47951C4.97589 6.3862 5.14998 5.23014 5.51484 4.17085C5.76241 3.45208 6.1023 2.76557 6.56226 2.17336C4.09972 2.77895 2.23508 4.90491 2.02062 7.49896ZM8 2.1204C7.29452 2.69277 6.79592 3.52219 6.46032 4.49652C6.13931 5.4285 5.97681 6.46734 5.92025 7.4779C6.5896 7.47899 7.28127 7.485 8 7.49989C8.7546 7.48425 9.43077 7.47841 10.0797 7.47777C10.0232 6.46725 9.86068 5.42846 9.53968 4.49651C9.20408 3.52219 8.70548 2.69277 8 2.1204ZM10.0822 8.47771C10.0279 9.50221 9.8654 10.5578 9.53968 11.5035C9.20409 12.4778 8.70548 13.3072 8.00001 13.8796C7.29453 13.3072 6.79592 12.4778 6.46032 11.5035C6.13462 10.5579 5.9721 9.5023 5.91784 8.47784C6.58355 8.47892 7.27164 8.48494 7.98959 8.49989C7.99653 8.50004 8.00347 8.50004 8.01042 8.49989C8.76493 8.48417 9.43715 8.47833 10.0822 8.47771ZM4.91661 8.47951C4.43411 8.48168 3.962 8.48548 3.49714 8.48922C2.99784 8.49323 2.50691 8.49718 2.02045 8.49899C2.2341 11.094 4.09907 13.2209 6.56227 13.8266C6.1023 13.2344 5.76241 12.5479 5.51484 11.8291C5.14541 10.7566 4.97157 9.58487 4.91661 8.47951ZM9.43774 13.8266C9.89771 13.2344 10.2376 12.5479 10.4852 11.8291C10.8545 10.7569 11.0283 9.58549 11.0834 8.48039C11.4269 8.48234 11.771 8.48511 12.1244 8.48796C12.7045 8.49264 13.3098 8.49752 13.9795 8.4993C13.7658 11.0941 11.9008 13.2209 9.43774 13.8266ZM13.9794 7.49928C13.3241 7.49751 12.7264 7.49271 12.1508 7.48809C11.7885 7.48518 11.435 7.48234 11.0814 7.48037C11.0242 6.38681 10.8501 5.23042 10.4852 4.17085C10.2376 3.45208 9.89771 2.76557 9.43774 2.17336C11.9004 2.77897 13.7651 4.90509 13.9794 7.49928ZM1 8C1 4.13401 4.13401 1 8 1C11.866 1 15 4.13401 15 8C15 11.866 11.866 15 8 15C4.13401 15 1 11.866 1 8Z" class="Union" clip-rule="evenodd" stroke="none"/>
</symbol>
</svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 114 KiB

After

Width:  |  Height:  |  Size: 116 KiB

3
frappe/public/images/web.svg Normal file
View file

@ -0,0 +1,3 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path stroke="none" fill="#888" fill-rule="evenodd" clip-rule="evenodd" d="M2.02062 7.49896C2.49506 7.49716 2.97742 7.4933 3.47006 7.48935C3.94277 7.48556 4.42495 7.48169 4.9187 7.47951C4.97589 6.3862 5.14998 5.23014 5.51484 4.17085C5.76241 3.45208 6.1023 2.76557 6.56226 2.17336C4.09972 2.77895 2.23508 4.90491 2.02062 7.49896ZM8 2.1204C7.29452 2.69277 6.79592 3.52219 6.46032 4.49652C6.13931 5.4285 5.97681 6.46734 5.92025 7.4779C6.5896 7.47899 7.28127 7.485 8 7.49989C8.7546 7.48425 9.43077 7.47841 10.0797 7.47777C10.0232 6.46725 9.86068 5.42846 9.53968 4.49651C9.20408 3.52219 8.70548 2.69277 8 2.1204ZM10.0822 8.47771C10.0279 9.50221 9.8654 10.5578 9.53968 11.5035C9.20409 12.4778 8.70548 13.3072 8.00001 13.8796C7.29453 13.3072 6.79592 12.4778 6.46032 11.5035C6.13462 10.5579 5.9721 9.5023 5.91784 8.47784C6.58355 8.47892 7.27164 8.48494 7.98959 8.49989C7.99653 8.50004 8.00347 8.50004 8.01042 8.49989C8.76493 8.48417 9.43715 8.47833 10.0822 8.47771ZM4.91661 8.47951C4.43411 8.48168 3.962 8.48548 3.49714 8.48922C2.99784 8.49323 2.50691 8.49718 2.02045 8.49899C2.2341 11.094 4.09907 13.2209 6.56227 13.8266C6.1023 13.2344 5.76241 12.5479 5.51484 11.8291C5.14541 10.7566 4.97157 9.58487 4.91661 8.47951ZM9.43774 13.8266C9.89771 13.2344 10.2376 12.5479 10.4852 11.8291C10.8545 10.7569 11.0283 9.58549 11.0834 8.48039C11.4269 8.48234 11.771 8.48511 12.1244 8.48796C12.7045 8.49264 13.3098 8.49752 13.9795 8.4993C13.7658 11.0941 11.9008 13.2209 9.43774 13.8266ZM13.9794 7.49928C13.3241 7.49751 12.7264 7.49271 12.1508 7.48809C11.7885 7.48518 11.435 7.48234 11.0814 7.48037C11.0242 6.38681 10.8501 5.23042 10.4852 4.17085C10.2376 3.45208 9.89771 2.76557 9.43774 2.17336C11.9004 2.77897 13.7651 4.90509 13.9794 7.49928ZM1 8C1 4.13401 4.13401 1 8 1C11.866 1 15 4.13401 15 8C15 11.866 11.866 15 8 15C4.13401 15 1 11.866 1 8Z"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.9 KiB

78
frappe/public/js/frappe/ui/sidebar.js
View file

@ -111,43 +111,71 @@ frappe.ui.Sidebar = class Sidebar {
for (var app of frappe.boot.app_data) {
frappe.boot.app_data_map[app.app_name] = app;
if (app.workspaces?.length) {
$(`<div class="app-item" data-app-name="${app.app_name}"
data-app-home="${app.app_home}">
<a>
<div class="sidebar-item-icon">
<img
style="margin-right: var(--margin-sm);"
class="app-logo"
src="${app.app_logo_url}"
alt="${__("App Logo")}"
>
</div>
<span>${app.app_title}</span>
</a>
</div>`).appendTo(app_switcher_menu);
this.add_app_item(app, app_switcher_menu);
}
}
this.add_website_select(app_switcher_menu);
this.setup_select_app(app_switcher_menu);
}
add_app_item(app, app_switcher_menu) {
$(`<div class="app-item" data-app-name="${app.app_name}"
data-app-home="${app.app_home}">
<a>
<div class="sidebar-item-icon">
<img
style="margin-right: var(--margin-sm);"
class="app-logo"
src="${app.app_logo_url}"
alt="${__("App Logo")}"
>
</div>
<span>${app.app_title}</span>
</a>
</div>`).appendTo(app_switcher_menu);
}
setup_select_app(app_switcher_menu) {
app_switcher_menu.find(".app-item").on("click", (e) => {
let item = $(e.delegateTarget);
let route = item.attr("data-app-home");
frappe.current_app = item.attr("data-app-name");
frappe.set_route(item.attr("data-app-home"));
this.wrapper
.find(".app-switcher-dropdown .sidebar-item-icon img")
.attr("src", frappe.boot.app_data_map[frappe.current_app].app_logo_url);
this.wrapper
.find(".app-switcher-dropdown .sidebar-item-label")
.html(frappe.boot.app_data_map[frappe.current_app].app_title);
if (route.startsWith("/app")) {
frappe.set_route(item.attr("data-app-home"));
// hide menu
app_switcher_menu.toggleClass("hidden");
this.wrapper
.find(".app-switcher-dropdown .sidebar-item-icon img")
.attr("src", frappe.boot.app_data_map[frappe.current_app].app_logo_url);
this.wrapper
.find(".app-switcher-dropdown .sidebar-item-label")
.html(frappe.boot.app_data_map[frappe.current_app].app_title);
// re-render the sidebar
this.make_sidebar();
// hide menu
app_switcher_menu.toggleClass("hidden");
// re-render the sidebar
this.make_sidebar();
} else {
// new page
window.open(route);
}
});
}
add_website_select(app_switcher_menu) {
$(`<div class="divider"></div>`).appendTo(app_switcher_menu);
this.add_app_item(
{
app_name: "website",
app_title: __("Website"),
app_home: "/",
app_logo_url: "/assets/frappe/images/web.svg",
},
app_switcher_menu
);
}
setup_pages() {
this.sidebar_pages = frappe.boot.sidebar_pages;
this.all_pages = this.sidebar_pages.pages;

1
frappe/public/js/frappe/views/treeview.js
View file

@ -86,6 +86,7 @@ frappe.views.TreeView = class TreeView {
var me = this;
if (!this.opts || !this.opts.do_not_make_page) {
this.parent = frappe.container.add_page(this.page_name);
$(this.parent).addClass("treeview");
frappe.ui.make_app_page({ parent: this.parent, single_column: true });
this.page = this.parent.page;
frappe.container.change_to(this.page_name);

4
frappe/public/scss/desk/sidebar.scss
View file

@ -115,7 +115,7 @@ body {
}
.divider {
margin: var(--margin-md) 0;
margin: var(--margin-xs) 0;
border-top: 1px solid var(--border-color);
}
@ -225,7 +225,7 @@ body {
a {
text-decoration: none;
display: flex;
vertical-align: middle;
align-items: center;
}
}

8
frappe/public/scss/desk/tree.scss
View file

@ -1,5 +1,13 @@
.treeview {
.layout-main-section {
max-width: var(--page-max-width);
margin: auto;
}
}
.tree {
padding: var(--padding-sm);
.btn-group {
.btn {
box-shadow: none;