La_Bureautique
/
zeg1jeux
2
2
Fork 3
Code Issues 2 Pull Requests 2 Packages Projects Releases Wiki Activity

Compare commits

base: La_Bureautique:d5980664c37e23fb0b831c7fbbbdcf45a8255824
Branches Tags
La_Bureautique:main
..
compare: La_Bureautique:aace984e143b41599c33cd8d5b8a047cb818175e
Branches Tags
La_Bureautique:main

No commits in common. "d5980664c37e23fb0b831c7fbbbdcf45a8255824" and "aace984e143b41599c33cd8d5b8a047cb818175e" have entirely different histories.
d5980664c3 ... aace984e14

19 changed files with 46 additions and 319 deletions
Show Stats Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,5 +1,3 @@
.env
cache/
tests/
minelife.html
vendors/keygen/__pycache__

19
farfetched.php
View File

@ -7,24 +7,17 @@ $gchange = new Gchange();
$javascripts['header'][] = 'lib/js/farfetched.js';
$bodyIds = 'farfetched';
include_once('header.php');
?>
<section id="shippable">
<h2>Envoi possible</h2>
<ul id="shippable-offers" class="offers-list">
</ul>
</section>
<section id="immaterial">
<h2>Offres immatérielles</h2>
<ul id="immaterial-offers" class="offers-list">
</ul>
</section>
<h2>Envoi possible</h2>
<ul id="shippable">
</ul>
<h2>Offres immatérielles</h2>
<ul id="immaterial">
</ul>
<?php
include_once('footer.php');

18
home.php
View File

@ -2,29 +2,21 @@
require_once('config.php');
require_once('lib/Gchange.class.php');
require_once('lib/Keygen.class.php');
$bodyIds = 'home';
include_once('header.php');
$gchange = new Gchange();
$keygen = new Keygen();
$ipfsHost = 'http://astroport.localhost:8080';
try {
$player = $gchange->getUser($_SESSION['player_pubkey']);
$twLink = $ipfsHost . '/ipns/' . $keygen->getIPNSPub($_SESSION['salt'], $_SESSION['pepper']);
} catch (Exception $errMsg) {
ErrorsHandler::kaput($errMsg);
}
echo '
<header>
Bienvenue '. $player->getUserName() . ' !
@ -58,20 +50,12 @@ echo '
</li>
<li id="dashboard-minelife">
<a href="minelife/index.html">
<a href="minelife.html">
<span>
Manuel
</span>
</a>
</li>
<li id="dashboard-tiddlywiki">
<a href="'. $twLink .'">
<span>
'. ('Mon TiddlyWiki') .'
</span>
</a>
</li>
</ul>

9
lib/Fred.class.php
View File

