projects
/
vchess.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix Maxima (immobilize kings too)
[vchess.git]
/
client
/
src
/
components
/
ChallengeList.vue
diff --git
a/client/src/components/ChallengeList.vue
b/client/src/components/ChallengeList.vue
index
7572ede
..
a1c46cd
100644
(file)
--- a/
client/src/components/ChallengeList.vue
+++ b/
client/src/components/ChallengeList.vue
@@
-1,12
+1,12
@@
<template lang="pug">
div
<template lang="pug">
div
- table
+ table
(v-if="challenges.length > 0")
thead
tr
th {{ st.tr["Variant"] }}
th {{ st.tr["With"] }}
th {{ st.tr["Cadence"] }}
thead
tr
th {{ st.tr["Variant"] }}
th {{ st.tr["With"] }}
th {{ st.tr["Cadence"] }}
- th {{ st.tr["
Random?
"] }}
+ th {{ st.tr["
Options
"] }}
tbody
tr(
v-for="c in sortedChallenges"
tbody
tr(
v-for="c in sortedChallenges"
@@
-16,7
+16,9
@@
div
td {{ c.vname }}
td {{ withWho(c) }}
td {{ c.cadence }}
td {{ c.vname }}
td {{ withWho(c) }}
td {{ c.cadence }}
- td(:class="getRandomnessClass(c)")
+ td(:class="getRandomnessClass(c)") {{ c.options.abridged || '' }}
+ p(v-else)
+ | {{ st.tr["No challenges found :( Click on 'New game'!"] }}
</template>
<script>
</template>
<script>
@@
-31,17
+33,22
@@
export default {
},
computed: {
sortedChallenges: function() {
},
computed: {
sortedChallenges: function() {
- // Show in order: challenges I sent, challenges I received, other challenges
+ // Show in order:
+ // challenges I sent, challenges I received, other challenges
let minAdded = Number.MAX_SAFE_INTEGER;
let maxAdded = 0;
let augmentedChalls = this.challenges.map(c => {
let priority = 0;
if (!!c.to && c.to == this.st.user.name) priority = 1;
let minAdded = Number.MAX_SAFE_INTEGER;
let maxAdded = 0;
let augmentedChalls = this.challenges.map(c => {
let priority = 0;
if (!!c.to && c.to == this.st.user.name) priority = 1;
- else if (c.from.sid == this.st.user.sid || c.from.id == this.st.user.id)
+ else if (
+ c.from.sid == this.st.user.sid ||
+ (c.from.id > 0 && c.from.id == this.st.user.id)
+ ) {
priority = 2;
priority = 2;
+ }
if (c.added < minAdded) minAdded = c.added;
if (c.added > maxAdded) maxAdded = c.added;
if (c.added < minAdded) minAdded = c.added;
if (c.added > maxAdded) maxAdded = c.added;
- return Object.assign({
}, c, { priority: priority }
);
+ return Object.assign({
priority: priority }, c
);
});
const deltaAdded = maxAdded - minAdded;
return augmentedChalls.sort((c1, c2) => {
});
const deltaAdded = maxAdded - minAdded;
return augmentedChalls.sort((c1, c2) => {
@@
-55,16
+62,24
@@
export default {
return c.to || this.st.tr["Any player"];
return c.from.name || "@nonymous";
},
return c.to || this.st.tr["Any player"];
return c.from.name || "@nonymous";
},
+ // TODO: duplicated from Hall
getRandomnessClass: function(c) {
getRandomnessClass: function(c) {
- return {
- ["random-" + c.randomness]: true
- };
+ const opts = c.options;
+ if (opts.randomness === undefined && opts.random === undefined)
+ return {};
+ if (opts.randomness !== undefined)
+ return { ["random-" + opts.randomness]: true };
+ return { ["random-" + (opts.random ? 2 : 0)]: true };
}
}
};
</script>
<style lang="sass" scoped>
}
}
};
</script>
<style lang="sass" scoped>
+p
+ text-align: center
+ font-weight: bold
+
// NOTE: the style applied to <tr> element doesn't work
tr.fromyou > td
font-style: italic
// NOTE: the style applied to <tr> element doesn't work
tr.fromyou > td
font-style: italic
@@
-73,9
+88,9
@@
tr.toyou > td
tr > td:last-child
&.random-0
tr > td:last-child
&.random-0
- background-color: #F
F5733
+ background-color: #F
EAF9E
&.random-1
&.random-1
- background-color: #
2B63B4
+ background-color: #
9EB2FE
&.random-2
&.random-2
- background-color: #
33B42B
+ background-color: #
A5FE9E
</style>
</style>