Added error page, Added drawings, Improved composer

Update .gitignore, .htaccess, and 24 more files...
This commit is contained in:
2023-05-24 23:35:42 +02:00
parent d5ea7e369b
commit ee90a3745d
26 changed files with 219 additions and 224 deletions

1
.gitignore vendored
View File

@@ -3,7 +3,6 @@
# Static resources
resources/FontAwesomePro/
resources/FontAwesome/
resources/HighlightJS/
resources/NibblePoker/css/*.css

View File

@@ -23,8 +23,8 @@ Options -Indexes +FollowSymlinks -ExecCGI
ServerSignature Off
# Custom error pages.
ErrorDocument 403 /403.php
ErrorDocument 404 /404.php
ErrorDocument 403 /error.php
ErrorDocument 404 /error.php
# Setting up browser's caching rules
# See:

83
403.php
View File

@@ -1,83 +0,0 @@
<?php
set_include_path('./commons/');
include_once 'config.php';
include_once 'langs.php';
include_once 'modals.php';
?>
<!DOCTYPE html>
<html lang="<?php echo($user_language); ?>">
<head>
<?php include 'headers.php'; ?>
<title><?php print(localize('error.403.title')); ?> - Nibble Poker</title>
<meta name="description" content="<?php print(localize('error.403.description')); ?>">
<meta property="og:title" content="Nibble Poker - <?php print(localize('error.403.title')); ?>" />
<meta property="og:type" content="website" />
<meta property="og:url" content="<?php echo($host_uri); ?>/" />
<meta property="og:image" content="<?php echo($host_uri); ?>/resources/Azias/logos/opengraph.png"/>
<meta property="og:image:type" content="image/png"/>
<meta property="og:description" content="<?php print(localize('error.403.description')); ?>"/>
</head>
<body class="with-custom-webkit-scrollbars with-custom-css-scrollbars dark-mode" data-dm-shortcut-enabled="true" data-sidebar-shortcut-enabled="true">
<?php
$debuggingText = "Referrer: " . (
array_key_exists('HTTP_REFERER', $_SERVER) ? htmlspecialchars($_SERVER['HTTP_REFERER']) : "<i>Not present in request !</i>"
) . "<br>";
$debuggingText .= "<br>TODO: Add more info once the cache is properly configured for 4xx errors !";
add_code_modal(
"http-error",
localize('modal.title.debugging'),
$debuggingText
);
include 'body-root.php';
?>
<div class="page-wrapper with-sidebar with-navbar-fixed-bottom">
<?php include 'sidebar.php'; ?>
<div class="content-wrapper">
<div class="container-fluid">
<div id="page-title-bar" class="card p-0 pl-20 m-0 square-corners bg-very-dark title-bkgd navbar">
<h2 class="content-title font-size-24 mt-20 text-truncate">
<i class="fad fa-exclamation-triangle"></i>&nbsp;&nbsp;<?php print(localize('error.4xx.title')); ?>
</h2>
<?php include 'header-lang.php'; ?>
</div>
<div class="content mx-auto w-lg-p90">
<div class="card p-0 m-0">
<div class="px-card py-10 border-bottom px-20">
<div class="container-fluid">
<div class="row">
<div class="col-1 text-center"><i class="fad fa-exclamation-triangle"></i></div>
<div class="col-10 text-center">
<h2 class="card-title font-size-18 m-0"><?php print(localize("error.403.title")); ?></h2>
</div>
<div class="col-1 text-center"><i class="fad fa-exclamation-triangle"></i></div>
</div>
</div>
</div>
<div class="p-20 bg-light-lm rounded-bottom bg-very-dark title-bkgd text-center">
<p class="font-size-18 m-0 font-weight-semi-bold">
<?php print(localize("error.403.description")); ?>
</p>
<hr class="my-15">
<p class="font-size-14 m-0"><!--no hr => mt-lg-10 mt-lg-5-->
<?php print(localize("error.403.explanation")); ?>
</p>
<!--<hr class="my-20">
<a href="/" class="js-set-previous-url">
<button class="btn btn-primary" type="button">Go back to previous page</button>
</a>-->
<a href="#<?php echo(get_modal_id("http-error")); ?>">
<div class="container-card-fold secondary">
<i class="fad fa-bug"></i>
</div>
</a>
</div>
</div>
</div>
</div>
</div>
<?php include 'footer.php'; ?>
</div>
<script src="/resources/HalfMoon/1.1.1/js/halfmoon.min.js"></script>
<script src="/resources/Azias/js/nibblepoker.lu.js"></script>
</body>
</html>

83
404.php
View File

@@ -1,83 +0,0 @@
<?php
set_include_path('./commons/');
include_once 'config.php';
include_once 'langs.php';
include_once 'modals.php';
?>
<!DOCTYPE html>
<html lang="<?php echo($user_language); ?>">
<head>
<?php include 'headers.php'; ?>
<title><?php print(localize('error.404.title')); ?> - Nibble Poker</title>
<meta name="description" content="<?php print(localize('error.404.description')); ?>">
<meta property="og:title" content="Nibble Poker - <?php print(localize('error.404.title')); ?>" />
<meta property="og:type" content="website" />
<meta property="og:url" content="<?php echo($host_uri); ?>/" />
<meta property="og:image" content="<?php echo($host_uri); ?>/resources/Azias/logos/opengraph.png"/>
<meta property="og:image:type" content="image/png"/>
<meta property="og:description" content="<?php print(localize('error.404.description')); ?>"/>
</head>
<body class="with-custom-webkit-scrollbars with-custom-css-scrollbars dark-mode" data-dm-shortcut-enabled="true" data-sidebar-shortcut-enabled="true">
<?php
$debuggingText = "Referrer: " . (
array_key_exists('HTTP_REFERER', $_SERVER) ? htmlspecialchars($_SERVER['HTTP_REFERER']) : "<i>Not present in request !</i>"
) . "<br>";
$debuggingText .= "<br>TODO: Add more info once the cache is properly configured for 4xx errors !";
add_code_modal(
"http-error",
localize('modal.title.debugging'),
$debuggingText
);
include 'body-root.php';
?>
<div class="page-wrapper with-sidebar with-navbar-fixed-bottom">
<?php include 'sidebar.php'; ?>
<div class="content-wrapper">
<div class="container-fluid">
<div id="page-title-bar" class="card p-0 pl-20 m-0 square-corners bg-very-dark title-bkgd navbar">
<h2 class="content-title font-size-24 mt-20 text-truncate">
<i class="fad fa-exclamation-triangle"></i>&nbsp;&nbsp;<?php print(localize('error.4xx.title')); ?>
</h2>
<?php include 'header-lang.php'; ?>
</div>
<div class="content mx-auto w-lg-p90">
<div class="card p-0 mx-0">
<div class="px-card py-10 border-bottom px-20">
<div class="container-fluid">
<div class="row">
<div class="col-1 text-center"><i class="fad fa-exclamation-triangle"></i></div>
<div class="col-10 text-center">
<h3 class="card-title font-size-18 m-0"><?php print(localize("error.404.title")); ?></h3>
</div>
<div class="col-1 text-center"><i class="fad fa-exclamation-triangle"></i></div>
</div>
</div>
</div>
<div class="p-20 bg-light-lm rounded-bottom bg-very-dark title-bkgd text-center">
<p class="font-size-18 m-0 font-weight-semi-bold">
<?php print(localize("error.404.description")); ?>
</p>
<hr class="my-15">
<p class="font-size-14 m-0"><!--no hr => mt-lg-10 mt-lg-5-->
<?php print(localize("error.404.explanation")); ?>
</p>
<!--<hr class="my-20">
<a href="/" class="js-set-previous-url">
<button class="btn btn-primary" type="button">Go back to previous page</button>
</a>-->
<a href="#<?php echo(get_modal_id("http-error")); ?>">
<div class="container-card-fold secondary">
<i class="fad fa-bug"></i>
</div>
</a>
</div>
</div>
</div>
</div>
</div>
<?php include 'footer.php'; ?>
</div>
<script src="/resources/HalfMoon/1.1.1/js/halfmoon.min.js"></script>
<script src="/resources/Azias/js/nibblepoker.lu.js"></script>
</body>
</html>

View File

@@ -28,6 +28,3 @@ if($enable_glider) {
echo('<link href="/resources/GliderJs/1.7.6/glider.min.css" rel="stylesheet" />');
}
?>

View File

@@ -94,11 +94,11 @@ abstract class ComposerElementModifiers {
const CONTAINER_CARD = ["card", "card"];
// Buttons
const BUTTON_THIN = ["thin", "btn-sm"];
const BUTTON_THICK = ["thick", "btn-lg"];
const BUTTON_ROUNDED = ["rounded", "btn-rounded"];
const BUTTON_CIRCLE = ["circle", "rounded-circle"];
const BUTTON_DOWNLOAD_PRIMARY = ["download-primary", "btn-primary"];
const BUTTON_THIN = ["thin", ""];
const BUTTON_THICK = ["thick", ""];
const BUTTON_ROUNDED = ["rounded", ""];
const BUTTON_CIRCLE = ["circle", ""];
const BUTTON_DOWNLOAD_PRIMARY = ["download-primary", "primary"];
// Horizontal ruler
const HR_SUBTLE = ["subtle", "subtle"];
@@ -114,7 +114,7 @@ abstract class ComposerElementModifiers {
const TABLE_INNER_BORDER = ["inner-bordered", "table-inner-bordered"];
const TABLE_OUTER_BORDER = ["outer-bordered", "table-outer-bordered"];
const TABLE_V2_STYLISH = ["stylish", "stylish r-s border o-hidden"];
const TABLE_V2_CELL_PADDING = ["auto-cell-padding", "table-p-xs"];
const TABLE_V2_CELL_PADDING = ["auto-cell-padding", "table-p-xs table-h-p-s"];
const TABLE_V2_VERTICAL_ALIGN = ["v-center-cells", "table-v-center"];
// Code
@@ -334,16 +334,31 @@ class ComposerContentMetadata {
true
) . '<div class="px-xxs">' . $inner_html . '</div>';
// Appending the tags if any are present
// Grabbing the DOM for inside the tags bar
$_template_gpr_tags_dom = '<i class="fad fa-tags t-size-10"></i>';
if(sizeof($this->article->tags) > 0) {
foreach($this->article->tags as $tag) {
$inner_html .= '<a href="'.l10n_url_abs("/content/?tags=" . $tag .
'" class="content-tag">#' . $tag . '</a>');
$_template_gpr_tags_dom .= '<a href="'.l10n_url_abs("/content/?tags=" . $tag .
'" class="ml-xs">#' . $tag . '</a>');
}
} else {
$inner_html .= '<i>' . localize("content.error.message.data.no.tags") . '</i>';
$_template_gpr_tags_dom .= '<i>' . localize("content.error.message.data.no.tags") . '</i>';
}
// Printing the tags bar
$inner_html .= getMainHeader(
$_template_gpr_tags_dom,
null,
null,
null,
true,
null,
6,
false,
false,
true
);
break;
case ComposerTemplates::RAW:
default:

File diff suppressed because one or more lines are too long

View File

@@ -0,0 +1,21 @@
{
"error.403.head.title": "403 - NibblePoker",
"error.403.head.description": "Access to the requested resource isn't unauthorized.",
"error.403.og.title": "NibblePoker - 403 Error",
"error.403.og.description": "Access to the requested resource isn't unauthorized.",
"error.403.header.title": "Error<span class=\"mx-s t-size-15\">❱</span>403 Error",
"error.404.head.title": "404 - NibblePoker",
"error.404.head.description": "The server couldn't find the requested resource.",
"error.404.og.title": "NibblePoker - 404 Error",
"error.404.og.description": "The server couldn't find the requested resource.",
"error.404.header.title": "Error<span class=\"mx-s t-size-15\">❱</span>404 Error",
"error.500.head.title": "500 - NibblePoker",
"error.500.head.description": "The server has encountered a situation it doesn't know how to handle.",
"error.500.og.title": "NibblePoker - 500 Error",
"error.500.og.description": "The server has encountered a situation it doesn't know how to handle.",
"error.500.header.title": "Error<span class=\"mx-s t-size-15\">❱</span>500 Error",
"error.skit.pc.dead": "Drawing of an old PC with a face with crossed eyes."
}

View File

@@ -161,10 +161,10 @@ include 'commons/DOM/body-2.php';
}
// // Printing the tags used in the search and others that may be available.
// TODO: Print the tags used in the search and others that may be available.
} elseif($requested_content_display_type == ContentDisplayType::CONTENT) {
echo($content->get_html());
// Printing the content
echo($content->get_html());
}
// Label used when there is an error to skip the content printing parts.

75
error.php Normal file
View File

@@ -0,0 +1,75 @@
<?php
$start_time = microtime(true);
set_include_path('./');
include_once 'commons/config.php';
include_once 'commons/langs.php';
// Determining the relevant error code to prepare the page for.
$np_err_code = 500;
if(isset($_SERVER['REDIRECT_STATUS'])) {
$np_err_code = $_SERVER['REDIRECT_STATUS'];
}
?>
<!DOCTYPE html>
<html lang="<?php echo($user_language); ?>">
<head>
<?php include 'commons/DOM/head.php'; ?>
<title><?php print(localize('error.'.$np_err_code.'.head.title')); ?></title>
<meta name="description" content="<?php print(localize('error.'.$np_err_code.'.head.description')); ?>">
<meta property="og:title" content="<?php print(localize('error.'.$np_err_code.'.og.title')); ?>"/>
<meta property="og:type" content="website"/>
<meta property="og:url" content="<?php echo($host_uri . l10n_url_abs('/')); ?>"/>
<meta property="og:image" content="<?php echo($host_uri); ?>/resources/NibblePoker/images/logos/v2_opengraph.png"/>
<meta property="og:image:type" content="image/png"/>
<meta property="og:description" content="<?php print(localize('error.'.$np_err_code.'.og.description')); ?>"/>
</head>
<body>
<?php
include_once 'commons/DOM/utils.php';
include 'commons/DOM/body-1.php';
$SIDEBAR_ID = 'error';
include 'commons/DOM/sidebar.php';
include 'commons/DOM/body-2.php';
?>
<header class="w-full p-m pl-s">
<h1 class="t-size-17 t-w-500">
<i class="fad fa-exclamation-triangle t-size-16 mr-s t-muted"></i><?php print(localize("error.".$np_err_code.".header.title")); ?>
</h1>
<?php //include "header-lang.php'; ?>
</header>
<?php include 'commons/DOM/body-3.php'; ?>
<main id="main" class="rl-m border border-r-0 p-l">
<?php printMainHeader(localize("home.intro.title")); ?>
<p class="mt-xs ml-s"><?php print(localize("home.intro.text.1")); ?></p>
<p class="mt-xs ml-s"><?php print(localize("home.intro.text.2")); ?></p>
<?php
$np_err_img = "";
$np_err_img_alt = "";
switch($np_err_code) {
case 403:
case 404:
case 500:
default:
$np_err_img = "/resources/NibblePoker/images/drawings/computer_v1_dead_strong.png";
$np_err_img_alt = localize("error.skit.pc.dead");
break;
}
echo('<img id="error-page-skit" src="' . $np_err_img . '" alt="' . $np_err_img_alt . '">');
?>
</main>
<?php
include 'commons/DOM/body-4.php';
include 'commons/DOM/footer.php';
include 'commons/DOM/body-5.php';
include 'commons/DOM/scripts.php';
?>
</body>
</html>
<?php
$end_time = microtime(true);
if($print_execution_timer) {
echo("<!-- PHP execution took " . round(($end_time - $start_time) * 1000, 2) . " ms -->");
}
?>

View File

@@ -35,47 +35,47 @@ include 'commons/DOM/body-2.php';
<main id="main" class="rl-m border border-r-0 p-l">
<?php printMainHeader(localize("home.intro.title")); ?>
<p class="mt-xs ml-s"><?php print(localize("home.intro.text.1")); ?></p>
<p class="mt-xs ml-s"><?php print(localize("home.intro.text.2")); ?></p>
<p class="mt-xs ml-s"><?php print(localize("home.intro.text.1")); ?></p>
<p class="mt-xs ml-s"><?php print(localize("home.intro.text.2")); ?></p>
<?php printMainHeader("Applications"); ?>
<!-- If 'r-*' is used, 'o-hidden' needs to be too => https://stackoverflow.com/a/8582304 -->
<table class="stylish w-full mt-xs table-p-xs r-s o-hidden border">
<thead>
<tr>
<th>Version</th>
<th>Downloads</th>
<th>Downloads</th>
</tr>
</thead>
<tbody>
<tr>
<td>C11</td>
<td>C12</td>
<td>C13</td>
</tr>
<tr>
<td>C21</td>
<td>C22</td>
<td>C23</td>
</tr>
</tbody>
</table>
<!-- If 'r-*' is used, 'o-hidden' needs to be too => https://stackoverflow.com/a/8582304 -->
<table class="stylish w-full mt-xs table-p-xs r-s o-hidden border">
<thead>
<tr>
<th>Version</th>
<th>Downloads</th>
<th>Downloads</th>
</tr>
</thead>
<tbody>
<tr>
<td>C11</td>
<td>C12</td>
<td>C13</td>
</tr>
<tr>
<td>C21</td>
<td>C22</td>
<td>C23</td>
</tr>
</tbody>
</table>
<?php printMainHeader("Testing"); ?>
<p class="mt-xs ml-s"><?php print(localize("home.intro.text.1")); ?></p>
<br>
<button class="p-xs border r-s">aaa</button>
<br>
<input class="p-xs border r-s" type="text">
<br>
<p class="mt-xs ml-s"><?php print(localize("home.intro.text.1")); ?></p>
<br>
<button class="p-xs border r-s">aaa</button>
<br>
<input class="p-xs border r-s" type="text">
<br>
<?php printMainHeader(localize("home.intro.title")); ?>
<p class="mt-xs ml-s">
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed <span class="code">do eiusmod tempor</span> incididunt ut labore et dolore magna aliqua.<br>
Mauris ultrices eros in cursus turpis massa tincidunt dui.<br>
Pulvinar elementum integer enim neque. Nunc mi ipsum faucibus vitae aliquet nec.
</p>
<p class="mt-xs ml-s">
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed <span class="code">do eiusmod tempor</span> incididunt ut labore et dolore magna aliqua.<br>
Mauris ultrices eros in cursus turpis massa tincidunt dui.<br>
Pulvinar elementum integer enim neque. Nunc mi ipsum faucibus vitae aliquet nec.
</p>
</main>
<?php

View File

@@ -7,7 +7,7 @@ This repository is only a mirror and should never be cloned and served as-is.
The [.htaccess](.htaccess) file has been made public **on purpose** since it does not contain any
private information and because it could be used by other people to create their website more easily
since these configuration files are a nightmare to work with.<br>
Especially with the lang redirections.
Especially with redirections to handle language changes and whatnot.
## Content
### Blog
@@ -30,7 +30,9 @@ These files are required and need to be installed manually for the website to wo
* Highlight.js v11.6.0
* `/resources/HighlightJS/`
## External Licenses
## Licenses
### External
Here is a list of the licenses for any third-party thing included in this repository.
* [Quantum Font](https://sesohq.sellfy.store/p/3enu/) by [sesohq](https://www.sesohq.com/)
@@ -39,3 +41,10 @@ Here is a list of the licenses for any third-party thing included in this reposi
* Uses the [MIT license](https://github.com/NickPiscitelli/Glider.js/blob/master/LICENSE.txt)
All licenses are also included as-is in their project's respective folder.
### Website's code
All the code, stylesheets and configs that are not covered by the [External licenses](#external) are all
licensed under the [Unlicense](LICENSE) license.
### Images
The images present in this repository are currently not licensed.

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

View File

@@ -44,7 +44,7 @@
@import 'site/body';
@import 'site/layout'; // Has manual disabling of some core stuff in specific situations and a shit-tier fix for tables.
@import 'site/hr';
//@import 'site/scrollbar';
@import 'site/scrollbar';
@import 'site/image';
@import 'site/wedge';
@import 'site/input';

View File

@@ -30,6 +30,18 @@
object-fit: contain;
}
#error-page-skit {
max-width: 40%;
height: auto;
position: absolute;
bottom: 1.5em;
right: 1.5em;
filter: drop-shadow(0 0 0.5rem #0000007F);
mix-blend-mode: multiply;
//opacity: 0.25;
opacity: 0.2;
}
// Logo colors
//.npl1, .npl6 {
//}

View File

@@ -30,4 +30,12 @@ button {
&:hover {
background-color: #{$color-background-button-hover};
}
&.primary {
background-color: #{$color-background-button-primary};
&:hover {
background-color: #{$color-background-button-primary-hover};
}
}
}

View File

@@ -29,6 +29,12 @@ table.stylish {
}
}
&.table-h-p-s {
th {
padding: calc(#{$margin-base-size} * 0.75);
}
}
&.table-p-s {
td, th {
padding: calc(#{$margin-base-size} * 0.75);

View File

@@ -60,6 +60,9 @@ $color-apollo-custom-10: mix($color-apollo-40, $color-apollo-41, 75%);
$color-apollo-custom-20: mix($color-apollo-39, $color-apollo-38, 60%);
$color-apollo-custom-30: mix($color-apollo-01, $color-apollo-03, 80%); // Primary button
$color-apollo-custom-31: mix($color-apollo-01, $color-apollo-03, 65%); // Primary button hover
//$color-test-01: mix(#7b6aa5, #000000, 33%);
$color-test-02: #007c7d;
@@ -114,6 +117,9 @@ $color-background-inputs: $color-apollo-40;
$color-background-button: $color-apollo-40;
$color-background-button-hover: $color-apollo-custom-10;
$color-background-button-primary: #{$color-apollo-custom-30};
$color-background-button-primary-hover: #{$color-apollo-custom-31};
$_color-white-lighter: rgb(253, 255, 251);
$_color-white-light: rgb(235, 237, 233);
$_color-white-medium: rgb(217, 222, 218);
@@ -136,6 +142,16 @@ $_color-blue-dark: #3353b6;
$_color-white-muted: #FFFFFF96;
//rgba(255, 255, 255, 0.6)
/* Variables > Scrollbar */
//$color-scrollbar-border: rgba(0, 0, 0, 0.15);
$color-scrollbar-border: $color-border-all;
$scrollbar-size: 1.25em;
/* Variables > Others */
$border-base-radius: 5px;

3
tools/.htaccess Normal file
View File

@@ -0,0 +1,3 @@
# Redirecting any URL that starts with "/tools" to the root of this folder.
RewriteEngine On
RewriteRule ^(.*) index.php [NC]