From a0d51517de9a016758fc26ef852663dee4dd9ff6 Mon Sep 17 00:00:00 2001
From: Diatrex <diahshalabi@hotmail.com>
Date: Mon, 20 Apr 2020 12:26:41 +0300
Subject: [PATCH] revert changes did by @mgoleli

---
 .../resources/views/partials/assets.twig      | 18 +++++++---------
 .../resources/views/partials/metadata.twig    | 21 +++++++++++++------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/assets.twig b/addons/default/visiosoft/base-theme/resources/views/partials/assets.twig
index 9dab182d9..2833942f0 100644
--- a/addons/default/visiosoft/base-theme/resources/views/partials/assets.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/partials/assets.twig
@@ -15,16 +15,21 @@
 {{ asset_add("theme.js", "visiosoft.theme.base::js/intlTelInput.min.js") }}
 {{ asset_add("theme.js", "visiosoft.theme.base::js/utils.js") }}
 {{ asset_add("theme.js", "visiosoft.theme.base::js/phoneField.js") }}
-
+{{ asset_add("theme.js", "visiosoft.theme.base::js/jquery.inputmask.bundle.min.js") }}
 
 {# Theme Scripts #}
 {#{{ asset_add("theme.js", "visiosoft.theme.base::js/plugins/*") }}#}
 {{ asset_add("theme.js", "visiosoft.theme.base::js/theme/initialize.js") }}
 
-{{ asset_add("theme.js", "visiosoft.theme.base::js/jquery.inputmask.bundle.min.js") }}
-
 {{ asset_script("theme.js") }}
 
+{# Include Styles Loaded From Outside #}
+<style type="text/css">
+    {% for style in asset_inlines("styles.css", ["min"]) %}
+    {{ style|raw }}
+    {% endfor %}
+</style>
+
 {# Include Scripts Loaded From Outside #}
 <script type="text/javascript">
     {% for script in asset_inlines("scripts.js", ["min"]) %}
@@ -37,10 +42,3 @@
     {{ script|raw }}
     {% endfor %}
 </script>
-
-{# Include Styles Loaded From Outside #}
-<style type="text/css">
-    {% for style in asset_inlines("styles.css", ["min"]) %}
-    {{ style|raw }}
-    {% endfor %}
-</style>
diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig b/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig
index 3120cef97..0c9932310 100644
--- a/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig
@@ -1,6 +1,9 @@
 <!-- Locale -->
 <meta http-equiv="Content-Language" content="{{ config('app.locale') }}">
 
+<!-- VueJS Requirements -->
+<meta name="csrf-token" content="{{ csrf_token() }}" />
+
 <!-- To the Future! -->
 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
@@ -10,19 +13,25 @@
 {#{{ favicons("theme::img/favicon.png") }}#}
 
 {# Base Theme Components #}
-{{ asset_add("theme.css", "theme::css/bootstrap.min.css") }}
-{{ asset_add("theme.css", "theme::css/theme.css") }}
-{{ asset_add("theme.css", "theme::css/select2.css") }}
-{{ asset_add("theme.css", "theme::css/font-awesome.min.css") }}
+{{ asset_add("theme.css", "visiosoft.theme.base::css/base.css") }}
+{{ asset_add("theme.css", "visiosoft.theme.base::css/bootstrap.min.css") }}
+{{ asset_add("theme.css", "visiosoft.theme.base::css/theme.css") }}
+{{ asset_add("theme.css", "visiosoft.theme.base::css/select2.css") }}
+{{ asset_add("theme.css", "visiosoft.theme.base::css/font-awesome.min.css") }}
 {{ asset_add("theme.css", "visiosoft.theme.base::css/intlTelInput.css") }}
 
-<script src="{{ asset_path('theme::js/vendor/jquery.min.js') }}"></script>
+<script src="{{ asset_path('visiosoft.theme.base::js/vendor/jquery.min.js') }}"></script>
 
 {{ asset_style("theme.css") }}
 
 {% include "visiosoft.theme.base::partials/styles" %}
 
-
+{# Custom Theme Components #}
+<style type="text/css">
+    {% for style in asset_inlines("custom-theme.css", ["min"]) %}
+    {{ style|raw }}
+    {% endfor %}
+</style>
 
 {# Important!! #}
 {{ constants() }}