Commit 91fc123b authored by Christopher Mark Fullarton's avatar Christopher Mark Fullarton
Browse files

Update webpack-cli. Remove cache footer element.

parent 91fd717e
......@@ -530,11 +530,20 @@
}
},
"@nodelib/fs.stat": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.0.2.tgz",
"integrity": "sha512-vCpf75JDcdomXvUd7Rn6DfYAVqPAFI66FVjxiWGwh85OLdvfo3paBoPJaam5keIYRyUolnS7SleS/ZPCidCvzw==",
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.0.tgz",
"integrity": "sha512-LAQ1d4OPfSJ/BMbI2DuizmYrrkD9JMaTdi2hQTlI53lQ4kRQPyZQRS4CYQ7O66bnBBnP/oYdRxbk++X0xuFU6A==",
"dev": true
},
"@samverschueren/stream-to-observable": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz",
"integrity": "sha512-MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg==",
"dev": true,
"requires": {
"any-observable": "^0.3.0"
}
},
"@schematics/angular": {
"version": "0.6.3",
"resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-0.6.3.tgz",
......@@ -1093,9 +1102,9 @@
}
},
"any-observable": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/any-observable/-/any-observable-0.2.0.tgz",
"integrity": "sha1-xnhwBYADV5AJCD9UrAq6+1wz0kI=",
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/any-observable/-/any-observable-0.3.0.tgz",
"integrity": "sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog==",
"dev": true
},
"anymatch": {
......@@ -4210,9 +4219,9 @@
"dev": true
},
"envinfo": {
"version": "4.4.2",
"resolved": "https://registry.npmjs.org/envinfo/-/envinfo-4.4.2.tgz",
"integrity": "sha512-5rfRs+m+6pwoKRCFqpsA5+qsLngFms1aWPrxfKbrObCzQaPc3M3yPloZx+BL9UE3dK58cxw36XVQbFRSCCfGSQ==",
"version": "5.7.0",
"resolved": "https://registry.npmjs.org/envinfo/-/envinfo-5.7.0.tgz",
"integrity": "sha512-+YEENfz2TAXPo/6kG4wvANO88c4aGFy73TI+etozWehqxyg0k8uOL3e1Cxqa2TppImicOeQHJUz8jWDpuZ3wkg==",
"dev": true
},
"errno": {
......@@ -4713,17 +4722,6 @@
"chardet": "^0.4.0",
"iconv-lite": "^0.4.17",
"tmp": "^0.0.33"
},
"dependencies": {
"tmp": {
"version": "0.0.33",
"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
"integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
"dev": true,
"requires": {
"os-tmpdir": "~1.0.2"
}
}
}
},
"extglob": {
......@@ -4993,9 +4991,9 @@
}
},
"flow-parser": {
"version": "0.72.0",
"resolved": "https://registry.npmjs.org/flow-parser/-/flow-parser-0.72.0.tgz",
"integrity": "sha512-kFaDtviKlD/rHi6NRp42KTbnPgz/nKcWUJQhqDnLDeKA8uGcRVSy0YlQjaf9M3pFo5PgC3SNFnCPpQGLtHjH2w==",
"version": "0.73.0",
"resolved": "https://registry.npmjs.org/flow-parser/-/flow-parser-0.73.0.tgz",
"integrity": "sha512-9JB+2hrKJ+S1OZ+upIwNTGlaLDRga2iC9KvpqWVFEVNlCxc51pkhNJRmA0PmUcLcEtFAW6IGBmVi70r+j+Qp9A==",
"dev": true
},
"flush-write-stream": {
......@@ -6713,9 +6711,9 @@
"dev": true
},
"rxjs": {
"version": "5.5.10",
"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.10.tgz",
"integrity": "sha512-SRjimIDUHJkon+2hFo7xnvNC4ZEHGzCRwh9P7nzX3zPkCGFEg/tuElrNR7L/rZMagnK2JeH2jQwPRpmyXyLB6A==",
"version": "5.5.11",
"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.11.tgz",
"integrity": "sha512-3bjO7UwWfA2CV7lmwYMBzj4fQ6Cq+ftHc2MvUe+WMS7wcdJ1LosDWmdjPQanYp2dBRj572p7PeU81JUxHKOcBA==",
"dev": true,
"requires": {
"symbol-observable": "1.0.1"
......@@ -7001,20 +6999,12 @@
"dev": true
},
"is-observable": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/is-observable/-/is-observable-0.2.0.tgz",
"integrity": "sha1-s2ExHYPG5dcmyr9eJQsCNxBvWuI=",
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/is-observable/-/is-observable-1.1.0.tgz",
"integrity": "sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA==",
"dev": true,
"requires": {
"symbol-observable": "^0.2.2"
},
"dependencies": {
"symbol-observable": {
"version": "0.2.4",
"resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-0.2.4.tgz",
"integrity": "sha1-lag9smGG1q9+ehjb2XYKL4bQj0A=",
"dev": true
}
"symbol-observable": "^1.1.0"
}
},
"is-odd": {
......@@ -8152,16 +8142,16 @@
}
},
"listr": {
"version": "0.13.0",
"resolved": "https://registry.npmjs.org/listr/-/listr-0.13.0.tgz",
"integrity": "sha1-ILsLowuuZg7oTMBQPfS+PVYjiH0=",
"version": "0.14.1",
"resolved": "https://registry.npmjs.org/listr/-/listr-0.14.1.tgz",
"integrity": "sha512-MSMUUVN1f8aRnPi4034RkOqdiUlpYW+FqwFE3aL0uYNPRavkt2S2SsSpDDofn8BDpqv2RNnsdOcCHWsChcq77A==",
"dev": true,
"requires": {
"chalk": "^1.1.3",
"@samverschueren/stream-to-observable": "^0.3.0",
"cli-truncate": "^0.2.1",
"figures": "^1.7.0",
"indent-string": "^2.1.0",
"is-observable": "^0.2.0",
"is-observable": "^1.1.0",
"is-promise": "^2.1.0",
"is-stream": "^1.1.0",
"listr-silent-renderer": "^1.1.1",
......@@ -8171,8 +8161,7 @@
"log-update": "^1.0.2",
"ora": "^0.2.3",
"p-map": "^1.1.1",
"rxjs": "^5.4.2",
"stream-to-observable": "^0.2.0",
"rxjs": "^6.1.0",
"strip-ansi": "^3.0.1"
},
"dependencies": {
......@@ -8214,26 +8203,11 @@
"chalk": "^1.0.0"
}
},
"rxjs": {
"version": "5.5.10",
"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.10.tgz",
"integrity": "sha512-SRjimIDUHJkon+2hFo7xnvNC4ZEHGzCRwh9P7nzX3zPkCGFEg/tuElrNR7L/rZMagnK2JeH2jQwPRpmyXyLB6A==",
"dev": true,
"requires": {
"symbol-observable": "1.0.1"
}
},
"supports-color": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
"dev": true
},
"symbol-observable": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz",
"integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=",
"dev": true
}
}
},
......@@ -12826,15 +12800,6 @@
"integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
"dev": true
},
"stream-to-observable": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/stream-to-observable/-/stream-to-observable-0.2.0.tgz",
"integrity": "sha1-WdbqOT2HwsDdrBCqDVYbxrpvDhA=",
"dev": true,
"requires": {
"any-observable": "^0.2.0"
}
},
"streamroller": {
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/streamroller/-/streamroller-0.7.0.tgz",
......@@ -13758,9 +13723,9 @@
"optional": true
},
"v8-compile-cache": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-1.1.2.tgz",
"integrity": "sha512-ejdrifsIydN1XDH7EuR2hn8ZrkRKUYF7tUcBjBy/lhrCvs2K+zRlbW9UHc0IQ9RsYFZJFqJrieoIHfkCa0DBRA==",
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.0.tgz",
"integrity": "sha512-qNdTUMaCjPs4eEnM3W9H94R3sU70YCuT+/ST7nUf+id1bVOrdjrpUaeZLqPBPRph3hsgn4a4BvwpxhHZx+oSDg==",
"dev": true
},
"validate-npm-package-license": {
......@@ -14120,37 +14085,37 @@
}
},
"webpack-cli": {
"version": "2.1.3",
"resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-2.1.3.tgz",
"integrity": "sha512-5AsKoL/Ccn8iTrwk3uErdyhetGH+c7VRQ7Itim2GL0IhBRq5rtojVDk00buMRmFmBpw1RvHXq97Gup965LbozA==",
"version": "2.1.4",
"resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-2.1.4.tgz",
"integrity": "sha512-dcxBcTPhKczWHYE9jh8MoHGQFuJxfqshZ3XSNFZ8o34heVvkqNvSRbMKy17NML+XUea7CXLzHWDg7a0GsBp7Pg==",
"dev": true,
"requires": {
"chalk": "^2.3.2",
"chalk": "^2.4.1",
"cross-spawn": "^6.0.5",
"diff": "^3.5.0",
"enhanced-resolve": "^4.0.0",
"envinfo": "^4.4.2",
"envinfo": "^5.7.0",
"glob-all": "^3.1.0",
"global-modules": "^1.0.0",
"got": "^8.2.0",
"got": "^8.3.1",
"import-local": "^1.0.0",
"inquirer": "^5.1.0",
"interpret": "^1.0.4",
"inquirer": "^5.2.0",
"interpret": "^1.1.0",
"jscodeshift": "^0.5.0",
"listr": "^0.13.0",
"listr": "^0.14.1",
"loader-utils": "^1.1.0",
"lodash": "^4.17.5",
"lodash": "^4.17.10",
"log-symbols": "^2.2.0",
"mkdirp": "^0.5.1",
"p-each-series": "^1.0.0",
"p-lazy": "^1.0.0",
"prettier": "^1.5.3",
"supports-color": "^5.3.0",
"v8-compile-cache": "^1.1.2",
"prettier": "^1.12.1",
"supports-color": "^5.4.0",
"v8-compile-cache": "^2.0.0",
"webpack-addons": "^1.1.5",
"yargs": "^11.1.0",
"yeoman-environment": "^2.0.0",
"yeoman-generator": "^2.0.4"
"yeoman-environment": "^2.1.1",
"yeoman-generator": "^2.0.5"
},
"dependencies": {
"ansi-regex": {
......@@ -14866,12 +14831,12 @@
},
"dependencies": {
"async": {
"version": "2.6.0",
"resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz",
"integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==",
"version": "2.6.1",
"resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
"integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
"dev": true,
"requires": {
"lodash": "^4.14.0"
"lodash": "^4.17.10"
}
},
"cross-spawn": {
......
......@@ -87,7 +87,7 @@
"ts-node": "~6.0.3",
"tslint": "~5.10.0",
"typescript": "^2.7",
"webpack-cli": "^2.1.3"
"webpack-cli": "^2.1.4"
},
"keywords": [
"arsnova",
......
......@@ -35,7 +35,6 @@ export class AnsweroptionsComponent implements OnInit, OnDestroy {
this.footerBarService.replaceFooterElements([
this.footerBarService.footerElemBack,
this.footerBarService.footerElemNicknames,
this.footerBarService.footerElemSaveAssets,
this.footerBarService.footerElemProductTour,
]);
}
......
......@@ -73,7 +73,6 @@ export class CountdownComponent implements OnInit, OnDestroy {
this.footerBarService.replaceFooterElements([
this.footerBarService.footerElemBack,
this.footerBarService.footerElemNicknames,
this.footerBarService.footerElemSaveAssets,
this.footerBarService.footerElemProductTour,
]);
}
......
......@@ -35,7 +35,6 @@ export class QuestiontextComponent implements OnInit, OnDestroy {
this.footerBarService.replaceFooterElements([
this.footerBarService.footerElemBack,
this.footerBarService.footerElemNicknames,
this.footerBarService.footerElemSaveAssets,
this.footerBarService.footerElemProductTour,
]);
}
......
......@@ -40,7 +40,6 @@ export class QuestiontypeComponent implements OnInit, OnDestroy {
this.footerBarService.replaceFooterElements([
this.footerBarService.footerElemBack,
this.footerBarService.footerElemNicknames,
this.footerBarService.footerElemSaveAssets,
this.footerBarService.footerElemProductTour,
]);
}
......
......@@ -42,7 +42,6 @@ export class QuizManagerDetailsOverviewComponent implements OnInit, OnDestroy {
this.footerBarService.replaceFooterElements([
this.footerBarService.footerElemBack,
this.footerBarService.footerElemNicknames,
this.footerBarService.footerElemSaveAssets,
this.footerBarService.footerElemProductTour,
]);
}
......
......@@ -51,7 +51,6 @@ export class QuizManagerComponent implements OnDestroy {
this.footerBarService.footerElemStartQuiz,
this.footerBarService.footerElemProductTour,
this.footerBarService.footerElemNicknames,
this.footerBarService.footerElemSaveAssets,
this.footerBarService.footerElemMemberGroup,
]);
......
......@@ -73,9 +73,6 @@ export class ActiveQuestionGroupService {
this.footerBarService.footerElemEnableCasLogin.isActive = this.activeQuestionGroup.sessionConfig.nicks.restrictToCasLogin;
this.footerBarService.footerElemBlockRudeNicknames.isActive = this.activeQuestionGroup.sessionConfig.nicks.blockIllegalNicks;
if (window.localStorage.getItem('config.cache_assets') === 'true') {
this.footerBarService.footerElemSaveAssets.isActive = true;
}
this.footerBarService.footerElemEnableCasLogin.onClickCallback = () => {
const newState = !this.footerBarService.footerElemEnableCasLogin.isActive;
this.footerBarService.footerElemEnableCasLogin.isActive = newState;
......@@ -88,14 +85,6 @@ export class ActiveQuestionGroupService {
this.activeQuestionGroup.sessionConfig.nicks.blockIllegalNicks = newState;
this.persist();
};
this.footerBarService.footerElemSaveAssets.onClickCallback = () => {
const newState = !this.footerBarService.footerElemSaveAssets.isActive;
this.footerBarService.footerElemSaveAssets.isActive = newState;
this.settingsService.serverSettings.cacheQuizAssets = newState;
if (isPlatformBrowser(this.platformId)) {
window.localStorage.setItem('config.cache_assets', `${newState}`);
}
};
}
}
......
......@@ -225,6 +225,10 @@ export class FooterBarService {
linkTarget: null,
}, function (): void {
});
/*
* Currently unused since the server decides if it will cache the quiz contents
*/
public footerElemSaveAssets: IFooterBarElement = new FooterbarElement({
id: 'saveAssets',
iconClass: 'fas fa-cloud',
......@@ -235,6 +239,7 @@ export class FooterBarService {
linkTarget: null,
}, function (): void {
});
public footerElemBlockRudeNicknames: IFooterBarElement = new FooterbarElement({
id: 'blockRudeNicknames',
iconClass: 'fas fa-lock',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment