X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=views%2Fvariant.pug;h=9419998a6d203af17251b850a26173f2e2f464c8;hp=62e9d76dc2d4a0f955c29d53224b59607d035d50;hb=8d7e2786f5a67a1b9a77c742d7951e0efbe8747d;hpb=247356cde3f4e36004942c5f57187d667f7ef27c

diff --git a/views/variant.pug b/views/variant.pug
index 62e9d76d..9419998a 100644
--- a/views/variant.pug
+++ b/views/variant.pug
@@ -1,73 +1,51 @@
 extends layout
 
 block css
-	link(rel="stylesheet" href="//fonts.googleapis.com/icon?family=Material+Icons")
 	link(rel="stylesheet" href="/stylesheets/variant.css")
 
 block content
 	.container#variantPage
-		// Modals
-		case lang
-			when "en"
-				include translations/en.pug
-				include langNames/en.pug
-				include modal-lang/en.pug
-				include modal-help/en.pug
-			when "fr"
-				include translations/fr.pug
-				include langNames/fr.pug
-				include modal-lang/fr.pug
-				include modal-help/fr.pug
-		input#modal-newgame.modal(type="checkbox")
-		div(role="dialog" aria-labelledby="newGameTxt")
-			.card.smallpad.small-modal
-				label#close-newgame.modal-close(for="modal-newgame")
-				h3#newGameTxt= translations["New game"]
-				p= translations["Waiting for opponent..."]
 		.row
 			.col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
 				label.drawer-toggle(for="drawer-control")
 				input#drawer-control.drawer(type="checkbox")
 				#menuBar
 					label.drawer-close(for="drawer-control")
-					a#homeLink(href="/")
+					a.icon-link(href="/")
 						i.material-icons home
-					.info-container
-						a(href="#rules" @click="setDisplay('rules')")
-							=translations["Rules"]
-						a(href="#play" @click="setDisplay('play')")
-							=translations["Play!"]
-						a(href="#problems" @click="setDisplay('problems')") 
-							=translations["Problems"]
-					#flagMenu.clickable(
-							onClick="document.getElementById('modalLang').checked=true")
-						img(src="/images/flags/" + lang + ".svg")
-					#helpMenu.clickable(
-							onClick="document.getElementById('modalHelp').checked=true")
-						.info-container
-							p= translations["Help"]
+					a(href="#room" @click="setDisplay('room')")
+						=translations["Hall"]
+					a(href="#gameList" @click="setDisplay('gameList')")
+						=translations["My games"]
+					a(href="#rules" @click="setDisplay('rules')")
+						=translations["Rules"]
+					a(href="#problems" @click="setDisplay('problems')")
+						=translations["Problems"]
+					#settings.clickable(
+							onClick="document.getElementById('modalSettings').checked=true")
+						i.material-icons settings
 		.row
+			my-room(v-show="display=='room'")
+			my-game-list(v-show="display=='gameList'")
 			my-rules(v-show="display=='rules'")
-			my-game(v-show="display=='play'" v-bind:problem="problem")
-			my-problems(v-show="display=='problems'" v-on:show-problem="showProblem($event)")
+			my-problems(v-show="display=='problems'")
+			my-game(v-show="display=='game'" :gameId="gameid")
 
 block javascripts
 	script(src="/javascripts/utils/misc.js")
 	script(src="/javascripts/utils/array.js")
-	script(src="/javascripts/utils/md5.js")
 	script(src="/javascripts/utils/printDiagram.js")
-	script(src="/javascripts/utils/ajax.js")
 	script(src="/javascripts/utils/datetime.js")
 	script(src="/javascripts/socket_url.js")
 	script(src="/javascripts/base_rules.js")
-	script(src="/javascripts/variants/" + variant + ".js")
+	script(src="/javascripts/variants/" + variant.name + ".js")
 	script.
 		const V = VariantRules; //because this variable is often used
-		const variant = "#{variant}";
-		const problemArray = !{JSON.stringify(problemArray)};
-		const translations = !{JSON.stringify(translations)};
+		const variant = !{JSON.stringify(variant)};
+	script(src="/javascripts/components/room.js")
+	script(src="/javascripts/components/gameList.js")
 	script(src="/javascripts/components/rules.js")
-	script(src="/javascripts/components/game.js")
 	script(src="/javascripts/components/problemSummary.js")
 	script(src="/javascripts/components/problems.js")
+	script(src="/javascripts/components/game.js")
 	script(src="/javascripts/variant.js")