1
0
mirror of https://github.com/kihashi/stardew_community_checklist.git synced 2025-10-19 08:03:17 +00:00

Merge branch 'release/1.1' into gh-pages

This commit is contained in:
John Cleaver 2016-04-13 23:16:24 -04:00
commit f3e66e2b4b
3 changed files with 83 additions and 8 deletions

23
changelog.json Normal file
View File

@ -0,0 +1,23 @@
{
"versions": [
{
"id": "Version 1.1",
"date": "2016-04-14",
"link": "Version-1.1",
"changes": [
"Added bundle completion numbers (#40)",
"'Hide Completed' toggle now hides items in completed bundles, even if the item is not checked. (#44)",
"Buttons for items in bundles that have been completed, but are not checked are now transparent. (#46)",
"Updated scripts to load via HTTPS so that users loading Github via HTTPS can use the page (#47)"
]
},
{
"id": "Version 1.0",
"date": "2016-04-13",
"link": "Version-1.0",
"changes": [
"Initial Version"
]
}
]
}

View File

@ -66,6 +66,10 @@
v-bind:class="['skills' == active_page ? 'is-active' : '']">
Skills
</a>
<a id="change-nav" class="header-tab" href="#" v-on:click.stop="change_page('changelog')"
v-bind:class="['changelog' == active_page ? 'is-active' : '']">
Change Log
</a>
</div>
<div class="header-right header-menu">
<span class="header-item">
@ -215,7 +219,8 @@
<p class="control">
<a class="button is-fullwidth" v-for="bundle_id in item.bundles"
v-on:click="toggleItemInBundle(bundle_id, item.id, $index)"
v-bind:class="[isItemInBundle(bundle_id, item.id, $index) ? 'is-success' : 'is-danger']">
v-bind:class="[isItemInBundle(bundle_id, item.id, $index) ? 'is-success' : '',
!isItemInBundle(bundle_id, item.id, $index) && !isBundleComplete(bundle_id) ? 'is-danger' : '' ]">
<span class="icon">
<i class="fa"
v-bind:class="[isItemInBundle(bundle_id, item.id, $index) ? 'fa-check-square-o' : 'fa-square-o']"></i>
@ -290,7 +295,8 @@
<p class="control">
<a class="button is-fullwidth" v-for="bundle_id in item.bundles"
v-on:click="toggleItemInBundle(bundle_id, item.id, $index)"
v-bind:class="[isItemInBundle(bundle_id, item.id, $index) ? 'is-success' : 'is-danger']">
v-bind:class="[isItemInBundle(bundle_id, item.id, $index) ? 'is-success' : '',
!isItemInBundle(bundle_id, item.id, $index) && !isBundleComplete(bundle_id) ? 'is-danger' : '' ]">
<span class="icon">
<i class="fa"
v-bind:class="[isItemInBundle(bundle_id, item.id, $index) ? 'fa-check-square-o' : 'fa-square-o']"></i>
@ -367,7 +373,8 @@
<p class="control">
<a class="button is-fullwidth" v-for="bundle_id in item.bundles"
v-on:click="toggleItemInBundle(bundle_id, item.id, $index)"
v-bind:class="[isItemInBundle(bundle_id, item.id, $index) ? 'is-success' : 'is-danger']">
v-bind:class="[isItemInBundle(bundle_id, item.id, $index) ? 'is-success' : '',
!isItemInBundle(bundle_id, item.id, $index) && !isBundleComplete(bundle_id) ? 'is-danger' : '' ]">
<span class="icon">
<i class="fa"
v-bind:class="[isItemInBundle(bundle_id, item.id, $index) ? 'fa-check-square-o' : 'fa-square-o']"></i>
@ -446,7 +453,8 @@
<p class="control">
<a class="button is-fullwidth" v-for="bundle_id in item.bundles"
v-on:click="toggleItemInBundle(bundle_id, item.id, $index)"
v-bind:class="[isItemInBundle(bundle_id, item.id, $index) ? 'is-success' : 'is-danger']">
v-bind:class="[isItemInBundle(bundle_id, item.id, $index) ? 'is-success' : '',
!isItemInBundle(bundle_id, item.id, $index) && !isBundleComplete(bundle_id) ? 'is-danger' : '' ]">
<span class="icon">
<i class="fa"
v-bind:class="[isItemInBundle(bundle_id, item.id, $index) ? 'fa-check-square-o' : 'fa-square-o']"></i>
@ -483,6 +491,39 @@
</div>
</section>
<section class="section" v-if="active_page == 'changelog'">
<div class="container">
<h1 class="title">Change Log</h1>
<div class="card is-fullwidth" v-for="version in changelog">
<header class="card-header">
<p class="card-header-title">
{{ version.id }}
</p>
</header>
<div class="card-content">
<div class="content">
<ul>
<li v-for="change in version.changes">{{ change }}</li>
</ul>
</div>
</div>
<div class="card-footer">
<p class="card-footer-item">
Release Date: {{ version.date }}
</p>
<a href="https://github.com/kihashi/stardew_community_checklist/releases/tag/{{ version.link }}" class="card-footer-item">
<span class="icon">
<i class="fa fa-github-square" aria-hidden="true"></i>
</span>
<span>
Github Release
</span>
</a>
</div>
</div>
</div>
</section>
<footer class="footer">
<div class="container">
<div class="content is-centered is-text-centered">
@ -511,8 +552,8 @@
</footer>
<!-- Javascript -->
<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/vue/1.0.17/vue.min.js"></script>
<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/vue-resource/0.1.16/vue-resource.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/vue/1.0.17/vue.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/vue-resource/0.1.16/vue-resource.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/clipboard.js/1.5.8/clipboard.min.js"></script>
<script type="text/javascript" src="main.js"></script>
</body>

15
main.js
View File

@ -1,7 +1,7 @@
var v = new Vue({
el: '#app',
data:{
debug: true,
changelog: null,
static: null,
user_data: [],
active_page: "bundles",
@ -16,6 +16,7 @@ var v = new Vue({
},
ready: function(){
this.fetchData();
this.fetchChangeLog();
new Clipboard('.copy');
storedUserData = localStorage.getItem('user_data');
if(storedUserData !== null && storedUserData !== ""){
@ -40,6 +41,13 @@ var v = new Vue({
}
});
},
fetchChangeLog: function() {
this.$http.get('changelog.json', function(data, status){
if(status == 200){
this.changelog = data.versions
}
});
},
enterLoadMode: function(){
this.load_mode = true;
},
@ -134,12 +142,15 @@ var v = new Vue({
},
isCompleted: function (item) {
for(i=0; i < item.bundles.length; i++){
if(!this.isItemInBundle(item.bundles[i], item.id, i)){
if(!(this.isItemInBundle(item.bundles[i], item.id, i) || this.isBundleComplete(item.bundles[i]))){
return false;
}
}
return true;
},
isBundleComplete: function(bundle_id){
return this.user_data[bundle_id].length >= this.static.bundles[bundle_id].items_required;
}
}
});