mirror of
https://github.com/ClaytonWWilson/FightHub.git
synced 2025-12-15 23:18:47 +00:00
Merge branch 'master' into Tristan_submit.php
This commit is contained in:
commit
dfaf9a1fe9
@ -4,6 +4,7 @@
|
||||
<link rel="stylesheet" href="main.css">
|
||||
</head>
|
||||
<body>
|
||||
<!-- Titlebar -->
|
||||
<form class="search" action="search.php">
|
||||
<h1 class="title-text">FightHub</h1>
|
||||
<input type="text" name="query" class="search" placeholder="Search..">
|
||||
|
||||
47
main.css
47
main.css
@ -3,23 +3,9 @@ body {
|
||||
}
|
||||
|
||||
|
||||
/* form.search {
|
||||
width: 80%;
|
||||
height: 150px;
|
||||
border: white solid 1px;
|
||||
border-bottom: #727272 solid 2px;
|
||||
} */
|
||||
/* Styles for titlebar */
|
||||
|
||||
/* div.upload {
|
||||
width: 5%;
|
||||
height: 150px;
|
||||
border: white solid 1px;
|
||||
border-bottom: #727272 solid 2px;
|
||||
display: block;
|
||||
float: left;
|
||||
} */
|
||||
|
||||
form {
|
||||
form.search {
|
||||
/* border: white solid 1px; */
|
||||
height: 150px;
|
||||
margin-top: -10px !important;
|
||||
@ -27,11 +13,6 @@ form {
|
||||
border-bottom: #727272 solid 2px;
|
||||
}
|
||||
|
||||
/* div.titlebar-container {
|
||||
border: white solid 1px;
|
||||
border-bottom: #727272 solid 2px;
|
||||
} */
|
||||
|
||||
.title-text {
|
||||
float: left;
|
||||
margin-top: 26px;
|
||||
@ -60,3 +41,27 @@ img.upload {
|
||||
margin-top: 45px;
|
||||
float: right;
|
||||
}
|
||||
|
||||
|
||||
/* Styles for upload.php */
|
||||
|
||||
form.upload-form {
|
||||
/* border: white solid 1px; */
|
||||
border-left: #727272 solid 2px;
|
||||
border-right: #727272 solid 2px;
|
||||
margin: 0 25% 0 25%;
|
||||
}
|
||||
|
||||
.upload-form input, .upload-form textarea, .upload-form select {
|
||||
display: block;
|
||||
margin-left: 20px;
|
||||
/* margin-bottom: 30px; */
|
||||
/* border: white solid 1px; */
|
||||
}
|
||||
|
||||
.upload-form h3 {
|
||||
color: #FF3D53;
|
||||
/* border: white solid 1px; */
|
||||
margin-bottom: 0px;
|
||||
margin-left: 20px;
|
||||
}
|
||||
6
scripts/main.js
Normal file
6
scripts/main.js
Normal file
@ -0,0 +1,6 @@
|
||||
|
||||
// Validates the data inputs on the upload form
|
||||
function validateUpload() {
|
||||
console.log("Validated!");
|
||||
document.getElementById("upload-form").submit();
|
||||
}
|
||||
34
submit.php
Normal file
34
submit.php
Normal file
@ -0,0 +1,34 @@
|
||||
<html>
|
||||
<head>
|
||||
<title>FightHub - Upload</title>
|
||||
<link rel="stylesheet" href="main.css">
|
||||
<script src="scripts/main.js"></script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<?php
|
||||
$servername = "localhost";
|
||||
$username = "fighthubuser";
|
||||
$password = "cC33dC8W";
|
||||
|
||||
$conn = new mysqli($servername, $username, $password);
|
||||
|
||||
if($conn->connect_error) {
|
||||
die("Connection failed: " . $conn->connect_error);
|
||||
}
|
||||
|
||||
$url = $_GET['url'];
|
||||
$name = $_GET['name'];
|
||||
$username = $_GET['username'];
|
||||
$description = $_GET['description'];
|
||||
$event_date = $_GET['date'];
|
||||
$length = $_GET['length'];
|
||||
$characters = $_GET['characters'];
|
||||
$players = $_GET['players'];
|
||||
$game = $_GET['game'];
|
||||
$stage = $_GET['stage'];
|
||||
echo"<h2>hello</h2>";
|
||||
echo $game;
|
||||
?>
|
||||
</body>
|
||||
</html>
|
||||
66
upload.php
66
upload.php
@ -1,3 +1,4 @@
|
||||
<<<<<<< HEAD
|
||||
<html>
|
||||
<head>
|
||||
<title>FightHub - Upload</title>
|
||||
@ -32,3 +33,68 @@
|
||||
?>
|
||||
</body>
|
||||
</html>
|
||||
=======
|
||||
<html>
|
||||
<head>
|
||||
<title>FightHub - Upload</title>
|
||||
<link rel="stylesheet" href="main.css">
|
||||
<script src="scripts/main.js"></script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<!-- Titlebar -->
|
||||
<form class="search" action="search.php">
|
||||
<h1 class="title-text">FightHub</h1>
|
||||
<input type="text" name="query" class="search" placeholder="Search..">
|
||||
<input type="submit" name="submit" class="submit" value="Search">
|
||||
<a href="upload.php"><img src="images/upload.png" class="upload" alt="upload"></a>
|
||||
</form>
|
||||
|
||||
<!-- submit.php will read the variables from the url and add it to the database -->
|
||||
<form class="upload-form" id="upload-form" action="submit.php">
|
||||
|
||||
<h3>Youtube URL *</h3>
|
||||
<input type="text" name="url" id="url">
|
||||
|
||||
<h3>Name *</h3>
|
||||
<input type="text" name="name" id="name">
|
||||
|
||||
<h3>Username *</h3>
|
||||
<input type="text" name="username">
|
||||
|
||||
<h3>Description</h3>
|
||||
<textarea name="description" cols="30" rows="10"></textarea>
|
||||
|
||||
<h3>Event Date</h3>
|
||||
<input type="date" name="video-date">
|
||||
|
||||
<h3>Video Length</h3>
|
||||
<input type="text" name="length">
|
||||
|
||||
<h3>Characters (Seperated by commas) *</h3>
|
||||
<input type="text" name="characters">
|
||||
|
||||
<h3>Players (Seperated by commas) *</h3>
|
||||
<input type="text" name="players">
|
||||
|
||||
<h3>Select Game *</h3>
|
||||
<select name="game">
|
||||
<option disabled selected value>-- Game --</option>
|
||||
<option value="Street Fighter V">Street Fighter V</option>
|
||||
<option value="Mortal Kombat 11">Mortal Kombat 11</option>
|
||||
<option value="Super Smash Bros Melee">Super Smash Bros Melee</option>
|
||||
<option value="Super Smash Bros Ultimate">Super Smash Ultimate</option>
|
||||
<option value="Killer Instinct">Killer Instinct</option>
|
||||
<option value="Injustice">Injustice</option>
|
||||
</select>
|
||||
|
||||
<h3>Stage Name *</h3>
|
||||
<input type="text" name="stage">
|
||||
|
||||
|
||||
<input type="button" name="submit_button" value="Submit" onclick="validateUpload()">
|
||||
</form>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
>>>>>>> master
|
||||
|
||||
Loading…
Reference in New Issue
Block a user