From 07f2979bacd048e79c81526de82d32b8fd6f2ac8 Mon Sep 17 00:00:00 2001 From: Aaron Brodeur Date: Wed, 13 Mar 2024 12:13:28 -0700 Subject: [PATCH 01/10] Sidebar & header styling progress --- src/renderer/public/moss-icon.svg | 180 ++++++++++++++++++++ src/renderer/src/elements/groups-sidebar.ts | 22 ++- src/renderer/src/elements/main-dashboard.ts | 48 ++++-- src/renderer/src/elements/sidebar-button.ts | 64 +------ yarn.lock | 12 +- 5 files changed, 247 insertions(+), 79 deletions(-) create mode 100644 src/renderer/public/moss-icon.svg diff --git a/src/renderer/public/moss-icon.svg b/src/renderer/public/moss-icon.svg new file mode 100644 index 00000000..0ff85cb4 --- /dev/null +++ b/src/renderer/public/moss-icon.svg @@ -0,0 +1,180 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/renderer/src/elements/groups-sidebar.ts b/src/renderer/src/elements/groups-sidebar.ts index eea65f0c..e8be8079 100644 --- a/src/renderer/src/elements/groups-sidebar.ts +++ b/src/renderer/src/elements/groups-sidebar.ts @@ -230,7 +230,7 @@ export class GroupsSidebar extends LitElement { ${this.renderGroupsLoading()} - { @@ -305,6 +305,26 @@ export class GroupsSidebar extends LitElement { .active .dropzone-indicator { display: block; } + + .sidebar { + padding-bottom: 10px; + } + + .sidebar-button { + width: 40px; + height: 40px; + outline: none; + border: none; + color: #fff; + background: linear-gradient(270deg, #394333 0%, #526C44 100%); + box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25); + border-radius: 5px; + } + + .sidebar-button:hover { + background: linear-gradient(270deg, #495542 0%, #67924F 100%); + cursor: pointer; + } `, ]; } diff --git a/src/renderer/src/elements/main-dashboard.ts b/src/renderer/src/elements/main-dashboard.ts index f707b7e1..d914ed31 100644 --- a/src/renderer/src/elements/main-dashboard.ts +++ b/src/renderer/src/elements/main-dashboard.ts @@ -1011,10 +1011,8 @@ export class MainDashboard extends LitElement { ? 'selected' : ''}" > - + > + + Date: Wed, 13 Mar 2024 17:22:53 -0700 Subject: [PATCH 02/10] Group welcome screen --- src/renderer/src/elements/feed-element.ts | 40 ++++++++----- src/renderer/src/elements/groups-sidebar.ts | 6 +- src/renderer/src/elements/main-dashboard.ts | 58 +++++++++++++------ src/renderer/src/layout/views/welcome-view.ts | 46 ++++++++++----- 4 files changed, 98 insertions(+), 52 deletions(-) diff --git a/src/renderer/src/elements/feed-element.ts b/src/renderer/src/elements/feed-element.ts index fb8ea774..8ca72f1a 100644 --- a/src/renderer/src/elements/feed-element.ts +++ b/src/renderer/src/elements/feed-element.ts @@ -87,20 +87,22 @@ export class FeedElement extends LitElement { } }} > -
- - ${timeAgo.format( +
+
+ + - ${this.notification.notification.title} +
+ ${timeAgo.format( this.notification.notification.timestamp, - )} + )}
- ${this.notification.notification.title} ${this.notification.notification.icon_src ? html`` : html``} - ${this.notification.notification.notification_type} +
${messageParts.map((part) => { @@ -124,7 +128,7 @@ export class FeedElement extends LitElement { return html` @@ -168,14 +172,18 @@ export class FeedElement extends LitElement { .notification { padding: 10px; border-radius: 10px; - background: var(--sl-color-tertiary-200); + background: rgba(22, 35, 17, 1.0); margin: 5px; - box-shadow: 1px 1px 3px var(--sl-color-primary-800); + border: 2px solid cursor: pointer; + color: #fff; + border: 2px solid rgba(96, 124, 4, .50); + transition: all .25s ease; } .notification:hover { - background: var(--sl-color-tertiary-100); + background-color: rgba(96, 124, 4, 1.0); + cursor: pointer; } `, weStyles, diff --git a/src/renderer/src/elements/groups-sidebar.ts b/src/renderer/src/elements/groups-sidebar.ts index e8be8079..e2b62c0e 100644 --- a/src/renderer/src/elements/groups-sidebar.ts +++ b/src/renderer/src/elements/groups-sidebar.ts @@ -230,7 +230,7 @@ export class GroupsSidebar extends LitElement { ${this.renderGroupsLoading()} -
- this.openClipboard()} @keypress=${(e: KeyboardEvent) => { if (e.key === 'Enter') { this.openClipboard(); } - }} + }}> + +
-
+
+
@@ -1087,7 +1088,7 @@ export class MainDashboard extends LitElement { tabindex="0" class="moss-button-icon" .src=${wrapPathInSvg(mdiMagnify)} - style="color: #fff; height: 24px;" + style="color: #fff; height: 24px; width: 24px" > @@ -1148,7 +1149,7 @@ export class MainDashboard extends LitElement { > ` - : html`
Home
`} + : html``}
@@ -1328,17 +1329,13 @@ export class MainDashboard extends LitElement { left: 74px; bottom: 0; right: 0; + padding-left: 8px; + background-color: rgba(57, 67, 50, 1.0); } #group-view-area { overflow: hidden; - border-radius: 5px; - border-left: 8px solid rgba(57, 67, 51, 1.0); - filter: drop-shadow(0px 4px 10px rgba(0, 0, 0, 0.5)); - border-top: 2px solid rgba(115, 167, 114, .40); - max-height: calc(100vh - 90px); - background-color: rgba(86, 113, 71, 1.0); - padding: 8px; + max-height: calc(100vh - 70px); } .invisible-scrollbars { diff --git a/src/renderer/src/elements/topbar-button.ts b/src/renderer/src/elements/topbar-button.ts index 19e29946..57b9d5b1 100644 --- a/src/renderer/src/elements/topbar-button.ts +++ b/src/renderer/src/elements/topbar-button.ts @@ -86,60 +86,8 @@ export class TopBarButton extends LitElement { .icon-container:hover { background-color: var(--hover-color, var(--sl-color-primary-900)); } - .icon-container:hover::after { - pointer-events: none; - content: ''; - position: absolute; - display: block; - background-color: transparent; - bottom: 0; - right: -60px; - height: 30px; - width: 60px; - border-radius: 0 0 0 30px; - box-shadow: -30px 0 0 0 var(--hover-color, var(--sl-color-primary-900)); - } - .icon-container:hover::before { - pointer-events: none; - content: ''; - position: absolute; - display: block; - background-color: transparent; - bottom: 0; - left: -60px; - height: 30px; - width: 60px; - border-radius: 0 0 30px 0; - box-shadow: 30px 0 0 0 var(--hover-color, var(--sl-color-primary-900)); - } - .selected { - background-color: var(--hover-color, var(--sl-color-primary-900)); - } - .selected::after { - pointer-events: none; - content: ''; - position: absolute; - display: block; - background-color: transparent; - bottom: 0; - right: -60px; - height: 30px; - width: 60px; - border-radius: 0 0 0 30px; - box-shadow: -30px 0 0 0 var(--hover-color, var(--sl-color-primary-900)); - } - .selected::before { - pointer-events: transparent; - content: ''; - position: absolute; - display: block; - background-color: transparent; - bottom: 0; - left: -60px; - height: 30px; - width: 60px; - border-radius: 0 0 30px 0; - box-shadow: 30px 0 0 0 var(--hover-color, var(--sl-color-primary-900)); + .selected, .icon-container:hover { + background: linear-gradient(180deg, #67F075 0%, #556F46 100%); } `, ]; diff --git a/src/renderer/src/groups/elements/group-home.ts b/src/renderer/src/groups/elements/group-home.ts index 91061d5b..0e9e10a0 100644 --- a/src/renderer/src/groups/elements/group-home.ts +++ b/src/renderer/src/groups/elements/group-home.ts @@ -433,7 +433,7 @@ export class GroupHome extends LitElement { >${msg('Group DNA Hash: ')}${encodeHashToBase64(this.groupStore.groupDnaHash)}
-
+
+
`; } @@ -254,6 +255,9 @@ export class AppletViewEl extends LitElement { css` :host { display: flex; + background-color: rgba(86, 113, 71, 1.0); + padding: 8px; + border-radius: 5px 0 0 0; } `, weStyles, From 68f86428b00049778f2571fcdbbae790d0cb89e5 Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 26 Mar 2024 19:54:08 +0100 Subject: [PATCH 04/10] fixed systray icon filenames for macos --- resources/icons/32x32.png | Bin 2734 -> 0 bytes resources/icons/icon_priority_high_32x32.png | Bin 10156 -> 0 bytes resources/icons/icon_priority_medium_32x32.png | Bin 9954 -> 0 bytes src/main/index.ts | 6 +++--- 4 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 resources/icons/32x32.png delete mode 100644 resources/icons/icon_priority_high_32x32.png delete mode 100644 resources/icons/icon_priority_medium_32x32.png diff --git a/resources/icons/32x32.png b/resources/icons/32x32.png deleted file mode 100644 index dc7dfdda4885e1900bd165b37c6b33e652961b1f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2734 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 diff --git a/src/main/index.ts b/src/main/index.ts index 618ba3c5..ff012e11 100644 --- a/src/main/index.ts +++ b/src/main/index.ts @@ -217,12 +217,12 @@ let SYSTRAY: Tray | undefined = undefined; let isAppQuitting = false; // icons -const SYSTRAY_ICON_DEFAULT = nativeImage.createFromPath(path.join(ICONS_DIRECTORY, '32x32.png')); +const SYSTRAY_ICON_DEFAULT = nativeImage.createFromPath(path.join(ICONS_DIRECTORY, '32x32@2x.png')); const SYSTRAY_ICON_HIGH = nativeImage.createFromPath( - path.join(ICONS_DIRECTORY, 'icon_priority_high_32x32.png'), + path.join(ICONS_DIRECTORY, 'icon_priority_high_32x32@2x.png'), ); const SYSTRAY_ICON_MEDIUM = nativeImage.createFromPath( - path.join(ICONS_DIRECTORY, 'icon_priority_medium_32x32.png'), + path.join(ICONS_DIRECTORY, 'icon_priority_medium_32x32@2x.png'), ); const handleSignZomeCall = (_e: IpcMainInvokeEvent, zomeCall: ZomeCallUnsignedNapi) => { From 89177f155ff0242d44c9709ad2b259103fbe573d Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 26 Mar 2024 19:55:00 +0100 Subject: [PATCH 05/10] updated notebooks in example config --- we.dev.config.example.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/we.dev.config.example.ts b/we.dev.config.example.ts index 1e556d8b..638f611e 100644 --- a/we.dev.config.example.ts +++ b/we.dev.config.example.ts @@ -91,7 +91,7 @@ export default defineConfig({ }, source: { type: 'https', - url: 'https://github.com/lightningrodlabs/notebooks/releases/download/v0.0.8/notebooks.webhapp', + url: 'https://github.com/lightningrodlabs/notebooks/releases/download/v0.2.4/notebooks.webhapp', }, }, ], From 825f1f0439df1a250eff3a70a28e5945513b751b Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 26 Mar 2024 20:04:25 +0100 Subject: [PATCH 06/10] added systray icons --- resources/icons/32x32@2x.png | Bin 0 -> 2734 bytes resources/icons/icon_priority_high_32x32@2x.png | Bin 0 -> 10156 bytes .../icons/icon_priority_medium_32x32@2x.png | Bin 0 -> 9954 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 resources/icons/32x32@2x.png create mode 100644 resources/icons/icon_priority_high_32x32@2x.png create mode 100644 resources/icons/icon_priority_medium_32x32@2x.png diff --git a/resources/icons/32x32@2x.png b/resources/icons/32x32@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..dc7dfdda4885e1900bd165b37c6b33e652961b1f GIT binary patch literal 2734 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 literal 0 HcmV?d00001 From 0585b26a46dcdc6595116a19b6b08aa33bf95c32 Mon Sep 17 00:00:00 2001 From: Aaron Brodeur Date: Tue, 26 Mar 2024 16:56:01 -0700 Subject: [PATCH 07/10] Mostly improvements to group home --- .../src/elements/group-applets-sidebar.ts | 2 +- src/renderer/src/elements/topbar-button.ts | 1 + .../src/groups/elements/group-home.ts | 104 ++++++++++++------ .../src/groups/elements/group-peers-status.ts | 15 ++- 4 files changed, 86 insertions(+), 36 deletions(-) diff --git a/src/renderer/src/elements/group-applets-sidebar.ts b/src/renderer/src/elements/group-applets-sidebar.ts index 1f41a278..69a51d4c 100644 --- a/src/renderer/src/elements/group-applets-sidebar.ts +++ b/src/renderer/src/elements/group-applets-sidebar.ts @@ -55,7 +55,7 @@ export class GroupAppletsSidebar extends LitElement { class="row" style="align-items: center; font-size: 20px; padding-left: 10px; font-weight: 500;" > - No applets installed in this group... + No applets installed. Join an applet to get started...
`; } diff --git a/src/renderer/src/elements/topbar-button.ts b/src/renderer/src/elements/topbar-button.ts index 57b9d5b1..f8f6ff10 100644 --- a/src/renderer/src/elements/topbar-button.ts +++ b/src/renderer/src/elements/topbar-button.ts @@ -81,6 +81,7 @@ export class TopBarButton extends LitElement { justify-content: center; border-radius: 20% 20% 0 0; height: var(--sidebar-width); + margin: 0 2px; width: var(--sidebar-width); } .icon-container:hover { diff --git a/src/renderer/src/groups/elements/group-home.ts b/src/renderer/src/groups/elements/group-home.ts index 0e9e10a0..2ee4008e 100644 --- a/src/renderer/src/groups/elements/group-home.ts +++ b/src/renderer/src/groups/elements/group-home.ts @@ -352,43 +352,43 @@ export class GroupHome extends LitElement { (info) => html`
-
- ${timeAgo.format(new Date(info.timestamp / 1000))} +
+
+ + ${msg('added an instance of ')} + ${info.appEntry ? info.appEntry.title : 'unknown'}  + +
+
+ ${timeAgo.format(new Date(info.timestamp / 1000))} +
-
- - ${msg('added a new instance of ')} +
+ -
${info.logo - ? html`Applet logo` + ? html`Applet logo` : html``} - ${info.appEntry ? info.appEntry.title : 'unknown'}  -
- ${msg('with the name ')} - ${info.appletEntry ? info.appletEntry.custom_name : 'unknown'}
-
- ${msg('joined by: ')} +
+ ${msg('Participants ')} ${info.joinedMembers.map( (agentKey) => html`
+
${groupProfile.name} +
${groupProfile.name}
@@ -472,7 +474,7 @@ export class GroupHome extends LitElement {
- ${msg('Joinable Applets')} + ${msg('Joinable Applets')} @@ -547,7 +549,7 @@ export class GroupHome extends LitElement {
${msg('Invite Member')}
@@ -698,7 +700,7 @@ export class GroupHome extends LitElement { return html``; return html` - ${msg( 'Create your personal profile for this group. Only members of this group will be able to see your profile.', @@ -725,6 +727,37 @@ export class GroupHome extends LitElement { padding: 8px; border-radius: 5px 0 0 0; } + + .agents-list { + color: #fff; + } + + .card-header { + width: 100%; + display: flex; + justify-content: space-between; + align-items: center; + } + + .instance-details { + display: flex; + font-size: 12px; + align-items: center; + } + + .card-content { + display: flex; + align-items: center; + padding-top: 15px; + justify-content: center; + } + + .card-footer { + display: flex; + justify-content: space-between; + align-items: center; + } + sl-tab-panel::part(base) { width: 600px; } @@ -734,6 +767,13 @@ export class GroupHome extends LitElement { } .title { font-size: 25px; + font-weight: bold; + color: #fff; + } + .subtitle { + font-size: 18px; + font-weight: bold; + color: #fff; } .invite-btn::part(base) { background-color: var(--sl-color-secondary-200); @@ -744,8 +784,8 @@ export class GroupHome extends LitElement { margin: 10px; --border-radius: 15px; border: none; - --border-color: transparent; - --sl-panel-background-color: var(--sl-color-tertiary-0); + --border-color: none; + --sl-panel-background-color: #fbffe7; } .online-status-bar { color: var(--sl-color-secondary-100); diff --git a/src/renderer/src/groups/elements/group-peers-status.ts b/src/renderer/src/groups/elements/group-peers-status.ts index 6aec9597..5eae32f2 100644 --- a/src/renderer/src/groups/elements/group-peers-status.ts +++ b/src/renderer/src/groups/elements/group-peers-status.ts @@ -3,7 +3,7 @@ import { StoreSubscriber } from '@holochain-open-dev/stores'; import { AgentPubKey, DnaHash } from '@holochain/client'; import { consume } from '@lit/context'; import { localized, msg } from '@lit/localize'; -import { html, LitElement } from 'lit'; +import { css, html, LitElement } from 'lit'; import { customElement, property } from 'lit/decorators.js'; import '@holochain-open-dev/peer-status/dist/elements/list-agents-by-status.js'; @@ -32,7 +32,7 @@ export class GroupPeersStatus extends LitElement { renderPeersStatus(members: AgentPubKey[]) { return html` m.toString() !== this._groupStore.groupClient.appAgentClient.myPubKey.toString(), )} @@ -56,5 +56,14 @@ export class GroupPeersStatus extends LitElement { } } - static styles = weStyles; + + + static styles = [ + weStyles, + css` + .agents-list { + color: #fff; + } + `, + ]; } From d7ca2557475f8337f8ed8f1791cfca98687fde9f Mon Sep 17 00:00:00 2001 From: Aaron Brodeur Date: Tue, 26 Mar 2024 17:16:53 -0700 Subject: [PATCH 08/10] Yarn.lock --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 3fd3b6b7..ad90354b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1740,8 +1740,8 @@ "@holochain-open-dev/stores" "0.300.0-dev.0" "@holochain-open-dev/utils" "0.300.0-dev.0" "@holochain/client" "^0.17.0-dev.7" - "@lightningrodlabs/we-applet" "file:../../Library/Caches/Yarn/v6/npm-@lightningrodlabs-attachments-0.6.0-176094eb-f4d6-43dd-8efa-cfa65ea61b93-1711497661770/node_modules/@lightningrodlabs/we-applet" - "@lightningrodlabs/we-elements" "file:../../Library/Caches/Yarn/v6/npm-@lightningrodlabs-attachments-0.6.0-176094eb-f4d6-43dd-8efa-cfa65ea61b93-1711497661770/node_modules/@lightningrodlabs/we-elements" + "@lightningrodlabs/we-applet" "file:../../Library/Caches/Yarn/v6/npm-@lightningrodlabs-attachments-0.6.0-6c26cc35-9b44-48d4-940d-cd48437840e8-1711498041488/node_modules/@lightningrodlabs/we-applet" + "@lightningrodlabs/we-elements" "file:../../Library/Caches/Yarn/v6/npm-@lightningrodlabs-attachments-0.6.0-6c26cc35-9b44-48d4-940d-cd48437840e8-1711498041488/node_modules/@lightningrodlabs/we-elements" "@lit/context" "^1.0.1" "@lit/localize" "^0.12.0" "@material/web" "=1.0.0-pre.9" @@ -1791,7 +1791,7 @@ "@holochain-open-dev/stores" "0.300.0-dev.0" "@holochain-open-dev/utils" "0.300.0-dev.0" "@holochain/client" "^0.17.0-dev.7" - "@lightningrodlabs/we-applet" "file:../../Library/Caches/Yarn/v6/npm-@lightningrodlabs-we-elements-0.5.0-291412eb-85e9-4cd5-8260-9d0445cfcce3-1711497661769/node_modules/@lightningrodlabs/we-applet" + "@lightningrodlabs/we-applet" "file:../../Library/Caches/Yarn/v6/npm-@lightningrodlabs-we-elements-0.5.0-a6064f05-c084-4b78-8d52-265076db0e2c-1711498041487/node_modules/@lightningrodlabs/we-applet" "@lit/context" "^1.0.1" "@lit/localize" "^0.12.0" "@mdi/js" "^7.2.0" From 0d2eb8856ba9f6193e1b1591a6907d696abe5644 Mon Sep 17 00:00:00 2001 From: Matthias Date: Wed, 27 Mar 2024 09:01:44 +0100 Subject: [PATCH 09/10] version bump --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a8ab4b26..76577475 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "org.lightningrodlabs.we-electron-alpha", - "version": "0.11.5", + "version": "0.11.6", "private": true, "description": "Moss (Alpha)", "main": "./out/main/index.js", From a30e03498cd0118f6bf356e2d75d777af84df1b4 Mon Sep 17 00:00:00 2001 From: Matthias Date: Wed, 27 Mar 2024 11:39:40 +0100 Subject: [PATCH 10/10] fixed wand button, formatting --- src/renderer/src/elements/main-dashboard.ts | 41 +++++++++++---------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/src/renderer/src/elements/main-dashboard.ts b/src/renderer/src/elements/main-dashboard.ts index 9ad4c60d..38575eaf 100644 --- a/src/renderer/src/elements/main-dashboard.ts +++ b/src/renderer/src/elements/main-dashboard.ts @@ -1009,7 +1009,8 @@ export class MainDashboard extends LitElement { ? 'selected' : ''}" > -
@@ -1274,9 +1278,8 @@ export class MainDashboard extends LitElement { .top-left-corner:hover { border-radius: 100% 0 0 100%; - background: linear-gradient(90deg, #96D96E 0%, #394333 90.91%); + background: linear-gradient(90deg, #96d96e 0%, #394333 90.91%); cursor: pointer; - } .hover-browser { @@ -1330,7 +1333,7 @@ export class MainDashboard extends LitElement { bottom: 0; right: 0; padding-left: 8px; - background-color: rgba(57, 67, 50, 1.0); + background-color: rgba(57, 67, 50, 1); } #group-view-area { @@ -1458,7 +1461,7 @@ export class MainDashboard extends LitElement { left: 0; top: 0; bottom: 0; - background: linear-gradient(270deg, #101C09 0%, #293C2C 100%); + background: linear-gradient(270deg, #101c09 0%, #293c2c 100%); } .left-group-sidebar { @@ -1529,13 +1532,13 @@ export class MainDashboard extends LitElement { outline: none; border: none; color: #fff; - background: linear-gradient(270deg, #394333 0%, #526C44 100%); + background: linear-gradient(270deg, #394333 0%, #526c44 100%); box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25); - border-radius: 5px; + border-radius: 5px; } .moss-button:hover { - background: linear-gradient(270deg, #495542 0%, #67924F 100%); + background: linear-gradient(270deg, #495542 0%, #67924f 100%); cursor: pointer; } `,