From c588fa15cce9765edc890ce2d557e0026c28d43c Mon Sep 17 00:00:00 2001 From: root Date: Wed, 17 Apr 2019 01:07:26 -0400 Subject: [PATCH 1/9] test commit --- clayton-testfile | 1 + 1 file changed, 1 insertion(+) create mode 100644 clayton-testfile diff --git a/clayton-testfile b/clayton-testfile new file mode 100644 index 0000000..d9f5a62 --- /dev/null +++ b/clayton-testfile @@ -0,0 +1 @@ +this is a test file for commit From 7a91f187bbe5eeabb2f217543f1857797a524f5b Mon Sep 17 00:00:00 2001 From: root Date: Wed, 17 Apr 2019 20:56:03 -0400 Subject: [PATCH 2/9] Removed test file --- clayton-testfile | 1 - 1 file changed, 1 deletion(-) delete mode 100644 clayton-testfile diff --git a/clayton-testfile b/clayton-testfile deleted file mode 100644 index d9f5a62..0000000 --- a/clayton-testfile +++ /dev/null @@ -1 +0,0 @@ -this is a test file for commit From 974ec9b65586ff3854f94dc23a289bbfb71613d0 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Thu, 18 Apr 2019 00:18:00 -0400 Subject: [PATCH 3/9] Titlebar for index.php completed --- .gitignore | 0 .htaccess | 0 README.md | 0 index.php | 27 ++++++++++++--------------- main.css | 34 ++++++++++++++++++++++++++++++++++ old_index.html | 0 6 files changed, 46 insertions(+), 15 deletions(-) mode change 100644 => 100755 .gitignore mode change 100644 => 100755 .htaccess mode change 100644 => 100755 README.md mode change 100644 => 100755 index.php create mode 100755 main.css mode change 100644 => 100755 old_index.html diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/.htaccess b/.htaccess old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/index.php b/index.php old mode 100644 new mode 100755 index 9e25423..0f45309 --- a/index.php +++ b/index.php @@ -1,23 +1,20 @@ - PHP Test + FightHub - Home + - Hello World

'; +
+

FightHub

+ + +
- // In the variables section below, replace user and password with your own MySQL credentials as created on your server - $servername = "localhost"; - $username = "fighthubuser"; - $password = "cC33dC8W"; - // Create MySQL connection - $conn = mysqli_connect($servername, $username, $password); - // Check connection - if it fails, output will include the error message - if (!$conn) { - die('

Connection failed:

' . mysqli_connect_error()); - } - echo '

Connected successfully

