Layout redesign.

- In a seperate commit from the stylesheet changes. Work in progress.
This commit is contained in:
Gitea 2020-06-22 03:44:10 -04:00
parent f416e08d54
commit 720dcc89eb
12 changed files with 229 additions and 197 deletions

181
404.html
View File

@ -1,104 +1,107 @@
<DOCTYPE html> <DOCTYPE html>
<html> <html lang="en">
<head></head>
<body style="text-align: center">
<audio controls autoplay>
<source src="alive.ogg" type="audio/wav">
</audio>
<pre> ,:/+/- <head>
/M/ .,-=;//;- </head>
.:/= ;MH/, ,=/+%$XH@MM#@:
-$##@+$###@H@MMM#######H:. -/H#
.,H@H@ X######@ -H#####@+- -+H###@X
.,@##H; +XM##M/, =%@###@X;-
X%- :M##########$. .:%M###@%:
M##H, +H@@@$/-. ,;$M###@%, -
M####M=,,---,.-%%H####M$: ,+@##
@##################@/. :%H##@$-
M###############H, ;HM##M$=
#################. .=$M##M$=
################H..;XM##M$= .:+
M###################@%= =+@MH%
@#################M/. =+H#X%=
=+M###############M, ,/X#H+:,
.;XM###########H= ,/X#H+:;
.=+HM#######M+/+HM@+=.
,:/%XM####H/.
,.:=-. </pre>
This was a triumph!
I'm making a note here:
Huge success!
It's hard to overstate <body style="text-align: center">
my satisfaction. <audio controls autoplay>
<source src="alive.ogg" type="audio/wav">
</audio>
Aperture Science: <pre> ,:/+/-
We do what we must /M/ .,-=;//;-
because we can .:/= ;MH/, ,=/+%$XH@MM#@:
For the good of all of us. -$##@+$###@H@MMM#######H:. -/H#
Except the ones who are dead. .,H@H@ X######@ -H#####@+- -+H###@X
.,@##H; +XM##M/, =%@###@X;-
X%- :M##########$. .:%M###@%:
M##H, +H@@@$/-. ,;$M###@%, -
M####M=,,---,.-%%H####M$: ,+@##
@##################@/. :%H##@$-
M###############H, ;HM##M$=
#################. .=$M##M$=
################H..;XM##M$= .:+
M###################@%= =+@MH%
@#################M/. =+H#X%=
=+M###############M, ,/X#H+:,
.;XM###########H= ,/X#H+:;
.=+HM#######M+/+HM@+=.
,:/%XM####H/.
,.:=-. </pre>
This was a triumph!
I'm making a note here:
Huge success!
But there's no sense crying It's hard to overstate
over every mistake. my satisfaction.
You just keep on trying
'til you run out of cake.
And the science gets done.
And you make a neat gun
for the people who are
still alive.
I'm not even angry... Aperture Science:
I'm being so sincere right now. We do what we must
Even though you broke my heart, because we can
and killed me. For the good of all of us.
Except the ones who are dead.
And tore me to pieces. But there's no sense crying
And threw every piece into a fire. over every mistake.
As they burned it hurt because You just keep on trying
I was so happy for you! 'til you run out of cake.
And the science gets done.
And you make a neat gun
for the people who are
still alive.
Now, these points of data I'm not even angry...
make a beautiful line. I'm being so sincere right now.
And we're out of beta. Even though you broke my heart,
We're releasing on time! and killed me.
So I'm GLaD I got burned!
Think of all the things we learned!
for the people who are
still alive.
Go ahead and leave me... And tore me to pieces.
I think I'd prefer to stay inside... And threw every piece into a fire.
Maybe you'll find someone else As they burned it hurt because
to help you. I was so happy for you!
Maybe Black Mesa?
That was a joke. Ha Ha. Fat Chance!
Anyway this cake is great! Now, these points of data
It's so delicious and moist! make a beautiful line.
And we're out of beta.
We're releasing on time!
So I'm GLaD I got burned!
Think of all the things we learned!
for the people who are
still alive.
Look at me: still talking Go ahead and leave me...
when there's science to do! I think I'd prefer to stay inside...
When I look out there, Maybe you'll find someone else
it makes me glad I'm not you. to help you.
Maybe Black Mesa?
That was a joke. Ha Ha. Fat Chance!
I've experiments to run. Anyway this cake is great!
There is research to be done. It's so delicious and moist!
On the people who are
still alive.
And believe me I am
still alive.
I'm doing science and I'm
still alive.
I feel fantastic and I'm
still alive.
While you're dying I'll be
still alive.
And when you're dead I will be
still alive
Still alive. Look at me: still talking
when there's science to do!
When I look out there,
it makes me glad I'm not you.
Still alive. I've experiments to run.
There is research to be done.
On the people who are
still alive.
And believe me I am
still alive.
I'm doing science and I'm
still alive.
I feel fantastic and I'm
still alive.
While you're dying I'll be
still alive.
And when you're dead I will be
still alive
Still alive.
Still alive.
</body> </body>
</html> </html>

