mirror of
https://github.com/ClaytonWWilson/FightHub.git
synced 2025-12-17 23:58:47 +00:00
Merge branch 'master' into gosse
This commit is contained in:
root
commit
5e5043f6b2
0
.gitignore
vendored
Normal file → Executable file
0
.gitignore
vendored
Normal file → Executable file
BIN
images/upload.png
Normal file
BIN
images/upload.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.3 KiB |
28
index.php
Normal file → Executable file
28
index.php
Normal file → Executable file
@ -1,23 +1,21 @@
|
|||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<title>PHP Test</title>
|
<title>FightHub - Home</title>
|
||||||
|
<link rel="stylesheet" href="main.css">
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<?php echo '<p>Hello World</p>';
|
<!-- 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>
|
||||||
|
|
||||||
// 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('<p>Connection failed: <p>' . mysqli_connect_error());
|
<!-- This is where php code for loading preview videos below the titlebar will go -->
|
||||||
}
|
</body>
|
||||||
echo '<p>Connected successfully</p>';
|
|
||||||
?>
|
|
||||||
</body>
|
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
67
main.css
Executable file
67
main.css
Executable file
@ -0,0 +1,67 @@
|
|||||||
|
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;
|
||||||
|
}
|
||||||
375
old_index.html
375
old_index.html
@ -1,375 +0,0 @@
|
|||||||
|
|
||||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
|
||||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
|
||||||
<!--
|
|
||||||
Modified from the Debian original for Ubuntu
|
|
||||||
Last updated: 2016-11-16
|
|
||||||
See: https://launchpad.net/bugs/1288690
|
|
||||||
-->
|
|
||||||
<head>
|
|
||||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
|
|
||||||
<title>Apache2 Ubuntu Default Page: It works</title>
|
|
||||||
<style type="text/css" media="screen">
|
|
||||||
* {
|
|
||||||
margin: 0px 0px 0px 0px;
|
|
||||||
padding: 0px 0px 0px 0px;
|
|
||||||
}
|
|
||||||
|
|
||||||
body, html {
|
|
||||||
padding: 3px 3px 3px 3px;
|
|
||||||
|
|
||||||
background-color: #D8DBE2;
|
|
||||||
|
|
||||||
font-family: Verdana, sans-serif;
|
|
||||||
font-size: 11pt;
|
|
||||||
text-align: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
div.main_page {
|
|
||||||
position: relative;
|
|
||||||
display: table;
|
|
||||||
|
|
||||||
width: 800px;
|
|
||||||
|
|
||||||
margin-bottom: 3px;
|
|
||||||
margin-left: auto;
|
|
||||||
margin-right: auto;
|
|
||||||
padding: 0px 0px 0px 0px;
|
|
||||||
|
|
||||||
border-width: 2px;
|
|
||||||
border-color: #212738;
|
|
||||||
border-style: solid;
|
|
||||||
|
|
||||||
background-color: #FFFFFF;
|
|
||||||
|
|
||||||
text-align: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
div.page_header {
|
|
||||||
height: 99px;
|
|
||||||
width: 100%;
|
|
||||||
|
|
||||||
background-color: #F5F6F7;
|
|
||||||
}
|
|
||||||
|
|
||||||
div.page_header span {
|
|
||||||
margin: 15px 0px 0px 50px;
|
|
||||||
|
|
||||||
font-size: 180%;
|
|
||||||
font-weight: bold;
|
|
||||||
}
|
|
||||||
|
|
||||||
div.page_header img {
|
|
||||||
margin: 3px 0px 0px 40px;
|
|
||||||
|
|
||||||
border: 0px 0px 0px;
|
|
||||||
}
|
|
||||||
|
|
||||||
div.table_of_contents {
|
|
||||||
clear: left;
|
|
||||||
|
|
||||||
min-width: 200px;
|
|
||||||
|
|
||||||
margin: 3px 3px 3px 3px;
|
|
||||||
|
|
||||||
background-color: #FFFFFF;
|
|
||||||
|
|
||||||
text-align: left;
|
|
||||||
}
|
|
||||||
|
|
||||||
div.table_of_contents_item {
|
|
||||||
clear: left;
|
|
||||||
|
|
||||||
width: 100%;
|
|
||||||
|
|
||||||
margin: 4px 0px 0px 0px;
|
|
||||||
|
|
||||||
background-color: #FFFFFF;
|
|
||||||
|
|
||||||
color: #000000;
|
|
||||||
text-align: left;
|
|
||||||
}
|
|
||||||
|
|
||||||
div.table_of_contents_item a {
|
|
||||||
margin: 6px 0px 0px 6px;
|
|
||||||
}
|
|
||||||
|
|
||||||
div.content_section {
|
|
||||||
margin: 3px 3px 3px 3px;
|
|
||||||
|
|
||||||
background-color: #FFFFFF;
|
|
||||||
|
|
||||||
text-align: left;
|
|
||||||
}
|
|
||||||
|
|
||||||
div.content_section_text {
|
|
||||||
padding: 4px 8px 4px 8px;
|
|
||||||
|
|
||||||
color: #000000;
|
|
||||||
font-size: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
div.content_section_text pre {
|
|
||||||
margin: 8px 0px 8px 0px;
|
|
||||||
padding: 8px 8px 8px 8px;
|
|
||||||
|
|
||||||
border-width: 1px;
|
|
||||||
border-style: dotted;
|
|
||||||
border-color: #000000;
|
|
||||||
|
|
||||||
background-color: #F5F6F7;
|
|
||||||
|
|
||||||
font-style: italic;
|
|
||||||
}
|
|
||||||
|
|
||||||
div.content_section_text p {
|
|
||||||
margin-bottom: 6px;
|
|
||||||
}
|
|
||||||
|
|
||||||
div.content_section_text ul, div.content_section_text li {
|
|
||||||
padding: 4px 8px 4px 16px;
|
|
||||||
}
|
|
||||||
|
|
||||||
div.section_header {
|
|
||||||
padding: 3px 6px 3px 6px;
|
|
||||||
|
|
||||||
background-color: #8E9CB2;
|
|
||||||
|
|
||||||
color: #FFFFFF;
|
|
||||||
font-weight: bold;
|
|
||||||
font-size: 112%;
|
|
||||||
text-align: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
div.section_header_red {
|
|
||||||
background-color: #CD214F;
|
|
||||||
}
|
|
||||||
|
|
||||||
div.section_header_grey {
|
|
||||||
background-color: #9F9386;
|
|
||||||
}
|
|
||||||
|
|
||||||
.floating_element {
|
|
||||||
position: relative;
|
|
||||||
float: left;
|
|
||||||
}
|
|
||||||
|
|
||||||
div.table_of_contents_item a,
|
|
||||||
div.content_section_text a {
|
|
||||||
text-decoration: none;
|
|
||||||
font-weight: bold;
|
|
||||||
}
|
|
||||||
|
|
||||||
div.table_of_contents_item a:link,
|
|
||||||
div.table_of_contents_item a:visited,
|
|
||||||
div.table_of_contents_item a:active {
|
|
||||||
color: #000000;
|
|
||||||
}
|
|
||||||
|
|
||||||
div.table_of_contents_item a:hover {
|
|
||||||
background-color: #000000;
|
|
||||||
|
|
||||||
color: #FFFFFF;
|
|
||||||
}
|
|
||||||
|
|
||||||
div.content_section_text a:link,
|
|
||||||
div.content_section_text a:visited,
|
|
||||||
div.content_section_text a:active {
|
|
||||||
background-color: #DCDFE6;
|
|
||||||
|
|
||||||
color: #000000;
|
|
||||||
}
|
|
||||||
|
|
||||||
div.content_section_text a:hover {
|
|
||||||
background-color: #000000;
|
|
||||||
|
|
||||||
color: #DCDFE6;
|
|
||||||
}
|
|
||||||
|
|
||||||
div.validator {
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<div class="main_page">
|
|
||||||
<div class="page_header floating_element">
|
|
||||||
<img src="/icons/ubuntu-logo.png" alt="Ubuntu Logo" class="floating_element"/>
|
|
||||||
<span class="floating_element">
|
|
||||||
Apache2 Ubuntu Default Page
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<!-- <div class="table_of_contents floating_element">
|
|
||||||
<div class="section_header section_header_grey">
|
|
||||||
TABLE OF CONTENTS
|
|
||||||
</div>
|
|
||||||
<div class="table_of_contents_item floating_element">
|
|
||||||
<a href="#about">About</a>
|
|
||||||
</div>
|
|
||||||
<div class="table_of_contents_item floating_element">
|
|
||||||
<a href="#changes">Changes</a>
|
|
||||||
</div>
|
|
||||||
<div class="table_of_contents_item floating_element">
|
|
||||||
<a href="#scope">Scope</a>
|
|
||||||
</div>
|
|
||||||
<div class="table_of_contents_item floating_element">
|
|
||||||
<a href="#files">Config files</a>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
-->
|
|
||||||
<div class="content_section floating_element">
|
|
||||||
|
|
||||||
|
|
||||||
<div class="section_header section_header_red">
|
|
||||||
<div id="about"></div>
|
|
||||||
It works!
|
|
||||||
</div>
|
|
||||||
<div class="content_section_text">
|
|
||||||
<p>
|
|
||||||
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 <b>replace this file</b> (located at
|
|
||||||
<tt>/var/www/html/index.html</tt>) before continuing to operate your HTTP server.
|
|
||||||
</p>
|
|
||||||
|
|
||||||
|
|
||||||
<p>
|
|
||||||
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.
|
|
||||||
</p>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
<div class="section_header">
|
|
||||||
<div id="changes"></div>
|
|
||||||
Configuration Overview
|
|
||||||
</div>
|
|
||||||
<div class="content_section_text">
|
|
||||||
<p>
|
|
||||||
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
|
|
||||||
<b>fully documented in
|
|
||||||
/usr/share/doc/apache2/README.Debian.gz</b>. Refer to this for the full
|
|
||||||
documentation. Documentation for the web server itself can be
|
|
||||||
found by accessing the <a href="/manual">manual</a> if the <tt>apache2-doc</tt>
|
|
||||||
package was installed on this server.
|
|
||||||
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
The configuration layout for an Apache2 web server installation on Ubuntu systems is as follows:
|
|
||||||
</p>
|
|
||||||
<pre>
|
|
||||||
/etc/apache2/
|
|
||||||
|-- apache2.conf
|
|
||||||
| `-- ports.conf
|
|
||||||
|-- mods-enabled
|
|
||||||
| |-- *.load
|
|
||||||
| `-- *.conf
|
|
||||||
|-- conf-enabled
|
|
||||||
| `-- *.conf
|
|
||||||
|-- sites-enabled
|
|
||||||
| `-- *.conf
|
|
||||||
</pre>
|
|
||||||
<ul>
|
|
||||||
<li>
|
|
||||||
<tt>apache2.conf</tt> is the main configuration
|
|
||||||
file. It puts the pieces together by including all remaining configuration
|
|
||||||
files when starting up the web server.
|
|
||||||
</li>
|
|
||||||
|
|
||||||
<li>
|
|
||||||
<tt>ports.conf</tt> 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.
|
|
||||||
</li>
|
|
||||||
|
|
||||||
<li>
|
|
||||||
Configuration files in the <tt>mods-enabled/</tt>,
|
|
||||||
<tt>conf-enabled/</tt> and <tt>sites-enabled/</tt> directories contain
|
|
||||||
particular configuration snippets which manage modules, global configuration
|
|
||||||
fragments, or virtual host configurations, respectively.
|
|
||||||
</li>
|
|
||||||
|
|
||||||
<li>
|
|
||||||
They are activated by symlinking available
|
|
||||||
configuration files from their respective
|
|
||||||
*-available/ counterparts. These should be managed
|
|
||||||
by using our helpers
|
|
||||||
<tt>
|
|
||||||
a2enmod,
|
|
||||||
a2dismod,
|
|
||||||
</tt>
|
|
||||||
<tt>
|
|
||||||
a2ensite,
|
|
||||||
a2dissite,
|
|
||||||
</tt>
|
|
||||||
and
|
|
||||||
<tt>
|
|
||||||
a2enconf,
|
|
||||||
a2disconf
|
|
||||||
</tt>. See their respective man pages for detailed information.
|
|
||||||
</li>
|
|
||||||
|
|
||||||
<li>
|
|
||||||
The binary is called apache2. Due to the use of
|
|
||||||
environment variables, in the default configuration, apache2 needs to be
|
|
||||||
started/stopped with <tt>/etc/init.d/apache2</tt> or <tt>apache2ctl</tt>.
|
|
||||||
<b>Calling <tt>/usr/bin/apache2</tt> directly will not work</b> with the
|
|
||||||
default configuration.
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="section_header">
|
|
||||||
<div id="docroot"></div>
|
|
||||||
Document Roots
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="content_section_text">
|
|
||||||
<p>
|
|
||||||
By default, Ubuntu does not allow access through the web browser to
|
|
||||||
<em>any</em> file apart of those located in <tt>/var/www</tt>,
|
|
||||||
<a href="http://httpd.apache.org/docs/2.4/mod/mod_userdir.html" rel="nofollow">public_html</a>
|
|
||||||
directories (when enabled) and <tt>/usr/share</tt> (for web
|
|
||||||
applications). If your site is using a web document root
|
|
||||||
located elsewhere (such as in <tt>/srv</tt>) you may need to whitelist your
|
|
||||||
document root directory in <tt>/etc/apache2/apache2.conf</tt>.
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
The default Ubuntu document root is <tt>/var/www/html</tt>. You
|
|
||||||
can make your own virtual hosts under /var/www. This is different
|
|
||||||
to previous releases which provides better security out of the box.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="section_header">
|
|
||||||
<div id="bugs"></div>
|
|
||||||
Reporting Problems
|
|
||||||
</div>
|
|
||||||
<div class="content_section_text">
|
|
||||||
<p>
|
|
||||||
Please use the <tt>ubuntu-bug</tt> tool to report bugs in the
|
|
||||||
Apache2 package with Ubuntu. However, check <a
|
|
||||||
href="https://bugs.launchpad.net/ubuntu/+source/apache2"
|
|
||||||
rel="nofollow">existing bug reports</a> before reporting a new bug.
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
Please report bugs specific to modules (such as PHP and others)
|
|
||||||
to respective packages, not to the web server itself.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="validator">
|
|
||||||
</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
|
|
||||||
6
scripts/main.js
Normal file
6
scripts/main.js
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
|
||||||
|
// Validates the data inputs on the upload form
|
||||||
|
function validateUpload() {
|
||||||
|
console.log("Validated!");
|
||||||
|
document.getElementById("upload-form").submit();
|
||||||
|
}
|
||||||
63
upload.php
Normal file
63
upload.php
Normal file
@ -0,0 +1,63 @@
|
|||||||
|
<html>
|
||||||
|
<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>Name *</h3>
|
||||||
|
<input type="text" name="name" id="name">
|
||||||
|
|
||||||
|
<h3>Username *</h3>
|
||||||
|
<input type="text" name="username">
|
||||||
|
|
||||||
|
<h3>Description</h3>
|
||||||
|
<textarea name="description" cols="30" rows="10"></textarea>
|
||||||
|
|
||||||
|
<h3>Event Date</h3>
|
||||||
|
<input type="date" name="video-date">
|
||||||
|
|
||||||
|
<h3>Video Length</h3>
|
||||||
|
<input type="text" name="length">
|
||||||
|
|
||||||
|
<h3>Characters (Seperated by commas) *</h3>
|
||||||
|
<input type="text" name="characters">
|
||||||
|
|
||||||
|
<h3>Players (Seperated by commas) *</h3>
|
||||||
|
<input type="text" name="players">
|
||||||
|
|
||||||
|
<h3>Select Game *</h3>
|
||||||
|
<select name="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">
|
||||||
|
|
||||||
|
|
||||||
|
<input type="button" name="submit_button" value="Submit" onclick="validateUpload()">
|
||||||
|
</form>
|
||||||
|
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
Loading…
Reference in New Issue
Block a user