diff --git a/build/webpack.base.config.js b/build/webpack.base.config.js index 913ec3ebad..7278a6d534 100755 --- a/build/webpack.base.config.js +++ b/build/webpack.base.config.js @@ -15,7 +15,7 @@ module.exports = { core_pages: path.resolve(__dirname, '../src/pages'), core_components: path.resolve(__dirname, '../src/components'), core_themes: path.resolve(__dirname, '../src/themes'), - + lib: path.resolve(__dirname, '../src/lib'), 'src': path.resolve(__dirname, '../src'), diff --git a/src/components/core/AddToCart.vue b/src/components/core/AddToCart.vue index b8c2159004..3433de2fb5 100644 --- a/src/components/core/AddToCart.vue +++ b/src/components/core/AddToCart.vue @@ -1,5 +1,5 @@ diff --git a/src/components/core/ProductTile.vue b/src/components/core/ProductTile.vue new file mode 100644 index 0000000000..cf816ac7a0 --- /dev/null +++ b/src/components/core/ProductTile.vue @@ -0,0 +1,21 @@ + + + \ No newline at end of file diff --git a/src/components/core/blocks/Microcart/Microcart.vue b/src/components/core/blocks/Microcart/Microcart.vue new file mode 100644 index 0000000000..e96f1d96d0 --- /dev/null +++ b/src/components/core/blocks/Microcart/Microcart.vue @@ -0,0 +1,24 @@ + + + + diff --git a/src/components/core/blocks/SidebarMenu/SidebarMenu.vue b/src/components/core/blocks/SidebarMenu/SidebarMenu.vue new file mode 100644 index 0000000000..6eb20062a0 --- /dev/null +++ b/src/components/core/blocks/SidebarMenu/SidebarMenu.vue @@ -0,0 +1,11 @@ + + + \ No newline at end of file diff --git a/src/event-bus/event-bus.js b/src/event-bus/event-bus.js new file mode 100644 index 0000000000..0d122e8a95 --- /dev/null +++ b/src/event-bus/event-bus.js @@ -0,0 +1,6 @@ +import Vue from 'vue' + +const EventBus = new Vue() + +export default EventBus + diff --git a/src/index.template.html b/src/index.template.html index 45015e1b05..00e18d7dfa 100755 --- a/src/index.template.html +++ b/src/index.template.html @@ -6,6 +6,8 @@ + <% for (var chunk of webpack.chunks) { for (var file of chunk.files) { if (file.match(/\.(js|css)$/)) { %> diff --git a/src/pages/Home.vue b/src/pages/Home.vue index 2ce45ea932..29a7994c47 100755 --- a/src/pages/Home.vue +++ b/src/pages/Home.vue @@ -1,25 +1,20 @@ diff --git a/src/themes/default/App.vue b/src/themes/default/App.vue index e9159f6d04..6d0a2d1971 100755 --- a/src/themes/default/App.vue +++ b/src/themes/default/App.vue @@ -1,8 +1,18 @@ @@ -10,12 +20,32 @@ import MainHeader from './components/core/blocks/Header/Header.vue' import MainFooter from './components/core/blocks/Footer/Footer.vue' +import Microcart from './components/core/blocks/Microcart/Microcart.vue' +import SidebarMenu from './components/core/blocks/SidebarMenu/SidebarMenu.vue' + export default { components: { MainHeader, - MainFooter + MainFooter, + Microcart, + SidebarMenu } } + + + + \ No newline at end of file diff --git a/src/themes/default/components/core/Logo.vue b/src/themes/default/components/core/Logo.vue new file mode 100644 index 0000000000..acf5b3051f --- /dev/null +++ b/src/themes/default/components/core/Logo.vue @@ -0,0 +1,51 @@ + + + + + diff --git a/src/themes/default/components/core/ProductTile.vue b/src/themes/default/components/core/ProductTile.vue new file mode 100644 index 0000000000..6efccebbc2 --- /dev/null +++ b/src/themes/default/components/core/ProductTile.vue @@ -0,0 +1,18 @@ + + + + + diff --git a/src/themes/default/components/core/SearchIcon.vue b/src/themes/default/components/core/SearchIcon.vue new file mode 100644 index 0000000000..46c14bf554 --- /dev/null +++ b/src/themes/default/components/core/SearchIcon.vue @@ -0,0 +1,15 @@ + + + + + diff --git a/src/themes/default/components/core/blocks/Header/HamburgerIcon.vue b/src/themes/default/components/core/blocks/Header/HamburgerIcon.vue new file mode 100644 index 0000000000..b327a354f9 --- /dev/null +++ b/src/themes/default/components/core/blocks/Header/HamburgerIcon.vue @@ -0,0 +1,24 @@ + + + + + diff --git a/src/themes/default/components/core/blocks/Header/Header.vue b/src/themes/default/components/core/blocks/Header/Header.vue index 8c0482f0ff..7199038f22 100644 --- a/src/themes/default/components/core/blocks/Header/Header.vue +++ b/src/themes/default/components/core/blocks/Header/Header.vue @@ -1,31 +1,55 @@ diff --git a/src/themes/default/components/core/blocks/Header/MicrocartIcon.vue b/src/themes/default/components/core/blocks/Header/MicrocartIcon.vue index 68c32da15e..94176cb99a 100644 --- a/src/themes/default/components/core/blocks/Header/MicrocartIcon.vue +++ b/src/themes/default/components/core/blocks/Header/MicrocartIcon.vue @@ -1,17 +1,26 @@ diff --git a/src/themes/default/components/core/blocks/Header/WishlistIcon.vue b/src/themes/default/components/core/blocks/Header/WishlistIcon.vue new file mode 100644 index 0000000000..1251e4cfcd --- /dev/null +++ b/src/themes/default/components/core/blocks/Header/WishlistIcon.vue @@ -0,0 +1,15 @@ + + + + + diff --git a/src/themes/default/components/core/blocks/Microcart/Microcart.vue b/src/themes/default/components/core/blocks/Microcart/Microcart.vue new file mode 100644 index 0000000000..2db4a27132 --- /dev/null +++ b/src/themes/default/components/core/blocks/Microcart/Microcart.vue @@ -0,0 +1,48 @@ + + + + + diff --git a/src/themes/default/components/core/blocks/SidebarMenu/SidebarMenu.vue b/src/themes/default/components/core/blocks/SidebarMenu/SidebarMenu.vue new file mode 100644 index 0000000000..bcef74f1a4 --- /dev/null +++ b/src/themes/default/components/core/blocks/SidebarMenu/SidebarMenu.vue @@ -0,0 +1,47 @@ + + + + + diff --git a/src/themes/default/css/margin.css b/src/themes/default/css/margin.css new file mode 100644 index 0000000000..fe59b91ceb --- /dev/null +++ b/src/themes/default/css/margin.css @@ -0,0 +1,4 @@ +.mx10 { + margin-left: 10px; + margin-right: 10px; +} \ No newline at end of file diff --git a/src/themes/default/css/padding.css b/src/themes/default/css/padding.css new file mode 100644 index 0000000000..f0aa77b895 --- /dev/null +++ b/src/themes/default/css/padding.css @@ -0,0 +1,6 @@ +.p5 { + padding: 5px; +} +.p15 { + padding: 15px; +} \ No newline at end of file diff --git a/src/themes/default/pages/Home.vue b/src/themes/default/pages/Home.vue index ec25089db6..19aa54d155 100755 --- a/src/themes/default/pages/Home.vue +++ b/src/themes/default/pages/Home.vue @@ -1,18 +1,15 @@ -