From 9147fc6f47d84161426737b650f555d61c1246d5 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 17 Apr 2019 00:37:11 -0400 Subject: [PATCH 01/19] wassup --- text.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 text.txt diff --git a/text.txt b/text.txt new file mode 100644 index 0000000..092bfb9 --- /dev/null +++ b/text.txt @@ -0,0 +1 @@ +yo From 216819913572dd319e13fad71d8a09f30d2aedd2 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Sat, 20 Apr 2019 16:27:51 -0400 Subject: [PATCH 02/19] upload.php 1st draft --- upload.php | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 upload.php diff --git a/upload.php b/upload.php new file mode 100644 index 0000000..1a665e4 --- /dev/null +++ b/upload.php @@ -0,0 +1,34 @@ + + + FightHub - Upload + + + + + + 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 "

" . $game . "

"; + ?> + + From 9b4d874b62172f9c951d1e60cf02c1d326647f98 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Sat, 20 Apr 2019 16:51:49 -0400 Subject: [PATCH 03/19] fixed upload.php merge conflict --- upload.php | 37 ------------------------------------- 1 file changed, 37 deletions(-) diff --git a/upload.php b/upload.php index cc76020..7bf6d0d 100644 --- a/upload.php +++ b/upload.php @@ -1,39 +1,3 @@ -<<<<<<< HEAD - - - FightHub - Upload - - - - - - 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 "

" . $game . "

"; - ?> - - -======= FightHub - Upload @@ -97,4 +61,3 @@ ->>>>>>> master From dbe0ba85fb6dc491d354621c9d6f6ce75a8c2b7b Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Sat, 20 Apr 2019 17:50:37 -0400 Subject: [PATCH 04/19] Updated update.php and add JS to it for textbox error checking --- index.php | 1 + main.css | 47 +++++++++++---------- scripts/main.js | 106 ++++++++++++++++++++++++++++++++++++++++++++++++ upload.php | 63 ++++++++++++++++++++++++++++ 4 files changed, 196 insertions(+), 21 deletions(-) create mode 100644 scripts/main.js create mode 100644 upload.php diff --git a/index.php b/index.php index d306974..cb55747 100755 --- a/index.php +++ b/index.php @@ -4,6 +4,7 @@ + + + +
+ +

Youtube URL *

+ + +

Video Title *

+ + +

Username *

+ + +

Description

+ + +

Event Date *

+ + +

Video Length

+ + +

Characters (Seperated by commas) *

+ + +

Players (Seperated by commas) *

+ + +

Select Game *

+ + +

Stage Name *

+ + + + +
+ + + From c70626cebe624c1ac54639138587f798a82c5859 Mon Sep 17 00:00:00 2001 From: Clayton Wilson Date: Sat, 20 Apr 2019 18:00:00 -0400 Subject: [PATCH 05/19] Fix Merge --- upload.php | 1 - 1 file changed, 1 deletion(-) diff --git a/upload.php b/upload.php index 30440a8..8efc326 100644 --- a/upload.php +++ b/upload.php @@ -20,7 +20,6 @@

Youtube URL *

-<<<<<<< HEAD

Video Title *

From 20aed419cbe64ac8ae2e0109e21b6e7293fdadd2 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Mon, 22 Apr 2019 00:21:47 -0400 Subject: [PATCH 06/19] Add styles and layout html code for video item list --- index.php | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ main.css | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 160 insertions(+) diff --git a/index.php b/index.php index cb55747..8648984 100755 --- a/index.php +++ b/index.php @@ -17,5 +17,85 @@ + +
+ +
+ + + Video Title Here + +
+ + + + + + + + + + + + + +
PlayersCharacters
Player1Character1
Player2Character2
+
+ +
+

Game Name

+

Stage Name

+
+ +
+

The description goes here.......

+
+ +
+ + + + +
+ + + Video Title Here + +
+ + + + + + + + + + + + + +
PlayersCharacters
Player1Character1
Player2Character2
+
+ +
+

Game Name

+

Stage Name

+
+ +
+

The description goes here.......

