changes for v0.0.6

README.md

@@ -83,7 +83,7 @@ npm run build-mac
 ```
 
 The build script expects above mentioned binaries (`holochain-<platform>` and `hc-<platform>`) to be present in the root directory and puts them into the final package with everything else.
-In order to have Linux builds be portable across all Linux distributions, releases need to have a static build of those binaries. There is a branch in [holochain-rust/static-holoscape-build](https://github.com/holochain/holochain-rust/tree/static-holoscape-build) that gets tracked and automatically build and statically linked. Binaries can be downloaded here: https://hydra.holo.host/jobset/holochain-rust/static-holoscape-build.
+In order to have Linux builds be portable across all Linux distributions, releases need to have a static build of those binaries. Currently we use [this bash script](https://github.com/holochain/holochain-rust/commit/41391d89763d3a3ef6cf8bd9af1d21e6cdabb7d3) to make our static builds.  Please not this is subject to change. (How we used to do it: ~~There is a branch in [holochain-rust/static-holoscape-build](https://github.com/holochain/holochain-rust/tree/static-holoscape-build) that gets tracked and automatically build and statically linked. Binaries can be downloaded here: https://hydra.holo.host/jobset/holochain-rust/static-holoscape-build.~~)
 
 ## Contribute
 Holochain is an open source project.  We welcome all sorts of participation and are actively working on increasing surface area to accept it.  Please see our [contributing guidelines](/CONTRIBUTING.md) for our general practices and protocols on participating in the community, as well as specific expectations around things like code formatting, testing practices, continuous integration, etc.

main.js

@@ -7,7 +7,7 @@ const { loadUIinfo, sanitizeUINameForScheme, HAPP_SCHEME } = require('./happ-ui-
 const TOML = require('@iarna/toml')
 
 const mb = menubar({
-  showDockIcon: true, 
+  showDockIcon: true,
   browserWindow: {icon: systemTrayIconFull()},
   icon: systemTrayIconFull(),
   tooltip: 'Holoscape - The Holochain run-time'
@@ -81,7 +81,7 @@ mb.on('ready', async () => {
           break
       case "sim2h":
           config = {
-              sim2h_url: config.sim2h_url || "wss://localhost:9000"
+              sim2h_url: config.sim2h_url || "ws://localhost:9000"
           }
           break
       case "lib3h":

package.json

@@ -1,6 +1,6 @@
 {
   "name": "holoscape",
-  "version": "0.0.1",
+  "version": "0.0.6",
   "description": "A complete end-user deployment of a Holochain conductor with UI for administration and a run-time for hApp UIs.",
   "main": "main.js",
   "scripts": {

views/splash.html

@@ -146,10 +146,10 @@
         <v-content id="background">
           <div id="title">
             <img class="logo" src="../images/Holoscape_title.png"></img>
-            <h3 class="version">Version 0.0.5-alpha</h3>
+            <h3 class="version">Version 0.0.6-alpha</h3>
           </div>
           <div class="status">{{status}}</div>
-        
+
           <v-dialog v-model="missing_binaries_modal" persistent max-width="590">
             <v-card>
               <v-card-title class="headline">Holoscape Error - Missing Binaries</v-card-title>
@@ -158,7 +158,7 @@ <h3 class="version">Version 0.0.5-alpha</h3>
                 <v-container>
                 <p>Holoscape needs both binaries out of the <a href="#" v-on:click="openExternal('https://github.com/holochain/holochain-rust')">holochain-rust</a> repository: <span class='code'>hc</span> and <span class='code'>holochain</span>.</p>
                 <p>Depending on the OS, it expects to find either <span class='code'>hc-linux</span> and <span class='code'>holochain-linux</span> or <span class='code'>hc-darwin</span> and <span class='code'>holochain-darwin</span> in the application directory (the root of the repository during development).</p>
-                <p>For development you can either build those yourself or get them through Holonix like this:</p>              
+                <p>For development you can either build those yourself or get them through Holonix like this:</p>
     <pre>$ nix-shell https://holochain.love
     $ cp `which holochain` holochain-linux
     $ cp `which hc` hc-linux</pre>
@@ -179,7 +179,7 @@ <h3 class="version">Version 0.0.5-alpha</h3>
               <v-card-title class="headline">Passphrase needed to unlock keystore</v-card-title>
               <v-divider></v-divider>
               <v-card-text>
-              
+
                 <v-text-field
                   v-model="passphrase"
                   :append-icon="show_passphrase ? 'mdi-eye' : 'mdi-eye-off'"
@@ -190,7 +190,7 @@ <h3 class="version">Version 0.0.5-alpha</h3>
                   solo
                   @click:append="show_passphrase = !show_passphrase"
                 ></v-text-field>
-              
+
               </v-card-text>
               <v-divider></v-divider>
               <v-card-actions>
@@ -205,7 +205,7 @@ <h3 class="version">Version 0.0.5-alpha</h3>
             <v-card>
               <v-card-title class="headline">Welcome to Holoscape and Holochain</v-card-title>
               <v-card-text>
-                
+
                 <v-stepper v-model="intro">
                   <v-stepper-header>
                     <v-stepper-step
@@ -277,7 +277,7 @@ <h3 class="version">Version 0.0.5-alpha</h3>
                             context!
                           </p>
                           <p>
-                            We want to complete more testing and see additional real-world usage to find and remove bugs. 
+                            We want to complete more testing and see additional real-world usage to find and remove bugs.
                             In order to help develop and debug our network implementation, <a href="#" v-on:click="openExternal('https://blog.holochain.org/p/30079b6f-7733-40a6-9135-ac5b9d861b96')">Sim2h</a>
                             can be configured to store a centrally held log of all the data that is transmitted between nodes.
                             When needed, this feature will be used to analyse and diagnose potential problems.
@@ -298,14 +298,14 @@ <h3 class="version">Version 0.0.5-alpha</h3>
                         </v-card-text>
                       </v-card>
                     </v-stepper-content>
-                  
-                    
+
+
                     <v-stepper-content
                       key="2-step"
                       step="3"
                     >
                     <v-card class="scroll" height="260px" flat>
-                      
+
                       <v-card-text>
                         <p>
                           This is it! You can go ahead and click <i>Finish setup</i> below.
@@ -325,9 +325,9 @@ <h3 class="version">Version 0.0.5-alpha</h3>
                           </div>
                           <div class="form-group" id="network-config-sim2h" v-if="network_type==='sim2h'">
                             <label for="sim2h-url">Sim2h Switch-Board URL</label>
-                            <input type="input" class="form-control" id="sim2h-url" aria-describedby="sim2h-url-help" placeholder="wss://sim2h.holochain.org:9000" value="wss://sim2h.holochain.org:9000" v-model="sim2h_url">
-                            <small id="sim2h-url-help" class="form-text text-muted clearfix" v-if="sim2h_url=='wss://sim2h.holochain.org:9000'">
-                              The default URL wss://sim2h.holochain.org points to a public pre-alpha test instance of the sim2h switch-board.
+                            <input type="input" class="form-control" id="sim2h-url" aria-describedby="sim2h-url-help" placeholder="ws://public.sim2h.net:9000" value="ws://public.sim2h.net:9000" v-model="sim2h_url">
+                            <small id="sim2h-url-help" class="form-text text-muted clearfix" v-if="sim2h_url=='ws://public.sim2h.net:9000'">
+                              The default URL ws://public.sim2h.net points to a public pre-alpha test instance of the sim2h switch-board.
                             </small>
                           </div>
                           <div class="form-group" id="network-config-lib3h" v-if="network_type==='lib3h'">
@@ -342,7 +342,7 @@ <h3 class="version">Version 0.0.5-alpha</h3>
                           </div>
                         </div>
                       </v-card-text>
-                    </v-card>  
+                    </v-card>
                     </v-stepper-content>
                   </v-stepper-items>
                 </v-stepper>
@@ -361,7 +361,7 @@ <h3 class="version">Version 0.0.5-alpha</h3>
             </v-card>
           </v-dialog>
         </v-content>
-      </v-app>    
+      </v-app>
     </div>
   </div>
 

views/splash.js

@@ -18,7 +18,7 @@ import { Ripple } from 'vuetify/lib/directives'
 Vue.use(Vuetify,  {
     components: {
         VApp, VContainer,
-        VRow, VCol, VCard, VCardTitle, VCardSubtitle, 
+        VRow, VCol, VCard, VCardTitle, VCardSubtitle,
         VAvatar, VIcon, VBtn, VImg, VSpacer, VSimpleTable,
         VChip, VProgressCircular,
         VDialog, VForm, VTextField,
@@ -52,7 +52,7 @@ let app = new Vue({
         status: "Initializing...",
         logs: require('electron').remote.getGlobal('holoscape').logMessages,
         network_type: "sim2h",
-        sim2h_url: 'wss://sim2h.holochain.org:9000',
+        sim2h_url: 'ws://public.sim2h.net:9000',
         dynamo_url: 'http://localhost:8000',
         disclaimer: false,
         t_and_c: false,
@@ -157,4 +157,4 @@ $('#passphrase').on('keyup', (event) => {
     }
 })
 
-ipcRenderer.send('splash-initialized')
+ipcRenderer.send('splash-initialized')