From d42f45fff0d1070b82d53171ee43c17ad42016c7 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 17 Apr 2019 00:28:41 -0400 Subject: [PATCH 1/6] test --- hello | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 hello diff --git a/hello b/hello new file mode 100644 index 0000000..e69de29 From 20dc303cc905918443b8e9296515d79954581530 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 17 Apr 2019 00:40:05 -0400 Subject: [PATCH 2/6] test 2 --- test.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 test.txt diff --git a/test.txt b/test.txt new file mode 100644 index 0000000..90bfcb5 --- /dev/null +++ b/test.txt @@ -0,0 +1 @@ +this is a test From 815a876d2ffd573ec5fe9f831f38910cfb114e4a Mon Sep 17 00:00:00 2001 From: root Date: Sun, 21 Apr 2019 22:11:55 -0400 Subject: [PATCH 3/6] index.php now gets 10 rows from video table and prints them sorted by date --- hello | 0 images/upload.png | Bin index.php | 71 +++++++++++++++++++++++++++++++++++++++++++--- scripts/main.js | 0 test.txt | 0 upload.php | 0 6 files changed, 67 insertions(+), 4 deletions(-) mode change 100644 => 100755 hello mode change 100644 => 100755 images/upload.png mode change 100644 => 100755 scripts/main.js mode change 100644 => 100755 test.txt mode change 100644 => 100755 upload.php diff --git a/hello b/hello old mode 100644 new mode 100755 diff --git a/images/upload.png b/images/upload.png old mode 100644 new mode 100755 diff --git a/index.php b/index.php index cb55747..9eb5b0d 100755 --- a/index.php +++ b/index.php @@ -10,12 +10,75 @@ upload - - - - + + + + Connection failed:

' . mysql_error()); + } + + echo '

Connect1ed successfully

'; + + // $sql = 'SELECT video_id, video_url, video_name, username, date_upload, date_video, video_length, description, characters, players, game, stage, approved FROM video'; + + //$sql = 'select * from video'; + // mysqli_select_db('fighthubdata'); + //echo 'hello'; + $retval = mysqli_query( $conn, "select * from video order by date_video DESC "); + //echo 'test'; + if(!$retval ) { + //echo '

death

' + die('Could not get data: ' . mysqli_error()); + + } + //echo 'not death'; + + $search = $_GET['query']; + $i = 0; + + while($row = mysqli_fetch_array($retval, MYSQLI_ASSOC)) { + + if($i > 9){ + break; + } + + echo " VIDEO ID :{$row['video_id']}
". + "VIDEO URL : {$row['video_url']}
". + "VIDEO NAME : {$row['video_name']}
". + "USERNAME : {$row['username']}
". + "DATE UPLOAD : {$row['date_upload']}
". + "DATE VIDEO : {$row['date_video']}
". + "VIDEO LENGTH : {$row['video_length']}
". + "DESCRIPTION : {$row['description']}
". + "CHARACTERS : {$row['characters']}
". + "PLAYERS : {$row['players']}
". + "GAME : {$row['game']}
". + "STAGE : {$row['stage']}
". + "APPROVED : {$row['approved']}
". + "--------------------------------
"; + echo "Fetched data successfully\n"; + mysqli_close($conn); + $i++; + } +} + writeEntryforIndex(); + + ?> diff --git a/scripts/main.js b/scripts/main.js old mode 100644 new mode 100755 diff --git a/test.txt b/test.txt old mode 100644 new mode 100755 diff --git a/upload.php b/upload.php old mode 100644 new mode 100755 From 2fdf8b8409d85170a5951670abdbc573a0d22569 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 22 Apr 2019 03:14:14 -0400 Subject: [PATCH 4/6] added styling to search.php, not working yet --- main.css | 213 ++++++++++++++++++++++++++++++++++++----------------- search.php | 148 +++++++++++++++++++++++++++++++++++++ 2 files changed, 294 insertions(+), 67 deletions(-) mode change 100755 => 100644 main.css create mode 100755 search.php diff --git a/main.css b/main.css old mode 100755 new mode 100644 index 9f88848..2c4b822 --- a/main.css +++ b/main.css @@ -1,67 +1,146 @@ -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; -} \ No newline at end of file +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; +} diff --git a/search.php b/search.php new file mode 100755 index 0000000..fa92f65 --- /dev/null +++ b/search.php @@ -0,0 +1,148 @@ + + + echo ""; + FightHub - Home + + + + +
+

FightHub

+ + + upload +
+ + + + Connection failed:

' . mysql_error()); + } + + echo '

Connect1ed successfully

