Fixed Merge

This commit is contained in:
Ubuntu 2019-04-20 17:57:14 -04:00
commit 609af1c391
2 changed files with 63 additions and 67 deletions

View File

@ -1,9 +1,6 @@
// Validates the data inputs on the upload form
function validateUpload() {
// console.log("Validated!");
// document.getElementById("upload-form").submit();
var url_bar = document.getElementById('url');
var video_title = document.getElementById('title');
var username = document.getElementById('username');
@ -103,4 +100,3 @@ function validateUpload() {
} else {
alert('Please fill out the rest of the upload form.');
}
}

View File

@ -1,63 +1,63 @@
<html lang="en">
<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>Video Title *</h3>
<input type="text" name="title" id="title">
<h3>Username *</h3>
<input type="text" name="username" id="username">
<h3>Description</h3>
<textarea name="description" cols="30" rows="10" id="description"></textarea>
<h3>Event Date *</h3>
<input type="date" name="video-date" id="video-date">
<h3>Video Length</h3>
<input type="text" name="length" id="length">
<h3>Characters (Seperated by commas) *</h3>
<input type="text" name="characters" id="characters">
<h3>Players (Seperated by commas) *</h3>
<input type="text" name="players" id="players">
<h3>Select Game *</h3>
<select name="game" id="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" id="stage">
<input type="button" name="submit_button" value="Submit" onclick="validateUpload()">
</form>
</body>
</html>
<html lang="en">
<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">
<<<<<<< HEAD
<h3>Video Title *</h3>
<input type="text" name="title" id="title">
<h3>Username *</h3>
<input type="text" name="username" id="username">
<h3>Description</h3>
<textarea name="description" cols="30" rows="10" id="description"></textarea>
<h3>Event Date *</h3>
<input type="date" name="video-date" id="video-date">
<h3>Video Length</h3>
<input type="text" name="length" id="length">
<h3>Characters (Seperated by commas) *</h3>
<input type="text" name="characters" id="characters">
<h3>Players (Seperated by commas) *</h3>
<input type="text" name="players" id="players">
<h3>Select Game *</h3>
<select name="game" id="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" id="stage">
<input type="button" name="submit_button" value="Submit" onclick="validateUpload()">
</form>
</body>
</html>