'; - ?> - + + + + + diff --git a/main.css b/main.css new file mode 100755 index 0000000..646afb1 --- /dev/null +++ b/main.css @@ -0,0 +1,34 @@ +body { + background-color: #1E1E1E; +} + + +form { + width: 100%; + height: 150px; + /* border: black solid 1px; */ + border-bottom: #727272 solid 2px; + +} + +.title-text { + float: left; + margin-top: 28px; + padding-right: 20px; + color: #FF3D53; + font-family: "Calibri"; + font-size: 50pt; +} +.search { + width: 60%; + padding: 10px; + font-size: 20px; + margin-top: 45px; +} + +.submit { + width: 150px; + padding: 10px; + font-size: 20px; + /* float: left; */ +} \ No newline at end of file diff --git a/old_index.html b/old_index.html old mode 100644 new mode 100755 From 87cfe55154728e493a5f62c74293d22782522759 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Fri, 19 Apr 2019 23:39:59 -0400 Subject: [PATCH 4/9] Adding upload button --- images/upload.png | Bin 0 -> 1338 bytes index.php | 4 ++-- main.css | 42 +++++++++++++++++++++++++++++++++++------- 3 files changed, 37 insertions(+), 9 deletions(-) create mode 100644 images/upload.png diff --git a/images/upload.png b/images/upload.png new file mode 100644 index 0000000000000000000000000000000000000000..6d89e86180576a6d9f06e87909a901cbb62f0d64 GIT binary patch literal 1338 zcmV-A1;zS_P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y9E;JKBXv6>j1gl9zK~#8N?VS5-990y@`;T;YXLe?Gc6WAn z_WhV-YZH^SNz;aCwc-OsMMTkvh=N){1*M`Qz7@d-)~fwQ@bQBnhzKI$0~IV-&>s}v z7Nz=wKj?SvxjVg^*%*5j^Y?t*(1!qRcLIZSE z_RydB13cuPw;W1V?2^|%F(c6XVNh_q?NeUt947ZE~%g!%U zZYs4F@&&OfW}-qYxVqT5(y!0jCsq{ zXn>9iKkqH!deRDMcap+`;WYAxtAk&o6(kfWY2`YFUCTk9EJHjVPSF&2tvRbsA)ZiX zr!41<)~V|jAmp?L=&0~$FaBkav_jgQszSuQ)&7}Y`NBf=NOvbnY!u9{Q}}9g2IXx* zC$im{y!TwV4ds26KFz-0UU;ZFSanL%w!7CY)8fm-c>wvlC1_9CPS?s`TWrw%oMv@E zM};IKt&n!7s_?2}oupR3k}dw;YS-Nq}{11gdUnAzUePxiy%=I?k}~GpXXJ?63IQ4J_gVB z0$B^w*rv~f!?#-Vn0iuZ!wB+yUi{Ea_>mQE$_JeVTu)jd?M_wU-f@Mr056WJ!l!Ce z$kB$-8UouFgV&TA$j@@iKSlAqk>Z_ptngqM?^?R$wsT`|s6X`iM!FfVi~gdPvt>O3 zH`3ptRmvwSJlb1A*NP;qa8Bu0!F8o32G{(0!^$H$9_=}Iv?I}xV&t&6@xIVF1$lk^ zN~kfGg$C%T@NhW9^{6ii#Lv;nm%Z2!n5Ym>DclB;s0t4RUE~)Rs$z)*{R;-M|JKBI zyuQ?u6C;I?hx|dY?4t2wzZa!D+9bR zJXVcRs>gmN+F&%L2<+YDHI!y`KvRWHEC0Osx+n2wYi?e-wUWY*#k&E;+wHl&<%A zPD$ZDFUV)JyBt5=`((CmjbofyyD)2eZYC@15kbzvb20fAakDuD<^TWy07*qoM6N<$f*Bx$sQ>@~ literal 0 HcmV?d00001 diff --git a/index.php b/index.php index 0f45309..d306974 100755 --- a/index.php +++ b/index.php @@ -4,17 +4,17 @@ -
+

FightHub

