Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/unity

.gitignore

@@ -3,6 +3,7 @@
 /public/storage
 /storage/*.key
 /vendor
+**/.idea/
 .env
 .env.backup
 .phpunit.result.cache
@@ -11,6 +12,17 @@ Homestead.json
 Homestead.yaml
 npm-debug.log
 yarn-error.log
+composer.lock
+yarn.lock
+.DS_Store
+public/.DS_Store
+public/images/.DS_Store
+gox.iml
+rebuild_docker.sh
+docker/*
+db/*
+docker-compose.yml
+package-lock.json
 /public/admin
 /public/user
 /public/swagger

webpack.mix.js

@@ -18,17 +18,17 @@ mix.extend('addWebpackLoaders', (webpackConfig, loaderRules) => {
  */
 
 mix
-	// .js('resources/js/admin/index.js', 'public/admin/js')
-	// .sass('resources/sass/admin/index.scss', 'public/admin/css').options({ processCssUrls: false })
-	// .styles([
-	// 	'resources/sass/admin/editor.css', 
-	// ], 'public/admin/css/editor.css')
+	.js('resources/js/admin/index.js', 'public/admin/js')
+	.sass('resources/sass/admin/index.scss', 'public/admin/css').options({ processCssUrls: false })
+	.styles([
+		'resources/sass/admin/editor.css',
+	], 'public/admin/css/editor.css')
 	
-	// .js('resources/js/user/index.js', 'public/user/js')
-	// .sass('resources/sass/user/index.scss', 'public/user/css').options({ processCssUrls: false })
-	// .styles([
-	// 	'resources/sass/user/editor.css', 
-	// ], 'public/user/css/editor.css')
+	.js('resources/js/user/index.js', 'public/user/js')
+	.sass('resources/sass/user/index.scss', 'public/user/css').options({ processCssUrls: false })
+	.styles([
+		'resources/sass/user/editor.css',
+	], 'public/user/css/editor.css')
 
 	// .js('resources/js/swagger/index.js', 'public/swagger/js').webpackConfig({ node: { fs: 'empty' }})