From ba9b3530fa2ef6e42e02781b3370484b5836d656 Mon Sep 17 00:00:00 2001 From: Manuel Wiedenmann Date: Thu, 14 Jun 2018 18:11:56 +0200 Subject: [PATCH 1/3] Rename truffle-kredits to kredits-contracts --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 7786380..690f553 100644 --- a/README.md +++ b/README.md @@ -57,13 +57,13 @@ _(You need collaborator permissions on the 5apps Deploy project.)_ ## Working with locally deployed contracts The smart contracts and their JavaScript wrapper library are developed in the -[truffle-kredits](https://github.com/67P/truffle-kredits) repo/package. +[kredits-contracts](https://github.com/67P/kredits-contracts) repo/package. You can run `kredits-web` on your machine, against a local, simulated Ethereum network, provided e.g. by [ganache](http://truffleframework.com/ganache/) or [ganache-cli](https://github.com/trufflesuite/ganache-cli). -[truffle-kredits](https://github.com/67P/truffle-kredits) holds all the tools +[kredits-contracts](https://github.com/67P/kredits-contracts) holds all the tools to start and set up such a simulated network, as well as to deploy smart contracts to it. @@ -76,21 +76,21 @@ Run a local IPFS deamon in offline mode. * Make sure CORS headers are configured. See [IPFS](#ipfs) for more info. * `ipfs daemon --offline` -#### 2. truffle-kredits +#### 2. kredits-contracts Get your local Ethereum development node running. - * Clone [truffle-kredits](https://github.com/67P/truffle-kredits) + * Clone [kredits-contracts](https://github.com/67P/kredits-contracts) * `npm install` * `npm run ganache` - which is basically: `ganache-cli -p 7545 -i 100` (we use the non-default port for local networks and a fixed network id) * `npm run bootstrap` - bootstrap runs fresh migrations, adds some seed data and writes the address/abi information to JSON that will be used by kredits-web - * `npm link` - make the `truffle-kredits` module linkable as `kredits-contracts` on your machine + * `npm link` - make the `kredits-contracts` module linkable as `kredits-contracts` on your machine #### 3. kredits-web With IPFS and Ethereum/ganache running, you can now start this Ember app. - * `npm link kredits-contracts` - link the local `truffle-kredits` package (it will become `kredits-contracts` soon) + * `npm link kredits-contracts` - link the local `kredits-contracts` package * `npm run start:local` - NETWORK_ID=100 and WEB3_PROVIDER_URL=http://localhost:7545 must be set for local settings #### IPFS -- 2.50.1 From 38d853a272c3e1697160ccf9b4d6e30d237672d7 Mon Sep 17 00:00:00 2001 From: Manuel Wiedenmann Date: Thu, 14 Jun 2018 19:04:22 +0200 Subject: [PATCH 2/3] Remove spinner route --- app/router.js | 1 - app/routes/spinner.js | 4 ---- app/templates/spinner.hbs | 1 - tests/unit/routes/spinner-test.js | 11 ----------- 4 files changed, 17 deletions(-) delete mode 100644 app/routes/spinner.js delete mode 100644 app/templates/spinner.hbs delete mode 100644 tests/unit/routes/spinner-test.js diff --git a/app/router.js b/app/router.js index 0aa6ac3..53708e0 100644 --- a/app/router.js +++ b/app/router.js @@ -7,7 +7,6 @@ const Router = EmberRouter.extend({ }); Router.map(function() { - this.route('spinner'); this.route('proposals', function() { this.route('new'); }); diff --git a/app/routes/spinner.js b/app/routes/spinner.js deleted file mode 100644 index 6c74252..0000000 --- a/app/routes/spinner.js +++ /dev/null @@ -1,4 +0,0 @@ -import Route from '@ember/routing/route'; - -export default Route.extend({ -}); diff --git a/app/templates/spinner.hbs b/app/templates/spinner.hbs deleted file mode 100644 index 7b99811..0000000 --- a/app/templates/spinner.hbs +++ /dev/null @@ -1 +0,0 @@ -{{loading-spinner}} diff --git a/tests/unit/routes/spinner-test.js b/tests/unit/routes/spinner-test.js deleted file mode 100644 index a2c0561..0000000 --- a/tests/unit/routes/spinner-test.js +++ /dev/null @@ -1,11 +0,0 @@ -import { module, test } from 'qunit'; -import { setupTest } from 'ember-qunit'; - -module('Unit | Route | spinner', function(hooks) { - setupTest(hooks); - - test('it exists', function(assert) { - let route = this.owner.lookup('route:spinner'); - assert.ok(route); - }); -}); -- 2.50.1 From 47b8421d354abe77aff0f93846bcbdd7e2537cd4 Mon Sep 17 00:00:00 2001 From: Manuel Wiedenmann Date: Thu, 14 Jun 2018 19:04:42 +0200 Subject: [PATCH 3/3] Rename loading.hbs to application-loading.hbs --- app/templates/{loading.hbs => application-loading.hbs} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename app/templates/{loading.hbs => application-loading.hbs} (100%) diff --git a/app/templates/loading.hbs b/app/templates/application-loading.hbs similarity index 100% rename from app/templates/loading.hbs rename to app/templates/application-loading.hbs -- 2.50.1