Skip to content

Commit

Permalink
rutaaaassss
Browse files Browse the repository at this point in the history
  • Loading branch information
@JorgeCarreras2
JorgeCarreras2 committed Apr 1, 2020
1 parent 6e9510d commit 4703007
Show file tree
Hide file tree
Showing 8 changed files with 188 additions and 122 deletions.
21 changes: 21 additions & 0 deletions Angular/lucia-no-te-enfades-pp/src/app/app-routing.module.ts
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';

import { HomeComponent } from "./home/home.component";
import { LoginComponent } from "./login/login.component";

const routes: Routes = [
{path: 'index', component: HomeComponent },
{path: 'login', component: LoginComponent }
];

export const routing = RouterModule.forRoot(routes);
// Aqui van las rutas de los componentes
// Más tarde, a la hora de poner links, los links cambian el componente activo

@NgModule({

imports: [RouterModule.forRoot(routes)],
exports: [RouterModule]
})
export class AppRoutingModule { }
115 changes: 1 addition & 114 deletions Angular/lucia-no-te-enfades-pp/src/app/app.component.html
View file
Original file line number Diff line number Diff line change
@@ -1,114 +1 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="generator" content="Jekyll v3.8.6">
<title>eTorneos - Home</title>

<!-- Bootstrap core CSS -->
<link href="/core/bootstrap.min.css" rel="stylesheet">
<meta name="theme-color" content="#563d7c">


<!-- Custom styles for this template -->
<link href="/css/Index/carousel.css" rel="stylesheet">

</head>
<body>
<!-- NavBar -->
<header>

</header>

<main role="main">
<div id="myCarousel" class="carousel slide" data-ride="carousel"
data-interval="5000">
<div class="carousel-inner">
<div class="carousel-item active">
<img src="/imgs/Main/main1.jpg" class="d-block w-100" alt="...">
<div class="container">
<div class="carousel-caption text-right">
<h1>Exciting tournaments</h1>
<p>Play competitively with your friends in Rocket League
matches.</p>
</div>
</div>
</div>
<div class="carousel-item">
<img src="/imgs/Main/main2.jpg" class="d-block w-100" alt="...">
<div class="container">
<div class="carousel-caption text-right">
<h1>Win prizes</h1>
<p>Win awesome prizes in a variety of different tournaments.</p>
</div>
</div>
</div>


<div class="carousel-item">
<img src="/imgs/Main/main3.png" class="d-block w-100" alt="...">
<div class="container">
<div class="carousel-caption text-right">
<h1>Show your skills</h1>
<p>The best teams will be in our leaderboard.</p>
</div>
</div>
</div>

</div>
</div>


<div class="container marketing">

<!-- Three columns of text below the carousel -->
<div class="row">
<div class="col-lg-4">
<img src="/imgs/Main/rl-icon.jpg" class="" width="140" height="140"
preserveAspectRatio="xMidYMid slice" focusable="false" role="img">
<title>Rocket League</title>
<h2>Rocket League</h2>
<p>Play with your team in incredible tournaments.</p>
<form action="tournaments">
<input type="submit" class="button" value="View tournaments">
</form>
</div>
<!-- /.col-lg-4 -->
<div class="col-lg-4">
<img src="/imgs/Main/leaderboardLogo.png" class="" width="140"
height="140" preserveAspectRatio="xMidYMid slice"
focusable="false" role="img">
<title>Leaderboard</title>
<h2>Leaderboard</h2>
<p>See the very best teams that have taken part in tournaments.</p>
<form action="leaderBoard">
<input type="submit" class="button" value="View leaderboard">
</form>
</div>
<!-- /.col-lg-4 -->

<div class="col-lg-4">
<img src="/imgs/Main/userLogo.png" class="" width="140"
height="140" preserveAspectRatio="xMidYMid slice"
focusable="false" role="img">
<title>Register</title>
<h2>Register</h2>
<p>Still not have an account? Make an account to start playing.</p>
<form action="register">
<input type="submit" class="button" value="Register">
</form>
</div>

<!-- /.col-lg-4 -->
</div>
<!-- /.row -->

</div>

</main>
<script src="/core/jquery-3.4.1.slim.min.js"></script>
<script src="/core/bootstrap.bundle.min.js"></script>
</body>
</html>
<router-outlet></router-outlet>
15 changes: 8 additions & 7 deletions Angular/lucia-no-te-enfades-pp/src/app/app.module.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,24 @@ import { UserService } from './_servicies/user.service';

import { RocketleagueComponent } from './rocketleague/rocketleague.component';

import { AppRoutingModule, routing } from './app-routing.module';

import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
import { RouterModule } from "@angular/router";

import { HomeComponent } from './home/home.component';