'; + + // $sql = 'SELECT video_id, video_url, video_name, username, date_upload, date_video, video_length, description, characters, players, game, stage, approved FROM video'; + + //$sql = 'select * from video'; + // mysqli_select_db('fighthubdata'); + //echo 'hello'; + $search = $_GET['query']; + echo $search; + + $retval = mysqli_query( $conn, "select * from video where characters like '%$search%' OR players like '%$search%' OR description like '%$search%' OR game like '%$search%' OR stage like '%$search%' OR video_name like '%$search%'"); + //echo 'test'; + if(!$retval ) { + //echo '

death

' + die('Could not get data: ' . mysqli_error()); + + } + //echo 'not death'; + + + // $i = 9; + + while($row = mysqli_fetch_array($retval, MYSQLI_ASSOC)) { + + // if($i > 9){ + // break; + // } + + //Format for video_url + +
+ +
+ + + + Video Title Here + + + //Format for player and characters +
+ + + + + + + //Player1, character1 data + + + + + + + //Player2, character2 data + + + + + + +
PlayersCharacters
Player1Character1
Player2Character2
+
+ + //Game and stage + // +
+

Game Name

+

Stage Name

+
+ + +
+

The description goes here.......

+
+ + //
+
+ + + echo " VIDEO ID :{$row['video_id']}
". + "VIDEO URL : {$row['video_url']}
". + "VIDEO NAME : {$row['video_name']}
". + "USERNAME : {$row['username']}
". + "DATE UPLOAD : {$row['date_upload']}
". + "DATE VIDEO : {$row['date_video']}
". + "VIDEO LENGTH : {$row['video_length']}
". + "DESCRIPTION : {$row['description']}
". + "CHARACTERS : {$row['characters']}
". + "PLAYERS : {$row['players']}
". + "GAME : {$row['game']}
". + "STAGE : {$row['stage']}
". + "APPROVED : {$row['approved']}
". + "--------------------------------
"; + + + echo "Fetched data successfully\n"; + mysqli_close($conn); + $i++; + } +} + writeEntryforIndex(); + + + // + + + ?> + + + From c4c6992e7c328a9eb3b08a0405cbc67b3fe6e589 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 22 Apr 2019 15:47:06 -0400 Subject: [PATCH 5/6] working styles for index.php and search.php. Index.php still prints all data from a row --- .index.php.swp | Bin 0 -> 16384 bytes index.php | 61 +++++++++++++++++++++++++++- search.php | 106 ++++++++++++++++++++++++++----------------------- 3 files changed, 116 insertions(+), 51 deletions(-) create mode 100644 .index.php.swp diff --git a/.index.php.swp b/.index.php.swp new file mode 100644 index 0000000000000000000000000000000000000000..072e02ae227afa9c2e55bb30d5dd850aee7bf148 GIT binary patch literal 16384 zcmeI2TZklA8OO^+V>&U3X3#YTi8gZNc8L_{pfN*{;bh)_lu<%^UNC zT!CDHH>N#v9;B(eProsn`Q5n!xdOQYxdOQYxdOQYxdOQYxdLw~ z1-O5c@@aT{Q{wd_$=|n4{JlB3){?*HCeoA3{7YxVxbi1Pb5wt)9+ynk{ zo1$C?Pk@V{2Uftn-~gBcFBjkg_%XN!o&=}B3TT0&Km!#p1zx#TQGNuT2hV|L!B@cJ zU<%v~uDw%Hu7b~j%iyzM4XlDwU1&r_w2N|Bp zsOJUbc)Dr3JLCs!*JgXPYn#jqsmmO1kGRE%+uUJYJ)k|?acIY*YPF>lP5`B_7ucM2 zTpkQyYDs(`Ql4%ok0}KLg`$1`{SEx>55fzMy=^#N$jU{-b6sRA6qsRoq&9n=%i)gW z1+%6578YjaADAh%78o}yW|FCMox;d4SQz#q#~Ez7O-G61@g04@f^fo4`{dmETzhjYr(x-VZt#E4Jm1-9uP?1_F0Gy#+BI2d z1h&s@&z-P+W@)~&O3R&7i<>8h`DHb4JIvkT*2E3-bDJHC@5&@XJ+N(g&wiOtuPv|6 z%@@)`gx!sfG+*IHnM9h})OgTRsfJK{9mm9NYLlB}IC>b)ZmA-mwp6lBoO8YFuxi%} zOcrdZtt1-8bcX|`Z~zfKaTH#s*$e26+JD#JX8*^CT z^%+`qgY<}d!p8;bxF zlUsPggGUb|xGg5W*~8_`gW@s_44hk>`{8j-eArhTcoC1ftY&z9jrF_C)QX|+*!*n$ z9P-OT#jOJO!Ger`R86L=)TD~8zn>_Yb>?EQk>df?#W)e)i7*gdb^HvPC3ewwF#MF& zS+zoO7d)c992+!kk#ThV-H-=jbm~DhLe-GogLYJ!Ey19sEqFm+=W-m&EQqHeyu|=i z=mtzbFUA_Od*z}{E&Ay6CHR7Y&~`8uq5FqF$@tV0W6ri71o{9ejPL4Bg;pNkcxZWP zdv0T6wLLvemy~qa5@MvCO00)thrEi>jqA26I~2kgRUkZemJW+E4Kg!5Ff9B~++OT# zo-JL7STHD^L#j-dLt<%kNL0H{#MGASaWa|Ctz;-G345Z5Brt7OF15YLF-c_Hfpnsu zJ5D94rKMv*;05LB>4v;R(~?K|t;DR~f}}#GgGt#*mNw1ES;$Kb;boef=_boiCONQI zNDUF=2B$-Dok?j(cCpkQ2)B}Pgv2mLs;F%U6MJJZw4hRhP%0u+Z|Zw&a@*{dOFa?V zR@4>cD>)VktovAk7|+p-35yz!e(yITcF!p$dulL51WzqC)AUgBI3TS7ImNEX3F+2I6Uv+G_f( zHfB$dw~o2d=(MP*`ROc2h6e12Sy(|v#_%@G4ydOi^v&ahU$gMo&Y}Zy#SX}@kTq`i z2tgsIZ6f|rThz9gaUPR4>5DL0MdXl;mI&ivh0wqF5szn#wre;MCYxd|DIY_9Oy)3` zk})ss4%=X2vW$ij?4}h^9M(nA$1uK!a6+JshC&)g)JBWvj8+C{wj&Ng*rEuTt{yTx zZT#Mb9D56yZIQuf&&-(ZV;@Ho79(*X^I`OE;g@LRBi@Q+$1`-t@bSzWjFcn{EBU3t@wMmm!JuQ)ZU8zd5t@PV^E1p{yqd;-+Lhd>d$9~=NLU|rzr;8E}pP{H4@ z2JjQ`d0+vtEh>MW_pDU0n zkSmZYkSmZYkSmZYkSp+(P@pM~H{aHae1FFpELNz*E=j%@lkDgGKkdZ~H+n`^uO_x` zPH%M9PmOJ0rRyvc8RNa6@vQN3t5^frH}mQB<)I7N((HKFBu@9;|4a6tmat1VwmNUi zO}cECPD#QXE3IOQISu;J{TdbPT#1R16*_n#mdwOP-^jZ5NQP{yV9Y2kGHdC6ptK{N iIGUJj1!id@4-rXKd2{xRanHpQ<not death'; - $search = $_GET['query']; + //$search = $_GET['query']; $i = 0; - + echo "
"; while($row = mysqli_fetch_array($retval, MYSQLI_ASSOC)) { if($i > 9){ break; } + + //Format for video_url + //Get substring from url after '=' + $split = explode("=", $row['video_url']); + + + + echo "" . + "
" . + "" . + + + "{$row['video_name']}" . + + + + "
" . + "" . + "" . + "" . + "" . + "" . + + + "" . + "" . + "" . + "" . + + + "" . + "" . + "" . + "" . + + + "
PlayersCharacters
{$row['players']}{$row['characters']}
{$row['players']}{$row['characters']}
" . + "
" . + + + + "
" . + "

