wip

marol1210 · Jul 10, 2020 · 6ceea0c · 6ceea0c
1 parent 98a6d7f
commit 6ceea0c
Show file tree

Hide file tree

Showing 9 changed files with 11,063 additions and 62 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@ composer.lock
 .phpunit.result.cache
 /node_modules
 .env
+.DS_Store
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -19,11 +19,12 @@
     "axios": "^0.19.2",
     "cross-env": "^7.0.2",
     "laravel-mix": "^5.0.4",
-    "less": "^3.11.3",
-    "less-loader": "^6.2.0",
     "tailwindcss": "^1.4.6",
+    "vddl": "^0.7.1",
     "vue": "^2.6.11",
     "vue-quill-editor": "^3.0.6",
-    "vue-zondicons": "^0.1.10"
+    "vue-zondicons": "^0.1.10",
+    "less": "^3.11.3",
+    "less-loader": "^6.2.0"
   }
 }
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
@@ -11,7 +11,7 @@
     <title>@yield('meta_title', 'AvoRed E commerce')</title>
 
     <!-- Styles -->
-    <link href="{{ asset('vendor/avored/css/app.css') }}" rel="stylesheet">
+    <link href="{{ mix('vendor/avored/css/app.css') }}" rel="stylesheet">
 </head>
 
 <body>
@@ -39,7 +39,7 @@
             </a-layout>
         </avored-layout>
     </div>
-    <script src="{{ asset('vendor/avored/js/app.js') }}"></script>
+    <script src="{{ mix('vendor/avored/js/app.js') }}"></script>
     @stack('scripts')
 </body>
 

diff --git a/resources/views/partials/header.blade.php b/resources/views/partials/header.blade.php
@@ -42,36 +42,5 @@ class="w-full py-2 px-4 font-medium text-gray-700 hover:bg-gray-100 focus:outlin
                 </div>
             </div>
         </div>
-        {{-- <a-menu-item class="border-b-0">
-            <svg 
-                xmlns="http://www.w3.org/2000/svg" 
-                class="w-4 h-4"
-                @click="()=> collapsed = !collapsed"
-            ><path d="M1 1h18v2H1V1zm6 8h12v2H7V9zm-6 8h18v2H1v-2zM7 5h12v2H7V5zm0 8h12v2H7v-2zM1 6l4 4-4 4V6z"/>
-            </svg>
-        </a-menu-item> --}}
-
-    {{-- <a-menu class="header-nav" mode="horizontal">
-        <a-sub-menu key="header-account">
-            <span slot="title">
-                <a-avatar
-                    class="header-avtar" 
-                    size="small" 
-                    shape="square" 
-                    icon="user"></a-avatar>
-                {{ Auth::guard('admin')->user()->full_name }}
-            </span>
-            <a-menu-item key="1">
-                <a href="{{ route('admin.logout') }}"
-                    onclick="event.preventDefault();
-                        document.getElementById('admin-logout-form').submit();">
-                <a-icon type="logout"></a-icon>
-                <span>{{ __('avored::system.header.logout') }}</span>
-                </a>
-            </a-menu-item>
-        </a-sub-menu>
-    </a-menu>
-     <form id="admin-logout-form" action="{{ route('admin.logout') }}" method="POST" style="display: none;">
-        @csrf
-    </form> --}}
+
 </a-layout-header>
diff --git a/resources/views/partials/sidebar.blade.php b/resources/views/partials/sidebar.blade.php
@@ -1,6 +1,7 @@
 <a-layout-sider :style="{background: '#fff'}" :trigger="null" collapsible v-model="collapsed">
-    <a href="{{ route('admin.dashboard') }}">
-        <div class="logo">AvoRed</div>
+    <a href="{{ route('admin.dashboard') }}" class="flex items-center mt-2">
+        <img class="h-12 block ml-8 w-12" src="{{ asset('vendor/avored/images/logo_only.svg') }}" />
+        <div class="text-xl text-red-600">AvoRed</div>
     </a>
     <a-menu 
         theme="light"

diff --git a/resources/views/user/auth/login.blade.php b/resources/views/user/auth/login.blade.php
@@ -9,10 +9,10 @@
 
     <title>@yield('meta_title', 'AvoRed E commerce')</title>
 
-    <script defer src="{{ asset('vendor/avored/js/app.js') }}"></script>
+    <script defer src="{{ mix('vendor/avored/js/app.js') }}"></script>
 
     <!-- Styles -->
