diff --git a/.dockerignore b/.dockerignore index b30e85b..3d1eb70 100644 --- a/.dockerignore +++ b/.dockerignore @@ -2,5 +2,5 @@ .idea/ .dockerignore .gitignore -notes.txt -readme.md +*.txt +*.md diff --git a/.gitignore b/.gitignore index d7bb56b..b7df7a1 100644 --- a/.gitignore +++ b/.gitignore @@ -8,9 +8,7 @@ resources/ChartJs/ resources/FontAwesomePro/ resources/GoogleFonts/ resources/HalfMoon/ -resources/Icons8/ -resources/Quantum/ # Other folders (Will be removed once the content system is finished !) content/page/ -files/ +/files/ diff --git a/.htaccess b/.htaccess index 045af22..2cb4437 100644 --- a/.htaccess +++ b/.htaccess @@ -1,9 +1,24 @@ # Prevent access to .htaccess - Order allow,deny - Deny from all + ## Apache 2.2 + Order allow,deny + Deny from all + ## Apache 2.4 + # Require all denied +## Deny access to some common leftovers +# +# ## Apache 2.2 +# Order allow,deny +# Deny from all +# Satisfy All +# ## Apache 2.4 +# # Require all denied +# + +ServerSignature Off + # Redirecting HTTP traffic to HTTPS. (Keep commented on localhost !) # This is handled other services, but it should still be enabled in production just to be safe. #RewriteEngine On @@ -19,61 +34,63 @@ ErrorDocument 403 /403.php ErrorDocument 404 /404.php # Setting some headers for security. -# TODO: Implement a proper module check and redirection to clean 503 error page if module is not enabled ! Header always set X-Detected-Country "NK" Header always set X-Frame-Options "deny" +# Prevents CloudFlare from injecting some JS code through their hidden apps... Header always set Content-Security-Policy "default-src 'self'; object-src 'none'; child-src 'self'; frame-ancestors 'none'; upgrade-insecure-requests; block-all-mixed-content" Header always set X-XSS-Protection " 1; mode=block" Header always set Referrer-Policy "no-referrer" Header always set X-Content-Type-Options "nosniff" Header always set Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" Header always set Cache-Control "max-age=300, public" -# FIXME: Apparently, the 'Permissions-Policy' header is not properly formatted, IDK why... +# Remark: Apparently, the 'Permissions-Policy' header is not properly formatted, IDK why... Header always set Permissions-Policy "accelerometer=(),autoplay=(),camera=(),display-capture=(),document-domain=(),encrypted-media=(),fullscreen=(),geolocation=(),gyroscope=(),magnetometer=(),microphone=(),midi=(),payment=(),picture-in-picture=(),publickey-credentials-get=(),screen-wake-lock=(),sync-xhr=(self),usb=(),web-share=(),xr-spatial-tracking=()" Header always set Access-Control-Allow-Origin "*" Header unset X-Powered-By Header always set X-Powered-By "Amiga 1200, Kickstart 3.1" +# Removed the condition to prevent silent errors since the module is required for the website +# + # Handling all other redirections. - - # TODO: Raise error if not available - RewriteEngine On +RewriteEngine On - # Sending a 404 for git and IDEs folders just in case they ever get copied to the web server, - # or if one of the honeypot files is acessed directly. - # A 404 is preferred to prevent further scanning of this folder and from raising some flags. - # FIXME: These rules break the later honeypot rules !!! - #RedirectMatch 404 ^.*\.?(git|vs(code)|idea).* - #RedirectMatch 404 ^.*honeypot.* +# Sending a 404 for git and IDEs folders just in case they ever get copied to the web server, +# or if one of the honeypot files is acessed directly. +# A 404 is preferred to prevent further scanning of this folder and from raising some flags. +# FIXME: These rules break the later honeypot rules !!! +#RedirectMatch 404 ^.*\.?(git|vs(code)|idea).* +#RedirectMatch 404 ^.*honeypot.* - # Languages. (Does not work with a regex) - RewriteRule ^en/(.*)$ /$1 [QSA] - RewriteRule ^fr/(.*)$ /$1 [QSA] - RewriteRule ^lb/(.*)$ /$1 [QSA] +# Languages. (Does not work with a regex) +RewriteRule ^en/(.*)$ /$1 [QSA] +RewriteRule ^fr/(.*)$ /$1 [QSA] +RewriteRule ^lb/(.*)$ /$1 [QSA] - # Content categories. - Should be removed ? - #RewriteRule ^((en|fr|lb)/)?blog/article/(.*)$ /content/page/$1 [QSA] - #RewriteRule ^((en|fr|lb)/)?programming/(applications|tutorials|tools)/(.*)$ /content/page/$1 [QSA] - ##RewriteRule ^((en|fr|lb)/)?electronics/ham/(.*)$ /content/page/$1 [QSA] +# Content categories. - Should be removed ? +#RewriteRule ^((en|fr|lb)/)?blog/article/(.*)$ /content/page/$1 [QSA] +#RewriteRule ^((en|fr|lb)/)?programming/(applications|tutorials|tools)/(.*)$ /content/page/$1 [QSA] +##RewriteRule ^((en|fr|lb)/)?electronics/ham/(.*)$ /content/page/$1 [QSA] - # Content root pages. - Should be removed ? - #RewriteRule ^((en|fr|lb)/)?programming/(purebasic|python|others)/(.*)$ /content/$1 [QSA] - #RewriteRule ^((en|fr|lb)/)?electronics/(iot|experiments)/(.*)$ /content/$1 [QSA] +# Content root pages. - Should be removed ? +#RewriteRule ^((en|fr|lb)/)?programming/(purebasic|python|others)/(.*)$ /content/$1 [QSA] +#RewriteRule ^((en|fr|lb)/)?electronics/(iot|experiments)/(.*)$ /content/$1 [QSA] - # Content pages. (Old regex are taken care of by the "content/index.php" page) - RewriteRule ^((en|fr|lb)/)?(blog|programming|electronics)/(.*)$ /content/$1 [QSA] +# Content pages. (Old regex are taken care of by the "content/index.php" page) +RewriteRule ^((en|fr|lb)/)?(blog|programming|electronics)/(.*)$ /content/$1 [QSA] - # Internal redirections for scanning and exploit attempts. - # These rules are here since they're easier to implement in the .htaccess. - #RewriteRule ^.*(install|xmlrpc)\.php.*$ /honeypot/file-php.php [QSA] - #RewriteRule ^.*\.xml.*$ /honeypot/file-xml.php [QSA] - #RewriteRule ^.*wlwmanifest\.xml.*$ /honeypot/file-xml-wlwmanifest.php [QSA] - #RewriteRule ^.*\.env.*$ /honeypot/file-env.php [QSA] - #RewriteRule ^.*(ap(i|p.*)|cms|sit[eo]|shop.*|wp.*).*$ /honeypot/folder.php [QSA] +# Internal redirections for scanning and exploit attempts. +# These rules are here since they're easier to implement in the .htaccess. +#RewriteRule ^.*(install|xmlrpc)\.php.*$ /honeypot/file-php.php [QSA] +#RewriteRule ^.*\.xml.*$ /honeypot/file-xml.php [QSA] +#RewriteRule ^.*wlwmanifest\.xml.*$ /honeypot/file-xml-wlwmanifest.php [QSA] +#RewriteRule ^.*\.env.*$ /honeypot/file-env.php [QSA] +#RewriteRule ^.*(ap(i|p.*)|cms|sit[eo]|shop.*|wp.*).*$ /honeypot/folder.php [QSA] - # Cases left to handle: - # * /wp-admin/post.php?id=whatever - # * /public /vendor /storage +# Cases left to handle: +# * /wp-admin/post.php?id=whatever +# * /public /vendor /storage +# * //vendor/phpunit/phpunit/src/Util/PHP/eval-stdin.php + +# TODO: Implement bee-movie themed tarpit once I have a rate-limiting solution in place ! - # TODO: Implement bee-movie themed tarpit once I have a rate-limiting solution in place ! - diff --git a/403.php b/403.php index dd21867..2e0be75 100644 --- a/403.php +++ b/403.php @@ -1,4 +1,8 @@ - + diff --git a/404.php b/404.php index 525c0e9..75ef384 100644 --- a/404.php +++ b/404.php @@ -1,4 +1,8 @@ - + diff --git a/about/index.php b/about/index.php index 0670acf..8f659e0 100644 --- a/about/index.php +++ b/about/index.php @@ -1,4 +1,8 @@ - + @@ -16,7 +20,7 @@ data-sidebar-shortcut-enabled="true">
- +
@@ -25,25 +29,47 @@
-
+
-
+

