Merge pull request 'added plausible' (#17) from develop into master
All checks were successful
continuous-integration/drone/push Build is passing

Reviewed-on: #17
This commit is contained in:
Samuel Philipp 2020-08-02 18:50:19 +00:00
commit ec5b906d6c
5 changed files with 52 additions and 14 deletions

View file

@ -12,7 +12,24 @@ steps:
commands: commands:
- npm install - npm install
- npm run build - npm run build
- name: deploy - name: deploy-develop
image: alpine
environment:
FTP_HOST:
from_secret: FTP_HOST
FTP_USERNAME:
from_secret: FTP_USERNAME
FTP_PASSWORD:
from_secret: FTP_PASSWORD
commands:
- which lftp || ( apk --update add lftp )
- lftp -e "set ftp:ssl-force true; set ssl:verify-certificate no; mirror -R ./dist/ dev.sp-magic.de/; bye" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST
when:
branch:
- develop
event:
- push
- name: deploy-master
image: alpine image: alpine
environment: environment:
FTP_HOST: FTP_HOST:

View file

@ -10,8 +10,8 @@ Website for sp-magic.de
The following Parameters are set directly on the Web-Server. The following Parameters are set directly on the Web-Server.
``` ```
Content-Security-Policy: default-src 'none'; img-src 'self'; script-src 'self'; style-src 'self'; font-src 'self'; frame-ancestors 'none'; base-uri 'self'; form-action 'none' Content-Security-Policy: default-src 'none'; script-src 'self' https://plausible.sp-codes.de; object-src 'none'; style-src 'self'; img-src 'self' https://img.shields.io; media-src 'none'; frame-src 'none'; font-src 'self'; connect-src 'self' https://plausible.sp-codes.de
Referrer-Policy: same-origin Referrer-Policy: strict-origin-when-cross-origin
Feature-Policy: sync-xhr 'self' Feature-Policy: sync-xhr 'self'
Strict-Transport-Security: max-age=31536000; includeSubDomains; preload Strict-Transport-Security: max-age=31536000; includeSubDomains; preload
X-Content-Type-Options: nosniff X-Content-Type-Options: nosniff
@ -19,4 +19,4 @@ X-Frame-Options: DENY
X-XSS-Protection: 1; mode=block X-XSS-Protection: 1; mode=block
``` ```
There is also a `301` Redirect from http to https. There is also a `301` Redirect from http to https.

BIN
src/img/matrix.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

View file

@ -24,13 +24,13 @@
<meta property="og:description" content="Samuel Philipp - Software Engineer & Magician"> <meta property="og:description" content="Samuel Philipp - Software Engineer & Magician">
<meta property="og:site_name" content="sp-magic"> <meta property="og:site_name" content="sp-magic">
<meta property="og:image" content="https://sp-magic.de/img/sp-magic.jpg"> <meta property="og:image" content="https://sp-magic.de/img/sp-magic.jpg">
<!--<meta property="og:updated_time" content="">-->
<meta name="twitter:card" content="summary_large_image"> <meta name="twitter:card" content="summary_large_image">
<meta name="twitter:title" content="sp-magic"> <meta name="twitter:title" content="sp-magic">
<meta name="twitter:description" content="Samuel Philipp - Magician from Magdeburg"> <meta name="twitter:description" content="Samuel Philipp - Magician from Magdeburg">
<meta name="twitter:image" content="https://sp-magic.de/img/sp-magic.jpg"> <meta name="twitter:image" content="https://sp-magic.de/img/sp-magic.jpg">
<link rel="shortcut icon" href="img/samuel.png"> <link rel="shortcut icon" href="img/samuel.png">
<link rel="stylesheet" href="css/main.min.css"> <link rel="stylesheet" href="css/main.min.css">
<script async defer data-domain="sp-magic.de" src="https://plausible.sp-codes.de/js/plausible.js"></script>
</head> </head>
<body class="d-flex flex-column"> <body class="d-flex flex-column">
<div class="container flex-column flex-grow p-3"> <div class="container flex-column flex-grow p-3">
@ -54,10 +54,12 @@
</div> </div>
<div class="d-flex justify-content-center flex-wrap my-3"> <div class="d-flex justify-content-center flex-wrap my-3">
<div class="m-2"><a rel="me" href="https://social.tchncs.de/@samuel_p"><span
class="fab fa-fw fa-4x fa-mastodon"></span></a></div>
<div class="m-2"><a href="mailto:mail@sp-magic.de"><span <div class="m-2"><a href="mailto:mail@sp-magic.de"><span
class="fas fa-fw fa-4x fa-envelope"></span></a></div> class="fas fa-fw fa-4x fa-envelope"></span></a></div>
<div class="m-2"><a href="https://matrix.to/#/@samuel-p:matrix.sp-codes.de">
<img class="matrix-icon" src="../img/matrix.png" alt=""></a></div>
<div class="m-2"><a rel="me" href="https://social.tchncs.de/@samuel_p"><span
class="fab fa-fw fa-4x fa-mastodon"></span></a></div>
</div> </div>
<div class="d-flex justify-content-center mb-3"> <div class="d-flex justify-content-center mb-3">
@ -66,15 +68,21 @@
</div> </div>
</div> </div>
</div> </div>
<div class="d-flex justify-content-end flex-wrap p-2 menu"> <div class="d-flex justify-content-start flex-wrap p-2 menu border-top">
<div class="mr-3"><span class="far fa-copyright mr-2"></span>Samuel Philipp</div> <div class="d-flex justify-content-start flex-wrap">
<div class="flex-grow-1"></div> <div class="mr-3">Made with <span class="fas fa-heart highlight"></span> in Germany</div>
<div><a href="https://sp-codes.de/de/imprint"><span <div class="mr-3"><span class="far fa-copyright mr-2"></span>Samuel Philipp</div>
</div>
<div class="flex-sm-grow-1"></div>
<div class="d-flex justify-content-sm-start flex-wrap">
<div class="mr-3"><a href="https://sp-codes.de/de/imprint"><span
class="fas fa-info-circle mr-2"></span>Impressum</a></div> class="fas fa-info-circle mr-2"></span>Impressum</a></div>
<div class="ml-3"><a href="https://sp-codes.de/de/privacy"><span <div class="mr-3"><a href="https://sp-codes.de/de/privacy"><span
class="fas fa-user-secret mr-2"></span>Datenschutz</a></div> class="fas fa-user-secret mr-2"></span>Datenschutz</a></div>
<div class="ml-3"><a target="_blank" href="https://git.sp-codes.de/samuel-p/sp-magic.de"><span <div class="mr-3"><a target="_blank" href="https://git.sp-codes.de/samuel-p/sp-magic.de"><span
class="fas fa-code mr-2"></span>Code</a></div> class="fas fa-code mr-2"></span>Code</a></div>
<div><a target="_blank" href="https://plausible.sp-codes.de/sp-magic.de"><span
class="fas fa-chart-line mr-2"></span>Statistiken</a></div>
</div> </div>
</body> </body>
</html> </html>

View file

@ -81,4 +81,17 @@ a:hover {
.fa-4x { .fa-4x {
font-size: 2em; font-size: 2em;
} }
} }
.matrix-icon {
margin: 0 8px;
width: 4em;
height: 4em;
}
@media (max-width: 767.98px) {
.matrix-icon {
width: 2em;
height: 2em;
}
}