View File

@ -1,6 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<title>Quartznet | About</title> <title>Quartznet | About</title>
@ -25,5 +24,4 @@
<?php include "../includes/footer.php" ?> <?php include "../includes/footer.php" ?>
</body> </body>
</html>
</html>

View File

@ -1,7 +1,6 @@
<?php require_once("./auth.php"); auth(); ?> <?php require_once("./auth.php"); auth(); ?>
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<title>Quartznet | Admin</title> <title>Quartznet | Admin</title>
@ -10,21 +9,39 @@
<body> <body>
<header> <header>
<div class="container"> <nav>
<nav> <div class="container">
<a class="title" href="/quartznet/">Quartznet</a>
<ul class="menu"> <ul class="menu">
<li><a href="/quartznet/">Home</a></li>
<li><a href="/quartznet/about">About</a></li> <li><a href="/quartznet/about">About</a></li>
<li><a href="/quartznet/contact">Contact</a></li> <li><a href="/quartznet/contact">Contact</a></li>
<li><a href="/quartznet/admin">Admin</a></li> <li><a href="/quartznet/admin">Admin</a></li>
<li><a href="https://quartznet.info/sound">Sound</a></li>
<li><a href="https://quartznet.info/status">Status</a></li>
<li><a href="https://quartznet.info/git">Git</a></li>
<li><a href="https://quartznet.info/sql">SQL</a></li>
<li><a href="/quartznet/admin/logout.php">Logout</a></li>
<li><a class="link" href="https://quartznet.info/sound">Sound</a></li> <!-- <li class="nav-item dropdown">
<li><a class="link" href="https://quartznet.info/status">Status</a></li> <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<li><a class="link" href="https://quartznet.info/git">Git</a></li> Admin
<li><a class="link" href="https://quartznet.info/sql">SQL</a></li> </a>
<li><a class="link" href="/quartznet/admin/logout.php">Logout</a></li> <div class="dropdown-menu" aria-labelledby="navbarDropdown">
</ul> <a class="dropdown-item" href="https://quartznet.info/sound">Sound</a>
</nav> <a class="dropdown-item" href="https://quartznet.info/status">Status</a>
<a class="dropdown-item" href="https://quartznet.info/git">Git</a>
<a class="dropdown-item" href="https://quartznet.info/sql">SQL</a>
<a class="dropdown-item" href="/quartznet/admin/logout.php">Logout</a>
</div>
</li> -->
</ul>
</div>
</nav>
<div class="overlay">
<div class="description">
<h1 class="title">Quartznet</h1>
<p>Software, Games, Science, Space!</p>
</div> </div>
</header> </header>
@ -63,16 +80,14 @@
<!--Insert new user--> <!--Insert new user-->
<form method="post" action="users.php" name="login"> <form method="post" action="users.php" name="login">
<div class="form-group"> <div class="form-group">
<input name="username" type="text" required placeholder="username" maxlength="30"> <input name="username" type="text" required placeholder="username" maxlength="30">
<input name="password" type="password" required placeholder="password" maxlength="30"> <input name="password" type="password" required placeholder="password" maxlength="30">
</div> </div>
</form> </form>
</section> </section>
</main> </main>
<?php include "../includes/footer.php" ?> <?php include "../includes/footer.php" ?>
</body> </body>
</html>
</html>

