Merge pull request #40 from ClubCedille/antoinebou12-patch-1

better scroller && more team member

gulpfile.js

@@ -8,6 +8,9 @@ const autoprefixer = require("gulp-autoprefixer");
 const bs = require("browser-sync").create();
 const rimraf = require("rimraf");
 const comments = require("gulp-header-comment");
+const plumber = require('gulp-plumber');
+const through = require('through2');
+
 
 var path = {
   src: {
@@ -30,17 +33,28 @@ var path = {
 gulp.task("html:build", function () {
   return gulp
     .src(path.src.html)
-    .pipe(
-      fileinclude({
-        basepath: path.src.incdir,
-      })
-    )
+    .pipe(plumber({
+      errorHandler: function (err) {
+        console.error('Error in plugin "' + err.plugin + '": ' + err.message);
+        this.emit('end');
+      }
+    }))
+    .pipe(through.obj(function (file, enc, cb) {
+      this.push(file);
+      cb();
+    }, function (cb) {
+      if (this._transformState.writechunk) {
+        console.log('Processing file:', this._transformState.writechunk.relative);
+      }
+      cb();
+    }))
+    .pipe(fileinclude({
+      basepath: path.src.incdir,
+    }))
     .pipe(gulp.dest(path.build.dirDev))
-    .pipe(
-      bs.reload({
-        stream: true,
-      })
-    );
+    .pipe(bs.reload({
+      stream: true,
+    }));
 });
 
 // SCSS

package.json

@@ -27,5 +27,9 @@
     "react-native-text-ticker": "^1.14.0",
     "sass": "^1.66.1",
     "tailwindcss": "^3.0.23"
+  },
+  "devDependencies": {
+    "gulp-plumber": "^1.2.1",
+    "through2": "^4.0.2"
   }
 }

source/about.html

@@ -1,4 +1,3 @@
-@@include('blocks/scroller.htm')
 @@include('header.htm')
 
 @@include('blocks/navigation.html', {"about":"active", "company":"active"})
@@ -19,7 +18,7 @@
 @@include('blocks/about/counter.htm')
 <!-- section Counter End  -->
 <!-- Section Testimonial Start -->
-@@include('blocks/testimonial.htm')
+@@include('blocks/about/testimonial.htm')
 <!-- Section Testimonial End -->
 
 @@include('blocks/footer.htm')

source/blog-sidebar.html

@@ -1,4 +1,3 @@
-@@include('blocks/scroller.htm')
 @@include('header.htm')
 
 @@include('blocks/navigation.html',{"blog":"active", "blogSidebar":"active"})

source/contact.html

@@ -1,4 +1,3 @@
-@@include('blocks/scroller.htm')
 @@include('header.htm')
 
 @@include('blocks/navigation.html',{"contact":"active"})
@@ -24,9 +23,6 @@ <h2 class="mb-5 mt-2">N'hésitez pas à nous contacter pour toute information</h
 							<i class="ti-email mr-3"></i> Email: [email protected]
 						</li>
 					</ul>
-
-					<img src="images/Discord.png" alt="Discord" width="200px" height="200px">
-
 					@@include('blocks/social-icon.htm')
 				</div>
 			</div>

source/index.html

@@ -4,26 +4,26 @@
 @@include('blocks/navigation.html',{"home":"active"})
 
 <!-- Slider Start -->
-@@include('blocks/slider.htm')
+@@include('blocks/index/slider.htm')
 
 <!-- Section Intro Start -->
-@@include('blocks/intro.htm')
+@@include('blocks/index/intro.htm')
 
 <!-- Section Intro END -->
 <!-- Section About Start -->
 
-@@include('blocks/about-start.htm')
+@@include('blocks/index/about-start.htm')
 
 <!-- Section About End -->
 <!-- section Counter Start -->
-@@include('blocks/counter.htm')
+@@include('blocks/index/counter.htm')
 <!-- section Counter End  -->
 <!--  Section Services Start -->
-@@include('blocks/services.htm')
+@@include('blocks/index/services.htm')
 <!--  Section Cta End-->
-@@include('blocks/cta.htm')
+@@include('blocks/index/cta.htm')
 
-@@include('blocks/contact-index.htm')
+@@include('blocks/index/contact-index.htm')
 @@include('blocks/footer.htm')
 
 @@include('footer.htm')