From 203a1df5401a5c7385fd488211600a1fd4b546b7 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 13 Aug 2021 08:21:17 +0800
Subject: [PATCH 1/3] update gitignore

---
 .gitignore | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.gitignore b/.gitignore
index 20e3f4c..76b25b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 /public/storage
 /storage/*.key
 /vendor
+**/.idea/
 .env
 .env.backup
 .phpunit.result.cache
@@ -11,5 +12,16 @@ 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

From 16cceb03d6016ba6628dec39c4fcac8200c9dec4 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 16 Aug 2021 09:47:30 +0800
Subject: [PATCH 2/3] enable disabled modules in web pack

---
 webpack.mix.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/webpack.mix.js b/webpack.mix.js
index 87293e7..9011ba3 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -18,19 +18,19 @@ 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' }})
+	.js('resources/js/swagger/index.js', 'public/swagger/js').webpackConfig({ node: { fs: 'empty' }})
 
 	.js('resources/js/swagger/index.js', 'public/swagger/js')
 	.addWebpackLoaders([

From 1edc44af6c12eeccf07b8c4b0963fa5c22ef6558 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 16 Aug 2021 09:48:35 +0800
Subject: [PATCH 3/3] enable disabled modules in web pack

---
 webpack.mix.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webpack.mix.js b/webpack.mix.js
index 9011ba3..45bebaf 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -30,7 +30,7 @@ mix
 		'resources/sass/user/editor.css',
 	], 'public/user/css/editor.css')
 
-	.js('resources/js/swagger/index.js', 'public/swagger/js').webpackConfig({ node: { fs: 'empty' }})
+	// .js('resources/js/swagger/index.js', 'public/swagger/js').webpackConfig({ node: { fs: 'empty' }})
 
 	.js('resources/js/swagger/index.js', 'public/swagger/js')
 	.addWebpackLoaders([