-   Who am I ? +   

-
-

nibblepoker@gmail.com

-
-
-

TODO

+
+ +
+
+ rounded image +
+ +
+
+
+

+ Bozet Herwin +

+
+ +
+ + +
+
+ +
@@ -54,7 +80,7 @@

-   Skills +   

@@ -64,7 +90,32 @@
-
+
+

+   TODO +

+
+ +
+ +
+ +
+
+
+
+

+    +

+
+
+

@NibblePoker

+
+
+
+
+ +

  TODO

diff --git a/commons/body-root.php b/commons/body-root.php index 298797a..71e2c11 100644 --- a/commons/body-root.php +++ b/commons/body-root.php @@ -1,2 +1,7 @@ - +
diff --git a/commons/content.php b/commons/content.php index 7846614..948cba5 100644 --- a/commons/content.php +++ b/commons/content.php @@ -1,6 +1,14 @@ -
@@ -12,37 +18,16 @@ defined('SIDEBAR_ID') or define('SIDEBAR_ID', 'default');

Nibble Poker

- "> + "> - "> - - -
- - - + "> + +
- - - - - - - - - - - - - -
@@ -55,36 +40,30 @@ defined('SIDEBAR_ID') or define('SIDEBAR_ID', 'default'); +
+ + + + + + + + + + + +
-
- "> + "> - "> + "> - "> + "> diff --git a/commons/strings.json b/commons/strings.json index 0d384c0..8da0e89 100644 --- a/commons/strings.json +++ b/commons/strings.json @@ -9,6 +9,7 @@ "home.intro.text.2": "If you wish to contact me, you can do so through the contact form linked in the sidebar or via the email address present on that page.", "blog.title": "Blog", "programming.title": "Programming", + "programming.title.projects": "Projects", "programming.java.title": "Java", "programming.purebasic.title": "PureBasic", "programming.python.title": "Python", @@ -57,6 +58,7 @@ "error.404.description": "The requested resource couldn't be found on the server !", "error.content.title.generic": "Content error", + "error.content.title.empty": "No content found", "error.content.none": "No explicit error was encountered.", "error.content.detect.category": "Failed to detect which category of content you requested.", "error.content.detect.display": "Failed to detect if you requested the category's search page or a specific one.", @@ -65,9 +67,17 @@ "error.content.detect.empty": "No content could be found for the given tags.", "content.title.error": "$content.title.error", - "content.title.search": "$content.title.search", + "content.title.search": "Projects search", "content.title.article": "$content.title.article", - "content.title.application": "$content.title.application" + "content.title.application": "$content.title.application", + "content.tags.requested": "Requested tags", + "content.search.count.single": "result", + "content.search.count.multiple": "results", + + "about.biography.title": "Who am I ?", + "about.skills.title": "Skills", + "about.work.title": "Professional experiences", + "about.education.title": "TODO:SchoolAndEducation" }, "fr": { "home.title.nav": "Accueil", @@ -78,6 +88,7 @@ "home.intro.text.2": "Si vous désirez me contacter, vous pouvez le faire via le formulaire de contact dans la page prévu à cet effet qui est liée dans le menu latéral ou via l'adresse email présente sur cette page.", "blog.title": "Blog", "programming.title": "Programmation", + "programming.title.projects": "Projets", "programming.java.title": "Java", "programming.purebasic.title": "PureBasic", "programming.python.title": "Python", @@ -126,7 +137,8 @@ "error.404.description": "La ressource demandée est introuvable sur le serveur !", "error.content.title.generic": "Erreur de contenu", - "error.content.none": "Aucune erreur précise n'a été détectée.", + "error.content.title.empty": "Aucun contenu trouvé", + "error.content.none": "Aucune erreur n'a été détectée.", "error.content.detect.category": "Impossibilité de détecter la catégorie de contenu demandée.", "error.content.detect.display": "Impossibilité de détecter si une recherche ou page spécifique était demandée.", "error.content.detect.subtype": "Impossibilité de détecter le sous-type de contenu demandé.", @@ -134,9 +146,17 @@ "error.content.detect.empty": "Aucun contenu en rapport avec les tags choisi n'as été trouvé.", "content.title.error": "$content.title.error", - "content.title.search": "$content.title.search", + "content.title.search": "Recherche de projets", "content.title.article": "$content.title.article", - "content.title.application": "$content.title.application" + "content.title.application": "$content.title.application", + "content.tags.requested": "Tags demandés", + "content.search.count.single": "résultat", + "content.search.count.multiple": "résultats", + + "about.biography.title": "Qui suis-je ?", + "about.skills.title": "Compétences", + "about.work.title": "Parcours professionnel", + "about.education.title": "Éducation" }, "lb": { "home.title.nav": "Doheem", diff --git a/contact/index.php b/contact/index.php index 4c7c44f..5bb0fe6 100644 --- a/contact/index.php +++ b/contact/index.php @@ -1,4 +1,8 @@ - + @@ -15,7 +19,8 @@
- + +
@@ -24,7 +29,7 @@
-
+
@@ -66,7 +71,7 @@
-
+
diff --git a/content/index.json b/content/index.json index 6eda888..2cd0c3d 100644 --- a/content/index.json +++ b/content/index.json @@ -9,7 +9,7 @@ "en": "This is a test article, please ignore it", "fr": "Ceci est un article de test, veuillez l'ignorer." }, - "image": "test.jpg", + "image": "/resources/Azias/imgs/angry-alchool-pussy.png", "tags": [ "programming", "purebasic" ] @@ -26,7 +26,7 @@ }, "image": "test.jpg", "tags": [ - "programming", "purebasic" + "programming", "docker" ] } ] \ No newline at end of file diff --git a/content/index.php b/content/index.php index b2e9c3b..7bd5682 100644 --- a/content/index.php +++ b/content/index.php @@ -1,6 +1,16 @@ - @@ -36,7 +46,7 @@ if($content_has_error) {
- +
@@ -45,9 +55,10 @@ if($content_has_error) {
-
- -
+
+
@@ -55,76 +66,89 @@ if($content_has_error) {
-
-

This page is still under construction !

-

REQUEST_URI:

-

$requested_content_type:

-

$requested_content_display_type:

-

$requested_tags: []

-

count($requested_tags):

-

$content_has_error:

-

$_content_error_message_key:

-

localize($_content_error_message_key):

-

$content_error_message:

-

$filtered_content_index_data:

-

$content_requested_url_part:

-
-
- - + '); + echo('

REQUEST_URI: '.$_SERVER['REQUEST_URI'].'

'); + echo('

$requested_content_type: '.$requested_content_type.'

'); + echo('

$requested_content_display_type: '.$requested_content_display_type.'

'); + echo('

$requested_tags: ['.implode(", ", $requested_tags).']

'); + echo('

count($requested_tags): '.count($requested_tags).'

'); + echo('

$content_has_error: '.$content_has_error.'

'); + echo('

$_content_error_message_key: '.$_content_error_message_key.'

'); + echo('

localize($_content_error_message_key): '.localize($_content_error_message_key).'

'); + echo('

$content_error_message: '.$content_error_message.'

'); + echo('

$filtered_content_index_data: '); + print_r($filtered_content_index_data); + echo('

'); + echo('

$content_requested_url_part: '.$content_requested_url_part.'

'); + echo('
'); + } + + // Checking if an error occurred. if($content_error_code != 200) { - printErrorCard('error.content.title.generic', $content_error_message); + printErrorCard(localize('error.content.title.generic'), $content_error_message); goto content_printing_end; } - + // Printing the containers if($requested_content_display_type == ContentDisplayType::SEARCH) { - startMainCard("fad fa-file-alt", "content.title.search", "subtitle"); - echo('
'); + startMainCard("fad fa-file-search", localize("content.title.search"), + strval(count($filtered_content_index_data)) . " " . + (count($filtered_content_index_data) > 1 ? + localize("content.search.count.multiple") : + localize("content.search.count.single"))); + echo('
'); for($i = 0; $i < count($filtered_content_index_data); $i++) { if($i > 0) { echo('
'); } echo('
'); - echo('

'.$filtered_content_index_data[$i]["title"][$user_language].'

'); + + + echo('
'); + + echo('
'); + echo(''); + echo('
'); + + echo('
'); + echo('

'.$filtered_content_index_data[$i]["title"][$user_language].'

'); + echo('

'.$filtered_content_index_data[$i]["preamble"][$user_language].'

'); + echo('
'); + + echo('
'); + + echo('
'); + + echo('
'); + echo('
'); + echo(''); + for($j = 0; $j < count($filtered_content_index_data[$i]["tags"]); $j++) { + echo('#'.$filtered_content_index_data[$i]["tags"][$j].''); + } + echo('
'); + // TODO: Add button to view article ! + echo('
'); + + echo('
'); } echo('
'); - echo('
'. '

'. 'Card footer here.'. - '

');/**/ - + '

'); endMainCard(); } elseif($requested_content_display_type == ContentDisplayType::ARTICLE) { - startMainCard("fad fa-file-alt", "content.title.article", "subtitle"); + startMainCard("fad fa-file-alt", localize("content.title.article"), "subtitle"); endMainCard(); } elseif($requested_content_display_type == ContentDisplayType::APPLICATION) { - startMainCard("fad fa-file-alt", "content.title.application", "subtitle"); + startMainCard("fad fa-file-alt", localize("content.title.application"), "subtitle"); endMainCard(); } content_printing_end: ?> - - - -
diff --git a/content/items/test01.json b/content/items/test01.json index 0ef8827..5b1f285 100644 --- a/content/items/test01.json +++ b/content/items/test01.json @@ -1,3 +1,3 @@ { - "_": "Is this file used anywhere ?" + "_": "Is this file used anywhere ? - Referenced as the id in the article index" } \ No newline at end of file diff --git a/index.php b/index.php index eb34b1c..da75e61 100644 --- a/index.php +++ b/index.php @@ -1,4 +1,8 @@ - + @@ -15,7 +19,7 @@
- +
@@ -24,10 +28,7 @@
-
- - - +
@@ -52,10 +53,9 @@
- - - - +
+
+
@@ -75,7 +75,6 @@
-

PB-ListComPort diff --git a/links/index.php b/links/index.php index e405710..0115b61 100644 --- a/links/index.php +++ b/links/index.php @@ -1,4 +1,8 @@ - + @@ -15,7 +19,7 @@

- +
@@ -24,7 +28,7 @@
-
+
diff --git a/privacy/index.php b/privacy/index.php index 5e0c2b9..226b65f 100644 --- a/privacy/index.php +++ b/privacy/index.php @@ -1,4 +1,8 @@ - + @@ -24,7 +28,7 @@
-
+
@@ -33,7 +37,7 @@
-
+

@@ -58,7 +62,7 @@
-
+

@@ -72,7 +76,7 @@
-
+

@@ -89,7 +93,7 @@
-
+


@@ -107,7 +111,7 @@

-
+

diff --git a/readme.md b/readme.md index 3419575..291a26c 100644 --- a/readme.md +++ b/readme.md @@ -39,8 +39,6 @@ These files are required for the website to work properly !
* `/resources/FontAwesomePro/` * HalfMoon v1.1.1 * `/resources/HalfMoon/` -* Quantum - * `/resources/Quantum/` ### Optional These files are leftovers from previous projects and might be required somewhere. @@ -48,5 +46,3 @@ These files are leftovers from previous projects and might be required somewhere * `/resources/ChartJs/` * Material Icons * `/resources/GoogleFonts/MaterialIcons/` -* Icons8 - Color & Fluent private packs - * `/resources/Icons8/` diff --git a/resources/Azias/css/nibblepoker.lu.css b/resources/Azias/css/nibblepoker.lu.css index 34f7435..f4f5818 100644 --- a/resources/Azias/css/nibblepoker.lu.css +++ b/resources/Azias/css/nibblepoker.lu.css @@ -4,6 +4,11 @@ src: url("/resources/Quantum/Quantum.otf") format('opentype'); } +/* Preventing images from being saved with the right-click */ +img.no-save { + pointer-events: none; +} + /* Background for the main container and its cards */ div#body-overlay { position: absolute; @@ -91,11 +96,20 @@ div#body-overlay { image-rendering: pixelated; } -hr, hr.dark-mode { +hr, hr.dark-mde, hr.subtle { background-color: rgba(0, 0, 0, 0) !important; background: rgb(93,95,97); background: radial-gradient(circle, rgba(83,85,87,0.8) 0%, rgba(65,67,69,0.65) 75%, rgba(17,20,23,0) 100%); - opacity: 0.75; + opacity: 0.1; + margin-top: 5px; + margin-bottom: 5px; +} + +img.content-search-image { + max-height: 128px; +} +div.content-tag-container a:not(:first-child) { + margin-left: 10px; } @media (min-width: 993px) { @@ -113,6 +127,22 @@ hr, hr.dark-mode { } } +/* Custom dynamic sizing */ +.w-lg-p90 { + width: 95% !important; +} +@media (max-width: 992px) { + .w-95 { + width: 95% !important; + } +} +@media (min-width: 993px) { + .w-lg-p90 { + width: 90% !important; + } +} + + /* Trash */ /*.lang-icon { height: var(--base-line-height); diff --git a/resources/Quantum/Quantum.otf b/resources/Quantum/Quantum.otf new file mode 100644 index 0000000..b26c789 Binary files /dev/null and b/resources/Quantum/Quantum.otf differ diff --git a/resources/Quantum/readme.md b/resources/Quantum/readme.md new file mode 100644 index 0000000..34fc69a --- /dev/null +++ b/resources/Quantum/readme.md @@ -0,0 +1,2 @@ +# Quantum Font +100% font made by [sesohq](https://www.sesohq.com/) over at [sesohq.sellfy.store](https://sesohq.sellfy.store/p/3enu/).