Merge pull request #2 from zo-el/05-10-fix-ui

update Ui

.gitignore

@@ -1,13 +1,15 @@
-agent.txt
-priv.key
-
 build/
 ui/
-dna/
 node_modules/
 .dist/
 .cache/
 
+target
+*.dna
+*.happ
+.cargo
+.hc*
+
 # OS generated files #
 ######################
 .tags*
@@ -18,8 +20,3 @@ node_modules/
 .Trashes
 ehthumbs.db
 Thumbs.db
-
-target
-*.dna
-*.happ
-.cargo

Makefile

@@ -62,6 +62,19 @@ test-dna-debug:
 
 test-e2e:	test-dna
 
+# Spin up agents
+
+gen-agent:
+	hc sandbox clean
+	hc sandbox generate ./minersweeper.happ -a='minersweeper-1'
+	hc sandbox generate ./minersweeper.happ -a='minersweeper-2'
+
+run-agent1:
+	hc sandbox r 0 -p=8800
+
+run-agent2:
+	hc sandbox r 1 -p=9300
+
 # Generic targets; does not require a Nix environment
 .PHONY: clean
 clean:

README.md

@@ -21,7 +21,7 @@ holochain
 ```
 
 ```
-dna_utils
+hc
 ```
 
 Subsequent steps also assumes npm/yarn is installed.
@@ -45,7 +45,9 @@ npm run build
 
 The happ can now be started for development purposes using
 ```
-holochain-run-dna -p 3500 -i minersweeper ./minersweeper.dna.gz
+make gen-agent # to generate agents
+
+make run-agent1 # to run a conductor that is running agent 1
 ```
 and for the ui
 ```