From 8ae0219a33b4031773f3efcb3366e405b4b446e3 Mon Sep 17 00:00:00 2001 From: Francesca Sperati <6431@ait.nsw.edu.au> Date: Sat, 12 Jan 2019 20:56:17 +1100 Subject: [PATCH 1/2] split the top and side bars into files (html _loadert), start ads.html template --- package.json | 4 +- src/_sidebar.html | 235 ++++++++++ src/_topbar.html | 367 +++++++++++++++ src/ads.html | 176 +++++++ src/charts.html | 561 ++++++++++++---------- src/charts_.html | 651 -------------------------- src/index.html | 855 +++++++++------------------------- webpack/plugins/htmlPlugin.js | 1 + 8 files changed, 1331 insertions(+), 1519 deletions(-) create mode 100644 src/_sidebar.html create mode 100644 src/_topbar.html create mode 100644 src/ads.html mode change 100644 => 100755 src/charts.html delete mode 100755 src/charts_.html diff --git a/package.json b/package.json index 4d67b95..2b9175d 100755 --- a/package.json +++ b/package.json @@ -34,6 +34,8 @@ "eslint-plugin-import": "2.7.0", "extract-text-webpack-plugin": "^3.0.1", "html-webpack-plugin": "^2.30.1", + "html-includes": "^4.0.0", + "html-loader": "^0.5.5", "imagemin-webpack-plugin": "^1.5.2", "node-sass": "^4.5.3", "postcss-cssnext": "^3.0.2", @@ -65,4 +67,4 @@ "popper.js": "^1.12.6", "skycons": "^1.0.0" } -} \ No newline at end of file +} diff --git a/src/_sidebar.html b/src/_sidebar.html new file mode 100644 index 0000000..13e6282 --- /dev/null +++ b/src/_sidebar.html @@ -0,0 +1,235 @@ + +
+
+ + + + + + + +
+
diff --git a/src/_topbar.html b/src/_topbar.html new file mode 100644 index 0000000..a9d2899 --- /dev/null +++ b/src/_topbar.html @@ -0,0 +1,367 @@ + +
+
+ + + +
+
\ No newline at end of file diff --git a/src/ads.html b/src/ads.html new file mode 100644 index 0000000..6c4df71 --- /dev/null +++ b/src/ads.html @@ -0,0 +1,176 @@ + + + + + + Dashboard + + + + + + + + + + + + + + + +
+ +
+ + + + + +
+ + ${require('html-loader!./_sidebar.html')} + +
+ + + ${require('html-loader!./_topbar.html')} + + + +
+
+
+
+ All Ads Published +
+
+
+
+ +
+
+ +
+
+ Card image cap +
+
Adv title
+

Some quick example text to build on the card title and make up the bulk of the card's content.

+ Go somewhere +
+
+
+ + +
+
+ Card image cap +
+
Card title
+

Some quick example text to build on the card title and make up the bulk of the card's content.

+ Go somewhere +
+
+
+ + +
+
+ Card image cap +
+
Card title
+

Some quick example text to build on the card title and make up the bulk of the card's content.

+ Go somewhere +
+
+
+ + + +
+
+ +
+
+
+
+
+ + + + + + + + + + + + diff --git a/src/charts.html b/src/charts.html old mode 100644 new mode 100755 index f9e74fa..2c3d30f --- a/src/charts.html +++ b/src/charts.html @@ -3,8 +3,7 @@ - Dashboard - + Charts - - - - - @@ -92,20 +88,7 @@
- - - - - - - - - - - - - - +
@@ -116,9 +99,12 @@
+
+
Adminator
+
@@ -134,103 +120,179 @@
- - - - - - - +
-
    - -
  • - 3 + 3 - +
    • - - Emails + + Notifications
      • @@ -275,19 +329,14 @@
-
-
-
-

John Doe

-
-
- 5 mins ago -
-
- - Want to create your own customized data generator for your app... + + John Doe + liked your post -
+ +

+ 5 mins ago +

@@ -297,19 +346,14 @@
-
-
-
-

Moo Doe

-
-
- 15 mins ago -
-
- - Want to create your own customized data generator for your app... + + Moo Doe + liked your cover image -
+ +

+ 7 mins ago +

@@ -319,19 +363,14 @@
-
-
-
-

Lee Doe

-
-
- 25 mins ago -
-
- - Want to create your own customized data generator for your app... + + Lee Doe + commented on your video -
+ +

+ 10 mins ago +

