From 310b5d56c8d17583768093fa8373e866fd5e480c Mon Sep 17 00:00:00 2001
From: Tanuj Soni <tanuj@blockapps.net>
Date: Mon, 12 Mar 2018 17:03:21 +0530
Subject: [PATCH 1/4] [RAFFLE-794] Uploadable app

---
 initfile.json              | 12 ++++++++++++
 package.json               |  2 +-
 public/index.html          |  2 +-
 scripts/create-metadata.js |  2 +-
 4 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 initfile.json

diff --git a/initfile.json b/initfile.json
new file mode 100644
index 0000000..07362ac
--- /dev/null
+++ b/initfile.json
@@ -0,0 +1,12 @@
+{
+  "raffle": {
+    "contractName": "Raffle",
+    "contractFilename": "contracts/Raffle.sol",
+    "args": {
+      "_name": "New",
+      "_ticketCount": 5,
+      "_ticketPrice": 50,
+      "_charityPercentage": 60
+    }
+  }
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index 9470cdf..9a2fa2e 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
   "scripts": {
     "start": "npm-run-all -p watch-css start-js",
     "start-js": "react-scripts start",
-    "build": "npm run build-css && react-scripts build && mkdir package &&  mkdir package/contracts && node scripts/create-metadata.js && mv build/* package/  && cd package && zip -r app.zip * && cd .. && rm -rf build && mv package build",
+    "build": "npm run build-css && react-scripts build && node scripts/create-metadata.js && cp -a lib/lottery/contracts/ ./build/ && cp  initfile.json ./build/",
     "test": "react-scripts test --env=jsdom",
     "eject": "react-scripts eject",
     "build-css": "node-sass-chokidar src/ -o src/",
diff --git a/public/index.html b/public/index.html
index 2e47286..81c5edb 100644
--- a/public/index.html
+++ b/public/index.html
@@ -14,7 +14,7 @@
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
     <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto">
-
+    <script src="addresses.js"></script>
     <!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.
diff --git a/scripts/create-metadata.js b/scripts/create-metadata.js
index 0416d99..ff0f547 100644
--- a/scripts/create-metadata.js
+++ b/scripts/create-metadata.js
@@ -14,7 +14,7 @@ readJson('package.json', (err, data) => {
     version: data.version,
   };
 
-  fs.writeFile('package/metadata.json',JSON.stringify(metadata,null,2), 'utf8', (err) => {
+  fs.writeFile('build/metadata.json',JSON.stringify(metadata,null,2), 'utf8', (err) => {
     if(err) {
       console.log('Failed to write metadata.json', err);
     }

From 2b7a612ecb3b694da70810c4952343a651742e44 Mon Sep 17 00:00:00 2001
From: Tanuj Soni <tanuj@blockapps.net>
Date: Tue, 13 Mar 2018 14:48:42 +0530
Subject: [PATCH 2/4] [RAFFLE-794] SSL config

---
 src/raffle/raffle.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/raffle/raffle.js b/src/raffle/raffle.js
index 18e1c42..85e67a6 100644
--- a/src/raffle/raffle.js
+++ b/src/raffle/raffle.js
@@ -1,12 +1,13 @@
 const contractName = buildContractName('Raffle')
+const HTTP_PROTOCOL = document.location.protocol === "http:" ? "http" : "https";
 
-const uploadUrl = `http://${window.location.hostname}/bloc/v2.2/users/:user/:address/contract?resolve`
-const enterUrl = `http://${window.location.hostname}/bloc/v2.2/users/:username/:userAddress/contract/:contractName/:contractAddress/call?resolve`;
+const uploadUrl = `${HTTP_PROTOCOL}://${window.location.hostname}/bloc/v2.2/users/:user/:address/contract?resolve`
+const enterUrl = `${HTTP_PROTOCOL}://${window.location.hostname}/bloc/v2.2/users/:username/:userAddress/contract/:contractName/:contractAddress/call?resolve`;
 // const raffleListUrl = `http://${window.location.hostname}/cirrus/search/Raffle?winnerAddress=eq.0000000000000000000000000000000000000000`;
 // const raffleListUrlNotEqual = `http://${window.location.hostname}/cirrus/search/Raffle?winnerAddress=not.eq.0000000000000000000000000000000000000000`;
-const raffleListUrlAll = `http://${window.location.hostname}/cirrus/search/${contractName}`;
-const cirrusUrl = `http://${window.location.hostname}/cirrus/search`;
-const compileUrl = `http://${window.location.hostname}/bloc/v2.2/contracts/compile`;
+const raffleListUrlAll = `${HTTP_PROTOCOL}://${window.location.hostname}/cirrus/search/${contractName}`;
+const cirrusUrl = `${HTTP_PROTOCOL}://${window.location.hostname}/cirrus/search`;
+const compileUrl = `${HTTP_PROTOCOL}://${window.location.hostname}/bloc/v2.2/contracts/compile`;
 const codeHash = 'a44d5968d33c8d99ef36ea6980a4151fd1fd45379a85425d55a71ccfb1860e57';
 
 const contractSrc = `contract ${contractName} {

From a0c309fada21b2f8a74567890606aa762aea4a4b Mon Sep 17 00:00:00 2001
From: Tanuj Soni <tanuj@blockapps.net>
Date: Wed, 14 Mar 2018 12:19:57 +0530
Subject: [PATCH 3/4] [RAFFLE-794] Featue: zip build folder

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9a2fa2e..0427db1 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
   "scripts": {
     "start": "npm-run-all -p watch-css start-js",
     "start-js": "react-scripts start",
-    "build": "npm run build-css && react-scripts build && node scripts/create-metadata.js && cp -a lib/lottery/contracts/ ./build/ && cp  initfile.json ./build/",
+    "build": "npm run build-css && react-scripts build && node scripts/create-metadata.js && cp -a lib/lottery/contracts/ ./build/ && cp  initfile.json ./build/ && cd build && zip -r app.zip *",
     "test": "react-scripts test --env=jsdom",
     "eject": "react-scripts eject",
     "build-css": "node-sass-chokidar src/ -o src/",

From 2e476cdedb54419142fc4b96c9cbe6b63010ecb7 Mon Sep 17 00:00:00 2001
From: nikitamendelbaum <nikitamendelbaum@gmail.com>
Date: Tue, 29 May 2018 18:06:04 -0400
Subject: [PATCH 4/4] macos fix; app.zip bundle saved in root dir

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0427db1..d036bc2 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
   "scripts": {
     "start": "npm-run-all -p watch-css start-js",
     "start-js": "react-scripts start",
-    "build": "npm run build-css && react-scripts build && node scripts/create-metadata.js && cp -a lib/lottery/contracts/ ./build/ && cp  initfile.json ./build/ && cd build && zip -r app.zip *",
+    "build": "npm run build-css && react-scripts build && node scripts/create-metadata.js && cp -r lib/lottery/contracts ./build/ && cp  initfile.json ./build/ && zip -r app.zip build/*",
     "test": "react-scripts test --env=jsdom",
     "eject": "react-scripts eject",
     "build-css": "node-sass-chokidar src/ -o src/",