+ upload
- diff --git a/main.css b/main.css index 646afb1..bc0f287 100755 --- a/main.css +++ b/main.css @@ -3,24 +3,46 @@ body { } -form { - width: 100%; +/* form.search { + width: 80%; height: 150px; - /* border: black solid 1px; */ + border: white solid 1px; + border-bottom: #727272 solid 2px; +} */ + +/* div.upload { + width: 5%; + height: 150px; + border: white solid 1px; + border-bottom: #727272 solid 2px; + display: block; + float: left; +} */ + +form { + /* border: white solid 1px; */ + height: 150px; + margin-top: -10px !important; + width: 99% !important; border-bottom: #727272 solid 2px; - } +/* div.titlebar-container { + border: white solid 1px; + border-bottom: #727272 solid 2px; +} */ + .title-text { float: left; - margin-top: 28px; + margin-top: 26px; padding-right: 20px; color: #FF3D53; font-family: "Calibri"; font-size: 50pt; } + .search { - width: 60%; + width: 50%; padding: 10px; font-size: 20px; margin-top: 45px; @@ -30,5 +52,11 @@ form { width: 150px; padding: 10px; font-size: 20px; - /* float: left; */ +} + +img.upload { + width: 150px; + /* margin-bottom: -17px; */ + margin-top: 45px; + float: right; } \ No newline at end of file From 6577bc3bd367d3dc23b6db6901208b95a6ba7b32 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Sat, 20 Apr 2019 00:44:46 -0400 Subject: [PATCH 5/9] html for upload.php --- index.php | 1 + main.css | 7 +------ upload.php | 26 ++++++++++++++++++++++++++ 3 files changed, 28 insertions(+), 6 deletions(-) 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 @@ +

FightHub

diff --git a/main.css b/main.css index bc0f287..2f33489 100755 --- a/main.css +++ b/main.css @@ -19,7 +19,7 @@ body { float: left; } */ -form { +form.search { /* border: white solid 1px; */ height: 150px; margin-top: -10px !important; @@ -27,11 +27,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; diff --git a/upload.php b/upload.php new file mode 100644 index 0000000..d4e460e --- /dev/null +++ b/upload.php @@ -0,0 +1,26 @@ + + + FightHub - Upload + + + + + + +

FightHub

+ + + upload +
+ + +
+ + + + + +
+ + + From 4eeda2e474c695f9e23cecc5c8df3c260e153abc Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Sat, 20 Apr 2019 03:19:40 -0400 Subject: [PATCH 6/9] upload.php html and temporary style --- main.css | 40 +++++++++++++++++++++++++--------------- upload.php | 43 ++++++++++++++++++++++++++++++++++++++----- 2 files changed, 63 insertions(+), 20 deletions(-) diff --git a/main.css b/main.css index 2f33489..9f88848 100755 --- a/main.css +++ b/main.css @@ -3,21 +3,7 @@ body { } -/* form.search { - width: 80%; - height: 150px; - border: white solid 1px; - border-bottom: #727272 solid 2px; -} */ - -/* div.upload { - width: 5%; - height: 150px; - border: white solid 1px; - border-bottom: #727272 solid 2px; - display: block; - float: left; -} */ +/* Styles for titlebar */ form.search { /* border: white solid 1px; */ @@ -54,4 +40,28 @@ img.upload { /* 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 diff --git a/upload.php b/upload.php index d4e460e..58bf48f 100644 --- a/upload.php +++ b/upload.php @@ -14,11 +14,44 @@ -
- - - - + + +

Youtube URL *

+ + +

Name *

+ + +

Username *

+ + +

Description

+ + +

Event Date

+ + +

Video Length

+ + +

Characters (Seperated by commas) *

+ + +

Players (Seperated by commas) *

+ + +

Select Game *

+ + +

Stage Name *

+ + +
From 02c5c434283b78427c5dd5b253d25dca5438efdc Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Sat, 20 Apr 2019 15:17:00 -0400 Subject: [PATCH 7/9] work on the upload page --- scripts/main.js | 6 ++++++ upload.php | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 scripts/main.js diff --git a/scripts/main.js b/scripts/main.js new file mode 100644 index 0000000..03a897d --- /dev/null +++ b/scripts/main.js @@ -0,0 +1,6 @@ + +// Validates the data inputs on the upload form +function validateUpload() { + console.log("Validated!"); + document.getElementById("upload-form").submit(); +} \ No newline at end of file diff --git a/upload.php b/upload.php index 58bf48f..81324b0 100644 --- a/upload.php +++ b/upload.php @@ -2,6 +2,7 @@ FightHub - Upload + @@ -14,7 +15,7 @@ -
+

Youtube URL *

@@ -52,7 +53,7 @@ - +
From d82c70f94c11e39501741a500652de1252f9e30d Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Sat, 20 Apr 2019 16:02:41 -0400 Subject: [PATCH 8/9] Removed old_index.html --- old_index.html | 375 ------------------------------------------------- 1 file changed, 375 deletions(-) delete mode 100755 old_index.html diff --git a/old_index.html b/old_index.html deleted file mode 100755 index 96ed444..0000000 --- a/old_index.html +++ /dev/null @@ -1,375 +0,0 @@ - - - - - - - Apache2 Ubuntu Default Page: It works - - - -
-
- Ubuntu Logo - - Apache2 Ubuntu Default Page - -
- -
- - -
-
- It works! -
-
-

- This is the default welcome page used to test the correct - operation of the Apache2 server after installation on Ubuntu systems. - It is based on the equivalent page on Debian, from which the Ubuntu Apache - packaging is derived. - If you can read this page, it means that the Apache HTTP server installed at - this site is working properly. You should replace this file (located at - /var/www/html/index.html) before continuing to operate your HTTP server. -

- - -

- If you are a normal user of this web site and don't know what this page is - about, this probably means that the site is currently unavailable due to - maintenance. - If the problem persists, please contact the site's administrator. -

- -
-
-
- Configuration Overview -
-
-

- Ubuntu's Apache2 default configuration is different from the - upstream default configuration, and split into several files optimized for - interaction with Ubuntu tools. The configuration system is - fully documented in - /usr/share/doc/apache2/README.Debian.gz. Refer to this for the full - documentation. Documentation for the web server itself can be - found by accessing the manual if the apache2-doc - package was installed on this server. - -

-

- The configuration layout for an Apache2 web server installation on Ubuntu systems is as follows: -

- 
-/etc/apache2/
-|-- apache2.conf
-|       `--  ports.conf
-|-- mods-enabled
-|       |-- *.load
-|       `-- *.conf
-|-- conf-enabled
-|       `-- *.conf
-|-- sites-enabled
-|       `-- *.conf
-
-
    -
  • - apache2.conf is the main configuration - file. It puts the pieces together by including all remaining configuration - files when starting up the web server. -
    • - -
  • - ports.conf is always included from the - main configuration file. It is used to determine the listening ports for - incoming connections, and this file can be customized anytime. -
    • - -
  • - Configuration files in the mods-enabled/, - conf-enabled/ and sites-enabled/ directories contain - particular configuration snippets which manage modules, global configuration - fragments, or virtual host configurations, respectively. -
    • - -
  • - They are activated by symlinking available - configuration files from their respective - *-available/ counterparts. These should be managed - by using our helpers - - a2enmod, - a2dismod, - - - a2ensite, - a2dissite, - - and - - a2enconf, - a2disconf - . See their respective man pages for detailed information. -
    • - -
  • - The binary is called apache2. Due to the use of - environment variables, in the default configuration, apache2 needs to be - started/stopped with /etc/init.d/apache2 or apache2ctl. - Calling /usr/bin/apache2 directly will not work with the - default configuration. -
    • -
-
- -
-
- Document Roots -
- -
-

- By default, Ubuntu does not allow access through the web browser to - any file apart of those located in /var/www, - public_html - directories (when enabled) and /usr/share (for web - applications). If your site is using a web document root - located elsewhere (such as in /srv) you may need to whitelist your - document root directory in /etc/apache2/apache2.conf. -

-

- The default Ubuntu document root is /var/www/html. You - can make your own virtual hosts under /var/www. This is different - to previous releases which provides better security out of the box. -

-
- -
-
- Reporting Problems -
-
-

- Please use the ubuntu-bug tool to report bugs in the - Apache2 package with Ubuntu. However, check existing bug reports before reporting a new bug. -

-

- Please report bugs specific to modules (such as PHP and others) - to respective packages, not to the web server itself. -

-
- - - - -
-
-
-
- - - From a3b3a5b590e4f5ff288d4e3ae187eb2645862708 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Sat, 20 Apr 2019 16:40:36 -0400 Subject: [PATCH 9/9] Upload.php html done --- upload.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/upload.php b/upload.php index 81324b0..7bf6d0d 100644 --- a/upload.php +++ b/upload.php @@ -44,9 +44,12 @@

Select Game *

Stage Name *