Skip to content

Commit 07c2b06

Browse files
lujoselu98lujoselu98
committed
Merge develop
2 parents 047ade2 + e5f0883 commit 07c2b06

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+64610
-0
lines changed

‎.idea/misc.xml‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎PadelVersus.iml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module type="WEB_MODULE" version="4">
3+
<component name="NewModuleRootManager" inherit-compiler-output="true">
4+
<exclude-output />
5+
<content url="file://$MODULE_DIR$" />
6+
<orderEntry type="inheritedJdk" />
7+
<orderEntry type="sourceFolder" forTests="false" />
8+
</component>
9+
</module>

‎README.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ The webapp will implement ELO ranking system automatically calculated.
5252

5353
### Snapshots
5454
#### Home
55+
<<<<<<< HEAD
5556
This window will show you some matches of the tournament with their dates, and their places. Moreover, will show you the latest matches and the next matches and the main managers.
5657
![Home](https://raw.githubusercontent.com/CodeURJC-DAW-2019-20/PadelVersus/master/WebImages/Captura.JPG)
5758
#### Loggin
@@ -81,3 +82,13 @@ Contains one calendar with the matches of each month.
8182
![Calendar](https://raw.githubusercontent.com/CodeURJC-DAW-2019-20/PadelVersus/master/WebImages/Calendar.JPG)
8283
### Flow Diagram
8384
![Diagram](https://raw.githubusercontent.com/CodeURJC-DAW-2019-20/PadelVersus/master/WebImages/flowDiagram.JPG)
85+
=======
86+
#### Matches
87+
#### SpecificMatch
88+
#### Teams
89+
#### SpecificTeam
90+
#### Player/User
91+
92+
#### Registration Tournament
93+
### Flow Diagram
94+
>>>>>>> origin/develop

‎RegistrationForm.html‎

Lines changed: 262 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,262 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="UTF-8">
5+
<title>Tournament Registration</title>
6+
<meta charset="utf-8">
7+
<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
8+
<meta name="description" content=""/>
9+
<meta name="keywords" content=""/>
10+
<meta name="viewport" content="width=device-width,initial-scale=1">
11+
<title>Padel Versus</title>
12+
<link href="https://fonts.googleapis.com/css?family=Montserrat%7COpen+Sans:700,400%7CRaleway:400,800,900"
13+
rel="stylesheet"/>
14+
<link rel="icon" href="favicon.ico" type="image/x-icon">
15+
<link href="css/library/bootstrap.css" rel="stylesheet" type="text/css"/>
16+
<link href="dev-assets/preloader-default.css" rel="stylesheet" type="text/css"/>
17+
<link href="dev-assets/demo-switcher.css" rel="stylesheet" type="text/css"/>
18+
</head>
19+
<body>
20+
21+
<div class="preloader-wrapper" id="preloader">
22+
<div class="motion-line dark-big"></div>
23+
<div class="motion-line yellow-big"></div>
24+
<div class="motion-line dark-small"></div>
25+
<div class="motion-line yellow-normal"></div>
26+
<div class="motion-line yellow-small1"></div>
27+
<div class="motion-line yellow-small2"></div>
28+
</div>
29+
30+
31+
32+
33+
<!--MAIN MENU WRAP BEGIN-->
34+
<div class="main-menu-wrap sticky-menu">
35+
<div class="container">
36+
<a class="custom-logo-link">
37+
<img src="images/soccer/logo.png" alt="logo" class="custom-logo" href="index.html">
38+
</a>
39+
40+
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#team-menu" aria-expanded="false">
41+
<span class="sr-only">Toggle navigation</span>
42+
<span class="icon-bar"></span>
43+
<span class="icon-bar"></span>
44+
<span class="icon-bar"></span>
45+
</button>
46+
<nav class="navbar">
47+
<div class="collapse navbar-collapse" id="team-menu">
48+
<ul class="main-menu nav">
49+
<li class="active">
50+
<a href="index.html"><span>Home</span></a>
51+
</li>
52+
<li>
53+
<a href="matches.html"><span>Matches</span></a>
54+
<ul>
55+
<li>
56+
<a href="standing-cup.html"><span>Standings</span></a>
57+
</li>
58+
<li>
59+
<a href="standings.html"><span>Championship</span></a>
60+
</li>
61+
</ul>
62+
</li>
63+
<li>
64+
<a href="teams.html"><span>Teams</span></a>
65+
</li>
66+
<li><a href="standings.html"><span>Ranking</span></a></li>
67+
<li><a href="calendar.html"><span>Calendar</span></a></li>
68+
69+
<li><a href="RegistrationForm.html"><span>Registration Tournament</span></a></li>
70+
<li>
71+
<a href="coming-soon.html"><span>other</span></a>
72+
<ul>
73+
<li><a href="404.html"><span>404</span></a></li>
74+
<li><a href="offline.html"><span>offline</span></a></li>
75+
<li><a href="coming-soon.html"><span>comming soon</span></a></li>
76+
77+
</ul>
78+
</li>
79+
<li><a href="logIn.html"><span>LOG IN</span></a></li>
80+
</ul>
81+
</div>
82+
</nav>
83+
</div>
84+
</div>
85+
<!--MAIN MENU WRAP END-->
86+
87+
88+
<div class="container" style="padding-top :3%">
89+
<form>
90+
<div class="form-group">
91+
<div class="form-row">
92+
<div class="form-group col-md-offset-2">
93+
<label>Chose Tournament</label>
94+
<select class="form-control" style="width: 75%">
95+
<option selected>Choose...</option>
96+
<option>Tournament 1</option>
97+
<option>Tournament 2</option>
98+
<option>Tournament 3</option>
99+
</select>
100+
<label>Team name</label>
101+
<input type="text" class="form-control" placeholder="Team name" style="width: 75%">
102+
<label> Upload team Logo</label>
103+
<input type="file" class="form-control-file" style="width: 75%">
104+
</div>
105+
</div>
106+
<div class="form-row">
107+
<div class="form-group col-md-6">
108+
<label style="display: block; text-align: center"><h3>Player Name</h3></label>
109+
<div >
110+
<a href="player.html" class="item">
111+
<img src="images/soccer/staff-item-img.jpg" alt="player" style="margin-left: 20%">
112+
</a>
113+
</div>
114+
</div>
115+
<div class="form-group col-md-6">
116+
<label style="display: block; margin-left:25%"><h3>Partner</h3></label>
117+
<select class="form-control" style="width: 75%; ">
118+
<option selected>Choose Partner</option>
119+
<option>Tournament 1</option>
120+
<option>Tournament 2</option>
121+
<option>Tournament 3</option>
122+
</select>
123+
</div>
124+
</div>
125+
</div>
126+
<<button type="submit" class="btn btn-primary">Register</button>
127+
</form>
128+
</div>
129+
130+
131+
<!--FOOTER BEGIN-->
132+
<footer class="footer">
133+
<div class="wrapper-overfllow">
134+
<div class="container">
135+
<div class="row">
136+
<div class="col-md-4 col-sm-12">
137+
<div class="footer-left">
138+
<div class="wrap">
139+
<a href="index.html" class="foot-logo"><img src="images/soccer/footer-logo.png" alt="footer-logo"></a>
140+
141+
</div>
142+
</div>
143+
</div>
144+
<div class="col-md-4 col-sm-12 col-lg-offset-1">
145+
<div class="foot-news">
146+
<h4>Recent news</h4>
147+
<div class="item">
148+
<a class="image"><img class="img-responsive" src="images/padel.jpg" alt="news-image"></a>
149+
<a class="date">25 Sep 2016</a>
150+
</div>
151+
</div>
152+
</div>
153+
<div class=" col-lg-3 col-md-4 col-sm-12">
154+
<div class="foot-contact">
155+
<h4>Contact us</h4>
156+
<ul class="contact-list">
157+
<li><i class="fa fa-flag" aria-hidden="true"></i><span>URJC</span></li>
158+
<li><i class="fa fa-envelope" aria-hidden="true"></i><a href="mailto:team@email.com">padelversus@email.com</a></li>
159+
<li class="phone"><i class="fa fa-phone" aria-hidden="true"></i><span>+34 583766284</span></li>
160+
</ul>
161+
<ul class="socials">
162+
<li><a href="#"><i class="fa fa-facebook-square" aria-hidden="true"></i></a></li>
163+
<li><a href="#"><i class="fa fa-twitter" aria-hidden="true"></i></a></li>
164+
<li><a href="#"><i class="fa fa-google" aria-hidden="true"></i></a></li>
165+
<li><a href="#"><i class="fa fa-pinterest" aria-hidden="true"></i></a></li>
166+
<li><a href="#"><i class="fa fa-instagram" aria-hidden="true"></i></a></li>
167+
</ul>
168+
</div>
169+
</div>
170+
</div>
171+
</div>
172+
</div>
173+
<div class="footer-menu-wrap">
174+
<div class="container">
175+
<ul class="main-menu nav">
176+
<li class="active">
177+
<a href="index.html"><span>Home</span></a>
178+
</li>
179+
<li>
180+
<a href="matches.html"><span>Matches</span></a>
181+
</li>
182+
<li>
183+
<a href="teams.html"><span>Team</span></a>
184+
</li>
185+
<li><a href="standings.html"><span>Ranking</span></a></li>
186+
<li><a href="calendar.html"><span>Calendar</span></a></li>
187+
<li><a href="RegistrationForm.html"><span>Registration Tournament</span></a></li>
188+
<li><a href="logIn.html"><span>LOG IN</span></a></li>
189+
</ul>
190+
191+
192+
</div>
193+
</div>
194+
195+
</footer>
196+
<!--FOOTER END-->->
197+
198+
<script type="text/javascript" src="js/library/jquery.js"></script>
199+
<script type="text/javascript" src="js/library/jquery-ui.js"></script>
200+
<script type="text/javascript" src="js/library/bootstrap.js"></script>
201+
<script type="text/javascript" src="js/library/jquery.sticky.js"></script>
202+
<script type="text/javascript" src="js/library/jquery.jcarousel.js"></script>
203+
<script type="text/javascript" src="js/library/jcarousel.connected-carousels.js"></script>
204+
<script type="text/javascript" src="js/library/owl.carousel.js"></script>
205+
<script type="text/javascript" src="js/library/progressbar.js"></script>
206+
<script type="text/javascript" src="js/library/jquery.bracket.min.js"></script>
207+
<script type="text/javascript" src="js/library/chartist.js"></script>
208+
<script type="text/javascript" src="js/library/Chart.js"></script>
209+
<script type="text/javascript" src="js/library/fancySelect.js"></script>
210+
<script type="text/javascript" src="js/library/isotope.pkgd.js"></script>
211+
<script type="text/javascript" src="js/library/imagesloaded.pkgd.js"></script>
212+
213+
<script type="text/javascript" src="js/jquery.team-coundown.js"></script>
214+
<script type="text/javascript" src="js/matches-slider.js"></script>
215+
<script type="text/javascript" src="js/header.js"></script>
216+
<script type="text/javascript" src="js/matches_broadcast_listing.js"></script>
217+
<script type="text/javascript" src="js/news-line.js"></script>
218+
<script type="text/javascript" src="js/match_galery.js"></script>
219+
<script type="text/javascript" src="js/main-club-gallery.js"></script>
220+
<script type="text/javascript" src="js/product-slider.js"></script>
221+
<script type="text/javascript" src="js/circle-bar.js"></script>
222+
<script type="text/javascript" src="js/standings.js"></script>
223+
<script type="text/javascript" src="js/shop-price-filter.js"></script>
224+
<script type="text/javascript" src="js/timeseries.js"></script>
225+
<script type="text/javascript" src="js/radar.js"></script>
226+
<script type="text/javascript" src="js/slider.js"></script>
227+
<script type="text/javascript" src="js/preloader.js"></script>
228+
<script type="text/javascript" src="js/diagram.js"></script>
229+
<script type="text/javascript" src="js/bi-polar-diagram.js"></script>
230+
<script type="text/javascript" src="js/label-placement-diagram.js"></script>
231+
<script type="text/javascript" src="js/donut-chart.js"></script>
232+
<script type="text/javascript" src="js/animate-donut.js"></script>
233+
<script type="text/javascript" src="js/advanced-smil.js"></script>
234+
<script type="text/javascript" src="js/svg-path.js"></script>
235+
<script type="text/javascript" src="js/pick-circle.js"></script>
236+
<script type="text/javascript" src="js/horizontal-bar.js"></script>
237+
<script type="text/javascript" src="js/gauge-chart.js"></script>
238+
<script type="text/javascript" src="js/stacked-bar.js"></script>
239+
240+
<script type="text/javascript" src="js/library/chartist-plugin-legend.js"></script>
241+
<script type="text/javascript" src="js/library/chartist-plugin-threshold.js"></script>
242+
<script type="text/javascript" src="js/library/chartist-plugin-pointlabels.js"></script>
243+
244+
<script type="text/javascript" src="js/treshold.js"></script>
245+
<script type="text/javascript" src="js/visible.js"></script>
246+
<script type="text/javascript" src="js/anchor.js"></script>
247+
<script type="text/javascript" src="js/landing_carousel.js"></script>
248+
<script type="text/javascript" src="js/landing_sport_standings.js"></script>
249+
<script type="text/javascript" src="js/twitterslider.js"></script>
250+
<script type="text/javascript" src="js/champions.js"></script>
251+
<script type="text/javascript" src="js/landing_mainnews_slider.js"></script>
252+
<script type="text/javascript" src="js/carousel.js"></script>
253+
<script type="text/javascript" src="js/video_slider.js"></script>
254+
<script type="text/javascript" src="js/footer_slides.js"></script>
255+
<script type="text/javascript" src="js/player_test.js"></script>
256+
257+
<script type="text/javascript" src="js/main.js"></script>
258+
259+
260+
<script type="text/javascript" src="dev-assets/demo-switcher.js"></script>
261+
</body>
262+
</html>

0 commit comments

Comments
 (0)