View File

@ -5,40 +5,35 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<title>Quartznet | Login</title> <head>
<title>Quartznet | Login</title>
<?php include "../includes/head.php" ?> <?php include "../includes/head.php" ?>
</head>
<body>
<?php include "../includes/header.php" ?> <?php include "../includes/header.php" ?>
<main> <main class="container">
<section class="container"> <form class="form-signin" action="login.php" method="post">
<div class="form-label-group">
<label for="username">Username</label>
<input type="text" id="username" class="form-control" name="username" placeholder="Username" required autofocus>
</div>
<div class="col-sm-9 col-md-7 col-lg-5 mx-auto"> <div class="form-label-group">
<label for="inputPassword">Password</label>
<input type="password" id="password" class="form-control" name="password" placeholder="Password" required>
</div>
<h2 class="card-title">Login</h2> <div class="custom-control custom-checkbox mb-3">
<form class="form-signin" action="login.php" method="post"> <input type="checkbox" class="custom-control-input" id="customCheck1">
<div class="form-label-group"> <label class="custom-control-label" for="customCheck1">Remember password</label>
<input type="text" id="username" class="form-control" name="username" placeholder="Username" required autofocus> </div>
<label for="username">Username</label> <button class="btn btn-lg btn-primary btn-block text-uppercase" type="submit">Sign in</button>
</div> </form>
</main>
<div class="form-label-group"> <?php include "../includes/footer.php" ?>
<input type="password" id="password" class="form-control" name="password" placeholder="Password" required> </body>
<label for="inputPassword">Password</label> </html>
</div>
<div class="custom-control custom-checkbox mb-3">
<input type="checkbox" class="custom-control-input" id="customCheck1">
<label class="custom-control-label" for="customCheck1">Remember password</label>
</div>
<button class="btn btn-lg btn-primary btn-block text-uppercase" type="submit">Sign in</button>
</form>
</div>
</section>
</main>
<?php include "../includes/footer.php" ?>
</html>

0
admin/logout.php Normal file → Executable file
View File

11
admin/users.php Normal file → Executable file
View File

@ -1,4 +1,4 @@
<?php require_once("./auth.php"); auth(); <?php require_once("./auth.php"); auth();
// Select all users // Select all users
$connection = connect(); $connection = connect();
@ -23,11 +23,11 @@ $rows = pg_num_rows($result);
<section class="content"> <section class="content">
<!-- Should this still use tables --> <!-- Should this still use tables -->
<table width="100%"> <table width="100%">
<thead> <thead>
<tr> <tr>
<th>Id</th> <th>Id</th>
<th>Name</th> <th>Name</th>
<th>Password</th> <th>Password</th>
</tr> </tr>
</thead> </thead>
@ -56,5 +56,4 @@ $rows = pg_num_rows($result);
</main> </main>
<?php include "../includes/footer.php" ?> <?php include "../includes/footer.php" ?>
</html>
</html>

View File

@ -1,6 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<title>Quartznet | Contact</title> <title>Quartznet | Contact</title>
@ -14,16 +13,15 @@
<section class="container"> <section class="container">
<h2>Contact</h2> <h2>Contact</h2>
<p>We can be reached at contact@quartznet.com. If you are requesting a key for reviewing, steaming, or youtube, as well as all other legitimate purposes, please be sure to include a link to your channel or website.</p> <p>We can be reached at contact@quartznet.com. If you are requesting a key for reviewing, steaming, or youtube, as well as all other legitimate purposes, please be sure to include a link to your channel or website.</p>
<p>Feel free to contact us via email if you want to get in touch.</p> <p>Feel free to contact us via email if you want to get in touch.</p>
<p>Some of the team members also actively participate at the community subreddit and the Discord server.</p> <p>Some of the team members also actively participate at the community subreddit and the Discord server.</p>
<p>You can also subscribe to our blog.</p> <p>You can also subscribe to our blog.</p>
</section> </section>
</main> </main>
<?php include "../includes/footer.php" ?> <?php include "../includes/footer.php" ?>
</body> </body>
</html>
</html>

