Updated about page, Update build scripts

Update .gitignore, index.php, and 5 more files...

.gitignore

@@ -39,5 +39,4 @@ tools/items/mc-art-viewer/nbt.js
 
 # Temporary
 articles/*.txt
-commons/strings/_*/
 meow*.ogg

about/index.php

@@ -76,70 +76,75 @@ include 'commons/DOM/sidebar.php';
 		<?php print(localize("about.financing.text.20")); ?><br>
 		<?php print(localize("about.financing.text.21")); ?>
 	</p>
-	<table class="stylish r-s border o-hidden table-p-xs table-h-p-s table-v-center mt-xs mx-s">
+	
-		<thead>
+	<div class="grid col-2 col-medium-1">
+		<table class="stylish r-s border o-hidden table-p-xs table-h-p-s table-v-center mt-s mx-s">
+			<thead>
+				<tr>
+					<th><?php print(localize("about.financing.part.service")); ?></th>
+					<th><?php print(localize("about.financing.part.cost.yearly")); ?></th>
+				</tr>
+			</thead>
+			<tbody>
+				<tr>
+					<td><?php print(localize("about.financing.part.domain.lu")); ?></td>
+					<td><?php print(number_format(17,2, $lang_number_decimal, $lang_number_thousands)); ?> €</td>
+				</tr>
+				<tr>
+					<td><?php print(localize("about.financing.part.domain.com")); ?></td>
+					<td><?php print(number_format(14.5,2, $lang_number_decimal, $lang_number_thousands)); ?> €</td>
+				</tr>
+				<tr>
+					<td><?php print(localize("about.financing.part.proxy.europe")); ?></td>
+					<td><?php print(number_format(14.5,2, $lang_number_decimal, $lang_number_thousands)); ?> €</td>
+				</tr>
+				<tr>
+					<td><?php print(localize("about.financing.part.proxy.america")); ?></td>
+					<td><?php print(number_format(13,2, $lang_number_decimal, $lang_number_thousands)); ?> €</td>
+				</tr>
+				<tr>
+					<td><?php print(localize("about.financing.part.electricity")); ?></td>
+					<td>&pm;<?php print(number_format(30,2, $lang_number_decimal, $lang_number_thousands)); ?> €</td>
+				</tr>
+				<tr>
+					<td><b class="f-right"><?php print(localize("about.financing.part.cost.yearly.total")); ?>:</b></td>
+					<td>&pm;<?php print(number_format(
+						17 + 14.5 + 14.5 + 13 + 30,
+						2, $lang_number_decimal, $lang_number_thousands)
+						); ?> €
+					</td>
+				</tr>
+			</tbody>
+		</table>
+		<table class="stylish r-s border o-hidden table-p-xs table-h-p-s table-v-center mt-s mx-s">
+			<thead>
 			<tr>
-				<th><?php print(localize("about.financing.part.service")); ?></th>
+				<th><?php print(localize("about.financing.part.equipment")); ?></th>
-				<th><?php print(localize("about.financing.part.cost.yearly")); ?></th>
+				<th><?php print(localize("about.financing.part.cost")); ?></th>
 			</tr>
-		</thead>
+			</thead>
-		<tbody>
+			<tbody>
 			<tr>
-				<td><?php print(localize("about.financing.part.domain.lu")); ?></td>
+				<td>
-				<td><?php print(number_format(17,2, $lang_number_decimal, $lang_number_thousands)); ?> €</td>
+					<?php print(localize("about.financing.part.nanopir4s")); ?>
+				</td>
+				<td>&pm;<?php print(number_format(80,2, $lang_number_decimal, $lang_number_thousands)); ?> €</td>
 			</tr>
 			<tr>
-				<td><?php print(localize("about.financing.part.domain.com")); ?></td>
+				<td><?php print(localize("about.financing.part.storage")); ?></td>
-				<td><?php print(number_format(14.5,2, $lang_number_decimal, $lang_number_thousands)); ?> €</td>
+				<td>&pm;<?php print(number_format(10,2, $lang_number_decimal, $lang_number_thousands)); ?> €</td>
 			</tr>
 			<tr>
