Merge branch 'dev' into 'main'
New updates See merge request evilthings-services/mstar!2
This commit is contained in:
mStar aka a person
commit
29d8bb96ea
5 changed files with 153 additions and 82 deletions
2
main.go
2
main.go
|
|
@ -43,7 +43,7 @@ func main() {
|
||||||
http.HandleFunc("/cat/awawawa", awawaStream)
|
http.HandleFunc("/cat/awawawa", awawaStream)
|
||||||
|
|
||||||
// static files in /static
|
// static files in /static
|
||||||
http.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.FS(embed_static))))
|
http.Handle("/static/", http.FileServer(http.FS(embed_static)))
|
||||||
|
|
||||||
// .well-known from /well-known
|
// .well-known from /well-known
|
||||||
http.Handle("/.well-known/", http.StripPrefix("/.well-known/", http.FileServer(http.FS(embed_well_known))))
|
http.Handle("/.well-known/", http.StripPrefix("/.well-known/", http.FileServer(http.FS(embed_well_known))))
|
||||||
|
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
paban
|
|
||||||
|
|
@ -0,0 +1,13 @@
|
||||||
|
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||||
|
|
||||||
|
xjMEZdyUGBYJKwYBBAHaRw8BAQdAHPAK4Dcxlt9y7L2uSRc2BKMk7zDWN9Nd
|
||||||
|
5nS9fssWLhLNG21lQG1zdGFyLmRldiA8bWVAbXN0YXIuZGV2PsKMBBAWCgA+
|
||||||
|
BYJl3JQYBAsJBwgJkAU6LZrw8DJgAxUICgQWAAIBAhkBApsDAh4BFiEEJ/yq
|
||||||
|
vTAirP8CPm4qBTotmvDwMmAAAKTfAQD0ewBh/guakvHaUyDTM6wJToSkw5xu
|
||||||
|
HL69SjQNYwhr/AEAq71YEYYk9rRw4QkMinK/y/m+ee9cGqD6aGEcie4mGQvO
|
||||||
|
OARl3JQYEgorBgEEAZdVAQUBAQdAN5mPRNShP0JBSm4dkW87atJa/N+ryjK0
|
||||||
|
LFBHLmeMiRcDAQgHwngEGBYKACoFgmXclBgJkAU6LZrw8DJgApsMFiEEJ/yq
|
||||||
|
vTAirP8CPm4qBTotmvDwMmAAACz7AP0YJslXLzCd57QxUfWMZcdJZp+27Dld
|
||||||
|
/lfTxClP1NLvAwEAz7lqe23bhwgrC21xdKipJkSH391Ydd0N5GsAMoeD/Ak=
|
||||||
|
=kQax
|
||||||
|
-----END PGP PUBLIC KEY BLOCK-----
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
@import url('https://fonts.googleapis.com/css2?family=Cantarell&display=swap');
|
@import url('https://fonts.googleapis.com/css2?family=Cantarell&display=swap');
|
||||||
|
|
||||||
* {
|
* {
|
||||||
/* Some global vars for colors*/
|
/* Some global vars for colors*/
|
||||||
--text: #0c0311;
|
--text: #0c0311;
|
||||||
|
|
@ -9,15 +10,15 @@
|
||||||
|
|
||||||
font-family: Cantarell, serif;
|
font-family: Cantarell, serif;
|
||||||
}
|
}
|
||||||
body {
|
|
||||||
background: var(--background);
|
|
||||||
}
|
|
||||||
table {
|
table {
|
||||||
border-collapse: collapse;
|
border-collapse: collapse;
|
||||||
}
|
}
|
||||||
|
|
||||||
td, th {
|
td, th {
|
||||||
border: 1px solid var(--accent);
|
border-width: 1px;
|
||||||
|
border-style: solid;
|
||||||
|
border-color: #7924b2;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
padding: 8px;
|
padding: 8px;
|
||||||
}
|
}
|
||||||
|
|
@ -25,6 +26,26 @@ td, th {
|
||||||
tr:nth-child(even) {
|
tr:nth-child(even) {
|
||||||
background-color: var(--secondary);
|
background-color: var(--secondary);
|
||||||
}
|
}
|
||||||
|
|
||||||
footer {
|
footer {
|
||||||
font-size: small;
|
font-size: small;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.size-to-max-inner-content {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
justify-content: center;
|
||||||
|
max-width: max-content;
|
||||||
|
}
|
||||||
|
|
||||||
|
.center-inner {
|
||||||
|
display: flex;
|
||||||
|
align-content: center;
|
||||||
|
flex-direction: row;
|
||||||
|
text-align: center;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.add-background {
|
||||||
|
background: var(--background);
|
||||||
|
}
|
||||||
|
|
@ -1,20 +1,19 @@
|
||||||
<!DOCTYPE html>
|
<!doctype html>
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
<head>
|
<head>
|
||||||
<script src="https://unpkg.com/htmx.org@1.9.5"></script>
|
<link rel="stylesheet" href="/static/styles/index.css" />
|
||||||
<link rel="stylesheet" href="/static/styles/index.css">
|
<meta charset="UTF-8" />
|
||||||
<meta charset="UTF-8">
|
|
||||||
<title>m*</title>
|
<title>m*</title>
|
||||||
<style>
|
|
||||||
@import url('https://fonts.googleapis.com/css2?family=Cantarell&display=swap');
|
|
||||||
* {
|
|
||||||
font-family: Cantarell, sans-serif;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
</head>
|
</head>
|
||||||
<body>
|
|
||||||
|
<body class="add-background">
|
||||||
|
<div class="center-inner">
|
||||||
|
<div class="size-to-max-inner-content">
|
||||||
<h1>Welcome to my personal webpage</h1>
|
<h1>Welcome to my personal webpage</h1>
|
||||||
<p>Here you'll be able to find various information about me, including social network links/names</p>
|
<p>
|
||||||
|
Here you'll be able to find various information about me, including
|
||||||
|
social network links/names
|
||||||
|
</p>
|
||||||
<h3>Some information about me</h3>
|
<h3>Some information about me</h3>
|
||||||
<table>
|
<table>
|
||||||
<tr>
|
<tr>
|
||||||
|
|
@ -30,7 +29,7 @@
|
||||||
<td>German, English</td>
|
<td>German, English</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
<br>
|
<br />
|
||||||
<h3>You can find me on:</h3>
|
<h3>You can find me on:</h3>
|
||||||
<table>
|
<table>
|
||||||
<tr>
|
<tr>
|
||||||
|
|
@ -38,41 +37,80 @@
|
||||||
<th>Link/Username</th>
|
<th>Link/Username</th>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>Mastodon</td>
|
<td>Fedi</td>
|
||||||
<td><a rel="me" href="https://woem.men/@mstar">https://mk.absturztau.be/@m_star</a></td>
|
<td>
|
||||||
|
<a rel="me" href="https://woem.men/@mstar"
|
||||||
|
>https://woem.men/@mstar</a
|
||||||
|
>
|
||||||
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>Discord</td>
|
<td>Discord</td>
|
||||||
<td><p>m_star</p></td>
|
<td>
|
||||||
|
<p>m_star</p>
|
||||||
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>Pronouns page</td>
|
<td>Pronouns page</td>
|
||||||
<td><a href="https://en.pronouns.page/@m_evil">https://en.pronouns.page/@m_evil</a></td>
|
<td>
|
||||||
|
<a href="https://en.pronouns.page/@m_evil"
|
||||||
|
>https://en.pronouns.page/@m_evil</a
|
||||||
|
>
|
||||||
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>Gitlab</td>
|
<td>Gitlab</td>
|
||||||
<td><a href="https://gitlab.com/mstarongitlab">https://gitlab.com/beckersam</a></td>
|
<td>
|
||||||
|
<a href="https://gitlab.com/mstarongitlab"
|
||||||
|
>https://gitlab.com/mstarongitlab</a
|
||||||
|
>
|
||||||
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>Github</td>
|
<td>Github</td>
|
||||||
<td><a href="https://github.com/mstarongithub/">https://github.com/mstarongithub/</a></td>
|
<td>
|
||||||
|
<a href="https://github.com/mstarongithub/"
|
||||||
|
>https://github.com/mstarongithub/</a
|
||||||
|
>
|
||||||
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>Twitch</td>
|
<td>Twitch</td>
|
||||||
<td><a href="https://twitch.tv/mstarontwitch">https://twitch.tv/mstarontwitch</a></td>
|
<td>
|
||||||
|
<a href="https://twitch.tv/mstarontwitch"
|
||||||
|
>https://twitch.tv/mstarontwitch</a
|
||||||
|
>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>Youtube</td>
|
||||||
|
<td>
|
||||||
|
<a href="https://www.youtube.com/channel/UC-LklY_wt004i_30xcVohbg"
|
||||||
|
>https://www.youtube.com/channel/UC-LklY_wt004i_30xcVohbg</a
|
||||||
|
>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<!-- Rickroll -->
|
||||||
|
<td>Twitter</td>
|
||||||
|
<td>
|
||||||
|
<a href="https://www.youtube.com/watch?v=dQw4w9WgXcQ">https://twitter.com/mstar</a>
|
||||||
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
<ul>
|
<ul>
|
||||||
<li><a href="https://foxgirls.love/web">Fren Erika</a></li>
|
<li><a href="https://foxgirls.love/web">Fren Erika</a></li>
|
||||||
<li><a href="https://linktr.ee/akijam">Fren Aki</a></li>
|
<li><a href="https://linktr.ee/akijam">Fren Aki</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
<hr>
|
<hr />
|
||||||
<p>Todo: Add proper styling</p>
|
<p>Todo: Add proper styling</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<footer>
|
<footer>
|
||||||
<p>Last updated: 08.01.2024: 14:19</p>
|
<p>Contact: <a href="mailto:me@mstar.dev">me@mstar.dev</> (<a href="/static/files/other/publickey.me@mstar.dev-27fcaabd3022acff023e6e2a053a2d9af0f03260.asc">Public PGP key</a>)</p>
|
||||||
<p>
|
<p>Last updated: 20.04.2024</p>
|
||||||
Privacy notice: This webserver stores no information
|
<p>Privacy notice: This webserver stores no information</p>
|
||||||
</p>
|
|
||||||
</footer>
|
</footer>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue