Merge branch 'main' into pending-projects

lightningrodlabs · Oct 13, 2023 · d8b07d9 · d8b07d9
2 parents 6ac6927 + 1cbbf19
commit d8b07d9
Show file tree

Hide file tree

Showing 39 changed files with 778 additions and 646 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -59,16 +59,16 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          gh release upload "${GITHUB_REF#refs/tags/}" "electron/out/Acorn-9.2.1-alpha.AppImage" --clobber
+          gh release upload "${GITHUB_REF#refs/tags/}" "electron/out/Acorn-9.3.1-alpha.AppImage" --clobber
       - name: upload binary (macos only)
         if: ${{ runner.os == 'macOs' }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          gh release upload "${GITHUB_REF#refs/tags/}" "electron/out/Acorn.9.2.1-alpha.darwin-x64.zip" --clobber
+          gh release upload "${GITHUB_REF#refs/tags/}" "electron/out/Acorn.9.3.1-alpha.darwin-x64.zip" --clobber
       - name: upload binary (Windows only)
         if: ${{ runner.os == 'Windows' }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          gh release upload "$($env:GITHUB_REF -replace "refs/tags/")" "electron/out/Acorn.Setup.9.2.1-alpha.exe" --clobber
+          gh release upload "$($env:GITHUB_REF -replace "refs/tags/")" "electron/out/Acorn.Setup.9.3.1-alpha.exe" --clobber
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ Acorn is currently in **Alpha** testing phase.
 
 ## Things you can do
 
-- [**Download & install the latest Acorn release**](https://github.com/lightningrodlabs/acorn/releases/tag/v9.2.1-alpha).
+- [**Download & install the latest Acorn release**](https://github.com/lightningrodlabs/acorn/releases/tag/v9.3.1-alpha).
 
 - Check out the [Acorn Knowledge Base](https://docs.acorn.software) to learn more about Acorn, its methodology and features.
 

diff --git a/electron/package-lock.json b/electron/package-lock.json
diff --git a/electron/package.json b/electron/package.json
@@ -1,6 +1,6 @@
 {
   "name": "acorn",
-  "version": "9.2.1-alpha",
+  "version": "9.3.1-alpha",
   "description": "Open source peer-to-peer project management for software teams",
   "main": "dist/index.js",
   "scripts": {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "acorn",
-  "version": "9.2.1-alpha",
+  "version": "9.3.1-alpha",
   "description": "Acorn is software that helps people create the future",
   "repository": {
     "type": "git",

diff --git a/web/dist/splashscreen.html b/web/dist/splashscreen.html
@@ -1,4 +1,4 @@
-<!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 9.2.1-alpha</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')
+<!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 9.3.1-alpha</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')
       require('electron').ipcRenderer.on('status', (event, message) => {
         el.innerHTML = message
       })</script></body></html>
diff --git a/web/package-lock.json b/web/package-lock.json
diff --git a/web/package.json b/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "acorn-ui",
-  "version": "9.2.1-alpha",
+  "version": "9.3.1-alpha",
   "browser": {
     "child_process": false
   },

diff --git a/web/src/components/MapViewOutcomeTitleForm/MapViewOutcomeTitleForm.component.tsx b/web/src/components/MapViewOutcomeTitleForm/MapViewOutcomeTitleForm.component.tsx
@@ -26,21 +26,15 @@ export type MapViewOutcomeTitleFormOwnProps = {
 
 export type MapViewOutcomeTitleFormConnectorStateProps = {
   activeAgentPubKey: AgentPubKeyB64
-  scale
+  scale: number
   // the value of the text input
   content: string
   // coordinates in css terms for the box
   leftConnectionXPosition: number
   topConnectionYPosition: number
-  // (optional) the address of an Outcome to connect this Outcome to
-  // in the case of creating an Outcome
-  fromAddress: ActionHashB64
-  // (optional) the relation (relation_as_{child|parent}) between the two
-  // in the case of creating an Outcome
-  relation: RelationInput
+  maybeLinkedOutcome: Option<LinkedOutcomeDetails>
   // (optional) the address of an existing connection that
   // indicates this Outcome as the child of another (a.k.a has a parent)
-  // ASSUMPTION: one parent
   existingParentConnectionAddress: ActionHashB64
 }
 
@@ -63,8 +57,7 @@ const MapViewOutcomeTitleForm: React.FC<MapViewOutcomeTitleFormProps> = ({
   activeAgentPubKey,
   scale,
   content,
-  fromAddress,
-  relation,
+  maybeLinkedOutcome,
   existingParentConnectionAddress,
   leftConnectionXPosition,
   topConnectionYPosition,
@@ -147,7 +140,8 @@ const MapViewOutcomeTitleForm: React.FC<MapViewOutcomeTitleFormProps> = ({
         isImported: false,
         githubLink: '',
       },
-      fromAddress ? { outcomeActionHash: fromAddress, relation, siblingOrder: 0 } : null
+      // could be null and that's ok
+      maybeLinkedOutcome
     )
   }
 

diff --git a/web/src/components/MapViewOutcomeTitleForm/MapViewOutcomeTitleForm.connector.ts b/web/src/components/MapViewOutcomeTitleForm/MapViewOutcomeTitleForm.connector.ts
@@ -8,7 +8,7 @@ import {
   closeOutcomeForm,
   updateContent,
 } from '../../redux/ephemeral/outcome-form/actions'
-import MapViewOutcomeTitleForm, { MapViewOutcomeTitleFormConnectorDispatchProps, MapViewOutcomeTitleFormOwnProps } from './MapViewOutcomeTitleForm.component'
+import MapViewOutcomeTitleForm, { MapViewOutcomeTitleFormConnectorDispatchProps, MapViewOutcomeTitleFormConnectorStateProps, MapViewOutcomeTitleFormOwnProps } from './MapViewOutcomeTitleForm.component'
 import ProjectsZomeApi from '../../api/projectsApi'
 import { getAppWs } from '../../hcWebsockets'
 import { cellIdFromString } from '../../utils'
@@ -23,7 +23,7 @@ import { LAYOUT_ANIMATION_TYPICAL_MS } from '../../constants'
 // to pass it to a component for rendering, as specific properties that
 // that component expects
 
-function mapStateToProps(state: RootState) {
+function mapStateToProps(state: RootState): MapViewOutcomeTitleFormConnectorStateProps {
   const {
     ui: {
       viewport: { scale },
@@ -32,27 +32,16 @@ function mapStateToProps(state: RootState) {
         content,
         leftConnectionXPosition,
         topConnectionYPosition,
-        // these three all relate to each other
-        fromAddress,
-        relation,
-        // ASSUMPTION: one parent
-        existingParentConnectionAddress, // this is optional though
+        maybeLinkedOutcome,
+        existingParentConnectionAddress,
       },
     },
   } = state
 
   return {
+    maybeLinkedOutcome, 
     activeAgentPubKey: state.agentAddress,
     scale,
-    // optional, the address of the Outcome that we are relating this to
-    fromAddress,
-    // optional, the relation (relation_as_{child|parent})
-    // between the potential fromAddress Outcome
-    // and a new Outcome to be created
-    relation,
-    // optional, the address of an existing connection that
-    // indicates this Outcome as the child of another (a.k.a has a parent)
-    // ASSUMPTION: one parent
     existingParentConnectionAddress,
     content,
     leftConnectionXPosition: leftConnectionXPosition,

diff --git a/web/src/components/OutcomeConnector/OutcomeConnector.scss b/web/src/components/OutcomeConnector/OutcomeConnector.scss
@@ -0,0 +1,21 @@
+.outcome-connector {
+  position: absolute;
+  width: 30px;
+  height: 30px;
+  transform: translate(-15px, -15px);
+  background-color: rgba(255, 255, 255, 0.5);
+  border-radius: 10px;
+}
+
+.outcome-connector-blue-dot {
+  background-color: #b1b9ff;
+  width: 10px;
+  height: 10px;
+  border-radius: 5px;
+  margin: 10px;
+}
+
+.outcome-connector:hover .outcome-connector-blue-dot,
+.outcome-connector.active .outcome-connector-blue-dot {
+  background-color: #6772ff;
+}
diff --git a/web/src/components/OutcomeConnector/OutcomeConnector.tsx b/web/src/components/OutcomeConnector/OutcomeConnector.tsx
@@ -0,0 +1,37 @@
+import React from 'react'
+import './OutcomeConnector.scss'
+
+export type OutcomeConnectorProps = {
+  active: boolean
+  pixelTop: number
+  pixelLeft: number
+  onMouseDown: (event: React.MouseEvent) => void
+  onMouseUp: (event: React.MouseEvent) => void
+  onMouseOver: (event: React.MouseEvent) => void
+  onMouseOut: (event: React.MouseEvent) => void
+}
+
+const OutcomeConnector: React.FC<OutcomeConnectorProps> = ({
+  active,
+  pixelTop,
+  pixelLeft,
+  onMouseDown,
+  onMouseUp,
+  onMouseOver,
+  onMouseOut,
+}) => {
+  return (
+    <div
+      className={`outcome-connector ${active ? 'active' : ''}`}
+      style={{ top: `${pixelTop}px`, left: `${pixelLeft}px` }}
+      onMouseDown={onMouseDown}
+      onMouseUp={onMouseUp}
+      onMouseOver={onMouseOver}
+      onMouseOut={onMouseOut}
+    >
+      <div className="outcome-connector-blue-dot" />
+    </div>
+  )
+}
+
+export default OutcomeConnector