diff --git a/views/card-module.js b/views/card-module.js index af5860a..4c495a1 100644 --- a/views/card-module.js +++ b/views/card-module.js @@ -9,16 +9,17 @@ export default{ }, methods:{ clicked() { - if(!this.isClicked){ - this.isClicked=true - document.querySelector(`#${this.idUsed}`).setAttribute("style","border: 2px solid red; margin: 20px; color: red; fontSize: 20px; cursor: pointer"); - this.$emit('selected',this.id); - } - else{ - this.isClicked=false - document.querySelector(`#${this.idUsed}`).setAttribute("style","border: 2px solid black; margin: 20px; color: red; fontSize: 20px; cursor: pointer"); - this.$emit('unSelected',this.id); - } + this.$emit('selected',this.id); + // if(!this.isClicked){ + // this.isClicked=true + // document.querySelector(`#${this.idUsed}`).setAttribute("style","border: 2px solid red; margin: 20px; color: red; fontSize: 20px; cursor: pointer"); + // this.$emit('selected',this.id); + // } + // else{ + // this.isClicked=false + // document.querySelector(`#${this.idUsed}`).setAttribute("style","border: 2px solid black; margin: 20px; color: red; fontSize: 20px; cursor: pointer"); + // this.$emit('unSelected',this.id); + // } } }, template:` diff --git a/views/deck-module.js b/views/deck-module.js index 8429563..86a7544 100644 --- a/views/deck-module.js +++ b/views/deck-module.js @@ -12,37 +12,36 @@ export default{ methods:{ selected(id){ if(this.nbCardsSelected>=this.deck.nbCards){ - document.querySelector(`#id${id}`).setAttribute("style","border: 2px solid black; margin: 20px; color: red; fontSize: 20px; cursor: pointer"); + this.set(); + console.log("deb") } else{ - this.nbCardsSelected+=1; - console.log("this.nbCardsSelected",this.nbCardsSelected); - console.log("selected",id); - this.selectedCards[id]=this.deck.outputCards[id-1] - console.log('selectedCards add',this.selectedCards); - if(this.nbCardsSelected==this.deck.nbCards){ - this.set(); - console.log("dqsdgqhj") + if(this.selectedCards[id]!=null){ + console.log("deselec") + document.querySelector(`#id${id}`).setAttribute("style","border: 2px solid black; margin: 20px; color: red; fontSize: 20px; cursor: pointer"); + this.nbCardsSelected-=1 + this.selectedCards[id]=null + } + else{ + console.log("Selec") + this.selectedCards[id]=this.deck.outputCards[id-1] + document.querySelector(`#id${id}`).setAttribute("style","border: 2px solid red; margin: 20px; color: red; fontSize: 20px; cursor: pointer"); + this.nbCardsSelected+=1 + if(this.nbCardsSelected==this.deck.nbCards){ + console.log("this.selectedCards.length",this.selectedCards.length) + this.set(); + } } - } - }, - unSelected(id){ - if(this.selectedCards[id]!=null){ - this.selectedCards.splice(id,1); - this.nbCardsSelected-=1; - console.log("this.nbCardsSelected",this.nbCardsSelected); - console.log('selectedCards remove',this.selectedCards); - console.log("unSelected",id); } }, set(){ console.log("Check Set") let checkSet=true; if(checkSet){ + console.log("this.selectedCards.length",this.selectedCards.length) this.deck.checkSet(this.selectedCards); this.nbCardsSelected=0; this.selectedCards.splice(0,this.selectedCards.length+1) - console.log("this.selectedCards.length",this.selectedCards.length) } }, }, @@ -50,7 +49,7 @@ export default{