diff --git a/README.md b/README.md index ce79239..5b5dcd3 100755 --- a/README.md +++ b/README.md @@ -1,2 +1,9 @@ # FightHub A website that allows you to share videos of matches in fighting games. You can also search for videos added by other users. + +### Images +

+ 0.png + 1.png + 2.png +

diff --git a/Screenshots/0.png b/Screenshots/0.png new file mode 100644 index 0000000..4229667 Binary files /dev/null and b/Screenshots/0.png differ diff --git a/Screenshots/1.png b/Screenshots/1.png new file mode 100644 index 0000000..d1d571e Binary files /dev/null and b/Screenshots/1.png differ diff --git a/Screenshots/2.png b/Screenshots/2.png new file mode 100644 index 0000000..bc4c5cd Binary files /dev/null and b/Screenshots/2.png differ diff --git a/hello b/hello deleted file mode 100755 index e69de29..0000000 diff --git a/index.php b/index.php index c02ebc3..3b3a8bc 100755 --- a/index.php +++ b/index.php @@ -1,4 +1,4 @@ - + FightHub - Home @@ -6,7 +6,7 @@
-

FightHub

+

FightHub

 upload @@ -138,6 +138,6 @@ function writeEntryforIndex() { writeEntryforIndex(); ?> - + diff --git a/main.css b/main.css index 2c4b822..b6855e4 100644 --- a/main.css +++ b/main.css @@ -1,146 +1,251 @@ -body { - background-color: #1E1E1E; -} - - -/* Styles for titlebar */ - - -form.search { - /* border: white solid 1px; */ - height: 150px; - margin-top: -10px !important; - width: 99% !important; - border-bottom: #727272 solid 2px; -} - -.title-text { - float: left; - margin-top: 26px; - padding-right: 20px; - color: #FF3D53; - font-family: "Calibri"; - font-size: 50pt; -} - -.search { - width: 50%; - padding: 10px; - font-size: 20px; - margin-top: 45px; -} - -.submit { - width: 150px; - padding: 10px; - font-size: 20px; -} - -img.upload { - width: 150px; - /* margin-bottom: -17px; */ - 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; -} - -/* Styles for Video element displays */ - -div.video-list-container { - /* border: white solid 1px; */ - margin-left: 15%; - margin-right: 15%; -} - -#video-item { - /* border: white solid 1px; */ - width: 100%; - height: 178.75px; - padding-top: 10px; - border-bottom: #727272 solid 2px; -} - -iframe { - width: 300px; - height: 168.75px; - /* margin-top: 5px; */ - margin-bottom: 10px; - float: left; -} - -.video-list-container a { - color: #FF3D53; - /* border: white solid 1px; */ - padding-left: 10px; - /* margin-top: 1000px !important; */ - font-family: "Calibri"; - /* position: relative; */ -} - -#players-characters { - /* border: white solid 1px; */ - /* display: inline; */ -} - -#players-characters table { - color: #FF3D53; - font-size: 10pt; - font-family: "Calibri"; - padding-left: 10px; - width: 20%; - margin-top: 10px; - /* border-right: #727272 solid 2px; */ -} - -table .data { - font-weight: lighter; -} - -table .header { - font-weight: bolder !important; - padding-bottom: 10px; -} - -#table-border { - border-bottom: #727272 solid 1px; -} - -#game-stage { - color: #FF3D53; - float: right; - font-family: "Calibri"; - /* border: white solid 1px; */ - /* border-right: #727272 solid 2px; */ - margin-top: -83px; - width: 20%; - text-align: left; -} - -#description p { - /* border: white solid 1px; */ - color: #FF3D53; - font-family: "Calibri"; - margin-left: 310px; -} +body { + background-color: #1E1E1E; +} + + +/* Styles for titlebar */ + + +form.search { + /* border: white solid 1px; */ + height: 150px; + margin-top: -10px !important; + width: 99% !important; + border-bottom: #727272 solid 2px; +} + +.title-text { + float: left; + margin-top: 26px; + padding-right: 20px; + color: #FF3D53; + font-family: "Calibri"; + font-size: 50pt; +} + +.search { + width: 50%; + padding: 10px; + font-size: 20px; + margin-top: 45px; +} + +.submit { + width: 150px; + padding: 10px; + font-size: 20px; +} + +img.upload { + width: 150px; + /* margin-bottom: -17px; */ + 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%; + margin-top: 60px; + margin-bottom: 60px; +} + +.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: 2%; +} + +h3.url { + /* padding-top: 40px; */ + /* border: white solid 1px; */ +} + +.url { + /* margin: auto !important; */ + width: 93%; +} + +h3.title { + padding-top: 40px; +} + +.title { + /* margin: auto !important; */ + width: 93%; +} + +.user-date { + width: 93%; + margin-left: 3%; + /* margin: auto; */ +} + +.username { + /* margin-left: 20px; */ + padding-top: 20px; + margin-left: -20px; +} + +.video-date { + float: right; + margin-top: -62px; +} + +.description { + width: 93%; + /* margin: auto !important; */ + resize: none; +} + +h3.description { + padding-top: 40px; +} + +.characters { + width: 93%; + /* margin: auto !important; */ +} + +h3.characters { + padding-top: 40px; +} + +.players { + width: 93%; + /* margin: auto !important; */ +} + +h3.players { + padding-top: 40px; +} + +.game-info { + width: 93%; + margin-left: 3%; + /* margin: auto; */ +} + +.game-name { + padding-top: 20px; + margin-left: -20px; +} + +.stage-name { + float: right; + margin-top: -61px; +} + +.length-button { + margin: 3%; + width: 93%; + /* border: white solid 1px; */ +} + +.length { + padding-top: 10px; + margin-left: -20px; +} + +.button { + float: right; + margin-top: -21px; +} + +h3 { + padding-left: 15px; +} + + + + +/* Styles for Video element displays */ + +div.video-list-container { + /* border: white solid 1px; */ + margin-left: 15%; + margin-right: 15%; +} + +#video-item { + /* border: white solid 1px; */ + width: 100%; + height: 178.75px; + padding-top: 10px; + border-bottom: #727272 solid 2px; +} + +iframe { + width: 300px; + height: 168.75px; + /* margin-top: 5px; */ + margin-bottom: 10px; + float: left; +} + +.video-list-container a { + color: #FF3D53; + /* border: white solid 1px; */ + padding-left: 10px; + /* margin-top: 1000px !important; */ + font-family: "Calibri"; + /* position: relative; */ +} + +#players-characters { + /* border: white solid 1px; */ + /* display: inline; */ +} + +#players-characters table { + color: #FF3D53; + font-size: 10pt; + font-family: "Calibri"; + padding-left: 10px; + width: 20%; + margin-top: 10px; + /* border-right: #727272 solid 2px; */ +} + +table .data { + font-weight: lighter; +} + +table .header { + font-weight: bolder !important; + padding-bottom: 10px; +} + +#table-border { + border-bottom: #727272 solid 1px; +} + +#game-stage { + color: #FF3D53; + float: right; + font-family: "Calibri"; + /* border: white solid 1px; */ + /* border-right: #727272 solid 2px; */ + margin-top: -83px; + width: 20%; + text-align: left; +} + +#description p { + /* border: white solid 1px; */ + color: #FF3D53; + font-family: "Calibri"; + margin-left: 310px; +} diff --git a/scripts/main.js b/scripts/main.js index 03a897d..257f5bc 100755 --- a/scripts/main.js +++ b/scripts/main.js @@ -1,6 +1,103 @@ // Validates the data inputs on the upload form function validateUpload() { - console.log("Validated!"); - document.getElementById("upload-form").submit(); -} \ No newline at end of file + var url_bar = document.getElementById('url'); + var video_title = document.getElementById('title'); + var username = document.getElementById('username'); + // var description = document.getElementById('description'); // optional + var video_date = document.getElementById('video-date'); + // var length = document.getElementById('length'); // optional + var characters = document.getElementById('characters'); + var players = document.getElementById('players'); + var game = document.getElementById('game'); + var stage = document.getElementById('stage'); + + // console.log('url_bar: ' + url_bar); + // console.log('video_title: ' + video_title); + // console.log('username: ' + username); + // console.log('description: ' + description); + // console.log('video_date: ' + video_date); + // console.log('length: ' + length); + // console.log('characters: ' + characters); + // console.log('players: ' + players); + // console.log('game: ' + game); + // console.log('stage: ' + stage); + + + // Checking that the required text boxes are filled in, and highlighting them red + // if they are not + var form_complete = true; + + // URL + if (url_bar.value == "") { + form_complete = false; + url_bar.style = "border-color:red;" + } else { + url_bar.style = "border-color:green;" + } + + // Video Title + if (video_title.value == "") { + form_complete = false; + video_title.style = "border-color:red;" + } else { + video_title.style = "border-color:green;" + } + + // Username + if (username.value == "") { + form_complete = false; + username.style = "border-color:red;" + } else { + username.style = "border-color:green;" + } + + // Video Date + if (video_date.value == "") { + form_complete = false; + video_date.style = "border-color:red;" + } else { + video_date.style = "border-color:green;" + } + + // Characters + if (characters.value == "") { + form_complete = false; + characters.style = "border-color:red;" + } else { + characters.style = "border-color:green;" + } + + // Players + if (players.value == "") { + form_complete = false; + players.style = "border-color:red;" + } else { + players.style = "border-color:green;" + } + + // Game + if (game.value == "") { + form_complete = false; + game.style = "border-color:red;" + } else { + game.style = "border-color:green;" + } + + // Stage + if (stage.value == "") { + form_complete = false; + stage.style = "border-color:red;" + } else { + stage.style = "border-color:green;" + } + + // If the form is completely filled out, call the submit function for the form + // and redirect them to submit.php, otherwise alert them that they've forgotten to + // fill in some of the form + if (form_complete) { + document.getElementById("upload-form").submit(); + } else { + alert('Please fill out the rest of the upload form.'); + } +} diff --git a/search.php b/search.php index 08950f0..dda7fa1 100755 --- a/search.php +++ b/search.php @@ -1,17 +1,16 @@ - + - - FightHub - Home + FightHub - Search - - - -

FightHub

- - - upload -
+ + +
+

FightHub

 + + + upload +
@@ -153,5 +152,5 @@ function writeEntryforIndex() { ?> - + diff --git a/submit.php b/submit.php new file mode 100644 index 0000000..1d4954d --- /dev/null +++ b/submit.php @@ -0,0 +1,66 @@ +connect_error) { + //echo "it dead
i"; + die("Connection failed: " . $conn->connect_error); +} + +$url = $_GET['url']; +$title = $_GET['title']; +$username = $_GET['username']; +$description = $_GET['description']; +$event_date = $_GET['video-date']; +$length = $_GET['length']; +$characters = $_GET['characters']; +$players = $_GET['players']; +$game = $_GET['game']; +$stage = $_GET['stage']; +$date = date('Y\-m\-d'); +//echo "here
"; + +$url = mysqli_real_escape_string($conn, $url); +//echo "done
"; +$title = mysqli_real_escape_string($conn, $title); +$username = mysqli_real_escape_string($conn, $username); +$description = mysqli_real_escape_string($conn, $description); +$event_date = mysqli_real_escape_string($conn, $event_date); +$length = mysqli_real_escape_string($conn, $length); +$characters = mysqli_real_escape_string($conn, $characters); +$players = mysqli_real_escape_string($conn, $players); +$game = mysqli_real_escape_string($conn, $game); +$stage = mysqli_real_escape_string($conn, $stage); +$date = mysqli_real_escape_string($conn, $date); +//echo "there boi
"; +//echo ""; + +$sql = "INSERT INTO video (video_url, video_name, username, date_upload, date_video, video_length, description, characters, players, game, stage, approved) VALUES ('$url', '$title', '$username', '$date', '$event_date', '$length', '$description', '$characters', '$players', '$game', '$stage', TRUE)"; + +//echo ""; +//echo $sql; + +if($conn->query($sql) === TRUE){ + echo "New record created successfully"; +} +else { + echo "Error"; + echo $conn->error; +} +$conn->close() + +//echo "" + +//header("Location: http://ec2-18-217-5-198.us-east-2.compute.amazonaws.com/index.php"); + +//exit; +?> + + + diff --git a/test.txt b/test.txt deleted file mode 100755 index 90bfcb5..0000000 --- a/test.txt +++ /dev/null @@ -1 +0,0 @@ -this is a test diff --git a/upload.php b/upload.php index 7bf6d0d..3d1adee 100755 --- a/upload.php +++ b/upload.php @@ -1,63 +1,84 @@ - - - FightHub - Upload - - - - - - -
-

FightHub

- - - upload -
- - -
- -

Youtube URL *

- - -

Name *

- - -

Username *

- - -

Description

- - -

Event Date

- - -

Video Length

- - -

Characters (Seperated by commas) *

- - -

Players (Seperated by commas) *

- - -

Select Game *

- - -

Stage Name *

- - - - -
- - - + + + FightHub - Upload + + + + + + +
+

FightHub

 + + + upload +
+ + +
+ +

Youtube URL *

+ + +

Video Title *

+ + +
+
+

Username *

+ +
+ + +
+

Event Date *

+ +
+
+ +

Description

+ + +

Characters (Seperated by commas) *

+ + +

Players (Seperated by commas) *

+ + + + + +
+
+

Select Game *

+ +
+ +
+

Stage Name *

+ +
+
+ +
+
+

Video Length

+ +
+ +
+ +
+
+
+ + +