mirror of
https://github.com/kihashi/stardew_community_checklist.git
synced 2025-10-19 08:03:17 +00:00
Merge branch 'release/1.3' into gh-pages
This commit is contained in:
commit
f36ab8b384
@ -1,5 +1,15 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"id": "Version 1.3",
|
||||||
|
"date": "2016-04-15",
|
||||||
|
"link": "Version-1.3",
|
||||||
|
"changes": [
|
||||||
|
"Bundles rewards are now hidden with other spoilers.",
|
||||||
|
"Added a settings page to allow the user to define what information constitutes spoilers.",
|
||||||
|
"Small Layout Changes"
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "Version 1.2",
|
"id": "Version 1.2",
|
||||||
"date": "2016-04-14",
|
"date": "2016-04-14",
|
||||||
|
|||||||
85
index.html
85
index.html
@ -83,6 +83,7 @@
|
|||||||
</a>
|
</a>
|
||||||
</span>
|
</span>
|
||||||
<span class="header-item">
|
<span class="header-item">
|
||||||
|
<p class="control has-addons">
|
||||||
<a class="button" v-on:click="hideSpoilers = !hideSpoilers">
|
<a class="button" v-on:click="hideSpoilers = !hideSpoilers">
|
||||||
<span class="icon">
|
<span class="icon">
|
||||||
<i class="fa" v-bind:class="[hideSpoilers ? 'fa-check-square-o' : 'fa-square-o']"></i>
|
<i class="fa" v-bind:class="[hideSpoilers ? 'fa-check-square-o' : 'fa-square-o']"></i>
|
||||||
@ -91,6 +92,12 @@
|
|||||||
Hide Spoilers
|
Hide Spoilers
|
||||||
</span>
|
</span>
|
||||||
</a>
|
</a>
|
||||||
|
<a class="button is-info is-marginless" v-on:click="enterSpoilerSettings">
|
||||||
|
<span class="icon">
|
||||||
|
<i class="fa fa-cogs"></i>
|
||||||
|
</span>
|
||||||
|
</a>
|
||||||
|
</p>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -143,6 +150,56 @@
|
|||||||
<button class="modal-close" v-on:click="exitLoadMode"></button>
|
<button class="modal-close" v-on:click="exitLoadMode"></button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Spoilers Settings Modal -->
|
||||||
|
<div id="spoilers-modal" class="modal" v-bind:class="[pick_spoilers ? 'is-active' : '']">
|
||||||
|
<div class="modal-background" v-on:click="exitSpoilerSettings"></div>
|
||||||
|
<div class="modal-container">
|
||||||
|
<div class="modal-content">
|
||||||
|
<div class="box">
|
||||||
|
<div class="content">
|
||||||
|
<p class="notification is-info">
|
||||||
|
These settings control which elements are hidden when Hide Spoilers is enabled.
|
||||||
|
</p>
|
||||||
|
<p class="control">
|
||||||
|
<label class="checkbox">
|
||||||
|
<input type="checkbox" v-model="temp_spoilers.bundle_rewards">
|
||||||
|
Bundle Rewards
|
||||||
|
</label>
|
||||||
|
</p>
|
||||||
|
<p class="control">
|
||||||
|
<label class="checkbox">
|
||||||
|
<input type="checkbox" v-model="temp_spoilers.item_source">
|
||||||
|
Item Source Information
|
||||||
|
</label>
|
||||||
|
</p>
|
||||||
|
<p class="control">
|
||||||
|
<label class="checkbox">
|
||||||
|
<input type="checkbox" v-model="temp_spoilers.item_seasons">
|
||||||
|
Item Seasons
|
||||||
|
</label>
|
||||||
|
</p>
|
||||||
|
<p class="control">
|
||||||
|
<label class="checkbox">
|
||||||
|
<input type="checkbox" v-model="temp_spoilers.item_skills">
|
||||||
|
Item Skills
|
||||||
|
</label>
|
||||||
|
</p>
|
||||||
|
<a class="button is-info is-pulled-right" v-on:click="saveSpoilerSettings">
|
||||||
|
<span class="icon">
|
||||||
|
<i class="fa fa-save"></i>
|
||||||
|
</span>
|
||||||
|
<span>
|
||||||
|
Save
|
||||||
|
</span>
|
||||||
|
</a>
|
||||||
|
<div class="is-clearfix"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<button class="modal-close" v-on:click="exitSpoilerSettings"></button>
|
||||||
|
</div>
|
||||||
|
|
||||||
<!-- BUNDLE TAB -->
|
<!-- BUNDLE TAB -->
|
||||||
<section id="bundle-section" class="section" v-if="active_page == 'bundles'">
|
<section id="bundle-section" class="section" v-if="active_page == 'bundles'">
|
||||||
<div class="container is-fluid">
|
<div class="container is-fluid">
|
||||||
@ -154,6 +211,7 @@
|
|||||||
</p>
|
</p>
|
||||||
<p class="panel-tabs">
|
<p class="panel-tabs">
|
||||||
<a href="#" v-for="room in static.rooms" id="panel-room-{{ room.id }}"
|
<a href="#" v-for="room in static.rooms" id="panel-room-{{ room.id }}"
|
||||||
|
class="has-text-centered"
|
||||||
v-bind:class="[room.id == active_room ? 'is-active' : '']"
|
v-bind:class="[room.id == active_room ? 'is-active' : '']"
|
||||||
v-on:click.stop="change_room(room.id)">
|
v-on:click.stop="change_room(room.id)">
|
||||||
{{ room.name }}
|
{{ room.name }}
|
||||||
@ -177,7 +235,8 @@
|
|||||||
{{ user_data[active_bundle].length }} / {{ static.bundles[active_bundle].items_required }}
|
{{ user_data[active_bundle].length }} / {{ static.bundles[active_bundle].items_required }}
|
||||||
</span>
|
</span>
|
||||||
</h3>
|
</h3>
|
||||||
<h5 class="subtitle">{{ static.bundles[active_bundle].reward }}</h5>
|
<h5 class="subtitle" v-if="!(hideSpoilers && spoilers.bundle_rewards)">{{ static.bundles[active_bundle].reward }}</h5>
|
||||||
|
<h5 class="subtitle" v-else> </h5>
|
||||||
<progress class="progress is-info"
|
<progress class="progress is-info"
|
||||||
value="{{ user_data[active_bundle].length }}"
|
value="{{ user_data[active_bundle].length }}"
|
||||||
max="{{ static.bundles[active_bundle].items_required }}"></progress>
|
max="{{ static.bundles[active_bundle].items_required }}"></progress>
|
||||||
@ -211,7 +270,7 @@
|
|||||||
<div class="content is-flex">
|
<div class="content is-flex">
|
||||||
<div class="columns source">
|
<div class="columns source">
|
||||||
<div class="column">
|
<div class="column">
|
||||||
<div v-if="!hideSpoilers">{{ item.source }}</div>
|
<div v-if="!(hideSpoilers && spoilers.item_source)">{{ item.source }}</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -230,7 +289,7 @@
|
|||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<footer class="card-footer" v-if="!hideSpoilers">
|
<footer class="card-footer" v-if="!(hideSpoilers && spoilers.item_seasons)">
|
||||||
<div class="card-footer-item">
|
<div class="card-footer-item">
|
||||||
<span class="icon is-small"><i class="fa fa-calendar-check-o"></i></span>
|
<span class="icon is-small"><i class="fa fa-calendar-check-o"></i></span>
|
||||||
<span class="tag is-primary is-text-centered"
|
<span class="tag is-primary is-text-centered"
|
||||||
@ -239,7 +298,7 @@
|
|||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
<footer class="card-footer" v-if="!hideSpoilers">
|
<footer class="card-footer" v-if="!(hideSpoilers && source.item_skills)">
|
||||||
<div class="card-footer-item">
|
<div class="card-footer-item">
|
||||||
<span class="icon is-small"><i class="fa fa-tree"></i></span>
|
<span class="icon is-small"><i class="fa fa-tree"></i></span>
|
||||||
<span class="tag is-info is-text-centered"
|
<span class="tag is-info is-text-centered"
|
||||||
@ -287,7 +346,7 @@
|
|||||||
<div class="content is-flex">
|
<div class="content is-flex">
|
||||||
<div class="columns source">
|
<div class="columns source">
|
||||||
<div class="column">
|
<div class="column">
|
||||||
<div v-if="!hideSpoilers">{{ item.source }}</div>
|
<div v-if="!(hideSpoilers && spoilers.item_source)">{{ item.source }}</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -306,7 +365,7 @@
|
|||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<footer class="card-footer" v-if="!hideSpoilers">
|
<footer class="card-footer" v-if="!(hideSpoilers && spoilers.item_seasons)">
|
||||||
<div class="card-footer-item">
|
<div class="card-footer-item">
|
||||||
<span class="icon is-small"><i class="fa fa-calendar-check-o"></i></span>
|
<span class="icon is-small"><i class="fa fa-calendar-check-o"></i></span>
|
||||||
<span class="tag is-primary is-text-centered"
|
<span class="tag is-primary is-text-centered"
|
||||||
@ -315,7 +374,7 @@
|
|||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
<footer class="card-footer" v-if="!hideSpoilers">
|
<footer class="card-footer" v-if="!(hideSpoilers && spoilers.item_skills)">
|
||||||
<div class="card-footer-item">
|
<div class="card-footer-item">
|
||||||
<span class="icon is-small"><i class="fa fa-tree"></i></span>
|
<span class="icon is-small"><i class="fa fa-tree"></i></span>
|
||||||
<span class="tag is-info is-text-centered"
|
<span class="tag is-info is-text-centered"
|
||||||
@ -365,7 +424,7 @@
|
|||||||
<div class="content is-flex">
|
<div class="content is-flex">
|
||||||
<div class="columns source">
|
<div class="columns source">
|
||||||
<div class="column">
|
<div class="column">
|
||||||
<div v-if="!hideSpoilers">{{ item.source }}</div>
|
<div v-if="!(hideSpoilers && spoilers.item_source)">{{ item.source }}</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -384,7 +443,7 @@
|
|||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<footer class="card-footer" v-if="!hideSpoilers">
|
<footer class="card-footer" v-if="!(hideSpoilers && spoilers.item_seasons)">
|
||||||
<div class="card-footer-item">
|
<div class="card-footer-item">
|
||||||
<span class="icon is-small"><i class="fa fa-calendar-check-o"></i></span>
|
<span class="icon is-small"><i class="fa fa-calendar-check-o"></i></span>
|
||||||
<span class="tag is-primary is-text-centered"
|
<span class="tag is-primary is-text-centered"
|
||||||
@ -393,7 +452,7 @@
|
|||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
<footer class="card-footer" v-if="!hideSpoilers">
|
<footer class="card-footer" v-if="!(hideSpoilers && spoilers.item_skills)">
|
||||||
<div class="card-footer-item">
|
<div class="card-footer-item">
|
||||||
<span class="icon is-small"><i class="fa fa-tree"></i></span>
|
<span class="icon is-small"><i class="fa fa-tree"></i></span>
|
||||||
<span class="tag is-info is-text-centered"
|
<span class="tag is-info is-text-centered"
|
||||||
@ -445,7 +504,7 @@
|
|||||||
<div class="content is-flex">
|
<div class="content is-flex">
|
||||||
<div class="columns source">
|
<div class="columns source">
|
||||||
<div class="column">
|
<div class="column">
|
||||||
<div v-if="!hideSpoilers">{{ item.source }}</div>
|
<div v-if="!(hideSpoilers && spoilers.item_source)">{{ item.source }}</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -464,7 +523,7 @@
|
|||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<footer class="card-footer" v-if="!hideSpoilers">
|
<footer class="card-footer" v-if="!(hideSpoilers && spoilers.item_seasons)">
|
||||||
<div class="card-footer-item">
|
<div class="card-footer-item">
|
||||||
<span class="icon is-small"><i class="fa fa-calendar-check-o"></i></span>
|
<span class="icon is-small"><i class="fa fa-calendar-check-o"></i></span>
|
||||||
<span class="tag is-primary is-text-centered"
|
<span class="tag is-primary is-text-centered"
|
||||||
@ -473,7 +532,7 @@
|
|||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
<footer class="card-footer" v-if="!hideSpoilers">
|
<footer class="card-footer" v-if="!(hideSpoilers && spoilers.item_skills)">
|
||||||
<div class="card-footer-item">
|
<div class="card-footer-item">
|
||||||
<span class="icon is-small"><i class="fa fa-tree"></i></span>
|
<span class="icon is-small"><i class="fa fa-tree"></i></span>
|
||||||
<span class="tag is-info is-text-centered"
|
<span class="tag is-info is-text-centered"
|
||||||
|
|||||||
27
main.js
27
main.js
@ -11,8 +11,17 @@ var v = new Vue({
|
|||||||
active_skill: "farming",
|
active_skill: "farming",
|
||||||
save_mode: false,
|
save_mode: false,
|
||||||
load_mode: false,
|
load_mode: false,
|
||||||
|
pick_spoilers: false,
|
||||||
hideCompleted: false,
|
hideCompleted: false,
|
||||||
hideSpoilers: false
|
hideSpoilers: false,
|
||||||
|
spoilers: {
|
||||||
|
bundle_rewards: true,
|
||||||
|
item_source: true,
|
||||||
|
item_seasons: true,
|
||||||
|
item_skills: true
|
||||||
|
},
|
||||||
|
temp_spoilers: {}
|
||||||
|
|
||||||
},
|
},
|
||||||
ready: function(){
|
ready: function(){
|
||||||
this.fetchData();
|
this.fetchData();
|
||||||
@ -22,6 +31,10 @@ var v = new Vue({
|
|||||||
if(storedUserData !== null && storedUserData !== ""){
|
if(storedUserData !== null && storedUserData !== ""){
|
||||||
this.loadData(storedUserData);
|
this.loadData(storedUserData);
|
||||||
}
|
}
|
||||||
|
spoilers = localStorage.getItem('spoilers');
|
||||||
|
if(spoilers !== null && spoilers !== ""){
|
||||||
|
this.spoilers = JSON.parse(spoilers);
|
||||||
|
}
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
user_data_serialized: function(){
|
user_data_serialized: function(){
|
||||||
@ -65,6 +78,18 @@ var v = new Vue({
|
|||||||
exitSaveMode: function(){
|
exitSaveMode: function(){
|
||||||
this.save_mode = false;
|
this.save_mode = false;
|
||||||
},
|
},
|
||||||
|
enterSpoilerSettings: function(){
|
||||||
|
this.temp_spoilers = JSON.parse(JSON.stringify(this.spoilers));
|
||||||
|
this.pick_spoilers = true;
|
||||||
|
},
|
||||||
|
saveSpoilerSettings: function(){
|
||||||
|
this.spoilers = JSON.parse(JSON.stringify(this.temp_spoilers));
|
||||||
|
localStorage.setItem('spoilers', JSON.stringify(this.spoilers));
|
||||||
|
this.exitSpoilerSettings();
|
||||||
|
},
|
||||||
|
exitSpoilerSettings: function(){
|
||||||
|
this.pick_spoilers = false
|
||||||
|
},
|
||||||
change_page: function(new_page){
|
change_page: function(new_page){
|
||||||
this.active_page = new_page;
|
this.active_page = new_page;
|
||||||
},
|
},
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user