Compare commits

..

2 Commits

Author SHA1 Message Date
6cf9272f6b Many improvement 2021-03-21 00:28:48 +01:00
677accd35e Many improvement 2021-03-21 00:27:51 +01:00
9 changed files with 177 additions and 27 deletions

View File

@ -118,6 +118,7 @@ a {
text-align: center; text-align: center;
vertical-align:middle; vertical-align:middle;
display: flex; display: flex;
flex-flow: column;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
@ -126,6 +127,10 @@ a {
vertical-align: middle; vertical-align: middle;
} }
.center-txt{
text-align: center;
}
#li-nextcloud { background-image: url(/img/icons/Nextcloud_Logo.svg); } #li-nextcloud { background-image: url(/img/icons/Nextcloud_Logo.svg); }
#li-matrix { background-image: url(/img/icons/Matrix_Logo.svg); } #li-matrix { background-image: url(/img/icons/Matrix_Logo.svg); }

View File

@ -11,7 +11,6 @@
<?php include "../common/header.html"; ?> <?php include "../common/header.html"; ?>
<center>
<div class="cont"> <div class="cont">
@ -21,6 +20,5 @@
<li><a href="/active-forks/">Gaffelsøker</a></li> <li><a href="/active-forks/">Gaffelsøker</a></li>
</ul> </ul>
</div> </div>
</center>
</body> </body>
</html> </html>

View File

@ -41,16 +41,15 @@ session_start();
<?php include "../common/header.html"; ?> <?php include "../common/header.html"; ?>
<body> <body>
<center>
<div class="cont"> <div class="cont">
<h1>Filopplasting</h1> <h1 class="center-txt">Filopplasting</h1>
<p> <p class="center-txt">
Her kan du laste opp filer for å dele med andre. Filene kan være maks 5GB.<br /> Serveren ligger i Kristiansand og har 500/500 internet <br /> Her kan du laste opp filer for å dele med andre. Filene kan være maks 5GB.<br /> Serveren ligger i Kristiansand og har 500/500 internet <br />
All opplasting skjer eget ansvar. All opplasting skjer eget ansvar.
</p> </p>
<div> <div>
<a class="btn btn-info" href="http://trygve.me/filopplasting/filer/">Se alle filer</a> <a class="center-txt" href="http://trygve.me/filopplasting/filer/">Se alle filer</a>
</div> </div>
<hr class="my-4"> <hr class="my-4">
<div> <div>
@ -58,12 +57,46 @@ session_start();
<div class="form-group"> <div class="form-group">
<input type="hidden" name="<?php echo ini_get("session.upload_progress.name"); ?>" value="123" /> <input type="hidden" name="<?php echo ini_get("session.upload_progress.name"); ?>" value="123" />
<input type="file" name="file" class="" > <input type="file" name="file" class="" >
<button type="submit" class="btn btn-raised btn-primary">Last opp </button> <button type="submit" class="btn btn-primary">Last opp </button>
</div> </div>
</form> </form>
</div> </div>
<?php
$errorMSG = '
<div class="alert alert-warning" role="alert">
Hmmmm 🤔 Her var det visst noe som gikk galt.
</div>';
$bannedMSG = '
<div class="alert alert-warning" role="alert">
Denne filtypen er ikke tillatt.
</div>';
if(isset($_SESSION['fileupload-response'])) {
if($_SESSION['fileupload-response'] == "success") {
$successMSG = '
<div class="alert alert-primary center" role="alert">
'
. $_SESSION['linkData'] .
'
<button type="button" class="btn btn-primary" onclick="copyToClipboard(\'' . $_SESSION['link'] . '\')">Kopier lenke</button>
</div>
';
echo($successMSG);
}
elseif ($_SESSION['fileupload-response'] == "failed") {
echo($errorMSG);
}
elseif ($_SESSION['fileupload-response'] == "banned") {
echo($bannedMSG);
}
session_destroy();
}
?>
</ul> </ul>
</div> </div>
</center>
</body> </body>
</html> </html>

View File

@ -33,17 +33,14 @@
<?php include "../common/header.html"; ?> <?php include "../common/header.html"; ?>
<center>
<div class="cont"> <div class="cont">
<h1>Direktesending fra fuglekassa</h1> <h1 class="center-txt">Direktesending fra fuglekassa</h1>
<video id="live_stream" class="video-js responsive main-vid vjs-theme-forest" controls autoplay="true" preload="auto" <video id="live_stream" class="video-js responsive main-vid vjs-theme-forest" controls autoplay="true" preload="auto"
data-setup='{"controls": true, "autoplay": true, "responsive": true, "fluid": true}'> data-setup='{"controls": true, "autoplay": true, "responsive": true, "fluid": true}'>
<source src="https://trygve.me:8080/hls/stream.m3u8" type="application/x-mpegURL"> <source src="https://trygve.me:8080/hls/stream.m3u8" type="application/x-mpegURL">
</video> </video>
</div> </div>
</center>
</body>
<script src="./video-js/video.js"></script> <script src="./video-js/video.js"></script>
<script> <script>
var player = videojs('live_stream'); var player = videojs('live_stream');

81
img/icons/Jitsi_Logo.svg Normal file

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 14 KiB

View File

@ -6,29 +6,47 @@
<meta name="theme-color" content="#263238"/> <meta name="theme-color" content="#263238"/>
<link rel="icon" type="image/png" href="/dist/favicon.png"> <link rel="icon" type="image/png" href="/dist/favicon.png">
<link rel="stylesheet" href="/css/main.css"> <link rel="stylesheet" href="/css/main.css">
<style>
.btn-bg {
width: 90%;
height: 90%;
background-size: contain;
background-position: center;
background-repeat: no-repeat;
}
#bg-nextcloud { background-image: url(/img/icons/Nextcloud_Logo.svg); }
#bg-matrix { background-image: url(/img/icons/Matrix_Logo.svg); }
#bg-meet { background-image: url(/img/icons/Jitsi_Logo.svg);}
@media (prefers-color-scheme: dark) {
#bg-nextcloud { }
#bg-matrix { filter: invert(); }
#bg-meet { filter: invert(); }
}
</style>
</head> </head>
<body class="theme-auto"> <body class="theme-auto">
<?php include "common/header.html"; ?> <?php include "common/header.html"; ?>
<center>
<div class="cont"> <div class="cont">
<h1>Velkommen til Trygves side!</h1> <h1 class="center-txt">Velkommen til Trygves side!</h1>
<h2>Mine prosjekter:</h2> <h2 class="center-txt">Mine prosjekter:</h2>
<ul class="service-list"> <ul class="service-list">
<li><a href="/liveresultater/"><div>Liveresultater</div></a></li> <li><a href="/liveresultater/"><div>Liveresultater</div></a></li>
<li><a href="/fuglekasse/"><div>Fuglekasse</div></a></li> <li><a href="/fuglekasse/"><div>Fuglekasse</div></a></li>
<li><a href="/filopplasting/"><div>Filopplasting</div></a></li> <li><a href="/filopplasting/"><div>Filopplasting</div></a></li>
</ul> </ul>
<h2>Tjenester:</h2> <h2 class="center-txt">Tjenester:</h2>
<ul class="service-list"> <ul class="service-list">
<li id="li-matrix"><a href="https://riot.trygve.me"></a></li> <li><a href="/matrix_info"><div class="btn-bg" id="bg-matrix"></div></a></li>
<li id="li-nextcloud"> <a href="https://nextcloud.trygve.me/"></a></li> <li><a href="/mumble_info"><div>Mumble</div></a></li>
<li><a href="https://meet.trygve.me/"><div class="btn-bg" id="bg-meet"></div><div>Meet</div></a></li>
<li><a href="https://nextcloud.trygve.me/"><div class="btn-bg" id="bg-nextcloud"></div></a></li>
</ul> </ul>
</div> </div>
</center>
</body> </body>
</html> </html>

26
mumble_info/index.php Normal file
View File

@ -0,0 +1,26 @@
<!DOCTYPE html>
<html lang="no">
<head>
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta charset="UTF-8">
<meta name="theme-color" content="#263238"/>
<link rel="icon" type="image/png" href="/dist/favicon.png">
<link rel="stylesheet" href="/css/main.css">
</head>
<body class="theme-auto">
<?php include "../common/header.html"; ?>
<div class="cont">
<h1 class="center-txt">Mumble</h1>
<a href="mumble://trygve.me"><h2 class="center-txt">Åpne serveren i mumble</h2></a>
<article>
<p>Eller du kan skrive inn adressa selv:</p>
<code>trygve.me</code>
</article>
</div>
</body>
</html>

View File

@ -16,8 +16,6 @@
<?php include "../common/header.html"; ?> <?php include "../common/header.html"; ?>
<center>
<div class="cont"> <div class="cont">
<button id="startStopBtn" onclick="startStop()"></button> <button id="startStopBtn" onclick="startStop()"></button>
@ -55,7 +53,6 @@
<a href="https://github.com/librespeed/speedtest">Source code</a> <a href="https://github.com/librespeed/speedtest">Source code</a>
</div> </div>
</center>
<script type="text/javascript">setTimeout(function(){initUI()},100);</script> <script type="text/javascript">setTimeout(function(){initUI()},100);</script>
</body> </body>
</html> </html>

View File

@ -67,8 +67,3 @@
display:block; display:block;
margin: 0 auto; margin: 0 auto;
} }
@media all and (max-width:40em){
body{
font-size:0.8em;
}
}