diff --git a/Dockerfile b/Dockerfile index 068c97cf988de657a74d6bfe3dd3f643a561c839..ae36f2b488d5ad31aea63f155ccaeb8e9932e0e2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ FROM thecodingmachine/php:8.0-v4-slim-apache # | USER root -RUN cd /usr/local/lib/thecodingmachine-php/extensions/current/ && ./install_all.sh && ./disable_all.sh && a2enmod headers +RUN cd /usr/local/lib/thecodingmachine-php/extensions/current/ && ./install_all.sh && ./disable_all.sh USER docker # |-------------------------------------------------------------------------- @@ -46,8 +46,8 @@ ENV APP_ENV=prod \ # | Run Apache as www-data for more security # |-------------------------------------------------------------------------- ENV APACHE_RUN_USER=www-data \ - APACHE_RUN_GROUP=www-data - + APACHE_RUN_GROUP=www-data \ + APACHE_EXTENSIONS=headers # |-------------------------------------------------------------------------- # | Add php files of website # |-------------------------------------------------------------------------- diff --git a/public/yarn-error.log b/public/yarn-error.log deleted file mode 100644 index 6556db86af892bf3a7c0eff556c6198875181d6b..0000000000000000000000000000000000000000 --- a/public/yarn-error.log +++ /dev/null @@ -1,37 +0,0 @@ -Arguments: - C:\Program Files\nodejs\node.exe C:\Program Files (x86)\Yarn\bin\yarn.js init - -PATH: - C:\Program Files (x86)\VMware\VMware Workstation\bin\;C:\Program Files (x86)\Common Files\Intel\Shared Libraries\redist\intel64\compiler;C:\Program Files\Oculus\Support\oculus-runtime;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files\PuTTY\;C:\Program Files (x86)\Windows Kits\8.1\Windows Performance Toolkit\;C:\Program Files\Git\cmd;C:\Program Files (x86)\Touch Portal\plugins\adb\platform-tools;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\110\Tools\Binn\;D:\gitlab_runner;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\WINDOWS\System32\OpenSSH\;C:\Program Files\nodejs\;C:\ProgramData\chocolatey\bin;C:\Program Files (x86)\Microsoft SQL Server\100\Tools\Binn\;C:\Program Files\Microsoft SQL Server\100\Tools\Binn\;C:\Program Files\Microsoft SQL Server\100\DTS\Binn\;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn\;C:\Program Files\dotnet\;C:\Program Files (x86)\STMicroelectronics\STM32 ST-LINK Utility\ST-LINK Utility;C:\Program Files\LLVM\bin;C:\Program Files\Multipass\bin;C:\ProgramData\ComposerSetup\bin;C:\Program Files (x86)\Microsoft SQL Server\120\Tools\Binn\;C:\Program Files\Microsoft SQL Server\120\Tools\Binn\;C:\Program Files\Microsoft SQL Server\120\DTS\Binn\;C:\WINDOWS\system32;D:\dartsdk-windows-x64-release\dart-sdk\bin;D:\dartsdk-windows-x64-release\flutter\bin;D:\php-7.4.11;C:\MinGW\bin;C:\Program Files (x86)\Gow\bin;C:\Users\admin\AppData\Local\Programs\Python\Python38;C:\Program Files (x86)\Graphviz2.38\bin;C:\Program Files (x86)\Microsoft SQL Server\150\DTS\Binn\;C:\Program Files\Azure Data Studio\bin;C:\Program Files\Microsoft SQL Server\110\Tools\Binn\;C:\Program Files\WireGuard\;C:\Program Files\WorldPainter;C:\Program Files\Docker\Docker\resources\bin;C:\ProgramData\DockerDesktop\version-bin;C:\Program Files (x86)\Streamlink\bin;D:\sdk\go\bin;C:\Program Files (x86)\Yarn\bin\;D:\Ruby27-x64\bin;d:\chrome\tools;C:\Program Files (x86)\VMware\VMware Workstation\bin\;C:\Program Files (x86)\Common Files\Intel\Shared Libraries\redist\intel64\compiler;C:\Program Files\Oculus\Support\oculus-runtime;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files\PuTTY\;C:\Program Files (x86)\Windows Kits\8.1\Windows Performance Toolkit\;C:\Program Files\Git\cmd;C:\Program Files (x86)\Touch Portal\plugins\adb\platform-tools;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\110\Tools\Binn\;D:\gitlab_runner;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\WINDOWS\System32\OpenSSH\;C:\Program Files\nodejs\;C:\ProgramData\chocolatey\bin;C:\Program Files (x86)\Microsoft SQL Server\100\Tools\Binn\;C:\Program Files\Microsoft SQL Server\100\Tools\Binn\;C:\Program Files\Microsoft SQL Server\;C:\Users\admin\AppData\Local\Programs\Python\Python38\Scripts;C:\Users\admin\AppData\Roaming\Python\Python38\Scripts;C:\Program Files\Azure Data Studio\bin;C:\Users\admin\AppData\Local\Programs\Microsoft VS Code\bin;C:\Program Files\Docker\Docker\resources\bin;C:\Users\admin\go\bin;C:\Python27\DLLs;C:\Users\admin\AppData\Local\Yarn\bin - -Yarn version: - 1.22.5 - -Node version: - 12.16.1 - -Platform: - win32 x64 - -Trace: - Error: canceled - at Interface.<anonymous> (C:\Program Files (x86)\Yarn\lib\cli.js:137009:13) - at Interface.emit (events.js:311:20) - at Interface._ttyWrite (readline.js:893:16) - at ReadStream.onkeypress (readline.js:198:10) - at ReadStream.emit (events.js:311:20) - at emitKeys (internal/readline/utils.js:438:14) - at emitKeys.next (<anonymous>) - at ReadStream.onData (readline.js:1160:36) - at ReadStream.emit (events.js:311:20) - at addChunk (_stream_readable.js:294:12) - -npm manifest: - No manifest - -yarn manifest: - No manifest - -Lockfile: - # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. - # yarn lockfile v1 diff --git a/public/yarn.lock b/public/yarn.lock deleted file mode 100644 index fb57ccd13afbd082ad82051c2ffebef4840661ec..0000000000000000000000000000000000000000 --- a/public/yarn.lock +++ /dev/null @@ -1,4 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - diff --git a/scss/menue.scss b/scss/menue.scss index 0e33bd4577c2d83ccafbf926adbbb8fb97ef913e..d49f911fc3f05ab1fabcde6e146c8e26200857fb 100644 --- a/scss/menue.scss +++ b/scss/menue.scss @@ -6,14 +6,14 @@ align-content: flex-end; justify-content: flex-end; width: 100%; -} -#mainMenu a { - color: white; - text-align: center; - padding: 14px 16px; - text-decoration: none; - display: inline-block; + a { + color: white; + text-align: center; + padding: 14px 16px; + text-decoration: none; + display: inline-block; + } } .dropdown { diff --git a/scss/ntp.scss b/scss/ntp.scss index 1016f4f5725ecb3fb7f603f4aadd234923062cf8..f757254db618ef7de2307338336795e464f257fa 100644 --- a/scss/ntp.scss +++ b/scss/ntp.scss @@ -11,22 +11,21 @@ stroke: #00f; stroke-width: 2px; } -.graph rect { - fill: none; - stroke: #000; - shape-rendering: crispEdges; -} -#graph .y line, -.graph .x line, -.graph .y_score line { - stroke: #ccc; - shape-rendering: crispEdges; -} -.graph .y_score line { - stroke: #ddd; - stroke-dasharray: 2, 2, 2, 2; -} - -.graph svg{ - background-color: #ebebeb; +.graph { + rect { + fill: none; + stroke: #000; + shape-rendering: crispEdges; + } + .y line, .x line, .y_score line { + stroke: #ccc; + shape-rendering: crispEdges; + } + .y_score line { + stroke: #ddd; + stroke-dasharray: 2, 2, 2, 2; + } + svg{ + background-color: #ebebeb; + } } \ No newline at end of file