From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Tue, 5 Oct 2021 15:48:19 +0000 (+0200)
Subject: wip #4751 @0.25
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=419fe0cbc59bb98b4ebfb65a6cfff2e76fd071b8;p=odl.git

wip #4751 @0.25
---

diff --git a/app/Jobs/ProcessFluidbook.php b/app/Jobs/ProcessFluidbook.php
index 31a15cf..b9e4e35 100644
--- a/app/Jobs/ProcessFluidbook.php
+++ b/app/Jobs/ProcessFluidbook.php
@@ -48,9 +48,7 @@ class ProcessFluidbook extends Compiler
         $spl = new \SplFileInfo($path);
         $fname = $spl->getFilename();
         if (file_exists($path)) {
-            $dir = resource_path('fluidbook/working/');
-            Files::mkdir($dir);
-            copy($path, $dir . $fname);
+            copy($path, $this->wdir . $fname);
         }
         return $fname;
     }
@@ -66,7 +64,8 @@ class ProcessFluidbook extends Compiler
                 $link['type'] = 16;
                 $link['to'] = $this->_getAssetFile($ee[0]);
                 $link['target'] = '_popupiframe';
-                $link['extras'] = 'page=' . ($ee[1] ?? 1);
+                $link['pdfpage'] = $ee[1] ?? 1;
+                $link['infobulle'] = "Consulter le document";
             } else if (stripos($e[0], 'video/') === 0) {
                 $link['type'] = 4;
                 $link['inline'] = $e[0] === 'video/inline';
diff --git a/composer.lock b/composer.lock
index d7f1a01..f57dcaa 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1218,13 +1218,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubist_cms-back.git",
-                "reference": "6eec26598ffb2fd86cbdfc53f68143fdb6f96481"
+                "reference": "648b1affc3941ee588d0e74665163b12bcd05bce"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-ca29db.tar",
-                "reference": "6eec26598ffb2fd86cbdfc53f68143fdb6f96481",
-                "shasum": "0c06b8fd31014895a863218a281c4294d994a9d7"
+                "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-da3a83.tar",
+                "reference": "648b1affc3941ee588d0e74665163b12bcd05bce",
+                "shasum": "1f324f2dfb2e6363996a254285aa722669be6adb"
             },
             "require": {
                 "backpack/backupmanager": "^3.0",
@@ -1301,7 +1301,7 @@
                 }
             ],
             "description": "Cubist Backpack extension",
-            "time": "2021-10-05T10:03:58+00:00"
+            "time": "2021-10-05T11:50:10+00:00"
         },
         {
             "name": "cubist/cms-front",
@@ -2735,13 +2735,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/fluidbook_tools.git",
-                "reference": "e5ce3b29f54c211d45ce244c435fc77364092139"
+                "reference": "84663184d9a6f6419f380c1093311a7cf78f5704"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/fluidbook/tools/fluidbook-tools-dev-master-2b8598.tar",
-                "reference": "e5ce3b29f54c211d45ce244c435fc77364092139",
-                "shasum": "61de369f6bfff0a1546a7c2b6d88b960fc1ce076"
+                "url": "https://composer.cubedesigners.com/dist/fluidbook/tools/fluidbook-tools-dev-master-653417.tar",
+                "reference": "84663184d9a6f6419f380c1093311a7cf78f5704",
+                "shasum": "2bde8aa7648605824ef9eba194ebf61d8c095659"
             },
             "require": {
                 "barryvdh/laravel-debugbar": "^3.6",
@@ -2773,7 +2773,7 @@
                 }
             ],
             "description": "Fluidbook Tools",
-            "time": "2021-10-04T17:03:56+00:00"
+            "time": "2021-10-05T13:26:54+00:00"
         },
         {
             "name": "fruitcake/laravel-cors",
diff --git a/public/images/logo-light.svg b/public/images/logo-light.svg
index 4df1d86..1f66fad 100644
--- a/public/images/logo-light.svg
+++ b/public/images/logo-light.svg
@@ -10,102 +10,4 @@
 	.st4{fill:#151E27;}
 	.st5{fill:#9EC400;}
 </style>
-<path class="st0" d="M78.5,38.4C63.3,17,28.6,16.6,5.3,0c-6.7,38.2-5.9,65.7,4.8,84.1C6.7,84.4,3.3,84.4,0,84
-	c12.8,36.6,27.7,53.1,52,49.5c24.3-3.6,35.6-0.4,35.6-0.4c0,0,0,0,0-0.1c0,0,0.1,0.1,0.1,0.1C94.2,81.2,93.8,59.9,78.5,38.4z"/>
-<g>
-	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="0.9976" y1="66.5506" x2="91.6798" y2="66.5506">
-		<stop  offset="0" style="stop-color:#B1D348"/>
-		<stop  offset="1" style="stop-color:#57772B"/>
-	</linearGradient>
-	<path class="st1" d="M87.7,133.1c6.6-51.9,6.1-73.2-9.1-94.7C63.3,17,28.6,16.6,5.3,0C-5.2,59.8,2.5,93.5,38.6,106.9
-		C74.6,120.3,87.7,133.1,87.7,133.1z"/>
-	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="13.3938" y1="87.2887" x2="87.5962" y2="87.2887">
-		<stop  offset="0" style="stop-color:#57772B"/>
-		<stop  offset="1" style="stop-color:#B1D348"/>
-	</linearGradient>
-	<path class="st2" d="M87.6,133.1c0-39.3-2.3-55.1-15.7-69.7C58.5,48.8,32.6,51.7,13.7,41.5c-2.2,45.5,6.7,69.9,34.8,76.6
-		C76.6,124.7,87.6,133.1,87.6,133.1z"/>
-	<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="0" y1="107.1941" x2="87.6325" y2="107.1941">
-		<stop  offset="0" style="stop-color:#B1D348"/>
-		<stop  offset="1" style="stop-color:#57772B"/>
-	</linearGradient>
-	<path class="st3" d="M87.6,133.1c-12.6-31-19.5-42.8-34.7-50.1C37.7,75.7,18.2,86.1,0,84c12.8,36.6,27.7,53.1,52,49.5
-		C76.3,130,87.6,133.1,87.6,133.1z"/>
-</g>
-<g>
-	<g>
-		<path class="st4" d="M172.8,45.9c0-8.5-12.5-10.8-19.9-10.8c-20.3,0-29.8,10.6-29.8,33.4c0,0,0,23.4,0,25.4c-1.8,0-16.1,0-16.1,0
-			v6.3c0,0,14.3,0,16.1,0c0,2.1,0,39.5,0,39.7c0,10.8-4.1,13.7-16.1,14.4l-1,0.1v5.2l26.1-0.7l11,0.3l12.2,0.3l0-1.1l0-4.1l-3.6-0.1
-			c-5-0.1-10.2-0.2-11.9-4.9c-0.7-1.7-1.3-5.2-1.3-9.2c0,0,0-37.8,0-39.9c1.9,0,19,0,19,0v-6.3c0,0-17.1,0-19,0c0-2,0-27.7,0-27.7
-			c0-5.9,0-13.2,2.2-18.6c2-4.7,5.4-6.8,11.4-6.8c4.8,0,6.3,1.9,8,6.1c0.9,2.2,2.5,5,6.4,5C169.9,52,172.8,49.2,172.8,45.9z
-			 M266.5,151.3c-3.9,0-4.2-3.8-4.2-8.3V97.1l-6.5,0.4c0,0-5.2,0.3-5.3,0.3c-0.1,0-12.5-0.8-12.5-0.8l0,1v3.6l0.8,0.1
-			c9.8,1.4,9.8,3.5,9.7,12.5l0,2v18.6c0,5-1.9,10-5.2,13.7c-3.4,3.8-8,6-12.9,6c-9.3,0-10.6-8.8-10.6-18.4v-39l-6.2,0.3l-5.6,0.3
-			c0,0-5.6-0.3-5.6-0.3l-6.9-0.3l0,1v3.5l0.8,0.1c9.8,1.4,9.8,3.5,9.7,12.5l0,2v23.8c0,14,6.6,20.9,20.2,20.9
-			c8.5,0,17.2-4.6,22.7-11.8c0.7,2.9,2.7,12,2.7,12l21-5.5v-5l-2.9,0.3C268.6,151.2,267.5,151.3,266.5,151.3z M196.5,154.9l-0.9-0.1
-			c-8.7-0.6-8.7-2.9-8.8-9.9l0-3.2V69.8l-24.2,4.8v4.5l2.5,0.3c2.8,0.3,5.5,0.5,6.6,2.9C173,85,173,93.5,173,96.7v45.9l0,1.6
-			c0,7.9,0,10-8.8,10.6l-0.9,0.1v4.7l16.3-0.6c-0.1,0,7.7,0.3,7.7,0.3l9.2,0.3l0-1V154.9z M310.7,154.9l-0.9-0.1
-			c-8.7-0.6-8.7-2.9-8.8-9.9l0-3.2V95.9l-23.9,4.7v4.6l1-0.1c2.3-0.1,7.8-0.4,8.6,2.3c0.2,0.7,0.5,3.7,0.5,15.2v19.9l0,2
-			c-0.1,7.6-0.1,9.6-8.7,10.2l-0.9,0.1v4.7l17.3-0.6l7.8,0.3l8,0.3l0-1V154.9z M292.8,80.6c4.5,0,8.1-3.7,8.1-8.3
-			c0-4.8-3.7-8.5-8.4-8.5c-4.7,0-8.5,3.8-8.5,8.5C284,77,287.9,80.6,292.8,80.6z M374.4,133.7V62.2l-24.2,4.8v4.5l0.9,0
-			c9.1,0.3,9.5,3.9,9.5,12.1c0,0,0,15.7,0,19.6c-4.9-4.6-11.5-7.2-18.9-7.2c-19.2,0-30.6,16.9-30.6,33.3c0,18.4,12.9,31.7,30.6,31.7
-			c9.3,0,15.9-3.2,22.2-10.6c0.7-0.1,12.3-1.5,12.3-1.5l-0.4-1.2C374.4,144.3,374.4,137.4,374.4,133.7z M360.6,135.5
-			c0,9.1-2.7,19.9-15.6,19.9c-16.3,0-18.1-18.2-18.1-26c0-6.3,1.3-26.9,18.1-26.9c7.5,0,15.6,5,15.6,13.2V135.5z M479.3,96.1
-			c-15.5,0-32.1,12.7-32.1,31.7c0,18.3,14.4,33.3,32.1,33.3c18.4,0,32.2-14.1,32.2-32.7C511.5,110.9,496.7,96.1,479.3,96.1z
-			 M493.2,147.3c-2.8,5.7-7.3,8.7-13.3,8.7c-15.5,0-17.8-17.3-17.8-27.5c0-6.4,1.2-27.1,16.7-27.1c14.7,0,17.8,15.2,17.8,28
-			C496.6,134.3,496,141.5,493.2,147.3z M546.4,96.1c-15.5,0-32.1,12.7-32.1,31.7c0,18.3,14.4,33.3,32.1,33.3
-			c18.4,0,32.3-14.1,32.3-32.7C578.6,110.9,563.9,96.1,546.4,96.1z M560.3,147.3c-2.8,5.7-7.3,8.7-13.3,8.7
-			c-15.5,0-17.8-17.3-17.8-27.5c0-6.4,1.2-27.1,16.7-27.1c14.7,0,17.8,15.2,17.8,28C563.7,134.3,563.1,141.5,560.3,147.3z
-			 M413.6,96.1c-7.4,0-14.1,2.5-18.9,7.2c0-3.8,0-19.6,0-19.6c0-8.2,0.4-11.9,9.5-12.1l0.9,0v-4.5l-24.2-4.8v71.5
-			c0,3.7,0,10.7-1.3,14.1l-0.4,1.2c0,0,11.6,1.4,12.3,1.5c6.3,7.4,12.9,10.6,22.2,10.6c17.7,0,30.6-13.3,30.6-31.7
-			C444.2,113,432.8,96.1,413.6,96.1z M410.3,155.4c-12.9,0-15.6-10.8-15.6-19.9v-19.8c0-8.2,8.1-13.2,15.6-13.2
-			c16.8,0,18.1,20.5,18.1,26.9C428.3,137.2,426.6,155.4,410.3,155.4z M647.1,158.6V155l-0.8-0.1c-3.6-0.6-4.9-1.9-7.1-4.1l-2-2
-			c0,0-24.8-24.2-26-25.5c1.1-1.3,12.2-13.6,12.2-13.6c0,0,1.3-1.4,1.3-1.4c3.8-4.2,5.4-6,11.8-6.2l0.9,0v-4.7l-12.8,0.6
-			c0.1,0-6-0.3-6-0.3l-7.2-0.3l0,1v3.8h1c4.2,0,6.4,0.8,6.4,2.5c0,1-1.3,4-10.1,13.3c0,0-5.6,5.9-7.8,8.3c0-4.5,0-64,0-64L576.5,67
-			v4.5l2.1,0.2c2.9,0.3,5.7,0.6,7.1,3c1.4,2.4,1.4,9.9,1.4,12.7v55.1l0,1.6c0,7.9,0,10-8.8,10.6l-0.9,0.1v4.7l9.3-0.3l7.4-0.3
-			c-0.1,0,7.7,0.3,7.7,0.3l8.8,0.3l0-1v-3.7l-0.9-0.1c-8.1-0.5-8.9-2.6-8.9-8.4c0-0.7,0-1.4,0-2.1l0-2.6c0,0,0-7.5,0-8.2
-			c0.3-0.3,1.1-1.1,1.8-1.8c1.3,1.4,26.1,27.8,26.1,27.8s8.9-0.6,9-0.6c0.1,0,9.5,0.6,9.5,0.6L647.1,158.6z"/>
-	</g>
-</g>
-<path class="st5" d="M651.8,104.6v-4.3c4.1-2.4,7.4-4.8,9.7-7.3c2.3-2.4,4.1-5.3,5.4-8.7h3.4v14.7H686v5.5h-15.7v35.6
-	c0,2.7,0.1,5,0.4,6.9c0.3,1.9,0.7,3.4,1.3,4.5c0.6,1.1,1.4,1.9,2.5,2.4c1,0.5,2.3,0.7,3.9,0.7c2,0,3.6-0.4,5-1.2
-	c1.4-0.8,2.7-2.2,4-4.2l2.9,2.2c-1.1,2.9-3,5.1-5.7,6.6c-2.7,1.5-6,2.3-10,2.3c-5.2,0-9.1-1.2-11.8-3.7s-4-6-4-10.6v-41.6H651.8z"/>
-<path class="st5" d="M722.8,96c4.4,0,8.7,0.8,12.6,2.4c4,1.6,7.5,3.8,10.5,6.6c3,2.8,5.4,6.1,7.1,10c1.8,3.9,2.6,8.1,2.6,12.7
-	c0,4.8-0.9,9.1-2.6,13.1c-1.8,4-4.1,7.4-7.1,10.3c-3,2.9-6.5,5.2-10.5,6.8c-4,1.6-8.2,2.5-12.6,2.5c-4.4,0-8.5-0.8-12.5-2.4
-	c-3.9-1.6-7.4-3.8-10.4-6.7c-3-2.9-5.3-6.3-7-10.4c-1.7-4-2.6-8.4-2.6-13.2c0-4.6,0.9-8.9,2.6-12.8c1.7-3.9,4.1-7.3,7-10.1
-	c3-2.8,6.4-5,10.4-6.6C714.2,96.8,718.4,96,722.8,96z M722.8,101.6c-2.9,0-5.5,0.6-7.9,1.9c-2.4,1.3-4.4,3-6.1,5.3
-	c-1.7,2.3-3,5.1-3.9,8.3c-0.9,3.2-1.3,6.8-1.3,10.7c0,4.1,0.4,7.7,1.3,11c0.9,3.3,2.2,6.1,3.9,8.4c1.7,2.3,3.7,4.1,6,5.3
-	c2.3,1.2,5,1.9,8,1.9c3,0,5.7-0.6,8.1-1.9c2.4-1.2,4.5-3,6.2-5.4c1.7-2.3,3-5.2,4-8.4c0.9-3.3,1.4-6.9,1.4-10.9
-	c0-3.9-0.5-7.5-1.4-10.7c-0.9-3.2-2.3-6-4-8.3c-1.7-2.3-3.8-4.1-6.2-5.4C728.4,102.3,725.7,101.6,722.8,101.6z"/>
-<path class="st5" d="M790.7,96c4.4,0,8.7,0.8,12.6,2.4c4,1.6,7.5,3.8,10.5,6.6c3,2.8,5.4,6.1,7.1,10c1.8,3.9,2.6,8.1,2.6,12.7
-	c0,4.8-0.9,9.1-2.6,13.1c-1.8,4-4.1,7.4-7.1,10.3c-3,2.9-6.5,5.2-10.5,6.8c-4,1.6-8.2,2.5-12.6,2.5c-4.4,0-8.5-0.8-12.5-2.4
-	c-3.9-1.6-7.4-3.8-10.4-6.7c-3-2.9-5.3-6.3-7-10.4c-1.7-4-2.6-8.4-2.6-13.2c0-4.6,0.9-8.9,2.6-12.8c1.7-3.9,4.1-7.3,7-10.1
-	c3-2.8,6.4-5,10.4-6.6C782.2,96.8,786.3,96,790.7,96z M790.7,101.6c-2.9,0-5.5,0.6-7.9,1.9c-2.4,1.3-4.4,3-6.1,5.3
-	c-1.7,2.3-3,5.1-3.9,8.3c-0.9,3.2-1.3,6.8-1.3,10.7c0,4.1,0.4,7.7,1.3,11c0.9,3.3,2.2,6.1,3.9,8.4c1.7,2.3,3.7,4.1,6,5.3
-	c2.3,1.2,5,1.9,8,1.9c3,0,5.7-0.6,8.1-1.9c2.4-1.2,4.5-3,6.2-5.4c1.7-2.3,3-5.2,4-8.4c0.9-3.3,1.4-6.9,1.4-10.9
-	c0-3.9-0.5-7.5-1.4-10.7c-0.9-3.2-2.3-6-4-8.3c-1.7-2.3-3.8-4.1-6.2-5.4C796.4,102.3,793.7,101.6,790.7,101.6z"/>
-<path class="st5" d="M843,141c0,3,0.1,5.3,0.4,7.1c0.2,1.8,0.7,3.2,1.5,4.2c0.7,1,1.8,1.7,3.2,2.1c1.4,0.4,3.2,0.6,5.4,0.7v4.1
-	h-32.3v-4.1c2.3-0.1,4.2-0.3,5.6-0.8c1.4-0.4,2.5-1.1,3.3-2s1.4-2.2,1.6-3.9c0.3-1.7,0.4-3.9,0.4-6.6V91.3c0-4.2-0.1-7.7-0.2-10.6
-	c-0.1-2.8-0.3-4.8-0.5-5.8c-0.4-1.8-1.3-3-2.8-3.6c-1.4-0.6-4-0.9-7.8-0.9v-4l22.1-4.3V141z"/>
-<path class="st5" d="M871.8,105.5h0.5c2.5-3.3,5.2-5.7,8.3-7.2c3-1.5,6.5-2.3,10.5-2.3c4.2,0,8.1,0.8,11.8,2.5s6.8,3.9,9.5,6.8
-	c2.7,2.9,4.8,6.3,6.3,10.2c1.5,3.9,2.3,8.2,2.3,12.7c0,4.6-0.8,8.9-2.3,12.8c-1.6,3.9-3.7,7.4-6.4,10.2c-2.7,2.9-5.9,5.2-9.5,6.8
-	c-3.7,1.6-7.6,2.5-11.9,2.5c-4.4,0-8.6-0.8-12.5-2.5c-3.9-1.6-7-3.9-9.5-6.7l-5.5,7.8h-2.6V88.5c0-7.9-0.5-12.9-1.5-15.1
-	c-0.2-0.5-0.5-1-0.8-1.3c-0.3-0.4-0.8-0.7-1.4-0.9c-0.6-0.3-1.5-0.5-2.6-0.8c-1.1-0.2-2.6-0.5-4.4-0.7v-2.9l22-4.7V105.5z
-	 M872,134.8c0,3,0.4,5.7,1.3,8.1c0.9,2.5,2,4.6,3.6,6.3c1.5,1.8,3.4,3.1,5.5,4.2c2.1,1,4.5,1.5,7,1.5c2.7,0,5.2-0.6,7.4-1.9
-	c2.2-1.2,4.1-3,5.7-5.3c1.6-2.3,2.8-5.1,3.7-8.3c0.9-3.2,1.3-6.8,1.3-10.8c0-4-0.5-7.6-1.4-10.9c-0.9-3.3-2.2-6.2-3.9-8.5
-	c-1.6-2.4-3.6-4.2-5.9-5.6c-2.3-1.3-4.8-2-7.5-2c-3.2,0-6,0.8-8.5,2.3c-2.5,1.5-4.4,3.6-5.7,6.4c-1.7,3.4-2.6,8.2-2.6,14.2V134.8z"
-	/>
-<path class="st5" d="M956.8,96c4.4,0,8.7,0.8,12.6,2.4c4,1.6,7.5,3.8,10.5,6.6c3,2.8,5.4,6.1,7.1,10c1.8,3.9,2.6,8.1,2.6,12.7
-	c0,4.8-0.9,9.1-2.6,13.1c-1.8,4-4.1,7.4-7.1,10.3c-3,2.9-6.5,5.2-10.5,6.8c-4,1.6-8.2,2.5-12.6,2.5c-4.4,0-8.5-0.8-12.5-2.4
-	c-3.9-1.6-7.4-3.8-10.4-6.7c-3-2.9-5.3-6.3-7-10.4c-1.7-4-2.6-8.4-2.6-13.2c0-4.6,0.9-8.9,2.6-12.8c1.7-3.9,4.1-7.3,7-10.1
-	c3-2.8,6.4-5,10.4-6.6C948.3,96.8,952.4,96,956.8,96z M956.8,101.6c-2.9,0-5.5,0.6-7.9,1.9c-2.4,1.3-4.4,3-6.1,5.3
-	c-1.7,2.3-3,5.1-3.9,8.3c-0.9,3.2-1.3,6.8-1.3,10.7c0,4.1,0.4,7.7,1.3,11c0.9,3.3,2.2,6.1,3.9,8.4c1.7,2.3,3.7,4.1,6,5.3
-	c2.3,1.2,5,1.9,8,1.9c3,0,5.7-0.6,8.1-1.9c2.4-1.2,4.5-3,6.2-5.4c1.7-2.3,3-5.2,4-8.4c0.9-3.3,1.4-6.9,1.4-10.9
-	c0-3.9-0.5-7.5-1.4-10.7c-0.9-3.2-2.3-6-4-8.3c-1.7-2.3-3.8-4.1-6.2-5.4C962.5,102.3,959.8,101.6,956.8,101.6z"/>
-<path class="st5" d="M1028.7,111c1.9-2.3,2.8-4.3,2.8-6c0-2.5-2.3-3.7-6.9-3.7v-4.1h25.6v4.1c-1.4,0-2.7,0.2-3.8,0.5
-	c-1.1,0.3-2.2,0.8-3.3,1.5c-1.1,0.7-2.2,1.7-3.3,2.9c-1.1,1.2-2.4,2.7-3.8,4.5l-12.1,15.3l15.6,20.5c2.4,3.2,4.7,5.4,6.7,6.7
-	c2.1,1.3,4.3,1.9,6.6,1.9v4.1h-31.1v-4.1c2.8,0,4.8-0.2,5.9-0.6c1.1-0.4,1.6-1.3,1.6-2.5c0-0.5-0.3-1.3-1-2.4
-	c-0.7-1.1-1.8-2.6-3.3-4.6l-8.2-10.5l-10,12.6c-1.2,1.4-1.8,2.8-1.8,4.2c0,1.1,0.5,2,1.4,2.8c0.9,0.7,2.4,1.1,4.4,1.1v4.1H984v-4.1
-	c1.8,0,3.4-0.2,4.8-0.5c1.4-0.3,2.8-0.9,4-1.6c1.3-0.8,2.6-1.9,4-3.3c1.4-1.4,2.9-3.2,4.6-5.3l11.9-14.6l-15.6-22.1
-	c-1.8-2.5-3.4-4.2-4.9-5.1c-1.5-0.9-3.4-1.3-5.6-1.3v-4.1h28.8v4.1c-2.1,0-3.6,0.3-4.6,0.8c-0.9,0.5-1.4,1.2-1.4,2
-	c0,1.2,0.7,2.8,2.2,4.9l8.4,12.3L1028.7,111z"/>
 </svg>
diff --git a/public/images/logo.svg b/public/images/logo.svg
index 26863ff..5b92642 100644
--- a/public/images/logo.svg
+++ b/public/images/logo.svg
@@ -9,111 +9,4 @@
 	.st3{opacity:0.8;fill:url(#SVGID_3_);}
 	.st4{fill:#9EC400;}
 </style>
-<g>
-	<g>
-		<path class="st0" d="M31.4,8.9C28.3,4.5,21.1,4.4,16.3,1c-1.4,7.9-1.2,13.6,1,17.4c-0.7,0.1-1.4,0.1-2.1,0
-			c2.6,7.6,5.7,11,10.7,10.2c5-0.7,7.4-0.1,7.4-0.1c0,0,0,0,0,0c0,0,0,0,0,0C34.7,17.7,34.6,13.3,31.4,8.9z"/>
-		<g>
-			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="15.4464" y1="14.7192" x2="34.1555" y2="14.7192">
-				<stop  offset="0" style="stop-color:#B1D348"/>
-				<stop  offset="1" style="stop-color:#57772B"/>
-			</linearGradient>
-			<path class="st1" d="M33.3,28.4c1.4-10.7,1.3-15.1-1.9-19.5C28.3,4.5,21.1,4.4,16.3,1c-2.2,12.3-0.6,19.3,6.9,22.1
-				C30.6,25.8,33.3,28.4,33.3,28.4z"/>
-			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="18.0039" y1="18.9978" x2="33.313" y2="18.9978">
-				<stop  offset="0" style="stop-color:#57772B"/>
-				<stop  offset="1" style="stop-color:#B1D348"/>
-			</linearGradient>
-			<path class="st2" d="M33.3,28.4c0-8.1-0.5-11.4-3.2-14.4c-2.8-3-8.1-2.4-12-4.5c-0.4,9.4,1.4,14.4,7.2,15.8
-				C31.1,26.7,33.3,28.4,33.3,28.4z"/>
-			<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="15.2405" y1="23.1046" x2="33.3205" y2="23.1046">
-				<stop  offset="0" style="stop-color:#B1D348"/>
-				<stop  offset="1" style="stop-color:#57772B"/>
-			</linearGradient>
-			<path class="st3" d="M33.3,28.5c-2.6-6.4-4-8.8-7.2-10.3c-3.1-1.5-7.2,0.6-10.9,0.2c2.6,7.6,5.7,11,10.7,10.2
-				C31,27.8,33.3,28.5,33.3,28.5z"/>
-		</g>
-		<g>
-			<g>
-				<path class="st0" d="M50.9,10.5c0-1.8-2.6-2.2-4.1-2.2c-4.2,0-6.2,2.2-6.2,6.9c0,0,0,4.8,0,5.2c-0.4,0-3.3,0-3.3,0v1.3
-					c0,0,3,0,3.3,0v8.2c0,2.2-0.8,2.8-3.3,3l-0.2,0v1.1l5.4-0.1l2.3,0.1l2.5,0.1l0-0.2l0-0.9l-0.7,0c-1,0-2.1,0-2.5-1
-					c-0.1-0.4-0.3-1.1-0.3-1.9c0,0,0-7.8,0-8.2c0.4,0,3.9,0,3.9,0v-1.3c0,0-3.5,0-3.9,0c0-0.4,0-5.7,0-5.7c0-1.2,0-2.7,0.5-3.8
-					c0.4-1,1.1-1.4,2.3-1.4c1,0,1.3,0.4,1.6,1.3c0.2,0.4,0.5,1,1.3,1C50.3,11.7,50.9,11.1,50.9,10.5z M70.2,32.2
-					c-0.8,0-0.9-0.8-0.9-1.7V21L68,21.1c0,0-1.1,0.1-1.1,0.1c0,0-2.6-0.2-2.6-0.2l0,0.2V22l0.2,0c2,0.3,2,0.7,2,2.6l0,0.4v3.8
-					c0,1-0.4,2.1-1.1,2.8c-0.7,0.8-1.7,1.2-2.7,1.2c-1.9,0-2.2-1.8-2.2-3.8v-8l-1.3,0.1l-1.2,0.1c0,0-1.2-0.1-1.2-0.1l-1.4-0.1
-					l0,0.2V22l0.2,0c2,0.3,2,0.7,2,2.6l0,0.4v4.9c0,2.9,1.4,4.3,4.2,4.3c1.8,0,3.6-0.9,4.7-2.4c0.1,0.6,0.6,2.5,0.6,2.5l4.3-1.1v-1
-					l-0.6,0.1C70.7,32.2,70.4,32.2,70.2,32.2z M79.3,32.9l-0.2,0c-1.8-0.1-1.8-0.6-1.8-2l0-0.7v-9.5l-4.9,1v1l0.2,0
-					c0.5,0,1.6-0.1,1.8,0.5c0,0.1,0.1,0.8,0.1,3.1v4.1l0,0.4c0,1.6,0,2-1.8,2.1l-0.2,0v1l3.6-0.1l1.6,0.1l1.7,0.1l0-0.2V32.9z
-					 M55.8,32.9l-0.2,0c-1.8-0.1-1.8-0.6-1.8-2l0-0.7V15.4l-5,1v0.9l0.5,0.1c0.6,0.1,1.1,0.1,1.4,0.6c0.3,0.6,0.3,2.3,0.3,3v9.5
-					l0,0.3c0,1.6,0,2.1-1.8,2.2l-0.2,0v1l3.4-0.1c0,0,1.6,0.1,1.6,0.1l1.9,0.1l0-0.2V32.9z M75.6,17.6c0.9,0,1.7-0.8,1.7-1.7
-					c0-1-0.8-1.8-1.7-1.8c-1,0-1.8,0.8-1.8,1.8C73.8,16.9,74.6,17.6,75.6,17.6z M114.1,20.8c-3.2,0-6.6,2.6-6.6,6.5
-					c0,3.8,3,6.9,6.6,6.9c3.8,0,6.7-2.9,6.7-6.7C120.8,23.9,117.7,20.8,114.1,20.8z M117,31.4c-0.6,1.2-1.5,1.8-2.7,1.8
-					c-3.2,0-3.7-3.6-3.7-5.7c0-1.3,0.2-5.6,3.4-5.6c3,0,3.7,3.1,3.7,5.8C117.7,28.7,117.6,30.2,117,31.4z M148.8,33.7V33l-0.2,0
-					c-0.8-0.1-1-0.4-1.5-0.8l-0.4-0.4c0,0-5.1-5-5.4-5.3c0.2-0.3,2.5-2.8,2.5-2.8c0,0,0.3-0.3,0.3-0.3c0.8-0.9,1.1-1.2,2.4-1.3
-					l0.2,0v-1l-2.6,0.1c0,0-1.2-0.1-1.2-0.1l-1.5-0.1l0,0.2V22h0.2c0.9,0,1.3,0.2,1.3,0.5c0,0.2-0.3,0.8-2.1,2.7
-					c0,0-1.2,1.2-1.6,1.7c0-0.9,0-13.2,0-13.2l-5,1v0.9l0.4,0c0.6,0.1,1.2,0.1,1.5,0.6c0.3,0.5,0.3,2,0.3,2.6v11.4l0,0.3
-					c0,1.6,0,2.1-1.8,2.2l-0.2,0v1l1.9-0.1l1.5-0.1c0,0,1.6,0.1,1.6,0.1l1.8,0.1l0-0.2v-0.8l-0.2,0c-1.7-0.1-1.8-0.5-1.8-1.7
-					c0-0.1,0-0.3,0-0.4l0-0.5c0,0,0-1.5,0-1.7c0.1-0.1,0.2-0.2,0.4-0.4c0.3,0.3,5.4,5.7,5.4,5.7s1.8-0.1,1.9-0.1c0,0,2,0.1,2,0.1
-					L148.8,33.7z M128,20.8c-3.2,0-6.6,2.6-6.6,6.5c0,3.8,3,6.9,6.6,6.9c3.8,0,6.7-2.9,6.7-6.7C134.6,23.9,131.6,20.8,128,20.8z
-					 M130.8,31.4c-0.6,1.2-1.5,1.8-2.7,1.8c-3.2,0-3.7-3.6-3.7-5.7c0-1.3,0.2-5.6,3.4-5.6c3,0,3.7,3.1,3.7,5.8
-					C131.5,28.7,131.4,30.2,130.8,31.4z M92.5,28.6V13.8l-5,1v0.9l0.2,0c1.9,0.1,2,0.8,2,2.5c0,0,0,3.2,0,4c-1-1-2.4-1.5-3.9-1.5
-					c-4,0-6.3,3.5-6.3,6.9c0,3.8,2.7,6.5,6.3,6.5c1.9,0,3.3-0.7,4.6-2.2c0.1,0,2.5-0.3,2.5-0.3l-0.1-0.2
-					C92.5,30.8,92.5,29.3,92.5,28.6z M89.6,28.9c0,1.9-0.6,4.1-3.2,4.1c-3.4,0-3.7-3.8-3.7-5.4c0-1.3,0.3-5.5,3.7-5.5
-					c1.5,0,3.2,1,3.2,2.7V28.9z M100.6,20.8c-1.5,0-2.9,0.5-3.9,1.5c0-0.8,0-4,0-4c0-1.7,0.1-2.4,2-2.5l0.2,0v-0.9l-5-1v14.7
-					c0,0.8,0,2.2-0.3,2.9l-0.1,0.2c0,0,2.4,0.3,2.5,0.3c1.3,1.5,2.7,2.2,4.6,2.2c3.7,0,6.3-2.8,6.3-6.5
-					C106.9,24.3,104.5,20.8,100.6,20.8z M99.9,33c-2.7,0-3.2-2.2-3.2-4.1v-4.1c0-1.7,1.7-2.7,3.2-2.7c3.5,0,3.7,4.2,3.7,5.5
-					C103.6,29.3,103.3,33,99.9,33z"/>
-			</g>
-		</g>
-	</g>
-	<g>
-		<g>
-			<path class="st4" d="M149.7,22.6v-0.9c0.9-0.5,1.5-1,2-1.5c0.5-0.5,0.9-1.1,1.1-1.8h0.7v3h3.2v1.1h-3.2v7.3c0,0.6,0,1,0.1,1.4
-				c0.1,0.4,0.1,0.7,0.3,0.9c0.1,0.2,0.3,0.4,0.5,0.5c0.2,0.1,0.5,0.1,0.8,0.1c0.4,0,0.7-0.1,1-0.3c0.3-0.2,0.6-0.5,0.8-0.9l0.6,0.5
-				c-0.2,0.6-0.6,1.1-1.2,1.4c-0.6,0.3-1.2,0.5-2.1,0.5c-1.1,0-1.9-0.3-2.4-0.8s-0.8-1.2-0.8-2.2v-8.6H149.7z"/>
-			<path class="st4" d="M164.4,20.8c0.9,0,1.8,0.2,2.6,0.5c0.8,0.3,1.5,0.8,2.2,1.4c0.6,0.6,1.1,1.3,1.5,2.1
-				c0.4,0.8,0.5,1.7,0.5,2.6c0,1-0.2,1.9-0.5,2.7c-0.4,0.8-0.9,1.5-1.5,2.1c-0.6,0.6-1.3,1.1-2.2,1.4c-0.8,0.3-1.7,0.5-2.6,0.5
-				c-0.9,0-1.8-0.2-2.6-0.5c-0.8-0.3-1.5-0.8-2.1-1.4c-0.6-0.6-1.1-1.3-1.4-2.1c-0.4-0.8-0.5-1.7-0.5-2.7c0-0.9,0.2-1.8,0.5-2.6
-				c0.4-0.8,0.8-1.5,1.4-2.1c0.6-0.6,1.3-1,2.1-1.4C162.6,21,163.5,20.8,164.4,20.8z M164.4,22c-0.6,0-1.1,0.1-1.6,0.4
-				c-0.5,0.3-0.9,0.6-1.3,1.1c-0.3,0.5-0.6,1-0.8,1.7c-0.2,0.7-0.3,1.4-0.3,2.2c0,0.8,0.1,1.6,0.3,2.3c0.2,0.7,0.5,1.3,0.8,1.7
-				c0.3,0.5,0.8,0.8,1.2,1.1c0.5,0.3,1,0.4,1.6,0.4c0.6,0,1.2-0.1,1.7-0.4c0.5-0.3,0.9-0.6,1.3-1.1c0.4-0.5,0.6-1.1,0.8-1.7
-				c0.2-0.7,0.3-1.4,0.3-2.2c0-0.8-0.1-1.5-0.3-2.2c-0.2-0.7-0.5-1.2-0.8-1.7c-0.4-0.5-0.8-0.8-1.3-1.1C165.5,22.1,165,22,164.4,22z
-				"/>
-			<path class="st4" d="M178.4,20.8c0.9,0,1.8,0.2,2.6,0.5c0.8,0.3,1.5,0.8,2.2,1.4c0.6,0.6,1.1,1.3,1.5,2.1
-				c0.4,0.8,0.5,1.7,0.5,2.6c0,1-0.2,1.9-0.5,2.7c-0.4,0.8-0.9,1.5-1.5,2.1c-0.6,0.6-1.3,1.1-2.2,1.4c-0.8,0.3-1.7,0.5-2.6,0.5
-				c-0.9,0-1.8-0.2-2.6-0.5c-0.8-0.3-1.5-0.8-2.1-1.4c-0.6-0.6-1.1-1.3-1.4-2.1c-0.4-0.8-0.5-1.7-0.5-2.7c0-0.9,0.2-1.8,0.5-2.6
-				c0.4-0.8,0.8-1.5,1.4-2.1c0.6-0.6,1.3-1,2.1-1.4C176.6,21,177.5,20.8,178.4,20.8z M178.4,22c-0.6,0-1.1,0.1-1.6,0.4
-				c-0.5,0.3-0.9,0.6-1.3,1.1c-0.3,0.5-0.6,1-0.8,1.7c-0.2,0.7-0.3,1.4-0.3,2.2c0,0.8,0.1,1.6,0.3,2.3c0.2,0.7,0.5,1.3,0.8,1.7
-				c0.3,0.5,0.8,0.8,1.2,1.1c0.5,0.3,1,0.4,1.6,0.4c0.6,0,1.2-0.1,1.7-0.4c0.5-0.3,0.9-0.6,1.3-1.1c0.4-0.5,0.6-1.1,0.8-1.7
-				c0.2-0.7,0.3-1.4,0.3-2.2c0-0.8-0.1-1.5-0.3-2.2c-0.2-0.7-0.5-1.2-0.8-1.7c-0.4-0.5-0.8-0.8-1.3-1.1C179.5,22.1,179,22,178.4,22z
-				"/>
-			<path class="st4" d="M189.2,30.1c0,0.6,0,1.1,0.1,1.5c0,0.4,0.1,0.7,0.3,0.9c0.2,0.2,0.4,0.4,0.7,0.4c0.3,0.1,0.7,0.1,1.1,0.1
-				v0.8h-6.7V33c0.5,0,0.9-0.1,1.2-0.2c0.3-0.1,0.5-0.2,0.7-0.4c0.2-0.2,0.3-0.5,0.3-0.8c0.1-0.3,0.1-0.8,0.1-1.4V19.8
-				c0-0.9,0-1.6,0-2.2c0-0.6-0.1-1-0.1-1.2c-0.1-0.4-0.3-0.6-0.6-0.7c-0.3-0.1-0.8-0.2-1.6-0.2v-0.8l4.6-0.9V30.1z"/>
-			<path class="st4" d="M195.1,22.8L195.1,22.8c0.6-0.7,1.2-1.2,1.8-1.5c0.6-0.3,1.3-0.5,2.2-0.5c0.9,0,1.7,0.2,2.4,0.5
-				s1.4,0.8,2,1.4c0.6,0.6,1,1.3,1.3,2.1c0.3,0.8,0.5,1.7,0.5,2.6c0,1-0.2,1.8-0.5,2.6c-0.3,0.8-0.8,1.5-1.3,2.1
-				c-0.6,0.6-1.2,1.1-2,1.4c-0.8,0.3-1.6,0.5-2.5,0.5c-0.9,0-1.8-0.2-2.6-0.5c-0.8-0.3-1.5-0.8-2-1.4l-1.1,1.6h-0.5V19.3
-				c0-1.6-0.1-2.7-0.3-3.1c0-0.1-0.1-0.2-0.2-0.3c-0.1-0.1-0.2-0.1-0.3-0.2c-0.1-0.1-0.3-0.1-0.5-0.2c-0.2,0-0.5-0.1-0.9-0.1v-0.6
-				l4.5-1V22.8z M195.2,28.8c0,0.6,0.1,1.2,0.3,1.7c0.2,0.5,0.4,0.9,0.7,1.3c0.3,0.4,0.7,0.6,1.1,0.9c0.4,0.2,0.9,0.3,1.4,0.3
-				c0.6,0,1.1-0.1,1.5-0.4c0.5-0.3,0.9-0.6,1.2-1.1c0.3-0.5,0.6-1,0.8-1.7c0.2-0.7,0.3-1.4,0.3-2.2c0-0.8-0.1-1.6-0.3-2.3
-				c-0.2-0.7-0.5-1.3-0.8-1.8c-0.3-0.5-0.7-0.9-1.2-1.1c-0.5-0.3-1-0.4-1.6-0.4c-0.7,0-1.2,0.2-1.8,0.5c-0.5,0.3-0.9,0.8-1.2,1.3
-				c-0.4,0.7-0.5,1.7-0.5,2.9V28.8z"/>
-			<path class="st4" d="M212.6,20.8c0.9,0,1.8,0.2,2.6,0.5c0.8,0.3,1.5,0.8,2.2,1.4c0.6,0.6,1.1,1.3,1.5,2.1
-				c0.4,0.8,0.5,1.7,0.5,2.6c0,1-0.2,1.9-0.5,2.7c-0.4,0.8-0.9,1.5-1.5,2.1c-0.6,0.6-1.3,1.1-2.2,1.4c-0.8,0.3-1.7,0.5-2.6,0.5
-				c-0.9,0-1.8-0.2-2.6-0.5c-0.8-0.3-1.5-0.8-2.1-1.4c-0.6-0.6-1.1-1.3-1.4-2.1c-0.4-0.8-0.5-1.7-0.5-2.7c0-0.9,0.2-1.8,0.5-2.6
-				c0.4-0.8,0.8-1.5,1.4-2.1c0.6-0.6,1.3-1,2.1-1.4C210.9,21,211.7,20.8,212.6,20.8z M212.6,22c-0.6,0-1.1,0.1-1.6,0.4
-				c-0.5,0.3-0.9,0.6-1.3,1.1c-0.3,0.5-0.6,1-0.8,1.7c-0.2,0.7-0.3,1.4-0.3,2.2c0,0.8,0.1,1.6,0.3,2.3c0.2,0.7,0.5,1.3,0.8,1.7
-				c0.3,0.5,0.8,0.8,1.2,1.1c0.5,0.3,1,0.4,1.6,0.4c0.6,0,1.2-0.1,1.7-0.4c0.5-0.3,0.9-0.6,1.3-1.1c0.4-0.5,0.6-1.1,0.8-1.7
-				c0.2-0.7,0.3-1.4,0.3-2.2c0-0.8-0.1-1.5-0.3-2.2c-0.2-0.7-0.5-1.2-0.8-1.7c-0.4-0.5-0.8-0.8-1.3-1.1
-				C213.8,22.1,213.3,22,212.6,22z"/>
-			<path class="st4" d="M227.5,23.9c0.4-0.5,0.6-0.9,0.6-1.2c0-0.5-0.5-0.8-1.4-0.8V21h5.3v0.8c-0.3,0-0.6,0-0.8,0.1
-				c-0.2,0.1-0.5,0.2-0.7,0.3c-0.2,0.1-0.5,0.3-0.7,0.6c-0.2,0.2-0.5,0.6-0.8,0.9l-2.5,3.2l3.2,4.2c0.5,0.7,1,1.1,1.4,1.4
-				c0.4,0.3,0.9,0.4,1.4,0.4v0.8H226V33c0.6,0,1,0,1.2-0.1c0.2-0.1,0.3-0.3,0.3-0.5c0-0.1-0.1-0.3-0.2-0.5c-0.1-0.2-0.4-0.5-0.7-1
-				l-1.7-2.2l-2.1,2.6c-0.2,0.3-0.4,0.6-0.4,0.9c0,0.2,0.1,0.4,0.3,0.6c0.2,0.2,0.5,0.2,0.9,0.2v0.8h-5.5V33c0.4,0,0.7,0,1-0.1
-				c0.3-0.1,0.6-0.2,0.8-0.3c0.3-0.2,0.5-0.4,0.8-0.7c0.3-0.3,0.6-0.7,1-1.1l2.5-3l-3.2-4.6c-0.4-0.5-0.7-0.9-1-1.1
-				c-0.3-0.2-0.7-0.3-1.2-0.3V21h5.9v0.8c-0.4,0-0.7,0.1-0.9,0.2c-0.2,0.1-0.3,0.2-0.3,0.4c0,0.2,0.2,0.6,0.5,1l1.7,2.5L227.5,23.9z
-				"/>
-		</g>
-	</g>
-</g>
 </svg>