Moved source Apache html to /apache/ folder for better organisation. …

…Updated all the minify scripts.
justinhartman · May 15, 2018 · 67d0017 · 67d0017
1 parent 666d114
commit 67d0017
Show file tree

Hide file tree

Showing 63 changed files with 379 additions and 71 deletions.
diff --git a/src/400.html → src/apache/400.html b/src/400.html → src/apache/400.html
diff --git a/src/401.html → src/apache/401.html b/src/401.html → src/apache/401.html
diff --git a/src/403.html → src/apache/403.html b/src/403.html → src/apache/403.html
diff --git a/src/404.html → src/apache/404.html b/src/404.html → src/apache/404.html
diff --git a/src/405.html → src/apache/405.html b/src/405.html → src/apache/405.html
diff --git a/src/406.html → src/apache/406.html b/src/406.html → src/apache/406.html
diff --git a/src/407.html → src/apache/407.html b/src/407.html → src/apache/407.html
diff --git a/src/408.html → src/apache/408.html b/src/408.html → src/apache/408.html
diff --git a/src/409.html → src/apache/409.html b/src/409.html → src/apache/409.html
diff --git a/src/410.html → src/apache/410.html b/src/410.html → src/apache/410.html
diff --git a/src/411.html → src/apache/411.html b/src/411.html → src/apache/411.html
diff --git a/src/412.html → src/apache/412.html b/src/412.html → src/apache/412.html
diff --git a/src/413.html → src/apache/413.html b/src/413.html → src/apache/413.html
diff --git a/src/414.html → src/apache/414.html b/src/414.html → src/apache/414.html
diff --git a/src/415.html → src/apache/415.html b/src/415.html → src/apache/415.html
diff --git a/src/416.html → src/apache/416.html b/src/416.html → src/apache/416.html
diff --git a/src/417.html → src/apache/417.html b/src/417.html → src/apache/417.html
diff --git a/src/418.html → src/apache/418.html b/src/418.html → src/apache/418.html
diff --git a/src/421.html → src/apache/421.html b/src/421.html → src/apache/421.html
diff --git a/src/422.html → src/apache/422.html b/src/422.html → src/apache/422.html
diff --git a/src/423.html → src/apache/423.html b/src/423.html → src/apache/423.html
diff --git a/src/424.html → src/apache/424.html b/src/424.html → src/apache/424.html
diff --git a/src/426.html → src/apache/426.html b/src/426.html → src/apache/426.html
diff --git a/src/428.html → src/apache/428.html b/src/428.html → src/apache/428.html
diff --git a/src/429.html → src/apache/429.html b/src/429.html → src/apache/429.html
diff --git a/src/431.html → src/apache/431.html b/src/431.html → src/apache/431.html
diff --git a/src/451.html → src/apache/451.html b/src/451.html → src/apache/451.html
diff --git a/src/500.html → src/apache/500.html b/src/500.html → src/apache/500.html
diff --git a/src/501.html → src/apache/501.html b/src/501.html → src/apache/501.html
diff --git a/src/502.html → src/apache/502.html b/src/502.html → src/apache/502.html
diff --git a/src/503.html → src/apache/503.html b/src/503.html → src/apache/503.html
diff --git a/src/504.html → src/apache/504.html b/src/504.html → src/apache/504.html
diff --git a/src/505.html → src/apache/505.html b/src/505.html → src/apache/505.html
diff --git a/src/506.html → src/apache/506.html b/src/506.html → src/apache/506.html
diff --git a/src/507.html → src/apache/507.html b/src/507.html → src/apache/507.html
diff --git a/src/508.html → src/apache/508.html b/src/508.html → src/apache/508.html
diff --git a/src/510.html → src/apache/510.html b/src/510.html → src/apache/510.html
diff --git a/src/511.html → src/apache/511.html b/src/511.html → src/apache/511.html
diff --git a/src/scripts/minify b/src/scripts/minify
@@ -1,23 +1,101 @@
 #!/bin/bash