-				<td><?php print(localize("about.financing.part.proxy.europe")); ?></td>
+				<td><b class="f-right"><?php print(localize("about.financing.part.cost.total")); ?>:</b></td>
-				<td><?php print(number_format(14.5,2, $lang_number_decimal, $lang_number_thousands)); ?> €</td>
+				<td>&pm;<?php print(number_format(90, 2, $lang_number_decimal, $lang_number_thousands)); ?> €
-			</tr>
-			<tr>
-				<td><?php print(localize("about.financing.part.emails")); ?></td>
-				<td><?php print(number_format(14.4,2, $lang_number_decimal, $lang_number_thousands)); ?> €</td>
-			</tr>
-			<tr>
-				<td><?php print(localize("about.financing.part.electricity")); ?></td>
-				<td>&pm;<?php print(number_format(30,2, $lang_number_decimal, $lang_number_thousands)); ?> €</td>
-			</tr>
-			<tr>
-				<td><b class="f-right"><?php print(localize("about.financing.part.cost.yearly.total")); ?>:</b></td>
-				<td>&pm;<?php print(number_format(
-					16.93 + 14.5 + 14.52 + 14.4 + 30,
-					2, $lang_number_decimal, $lang_number_thousands)
-					); ?> €
 				</td>
 			</tr>
-		</tbody>
+			</tbody>
-	</table>
+		</table>
-	<p class="mt-xxs ml-s t-super-muted">
+	</div>
+	<p class="mt-xs ml-s t-super-muted t-center">
 		<?php print(localize("about.financing.text.isp")); ?>
 	</p>
-	<table class="stylish r-s border o-hidden table-p-xs table-h-p-s table-v-center mt-xxs mx-s mb-xs">
-		<thead>
-		<tr>
-			<th><?php print(localize("about.financing.part.equipment")); ?></th>
-			<th><?php print(localize("about.financing.part.cost")); ?></th>
-		</tr>
-		</thead>
-		<tbody>
-		<tr>
-			<td><?php print(localize("about.financing.part.nanopir4s")); ?></td>
-			<td>&pm;<?php print(number_format(80,2, $lang_number_decimal, $lang_number_thousands)); ?> €</td>
-		</tr>
-		<tr>
-			<td><?php print(localize("about.financing.part.storage")); ?></td>
-			<td>&pm;<?php print(number_format(10,2, $lang_number_decimal, $lang_number_thousands)); ?> €</td>
-		</tr>
-		<tr>
-			<td><b class="f-right"><?php print(localize("about.financing.part.cost.total")); ?>:</b></td>
-			<td>&pm;<?php print(number_format(90, 2, $lang_number_decimal, $lang_number_thousands)); ?> €
-			</td>
-		</tr>
-		</tbody>
-	</table>
 </main>
 <?php
 include 'commons/DOM/footer.php';

commons/strings/en/about.json

@@ -66,6 +66,7 @@
 	"about.financing.part.emails": "Emails",
 	"about.financing.part.electricity": "Electricity",
 	"about.financing.part.nanopir4s": "NanoPi R4S",
+	"about.financing.part.nanopir4s.desc": "Handles all non public-facing tasks and services.",
 	"about.financing.part.storage": "Local storage",
 	
 	

commons/strings/fr/about.json

@@ -66,6 +66,7 @@
 	"about.financing.part.emails": "Adresses email",
 	"about.financing.part.electricity": "Électricité",
 	"about.financing.part.nanopir4s": "NanoPi R4S",
+	"about.financing.part.nanopir4s.desc": "Gère tous les services et programmes internes.",
 	"about.financing.part.storage": "Stockage local",
 	
 	

compile.bat

@@ -161,39 +161,6 @@ popd
 :formula-wizard-end
 
 
-:php
-echo.
-echo Handling the PHP files
-echo -----------------------
-
-:php-minify
-echo Minifying PHP files...
-pushd %CD%
-:: We minify the .php files to help with some weird spacing issues that cannot be fixed with CSS.
-:: This issue is usually handled by the reverse-proxy or a middleware, but since I need to export SPA(s), I can't rely on it
-for /r "%CD%" %%F in (*.php) do (
-    set inputPath=%%F
-    set outputPath=%%~dpnF.min.php
-
-    echo ^> "!inputPath!" =^> "!outputPath!"
-    call "%~dp0node_modules\.bin\html-minifier-terser" --conservative-collapse --collapse-inline-tag-whitespace ^
---collapse-whitespace --remove-comments --decode-entities --continue-on-parse-error -o "!outputPath!" "!inputPath!"
-)
-popd
-
-:php-relink
-echo Linking minified PHP files together...
-pushd %CD%
-:: We change every .php extension to .min.php in all the minified file.
-:: I didn't use Python because it fails miserably with utf-8 symbols...
-for /r "%CD%" %%F in (*.min.php) do (
-    node "%~dp0php-relinker.js" "%%F"
-)
-popd
-
-:php-end
-
-
 :compile-typescript
 echo Compiling TypeScript for ".js" files...
 call .\node_modules\.bin\tsc

