nav tabs on admin dashboard
This commit is contained in:
-9
@@ -1,9 +0,0 @@
|
||||
{
|
||||
"env": {
|
||||
"node": true
|
||||
},
|
||||
"rules": {
|
||||
"node/exports-style": ["off"]
|
||||
}
|
||||
|
||||
}
|
||||
+35
-27
@@ -3,46 +3,54 @@
|
||||
Author Tobias Koppers @sokra
|
||||
*/
|
||||
/*globals window __webpack_hash__ */
|
||||
if(module.hot) {
|
||||
if (module.hot) {
|
||||
var lastHash;
|
||||
var upToDate = function upToDate() {
|
||||
return lastHash.indexOf(__webpack_hash__) >= 0;
|
||||
};
|
||||
var log = require("./log");
|
||||
var check = function check() {
|
||||
module.hot.check(true).then(function(updatedModules) {
|
||||
if(!updatedModules) {
|
||||
log("warning", "[HMR] Cannot find update. Need to do a full reload!");
|
||||
log("warning", "[HMR] (Probably because of restarting the webpack-dev-server)");
|
||||
window.location.reload();
|
||||
return;
|
||||
}
|
||||
module.hot
|
||||
.check(true)
|
||||
.then(function(updatedModules) {
|
||||
if (!updatedModules) {
|
||||
log("warning", "[HMR] Cannot find update. Need to do a full reload!");
|
||||
log(
|
||||
"warning",
|
||||
"[HMR] (Probably because of restarting the webpack-dev-server)"
|
||||
);
|
||||
window.location.reload();
|
||||
return;
|
||||
}
|
||||
|
||||
if(!upToDate()) {
|
||||
check();
|
||||
}
|
||||
if (!upToDate()) {
|
||||
check();
|
||||
}
|
||||
|
||||
require("./log-apply-result")(updatedModules, updatedModules);
|
||||
require("./log-apply-result")(updatedModules, updatedModules);
|
||||
|
||||
if(upToDate()) {
|
||||
log("info", "[HMR] App is up to date.");
|
||||
}
|
||||
|
||||
}).catch(function(err) {
|
||||
var status = module.hot.status();
|
||||
if(["abort", "fail"].indexOf(status) >= 0) {
|
||||
log("warning", "[HMR] Cannot apply update. Need to do a full reload!");
|
||||
log("warning", "[HMR] " + err.stack || err.message);
|
||||
window.location.reload();
|
||||
} else {
|
||||
log("warning", "[HMR] Update failed: " + err.stack || err.message);
|
||||
}
|
||||
});
|
||||
if (upToDate()) {
|
||||
log("info", "[HMR] App is up to date.");
|
||||
}
|
||||
})
|
||||
.catch(function(err) {
|
||||
var status = module.hot.status();
|
||||
if (["abort", "fail"].indexOf(status) >= 0) {
|
||||
log(
|
||||
"warning",
|
||||
"[HMR] Cannot apply update. Need to do a full reload!"
|
||||
);
|
||||
log("warning", "[HMR] " + (err.stack || err.message));
|
||||
window.location.reload();
|
||||
} else {
|
||||
log("warning", "[HMR] Update failed: " + (err.stack || err.message));
|
||||
}
|
||||
});
|
||||
};
|
||||
var hotEmitter = require("./emitter");
|
||||
hotEmitter.on("webpackHotUpdate", function(currentHash) {
|
||||
lastHash = currentHash;
|
||||
if(!upToDate() && module.hot.status() === "idle") {
|
||||
if (!upToDate() && module.hot.status() === "idle") {
|
||||
log("info", "[HMR] Checking for updates on the server...");
|
||||
check();
|
||||
}
|
||||
|
||||
+12
-6
@@ -8,19 +8,22 @@ module.exports = function(updatedModules, renewedModules) {
|
||||
});
|
||||
var log = require("./log");
|
||||
|
||||
if(unacceptedModules.length > 0) {
|
||||
log("warning", "[HMR] The following modules couldn't be hot updated: (They would need a full reload!)");
|
||||
if (unacceptedModules.length > 0) {
|
||||
log(
|
||||
"warning",
|
||||
"[HMR] The following modules couldn't be hot updated: (They would need a full reload!)"
|
||||
);
|
||||
unacceptedModules.forEach(function(moduleId) {
|
||||
log("warning", "[HMR] - " + moduleId);
|
||||
});
|
||||
}
|
||||
|
||||
if(!renewedModules || renewedModules.length === 0) {
|
||||
if (!renewedModules || renewedModules.length === 0) {
|
||||
log("info", "[HMR] Nothing hot updated.");
|
||||
} else {
|
||||
log("info", "[HMR] Updated modules:");
|
||||
renewedModules.forEach(function(moduleId) {
|
||||
if(typeof moduleId === "string" && moduleId.indexOf("!") !== -1) {
|
||||
if (typeof moduleId === "string" && moduleId.indexOf("!") !== -1) {
|
||||
var parts = moduleId.split("!");
|
||||
log.groupCollapsed("info", "[HMR] - " + parts.pop());
|
||||
log("info", "[HMR] - " + moduleId);
|
||||
@@ -32,7 +35,10 @@ module.exports = function(updatedModules, renewedModules) {
|
||||
var numberIds = renewedModules.every(function(moduleId) {
|
||||
return typeof moduleId === "number";
|
||||
});
|
||||
if(numberIds)
|
||||
log("info", "[HMR] Consider using the NamedModulesPlugin for module names.");
|
||||
if (numberIds)
|
||||
log(
|
||||
"info",
|
||||
"[HMR] Consider using the NamedModulesPlugin for module names."
|
||||
);
|
||||
}
|
||||
};
|
||||
|
||||
+9
-6
@@ -3,7 +3,8 @@ var logLevel = "info";
|
||||
function dummy() {}
|
||||
|
||||
function shouldLog(level) {
|
||||
var shouldLog = (logLevel === "info" && level === "info") ||
|
||||
var shouldLog =
|
||||
(logLevel === "info" && level === "info") ||
|
||||
(["info", "warning"].indexOf(logLevel) >= 0 && level === "warning") ||
|
||||
(["info", "warning", "error"].indexOf(logLevel) >= 0 && level === "error");
|
||||
return shouldLog;
|
||||
@@ -11,27 +12,29 @@ function shouldLog(level) {
|
||||
|
||||
function logGroup(logFn) {
|
||||
return function(level, msg) {
|
||||
if(shouldLog(level)) {
|
||||
if (shouldLog(level)) {
|
||||
logFn(msg);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
module.exports = function(level, msg) {
|
||||
if(shouldLog(level)) {
|
||||
if(level === "info") {
|
||||
if (shouldLog(level)) {
|
||||
if (level === "info") {
|
||||
console.log(msg);
|
||||
} else if(level === "warning") {
|
||||
} else if (level === "warning") {
|
||||
console.warn(msg);
|
||||
} else if(level === "error") {
|
||||
} else if (level === "error") {
|
||||
console.error(msg);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
/* eslint-disable node/no-unsupported-features/node-builtins */
|
||||
var group = console.group || dummy;
|
||||
var groupCollapsed = console.groupCollapsed || dummy;
|
||||
var groupEnd = console.groupEnd || dummy;
|
||||
/* eslint-enable node/no-unsupported-features/node-builtins */
|
||||
|
||||
module.exports.group = logGroup(group);
|
||||
|
||||
|
||||
+75
-41
@@ -3,65 +3,99 @@
|
||||
Author Tobias Koppers @sokra
|
||||
*/
|
||||
/*globals __webpack_hash__ */
|
||||
if(module.hot) {
|
||||
if (module.hot) {
|
||||
var lastHash;
|
||||
var upToDate = function upToDate() {
|
||||
return lastHash.indexOf(__webpack_hash__) >= 0;
|
||||
};
|
||||
var log = require("./log");
|
||||
var check = function check() {
|
||||
module.hot.check().then(function(updatedModules) {
|
||||
if(!updatedModules) {
|
||||
log("warning", "[HMR] Cannot find update. Need to do a full reload!");
|
||||
log("warning", "[HMR] (Probably because of restarting the webpack-dev-server)");
|
||||
return;
|
||||
}
|
||||
|
||||
return module.hot.apply({
|
||||
ignoreUnaccepted: true,
|
||||
ignoreDeclined: true,
|
||||
ignoreErrored: true,
|
||||
onUnaccepted: function(data) {
|
||||
log("warning", "Ignored an update to unaccepted module " + data.chain.join(" -> "));
|
||||
},
|
||||
onDeclined: function(data) {
|
||||
log("warning", "Ignored an update to declined module " + data.chain.join(" -> "));
|
||||
},
|
||||
onErrored: function(data) {
|
||||
log("error", data.error);
|
||||
log("warning", "Ignored an error while updating module " + data.moduleId + " (" + data.type + ")");
|
||||
}
|
||||
}).then(function(renewedModules) {
|
||||
if(!upToDate()) {
|
||||
check();
|
||||
module.hot
|
||||
.check()
|
||||
.then(function(updatedModules) {
|
||||
if (!updatedModules) {
|
||||
log("warning", "[HMR] Cannot find update. Need to do a full reload!");
|
||||
log(
|
||||
"warning",
|
||||
"[HMR] (Probably because of restarting the webpack-dev-server)"
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
require("./log-apply-result")(updatedModules, renewedModules);
|
||||
return module.hot
|
||||
.apply({
|
||||
ignoreUnaccepted: true,
|
||||
ignoreDeclined: true,
|
||||
ignoreErrored: true,
|
||||
onUnaccepted: function(data) {
|
||||
log(
|
||||
"warning",
|
||||
"Ignored an update to unaccepted module " +
|
||||
data.chain.join(" -> ")
|
||||
);
|
||||
},
|
||||
onDeclined: function(data) {
|
||||
log(
|
||||
"warning",
|
||||
"Ignored an update to declined module " +
|
||||
data.chain.join(" -> ")
|
||||
);
|
||||
},
|
||||
onErrored: function(data) {
|
||||
log("error", data.error);
|
||||
log(
|
||||
"warning",
|
||||
"Ignored an error while updating module " +
|
||||
data.moduleId +
|
||||
" (" +
|
||||
data.type +
|
||||
")"
|
||||
);
|
||||
}
|
||||
})
|
||||
.then(function(renewedModules) {
|
||||
if (!upToDate()) {
|
||||
check();
|
||||
}
|
||||
|
||||
if(upToDate()) {
|
||||
log("info", "[HMR] App is up to date.");
|
||||
require("./log-apply-result")(updatedModules, renewedModules);
|
||||
|
||||
if (upToDate()) {
|
||||
log("info", "[HMR] App is up to date.");
|
||||
}
|
||||
});
|
||||
})
|
||||
.catch(function(err) {
|
||||
var status = module.hot.status();
|
||||
if (["abort", "fail"].indexOf(status) >= 0) {
|
||||
log(
|
||||
"warning",
|
||||
"[HMR] Cannot check for update. Need to do a full reload!"
|
||||
);
|
||||
log("warning", "[HMR] " + (err.stack || err.message));
|
||||
} else {
|
||||
log(
|
||||
"warning",
|
||||
"[HMR] Update check failed: " + (err.stack || err.message)
|
||||
);
|
||||
}
|
||||
});
|
||||
}).catch(function(err) {
|
||||
var status = module.hot.status();
|
||||
if(["abort", "fail"].indexOf(status) >= 0) {
|
||||
log("warning", "[HMR] Cannot check for update. Need to do a full reload!");
|
||||
log("warning", "[HMR] " + err.stack || err.message);
|
||||
} else {
|
||||
log("warning", "[HMR] Update check failed: " + err.stack || err.message);
|
||||
}
|
||||
});
|
||||
};
|
||||
var hotEmitter = require("./emitter");
|
||||
hotEmitter.on("webpackHotUpdate", function(currentHash) {
|
||||
lastHash = currentHash;
|
||||
if(!upToDate()) {
|
||||
if (!upToDate()) {
|
||||
var status = module.hot.status();
|
||||
if(status === "idle") {
|
||||
if (status === "idle") {
|
||||
log("info", "[HMR] Checking for updates on the server...");
|
||||
check();
|
||||
} else if(["abort", "fail"].indexOf(status) >= 0) {
|
||||
log("warning", "[HMR] Cannot apply update as a previous update " + status + "ed. Need to do a full reload!");
|
||||
} else if (["abort", "fail"].indexOf(status) >= 0) {
|
||||
log(
|
||||
"warning",
|
||||
"[HMR] Cannot apply update as a previous update " +
|
||||
status +
|
||||
"ed. Need to do a full reload!"
|
||||
);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
+26
-20
@@ -3,29 +3,35 @@
|
||||
Author Tobias Koppers @sokra
|
||||
*/
|
||||
/*globals __resourceQuery */
|
||||
if(module.hot) {
|
||||
var hotPollInterval = +(__resourceQuery.substr(1)) || (10 * 60 * 1000);
|
||||
if (module.hot) {
|
||||
var hotPollInterval = +__resourceQuery.substr(1) || 10 * 60 * 1000;
|
||||
var log = require("./log");
|
||||
|
||||
var checkForUpdate = function checkForUpdate(fromUpdate) {
|
||||
if(module.hot.status() === "idle") {
|
||||
module.hot.check(true).then(function(updatedModules) {
|
||||
if(!updatedModules) {
|
||||
if(fromUpdate) log("info", "[HMR] Update applied.");
|
||||
return;
|
||||
}
|
||||
require("./log-apply-result")(updatedModules, updatedModules);
|
||||
checkForUpdate(true);
|
||||
}).catch(function(err) {
|
||||
var status = module.hot.status();
|
||||
if(["abort", "fail"].indexOf(status) >= 0) {
|
||||
log("warning", "[HMR] Cannot apply update.");
|
||||
log("warning", "[HMR] " + err.stack || err.message);
|
||||
log("warning", "[HMR] You need to restart the application!");
|
||||
} else {
|
||||
log("warning", "[HMR] Update failed: " + err.stack || err.message);
|
||||
}
|
||||
});
|
||||
if (module.hot.status() === "idle") {
|
||||
module.hot
|
||||
.check(true)
|
||||
.then(function(updatedModules) {
|
||||
if (!updatedModules) {
|
||||
if (fromUpdate) log("info", "[HMR] Update applied.");
|
||||
return;
|
||||
}
|
||||
require("./log-apply-result")(updatedModules, updatedModules);
|
||||
checkForUpdate(true);
|
||||
})
|
||||
.catch(function(err) {
|
||||
var status = module.hot.status();
|
||||
if (["abort", "fail"].indexOf(status) >= 0) {
|
||||
log("warning", "[HMR] Cannot apply update.");
|
||||
log("warning", "[HMR] " + (err.stack || err.message));
|
||||
log("warning", "[HMR] You need to restart the application!");
|
||||
} else {
|
||||
log(
|
||||
"warning",
|
||||
"[HMR] Update failed: " + (err.stack || err.message)
|
||||
);
|
||||
}
|
||||
});
|
||||
}
|
||||
};
|
||||
setInterval(checkForUpdate, hotPollInterval);
|
||||
|
||||
+40
-30
@@ -3,44 +3,54 @@
|
||||
Author Tobias Koppers @sokra
|
||||
*/
|
||||
/*globals __resourceQuery */
|
||||
if(module.hot) {
|
||||
if (module.hot) {
|
||||
var log = require("./log");
|
||||
var checkForUpdate = function checkForUpdate(fromUpdate) {
|
||||
module.hot.check().then(function(updatedModules) {
|
||||
if(!updatedModules) {
|
||||
if(fromUpdate)
|
||||
log("info", "[HMR] Update applied.");
|
||||
else
|
||||
log("warning", "[HMR] Cannot find update.");
|
||||
return;
|
||||
}
|
||||
module.hot
|
||||
.check()
|
||||
.then(function(updatedModules) {
|
||||
if (!updatedModules) {
|
||||
if (fromUpdate) log("info", "[HMR] Update applied.");
|
||||
else log("warning", "[HMR] Cannot find update.");
|
||||
return;
|
||||
}
|
||||
|
||||
return module.hot.apply({
|
||||
ignoreUnaccepted: true,
|
||||
onUnaccepted: function(data) {
|
||||
log("warning", "Ignored an update to unaccepted module " + data.chain.join(" -> "));
|
||||
},
|
||||
}).then(function(renewedModules) {
|
||||
require("./log-apply-result")(updatedModules, renewedModules);
|
||||
return module.hot
|
||||
.apply({
|
||||
ignoreUnaccepted: true,
|
||||
onUnaccepted: function(data) {
|
||||
log(
|
||||
"warning",
|
||||
"Ignored an update to unaccepted module " +
|
||||
data.chain.join(" -> ")
|
||||
);
|
||||
}
|
||||
})
|
||||
.then(function(renewedModules) {
|
||||
require("./log-apply-result")(updatedModules, renewedModules);
|
||||
|
||||
checkForUpdate(true);
|
||||
return null;
|
||||
checkForUpdate(true);
|
||||
return null;
|
||||
});
|
||||
})
|
||||
.catch(function(err) {
|
||||
var status = module.hot.status();
|
||||
if (["abort", "fail"].indexOf(status) >= 0) {
|
||||
log("warning", "[HMR] Cannot apply update.");
|
||||
log("warning", "[HMR] " + (err.stack || err.message));
|
||||
log("warning", "[HMR] You need to restart the application!");
|
||||
} else {
|
||||
log("warning", "[HMR] Update failed: " + (err.stack || err.message));
|
||||
}
|
||||
});
|
||||
}).catch(function(err) {
|
||||
var status = module.hot.status();
|
||||
if(["abort", "fail"].indexOf(status) >= 0) {
|
||||
log("warning", "[HMR] Cannot apply update.");
|
||||
log("warning", "[HMR] " + err.stack || err.message);
|
||||
log("warning", "[HMR] You need to restart the application!");
|
||||
} else {
|
||||
log("warning", "[HMR] Update failed: " + err.stack || err.message);
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
process.on(__resourceQuery.substr(1) || "SIGUSR2", function() {
|
||||
if(module.hot.status() !== "idle") {
|
||||
log("warning", "[HMR] Got signal but currently in " + module.hot.status() + " state.");
|
||||
if (module.hot.status() !== "idle") {
|
||||
log(
|
||||
"warning",
|
||||
"[HMR] Got signal but currently in " + module.hot.status() + " state."
|
||||
);
|
||||
log("warning", "[HMR] Need to be in idle state to start hot update.");
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user