-    <link href="{{ asset('vendor/avored/css/app.css') }}" rel="stylesheet">
+    <link href="{{ mix('vendor/avored/css/app.css') }}" rel="stylesheet">
 </head>
 <body>
     <div id="app">

diff --git a/webpack.mix.js b/webpack.mix.js
@@ -27,18 +27,22 @@ mix.setPublicPath(publicPath)
 
 /******** AVORED ADMIN JS  **********/
 mix.js('resources/js/app.js', 'vendor/avored/js/app.js')
-mix.copyDirectory('resources/images', '../../public/vendor/avored/images');
+
+/******** AVORED COPY IMAGES  **********/
+mix.copyDirectory('resources/images', '../../public/vendor/avored/images')
+
+
 /******** AVORED ADMIN CSS  **********/
-mix.less('resources/less/app.less', 'vendor/avored/css/app.css', {
-    lessOptions: {
-        javascriptEnabled: true,
-        modifyVars: {
-            'primary-color': '#E64448',
-            'link-color': '#C12E32',
-            'border-radius-base': '5px',
-        },
-    }
-}).options({
-    processCssUrls: false,
-    postCss: [ tailwindcss('tailwind.config.js') ],
-})
+// mix.less('resources/less/app.less', 'vendor/avored/css/app.css', {
+//     lessOptions: {
+//         javascriptEnabled: true,
+//         modifyVars: {
+//             'primary-color': '#E64448',
+//             'link-color': '#C12E32',
+//             'border-radius-base': '5px',
+//         },
+//     }
+// }).options({
+//     processCssUrls: false,
+//     postCss: [ tailwindcss('tailwind.config.js') ],
+// })
diff --git a/yarn.lock b/yarn.lock
@@ -872,9 +872,9 @@
   integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
 
 "@types/node@*":
-  version "14.0.20"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.20.tgz#0da05cddbc761e1fa98af88a17244c8c1ff37231"
-  integrity sha512-MRn/NP3dee8yL5QhbSA6riuwkS+UOcsPUMOIOG3KMUQpuor/2TopdRBu8QaaB4fGU+gz/bzyDWt0FtUbeJ8H1A==
+  version "14.0.22"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.22.tgz#23ea4d88189cec7d58f9e6b66f786b215eb61bdc"
+  integrity sha512-emeGcJvdiZ4Z3ohbmw93E/64jRzUHAItSHt8nF7M4TGgQTiWqFVGB8KNpLGFmUHmHLvjvBgFwVlqNcq+VuGv9g==
 
 "@types/q@^1.5.1":
   version "1.5.4"
@@ -2755,9 +2755,9 @@ [email protected]:
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
 electron-to-chromium@^1.3.488:
-  version "1.3.495"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.495.tgz#7c8284119bcd2c27e5968f2054296e57318dcc21"
-  integrity sha512-cIPX+4Y3RH/+SoqYd168Rx//CnjsZSdF3XTUhwMf3dwYuTfvWIgmmy6s1ipptGaOA+scH2Vj57Mc9fqp/ho22Q==
+  version "1.3.496"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.496.tgz#3f43d32930481d82ad3663d79658e7c59a58af0b"
+  integrity sha512-TXY4mwoyowwi4Lsrq9vcTUYBThyc1b2hXaTZI13p8/FRhY2CTaq5lK+DVjhYkKiTLsKt569Xes+0J5JsVXFurQ==
 
 elliptic@^6.0.0, elliptic@^6.5.2:
   version "6.5.3"
@@ -7250,6 +7250,13 @@ vary@~1.1.2:
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
   integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
 
+vddl@^0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/vddl/-/vddl-0.7.1.tgz#9fd3fdd7ebea78160b822cb42c145d64da0d4eba"
+  integrity sha512-6vnkOlzeBqP9Qd90Foz01zHym8oyF0cgM6vIexXK8pDMVsnHDjI3uKPcV6Yn1JOxHlbfdworGLfPAzfoxnXnyQ==
+  dependencies:
+    vue "^2.4.2"
+
 vendors@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e"
@@ -7319,7 +7326,7 @@ vue-zondicons@^0.1.10:
     uppercamelcase "^3.0.0"
     vue "^2.5.17"
 
-vue@^2.5.17, vue@^2.6.11:
+vue@^2.4.2, vue@^2.5.17, vue@^2.6.11:
   version "2.6.11"
   resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.11.tgz#76594d877d4b12234406e84e35275c6d514125c5"
   integrity sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ==