diff --git a/www/boris/conf.php b/www/boris/conf.php index d7688bc..db48ed2 100644 --- a/www/boris/conf.php +++ b/www/boris/conf.php @@ -2,6 +2,7 @@ define('STATION_NAME', exec('cat ../../../ipfs/.12D*/_xbian.zuid')); define('HOST', 'astroport'); +define('THEME', 'astroport'); /* diff --git a/www/boris/crowdbunker.css b/www/boris/crowdbunker.css deleted file mode 100644 index 4e66be6..0000000 --- a/www/boris/crowdbunker.css +++ /dev/null @@ -1,104 +0,0 @@ -:root { - - --pink: hsl(338.5, 72.8%, 36.1%); - --canard: hsl(200.8, 100%, 9.6%); -} - -body { - - background: #121212; - color: white; - margin: 0; - padding: 0; - font-family: Roboto,sans-serif; -} - -header { - - background: var(--canard); - overflow: hidden; - margin-bottom: 2rem; - -} - -header * { - - font-size: 1.5rem; - padding: 0.5rem; - margin: 0; - color: var(--pink); - text-decoration: none; -} - -header span { - - color: white; -} - - -main { - - width: 80%; - margin: auto; -} - -#videosList { - - display: grid; - grid-gap: 1rem 1rem; - grid-auto-flow: row; - grid-template-columns: 322px 322px 322px; - - list-style: none; - margin: 0; - padding: 0; -} - -#videosList li { - - background: var(--canard); - border-color: var(--pink); - border-radius: 0.25rem; - border-width: 1px; - border-style: solid; - overflow: hidden; -} - -#videosList .video-title { - - padding: 0.5rem 1rem; -} - -.video-title, -.video-title a, -.video-title a:visited { - - color: white; - font-weight: bold; - text-decoration: none; -} - -article { - - border-radius: 0.25rem; - background: var(--canard); - width: 58.3%; - margin: auto; - overflow: hidden; - -} - -article video { - - width: 100%; - max-height: 50vh; - background: black; -} - -article .video-title { - - font-weight: bold; - padding: 1rem 1rem; - font-size: 1.25rem; - margin: 0; -} diff --git a/www/boris/crowdbunker.css b/www/boris/crowdbunker.css new file mode 120000 index 0000000..51f0257 --- /dev/null +++ b/www/boris/crowdbunker.css @@ -0,0 +1 @@ +styles/crowdbunker/style.css \ No newline at end of file diff --git a/www/boris/get_astrxbian_index.sh b/www/boris/get_astrxbian_index.sh index 10dde16..3ba5005 100755 --- a/www/boris/get_astrxbian_index.sh +++ b/www/boris/get_astrxbian_index.sh @@ -9,4 +9,4 @@ PREFIX="$1" YOU=$(ps auxf --sort=+utime | grep -w ipfs | grep -v -E 'color=auto|grep' | tail -n 1 | cut -d " " -f 1) && [[ ! $YOU ]] && echo "ipfs NOT RUNNING. EXIT" && exit 1 # Filter no ipns link -cat /home/$YOU/.zen/{ipfs,ipfs_swarm}/.*/astroport/kodi/vstream/${PREFIX}ASTRXBIAN | grep -Ev "];;" | sort | uniq | tail -n +2 +cat ./{me,swarm}/.*/astroport/kodi/vstream/*ASTRXBIAN | grep -Ev "];;" | sort | uniq | tail -n +2 diff --git a/www/boris/astroport.png b/www/boris/styles/astroport/logo.png similarity index 100% rename from www/boris/astroport.png rename to www/boris/styles/astroport/logo.png diff --git a/www/boris/styles/astroport/style.css b/www/boris/styles/astroport/style.css index ae02a9c..5eaf361 100644 --- a/www/boris/styles/astroport/style.css +++ b/www/boris/styles/astroport/style.css @@ -109,3 +109,9 @@ footer { display: none; } + +#successMsg { + + opacity: 0; + transition: opacity 1s; +} diff --git a/www/boris/astrocrowdbunker.png b/www/boris/styles/crowdbunker/logo.png similarity index 100% rename from www/boris/astrocrowdbunker.png rename to www/boris/styles/crowdbunker/logo.png diff --git a/www/boris/youtube.php b/www/boris/youtube.php index 68f8615..357426d 100644 --- a/www/boris/youtube.php +++ b/www/boris/youtube.php @@ -4,18 +4,20 @@ require_once('functions.php'); $videosList = array(); - exec("/bin/bash -c './get_astrxbian_index.sh'", $videos); +// echo '
'; var_dump($videos); echo '
'; +// echo shell_exec('whoami'); // Pour savoir quel utilisateur système exécute les scripts PHP + $videos = array_reverse($videos); // ## film;MDan5TDuT-0;;Le Manuel de Survie en Dictature v1.1 au format papier;;["onelove"];k51qzi5uqu5dl0hnglpzumjezep2avacrtbx7i15v91elcxac4cpd8290kl1hq;720p;/ipfs/QmZp63RXhLm6QASmw1t2R8fu5waSJFmyW7cmdVNxyuJXzg/MDan5TDuT-0_Le%20Manuel%20de%20Survie%20en%20Dictature%20v1.1%20au%20format%20papier.mp4 foreach ($videos as $v) { - list($a, $youtubeID, $c, $videoName, $e, $src, $h, $quality, $videoURI) = explode(";", $v); + list($a, $youtubeID, $p3, $videoName, $p5, $src, $p7, $definition, $videoURI) = explode(";", $v); $videoURL = 'http://'. HOST. $videoURI; - $videoEco = 'http://'. HOST. '/ipns/' . $h; + $videoEco = 'http://'. HOST. '/ipns/' . $p7; $mimeType = guessTypeFromFilename($videoURI); @@ -37,9 +39,9 @@ foreach ($videos as $v) { ?> - Astroport/School: WWW/IPFS - Interfaces et API - - - + Astroport "<?php echo STATION_NAME; ?> + + diff --git a/www/boris/youtube_watch.php b/www/boris/youtube_watch.php index d112be9..e2c15c2 100644 --- a/www/boris/youtube_watch.php +++ b/www/boris/youtube_watch.php @@ -10,8 +10,8 @@ $videoMIME = htmlentities($_GET['mime']); <?php echo $videoName; ?> - Astroport "<?php echo STATION_NAME; ?> - - + + diff --git a/www/boris/youtube_watch_step2.html b/www/boris/youtube_watch_step2.html new file mode 100644 index 0000000..00ba3db --- /dev/null +++ b/www/boris/youtube_watch_step2.html @@ -0,0 +1,53 @@ + + + + $TITLE in Astroport + + + + + + +
+
+ ASTROPORT ${XZUID} +
+
+
+
+ +

$TITLE

+ +

Lancement de la video dans 7 secondes...

+ +

+ Ce fichier vous est servi par une station amie. Faites lui un don pour la remercier : + + +

+ +

+ La clef de la station amie est maintenant copiée dans le presse-papier. Vous pouvez la coller dans le client Ğ1 de votre choix (Cesium par exemple) afin de faire votre don 😉 +

+ +
+
+ + diff --git a/www/boris/youtube_watch_step3.html b/www/boris/youtube_watch_step3.html new file mode 100644 index 0000000..a80a248 --- /dev/null +++ b/www/boris/youtube_watch_step3.html @@ -0,0 +1,30 @@ + + + + $TITLE in Astroport + + + + + +
+
+ ASTROPORT ${XZUID} +
+
+ +
+
+ + +

+ $TITLE +

+
+
+ + +