WIP commit - just about to set up new 'tile' approach to formatting
This commit is contained in:
parent
3101bdc033
commit
4c68329850
2 changed files with 107 additions and 58 deletions
|
@ -3,7 +3,7 @@ export const load = async ({ fetch }) => {
|
||||||
const webservicesResult = await fetch('https://static.magnificent.nz/webservices/webservices.json');
|
const webservicesResult = await fetch('https://static.magnificent.nz/webservices/webservices.json');
|
||||||
const webservicesData = await webservicesResult.json();
|
const webservicesData = await webservicesResult.json();
|
||||||
|
|
||||||
console.log(webservicesData);
|
//console.log(webservicesData);
|
||||||
return {
|
return {
|
||||||
webservices: {
|
webservices: {
|
||||||
technologies: webservicesData.technologies,
|
technologies: webservicesData.technologies,
|
||||||
|
|
|
@ -7,8 +7,10 @@
|
||||||
function processData(webservices) {
|
function processData(webservices) {
|
||||||
let instances = 0;
|
let instances = 0;
|
||||||
let current = {};
|
let current = {};
|
||||||
|
let current_status = [];
|
||||||
let future = {};
|
let future = {};
|
||||||
let affiliates = {};
|
let affiliates = [];
|
||||||
|
let analogues = []
|
||||||
//
|
//
|
||||||
// just a trivial reassignment
|
// just a trivial reassignment
|
||||||
let hosts = webservices.hosts;
|
let hosts = webservices.hosts;
|
||||||
|
@ -17,9 +19,24 @@
|
||||||
webservices.technologies.forEach(function(tech, i) {
|
webservices.technologies.forEach(function(tech, i) {
|
||||||
if (hasInstances(tech)) {
|
if (hasInstances(tech)) {
|
||||||
console.log(tech.name + ': ' + tech.instances.length + ' instances...');
|
console.log(tech.name + ': ' + tech.instances.length + ' instances...');
|
||||||
instances += tech.instances.length;
|
tech.instances.forEach(function(instance, i) {
|
||||||
|
if (hasAffiliation(instance)) {
|
||||||
|
let tag = instance.affiliation;
|
||||||
|
affiliates[tag] += 1;
|
||||||
|
console.log('added tag: ' + tag);
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
|
}
|
||||||
|
getAnalogues(analogues, tech) {
|
||||||
|
single =
|
||||||
|
if
|
||||||
|
analogues = analogues.concat(local);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
/*affiliates.forEach(function(num, tag) {
|
||||||
|
console.log(tag + ': ' + num);
|
||||||
|
});*/
|
||||||
|
console.log('affiliates: ', affiliates);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
total_instances: instances,
|
total_instances: instances,
|
||||||
|
@ -32,9 +49,15 @@
|
||||||
|
|
||||||
// console.log(technologies);
|
// console.log(technologies);
|
||||||
function hasInstances(tech) {
|
function hasInstances(tech) {
|
||||||
if (tech.hasOwnProperty('instances') && tech.instances.constructor === Array) {
|
if (tech.hasOwnProperty('instances') && tech.instances.constructor === Array) return true;
|
||||||
return true;
|
return false;
|
||||||
}
|
}
|
||||||
|
function hasAffiliation(instance) {
|
||||||
|
if (instance.hasOwnProperty('affiliation')) return true;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
function hasStatus(instance) {
|
||||||
|
if (instance.hasOwnProperty('status')) return true;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -47,23 +70,21 @@
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div class="webservices">
|
<div class="webservices">
|
||||||
<div class="row">
|
|
||||||
<h1>Dave Web Services</h1>
|
<h1>Dave Web Services</h1>
|
||||||
|
|
||||||
<div class="summary">
|
<div class="summary cell-2">
|
||||||
<ul>
|
<ul>
|
||||||
<li>Total number of services: {stats.total_instances}</li>
|
<li>Total number of services: {stats.total_instances}</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
|
|
||||||
{#each technologies as technology}
|
{#each technologies as technology}
|
||||||
<div class="row">
|
<div class="technology cell">
|
||||||
<div class="technology">
|
|
||||||
<h2><a href="{technology.website}">{technology.name}</a></h2>
|
<h2><a href="{technology.website}">{technology.name}</a></h2>
|
||||||
|
<p>{technology.description}</p>
|
||||||
</div>
|
</div>
|
||||||
{#if hasInstances(technology)}
|
{#if hasInstances(technology)}
|
||||||
<div class="instances">
|
<div class="instances cell">
|
||||||
<ul class="instances">
|
<ul class="instances">
|
||||||
{#each technology.instances as instance}
|
{#each technology.instances as instance}
|
||||||
<li><a href="https://{instance.domain}">{instance.domain}</a> <span class="affiliation {instance.affiliation}">{instance.affiliation}</span></li>
|
<li><a href="https://{instance.domain}">{instance.domain}</a> <span class="affiliation {instance.affiliation}">{instance.affiliation}</span></li>
|
||||||
|
@ -71,40 +92,68 @@
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
{:else}
|
{:else}
|
||||||
<div class="instances">
|
<div class="instances cell">
|
||||||
<ul class="instances">
|
<ul class="instances">
|
||||||
<li>Nothing here yet...</li>
|
<li>Nothing here yet...</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
</div>
|
|
||||||
{/each}
|
{/each}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
body { bg-color: #eee; }
|
html { background-color: #eee; }
|
||||||
|
body {
|
||||||
|
background-color: #fff;
|
||||||
|
box-sizing: border-box;
|
||||||
|
margin: 0 auto;
|
||||||
|
min-height: 100%;
|
||||||
|
padding: 2em;
|
||||||
|
max-width: 800px;
|
||||||
|
font-size: 1.2em;
|
||||||
|
border: double 3px #ddd;
|
||||||
|
border-top: none;
|
||||||
|
border-bottom: none;
|
||||||
|
}
|
||||||
h1 { padding-left: 0.5em; }
|
h1 { padding-left: 0.5em; }
|
||||||
a { text-decoration: none; }
|
a { text-decoration: none; }
|
||||||
.webservices {
|
.webservices {
|
||||||
display: table;
|
display: flex;
|
||||||
gap: 6px;
|
flex-wrap: wrap;
|
||||||
background-color: #efefef;
|
background-color: #efefef;
|
||||||
width: 90%;
|
width: 60%;
|
||||||
margin: 0 auto;
|
margin: 0 auto 3em auto;
|
||||||
|
padding: 0;
|
||||||
}
|
}
|
||||||
.row {
|
.cell {
|
||||||
display: table-row;
|
box-sizing: border-box;
|
||||||
box-shadow: 5px 5px 4px #ccc;
|
flex-grow: 1;
|
||||||
padding: 5px;
|
width: 100%;
|
||||||
margin-bottom: 10px;
|
padding: 0.8em 1.2em;
|
||||||
|
overflow: hidden;
|
||||||
|
border: solid 3px white;
|
||||||
|
}
|
||||||
|
.webservices > .cell {
|
||||||
|
width: 50%;
|
||||||
}
|
}
|
||||||
.technology {
|
.technology {
|
||||||
background-color: #fff;
|
background-color: #efefef;
|
||||||
display: table-cell;
|
|
||||||
}
|
}
|
||||||
.instances {
|
.instances {
|
||||||
background-color: #fff;
|
background-color: #eee;
|
||||||
display: table-cell;
|
|
||||||
}
|
}
|
||||||
.webservices li { list-style-type: none; }
|
.webservices li { list-style-type: none; }
|
||||||
|
.cell > h1, .cell > h2, .cell > h3, .cell > h4, .cell > h5 { margin: 0; }
|
||||||
|
/*
|
||||||
|
* Breakpoints
|
||||||
|
*/
|
||||||
|
@media all and (max-width: 500px) {
|
||||||
|
.collapse { display: block; }
|
||||||
|
.collapse > .cell { width: 100% !important; }
|
||||||
|
}
|
||||||
|
/* .no-flexbox .webservices {
|
||||||
|
display: block;
|
||||||
|
.no-flexbox .webservices > cell { width: 100%; }
|
||||||
|
} */
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|
Loading…
Reference in a new issue