Merge pull request #19 from Thanos-UFM/backend

Listo a produccion
Thanos-UFM · Nov 14, 2018 · 49ded9c · 49ded9c
2 parents 84d2bd9 + 9100863
commit 49ded9c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/client/index.html b/client/index.html
@@ -2,7 +2,7 @@
 <html>
 <head>
   <meta charset="utf-8" />
-  <title>Cliente UNO</title>
+  <title>Node UNO</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
   <link rel='shortcut icon' type='image/x-icon' href='/favicon.ico'/>
   <link rel="stylesheet" type="text/css" href="css/style.css">

diff --git a/src/App.ts b/src/App.ts
@@ -4,7 +4,7 @@ import { Card } from './components/Card'
 import * as express from 'express'
 import * as socketIo from 'socket.io'
 import * as path from 'path'
-import { Result } from 'range-parser';
+//import { Result } from 'range-parser';
 
 class App {
   // Variables publicas
@@ -95,7 +95,7 @@ class App {
     let randomCards: Array<any> = []
     for (let i = 0; i < cardsToDeal; i++){
       if (this.cards.length == 0){
-        this.cards == this.usedCards;
+        this.fillDeck();
       }
       // Va a elegir un numero aleatorio de 0 a la cantidad de cartas que esten en el maso
       randomCardIndex = Math.floor(Math.random()*this.cards.length)

diff --git a/src/components/Game.ts b/src/components/Game.ts
@@ -4,5 +4,5 @@ export class Game {
   gameCode: string;
   players: Array<Player>;
   topCard: Card;
-  turn: number;
+  turn: number
 }