feat(values): replaced placeholder values with real values

also: fixed missed changes in directory restructuring and data refactoring, removed reference text file, added id property to various machine properties
main
steven 2021-02-11 22:02:06 -05:00
parent f763f02467
commit 6db8cffcbe
6 changed files with 95 additions and 133 deletions

View File

@ -1,99 +0,0 @@
$hinamizawa_total = disk_total_space("/data/");
$hinamizawa_free = disk_free_space("/data/");
$hinamizawa_used = getDifference($hinamizawa_total, $hinamizawa_free);
$hinamizawa_percent =
getPercentageUsed($hinamizawa_total, $hinamizawa_used);
$maebara_total = disk_total_space("/data/maebara/");
$maebara_free = disk_free_space("/data/maebara/");
$maebara_used = getDifference($maebara_total, $maebara_free);
$maebara_percent =
getPercentageUsed($maebara_total, $maebara_used);
$houjou_total = disk_total_space("/data/houjou/");
$houjou_free = disk_free_space("/data/houjou/");
$houjou_used = getDifference($houjou_total, $houjou_free);
$houjou_percent =
getPercentageUsed($houjou_total, $houjou_used);
$ryuuguu_total = disk_total_space("/data/ryuuguu/");
$ryuuguu_free = disk_free_space("/data/ryuuguu/");
$ryuuguu_used = getDifference($ryuuguu_total, $ryuuguu_free);
$ryuuguu_percent =
getPercentageUsed($ryuuguu_total, $ryuuguu_used);
$sonozaki_total = disk_total_space("/data/sonozaki/");
$sonozaki_free = disk_free_space("/data/sonozaki/");
$sonozaki_used = getDifference($sonozaki_total, $sonozaki_free);
$sonozaki_percent =
getPercentageUsed($sonozaki_total, $sonozaki_used);
#bernkastel { /* red */
color: #ee0000;
}
.hinamizawa { /* furude? */
--bg: #637bc0;
background: var(--bg, #637bc0);
}
.maebara {
--bg: #835e4c;
background: var(--bg, #835e4c);
}
.houjou {
--bg: #ebd076;
background: var(--bg, #ebd076);
}
.ryuuguu {
--bg: #faaa66;
background: var(--bg, #faaa66);
}
.sonozaki {
--bg: #86c9a8;
background: var(--bg, #86c9a8);
}
#st-lucia {
color: #5059bd
}
#angel-mort {
color: #5877a2;
}
<h1 id="homo-casa">homo.casa</h1>
<p id="bernkastel">Gods and dice are both best when silent.</p>
<h3>maebara - <?php echo getByteString($maebara_total); ?></h3>
<p>a famous artist, his loving wife, and their charismatic son</p>
<h3>houjou - <?php echo getByteString($houjou_total); ?></h3>
<p>a little girl awaiting the return of her big brother</p>
<h3>ryuuguu - <?php echo getByteString($ryuuguu_total); ?></h3>
<p>a caring father and his superstitious daughter</p>
<h3>sonozaki - <?php echo getByteString($sonozaki_total); ?></h3>
<p>a grandmother of twins carrying on her stone face</p>
<a href="https://st.lucia.homo.casa">
<h3>St. Lucia</h3>
<img src="/st-lucia.svg" alt="Saint Lucia Academy Crest" />
<p>a private school where research is exchanged</p>
</a>
<a href="https://angel.mort.homo.casa">
<h3>Angel Mort</h3>
<img src="/angel-mort.svg" alt="Angel Mort Signage" />
<p>a restaurant where luxury is served</p>
</a>
<p id="hanyuu">Child of Man. What is it you seek from this World?</p>

View File

@ -5,7 +5,7 @@ header, #drives, #services, footer {
}
.drive {
float: left;
width: 33%;
width: 20%;
}
.chart {
height: 80%;
@ -17,7 +17,7 @@ circle {
cy: 10;
}
.pie {
fill: #e6ddcc;
fill: #bbb;
r: 10;
}
.piece {
@ -36,7 +36,7 @@ em {
}
.service {
float: left;
width: 33%;
width: 25%;
}
/* breakpoints at 850px and 475px */

View File

@ -1 +1,38 @@
/* background */
body {
background: url(../img/shirakawa.jpg);
background-repeat: no-repeat;
background-size: cover;
background-position: center;
background-color: #704214;
color: #fff;
text-shadow: 1px 1px #000;
text-align: center;
}
/* colours */
#hinamizawa {
color: #e00;
}
#furude {
stroke: #637bc0;
}
#maebara {
stroke: #835e4c;
}
#houjou {
stroke: #ebd076;
}
#ryuuguu {
stroke: #faaa66;
}
#sonozaki {
stroke: #86c9a8;
}
#hanyuu {
color: #d1d0e3;
}

