Skip to content
This repository was archived by the owner on Mar 8, 2020. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .travis/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,11 @@ if [ -z "${TRAVIS_TAG}" ]; then
# Push to public Bluemix.
pushd ${DIR}/packages/composer-playground
cf login -a https://api.ng.bluemix.net -u ${CF_USERNAME} -p ${CF_PASSWORD} -o ${CF_ORGANIZATION} -s ${CF_SPACE}
cf push fabric-composer-next-unstable -c "node cli.js" -i 2 -m 128M --no-start
cf set-env fabric-composer-next-unstable CLIENT_ID ${GH_NEXT_UNSTABLE_OAUTH_CLIENT_ID}
cf set-env fabric-composer-next-unstable CLIENT_SECRET ${GH_NEXT_UNSTABLE_OAUTH_CLIENT_SECRET}
cf set-env fabric-composer-next-unstable USABILLA_ID ${USABILLA_ID}
cf start fabric-composer-next-unstable
cf push composer-playground-unstable -c "node cli.js" -i 2 -m 128M --no-start
cf set-env composer-playground-unstable CLIENT_ID ${GH_NEXT_UNSTABLE_OAUTH_CLIENT_ID}
cf set-env composer-playground-unstable CLIENT_SECRET ${GH_NEXT_UNSTABLE_OAUTH_CLIENT_SECRET}
cf set-env composer-playground-unstable USABILLA_ID ${USABILLA_ID}
cf start composer-playground-unstable
popd

else
Expand Down Expand Up @@ -141,11 +141,11 @@ else
# Push to public Bluemix.
pushd ${DIR}/packages/composer-playground
cf login -a https://api.ng.bluemix.net -u ${CF_USERNAME} -p ${CF_PASSWORD} -o ${CF_ORGANIZATION} -s ${CF_SPACE}
cf push fabric-composer-next -c "node cli.js" -i 2 -m 128M --no-start
cf set-env fabric-composer-next CLIENT_ID ${GH_NEXT_OAUTH_CLIENT_ID}
cf set-env fabric-composer-next CLIENT_SECRET ${GH_NEXT_OAUTH_CLIENT_SECRET}
cf set-env fabric-composer-next USABILLA_ID ${USABILLA_ID}
cf start fabric-composer-next
cf push composer-playground -c "node cli.js" -i 2 -m 128M --no-start
cf set-env composer-playground CLIENT_ID ${GH_NEXT_OAUTH_CLIENT_ID}
cf set-env composer-playground CLIENT_SECRET ${GH_NEXT_OAUTH_CLIENT_SECRET}
cf set-env composer-playground USABILLA_ID ${USABILLA_ID}
cf start composer-playground
popd

# Configure the Git repository and clean any untracked and unignored build files.
Expand Down
7 changes: 3 additions & 4 deletions packages/composer-playground/src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,15 @@
Loading...
</app>

<!-- Google Analytics: change UA-71073175-1 to be your site's ID -->
<!-- <script>
<script>
(function(A,n,g,u,l,a,r){A.GoogleAnalyticsObject=r;A[l]=A[l]||function(){
(A[l].q=A[l].q||[]).push(arguments)},A[l].l=1*new Date();a=n.createElement(g),
r=n.getElementsByTagName(g)[0];a.async=1;a.src=u;r.parentNode.insertBefore(a,r)
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');

ga('create', 'UA-71073175-1', 'auto');
ga('create', 'UA-91314349-1', 'auto');
ga('send', 'pageview');
</script> -->
</script>

<% if (htmlWebpackPlugin.options.metadata.isDevServer && htmlWebpackPlugin.options.metadata.HMR !== true) { %>
<!-- Webpack Dev Server reload -->
Expand Down
24 changes: 12 additions & 12 deletions packages/composer-ui/src/app/app.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,27 @@ describe('App', () => {


it('should have a title', () => {
let subject = browser.getTitle();
let result = 'Angular2 Webpack Starter by @gdi2290 from @AngularClass';
expect(subject).toEqual(result);
// let subject = browser.getTitle();
// let result = 'Angular2 Webpack Starter by @gdi2290 from @AngularClass';
// expect(subject).toEqual(result);
});

it('should have header', () => {
let subject = element(by.css('h1')).isPresent();
let result = true;
expect(subject).toEqual(result);
// let subject = element(by.css('h1')).isPresent();
// let result = true;
// expect(subject).toEqual(result);
});

it('should have <home>', () => {
let subject = element(by.css('app home')).isPresent();
let result = true;
expect(subject).toEqual(result);
// let subject = element(by.css('app home')).isPresent();
// let result = true;
// expect(subject).toEqual(result);
});

it('should have buttons', () => {
let subject = element(by.css('button')).getText();
let result = 'Submit Value';
expect(subject).toEqual(result);
// let subject = element(by.css('button')).getText();
// let result = 'Submit Value';
// expect(subject).toEqual(result);
});

});
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Before beginning this tutorial you will need:

## Let's get started - Importing the sample

1. Open the [{{site.data.conrefs.composer_short}} Playground](http://fabric-composer-next.mybluemix.net/editor). On the left are three files, a script file, `lib/logic.js` which represents transaction logic, a model file, `lib/org.acme.biznet.cto` which defines the participants assets and transactions of the business network, and an access control file, `permissions.acl` which defines the access different participants have.
1. Open the [{{site.data.conrefs.composer_short}} Playground](https://composer-playground.mybluemix.net). On the left are three files, a script file, `lib/logic.js` which represents transaction logic, a model file, `lib/org.acme.biznet.cto` which defines the participants assets and transactions of the business network, and an access control file, `permissions.acl` which defines the access different participants have.

2. To get set up with a sample business network click **Import/Replace**. This dialog allows you to import your own business network archive `.bna` files, or to import our premade business network samples. For now we'll use a pre-built sample from the {{site.data.conrefs.composer_short}} GitHub repository. Click **Authenticate with GitHub** then log into your GitHub account and click **Authorize application**.

Expand Down