Skip to content

Commit c37dad5

Browse files
weswallaweswalla
authored
Merge pull request #372 from weswalla/feature/weave-attachments
Feature/weave attachments
2 parents f336f55 + 076a5ea commit c37dad5

40 files changed

+1838
-98
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Acorn is currently in **Alpha** testing phase.
66

77
## Things you can do
88

9-
- [**Download & install the latest Acorn release**](https://github.com/lightningrodlabs/acorn/releases/tag/v11.1.2).
9+
- [**Download & install the latest Acorn release**](https://github.com/lightningrodlabs/acorn/releases/tag/v11.1.3).
1010

1111
- Check out the [Acorn Knowledge Base](https://docs.acorn.software) to learn more about Acorn, its methodology and features.
1212

‎happs/happ/workdir/acorn-desktop.webhapp‎

24.4 KB
Binary file not shown.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "acorn-workspace",
33
"packageManager": "[email protected]",
4-
"version": "11.1.2",
4+
"version": "11.1.3",
55
"private": true,
66
"workspaces": {
77
"packages": [

‎spec/weave-types.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
```
2+
export type AssetLocationAndInfo = {
3+
appletHash: AppletHash;
4+
assetInfo: AssetInfo;
5+
/**
6+
* Only set if Moss is run in applet development mode and the applet is running in hot-reloading mode
7+
*/
8+
appletDevPort?: number;
9+
};
10+
11+
export type AssetInfo = {
12+
name: string;
13+
icon_src: string;
14+
};
15+
16+
export type AppletInfo = {
17+
appletBundleId: string;
18+
appletName: string;
19+
appletIcon: string;
20+
groupsHashes: Array<DnaHash>;
21+
};
22+
```

‎weave-tool/acorn-moss.webhapp‎

24.2 KB
Binary file not shown.

‎weave-tool/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
"dev-weave2-webhapp": "weave --agent-idx 2 --dev-config weave.dev.config.webhapp.ts"
1111
},
1212
"dependencies": {
13-
"@theweave/cli": "0.13.0-rc.1"
13+
"@theweave/cli": "0.13.2-pre"
1414
}
1515
}

‎weave-tool/weave.dev.config.ts‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@ export default defineConfig({
4444
registeringAgent: 1,
4545
joiningAgents: [2],
4646
},
47+
{
48+
name: 'kando',
49+
instanceName: 'kando',
50+
registeringAgent: 1,
51+
joiningAgents: [2],
52+
},
4753
],
4854
},
4955
],
@@ -62,5 +68,18 @@ export default defineConfig({
6268
uiPort: 8081,
6369
},
6470
},
71+
{
72+
name: 'kando',
73+
subtitle: 'kanban boards',
74+
description: 'Real-time kanban based on syn',
75+
icon: {
76+
type: 'https',
77+
url: 'https://raw.githubusercontent.com/holochain-apps/kando/main/we_dev/kando_icon.png',
78+
},
79+
source: {
80+
type: 'https',
81+
url: 'https://github.com/holochain-apps/kando/releases/download/v0.12.0-rc.1/kando.webhapp',
82+
},
83+
},
6584
],
6685
})

‎web/dist/splashscreen.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!doctype html><html><head><title>Acorn</title><script defer="defer" src="./splash.js"></script></head><body><div class="splash-wrapper"><div class="splash-image-wrapper"><div class="splash-image-caption">Photograph by Valeriia Miller</div></div><div class="splash-content-wrapper"><div><div class="splash-logo">acorn</div><div class="splash-version">version 11.1.2</div></div><div class="splash-loading-message" id="activity">Setting up Holochain...</div><div class="splash-description">Acorn is an open-source, peer-to-peer project management application designed and built for distributed software development teams. Acorn functions through defining Intended Outcomes for a project in a Dependency Tree structure.<br/><br/>Acorn is built as a Holochain application, meaning it runs on decentralized peer-to-peer computing and can be used without server infrastructure or a hosting service. The users of a particular Acorn instance are its hosting power.</div><div class="splash-license">© 2020-2023 Harris-Braun Enterprises, LLC.<br/>Licensed under the Cryptographic Autonomy License v1.0.</div></div></div><script>const el = document.getElementById('activity')
1+
<!doctype html><html><head><title>Acorn</title><script defer="defer" src="./splash.js"></script></head><body><div class="splash-wrapper"><div class="splash-image-wrapper"><div class="splash-image-caption">Photograph by Valeriia Miller</div></div><div class="splash-content-wrapper"><div><div class="splash-logo">acorn</div><div class="splash-version">version 11.1.3</div></div><div class="splash-loading-message" id="activity">Setting up Holochain...</div><div class="splash-description">Acorn is an open-source, peer-to-peer project management application designed and built for distributed software development teams. Acorn functions through defining Intended Outcomes for a project in a Dependency Tree structure.<br/><br/>Acorn is built as a Holochain application, meaning it runs on decentralized peer-to-peer computing and can be used without server infrastructure or a hosting service. The users of a particular Acorn instance are its hosting power.</div><div class="splash-license">© 2020-2023 Harris-Braun Enterprises, LLC.<br/>Licensed under the Cryptographic Autonomy License v1.0.</div></div></div><script>const el = document.getElementById('activity')
22
require('electron').ipcRenderer.on('status', (event, message) => {
33
el.innerHTML = message
44
})</script></body></html>

‎web/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "acorn-ui",
3-
"version": "11.1.2",
3+
"version": "11.1.3",
44
"browser": {
55
"child_process": false
66
},

‎web/src/components/DescendantsAchievementStatus/DescendantsAchievementStatus.scss‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,12 @@
5959
background-color: var(--color-pumpkin);
6060
}
6161
}
62+
63+
&.attachments {
64+
.descendants-scope-wrapper .icon .inner-icon {
65+
background-color: var(--text-color-placeholder);
66+
}
67+
}
6268
}
6369
}
6470

0 commit comments

Comments
 (0)