diff --git a/CHANGELOG.md b/CHANGELOG.md index 128bed2c9a6d3acc24410ea1db4ebb174e4466a6..47571ce2323f2a907c7ab1b14d155f82e3cf34d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,57 +1,43 @@ # Changelog +## Unreleased +- Removed e2e testings +- Updated relative paths +- Removed unnecessary `async/await` + ## v2.0.0 - Upgraded to Webpack v4 -## 1.1.3 -### Added +## v1.1.3 - Added a function to play sound effects easily - -### Removed - Removed background music -## 1.1.2 -### Changed +## v1.1.2 - Set background music default to muted -## 1.1.1 -### Added +## v1.1.1 - Added a button to mute BGM - Added fade in effect on load -## 1.1.0 -### Added +## v1.1.0 - Added background music - Added sound effects -## 1.0.2 -### Added +## v1.0.2 - Added response to report card - -### Changed - Changed button design for Quiz Instruction page - -### Fixed - Fixed minor text changes - Fixed an error with button styling not rendering properly on Google Chrome -## 1.0.1 -### Added +## v1.0.1 - Added model answers to report page - -### Fixed - Fixed UI layout for Quiz component - -### Removed - Removed beta version tag -## 1.0.0 +## v1.0.0 ### Initial Release -## 1.0.0-beta.2 -### Added +## v1.0.0-beta.2 - Added a function to close modal when `esc` is pressed - -### Fixed - Fixed an issue with quiz not redirecting properly hence allowing users to cheat. - Fixed styling and positioning of general assets diff --git a/config/index.js b/config/index.js index a1cb9344e1c37f98c1ebb5b3948ea38ba2cf4d65..c07890ffb8fe23f7c013de4da5da52d2f7458c42 100644 --- a/config/index.js +++ b/config/index.js @@ -55,7 +55,7 @@ module.exports = { // Paths assetsRoot: path.resolve(__dirname, '../dist'), assetsSubDirectory: 'static', - assetsPublicPath: '/world-war-two/', + assetsPublicPath: '', /** * Source Maps diff --git a/package.json b/package.json index 021e04e5a391feb0dc571ead87e25c8bd800074c..571224f15d56b568e7b79af83e82e57b74c0cac6 100644 --- a/package.json +++ b/package.json @@ -6,27 +6,25 @@ "private": true, "scripts": { "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js", - "start": "npm run dev", "unit": "jest --config test/unit/jest.conf.js --coverage", - "test": "npm run unit", "lint": "eslint --ext .js,.vue src test/unit/specs", "build": "node build/build.js" }, "dependencies": { "animate.css": "^3.6.1", "bulma": "^0.6.2", - "mdi": "^2.1.99", + "mdi": "^2.2.43", "vue": "^2.5.16", "vue-router": "^3.0.1", "vuex": "^3.0.1" }, "devDependencies": { - "@vue/test-utils": "^1.0.0-beta.12", - "autoprefixer": "^8.1.0", + "@vue/test-utils": "^1.0.0-beta.13", + "autoprefixer": "^8.2.0", "babel-core": "^6.22.1", "babel-eslint": "^8.2.2", "babel-helper-vue-jsx-merge-props": "^2.0.3", - "babel-jest": "^23.0.0-alpha.0", + "babel-jest": "^22.4.3", "babel-loader": "^7.1.4", "babel-plugin-dynamic-import-node": "^1.2.0", "babel-plugin-syntax-jsx": "^6.18.0", @@ -35,31 +33,27 @@ "babel-plugin-transform-vue-jsx": "^3.7.0", "babel-preset-env": "^1.3.2", "babel-preset-stage-2": "^6.22.0", - "babel-register": "^6.22.0", "chalk": "^2.3.2", - "chromedriver": "^2.37.0", "copy-webpack-plugin": "^4.5.1", - "cross-spawn": "^6.0.5", "css-loader": "^0.28.11", - "eslint": "^4.19.0", + "eslint": "^4.19.1", "eslint-config-standard": "^11.0.0", - "eslint-friendly-formatter": "^3.0.0", + "eslint-friendly-formatter": "^4.0.0", "eslint-loader": "^2.0.0", "eslint-plugin-import": "^2.9.0", "eslint-plugin-node": "^6.0.1", "eslint-plugin-promise": "^3.7.0", "eslint-plugin-standard": "^3.0.1", - "eslint-plugin-vue": "^4.3.0", + "eslint-plugin-vue": "^4.4.0", "eventsource-polyfill": "^0.9.6", "extract-text-webpack-plugin": "^4.0.0-beta.0", "file-loader": "^1.1.11", "friendly-errors-webpack-plugin": "^1.6.1", - "html-webpack-plugin": "^3.0.7", - "jest": "^22.4.2", + "html-webpack-plugin": "^3.1.0", + "jest": "^22.4.3", "jest-serializer-vue": "^1.0.0", - "nightwatch": "^0.9.20", "node-notifier": "^5.2.1", - "node-sass": "^4.7.2", + "node-sass": "^4.8.3", "optimize-css-assets-webpack-plugin": "^4.0.0", "ora": "^2.0.0", "portfinder": "^1.0.13", @@ -67,20 +61,19 @@ "postcss-loader": "^2.1.3", "rimraf": "^2.6.0", "sass-loader": "^6.0.7", - "selenium-server": "^3.11.0", "semver": "^5.5.0", "shelljs": "^0.8.1", - "sinon": "^4.4.6", + "sinon": "^4.4.9", "uglifyjs-webpack-plugin": "^1.2.4", "url-loader": "^1.0.1", - "vue-jest": "^2.2.1", - "vue-loader": "^14.2.1", + "vue-jest": "^2.3.0", + "vue-loader": "^14.2.2", "vue-server-renderer": "^2.5.16", "vue-style-loader": "^4.1.0", "vue-template-compiler": "^2.5.16", - "webpack": "^4.1.1", + "webpack": "^4.2.0", "webpack-bundle-analyzer": "^2.11.1", - "webpack-cli": "^2.0.12", + "webpack-cli": "^2.0.13", "webpack-dev-server": "^3.1.1", "webpack-merge": "^4.1.2" }, diff --git a/src/App.vue b/src/App.vue index 12cfd1d3367a6ba073c9ff2da4eb3fdfee30ac73..d70c52abb4cdffabe57d73caa44abde8847e854e 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,21 +1,19 @@ diff --git a/src/components/Home.vue b/src/components/Home.vue index 437785b1c02f89d99aae07c8f0b1d718b7a2da31..bda2913f961a3f6f72f1cd770d6e78041e051d69 100644 --- a/src/components/Home.vue +++ b/src/components/Home.vue @@ -1,7 +1,7 @@ @@ -10,8 +10,16 @@ export default { name: 'home', methods: { + playSoundEffect () { + const soundEffect = document.querySelector('audio') + soundEffect.src = require(`@/assets/audio/marching.mp3`) + soundEffect.load() + + soundEffect.play() + }, gotoIntroduction () { - this.$parent.playAudio(require(`@/assets/audio/marching.mp3`)) + this.playSoundEffect() + this.$router.push('/introduction') } } diff --git a/src/components/Introduction.vue b/src/components/Introduction.vue index 7fdb43533d9de39209c24c4181ca59542f85fdca..b267e55ef301d465fb0c295e5cec489758613ed2 100644 --- a/src/components/Introduction.vue +++ b/src/components/Introduction.vue @@ -19,8 +19,16 @@ export default { name: 'introduction', methods: { + playSoundEffect () { + const soundEffect = document.querySelector('audio') + soundEffect.src = require(`@/assets/audio/door-open.mp3`) + soundEffect.load() + + soundEffect.play() + }, gotoStrategy () { - this.$parent.playAudio(require(`@/assets/audio/door-open.mp3`)) + this.playSoundEffect() + this.$router.push('/strategy') } } diff --git a/src/components/Quiz.vue b/src/components/Quiz.vue index 6dbfb5841fefaf37e751244b1d9848cf4661ff08..8ec32b3cba6522ed6d44809082302b5c149eeb46 100644 --- a/src/components/Quiz.vue +++ b/src/components/Quiz.vue @@ -1,23 +1,23 @@