Merge branch 'master' of gitlab.jonasled.de:jonasled/website

.gitlab-ci.yml

@@ -24,3 +24,37 @@ docker-build:
     - if: $CI_COMMIT_BRANCH
       exists:
         - Dockerfile
+
+pages-build:node:
+  image: node:lts-alpine
+  stage: build
+  script:
+    - mkdir public/js
+    - mkdir public/css
+    - yarn install
+    - yarn compile
+  artifacts:
+    paths:
+      - public/
+
+pages-build:php:
+  image: composer:2
+  stage: build
+  script:
+    - cd public/API
+    - composer install
+  artifacts:
+    paths:
+      - public/
+
+pages:
+  image: busybox
+  stage: deploy
+  script:
+    - echo "Nothing to do"
+  dependencies:
+    - pages-build:node
+    - pages-build:php
+  artifacts:
+    paths:
+      - public

js/externalLinkHandler.js

@@ -2,7 +2,6 @@ document.onreadystatechange = function () {
      document.querySelectorAll("a").forEach((element) => {
          let href = element.href;
          if(href.indexOf(location.hostname) === -1){
-             console.log(href);
              element.target = "_blank";
          }
      });

js/loader.js

@@ -1,19 +0,0 @@
-let div = document.createElement("div");
-div.className = "loader";
-div.innerHTML = `<div class="loader-dots">
-  <div class="dots"></div>
-  <div class="dots"></div>
-  <div class="dots"></div>
-  <div class="dots"></div>
-  <div class="dots"></div>
-</div>`;
-
-document.body.classList.add("stop-scrolling");
-document.body.appendChild(div);
-
-document.addEventListener('readystatechange', event => {
-    if (event.target.readyState === "complete") {
-        document.querySelector(".loader").style.display = "none";
-        document.body.classList.remove("stop-scrolling");
-    }
-});

js/script.js

@@ -1,4 +1,3 @@
-require("./loader");
 require("./browserCheck");
 
 require("./error");

package.json

@@ -9,7 +9,7 @@
     "compile": "concurrently \"yarn css\" \"yarn js\"",
     "css": "sass scss/:public/css --style=compressed --no-source-map",
     "js": "webpack --config ./webpack.conf.js",
-    "watch": "concurrently \"sass --watch --style compressed scss/:public/css\" \"cd public && php -S locaLhost:1234\" \"webpack --config ./webpack.conf.js --mode development --watch\""
+    "watch": "concurrently \"sass --watch --style compressed scss/:public/css\" \"cd public && php -S localhost:1234\" \"webpack --config ./webpack.conf.js --mode development --watch\""
   },
   "devDependencies": {
     "concurrently": "^6.0.0",

public/index.html

@@ -30,6 +30,10 @@
             <a href="https://www.abuseipdb.com/user/45130" target="_blank"><img class="abuseIpImg no-corner"
                                                                                 data-noPreview="true"
                                                                                 src="https://www.abuseipdb.com/contributor/45130.svg"></a>
+            <a href="https://status.jonasled.de">
+                <img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/jonasled/status/master/api/website/uptime.json">
+                <img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/jonasled/status/master/api/website/response-time.json">
+            </a>
         </div>
         <br>
         <br>

scss/_loader.scss

@@ -1,66 +0,0 @@
-.loader {
-  width: 100%;
-  height: 100%;
-  position: absolute;
-  top: 0;
-  left: 0;
-  transition: visibility 0s, opacity 0.5s linear;
-  background-color: $back-color;
-
-  .loader-dots {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-
-    .dots {
-      position: absolute;
-      padding: 10px;
-      border-radius: 50%;
-      background: $accent-color;
-      -webkit-animation: loader 1s ease-in-out 0s infinite;
-      animation: loader 1s ease-in-out 0s infinite;
-
-      &:nth-child(1) {
-        -webkit-animation-delay: 0s;
-        animation-delay: 0s;
-      }
-
-      &:nth-child(2) {
-        -webkit-animation-delay: 0.15s;
-        animation-delay: 0.15s;
-      }
-
-      &:nth-child(3) {
-        -webkit-animation-delay: 0.30s;
-        animation-delay: 0.30s;
-      }
-
-      &:nth-child(4) {
-        -webkit-animation-delay: 0.45s;
-        animation-delay: 0.45s;
-      }
-    }
-
-  }
-}
-
-@keyframes loader {
-  0% {
-    -webkit-transform: translateX(-100px);
-    transform: translateX(-100px);
-    opacity: 0;
-  }
-  50% {
-    opacity: 1;
-  }
-  100% {
-    -webkit-transform: translateX(100px);
-    transform: translateX(100px);
-    opacity: 0;
-  }
-}
-
-.stop-scrolling {
-  height: 100%;
-  overflow: hidden;
-}

scss/style.scss

@@ -1,6 +1,5 @@
 @import "var";
 @import "colorMixer";
-@import "loader";
 @import "general";
 @import "menue";
 @import "normalize";