@ -4,15 +4,15 @@ class Fred {
private $gatewayProtocol = 'http';
// private $gatewayDomain = 'libra.copylaradio.com';
private $gatewayDomain = 'libra.copylaradio.com';
// private $gatewayDomain = 'aries.copylaradio.com';
private $gatewayDomain = 'astroport.localhost';
// private $gatewayDomain = 'astroport.localhost';
private $gatewayPort = '1234';
private $gatewayDelay = 3;
private $gatewayMaxRounds = 20;
private $gatewayMaxRounds = 1;
public function __construct () {
@ -40,7 +40,6 @@ class Fred {
$url = $matches[1];
die($url);
$opts2 = array(
'http'=>array(
'method'=>"GET",
@ -49,8 +48,6 @@ class Fred {
)
);
echo 'fred 2';
$context2 = stream_context_create($opts2);
$page2 = false;

2
lib/Keygen.class.php
View File

@ -24,7 +24,7 @@ class Keygen {
$cmd .= ' -t duniter';
$cmd .= ' "'. $salt .'"';
$cmd .= ' -p "'. $pepper .'"';
$output=null;
$result_code=null;
exec($cmd, $output, $result_code);

89
lib/js/farfetched.js
View File

@ -4,7 +4,6 @@ const nodes = {
]
}
let gameId = 'spationaute'
async function fetchShippable (n) {
@ -18,8 +17,6 @@ async function fetchShippable (n) {
'title'
, 'description'
, 'id'
, 'picturesCount'
, 'pictures'
]
, query: {
bool: {
@ -66,6 +63,24 @@ async function fetchShippable (n) {
}
function displayShippable (records) {
let shippableElt = document.getElementById('shippable');
for (record of records) {
offerLi = document.createElement('li')
offerLink = document.createElement('a')
offerLink.innerHTML = record._source.title
offerLink.href = 'https://www.gchange.fr/#/app/market/view/' + record._id + '/'
offerLi.append(offerLink)
shippableElt.append(offerLi)
}
}
async function fetchImmaterial (n) {
@ -79,8 +94,6 @@ async function fetchImmaterial (n) {
'title'
, 'description'
, 'id'
, 'picturesCount'
, 'pictures'
]
, query: {
nested: {
@ -124,7 +137,7 @@ async function fetchImmaterial (n) {
if (r.ok === true) {
var obj = r.json()
// storeAtFreds(obj)
storeAtFreds(obj)
return obj
}
@ -216,45 +229,9 @@ function storeAtFreds (json) {
// JSON.stringify(json)
}
function displayShippable (records) {
let offersElt = document.getElementById('shippable-offers');
for (record of records) {
offerLi = document.createElement('li')
offerLink = document.createElement('a')
offerSpan = document.createElement('span')
offerImg = document.createElement('img')
if (record._source.picturesCount > 0) {
offerImg.src = 'data:' + (record._source.pictures[0].file._content_type) + ';base64,' + (record._source.pictures[0].file._content)
} else {
offerImg.src = 'themes/' + gameId + '/default-shippable.256.png'
}
offerImg.alt = record._source.title
offerImg.title = record._source.title
// offerLink.innerHTML = record._source.title
offerLink.href = 'https://www.gchange.fr/#/app/market/view/' + record._id + '/'
offerSpan.append(offerImg)
offerLink.append(offerSpan)
offerLi.append(offerLink)
offersElt.append(offerLi)
}
}
function displayImmaterial (records) {
let offersElt = document.getElementById('immaterial-offers');
let shippableElt = document.getElementById('immaterial');
for (record of records) {
@ -262,33 +239,15 @@ function displayImmaterial (records) {
offerLink = document.createElement('a')
offerSpan = document.createElement('span')
offerImg = document.createElement('img')
if (record._source.picturesCount > 0) {
offerImg.src = 'data:' + (record._source.pictures[0].file._content_type) + ';base64,' + (record._source.pictures[0].file._content)
} else {
offerImg.src = 'themes/' + gameId + '/default-immaterial.256.png'
}
offerImg.alt = record._source.title
offerImg.title = record._source.title
// offerLink.innerHTML = record._source.title
offerLink.innerHTML = record._source.title
offerLink.href = 'https://www.gchange.fr/#/app/market/view/' + record._id + '/'
offerSpan.append(offerImg)
offerLink.append(offerSpan)
offerLi.append(offerLink)
offersElt.append(offerLi)
shippableElt.append(offerLi)
}
}
fetchImmaterial(18)
fetchImmaterial(30)
.then(records => {
displayImmaterial(records.hits.hits)
@ -300,7 +259,7 @@ fetchImmaterial(18)
console.error(error)
})
fetchShippable(18)
fetchShippable(30)
.then(records => {
displayShippable(records.hits.hits)

5
login.php
View File

@ -11,12 +11,13 @@ $boris = '25zB1gSC7Qhwnx463cuDLDCKLRVieLAgFiPbYq6jVHG9';
$playerG1Id = null;
if (isset($_POST['salt'], $_POST['pepper'])) {
$fred = new Fred();
$keygen = new Keygen();
try {
$playerG1Id = $keygen->getG1Pub($_POST['salt'], $_POST['pepper']);
$playerG1Id = $fred->donneMoiSaPutaindeG1Pub($_POST['salt'], $_POST['pepper']);
$keygen->generatePubsec($_POST['salt'], $_POST['pepper']);
} catch (Exception $errMsg) {

6
messenger.php
View File

@ -7,8 +7,6 @@ require_once('lib/Gchange.class.php');
require_once('lib/Jaklis.class.php');
require_once('lib/ErrorsHandler.class.php');
$javascripts['header'][] = 'lib/js/messenger.js';
$gchange = new Gchange();
$messenger = new Messenger($gchange);
$fred = new Fred();
@ -155,9 +153,7 @@ if (isset($_GET['penpal'])) {
<input type="hidden" name="title" value="'. htmlspecialchars($displayedConv->getConvTitle()) .'" />
<p class="submit-button-wrapper">
<input type="submit" value="'. 'Envoyer' .'" />
</p>
<input type="submit" value="'. 'Envoyer' .'" />
</form>
';
}

1
minelife

@ -1 +0,0 @@
Subproject commit 1621fbcbc0525eb5b3c6ef80525d66c2e388dd68

12
themes/spationaute/css/dashboard.deco.css
View File

@ -41,16 +41,4 @@
border-style: outset;
border-color: red;
}
#dashboard-minelife {
background-image: url('../img/dashboard-minelife.png');
background-size: cover;
}
#dashboard-tiddlywiki {
background-image: url('../img/dashboard-tiddlywiki.png');
background-size: cover;
}

30
themes/spationaute/css/dashboard.layout.css
View File

@ -1,15 +1,7 @@
body#home header {
font-size: 2rem;
text-align: center;
margin-top: 2rem;
margin-bottom: 3rem;
}
body#home nav {
display: flex;
align-items: flex-start;
align-items: center;
height: 100vh;
}
@ -21,14 +13,6 @@ body#home nav ul {
padding: 0;
display: flex;
justify-content: space-evenly;
flex-wrap: wrap;
}
body#home nav ul > * {
margin-bottom: 3rem;
margin-left: 5vw;
margin-right: 5vw;
}
#dashboard-map {
@ -38,21 +22,17 @@ body#home nav ul > * {
#dashboard-map a span,
#dashboard-messenger a span,
#dashboard-farfetched a span,
#dashboard-minelife a span ,
#dashboard-tiddlywiki a span {
#dashboard-farfetched a span {
display: none;
}
#dashboard-map a,
#dashboard-messenger a,
#dashboard-farfetched a,
#dashboard-minelife a ,
#dashboard-tiddlywiki a {
#dashboard-farfetched a {
width: 15vw;
height: 15vw;
width: 25vw;
height: 25vw;
display: block;
}

23
themes/spationaute/css/deco.css
View File

@ -341,10 +341,6 @@ body#sonar {
color: hsl(132.2, 59.8%, 75.2%);
}
#messenger-page #conversations-list {
background-color: hsl(0, 27.8%, 12.1%);
}
#messenger-page #conversations-list .conversation time {
@ -372,21 +368,4 @@ body#sonar {
#messenger-page #conversations-list .conversation:hover {
background-color: hsl(0, 27.8%, 24.2%);
}
#messenger-page #conversation form,
#messenger-page #conversation textarea {
background-color: hsl(0, 50.8%, 95.1%);
}
#messenger-page #conversation textarea,
#messenger-page #conversation .submit-button-wrapper input {
font-size: 1.5rem;
}
#messenger-page #conversation .submit-button-wrapper input {
background-color: transparent;
}
}

75
themes/spationaute/css/farfetched.layout.css
View File

@ -1,75 +0,0 @@
body#farfetched main {
display: flex;
justify-content: space-evenly;
margin-top: 1.5rem;
}
body#farfetched main > section h2 {
text-align: center;
background-color: white;
color: black;
margin-top: 0;
padding-top: 1rem;
padding-bottom: 1rem;
}
body#farfetched main > section {
width: 48%;
/*overflow: hidden;*/
border: 0.125rem;
border-style: solid;
border-color: white;
}
body#farfetched main > section ul {
list-style: none;
margin: 0;
padding: 0;
}
body#farfetched main > section ul li {
margin: 0;
padding: 0;
}
body#farfetched main > section .offers-list {
display: flex;
flex-wrap: wrap;
justify-content: center;
}
body#farfetched main > section .offers-list > * {
margin: 0.5rem;
}
body#farfetched main > section .offers-list a {
display: block;
width: 5rem;
height: 5rem;
overflow: hidden;
}
body#farfetched main > section .offers-list a span {
display: block;
overflow: visible;
}
body#farfetched main > section .offers-list a span img {
width: 100%;
}

67
themes/spationaute/css/layout.css
View File

@ -222,22 +222,16 @@ main {
#messenger-page > footer {
display: none;
}
#messenger-page main {
display: flex;
height: 100vh;
}
#messenger-page #conversations-list {
width: 33.333vw;
height: 100%;
height: 100vh;
overflow-y: auto;
}
@ -292,8 +286,6 @@ main {
position: absolute;
top: 0;
right: 0;
padding-right: 0.5rem;
padding-top: 0.5rem;
}
@ -301,8 +293,6 @@ main {
#messenger-page #conversation {
height: 100vh;
overflow-y: auto;
width: 66.666vw;
}
@ -355,61 +345,6 @@ main {
text-align: right;
}
#messenger-page #conversation {
display: flex;
flex-direction: column;
justify-content: space-between;
}
#messenger-page #conversation #msgList {
overflow-y: auto;
flex-grow: 1;
}
#messenger-page #conversation form {
align-self: flex-end;
display: flex;
width: 100%;
padding-top: 1rem;
padding-bottom: 1rem;
}
#messenger-page #conversation label {
display: none;
}
#messenger-page #conversation textarea {
flex-basis: 100%;
flex-grow: 1;
margin-left: 1rem;
margin-right: 1rem;
border: 0;
}
#messenger-page #conversation textarea:focus {
outline: 0;
}
#messenger-page #conversation .submit-button-wrapper {
margin-left: 1rem;
margin-right: 1rem;
display: flex;
align-items: center;
}
#messenger-page #conversation .submit-button-wrapper input {
border: 0;
}

BIN
themes/spationaute/default-immaterial.256.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 21 KiB

BIN
themes/spationaute/default-shippable.256.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 9.0 KiB

BIN
themes/spationaute/img/dashboard-minelife.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 46 KiB

BIN
themes/spationaute/img/dashboard-tiddlywiki.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 16 KiB

7
themes/spationaute/js/messenger/messenger.js
View File

@ -1,7 +0,0 @@
/*
var form = document.querySelector('#messenger-page #conversation > form');
form.addEventListener
*/