View File

@ -8,7 +8,7 @@
$driveValues = getDriveValues($machine->drives);
?>
<title><?php echo $machine[0] ?> - homo.casa</title>
<title><?php echo $machine->name ?> - homo.casa</title>
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
@ -18,8 +18,8 @@
<meta name="theme-color" content="#ffffff">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
<link rel="stylesheet" href="base.css">
<link rel="stylesheet" href="flavour.css">
<link rel="stylesheet" href="css/base.css">
<link rel="stylesheet" href="css/flavour.css">
</head>
<body>

View File

@ -35,10 +35,11 @@
echo '
<div class="drive">
<h3>' . $drive->name . '</h3>
<h4>' . $drive->description . '</h4>
<svg class="chart">
<circle class="pie" />
<circle
id="' . $drive->name . '"
id="' . $drive->id . '"
class="piece"
stroke-dasharray="' . ($drive->spacePercentageUsed ?
$drive->spacePercentageUsed : 0) * 31.4 / 100 . ' 31.4"
@ -51,8 +52,13 @@
function printService($service) {
echo '
<a href="' . $service->location . '">
<div class="service" id="' . $service->name . '">
<div class="service" id="' . $service->id . '">
<h3>' . $service->name . '</h3>
<img
class="logo"
src="img/' . $service->id . '.svg"
alt="' . $service->name . ' logo"
/>
<h4>' . $service->description . '</h4>
</div>
</a>';

View File

@ -1,32 +1,50 @@
<?php
$machine->name = "Machine";
$machine->description = "machine description";
$machine->name = "Hinamizawa";
$machine->description = "a riverside village in the valley of the forested mountains";
$disk1->name = "disk1";
$disk1->description = "disk1 description";
$disk1->location = "/disk1/location/";
$disk2->name = "disk2";
$disk2->description = "disk2 description";
$disk2->location = "/disk2/location/";
$disk3->name = "disk3";
$disk3->description = "disk3 description";
$disk3->location = "/disk3/location/";
$disk1->id = "furude";
$disk1->name = "Furude";
$disk1->description = "the high priestess";
$disk1->location = "/data/";
$disk2->id = "maebara";
$disk2->name = "Maebara";
$disk2->description = "the fool";
$disk2->location = "/data/maebara/";
$disk3->id = "houjou";
$disk3->name = "Houjou";
$disk3->description = "the moon";
$disk3->location = "/data/houjou/";
$disk4->id = "ryuuguu";
$disk4->name = "Ryuuguu";
$disk4->description = "the hierophant";
$disk4->location = "/data/ryuuguu/";
$disk5->id = "sonozaki";
$disk5->name = "Sonozaki";
$disk5->description = "the chariot";
$disk5->location = "/data/houjou/";
$service1->name = "service1";
$service1->description = "service1 description";
$service1->location = "https://service1.example.com";
$service2->name = "service2";
$service2->description = "service2 description";
$service2->location = "https://service2.example.com";
$service3->name = "service3";
$service3->description = "service3 description";
$service3->location = "https://service3.example.com";
$service1->id = "st-lucia";
$service1->name = "St. Lucia";
$service1->description = "academy for girls";
$service1->location = "https://st.lucia.homo.casa";
$service2->id = "seventh-mart";
$service2->name = "Seventh Mart";
$service2->description = "local grocery store";
$service2->location = "https://seventh.mart.homo.casa";
$service3->id = "irie-clinic";
$service3->name = "Irie Clinic";
$service3->description = "healthcare research";
$service3->location = "https://irie.clinic.homo.casa";
$service1->id = "angel-mort";
$service4->name = "Angel Mort";
$service4->description = "dessert cafe";
$service4->location = "https://angel.mort.homo.casa";
$machine->driveLabel = "Drives";
$machine->drives = array($disk1, $disk2, $disk3);
$machine->serviceLabel = "Services";
$machine->services = array($service1, $service2, $service3);
$machine->driveLabel = "Houses";
$machine->drives = array($disk1, $disk2, $disk3, $disk4, $disk5);
$machine->serviceLabel = "Places of Business";
$machine->services = array($service1, $service2, $service3, $service4);
$machine->footer->name = "footer";
$machine->footer->description = "footer description";
$machine->footer->name = "hanyuu";
$machine->footer->description = "Child of Man. What do you seek from this world?";
?>