{$row['game']}

" . + "

{$row['stage']}

" . + "
" . + + + "
" . + "

{$row['description']}

". + "
" . + +"
"; echo " VIDEO ID :{$row['video_id']}
". "VIDEO URL : {$row['video_url']}
". @@ -75,6 +131,7 @@ function writeEntryforIndex() { mysqli_close($conn); $i++; } + echo "
"; } writeEntryforIndex(); diff --git a/search.php b/search.php index fa92f65..5249fe0 100755 --- a/search.php +++ b/search.php @@ -1,6 +1,6 @@ - echo ""; + FightHub - Home @@ -53,7 +53,7 @@ function writeEntryforIndex() { // $i = 9; - + echo "
"; while($row = mysqli_fetch_array($retval, MYSQLI_ASSOC)) { // if($i > 9){ @@ -61,60 +61,64 @@ function writeEntryforIndex() { // } //Format for video_url + //Get substring from url after '=' + $split = explode("=", $row['video_url']); -
- -
- + + + + echo "" . + "
" . + "" . - Video Title Here + "{$row['video_name']}" . - //Format for player and characters -
- - - - - - - //Player1, character1 data - - - - - - - //Player2, character2 data - - - - - - -
PlayersCharacters
Player1Character1
Player2Character2
-
- - //Game and stage - // -
-

