Browse Source

cleanup pkg and gulpfile

windhamdavid 1 year ago
parent
commit
7927b884b9
6 changed files with 910 additions and 81 deletions
  1. 2 0
      README.md
  2. 1 1
      css/v3-fullcalendar.css
  3. 47 18
      gulpfile.js
  4. 25 20
      js/v3-fullcalendar.js
  5. 834 42
      package-lock.json
  6. 1 0
      package.json

+ 2 - 0
README.md

@@ -12,9 +12,11 @@
 - git master -> main
 - rm old grunt files
 - update packages
+  - remove jasny boot in for 5.0 offcanvas
 - rewrite gulpfile to auto-build
 - rewrite the studio page
 - consolidate some scripts
+ - mv inline js to bundles
 
 #### 2020.04.04 - Updates - v.3.0
 

+ 1 - 1
css/v3-fullcalendar.css

@@ -1049,4 +1049,4 @@ Lots taken from Flatly (MIT): https://bootswatch.com/4/flatly/bootstrap.css
     display: none;
     /* don't display any button-related controls */
   }
-}
+}

+ 47 - 18
gulpfile.js

@@ -4,8 +4,9 @@ const gulp = require('gulp'),
       cleanCSS = require('gulp-clean-css'),
       uglify = require('gulp-uglify'),
       streamqueue = require('streamqueue');
+      browserSync = require('browser-sync').create();
 
