Merge pull request #1 from wilicw/develop

merge Develop to master

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     branches:
-      only: release
+      only: master
     docker:
       - image: circleci/node:11.2
     working_directory: ~/repo

CHANGELOG.md

@@ -0,0 +1,19 @@
+# Changelog
+
+## [Unreleased]
+### Added
+- Add Level in Timeing mode ending report
+- Add Changelog.
+
+## v0.0.1 - 2018-11-30
+### Added
+- Create project use Vuejs.
+- Add Vuex.
+- Add Vue router.
+- Use [JavaScript Standard Style](https://github.com/standard/standard) to coding.
+- Add Timeing mode.
+- Add Normal mode.
+- Add 5 bands resistor.
+
+[Unreleased]: https://github.com/wilicw/resicolor/tree/develop
+[0.0.1]: https://github.com/wilicw/resicolor/releases/tag/v0.0.1

deploy.sh

@@ -10,7 +10,7 @@ echo "version: 2\n\
 jobs:\n\
   build:\n\
     branches:\n\
-      only: release" > config.yml
+      only: master" > config.yml
 cd ..
 cp index.html 404.html
 git config --global user.email "[email protected]"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "resicolor",
-  "version": "1.2.2",
+  "version": "0.0.1",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",

src/views/Timeing.vue

@@ -21,6 +21,7 @@
         </el-rate>
         <br>
         Total: {{$store.state.total}} <br><br>
+        Level: {{$store.state.opacity}} <br><br>
         Avg: {{($store.state.total === 0) ? 0 : (Math.round((avgtime/$store.state.total) * 10) / 10 + 's/one resistor')}} <br><br>
         <el-button @click="tryagain" round>Try again</el-button>
       </div>