-rm -rf ../dist/apache/css
-rm -f ../dist/apache/*.html
-mkdir ../dist/apache/css
-echo "The ../dist/apache folder has been reset."
+#
+# Minify all the source HTML, JavaScript and CSS and save to /dist/ folder.
+# 
+# Copyright: Copyright (C) 2018 Justin Hartman (https://justin.hartman.me)
+# Author   : Justin Hartman <justin@hartman.me> (https://justin.hartman.me)
+# License  : https://opensource.org/licenses/AGPL-3.0 AGPL-3.0
+# Version  : 2.0.1
+# Link     : https://github.com/justinhartman/Apache-Error-Pages
+# Link     : https://justin.hartman.me
+# Since    : 1.0.0
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
+# 
 
-# Run html-minifier to compress HTML and JavaScript.
-for VARIABLE in 400 401 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 421 422 423 424 426 428 429 431 451 500 501 502 503 504 505 506 507 508 510 511
-do
-    HTML_FILE_NAME="$VARIABLE.html"
-    html-minifier --collapse-whitespace --remove-comments --remove-optional-tags --remove-redundant-attributes --remove-script-type-attributes --remove-tag-whitespace --use-short-doctype --minify-css true --minify-js true ../src/$HTML_FILE_NAME -o ../dist/apache/$HTML_FILE_NAME
-    echo "$HTML_FILE_NAME minified"
-done
+#######################################
+# Clears out the distribution folder
+# and re-creates the CSS folder.
+# Globals:
+#   None
+# Arguments:
+#   None
+# Returns:
+#   String
+#######################################
+reset_dist ()
+{
+    rm -rf ../dist/apache/*
+    mkdir ../dist/apache/css
+    echo "The ../dist/apache folder has been reset."
+}
 
-# Run postcss to compress all the CSS files.
-postcss ../src/css/ --dir ../dist/apache/css/
-echo "All the CSS files have now been minified."
+#######################################
+# Run html-minifier to compress HTML 
+# and JavaScript.
+# Globals:
+#   None
+# Arguments:
+#   None
+# Returns:
+#   String
+#######################################
+minfy_html ()
+{
+    for VARIABLE in 400 401 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 421 422 423 424 426 428 429 431 451 500 501 502 503 504 505 506 507 508 510 511
+    do
+        HTML_FILE_NAME="$VARIABLE.html"
+        html-minifier --collapse-whitespace --remove-comments --remove-optional-tags --remove-redundant-attributes --remove-script-type-attributes --remove-tag-whitespace --use-short-doctype --minify-css true --minify-js true ../src/apache/$HTML_FILE_NAME -o ../dist/apache/$HTML_FILE_NAME
+        echo "$HTML_FILE_NAME minified"
+    done
+}
 
-# JS_FILE_NAME="<your file name"
-# uglifyjs --compress --mangle -o ../dist/apache/$JS_FILE_NAME -- $JS_FILE_NAME
-# echo "$JS_FILE_NAME minified"
+#######################################
+# Run postcss to compress all the 
+# CSS files.
+# Globals:
+#   None
+# Arguments:
+#   None
+# Returns:
+#   String
+#######################################
+minify_css ()
+{
+    postcss ../src/css/ --dir ../dist/apache/css/
+    echo "All the CSS files have now been minified."
+}
 
+#######################################
+# Copy all the static items that 
+# aren't compressed.
+# Globals:
+#   None
+# Arguments:
+#   None
+# Returns:
+#   String
+#######################################
+copy_assets ()
+{
+    echo "Copying the assets and fonts..."
+    cp -R ../src/static/* ../dist/apache/
+}
+
+reset_dist
+minfy_html
+minify_css
+copy_assets
 echo "Minification Complete!"
+exit 0
diff --git a/src/scripts/minify_iis b/src/scripts/minify_iis
@@ -1,24 +1,101 @@
 #!/bin/bash
-rm -Rf ../dist/ms-iis/*
-mkdir ../dist/ms-iis/css
-echo "The ../dist/ms-iis folder has been reset."
+#
+# Minify all the source HTML, JavaScript and CSS and save to /dist/ folder.
+# 
+# Copyright: Copyright (C) 2018 Justin Hartman (https://justin.hartman.me)
+# Author   : Justin Hartman <justin@hartman.me> (https://justin.hartman.me)
+# License  : https://opensource.org/licenses/AGPL-3.0 AGPL-3.0
+# Version  : 2.0.1
+# Link     : https://github.com/justinhartman/Apache-Error-Pages
+# Link     : https://justin.hartman.me
+# Since    : 1.0.0
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
+# 
 
-# Run html-minifier to compress HTML and JavaScript.
-for VARIABLE in 440 449 451
-do
-    HTML_FILE_NAME="$VARIABLE.html"
-    html-minifier --collapse-whitespace --remove-comments --remove-optional-tags --remove-redundant-attributes --remove-script-type-attributes --remove-tag-whitespace --use-short-doctype --minify-css true --minify-js true ../src/ms-iis/$HTML_FILE_NAME -o ../dist/ms-iis/$HTML_FILE_NAME
-    echo "$HTML_FILE_NAME minified"
-done
+#######################################
+# Clears out the distribution folder
+# and re-creates the CSS folder.
+# Globals:
+#   None
+# Arguments:
+#   None
+# Returns:
+#   String
+#######################################
+reset_dist ()
+{
+    rm -Rf ../dist/ms-iis/*
+    mkdir ../dist/ms-iis/css
+    echo "The ../dist/ms-iis folder has been reset."
+}
 
-# Run postcss to compress all the CSS files.
-postcss ../src/css/ --dir ../dist/ms-iis/css/
-echo "All the CSS files have now been minified."
+#######################################
+# Run html-minifier to compress HTML 
+# and JavaScript.
+# Globals:
+#   None
+# Arguments:
+#   None
+# Returns:
+#   String
+#######################################
+minfy_html ()
+{
+    for VARIABLE in 440 449 451
+    do
+        HTML_FILE_NAME="$VARIABLE.html"
+        html-minifier --collapse-whitespace --remove-comments --remove-optional-tags --remove-redundant-attributes --remove-script-type-attributes --remove-tag-whitespace --use-short-doctype --minify-css true --minify-js true ../src/ms-iis/$HTML_FILE_NAME -o ../dist/ms-iis/$HTML_FILE_NAME
+        echo "$HTML_FILE_NAME minified"
+    done
+}
 
-# Create Symbolic links to the static items that aren't compressed.
-echo "Copying the /assets/ folder across..."
-cp -R ../dist/apache/assets ../dist/ms-iis/
-echo "Copying the /webfonts/ folder across..."
-cp -R ../dist/apache/webfonts ../dist/ms-iis/
+#######################################
+# Run postcss to compress all the 
+# CSS files.
+# Globals:
+#   None
+# Arguments:
+#   None
+# Returns:
+#   String
+#######################################
+minify_css ()
+{
+    postcss ../src/css/ --dir ../dist/ms-iis/css/
+    echo "All the CSS files have now been minified."
+}
 
+#######################################
+# Copy all the static items that 
+# aren't compressed.
+# Globals:
+#   None
+# Arguments:
+#   None
+# Returns:
+#   String
+#######################################
+copy_assets ()
+{
+    echo "Copying the assets and fonts..."
+    cp -R ../src/static/* ../dist/ms-iis/
+}
+
+reset_dist
+minfy_html
+minify_css
+copy_assets
 echo "Minification Complete!"
+exit 0
diff --git a/src/scripts/minify_nginx b/src/scripts/minify_nginx
@@ -1,24 +1,101 @@
 #!/bin/bash
-rm -Rf ../dist/nginx/*
-mkdir ../dist/nginx/css
-echo "The ../dist/nginx folder has been reset."
+#
+# Minify all the source HTML, JavaScript and CSS and save to /dist/ folder.
+# 
+# Copyright: Copyright (C) 2018 Justin Hartman (https://justin.hartman.me)
+# Author   : Justin Hartman <justin@hartman.me> (https://justin.hartman.me)
+# License  : https://opensource.org/licenses/AGPL-3.0 AGPL-3.0
+# Version  : 2.0.1
+# Link     : https://github.com/justinhartman/Apache-Error-Pages
+# Link     : https://justin.hartman.me
+# Since    : 1.0.0
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
+# 
 
-# Run html-minifier to compress HTML and JavaScript.
-for VARIABLE in 444 494 495 496 497 499
-do
-    HTML_FILE_NAME="$VARIABLE.html"
-    html-minifier --collapse-whitespace --remove-comments --remove-optional-tags --remove-redundant-attributes --remove-script-type-attributes --remove-tag-whitespace --use-short-doctype --minify-css true --minify-js true ../src/nginx/$HTML_FILE_NAME -o ../dist/nginx/$HTML_FILE_NAME
-    echo "$HTML_FILE_NAME minified"
-done
+#######################################
+# Clears out the distribution folder
+# and re-creates the CSS folder.
+# Globals:
+#   None
+# Arguments:
+#   None
+# Returns:
+#   String
+#######################################
+reset_dist ()
+{
+    rm -Rf ../dist/nginx/*
+    mkdir ../dist/nginx/css
+    echo "The ../dist/nginx folder has been reset."
+}
 
-# Run postcss to compress all the CSS files.
-postcss ../src/css/ --dir ../dist/nginx/css/
-echo "All the CSS files have now been minified."
+#######################################
+# Run html-minifier to compress HTML 
+# and JavaScript.
+# Globals:
+#   None
+# Arguments:
+#   None
+# Returns:
+#   String
+#######################################
+minfy_html ()
+{
+    for VARIABLE in 444 494 495 496 497 499
+    do
+        HTML_FILE_NAME="$VARIABLE.html"
+        html-minifier --collapse-whitespace --remove-comments --remove-optional-tags --remove-redundant-attributes --remove-script-type-attributes --remove-tag-whitespace --use-short-doctype --minify-css true --minify-js true ../src/nginx/$HTML_FILE_NAME -o ../dist/nginx/$HTML_FILE_NAME
+        echo "$HTML_FILE_NAME minified"
+    done
+}
 
-# Create Symbolic links to the static items that aren't compressed.
-echo "Copying the /assets/ folder across..."
-cp -R ../dist/apache/assets ../dist/nginx/
-echo "Copying the /webfonts/ folder across..."
-cp -R ../dist/apache/webfonts ../dist/nginx/
+#######################################
+# Run postcss to compress all the 
+# CSS files.
+# Globals:
+#   None
+# Arguments:
+#   None
+# Returns:
+#   String
+#######################################
+minify_css ()
+{
+    postcss ../src/css/ --dir ../dist/nginx/css/
+    echo "All the CSS files have now been minified."
+}
 
+#######################################
+# Copy all the static items that 
+# aren't compressed.
+# Globals:
+#   None
+# Arguments:
+#   None
+# Returns:
+#   String
+#######################################
+copy_assets ()
+{
+    echo "Copying the assets and fonts..."
+    cp -R ../src/static/* ../dist/nginx/
+}
+
+reset_dist
+minfy_html
+minify_css
+copy_assets
 echo "Minification Complete!"
+exit 0