Latest changes.

- Saving current changes. Testing ideas etc.
This commit is contained in:
Gitea
2020-08-19 04:52:47 -04:00
parent 1d1f6b4959
commit 0ac3aee564
15 changed files with 383 additions and 184 deletions

View File

@ -1,4 +1,16 @@
<!-- Login system -->
<!-- <li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Admin
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
<a class="dropdown-item" href="https://quartznet.info/sound">Sound</a>
<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> -->
<?php
session_start();

View File

@ -4,44 +4,58 @@
<head>
<title>Quartznet | Admin</title>
<?php include "../includes/head.php" ?>
<!-- General meta tags -->
<meta charset="utf-8">
<meta content='text/html; charset=utf-8' http-equiv='Content-Type'>
<meta http-equiv='X-UA-Compatible' content='IE=edge'>
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="description" content="A software and game studio.">
<meta name="keywords" content="quartznet, software, games, tools"/>
<meta name="author" content="quartznet"/>
<!-- Open Graph tags -->
<meta property="og:title" content="quartznet" />
<meta property="og:description" content="We are software and game developers." />
<!-- Load 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/themes.css" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=Open+Sans&display=swap" rel="stylesheet">
<link rel="icon" href="/quartznet/assets/favicon.ico">
<!-- Load javascript -->
<script src="/quartznet/assets/js/jquery-3.5.1.min.js" defer></script>
</head>
<body>
<header>
<nav>
<div class="container">
<ul class="menu">
<li><a href="/quartznet/">Home</a></li>
<li><a href="/quartznet/about">About</a></li>
<li><a href="/quartznet/contact">Contact</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>
<div class="container">
<nav class="navbar navbar-expand-md">
<div class="navbar-collapse order-1 order-md-0 dual-collapse2">
<ul class="navbar-nav mr-auto">
<li><a href="/quartznet/">Quartznet</a></li>
<li><a href="/quartznet/about">About</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>
</ul>
</div>
<div class="navbar-collapse collapse w-100 order-3 dual-collapse2">
<ul class="navbar-nav ml-auto">
<li><a href="/quartznet/admin/logout.php">Logout</a></li>
<!-- <li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Admin
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
<a class="dropdown-item" href="https://quartznet.info/sound">Sound</a>
<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>
</ul>
</div>
</nav>
</div>
<div class="overlay">
<div class="description">
<h1 class="title">Quartznet</h1>
<p>Software, Games, Science, Space!</p>
<h1 class="title">Quartznet</h1>
<p>Software, Games, Science, Space!</p>
</div>
</div>
</header>
@ -88,6 +102,11 @@
</section>
</main>
<?php include "../includes/footer.php" ?>
<footer>
<div class="container">
<hr>
<p>&copy; Quartznet 2020 | <a href="/quartznet/policy">Policy</a></p>
</div>
</footer>
</body>
</html>

View File

@ -8,12 +8,57 @@
<head>
<title>Quartznet | Login</title>
<?php include "../includes/head.php" ?>
<!-- General meta tags -->
<meta charset="utf-8">
<meta content='text/html; charset=utf-8' http-equiv='Content-Type'>
<meta http-equiv='X-UA-Compatible' content='IE=edge'>
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="description" content="A software and game studio.">
<meta name="keywords" content="quartznet, software, games, tools"/>
<meta name="author" content="quartznet"/>
<!-- Open Graph tags -->
<meta property="og:title" content="quartznet" />
<meta property="og:description" content="We are software and game developers." />
<!-- Load 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/themes.css" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=Open+Sans&display=swap" rel="stylesheet">
<link rel="icon" href="/quartznet/assets/favicon.ico">
<!-- Load javascript -->
<script src="/quartznet/assets/js/jquery-3.5.1.min.js" defer></script>
</head>
<body>
<?php include "../includes/header.php" ?>
<header>
<div class="container">
<nav class="navbar navbar-expand-md">
<div class="navbar-collapse order-1 order-md-0 dual-collapse2">
<ul class="navbar-nav mr-auto">
<li><a href="/quartznet/">Quartznet</a></li>
<li><a href="/quartznet/about">About</a></li>
</ul>
</div>
<div class="navbar-collapse collapse w-100 order-3 dual-collapse2">
<ul class="navbar-nav ml-auto">
<li><a href="/quartznet/admin">Admin</a></li>
</ul>
</div>
</nav>
</div>
<div class="overlay">
<div class="description">
<h1 class="title">Quartznet</h1>
<p>Software, Games, Science, Space!</p>
</div>
</div>
</header>
<main class="container">
<form class="form-signin" action="login.php" method="post">
<div class="form-label-group">
@ -34,6 +79,11 @@
</form>
</main>
<?php include "../includes/footer.php" ?>
<footer>
<div class="container">
<hr>
<p>&copy; Quartznet 2020 | <a href="/quartznet/policy">Policy</a></p>
</div>
</footer>
</body>
</html>

View File

@ -1,59 +0,0 @@
<?php require_once("./auth.php"); auth();
// Select all users
$connection = connect();
$sql = "SELECT * FROM users";
$result = pg_query($connection, $sql);
if (!result)
{
die("pg_query error: " . pg_last_error($db));
}
$rows = pg_num_rows($result);
?>
<!DOCTYPE html>
<html lang="en">
<title>Quartznet | Users</title>
<?php include "../includes/head.php" ?>
<?php include "../includes/header.php" ?>
<main class="container">
<section class="content">
<!-- Should this still use tables -->
<table width="100%">
<thead>
<tr>
<th>Id</th>
<th>Name</th>
<th>Password</th>
</tr>
</thead>
<tbody>
<!-- User info --->
<?php while($row=pg_fetch_assoc($result)) { ?>
<tr>
<td><?php echo $row["id"]?></td>
<td><?php echo $row["name"]?></td>
<td><?php echo $row["password"]?></td>
<?php } ?>
</tr>
</tbody>
</table>
<!--Insert new user-->
<form method="post" action="users.php" name="login">
<div class="form-group">
<input name="username" type="text" required placeholder="username" maxlength="30">
<input name="password" type="password" required placeholder="password" maxlength="30">
</div>
</form>
</section>
</main>
<?php include "../includes/footer.php" ?>
</html>