Commit e3b53ce5 authored by Sofia Aicha Delijaj's avatar Sofia Aicha Delijaj
Browse files

uwu

parent a8895d51
......@@ -11,7 +11,7 @@ const Pokemon = function(pokemon) {
Pokemon.getAll = result => {
sql.query("SELECT * FROM pokemon", (err, res) => {
sql.query("SELECT * FROM pokemon WHERE id_pokemon < 175", (err, res) => {
if (err) {
console.log("error: ", err);
result(null, err);
......
......@@ -11,7 +11,7 @@
</div>
</div>
<div class="col-md-4">
<a class="btn btn-primary" id="remove" [routerLink]="['/battle', partie.id_partie, partie.joueurTour, partie.pseudo]">Continue</a>
<a class="btn btn-primary" id="remove" [routerLink]="['/battle', partie.id_partie, partie.joueurTour, partie.pseudo]" skipLocationChange>Continue</a>
</div>
</div>
</div>
......
......@@ -2,7 +2,6 @@ import { Component, OnInit } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { ActivatedRoute } from '@angular/router';
import { ChatService } from '../chat.service';
import { Pokemon } from "./pokemon.js";
@Component({
selector: 'app-battle',
templateUrl: './battle.component.html',
......
......@@ -25,7 +25,7 @@
<div class="btn btn-primary" (click)="refuser(ami, i)">
<h6>Effacer</h6>
</div>
<div class="btn btn-primary" (click)="challenge(ami)">
<div class="btn btn-primary" (click)="challenge(ami.pseudo)">
<h6>Défier</h6>
</div>
</div>
......
......@@ -136,7 +136,6 @@ export class FriendsMenuComponent implements OnInit {
this.pseudo = res.body;
this.uid = res.uid;
this.liste();
this.ordre();
});
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment