Merge branch 'Update_versioning' into 'dev'

Update versioning

See merge request TheGamecraft/c-cms!101

composer.json

@@ -18,7 +18,8 @@
         "laravel/tinker": "^2.0",
         "laravel/ui": "^2.0",
         "nao-pon/flysystem-google-drive": "^1.1",
-        "nexmo/client": "^2.0"
+        "nexmo/client": "^2.0",
+        "pragmarx/version": "^1.2"
     },
     "require-dev": {
         "filp/whoops": "^2.0",
@@ -59,7 +60,8 @@
         ],
         "post-autoload-dump": [
             "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
-            "@php artisan package:discover"
+            "@php artisan package:discover",
+            "@php artisan version"
         ]
     },
     "config": {

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "29254ceb20a3b7daddcee4de8920dd91",
+    "content-hash": "7c071faf4bcbceff2849f97052c64f69",
     "packages": [
         {
             "name": "barryvdh/laravel-dompdf",
@@ -3762,6 +3762,130 @@
             ],
             "time": "2020-04-04T23:17:33+00:00"
         },
+        {
+            "name": "pragmarx/version",
+            "version": "v1.2.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/antonioribeiro/version.git",
+                "reference": "a3774a1820ecc987856dca993e7720c6b78dce85"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/antonioribeiro/version/zipball/a3774a1820ecc987856dca993e7720c6b78dce85",
+                "reference": "a3774a1820ecc987856dca993e7720c6b78dce85",
+                "shasum": ""
+            },
+            "require": {
+                "laravel/framework": ">=5.5.33",
+                "php": "^7.0",
+                "pragmarx/yaml": "^1.0",
+                "symfony/process": "^3.3|^4.0|^5.0"
+            },
+            "require-dev": {
+                "orchestra/testbench": "3.4.*|3.5.*|3.6.*|3.7.*|4.*|5.*",
+                "phpunit/phpunit": "~5|~6|~7|~8|~9"
+            },
+            "type": "library",
+            "extra": {
+                "component": "package",
+                "laravel": {
+                    "providers": [
+                        "PragmaRX\\Version\\Package\\ServiceProvider"
+                    ],
+                    "aliases": {
+                        "Version": "PragmaRX\\Version\\Package\\Facade"
+                    }
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "PragmaRX\\Version\\Package\\": "src/package",
+                    "PragmaRX\\Version\\Tests\\": "tests/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Antonio Carlos Ribeiro",
+                    "email": "acr@antoniocarlosribeiro.com",
+                    "role": "Creator & Designer"
+                }
+            ],
+            "description": "Take control over your Laravel app version",
+            "keywords": [
+                "laravel",
+                "version",
+                "versioning"
+            ],
+            "time": "2020-05-07T18:46:01+00:00"
+        },
+        {
+            "name": "pragmarx/yaml",
+            "version": "v1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/antonioribeiro/yaml.git",
+                "reference": "9f2b44c4a31f8a71bab77169205aee7184ae3ef4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/antonioribeiro/yaml/zipball/9f2b44c4a31f8a71bab77169205aee7184ae3ef4",
+                "reference": "9f2b44c4a31f8a71bab77169205aee7184ae3ef4",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/support": ">=5.5.33",
+                "php": ">=7.0",
+                "symfony/yaml": "^3.4|^4.0|^5.0"
+            },
+            "require-dev": {
+                "orchestra/testbench": "3.5|^3.6|^4.0|^5.0",
+                "phpunit/phpunit": "^4.0|^6.4|^7.0|^8.0|^9.0"
+            },
+            "suggest": {
+                "ext-yaml": "Required to use the PECL YAML."
+            },
+            "type": "library",
+            "extra": {
+                "component": "package",
+                "laravel": {
+                    "providers": [
+                        "PragmaRX\\Yaml\\Package\\ServiceProvider"
+                    ],
+                    "aliases": {
+                        "Yaml": "PragmaRX\\Yaml\\Package\\Facade"
+                    }
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "PragmaRX\\Yaml\\Package\\": "src/package",
+                    "PragmaRX\\Yaml\\Tests\\": "tests/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Antonio Carlos Ribeiro",
+                    "email": "acr@antoniocarlosribeiro.com",
+                    "role": "Creator & Designer"
+                }
+            ],
+            "description": "Load your Laravel config files using yaml",
+            "keywords": [
+                "config",
+                "laravel",
+                "yaml"
+            ],
+            "time": "2020-05-21T19:46:28+00:00"
+        },
         {
             "name": "psr/cache",
             "version": "1.0.1",
@@ -6763,6 +6887,83 @@
             ],
             "time": "2020-05-30T20:35:19+00:00"
         },
+        {
+            "name": "symfony/yaml",
+            "version": "v5.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/yaml.git",
+                "reference": "ea342353a3ef4f453809acc4ebc55382231d4d23"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/ea342353a3ef4f453809acc4ebc55382231d4d23",
+                "reference": "ea342353a3ef4f453809acc4ebc55382231d4d23",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "symfony/deprecation-contracts": "^2.1",
+                "symfony/polyfill-ctype": "~1.8"
+            },
+            "conflict": {
+                "symfony/console": "<4.4"
+            },
+            "require-dev": {
+                "symfony/console": "^4.4|^5.0"
+            },
+            "suggest": {
+                "symfony/console": "For validating YAML files using the lint command"
+            },
+            "bin": [
+                "Resources/bin/yaml-lint"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Yaml\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Yaml Component",
+            "homepage": "https://symfony.com",
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-05-20T17:43:50+00:00"
+        },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
             "version": "2.2.2",

config/app.php

@@ -63,7 +63,7 @@ return [
     |
     */
 
-    'version' => "3.0.2b",
+    'version' => "3.2.5.",
 
     /*
     |--------------------------------------------------------------------------

config/version.yml

@@ -0,0 +1,59 @@
+mode: absorb
+blade-directive: version
+current:
+  label: ''
+  major: 3
+  minor: 2
+  patch: 5
+  prerelease: 1-gb79c54fd
+  buildmetadata: ''
+  commit: 41845
+  timestamp:
+    year: 2020
+    month: 6
+    day: 21
+    hour: 18
+    minute: 44
+    second: 55
+    timezone: America/New_York
+commit:
+  mode: git-local
+  length: 6
+  increment-by: 1
+git:
+  from: local
+  commit:
+    local: 'git rev-parse --verify HEAD'
+    remote: 'git ls-remote {$repository}'
+  branch: refs/heads/master
+  repository: ''
+  version:
+    local: 'git describe'
+    remote: 'git ls-remote {$repository} | grep tags/ | grep -v {} | cut -d / -f 3 | sort --version-sort | tail -1'
+    matcher: '/^(?P<label>[v|V]*[er]*[sion]*)[\.|\s]*(?P<major>0|[1-9]\d*)\.(?P<minor>0|[1-9]\d*)\.(?P<patch>0|[1-9]\d*)(?:-(?P<prerelease>(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?P<buildmetadata>[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/'
+  timestamp:
+    local: 'git show -s --format=%ci'
+    remote: 'git show -s --format=%ci origin/master'
+format:
+  regex:
+    optional_bracket: '\[(?P<prefix>.*?)(?P<spaces>\s*)(?P<delimiter>\?\=)(?P<optional>.*?)\]'
+  label: '{$label}'
+  major: '{$major}'
+  minor: '{$minor}'
+  patch: '{$patch}'
+  prerelease: '{$prerelease}'
+  buildmetadata: '{$buildmetadata}'
+  commit: '{$commit}'
+  version: 'v {$major}.{$minor}.{$patch} (commit {$commit})'
+  version-only: 'version {$major}.{$minor}.{$patch}'
+  full: '{$version-only}[.?={$prerelease}][+?={$buildmetadata}] (commit {$commit})'
+  compact: 'v{$major}.{$minor}.{$patch}-{$commit}'
+  timestamp-year: '{$timestamp.year}'
+  timestamp-month: '{$timestamp.month}'
+  timestamp-day: '{$timestamp.day}'
+  timestamp-hour: '{$timestamp.hour}'
+  timestamp-minute: '{$timestamp.minute}'
+  timestamp-second: '{$timestamp.second}'
+  timestamp-timezone: '{$timestamp.timezone}'
+  timestamp-datetime: '{$timestamp.year}-{$timestamp.month}-{$timestamp.day} {$timestamp.hour}:{$timestamp.minute}:{$timestamp.second}'
+  timestamp-full: '{$timestamp.year}-{$timestamp.month}-{$timestamp.day} {$timestamp.hour}:{$timestamp.minute}:{$timestamp.second} {$timestamp.timezone}'

resources/views/layouts/admin/footer.blade.php

@@ -1,9 +1,10 @@
 <footer class="footer">
-    <div class="container-fluid">
+  <div class="row w-100">
+    <div class="col-4">
       <nav class="float-left">
         <ul>
           <li>
-            <a href="https://gitlab.com/TheGamecraft/c-cms/wikis/home">
+            <a href="https://docs.exvps.ca/">
               Documentation
             </a>
           </li>
@@ -14,6 +15,12 @@
           </li>
         </ul>
       </nav>
+    </div>
+    <div class="col-4 m-auto">
+      <small class="text-gray">C-CMS @version('compact')</small>
+    </div>
+    <div class="col-4">
+      <div class="container-fluid">
         <div class="copyright float-right">
           &copy;
           <script>
@@ -22,4 +29,6 @@
           <a href="https://gitlab.com/c-cms" target="_blank">L'équipe de C-CMS</a>
         </div>
       </div>
+    </div>
+  </div>
   </footer>

resources/views/layouts/public/footer.blade.php

@@ -1,4 +1,6 @@
-<nav class="float-left">
+<div class="row w-100">
+    <div class="col-7">
+        <nav class="float-left">
             <ul>
                 <li>
                 @if(App\Config::getData('media_twitter'))
@@ -15,11 +17,18 @@
                     @endif
                     </li>
             </ul>
-</nav>
+        </nav>
-<div class="copyright float-right">
+    </div>
+    <div class="col-2 my-auto text-right">
+        <small class="text-gray">C-CMS @version('compact')</small>
+    </div>
+    <div class="col-3">
+        <div class="copyright float-right">
             &copy;
             <script>
                 document.write(new Date().getFullYear())
             </script>, made with <i class="material-icons">favorite</i> by
             C-CMS.
+        </div>
+    </div>
 </div>