Skip to content

Commit

Permalink
Merge pull request #15 from CodeURJC-DAW-2019-20/serverBranch
Browse files Browse the repository at this point in the history
Modificadas el resto de navbars
  • Loading branch information
Danichu15 authored Feb 19, 2020
2 parents 350520b + 663b24f commit 36853db
Showing 11 changed files with 159 additions and 127 deletions.
6 changes: 6 additions & 0 deletions practica/src/main/java/com/practica/demo/Controlador.java
Original file line number Diff line number Diff line change
@@ -48,6 +48,12 @@ public String index(Model model) {

return "index"; //es necesario poner el .html
}

@RequestMapping("/index")
public String goIndex(Model model) {
return "index";
}

@RequestMapping("/tournaments")
public String goTournaments(Model model) {
return "rocketLeague";
2 changes: 1 addition & 1 deletion practica/src/main/resources/templates/bracketCreation.html
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@
<div class="collapse navbar-collapse" id="navbarCollapse">
<ul class="navbar-nav mr-auto">
<li class="nav-item active">
<form action="">
<form action="index">
<input type="submit" class="nav-link" value="Home">
</form>
</li>
2 changes: 1 addition & 1 deletion practica/src/main/resources/templates/diamond.html
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@
<div class="collapse navbar-collapse" id="navbarCollapse">
<ul class="navbar-nav mr-auto">
<li class="nav-item active">
<form action="">
<form action="index">
<input type="submit" class="nav-link" value="Home">
</form>
</li>
2 changes: 1 addition & 1 deletion practica/src/main/resources/templates/infoPage.html
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@
<div class="collapse navbar-collapse" id="navbarCollapse">
<ul class="navbar-nav mr-auto">
<li class="nav-item active">
<form action="">
<form action="index">
<input type="submit" class="nav-link" value="Home">
</form>
</li>
33 changes: 19 additions & 14 deletions practica/src/main/resources/templates/leaderBoard.html
Original file line number Diff line number Diff line change
@@ -4,40 +4,45 @@
</head>

<body class="hm-gradient">
<!-- NavBar -->

<!-- NavBar -->
<header>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
<a class="navbar-brand" href="#">
<img src="/imgs/NavBar/web-icon-white.png" width="30" height="30" alt="">
<img src="/imgs/Navbar/web-icon-white.png" width="30" height="30" alt="">
</a>
<a class="navbar-brand" >eTorneos</a>
<a class="navbar-brand" >eTournaments</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarCollapse">
<ul class="navbar-nav mr-auto">
<li class="nav-item active">
<a class="nav-link" href="../index/index.html">Home</a>
<form action="index">
<input type="submit" class="nav-link" value="Home">
</form>
</li>
<li class="nav-item active">
<a class="nav-link" href="../sign-in/sign-in.html">Sign in</a>
<form action="singIn">
<input type="submit" class="nav-link" value="Sign In">
</form>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Tournaments</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
<a class="dropdown-item" href="../lol/index.html">League of Legends</a>
<a class="dropdown-item" href="../rl/index.html">Rocket League</a>
<a class="dropdown-item" href="../pokemon/pokemon.html">Pokémon</a>
</div>
<li class="nav-item active">
<form action="leaderBoard">
<input type="submit" class="nav-link" value="Leaderboard">
</form>
</li>
</ul>
<ul class="navbar-nav ml-auto">
<li class="nav-item active">
<a class="nav-link" href="#">Register</a>
<form action="register">
<input type="submit" class="nav-link" value="Register">
</form>
</li>
</ul>
</div>


</nav>
</header>
<main>
37 changes: 17 additions & 20 deletions practica/src/main/resources/templates/profile.html
Original file line number Diff line number Diff line change
@@ -19,43 +19,40 @@
<link rel="stylesheet" href="css/Profile/magnific-popup.css" />
<link rel="stylesheet" href="css/Profile/style.css" />


<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->

</head>
<header>
<!-- NavBar -->
<header>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
<a class="navbar-brand" href="#">
<img src="/imgs/NavBar/web-icon-white.png" width="30" height="30" alt="">
<img src="/imgs/Navbar/web-icon-white.png" width="30" height="30" alt="">
</a>
<a class="navbar-brand" >eTorneos</a>
<a class="navbar-brand" >eTournaments</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarCollapse">
<ul class="navbar-nav mr-auto">
<li class="nav-item active">
<a class="nav-link" href="../../index/index.html">Home</a>
<form action="index">
<input type="submit" class="nav-link" value="Home">
</form>
</li>
<li class="nav-item active">
<a class="nav-link" href="../../sign-in/sign-in.html">Sign in</a>
<form action="singIn">
<input type="submit" class="nav-link" value="Sign In">
</form>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Tournaments</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
<a class="dropdown-item" href="../../lol/index.html">League of Legends</a>
<a class="dropdown-item" href="../../rl/index.html">Rocket League</a>
<a class="dropdown-item" href="../../pokemon/pokemon.html">Pokémon</a>
</div>
<li class="nav-item active">
<form action="leaderBoard">
<input type="submit" class="nav-link" value="Leaderboard">
</form>
</li>
</ul>
<ul class="navbar-nav ml-auto">
<li class="nav-item active">
<a class="nav-link" href="../../register/register.html">Register</a>
<form action="register">
<input type="submit" class="nav-link" value="Register">
</form>
</li>
</ul>
</div>
24 changes: 18 additions & 6 deletions practica/src/main/resources/templates/register.html
Original file line number Diff line number Diff line change
@@ -7,27 +7,39 @@
<body>

<!-- NavBar -->
<!-- NavBar -->
<header>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
<a class="navbar-brand" href="#">
<img src="/imgs/NavBar/web-icon-white.png" width="30" height="30" alt="">
<img src="/imgs/Navbar/web-icon-white.png" width="30" height="30" alt="">
</a>
<a class="navbar-brand" >eTorneos</a>
<a class="navbar-brand" >eTournaments</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarCollapse">
<ul class="navbar-nav mr-auto">
<li class="nav-item active">
<a class="nav-link" href="../index/index.html">Home</a>
<form action="index">
<input type="submit" class="nav-link" value="Home">
</form>
</li>
<li class="nav-item active">
<a class="nav-link" href="../sign-in/sign-in.html">Sign in</a>
</li>
<form action="singIn">
<input type="submit" class="nav-link" value="Sign In">
</form>
</li>
<li class="nav-item active">
<form action="leaderBoard">
<input type="submit" class="nav-link" value="Leaderboard">
</form>
</li>
</ul>
<ul class="navbar-nav ml-auto">
<li class="nav-item active">
<a class="nav-link" href="../register/register.html">Register</a>
<form action="register">
<input type="submit" class="nav-link" value="Register">
</form>
</li>
</ul>
</div>
30 changes: 16 additions & 14 deletions practica/src/main/resources/templates/rocketLeague.html
Original file line number Diff line number Diff line change
@@ -19,37 +19,39 @@

<body>

<!-- Navigation -->
<!-- NavBar -->
<header>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
<a class="navbar-brand" href="#">
<img src="/imgs/NavBar/web-icon-white.png" width="30" height="30" alt="">
<img src="/imgs/Navbar/web-icon-white.png" width="30" height="30" alt="">
</a>
<a class="navbar-brand" >eTorneos</a>
<a class="navbar-brand" >eTournaments</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarCollapse">
<ul class="navbar-nav mr-auto">
<li class="nav-item active">
<a class="nav-link" href="../index/index.html">Home</a>
<form action="index">
<input type="submit" class="nav-link" value="Home">
</form>
</li>
<li class="nav-item active">
<a class="nav-link" href="../sign-in/sign-in.html">Sign in</a>
<form action="singIn">
<input type="submit" class="nav-link" value="Sign In">
</form>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Tournaments</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
<a class="dropdown-item" href="../lol/index.html">League of Legends</a>
<a class="dropdown-item" href="../rl/index.html">Rocket League</a>
<a class="dropdown-item" href="../pokemon/pokemon.html">Pokémon</a>
</div>
<li class="nav-item active">
<form action="leaderBoard">
<input type="submit" class="nav-link" value="Leaderboard">
</form>
</li>
</ul>
<ul class="navbar-nav ml-auto">
<li class="nav-item active">
<a class="nav-link" href="../register/register.html">Register</a>
<form action="register">
<input type="submit" class="nav-link" value="Register">
</form>
</li>
</ul>
</div>
76 changes: 39 additions & 37 deletions practica/src/main/resources/templates/signIn.html
Original file line number Diff line number Diff line change
@@ -40,44 +40,46 @@

</head>
<body class="text-center">
<!-- NavBar -->
<header>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
<a class="navbar-brand" href="#"> <img
src="/imgs/NavBar/web-icon-white.png" width="30" height="30" alt="">
</a> <a class="navbar-brand">eTorneos</a>
<button class="navbar-toggler" type="button" data-toggle="collapse"
data-target="#navbarCollapse" aria-controls="navbarCollapse"
aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarCollapse">
<ul class="navbar-nav mr-auto">
<li class="nav-item active"><a class="nav-link"
href="/">Home</a></li>
<li class="nav-item active"><a class="nav-link"
href="../sign-in/sign-in.html">Sign in</a></li>
<li class="nav-item dropdown"><a
class="nav-link dropdown-toggle" href="#" id="navbarDropdown"
role="button" data-toggle="dropdown" aria-haspopup="true"
aria-expanded="false"> Tournaments</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdown">

{{#games}}
<a href="/">{{.}}</a>
{{/games}}
</div>
</li>
</ul>
<ul class="navbar-nav ml-auto">
<li class="nav-item active"><a class="nav-link"
href="../register/register.html">Register</a></li>
</ul>
</div>
<!-- NavBar -->
<header>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
<a class="navbar-brand" href="#">
<img src="/imgs/Navbar/web-icon-white.png" width="30" height="30" alt="">
</a>
<a class="navbar-brand" >eTournaments</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarCollapse">
<ul class="navbar-nav mr-auto">
<li class="nav-item active">
<form action="index">
<input type="submit" class="nav-link" value="Home">
</form>
</li>
<li class="nav-item active">
<form action="singIn">
<input type="submit" class="nav-link" value="Sign In">
</form>
</li>
<li class="nav-item active">
<form action="leaderBoard">
<input type="submit" class="nav-link" value="Leaderboard">
</form>
</li>
</ul>
<ul class="navbar-nav ml-auto">
<li class="nav-item active">
<form action="register">
<input type="submit" class="nav-link" value="Register">
</form>
</li>
</ul>
</div>



</nav>
</header>
</nav>
</header>

<form class="form-signin" action="/login" method="post">
<img class="mb-4" src="/imgs/NavBar/web-icon-black.png" alt="" width="72"
Loading

0 comments on commit 36853db

Please sign in to comment.