diff --git a/.dockerignore b/.dockerignore
index f515b5ae39408d58da6cd8f0dd8224afdec2c36c..785c53459e7ecb7cdef178374d1b2a9053c80e0f 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -8,6 +8,7 @@ public/internal/config.php
#phpstorm
.idea/
-# css / scss
+# css, scss, js
public/css/
-.sass-cache/
\ No newline at end of file
+.sass-cache/
+public/js/
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 380767e25af48988477fafaa841d9a70970cb1f3..f31f51e88a6687d35fdc3fb494452c35a94a1112 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,6 @@ public/internal/config.php
#phpstorm
.idea/
-# css / scss
public/css/
+public/js/
.sass-cache/
\ No newline at end of file
diff --git a/devSetup.bat b/devSetup.bat
new file mode 100644
index 0000000000000000000000000000000000000000..930d737985030a606998970259f5ed1cfe2a54db
--- /dev/null
+++ b/devSetup.bat
@@ -0,0 +1,5 @@
+start sass --watch --style compressed scss/:public/css
+
+cd public
+start php -S 127.0.0.1:8081
+start tsc --watchJ
\ No newline at end of file
diff --git a/public/js/cookie.js b/public/js/cookie.js
deleted file mode 100644
index c807a697650a7d9f68d31106f90bcc3aaed1b00d..0000000000000000000000000000000000000000
--- a/public/js/cookie.js
+++ /dev/null
@@ -1,26 +0,0 @@
-"use strict";
-function acceptCookie() {
- document.cookie = "cookieMessageHide=1";
- checkHide();
-}
-function getCookie(name) {
- var nameEQ = name + "=";
- var ca = document.cookie.split(";");
- for (var i = 0; i < ca.length; i++) {
- var c = ca[i];
- while (c.charAt(0) === " ")
- c = c.substr(1, c.length);
- if (c.indexOf(nameEQ) === 0)
- return c.substr(nameEQ.length, c.length);
- }
- return null;
-}
-function checkHide() {
- var cookieInfo = document.getElementsByClassName("cookieinfo")[0];
- if (getCookie("cookieMessageHide") === "1") {
- cookieInfo.style.display = "none";
- }
- else {
- cookieInfo.style.display = "block";
- }
-}
diff --git a/public/js/includeHTML.js b/public/js/includeHTML.js
deleted file mode 100644
index 7c476e7ba1e7858a3cf6581c62c5e0e38de84d8a..0000000000000000000000000000000000000000
--- a/public/js/includeHTML.js
+++ /dev/null
@@ -1,25 +0,0 @@
-"use strict";
-var z = document.getElementsByTagName("*");
-var _loop_1 = function (i) {
- var element = z[i];
- var externalFileURL = element.getAttribute("includeHTML");
- if (externalFileURL != "") {
- var xhr = new XMLHttpRequest();
- xhr.onreadystatechange = function () {
- if (this.readyState == 4) {
- if (this.status == 200) {
- element.innerHTML = this.responseText;
- }
- if (this.status == 404) {
- element.innerHTML = "Page not found.";
- }
- element.removeAttribute("includeHTML");
- }
- };
- xhr.open("GET", externalFileURL, true);
- xhr.send();
- }
-};
-for (var i = 0; i < z.length; i++) {
- _loop_1(i);
-}
diff --git a/ts/cookie.ts b/ts/cookie.ts
index a11c3c6b7be8874d964aa200ed87d6e96f82816b..03cb74488bb4024dbfc27666e1ba79f830b6245b 100644
--- a/ts/cookie.ts
+++ b/ts/cookie.ts
@@ -3,7 +3,7 @@ function acceptCookie(){
checkHide();
}
-function getCookie(name){
+function getCookie(name:string){
var nameEQ = name + "=";
var ca = document.cookie.split(";");
for (var i=0; i < ca.length; i++) {
@@ -15,9 +15,10 @@ function getCookie(name){
}
function checkHide(){
+ let cookieInfo: HTMLElement = <HTMLElement> document.getElementsByClassName("cookieinfo")[0];
if (getCookie("cookieMessageHide") === "1"){
- document.getElementsByClassName("cookieinfo")[0].style.display = "none";
+ cookieInfo.style.display = "none";
} else {
- document.getElementsByClassName("cookieinfo")[0].style.display = "block";
+ cookieInfo.style.display = "block";
}
}
\ No newline at end of file
diff --git a/ts/includeHTML.ts b/ts/includeHTML.ts
index c7d0623075359ded634657666c801ebaef382ac5..989b0aa11616ed9fe2ada430572127ba3cbc246a 100644
--- a/ts/includeHTML.ts
+++ b/ts/includeHTML.ts
@@ -1,9 +1,10 @@
-let z = document.getElementsByTagName("*");
-for (let i = 0; i < z.length; i++) {
- let element = z[i];
- let externalFileURL = element.getAttribute("includeHTML");
- if (externalFileURL) {
- let xhr = new XMLHttpRequest();
+let z:HTMLCollectionOf<HTMLElement> = <HTMLCollectionOf<HTMLElement>> document.getElementsByTagName("*");
+
+for (let i:number = 0; i < z.length; i++) {
+ let element:HTMLElement = z[i];
+ let externalFileURL:string = <string> element.getAttribute("includeHTML");
+ if (externalFileURL != "") {
+ let xhr:XMLHttpRequest = new XMLHttpRequest();
xhr.onreadystatechange = function() {
if (this.readyState == 4) {
if (this.status == 200) { element.innerHTML = this.responseText; }
diff --git a/tsconfig.json b/tsconfig.json
new file mode 100644
index 0000000000000000000000000000000000000000..609bab067fed331697a03789002def2029d0afed
--- /dev/null
+++ b/tsconfig.json
@@ -0,0 +1,70 @@
+{
+ "compilerOptions": {
+ /* Visit https://aka.ms/tsconfig.json to read more about this file */
+
+ /* Basic Options */
+ // "incremental": true, /* Enable incremental compilation */
+ "target": "es5", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */
+ "module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
+ // "lib": [], /* Specify library files to be included in the compilation. */
+ // "allowJs": true, /* Allow javascript files to be compiled. */
+ // "checkJs": true, /* Report errors in .js files. */
+ // "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
+ // "declaration": true, /* Generates corresponding '.d.ts' file. */
+ // "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */
+ // "sourceMap": true, /* Generates corresponding '.map' file. */
+ // "outFile": "./", /* Concatenate and emit output to single file. */
+ "outDir": "./public/js", /* Redirect output structure to the directory. */
+ "rootDir": "./ts", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
+ // "composite": true, /* Enable project compilation */
+ // "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */
+ "removeComments": true, /* Do not emit comments to output. */
+ // "noEmit": true, /* Do not emit outputs. */
+ // "importHelpers": true, /* Import emit helpers from 'tslib'. */
+ // "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
+ // "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
+
+ /* Strict Type-Checking Options */
+ "strict": true, /* Enable all strict type-checking options. */
+ // "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */
+ // "strictNullChecks": true, /* Enable strict null checks. */
+ // "strictFunctionTypes": true, /* Enable strict checking of function types. */
+ // "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
+ // "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */
+ // "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */
+ // "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */
+
+ /* Additional Checks */
+ // "noUnusedLocals": true, /* Report errors on unused locals. */
+ // "noUnusedParameters": true, /* Report errors on unused parameters. */
+ // "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
+ // "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */
+ // "noUncheckedIndexedAccess": true, /* Include 'undefined' in index signature results */
+
+ /* Module Resolution Options */
+ // "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
+ // "baseUrl": "./", /* Base directory to resolve non-absolute module names. */
+ // "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
+ // "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */
+ // "typeRoots": [], /* List of folders to include type definitions from. */
+ // "types": [], /* Type declaration files to be included in compilation. */
+ // "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
+ "esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
+ // "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */
+ // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */
+
+ /* Source Map Options */
+ // "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */
+ // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
+ // "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */
+ // "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
+
+ /* Experimental Options */
+ // "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */
+ // "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */
+
+ /* Advanced Options */
+ "skipLibCheck": true, /* Skip type checking of declaration files. */
+ "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
+ }
+}