release 1.0.0

Connoropolous · Connoropolous · commit 63abb06f9d45 · 2022-05-26T10:32:06.000-07:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -95,16 +95,16 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          gh release upload "${GITHUB_REF#refs/tags/}" "electron/out/Acorn-0.9.0-alpha3.AppImage" --clobber
+          gh release upload "${GITHUB_REF#refs/tags/}" "electron/out/Acorn-1.0.0-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-0.9.0-alpha3.dmg" --clobber
+          gh release upload "${GITHUB_REF#refs/tags/}" "electron/out/Acorn-1.0.0-alpha.dmg" --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.0.9.0-alpha3.exe" --clobber
+          gh release upload "$($env:GITHUB_REF -replace "refs/tags/")" "electron/out/Acorn.Setup.1.0.0-alpha.exe" --clobber
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": "0.9.0-alpha3",
+  "version": "1.0.0-alpha",
   "description": "Create the future",
   "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": "0.9.0-alpha3",
+  "version": "1.0.0-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><link rel="stylesheet" href="splashscreen.css"/></head><body><div class="splash-wrapper"><div class="splash-image-wrapper"><div class="splash-image-caption">Photograph by Andrey Svistunov</div></div><div class="splash-content-wrapper"><div><div class="splash-logo">acorn</div><div class="splash-version">version 0.9.0-alpha3</div></div><div class="splash-loading-message" id="activity">Setting up Holochain...</div><div class="splash-description">Acorn is a way of organizing intended outcomes and outcomes in tree-like structures. You can think of it as a virtual whiteboard for collaborative planning. It could have many uses, and one that it has served is organizing the vision and work allocation of distributed teams of software developers. Other uses could be as a personal planning tool, for teams completely aside from software, or anything where linked/inter-related nodes in a structured form would be helpful.</div><div class="splash-license">© 2020-2021 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>
+<!doctype html><html><head><title>Acorn</title></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 1.0.0-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-2022 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": "0.9.0-alpha3",
+  "version": "1.0.0-alpha",
   "devDependencies": {
     "@babel/core": "^7.5.5",
     "@babel/preset-env": "7.5.5",
diff --git a/web/src/components/ImportProjectModal/ImportProjectModal.js b/web/src/components/ImportProjectModal/ImportProjectModal.js
@@ -149,7 +149,7 @@ export default function ImportProjectModal({
 
   const onFilePicked = async projectData => {
     if (!projectData.tags) {
-      alert('Cannot import projects from versions prior to v0.9.0-alpha')
+      alert('Cannot import projects from versions prior to v1.0.0-alpha')
       onClose()
       return
     }
diff --git a/web/src/global.scss b/web/src/global.scss
@@ -20,7 +20,7 @@ canvas {
 }
 
 body {
-  background-color: #f7f5f3;
+  background-color: var(--bg-color-canvas);
   font-family: 'PlusJakartaSans-medium', Helvetica, Sans-Serif;
   word-spacing: 0.05em;
 }
diff --git a/web/src/images/acorn-splash-andrey-svistunov-unsplash.jpg b/web/src/images/acorn-splash-andrey-svistunov-unsplash.jpg
diff --git a/web/src/images/splash-image.png b/web/src/images/splash-image.png
diff --git a/web/src/import/index.ts b/web/src/import/index.ts
@@ -237,15 +237,15 @@ export default async function importAllProjectData(
   }
 
   // TAGS
-  // only v0.9.0-alpha and beyond have tags
+  // only v1.0.0-alpha and beyond have tags
   if (projectData.tags) {
     for (let address of Object.keys(projectData.tags)) {
       const old = projectData.tags[address]
       const clone = {
         ...old,
       }
       // an assigned field
-      // v0.9.0-alpha
+      // v1.0.0-alpha
       delete clone.headerHash
 
       try {
diff --git a/web/src/routes/ProjectView/MapView/MapView.component.tsx b/web/src/routes/ProjectView/MapView/MapView.component.tsx
@@ -5,7 +5,7 @@ import render from '../../../drawing'
 import setupEventListeners from '../../../event-listeners'
 import { setScreenDimensions } from '../../../redux/ephemeral/screensize/actions'
 
-import EmptyState from '../../../components/ProjectEmptyState/ProjectEmptyState'
+import ProjectEmptyState from '../../../components/ProjectEmptyState/ProjectEmptyState'
 import MultiEditBar from '../../../components/MultiEditBar/MultiEditBar.connector'
 import ConnectionConnectors from '../../../components/ConnectionConnectors/ConnectionConnectors.connector'
 import MapViewOutcomeTitleForm from '../../../components/MapViewOutcomeTitleForm/MapViewOutcomeTitleForm.connector'
@@ -87,8 +87,8 @@ const MapView: React.FC<MapViewProps> = ({
   }
   return (
     <>
+      {showEmptyState && <ProjectEmptyState />}
       <canvas ref={refCanvas} />
-      {showEmptyState && <EmptyState />}
       {/* transform everything in this container according  */}
       {/* to the same scaling and tranlating as the canvas */}
       {/* is being scaled and translated, using css matrix transforms */}
diff --git a/web/src/routes/ProjectView/MapView/MapView.connector.ts b/web/src/routes/ProjectView/MapView/MapView.connector.ts
@@ -9,19 +9,20 @@ function mapDispatchToProps(dispatch) {
 function mapStateToProps(state: RootState): MapViewProps {
   const projectId = state.ui.activeProject
 
+  // TODO: make this also based on whether the user has just registered (created their profile)
+  const showEmptyState =
+    !!state.agentAddress &&
+    ((state.projects.outcomes[projectId] &&
+      Object.values(state.projects.outcomes[projectId]).length === 0) ||
+      // project is loading
+      !state.projects.outcomes[projectId])
   return {
     projectId,
     translate: state.ui.viewport.translate,
     zoomLevel: state.ui.viewport.scale,
     // map from an array type (the selectedOutcomes) to a simple boolean type
     hasSelection: state.ui.selection.selectedOutcomes.length > 0,
-    // TODO: make this also based on whether the user has just registered (created their profile)
-    showEmptyState:
-      !!state.agentAddress &&
-      ((state.projects.outcomes[projectId] &&
-        Object.values(state.projects.outcomes[projectId]).length === 0) ||
-        // project is loading
-        !state.projects.outcomes[projectId]),
+    showEmptyState,
     outcomeFormIsOpen: state.ui.outcomeForm.isOpen,
   }
 }
diff --git a/web/src/routes/ProjectView/MapView/MapView.scss b/web/src/routes/ProjectView/MapView/MapView.scss
@@ -23,7 +23,6 @@
 
 canvas {
   position: absolute;
-  background-color: var(--bg-color-canvas);
 }
 
 /* transform */
diff --git a/web/src/splashscreen.html b/web/src/splashscreen.html
@@ -1,44 +1,44 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <title>Acorn</title>
-    <link rel="stylesheet" type="text/css" href="splashscreen.css" />
-  </head>
-  <body>
-    <div class="splash-wrapper">
-      <div class="splash-image-wrapper">
-        <div class="splash-image-caption">Photograph by Andrey Svistunov</div>
+
+<head>
+  <title>Acorn</title>
+</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 1.0.0-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-content-wrapper">
-        <div>
-          <div class="splash-logo">acorn</div>
-          <div class="splash-version">version 0.9.0-alpha3</div>
-        </div>
-        <div class="splash-loading-message" id="activity">
-          Setting up Holochain...
-        </div>
-        <div class="splash-description">
-          Acorn is a way of organizing intended outcomes and outcomes in tree-like
-          structures. You can think of it as a virtual whiteboard for
-          collaborative planning. It could have many uses, and one that it has
-          served is organizing the vision and work allocation of distributed
-          teams of software developers. Other uses could be as a personal
-          planning tool, for teams completely aside from software, or anything
-          where linked/inter-related nodes in a structured form would be
-          helpful.
-        </div>
-        <div class="splash-license">
-          © 2020-2021 Harris-Braun Enterprises, LLC.
-          <br />
-          Licensed under the Cryptographic Autonomy License v1.0.
-        </div>
+      <div class="splash-license">
+        © 2020-2022 Harris-Braun Enterprises, LLC.
+        <br />
+        Licensed under the Cryptographic Autonomy License v1.0.
       </div>
     </div>
-    <script>
-      const el = document.getElementById('activity')
-      require('electron').ipcRenderer.on('status', (event, message) => {
-        el.innerHTML = message
-      })
-    </script>
-  </body>
-</html>
+  </div>
+  <script>
+    const el = document.getElementById('activity')
+    require('electron').ipcRenderer.on('status', (event, message) => {
+      el.innerHTML = message
+    })
+  </script>
+</body>
+
+</html>
diff --git a/web/src/splashscreen.scss b/web/src/splashscreen.scss

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "acorn",`
`3`		`- "version": "0.9.0-alpha3",`
	`3`	`+ "version": "1.0.0-alpha",`
`4`	`4`	`"description": "Create the future",`
`5`	`5`	`"main": "dist/index.js",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "acorn-ui",`
`3`		`- "version": "0.9.0-alpha3",`
	`3`	`+ "version": "1.0.0-alpha",`
`4`	`4`	`"devDependencies": {`
`5`	`5`	`"@babel/core": "^7.5.5",`
`6`	`6`	`"@babel/preset-env": "7.5.5",`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ export default function ImportProjectModal({`
`149`	`149`
`150`	`150`	`const onFilePicked = async projectData => {`
`151`	`151`	`if (!projectData.tags) {`
`152`		`- alert('Cannot import projects from versions prior to v0.9.0-alpha')`
	`152`	`+ alert('Cannot import projects from versions prior to v1.0.0-alpha')`
`153`	`153`	`onClose()`
`154`	`154`	`return`
`155`	`155`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ canvas {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`body {`
`23`		`- background-color: #f7f5f3;`
	`23`	`+ background-color: var(--bg-color-canvas);`
`24`	`24`	`font-family: 'PlusJakartaSans-medium', Helvetica, Sans-Serif;`
`25`	`25`	`word-spacing: 0.05em;`
`26`	`26`	`}`