+
+ +
+ + +
+ diff --git a/main.css b/main.css index 9f88848..d2d053c 100755 --- a/main.css +++ b/main.css @@ -64,4 +64,84 @@ form.upload-form { /* 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; } \ No newline at end of file From 67ef4f0915e40503babb156046e2bf4d8d1c0b15 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Mon, 22 Apr 2019 01:02:53 -0400 Subject: [PATCH 07/19] Added bracket --- scripts/main.js | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/main.js b/scripts/main.js index 0fb2e43..257f5bc 100644 --- a/scripts/main.js +++ b/scripts/main.js @@ -100,3 +100,4 @@ function validateUpload() { } else { alert('Please fill out the rest of the upload form.'); } +} From 896f42f4b06f8bb7484161f40bd72dca8c5ccfa0 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Mon, 22 Apr 2019 19:11:58 -0400 Subject: [PATCH 08/19] submip.php file almost done --- submit.php | 92 ++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 62 insertions(+), 30 deletions(-) diff --git a/submit.php b/submit.php index ad299c3..a9ac09d 100644 --- a/submit.php +++ b/submit.php @@ -1,34 +1,66 @@ - - - FightHub - Upload - - - + - connect_error) { + //echo "it dead
i"; + die("Connection failed: " . $conn->connect_error); +} - if($conn->connect_error) { - die("Connection failed: " . $conn->connect_error); - } +$url = $_GET['url']; +$title = $_GET['name']; +$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; +?> + + - $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"

hello

"; - echo $game; - ?> - - From b5f8ca322ada5e357180e1bb6ca3351b4dcff6a5 Mon Sep 17 00:00:00 2001 From: Clayton Wilson Date: Mon, 22 Apr 2019 19:27:35 -0400 Subject: [PATCH 09/19] Updated variable name --- submit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submit.php b/submit.php index a9ac09d..8f0dd70 100644 --- a/submit.php +++ b/submit.php @@ -12,7 +12,7 @@ if($conn->connect_error) { } $url = $_GET['url']; -$title = $_GET['name']; +$title = $_GET['title']; $username = $_GET['username']; $description = $_GET['description']; $event_date = $_GET['video-date']; From ab58e096a4275bfdd946d394bef56891daa13389 Mon Sep 17 00:00:00 2001 From: Clayton Wilson Date: Mon, 22 Apr 2019 19:28:26 -0400 Subject: [PATCH 10/19] Delete text.txt --- text.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 text.txt diff --git a/text.txt b/text.txt deleted file mode 100644 index 092bfb9..0000000 --- a/text.txt +++ /dev/null @@ -1 +0,0 @@ -yo From dbb814f272a8f5de0d7c691bed17d8f465b4ccfd Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Mon, 22 Apr 2019 19:38:23 -0400 Subject: [PATCH 11/19] Removed test files --- hello | 0 test.txt | 1 - 2 files changed, 1 deletion(-) delete mode 100755 hello delete mode 100755 test.txt diff --git a/hello b/hello deleted file mode 100755 index e69de29..0000000 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 From 7c7b8543146e28c7c74536644e5dd7249b97fede Mon Sep 17 00:00:00 2001 From: Clayton Wilson Date: Mon, 22 Apr 2019 20:41:57 -0400 Subject: [PATCH 12/19] Removed the hardcoded videos --- index.php | 82 +------------------------------------------------------ 1 file changed, 1 insertion(+), 81 deletions(-) diff --git a/index.php b/index.php index fc9d03b..e1f75dc 100755 --- a/index.php +++ b/index.php @@ -138,86 +138,6 @@ function writeEntryforIndex() { writeEntryforIndex(); ?> - - -
- -
- - - Video Title Here - -
- - - - - - - - - - - - - -
PlayersCharacters
Player1Character1
Player2Character2
-
- -
-

Game Name

-

Stage Name

-
- -
-

The description goes here.......

-
- -
- - - - -
- - - Video Title Here - -
- - - - - - - - - - - - - -
PlayersCharacters
Player1Character1
Player2Character2
-
- -
-

Game Name

-

Stage Name

-
- -
-

The description goes here.......

-
- -
- - -
- + From 55dfdf84e9a09f59982c2be83355287bf6326480 Mon Sep 17 00:00:00 2001 From: Clayton Wilson Date: Mon, 22 Apr 2019 21:29:03 -0400 Subject: [PATCH 13/19] Changing the url of the submit.php redirect --- submit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submit.php b/submit.php index 8f0dd70..1d4954d 100644 --- a/submit.php +++ b/submit.php @@ -61,6 +61,6 @@ $conn->close() ?> From b6936f1a31ef221ca75ebf9bdf33d6904db87b28 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Tue, 23 Apr 2019 01:08:41 -0400 Subject: [PATCH 14/19] Styles upload.php --- main.css | 111 +++++++++++++++++++++++++++++++++++++++++++++++++---- upload.php | 92 +++++++++++++++++++++++++++----------------- 2 files changed, 161 insertions(+), 42 deletions(-) diff --git a/main.css b/main.css index 1902b01..22c6798 100644 --- a/main.css +++ b/main.css @@ -50,6 +50,8 @@ form.upload-form { 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 { @@ -66,20 +68,115 @@ form.upload-form { margin-left: 20px; } +h3.url { + /* padding-top: 40px; */ + /* border: white solid 1px; */ +} + +.url { + margin: auto !important; + width: 60%; +} + +h3.title { + padding-top: 40px; +} + +.title { + margin: auto !important; + width: 60%; +} + +.user-date { + width: 60%; + margin: auto; +} + +.username { + padding-top: 20px; + margin-left: -20px; +} + +.video-date { + float: right; + margin-top: -62px; +} + +.description { + width: 60%; + margin: auto !important; +} + +h3.description { + padding-top: 40px; +} + +.characters { + width: 60%; + margin: auto !important; +} + +h3.characters { + padding-top: 40px; +} + +.players { + width: 60%; + margin: auto !important; +} + +h3.players { + padding-top: 40px; +} + +.game-info { + width: 60%; + margin: auto; +} + +.game-name { + padding-top: 20px; + margin-left: -20px; +} + +.stage-name { + float: right; + margin-top: -61px; +} + +.length-button { + margin: auto; + width: 60%; + /* border: white solid 1px; */ +} + +.length { + padding-top: 20px; + margin-left: -20px; +} + +.button { + float: right; + margin-top: -21px; +} + + + + /* Styles for Video element displays */ div.video-list-container { /* border: white solid 1px; */ - margin-left: 15%; - margin-right: 15%; + 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; + /* border: white solid 1px; */ + width: 100%; + height: 178.75px; + padding-top: 10px; + border-bottom: #727272 solid 2px; } iframe { diff --git a/upload.php b/upload.php index 8efc326..598a9b6 100755 --- a/upload.php +++ b/upload.php @@ -17,45 +17,67 @@
-

Youtube URL *

- +

Youtube URL *

+ -

Video Title *

- +

Video Title *

+ -

Username *

- - -

Description

- - -

Event Date *

- - -

Video Length

- - -

Characters (Seperated by commas) *

- - -

Players (Seperated by commas) *

- - -

Select Game *

- +
+
+

Username *

+ +
-

Stage Name *

- + +
+

Event Date *

+ +
+
+ +

Description

+ + +

Characters (Seperated by commas) *

+ + +

Players (Seperated by commas) *

+ + + + + +
+
+

Select Game *

+ +
- +
+

Stage Name *

+ +
+
+ +
+
+

Video Length

+ +
+ +
+ +
+
From bc2c6484092d66753aeb9d698b01a25664cfc531 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Tue, 23 Apr 2019 01:22:54 -0400 Subject: [PATCH 15/19] Added English tags and a link to the index page on the logo. --- index.php | 4 ++-- search.php | 23 +++++++++++------------ upload.php | 2 +- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/index.php b/index.php index e1f75dc..3b3a8bc 100755 --- a/index.php +++ b/index.php @@ -1,4 +1,4 @@ - + FightHub - Home @@ -6,7 +6,7 @@ + + + @@ -153,5 +152,5 @@ function writeEntryforIndex() { ?> - + diff --git a/upload.php b/upload.php index 598a9b6..3d1adee 100755 --- a/upload.php +++ b/upload.php @@ -8,7 +8,7 @@