compress.bat

@@ -6,23 +6,22 @@ cd /D "%~dp0"
 
 
 :compile
-::call "%~dp0compile.bat"
+call "%~dp0compile.bat"
 :compile-end
 
-:: Source: https://stackoverflow.com/q/1192476
-set NP_ZIP_NAME=build_%date:~-4%-%date:~3,2%-%date:~0,2%_%time:~0,2%-%time:~3,2%-%time:~6,2%
-::echo %NP_ZIP_NAME%
-::goto end
-
-:: TMP
-del /Q /S /F tmp01.7z 2> nul 1> nul
 
 :archive
 echo.
 echo Handling the 'Formula Wizard'
 echo -----------------------------
 
-:archive-env
+:archive-env-name
+echo Preparing name variable...
+set NP_ZIP_NAME=build_%date:~-4%-%date:~3,2%-%date:~0,2%.7z
+del /Q /S /F %NP_ZIP_NAME% 2> nul 1> nul
+echo ^> %NP_ZIP_NAME%
+
+:archive-env-content
 echo Preparing environment variable...
 set NP_ZIP_CONTENT=
 set NP_ZIP_CONTENT=%NP_ZIP_CONTENT% "about/"
@@ -53,11 +52,12 @@ set NP_ZIP_CONTENT=%NP_ZIP_CONTENT% "resources/NibblePoker/sounds/"
 set NP_ZIP_CONTENT=%NP_ZIP_CONTENT% "resources/Quantum/"
 set NP_ZIP_CONTENT=%NP_ZIP_CONTENT% "resources/SplideJs/dist/"
 set NP_ZIP_CONTENT=%NP_ZIP_CONTENT% "./.htaccess" "./*.php" "./favicon.*"
-echo ^>%NP_ZIP_CONTENT%
+::echo ^>%NP_ZIP_CONTENT%
 
 :archive-7z
 echo Making '.7z' archive...
-7z a -mx9 "./%NP_ZIP_NAME%.7z" %NP_ZIP_CONTENT%
+7z a -mx9 "./%NP_ZIP_NAME%" %NP_ZIP_CONTENT% 1> nul
+echo ^> Done !
 
 :archive-end
 

minify-php.bat

@@ -0,0 +1,46 @@
+@echo off
+setlocal enabledelayedexpansion
+
+:: Going into the script's directory
+cd /D "%~dp0"
+
+
+:clean
+call "%~dp0clean.bat"
+:clean-end
+
+
+:php
+echo.
+echo Handling the PHP files
+echo -----------------------
+
+:php-minify
+echo Minifying PHP files...
+pushd %CD%
+:: We minify the .php files to help with some weird spacing issues that cannot be fixed with CSS.
+:: This issue is usually handled by the reverse-proxy or a middleware, but since I need to export SPA(s), I can't rely on it
+for /r "%CD%" %%F in (*.php) do (
+    set inputPath=%%F
+    set outputPath=%%~dpnF.min.php
+
+    echo ^> "!inputPath!" =^> "!outputPath!"
+    call "%~dp0node_modules\.bin\html-minifier-terser" --conservative-collapse --collapse-inline-tag-whitespace ^
+--collapse-whitespace --remove-comments --decode-entities --continue-on-parse-error -o "!outputPath!" "!inputPath!"
+)
+popd
+
+:php-relink
+echo Linking minified PHP files together...
+pushd %CD%
+:: We change every .php extension to .min.php in all the minified file.
+:: I didn't use Python because it fails miserably with utf-8 symbols...
+for /r "%CD%" %%F in (*.min.php) do (
+    node "%~dp0php-relinker.js" "%%F"
+)
+popd
+
+:php-end
+
+
+:end