Game Name

-

Stage Name

-
- -
-

The description goes here.......

-
+ "
" . + "" . + "" . + "" . + "" . + "" . - // - + + "" . + "" . + "" . + "" . + + + + "" . + "" . + "" . + "" . + + + "
PlayersCharacters
{$row['players']}{$row['characters']}
{$row['players']}{$row['characters']}
" . + "
" . + + + + "
" . + "

{$row['game']}

" . + "

{$row['stage']}

" . + "
" . + + + "
" . + "

{$row['description']}

". + "
" . + + + "
"; - + /* echo " VIDEO ID :{$row['video_id']}
". "VIDEO URL : {$row['video_url']}
". "VIDEO NAME : {$row['video_name']}
". @@ -131,11 +135,15 @@ function writeEntryforIndex() { "--------------------------------
"; - echo "Fetched data successfully\n"; + echo "Fetched data successfully\n"; + + */ mysqli_close($conn); $i++; } + echo "
"; } + writeEntryforIndex(); From 468aa4a64d54c2a3a2aa35de52e3d32950919782 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 22 Apr 2019 19:21:52 -0400 Subject: [PATCH 6/6] removed all debugging echo calls, character and player names now display separately --- .index.php.swp | Bin 16384 -> 16384 bytes index.php | 20 +++++++++++--------- search.php | 15 ++++++++------- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/.index.php.swp b/.index.php.swp index 072e02ae227afa9c2e55bb30d5dd850aee7bf148..f1cdd6318d4c68e1ea9480b9bd78fca4b42524f7 100644 GIT binary patch delta 736 zcmZwFO=uHA6u|MfCbiwvm~2H#LE;*cHl~T$h+@TTJ+u}i77JPrDM4bBq7Z0EORXSe zZ>@R|8PJn@s3*ZM7W7gxjD3uN92=tBTm4at1Y#Qd_x9@(TR1R$Op_} z21R7ig`F_)RTue;mw1MGoIn;C>_-xD7+7l)d5%R~Lms&{sYyQ*6OUR&9%2+Wl1QKz zYgn$P=a1~cDkIP74g)3-W!#%Hib5F{n-b8feiyA5! zJ>-u}RmvBp2hJC&W9ht_jSl=-87UVoHCA3nCz^Atyc+7xH0M}(S9RAl&uF!*CStkT z#)ge@(>6=9mGWe<6bmQ92{Tfiyg1fVAyTSN_2l;+5ncb+{{PwI9IP-t{kLGVf^N+P z_U88Pmsq=JODg5A_I7#wE>CxzCvJQYOBvS5+Kzz8+wCF?n87eY`0f{Zfg32o#xDHW zCh`t0th*Ob-2 Nv45zv(b(3p@yui5NtOxx92J64poz1jiKmM{J(d zE*38dK~S@x5<19_5D_H%LtTU@y>&685<%$DvGDub^i~gicwe4}hnM$#-cm^`m9*fc z#JMwRqx(cch=9mUWHI>HuMH_Za7>F^Cj+1T-Z_UzhpSqrU`!Qv>O_7bg(M>QRV(rZ zGq{Ffq;V8sgs|-q*}@wv<2DA6MhabsqZ1+QxkX-M4XaqeL$?%Vl1&IfEFTdm<1X%C z7H5&c0Mdw|2|j$Q5m~|lp5qxFAcGogbJefd!X_rs4f_e!ogz=1)?9Pkp`}*+p2!r# zevwZ;k*BzULA2nvSL7}3VFZ0J@TXp61CKF}GKO#(y-1=1G3fB44lg*hjLPZuXRC(g abH1!~_1K|ilkcsKmXDh1O#M*d-kp8W;Dnt3 diff --git a/index.php b/index.php index 4a4462b..c02ebc3 100755 --- a/index.php +++ b/index.php @@ -30,7 +30,7 @@ function writeEntryforIndex() { die('

Connection failed:

' . mysql_error()); } - echo '

Connect1ed successfully

'; + //echo '

Connect1ed successfully

'; // $sql = 'SELECT video_id, video_url, video_name, username, date_upload, date_video, video_length, description, characters, players, game, stage, approved FROM video'; @@ -57,13 +57,14 @@ function writeEntryforIndex() { //Format for video_url //Get substring from url after '=' - $split = explode("=", $row['video_url']); + $splitUrl = explode("=", $row['video_url']); - + $splitChar = explode(",", $row['characters']); + $splitPlay = explode(",", $row['players']); echo "" . "
" . - "