Skip to content

Commit

Permalink
Merge pull request #938 from aeternity/release/v0.8.6
Browse files Browse the repository at this point in the history
Release 0.8.6
  • Loading branch information
davidyuk authored Jun 28, 2019
2 parents 3d6adc9 + 9d2b6c7 commit 6618f3a
Show file tree
Hide file tree
Showing 70 changed files with 1,631 additions and 885 deletions.
2 changes: 0 additions & 2 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,3 @@ VUE_APP_REMOTE_CONNECTION_BACKEND_URL=https://stage-signaling.aepps.com
VUE_APP_VAPID_PUBLIC_KEY=BJP4PnSPRizQofIOBhe8o-AlaElRYbp7Mi_nirXzPYkJPkZfu-ONL7M14Y2c_q9LfU1K3XUcwzfx3lNM_jBLJrc
VUE_APP_MATOMO_URL=https://analytics-other.aepps.com
VUE_APP_MATOMO_SITE_ID=1
VUE_APP_COUNTLY_URL=https://analytics.aepps.com
VUE_APP_COUNTLY_APP_KEY=a14d0329eab4b17923ccbe7b6ca271e29d4906fc
63 changes: 55 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
# Base æpp
# Base æpp [![Build Status](https://api.travis-ci.org/aeternity/aepp-base.svg?branch=master)](https://api.travis-ci.org/aeternity/aepp-base)

## How to get the Base æpp

* [Google Play](https://play.google.com/store/apps/details?id=com.aeternity.base)
* [App Store](https://apps.apple.com/ru/app/base-%C3%A6pp-wallet/id1458655724)
* [Web version](https://base.aepps.com/)

Also join our [Telegram channel](https://t.me/aeppbase) and our [Forum](https://forum.aeternity.com/t/base-aepp-wallet-we-would-like-your-feedback/3387).

## Build Setup

Expand All @@ -12,17 +20,44 @@ npm run serve
# serve with hot reload at https://localhost:8080/
npm run serve -- --https

# run on android emulator or device
npm run serve:android

# run on ios emulator
npm run serve:ios

# build for production with minification
npm run build

# build for production and view the bundle analyzer report
npm run build -- --report

# generate resources for cordova
npm run gen:cordova-resource

# build for cordova
npm run build:cordova

# build an app file
npm run build:ios

# build an apk file
npm run build:android

# run unit tests
npm run test:unit

# run e2e tests
npm run test:e2e

# run all tests
npm test

# build a storybook
npm run storybook:build

# serve a storybook at http://localhost:6006
npm run storybook:serve
```

## Contributing
Expand All @@ -35,16 +70,28 @@ We use the [gitflow](https://danielkummer.github.io/git-flow-cheatsheet/) workfl
* Create a PR to master which then also has to be accepted.
* Create a tag for this version and push the tag.
* Also merge back the changes (like the version bump) into develop.
* The master branch is deployed to the [live environment](https://identity.aepps.com) by travis.
* The master branch has to be deployed to the [production environment](https://base.aepps.com/) manually.

## Live vs. Stage
## Deployment

We have a stage (develop) and a live (master) branch and environments where these branches will be deployed to.
We have a stage (develop) and a production (master) branch and environments where these branches will be deployed to.
* [stage environment](https://stage-identity.aepps.com)
* [live environment](https://identity.aepps.com)
* [production environment](https://base.aepps.com/)

### stage
* Is used to see changes to the code in effect in a "real" environment without the fear of breaking the live environment.
* Is used to see changes to the code in effect in a "real" environment without the fear of breaking the production environment.

### production
* Is the production environment, code lives in the "master" branch.

### other branches
* Every branch is auto-deployed on https://`branch-name`.origin.aepps.com/, with each `/`, `.` symbol in a branch name replaced by `-`.

### unsigned .apk and .app file
* Find `aetenity.app.tar.gz` file in the [latest release](https://github.com/aeternity/aepp-base/releases/latest) or download corresponding
version from a branch https://`branch-name`.origin.aepps.com/aetenity.app.tar.gz
* Find `aeternity.apk` file in the [latest release](https://github.com/aeternity/aepp-base/releases/latest) or download corresponding
version from a branch https://`branch-name`.origin.aepps.com/aeternity.apk

### live
* Is the live environment, code lives in the "master" branch
### bundle analyzer report
* Get bundle analyzer report on each domain by adding /report.html. Example [https://stage-identity.aepps.com/report.html](https://stage-identity.aepps.com/report.html).
7 changes: 6 additions & 1 deletion config.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<widget id="com.aeternity.base" version="0.8.5" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget id="com.aeternity.base" version="0.8.6" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>Base æpp</name>
<author href="https://aeternity.com">
aeternity developers
Expand All @@ -18,6 +18,7 @@
<access origin="cors-anywhere.herokuapp.com" />
<allow-intent href="market:*" />
<preference name="SplashMaintainAspectRatio" value="true" />
<preference name="HeaderColor" value="#f7296e" />
<edit-config file="app/src/main/AndroidManifest.xml" mode="merge" target="/manifest/application">
<application android:usesCleartextTraffic="true" />
</edit-config>
Expand All @@ -40,6 +41,7 @@
<feature name="SplashScreen">
<param name="onload" value="true" />
</feature>
<preference name="StatusBarBackgroundColor" value="#ff0d6a" />
<plugin name="cordova-plugin-whitelist" spec="^1.3.3" />
<plugin name="cordova-plugin-splashscreen" spec="^5.0.2" />
<plugin name="cordova-plugin-network-information" spec="^2.0.1" />
Expand All @@ -51,6 +53,9 @@
<plugin name="cordova-plugin-wkwebview-engine" spec="github:mwchambers/cordova-plugin-wkwebview-engine#da67d6bb6ce8597c38fc69e66b84566e34efea8d" />
<plugin name="com.lampa.startapp" spec="^6.1.6" />
<plugin name="cordova-plugin-x-socialsharing" spec="^5.4.5" />
<plugin name="cordova-plugin-statusbar" spec="^2.4.2" />
<plugin name="cordova-plugin-headercolor" spec="^1.0.0" />
<plugin name="cordova-clipboard" spec="github:ihadeed/cordova-clipboard#12dadc710dd2d374f942abe746ae2f828112e934" />
<engine name="android" spec="^8.0.0" />
<engine name="ios" spec="^5.0.0" />
</widget>
Loading

0 comments on commit 6618f3a

Please sign in to comment.