View File

@ -1,5 +1,18 @@
<footer> <footer>
<div class="container"> <div class="container">
<p>&copy; Quartznet 2020 <a href="/quartznet/policy">Policy</a></p> <hr>
<p>&copy; Quartznet 2020 | <a href="/quartznet/policy">Policy</a></p>
</div> </div>
</footer> </footer>
<!-- Used for nav bar dropdown with smaller screens-->
<script src="/quartznet/assets/js/jquery-3.5.1.min.js" defer></script>
<script src="/quartznet/assets/js/bootstrap.bundle.min.js" defer></script>
<script>
const toggleSwitch = document.querySelector('.theme-switch input[type="checkbox"]');
document.documentElement.setAttribute('data-theme', 'dark');
// var clientHeight = document.getElementsByClassName('overlay')[0].clientHeight;
// alert(clientHeight);
</script>

View File

@ -1,15 +1,25 @@
<header> <header>
<div class="container"> <div class="container">
<nav> <nav class="navbar navbar-expand-md">
<a class="title" href="/quartznet/">Quartznet</a> <div class="navbar-collapse order-1 order-md-0 dual-collapse2">
<!-- <h2>Software and Game developers</h2> --> <ul class="navbar-nav mr-auto">
<ul class="menu"> <li><a href="/quartznet/">Quartznet</a></li>
<li><a href="/quartznet/about">About</a></li> <li><a href="/quartznet/about">About</a></li>
<li><a href="/quartznet/contact">Contact</a></li> <li><a href="/quartznet/contact">Contact</a></li>
<!-- <li><a href="/quartznet/contact">Contact</a></li> --> </ul>
<!-- <li><a href="/quartznet/contact">Contact</a></li> --> </div>
<li><a href="/quartznet/admin">Admin</a></li> <div class="navbar-collapse collapse w-100 order-3 dual-collapse2">
</ul> <ul class="navbar-nav ml-auto">
<li><a href="/quartznet/admin">Admin</a></li>
</ul>
</div>
</nav> </nav>
</div> </div>
<div class="overlay">
<div class="description">
<h1 class="title">Quartznet</h1>
<p>Software, Games, Science, Space!</p>
</div>
</div>
</header> </header>

View File