@@ -339,21 +378,21 @@
  • - View All Email + View All Notifications
    • -
  • - 3 + 3 - + + - - - - - - - - - - - + -
    -
    -
    -
    - Dashboard -
    -
    -
    -
    - -
    -
    - -
    -
    -
    -
    Total Ads Views
    +
    +
    +
    +
    +
    +
    +
    Line Chart
    +
    + +
    +
    +
    +
    +
    +
    Area Chart
    +
    + +
    +
    +
    +
    +
    +
    Scatter Chart
    +
    + +
    +
    +
    +
    +
    +
    Bar Chart
    +
    + +
    +
    +
    +
    +
    +
    jQuery Sparkline
    +
    +
    +
    + Spark Line
    -
    -
    -
    - -
    -
    - 24K -
    -
    +
    +  
    -
    - - -
    -
    -
    -
    Successful Matches
    +
    +
    + Spark Bar
    -
    -
    -
    - -
    -
    - 127 -
    -
    +
    +   +
    +
    +
    +
    + Spark Tristate +
    +
    +   +
    +
    +
    +
    + Spark Discrete +
    +
    +   +
    +
    +
    +
    + Spark Bullet +
    +
    +   +
    +
    +
    +
    + Spark Box +
    +
    +  
    - - -
    -
    -
    -
    New Ads (last month)
    +
    +
    +
    +
    +
    Easy Pie Charts
    +
    +
    +
    +
    + +
    +
    New Users
    -
    -
    -
    - -
    -
    - 79 -
    +
    +
    + +
    +
    New Purchases
    +
    +
    +
    +
    +
    New Customers
    +
    +
    +
    + +
    +
    Bounce Rate
    - -
    -
    -
    -
    -
    - - - - - - +
    +
    +
    + + - diff --git a/src/charts_.html b/src/charts_.html deleted file mode 100755 index 2c3d30f..0000000 --- a/src/charts_.html +++ /dev/null @@ -1,651 +0,0 @@ - - - - - - Charts - - - - - - - - - -
    - -
    - - - - - -
    - -
    -
    - - - - - -
    -
    - - -
    - -
    -
    - - -
    -
    - - -
    -
    -
    -
    -
    -
    -
    Line Chart
    -
    - -
    -
    -
    -
    -
    -
    Area Chart
    -
    - -
    -
    -
    -
    -
    -
    Scatter Chart
    -
    - -
    -
    -
    -
    -
    -
    Bar Chart
    -
    - -
    -
    -
    -
    -
    -
    jQuery Sparkline
    -
    -
    -
    - Spark Line -
    -
    -   -
    -
    -
    -
    - Spark Bar -
    -
    -   -
    -
    -
    -
    - Spark Tristate -
    -
    -   -
    -
    -
    -
    - Spark Discrete -
    -
    -   -
    -
    -
    -
    - Spark Bullet -
    -
    -   -
    -
    -
    -
    - Spark Box -
    -
    -   -
    -
    -
    -
    -
    -
    -
    -
    Easy Pie Charts
    -
    -
    -
    -
    - -
    -
    New Users
    -
    -
    -
    - -
    -
    New Purchases
    -
    -
    -
    - -
    -
    New Customers
    -
    -
    -
    - -
    -
    Bounce Rate
    -
    -
    -
    -
    -
    -
    -
    -
    - - -
    - Copyright © 2017 Designed by Colorlib. All rights reserved. -
    -
    -
    - - diff --git a/src/index.html b/src/index.html index b9d4899..2abb89d 100755 --- a/src/index.html +++ b/src/index.html @@ -1,12 +1,13 @@ - - - - Dashboard - - - - - - + + - - -
    - -
    - - - - - -
    - - - - - - - - - - - - + + +
    + +
    - -
    -
    - - - - - + +
    + Copyright © 2017 Designed by Colorlib. + All rights reserved. +
    +
    +
    + + + \ No newline at end of file diff --git a/webpack/plugins/htmlPlugin.js b/webpack/plugins/htmlPlugin.js index 8841970..477be25 100755 --- a/webpack/plugins/htmlPlugin.js +++ b/webpack/plugins/htmlPlugin.js @@ -9,6 +9,7 @@ const titles = { 'buttons': 'Buttons', 'calendar': 'Calendar', 'charts': 'Charts', + 'ads': 'ads', 'chat': 'Chat', 'compose': 'Compose', 'datatable': 'Datatable', From 7ae73f16832e6802878d8021fe1c7c0e79262f25 Mon Sep 17 00:00:00 2001 From: Francesca Sperati <6431@ait.nsw.edu.au> Date: Sat, 12 Jan 2019 21:15:07 +1100 Subject: [PATCH 2/2] fix the logos code --- src/_sidebar.html | 64 +++++++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/src/_sidebar.html b/src/_sidebar.html index 13e6282..cb8c913 100644 --- a/src/_sidebar.html +++ b/src/_sidebar.html @@ -10,33 +10,33 @@