Add deck builder button and version tagging #28

Merged
hamcha merged 1 commit from feature/better-home into master 2019-09-18 14:22:24 +00:00
4 changed files with 44 additions and 4 deletions
Showing only changes of commit d57dcea8ce - Show all commits

View file

@ -44,11 +44,13 @@
"eslint": "^5.16.0", "eslint": "^5.16.0",
"eslint-plugin-prettier": "^3.1.0", "eslint-plugin-prettier": "^3.1.0",
"eslint-plugin-vue": "^5.0.0", "eslint-plugin-vue": "^5.0.0",
"git-describe": "^4.0.4",
"indexeddbshim": "^4.1.0", "indexeddbshim": "^4.1.0",
"prettier": "^1.18.2", "prettier": "^1.18.2",
"ts-jest": "^23.0.0", "ts-jest": "^23.0.0",
"vue-cli-plugin-axios": "^0.0.4", "vue-cli-plugin-axios": "^0.0.4",
"vue-cli-plugin-buefy": "^0.3.7", "vue-cli-plugin-buefy": "^0.3.7",
"vue-cli-plugin-git-describe": "^1.0.0",
"vue-template-compiler": "^2.6.10" "vue-template-compiler": "^2.6.10"
}, },
"license": "ISC" "license": "ISC"

View file

@ -13,11 +13,18 @@
<b-button <b-button
tag="router-link" tag="router-link"
to="/lobby" to="/lobby"
@click="gotoLobby" class="is-primary spaced"
class="is-primary"
inverted inverted
outlined outlined
>Play now!</b-button >Play with people</b-button
>
<b-button
tag="router-link"
to="/build"
class="is-primary spaced"
inverted
outlined
>Build a deck</b-button
> >
</div> </div>
</div> </div>
@ -74,6 +81,7 @@
> >
(ISC licensed)! (ISC licensed)!
</p> </p>
<p>MCG Version {{ projectVersion }}</p>
</div> </div>
</div> </div>
</footer> </footer>
@ -108,15 +116,25 @@
font-size: 11pt; font-size: 11pt;
} }
} }
.spaced {
margin: 5px;
}
</style> </style>
<script lang="ts"> <script lang="ts">
import { Component, Vue } from "vue-property-decorator"; import { Component, Vue } from "vue-property-decorator";
declare const GIT_DESCRIBE: { raw: string };
let versionString: string = GIT_DESCRIBE
? GIT_DESCRIBE.raw
: require("@/../package.json").version;
@Component({ @Component({
components: {} components: {}
}) })
export default class Home extends Vue { export default class Home extends Vue {
private projectName: string = "MLPCARDGAME"; private projectName: string = "MLPCARDGAME";
private projectVersion: string = versionString;
} }
</script> </script>

View file

@ -1,3 +1,9 @@
module.exports = { module.exports = {
publicPath: process.env.SUBPATH ? process.env.SUBPATH : "" publicPath: process.env.SUBPATH ? process.env.SUBPATH : "",
pluginOptions: {
gitDescribe: {
variableName: "GIT_DESCRIBE"
}
}
}; };

View file

@ -4649,6 +4649,15 @@ getpass@^0.1.1:
dependencies: dependencies:
assert-plus "^1.0.0" assert-plus "^1.0.0"
git-describe@^4.0.4:
version "4.0.4"
resolved "https://registry.yarnpkg.com/git-describe/-/git-describe-4.0.4.tgz#f3d55bce309becf6dc27fed535d380a621967e8c"
integrity sha512-L1X9OO1e4MusB4PzG9LXeXCQifRvyuoHTpuuZ521Qyxn/B0kWHWEOtsT4LsSfSNacZz0h4ZdYDsDG7f+SrA3hg==
dependencies:
lodash "^4.17.11"
optionalDependencies:
semver "^5.6.0"
glob-base@^0.3.0: glob-base@^0.3.0:
version "0.3.0" version "0.3.0"
resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4" resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
@ -10453,6 +10462,11 @@ vue-cli-plugin-buefy@^0.3.7:
resolved "https://registry.yarnpkg.com/vue-cli-plugin-buefy/-/vue-cli-plugin-buefy-0.3.7.tgz#31e5637529482a5a4564676f539db16278b0895c" resolved "https://registry.yarnpkg.com/vue-cli-plugin-buefy/-/vue-cli-plugin-buefy-0.3.7.tgz#31e5637529482a5a4564676f539db16278b0895c"
integrity sha512-w+1Wnj1VmoLJmv0yHoLUErnFkLSzz4yTGhCz7GudDKX7vB5NpVK+/xWmiFOytuDkleWeYrJgHN8CIOY7xe26jQ== integrity sha512-w+1Wnj1VmoLJmv0yHoLUErnFkLSzz4yTGhCz7GudDKX7vB5NpVK+/xWmiFOytuDkleWeYrJgHN8CIOY7xe26jQ==
vue-cli-plugin-git-describe@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/vue-cli-plugin-git-describe/-/vue-cli-plugin-git-describe-1.0.0.tgz#6980e7e7c9b30a8da5e56363c43a8224d3b178e7"
integrity sha512-vrln5ryf1VucQ3SD1NfMTnzM8Uyw0CDEjL9KYzyrGXGbTJuFXhPfm2fJsSvOClS5sotjOV9+4MnIWlqvZO5JuQ==
vue-eslint-parser@^2.0.3: vue-eslint-parser@^2.0.3:
version "2.0.3" version "2.0.3"
resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-2.0.3.tgz#c268c96c6d94cfe3d938a5f7593959b0ca3360d1" resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-2.0.3.tgz#c268c96c6d94cfe3d938a5f7593959b0ca3360d1"