projects
/
vchess.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
c6b8d37
)
Better challenge link in emails, better text on 'social' button
author
Benjamin Auder
<benjamin.auder@somewhere>
Wed, 19 Feb 2020 09:23:36 +0000
(10:23 +0100)
committer
Benjamin Auder
<benjamin.auder@somewhere>
Wed, 19 Feb 2020 09:23:36 +0000
(10:23 +0100)
client/src/translations/en.js
patch
|
blob
|
blame
|
history
client/src/translations/es.js
patch
|
blob
|
blame
|
history
client/src/translations/fr.js
patch
|
blob
|
blame
|
history
client/src/views/Hall.vue
patch
|
blob
|
blame
|
history
server/routes/challenges.js
patch
|
blob
|
blame
|
history
diff --git
a/client/src/translations/en.js
b/client/src/translations/en.js
index
4e69ddc
..
94be8f8
100644
(file)
--- a/
client/src/translations/en.js
+++ b/
client/src/translations/en.js
@@
-97,7
+97,6
@@
export const translations = {
Settings: "Settings",
"Show possible moves?": "Show possible moves?",
"Show solution": "Show solution",
Settings: "Settings",
"Show possible moves?": "Show possible moves?",
"Show solution": "Show solution",
- Social: "Social",
Solution: "Solution",
"Stop game": "Stop game",
Subject: "Subject",
Solution: "Solution",
"Stop game": "Stop game",
Subject: "Subject",
diff --git
a/client/src/translations/es.js
b/client/src/translations/es.js
index
828f42a
..
56c6733
100644
(file)
--- a/
client/src/translations/es.js
+++ b/
client/src/translations/es.js
@@
-98,7
+98,6
@@
export const translations = {
Settings: "Configuraciones",
"Show possible moves?": "¿Mostrar posibles movimientos?",
"Show solution": "Mostrar la solución",
Settings: "Configuraciones",
"Show possible moves?": "¿Mostrar posibles movimientos?",
"Show solution": "Mostrar la solución",
- Social: "Social",
Solution: "Solución",
"Stop game": "Terminar la partida",
Subject: "Asunto",
Solution: "Solución",
"Stop game": "Terminar la partida",
Subject: "Asunto",
diff --git
a/client/src/translations/fr.js
b/client/src/translations/fr.js
index
b67e7f7
..
3e9aa6a
100644
(file)
--- a/
client/src/translations/fr.js
+++ b/
client/src/translations/fr.js
@@
-101,7
+101,6
@@
export const translations = {
Settings: "Réglages",
"Show possible moves?": "Montrer les coups possibles ?",
"Show solution": "Montrer la solution",
Settings: "Réglages",
"Show possible moves?": "Montrer les coups possibles ?",
"Show solution": "Montrer la solution",
- Social: "Social",
Solution: "Solution",
"Stop game": "Arrêter la partie",
Subject: "Sujet",
Solution: "Solution",
"Stop game": "Arrêter la partie",
Subject: "Sujet",
diff --git
a/client/src/views/Hall.vue
b/client/src/views/Hall.vue
index
2236ce3
..
68d3b48
100644
(file)
--- a/
client/src/views/Hall.vue
+++ b/
client/src/views/Hall.vue
@@
-83,7
+83,7
@@
main
.col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
.button-group
button#peopleBtn(onClick="window.doClick('modalPeople')")
.col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
.button-group
button#peopleBtn(onClick="window.doClick('modalPeople')")
- | {{ st.tr["
Social
"] }}
+ | {{ st.tr["
Who's there?
"] }}
button(onClick="window.doClick('modalNewgame')")
| {{ st.tr["New game"] }}
.row
button(onClick="window.doClick('modalNewgame')")
| {{ st.tr["New game"] }}
.row
@@
-275,8
+275,11
@@
export default {
this.newchallenge.cadence = b.innerHTML;
});
});
this.newchallenge.cadence = b.innerHTML;
});
});
- const showCtype = localStorage.getItem("type-challenges") || "live";
- const showGtype = localStorage.getItem("type-games") || "live";
+ const dispCorr = this.$route.query["disp"];
+ const showCtype =
+ dispCorr || localStorage.getItem("type-challenges") || "live";
+ const showGtype =
+ dispCorr || localStorage.getItem("type-games") || "live";
this.setDisplay("c", showCtype);
this.setDisplay("g", showGtype);
},
this.setDisplay("c", showCtype);
this.setDisplay("g", showGtype);
},
diff --git
a/server/routes/challenges.js
b/server/routes/challenges.js
index
9ba5c53
..
5d0068d
100644
(file)
--- a/
server/routes/challenges.js
+++ b/
server/routes/challenges.js
@@
-39,7
+39,9
@@
router.post("/challenges", access.logged, access.ajax, (req,res) => {
challenge.to = user.id; //ready now to insert challenge
insertChallenge();
if (user.notify)
challenge.to = user.id; //ready now to insert challenge
insertChallenge();
if (user.notify)
- UserModel.notify(user, "New challenge: " + params.siteURL + "/");
+ UserModel.notify(
+ user,
+ "New challenge: " + params.siteURL + "/#/?disp=corr");
});
}
else
});
}
else