Moved static to src/assets

terkelg · fdc25a4f5c817bfefef000c61fed5fe49c87107f · Terkel Gjervig committed Jan 16, 2017 · Jan 16, 2017 · fdc25a4
1 parent ae7f495
commit fdc25a4f5c817bfefef000c61fed5fe49c87107f
Unified Split

Showing with 10 additions and 4 deletions.

BIN app/{static → src/assets}/icon-18x18.png

BIN app/{static → src/assets}/icon.ico

+2 −3 app/src/main/tray.js

+8 −1 gulpfile.babel.js
diff --git a/app/static/icon-18x18.png → app/src/assets/icon-18x18.png b/app/static/icon-18x18.png → app/src/assets/icon-18x18.png
diff --git a/app/static/icon.ico → app/src/assets/icon.ico b/app/static/icon.ico → app/src/assets/icon.ico
diff --git a/app/src/main/tray.js b/app/src/main/tray.js
@@ -15,11 +15,10 @@ const createTray = win => {
   }
 
   // Set tray icon
-  const trayIconDefault = path.join(__dirname, '../static/icon-18x18.png')
-  const trayIconWindows = path.join(__dirname, '../static/icon.ico')
+  const trayIconDefault = path.join(__dirname, 'assets/icon-18x18.png')
+  const trayIconWindows = path.join(__dirname, 'assets/icon.ico')
   let icon = isPlatform('windows') ? trayIconWindows : trayIconDefault
 
-  // TODO: Remove from here, and use evennts instead
   const toggleWin = () => {
     if (isPlatform('windows')) {
       if (win.isMinimized()) {
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
@@ -10,6 +10,7 @@ const DIST_DIR = 'app/dist'
 // Source files
 const JS_GLOB = `${SRC_DIR}/**/*.js`
 const CSS_GLOB = `${SRC_DIR}/**/*.scss`
+const ASSETS_GLOB = `app/src/assets/*.*`
 
 // Clean DIST directory
 export function clean () {
@@ -29,12 +30,18 @@ export function styles () {
     .pipe(dest(DIST_DIR))
 }
 
+export function assets () {
+  return src(ASSETS_GLOB, {base: SRC_DIR})
+    .pipe(dest(DIST_DIR))
+}
+
 export function watch () {
   watchSrc(JS_GLOB, scripts)
   watchSrc(CSS_GLOB, styles)
+  watchSrc(ASSETS_GLOB, assets)
 }
 
-const mainTasks = parallel(scripts, styles)
+const mainTasks = parallel(scripts, styles, assets)
 export const build = series(clean, mainTasks)
 export const dev = series(clean, mainTasks, watch)