@NgModule({
declarations: [
AppComponent,
LoginComponent,
HomeComponent

],

imports: [
BrowserModule,
NgbModule,
RouterModule.forRoot([
{path: 'login', component:LoginComponent},
{path:'index', component:AppComponent}
// {path:"",redirectTo:"index",pathMatch:'full'}
])
AppRoutingModule,
routing
],
providers: [
UserService
Expand Down
115 changes: 115 additions & 0 deletions Angular/lucia-no-te-enfades-pp/src/app/home/home.component.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="generator" content="Jekyll v3.8.6">
<title>eTorneos - Home</title>

<!-- Bootstrap core CSS -->
<link href="/core/bootstrap.min.css" rel="stylesheet">
<meta name="theme-color" content="#563d7c">


<!-- Custom styles for this template -->
<link href="/css/Index/carousel.css" rel="stylesheet">

</head>
<body>
<!-- NavBar -->
<header>

</header>

<main role="main">
<div id="myCarousel" class="carousel slide" data-ride="carousel"
data-interval="5000">
<div class="carousel-inner">
<div class="carousel-item active">
<img src="/imgs/Main/main1.jpg" class="d-block w-100" alt="...">
<div class="container">
<div class="carousel-caption text-right">
<h1>Exciting tournaments</h1>
<p>Play competitively with your friends in Rocket League
matches.</p>
</div>
</div>
</div>
<div class="carousel-item">
<img src="/imgs/Main/main2.jpg" class="d-block w-100" alt="...">
<div class="container">
<div class="carousel-caption text-right">
<h1>Win prizes</h1>
<p>Win awesome prizes in a variety of different tournaments.</p>
</div>
</div>
</div>


<div class="carousel-item">
<img src="/imgs/Main/main3.png" class="d-block w-100" alt="...">
<div class="container">
<div class="carousel-caption text-right">
<h1>Show your skills</h1>
<p>The best teams will be in our leaderboard.</p>
</div>
</div>
</div>

</div>
</div>


<div class="container marketing">

<!-- Three columns of text below the carousel -->
<div class="row">
<div class="col-lg-4">
<img src="/imgs/Main/rl-icon.jpg" class="" width="140" height="140"
preserveAspectRatio="xMidYMid slice" focusable="false" role="img">
<title>Rocket League</title>
<h2>Rocket League</h2>
<p>Play with your team in incredible tournaments.</p>
<form action="tournaments">
<input type="submit" class="button" value="View tournaments">
</form>
</div>
<!-- /.col-lg-4 -->
<div class="col-lg-4">
<img src="/imgs/Main/leaderboardLogo.png" class="" width="140"
height="140" preserveAspectRatio="xMidYMid slice"
focusable="false" role="img">
<title>Leaderboard</title>
<h2>Leaderboard</h2>
<p>See the very best teams that have taken part in tournaments.</p>
<form action="leaderBoard">
<input type="submit" class="button" value="View leaderboard">
</form>
</div>
<!-- /.col-lg-4 -->

<div class="col-lg-4">
<img src="/imgs/Main/userLogo.png" class="" width="140"
height="140" preserveAspectRatio="xMidYMid slice"
focusable="false" role="img">
<title>Register</title>
<h2>Register</h2>
<p>Still not have an account? Make an account to start playing.</p>
<form action="register">
<input type="submit" class="button" value="Register">
</form>
</div>

<!-- /.col-lg-4 -->
</div>
<!-- /.row -->

</div>

</main>
<script src="/core/jquery-3.4.1.slim.min.js"></script>
<script src="/core/bootstrap.bundle.min.js"></script>
</body>
</html>

Empty file added Angular/lucia-no-te-enfades-pp/src/app/home/home.component.scss
View file
Empty file.
25 changes: 25 additions & 0 deletions Angular/lucia-no-te-enfades-pp/src/app/home/home.component.spec.ts
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';

import { HomeComponent } from './home.component';

describe('HomeComponent', () => {
let component: HomeComponent;
let fixture: ComponentFixture<HomeComponent>;

beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ HomeComponent ]
})
.compileComponents();
}));

beforeEach(() => {
fixture = TestBed.createComponent(HomeComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});

it('should create', () => {
expect(component).toBeTruthy();
});
});
15 changes: 15 additions & 0 deletions Angular/lucia-no-te-enfades-pp/src/app/home/home.component.ts
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { Component, OnInit } from '@angular/core';

@Component({
selector: 'app-home',
templateUrl: './home.component.html',
styleUrls: ['./home.component.scss']
})
export class HomeComponent implements OnInit {

constructor() { }

ngOnInit(): void {
}

}
4 changes: 3 additions & 1 deletion Angular/lucia-no-te-enfades-pp/src/app/login/login.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ import { first } from 'rxjs/operators';

//import { AlertService, AuthenticationService } from '@/_services';

@Component({ templateUrl: 'login.component.html' })
@Component({
selector: 'login',
templateUrl: 'login.component.html' })
export class LoginComponent implements OnInit {
ngOnInit() {

Expand Down

0 comments on commit 4703007

Please sign in to comment.