New Release v0.6.0

.gitignore

@@ -1,2 +1,3 @@
-/vendor/
 /node_modules/
+/public/
+/vendor/

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 2021-09-09 - Release 0.6.0
+
+### Summary
+
+This release removes Google Font and add install, build and clean scripts.
+
 ## 2021-09-06 - Release 0.5.1
 
 ### Summary

README.md

@@ -3,13 +3,20 @@
 #### Table of Contents
 
 1. [Overview](#overview)
-2. [Copyright and License](#copyright-and-license)
-3. [Contributors](#contributors)
+2. [Setup](#setup)
+3. [Copyright and License](#copyright-and-license)
+4. [Contributors](#contributors)
 
 ## Overview
 
 The Solution Libre's website is based on [Start Bootstrap](http://startbootstrap.com/) - [Freelancer](http://startbootstrap.com/template-overviews/freelancer/).
 
+## Setup
+
+```sh
+./bin/build
+```
+
 ## Copyright and License
 
 ### [Start Bootstrap](http://startbootstrap.com/) - [Freelancer](http://startbootstrap.com/template-overviews/freelancer/)

bin/build

@@ -0,0 +1,44 @@
+#!/usr/bin/env sh
+
+cd "$(dirname "$0")/.." || exit 1
+
+compile_font() {
+  font_name=$1
+  font_styles=$2
+  css_filename="public/css/font/${font_name}.css"
+
+  css_files=''
+  for font_style in ${font_styles}; do
+    css_files="${css_files} ${font_style}.css"
+    filename="${font_name}-all-${font_style}"
+    $(echo "${font_style}" | grep - > /dev/null) || filename="${filename}-normal"
+    filename="${filename}.woff"
+    cp "node_modules/@fontsource/${font_name}/files/${filename}" public/css/font/files
+  done
+  {
+    cd "node_modules/@fontsource/${font_name}/"
+    cat ${css_files}
+    cd -
+  } > "${css_filename}"
+
+  for fontFile in $(cat "${css_filename}" | grep url | awk -F "'" '{print $2}'); do
+    cp "node_modules/@fontsource/${font_name}/${fontFile}" public/css/font/files
+  done
+}
+
+if [ ! -d './vendor' -o ! -d './node_modules' ]; then
+  ./bin/install
+fi
+
+./bin/clean
+
+cp -r src public
+gzip -c public/sitemap.xml > public/sitemap.xml.gz
+cp -pr ./node_modules/startbootstrap-freelancer/ public/
+
+mkdir -p public/css/font/files
+
+compile_font 'montserrat' '100 400 600'
+
+compile_font 'lato' '300 400 700 300-italic 400-italic 700-italic'
+

bin/clean

@@ -0,0 +1,5 @@
+#!/usr/bin/env sh
+
+cd "$(dirname "$0")/.." || exit 1
+
+rm -rf ./public

bin/install

@@ -0,0 +1,17 @@
+#!/usr/bin/env sh
+
+cd "$(dirname "$0")/.." || exit 1
+
+
+if $(command -v docker-compose > /dev/null); then
+  composer_cmd="./bin/composer"
+  npm_cmd="./bin/npm"
+elif $(command -v composer > /dev/null && command -v npm > /dev/null); then
+  composer_cmd='composer'
+  npm_cmd='npm'
+else
+  echo 'docker-compose is require'
+fi
+
+${composer_cmd} install
+${npm_cmd} i

composer.json

@@ -1,5 +1,6 @@
 {
     "name": "solution-libre/website",
+    "version": "0.6.0",
     "description": "Solution Libre's website",
     "type": "project",
     "require": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "website",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "description": "Solution Libre's website",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -15,8 +15,10 @@
     "url": "https://github.com/solution-libre/website/issues"
   },
   "homepage": "https://github.com/solution-libre/website#readme",
-  "dependencies": {},
-  "devDependencies": {
+  "dependencies": {
+    "@fontsource/lato": "^4.5.0",
+    "@fontsource/montserrat": "^4.5.1",
     "startbootstrap-freelancer": "^4.1.1"
-  }
+  },
+  "devDependencies": {}
 }

public/index.html → src/index.html

@@ -16,14 +16,23 @@
 
     <!-- Custom fonts for this template -->
     <link href="startbootstrap-freelancer/vendor/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css">
-    <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
-    <link href="https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic" rel="stylesheet" type="text/css">
+    <link href="css/font/montserrat.css" rel="stylesheet" type="text/css">
+    <link href="css/font/lato.css" rel="stylesheet" type="text/css">
 
     <!-- Plugin CSS -->
     <link href="startbootstrap-freelancer/vendor/magnific-popup/magnific-popup.css" rel="stylesheet" type="text/css">
 
     <!-- Custom styles for this template -->
     <link href="startbootstrap-freelancer/css/freelancer.min.css" rel="stylesheet">
+
+    <style>
+      .font-weight-light {
+          font-weight: 400 !important;
+      }
+      .lead {
+          font-weight: 400 !important;
+      }
+    </style>
   </head>
   <body id="page-top">
     <!-- Navigation -->
@@ -183,7 +192,7 @@ <h2 class="text-center text-uppercase text-secondary mb-0">Contactez-Nous</h2>
           <div class="col-md-4 mb-5 mb-lg-0">
             <p>Ce <a href="https://github.com/solution-libre/website">site web libre</a> est basé sur un thème Boostrap créé par <a href="http://startbootstrap.com/" target="_blank">Start Bootstrap</a>.
               <br />S'il vous plaît, <a href="https://github.com/solution-libre/website/fork">forkez-le !</a></p>
-            <p><a href="http://semver.org/lang/fr/" target="_blank" title="Semantic Versioning">v </a>: 0.5.1</p>
+            <p><a href="http://semver.org/lang/fr/" target="_blank" title="Semantic Versioning">v </a>: 0.6.0</p>
             <p><a class="portfolio-item d-block mx-auto" href="#legal-notice-modal">Mentions légales</a></p>
           </div>
           <div class="col-md-4 mb-5 mb-lg-0">