-gulp.task('copy', async function() {
+function copy(cb) {
   gulp.src('./node_modules/bootstrap/dist/js/bootstrap.js')
     .pipe(rename('v3-bootstrap.js'))
     .pipe(gulp.dest('./js/'));
@@ -49,9 +50,10 @@ gulp.task('copy', async function() {
     .pipe(rename('v3-fullcalendar-daygrid.css'))
     .pipe(gulp.dest('./css/'));
   console.log("files ๐Ÿ“„ from npm pkgs ");
-});
+  cb();
+}
 
-gulp.task('css', async function() {
+function css(cb) {
   return streamqueue({ objectMode: true },
       gulp.src('./css/fonts.css'),
       gulp.src('./css/v3-animate.css'),
@@ -68,18 +70,20 @@ gulp.task('css', async function() {
     .pipe(cleanCSS({level: {1: {specialComments: 0}}}))
     .pipe(rename('v3-front.min.css'))
     .pipe(gulp.dest('./css/', { overwrite:true })),
-  console.log("CSS built ๐Ÿ”ง ");
-});
+  console.log("CSS built ๐Ÿ”ง "),
+  cb();
+}
 
-gulp.task('cssf', async function() {
+function cssf(cb) {
   gulp.src('css/front-page.css')
     .pipe(cleanCSS({level: {1: {specialComments: 0}}}))
     .pipe(rename('v3-front.min.css'))
     .pipe(gulp.dest('./css/', { overwrite:true }));
-  console.log("CSSF built ๐Ÿ”ง ");
-});
+  console.log("CSSF built ๐Ÿ”ง "),
+  cb();
+}
 
-gulp.task('js', async function() {
+function js(cb) {
   return streamqueue({ objectMode: true },
       gulp.src('./js/v3-jquery.js'),
       gulp.src('./js/v3-popper.js'),
@@ -93,14 +97,15 @@ gulp.task('js', async function() {
       gulp.src('./js/validate.js'),
       gulp.src('./js/scripts.js')
     )
-    .pipe(concat('v3-script.js'))
-    .pipe(uglify())
-    .pipe(rename('v3-script.min.js'))
-    .pipe(gulp.dest('./js/', { overwrite:true })),
-  console.log("JS built ๐Ÿ”ง ");
-});
+  .pipe(concat('v3-script.js'))
+  .pipe(uglify())
+  .pipe(rename('v3-script.min.js'))
+  .pipe(gulp.dest('./js/', { overwrite:true })),
+  console.log("JS built ๐Ÿ”ง "),
+  cb();
+}
 
-gulp.task('jsf', async function() {
+function jsf(cb) {
   return streamqueue({ objectMode: true },
     gulp.src('./js/v3-jquery.js'),
     gulp.src('./js/svg-morpheus.js'),
@@ -113,5 +118,29 @@ gulp.task('jsf', async function() {
   .pipe(uglify())
   .pipe(rename('v3-front.min.js'))
   .pipe(gulp.dest('./js/', { overwrite:true })),
-console.log("JSF built ๐Ÿ”ง ");
-});
+  console.log("JSF built ๐Ÿ”ง "),
+  cb();
+}
+
+function reload(cb) {
+  browserSync.reload();
+  cb();
+}
+
+function run() {
+  browserSync.init({
+    open: 'external',
+    host: 'daw.ovid',
+    proxy: 'https://daw.ovid',
+    port: '333'
+  });
+  gulp.watch('./*.php').on('change', gulp.series(reload));
+  console.log("๐Ÿ”ฅ Run");
+}
+
+exports.copy = copy;
+exports.css = css;
+exports.cssf = cssf;
+exports.js = js;
+exports.jsf = jsf;
+exports.run = run;

+ 25 - 20
js/v3-fullcalendar.js

@@ -1,5 +1,5 @@
 /*!
-FullCalendar Core Package v4.4.0
+FullCalendar Core Package v4.4.2
 Docs & License: https://fullcalendar.io/
 (c) 2019 Adam Shaw
 */
@@ -1131,18 +1131,18 @@ Docs & License: https://fullcalendar.io/
     }
 
     /*! *****************************************************************************
-    Copyright (c) Microsoft Corporation. All rights reserved.
-    Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-    this file except in compliance with the License. You may obtain a copy of the
-    License at http://www.apache.org/licenses/LICENSE-2.0
+    Copyright (c) Microsoft Corporation.
 
-    THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
-    WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
-    MERCHANTABLITY OR NON-INFRINGEMENT.
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose with or without fee is hereby granted.
 
-    See the Apache Version 2.0 License for specific language governing permissions
-    and limitations under the License.
+    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+    REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+    AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+    INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+    LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+    OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+    PERFORMANCE OF THIS SOFTWARE.
     ***************************************************************************** */
     /* global Reflect, Promise */
 
@@ -2463,7 +2463,7 @@ Docs & License: https://fullcalendar.io/
                 ]);
             }
         }
-        if (!calendar.state.loadingLevel) { // avoid initial empty state while pending
+        if (!calendar.state.eventSourceLoadingLevel) { // avoid initial empty state while pending
             calendar.afterSizingTriggers._eventsPositioned = [null]; // fire once
         }
     }
@@ -3937,28 +3937,33 @@ Docs & License: https://fullcalendar.io/
     }());
     var Component = /** @class */ (function () {
         function Component() {
+            this.everRendered = false;
             this.uid = String(guid++);
         }
         Component.addEqualityFuncs = function (newFuncs) {
             this.prototype.equalityFuncs = __assign({}, this.prototype.equalityFuncs, newFuncs);
         };
         Component.prototype.receiveProps = function (props, context) {
-            var oldContext = this.context;
-            this.context = context;
-            if (!oldContext) {
-                this.firstContext(context);
-            }
+            this.receiveContext(context);
             var _a = recycleProps(this.props || {}, props, this.equalityFuncs), anyChanges = _a.anyChanges, comboProps = _a.comboProps;
             this.props = comboProps;
             if (anyChanges) {
-                if (oldContext) {
+                if (this.everRendered) {
                     this.beforeUpdate();
                 }
                 this.render(comboProps, context);
-                if (oldContext) {
+                if (this.everRendered) {
                     this.afterUpdate();
                 }
             }
+            this.everRendered = true;
+        };
+        Component.prototype.receiveContext = function (context) {
+            var oldContext = this.context;
+            this.context = context;
+            if (!oldContext) {
+                this.firstContext(context);
+            }
         };
         Component.prototype.render = function (props, context) {
         };
@@ -8578,7 +8583,7 @@ Docs & License: https://fullcalendar.io/
 
     // exports
     // --------------------------------------------------------------------------------------------------
-    var version = '4.4.0';
+    var version = '4.4.2';
 
     exports.Calendar = Calendar;
     exports.Component = Component;

File diff suppressed because it is too large
+ 834 - 42
package-lock.json


+ 1 - 0
package.json

@@ -8,6 +8,7 @@
     "url": "git@github.com:windhamdavid/daw.git"
   },
   "devDependencies": {
+    "browser-sync": "^2.27.10",
     "gulp": "^4.0.2",
     "gulp-clean-css": "^4.3.0",
     "gulp-concat": "^2.6.1",

Some files were not shown because too many files changed in this diff