@ -1,7 +1,8 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<title>Quartznet | Sirius</title>
<!-- General meta tags --> <!-- General meta tags -->
<meta charset="utf-8"> <meta charset="utf-8">
<meta content='text/html; charset=utf-8' http-equiv='Content-Type'> <meta content='text/html; charset=utf-8' http-equiv='Content-Type'>
@ -11,25 +12,18 @@
<meta name="keywords" content="quartznet, software, games, tools"/> <meta name="keywords" content="quartznet, software, games, tools"/>
<meta name="author" content="quartznet"/> <meta name="author" content="quartznet"/>
<!-- Open Graph meta tags --> <!-- Open Graph tags -->
<meta property="og:title" content="quartznet" /> <meta property="og:title" content="quartznet" />
<meta property="og:description" content="We are software and game developers." /> <meta property="og:description" content="We are software and game developers." />
<title>Quartznet</title>
<!-- Load CSS --> <!-- Load CSS -->
<link rel="stylesheet" href="/quartznet/assets/css/normalize.css"> <link rel="stylesheet" href="/quartznet/assets/css/bootstrap.min.css" defer>
<link href="/quartznet/assets/css/stylesheet.css" rel="stylesheet"> <link href="/quartznet/assets/css/stylesheet.css" rel="stylesheet">
<link href="/quartznet/assets/css/themes.css" rel="stylesheet"> <link href="/quartznet/assets/css/themes.css" rel="stylesheet">
<!-- <link rel="stylesheet" href="/quartznet/assets/css/dark.css" media="(prefers-color-scheme: dark)"> -->
<!-- <link rel="stylesheet" href="/quartznet/assets/css/light.css" media="(prefers-color-scheme: no-preference), (prefers-color-scheme: light)"> -->
<!-- Load fonts --> <link href="https://fonts.googleapis.com/css2?family=Open+Sans&display=swap" rel="stylesheet">
<link rel="icon" href="/quartznet/assets/favicon.ico"> <link rel="icon" href="/quartznet/assets/favicon.ico">
<!-- Load icons -->
<link href="https://fonts.googleapis.com/css?family=Roboto&display=swap" rel="stylesheet">
<!-- Global site tag (gtag.js) - Google Analytics --> <!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-120787474-1"></script> <script async src="https://www.googletagmanager.com/gtag/js?id=UA-120787474-1"></script>
<script> <script>
@ -44,25 +38,34 @@
<body> <body>
<?php include "includes/header.php" ?> <?php include "includes/header.php" ?>
<main> <main class="container">
<section class="container"> <!-- Project One -->
<h1>Sirius</h1> <div class="row">
<a href="/quartznet/sirius"><img class="img-fluid rounded mb-4 mb-lg-0" src="https://placehold.it/600x300" alt=""></a> <div class="col-md-7">
<p>A 2D sci-fi game about wannabe space captain trying to find their path.</p> <a href="/quartznet/sirius">
<p>Stores: Steam, Itch</p> <img class="img-fluid mb-3 mb-md-0" src="https://placehold.it/600x300" alt="">
<p>Platforms: Windows, Mac, Linux</p> </a>
</section> </div>
<div class="col-md-5">
<h3>Sirius</h3>
<p>A 2D sci-fi game about wannabe space captain trying to find their path.</p>
</div>
</div>
<hr>
<section class="container"> <!-- Project Two -->
<h1>quartz wave real name TBA</h1> <div class="row">
<a href="/quartznet/sirius"><img class="img-fluid rounded mb-4 mb-lg-0" src="https://placehold.it/600x300" alt=""></a> <div class="col-md-7">
<p>More text here soonTM.</p> <a href="/quartznet/sirius">
<p>Stores: Steam, Itch</p> <img class="img-fluid mb-3 mb-md-0" src="https://placehold.it/600x300" alt="">
<p>Platforms: Windows, Mac, Linux</p> </a>
</section> </div>
<div class="col-md-5">
<h3>Quartz</h3>
</div>
</div>
</main> </main>
<?php include "includes/footer.php" ?> <?php include "includes/footer.php" ?>
</body> </body>
</html>
</html>

View File

@ -23,10 +23,11 @@
<p>Like many site operators, I collect information that your browser sends whenever you visit my Site ("Log Data"). <p>Like many site operators, I collect information that your browser sends whenever you visit my Site ("Log Data").
This Log Data may include information such as your computer's Internet Protocol ("IP") address, browser type, browser version, the pages of my Site that you visit, the time and date of your visit, the time spent on those pages and other statistics.</p> This Log Data may include information such as your computer's Internet Protocol ("IP") address, browser type, browser version, the pages of my Site that you visit, the time and date of your visit, the time spent on those pages and other statistics.</p>
<p>In addition, I may use third party services such as Google Analytics that collect, monitor and analyze this.</p> <p>In addition, I may use third party services such as Google Analytics that collect, monitor and analyze this.</p>
<hr>
</section> </section>
<section class="container"> <section class="container">
<h2>Cookies Policy</h2> <h2>Cookies Policy</h2>
<span>Last updated: 20/12/2019</span> <span>Last updated: 20/12/2019</span>
@ -48,5 +49,4 @@
<?php include "../includes/footer.php" ?> <?php include "../includes/footer.php" ?>
</body> </body>
</html>
</html>

View File

@ -1,6 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<title>Quartznet | Sirius</title> <title>Quartznet | Sirius</title>
@ -20,5 +19,4 @@
<?php include "../includes/footer.php" ?> <?php include "../includes/footer.php" ?>
</body> </body>
</html>
</html>