summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhorus2022-10-31 12:24:35 +0100
committerhorus2022-10-31 12:24:35 +0100
commit3c4aa25af0cd6f56db85d503ab552d39b81b5c17 (patch)
treec9e7e8de0be62e7f1389a8c19485a6ca29806497
parentf0c30d3bf798d52d5c2b14b0a2a12167ed7c2d72 (diff)
downloadmoehring-3c4aa25af0cd6f56db85d503ab552d39b81b5c17.tar.gz
renamed to things
-rw-r--r--.gitmodules10
-rw-r--r--app.php2
-rw-r--r--functions.php10
-rw-r--r--public/index.php34
-rw-r--r--views/index.html2
-rw-r--r--views/snippets/navbar.html2
-rw-r--r--views/things.html (renamed from views/tools.html)14
m---------views/things/bpm (renamed from views/tools/bpm)0
m---------views/things/faces (renamed from views/tools/faces)0
-rw-r--r--views/things/ghrss/composer.json (renamed from views/tools/ghrss/composer.json)0
-rw-r--r--views/things/ghrss/composer.lock (renamed from views/tools/ghrss/composer.lock)0
-rw-r--r--views/things/ghrss/feed.php (renamed from views/tools/ghrss/feed.php)2
-rw-r--r--views/things/ghrss/ghrss.db.php (renamed from views/tools/ghrss/ghrss.db.php)0
-rw-r--r--views/things/ghrss/index.html (renamed from views/tools/ghrss/index.html)0
m---------views/things/pizza (renamed from views/tools/pizza)0
m---------views/things/untrack (renamed from views/tools/untrack)0
m---------views/things/zeitumstellung (renamed from views/tools/zeitumstellung)0
17 files changed, 39 insertions, 37 deletions
diff --git a/.gitmodules b/.gitmodules
index b102eaf..2d7365d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,15 +1,15 @@
[submodule "views/tools/faces"]
- path = views/tools/faces
+ path = views/things/faces
url = git@git.iamfabulous.de:faces
[submodule "views/tools/pizza"]
- path = views/tools/pizza
+ path = views/things/pizza
url = git@git.iamfabulous.de:pizza
[submodule "views/tools/untrack"]
- path = views/tools/untrack
+ path = views/things/untrack
url = git@git.iamfabulous.de:untrack
[submodule "views/tools/zeitumstellung"]
- path = views/tools/zeitumstellung
+ path = views/things/zeitumstellung
url = git@git.iamfabulous.de:zeitumstellung
[submodule "views/tools/bpm"]
- path = views/tools/bpm
+ path = views/things/bpm
url = git@git.iamfabulous.de:bpm
diff --git a/app.php b/app.php
index ea81dfe..16ce17c 100644
--- a/app.php
+++ b/app.php
@@ -19,7 +19,7 @@ $function = new \Twig\TwigFunction('maincss', function() {
$twig->addFunction($function);
$function = new \Twig\TwigFunction('dump_dances', function() {
- echo readfile(__DIR__ . '/views/tools/bpm/dances.json');
+ echo readfile(__DIR__ . '/views/things/bpm/dances.json');
});
$twig->addFunction($function);
diff --git a/functions.php b/functions.php
index 8a31111..7dc32ed 100644
--- a/functions.php
+++ b/functions.php
@@ -1,14 +1,14 @@
<?php
-require __DIR__ . '/views/tools/untrack/resolve.php';
-require __DIR__ . '/views/tools/zeitumstellung/vendor/autoload.php';
+require __DIR__ . '/views/things/untrack/resolve.php';
+require __DIR__ . '/views/things/zeitumstellung/vendor/autoload.php';
function get_faces(){
- return json_decode( file_get_contents( __DIR__ . '/views/tools/faces/faces.json' ), true );
+ return json_decode( file_get_contents( __DIR__ . '/views/things/faces/faces.json' ), true );
}
function get_dances(){
- return json_decode( file_get_contents( __DIR__ . '/views/tools/bpm/dances.json' ), true );
+ return json_decode( file_get_contents( __DIR__ . '/views/things/bpm/dances.json' ), true );
}
function str_starts_with( $haystack, $needle ) {
@@ -25,7 +25,7 @@ function str_ends_with( $haystack, $needle) {
}
function get_ghrss_feeds() {
- require_once __DIR__ . '/views/tools/ghrss/ghrss.db.php';
+ require_once __DIR__ . '/views/things/ghrss/ghrss.db.php';
$result = $db->query("SELECT name FROM language ORDER BY name;");
return $result->fetchAll();
}
diff --git a/public/index.php b/public/index.php
index c62faf5..afae00a 100644
--- a/public/index.php
+++ b/public/index.php
@@ -15,37 +15,39 @@ case("/about/"):
case("/projects/"):
echo $twig->render('projects.html');
break;
-case("/tool"):
- header("Location: https://" . $_SERVER["HTTP_HOST"] . "/tools/");
+case("/thing/"):
+case("/tool/"):
+case("/tools/"):
+ header("Location: https://" . $_SERVER["HTTP_HOST"] . "/things/");
exit;
break;
-case("/tools/"):
- echo $twig->render('tools.html');
+case("/things/"):
+ echo $twig->render('things.html');
break;
-case("/tools/faces/"):
- echo $twig->render('tools/faces/index.html', [ "faces" => get_faces() ]);
+case("/things/faces/"):
+ echo $twig->render('things/faces/index.html', [ "faces" => get_faces() ]);
break;
-case("/tools/pizza/"):
- echo $twig->render('tools/pizza/index.html');
+case("/things/pizza/"):
+ echo $twig->render('things/pizza/index.html');
break;
-case("/tools/untrack/"):
+case("/things/untrack/"):
$_url = "";
if ( isset($_REQUEST['url']) ) {
$_url = htmlspecialchars($_REQUEST['url']);
}
- echo $twig->render('tools/untrack/index.html', [ "url" => $_url ]);
+ echo $twig->render('things/untrack/index.html', [ "url" => $_url ]);
break;
-case("/tools/tanz/"):
- echo $twig->render('tools/bpm/index.html', [ "dances" => get_dances() ]);
+case("/things/tanz/"):
+ echo $twig->render('things/bpm/index.html', [ "dances" => get_dances() ]);
break;
case("/feeds/"):
echo $twig->render('feeds.html');
break;
-case("/tools/zeitumstellung/"):
- echo $twig->render('tools/zeitumstellung/index.html', [ "tc" => new Zeitumstellung() ]);
+case("/things/zeitumstellung/"):
+ echo $twig->render('things/zeitumstellung/index.html', [ "tc" => new Zeitumstellung() ]);
break;
-case("/tools/ghrss/"):
- echo $twig->render('tools/ghrss/index.html', [ "data" => get_ghrss_feeds() ]);
+case("/things/ghrss/"):
+ echo $twig->render('things/ghrss/index.html', [ "data" => get_ghrss_feeds() ]);
break;
default:
if ( str_ends_with($url, "/") ) {
diff --git a/views/index.html b/views/index.html
index 719e472..2288172 100644
--- a/views/index.html
+++ b/views/index.html
@@ -63,7 +63,7 @@
<code>
<span class="keyword">while</span> crazy; <span class="keyword">do</span>
<br>
- <span class="tab-over-space">eval(<span class="string">"</span><a href="/tools/" title="don't eval my life. also eval is bad">my <strike>life…</strike> tools</a><span class="string">"</span>)</span>
+ <span class="tab-over-space">eval(<span class="string">"</span><a href="/things/" title="don't eval my life. also eval is bad">my <strike>life…</strike> things</a><span class="string">"</span>)</span>
<br>
<span class="keyword">endwhile</span>
</code>
diff --git a/views/snippets/navbar.html b/views/snippets/navbar.html
index 9a63ad9..36524d7 100644
--- a/views/snippets/navbar.html
+++ b/views/snippets/navbar.html
@@ -16,7 +16,7 @@
<a class="nav-link {{ is_active('/projects') }}" href="/projects/">/projects</a>
</li>
<li class="nav-item">
- <a class="nav-link {{ is_active('/tools') }}" href="/tools/">/tools</a>
+ <a class="nav-link {{ is_active('/things') }}" href="/things/">/things</a>
</li>
<li class="nav-item">
<a class="nav-link {{ is_active('/about') }}" href="/about/">/about me</a>
diff --git a/views/tools.html b/views/things.html
index d522d67..1c34d40 100644
--- a/views/tools.html
+++ b/views/things.html
@@ -1,6 +1,6 @@
{% extends "snippets/layout.html" %}
-{% block title "tools | Maximilian Möhring" %}
+{% block title "things | Maximilian Möhring" %}
{% block css %}
.feed-flavor {
@@ -18,16 +18,16 @@
<ul>
<li>
- <a href="/tools/faces/" title="Best faces on the net">Best faces on the net</a>
+ <a href="/things/faces/" title="Best faces on the net">Best faces on the net</a>
</li>
<li>
- <a href="/tools/untrack/" title="Entfernt Tracking Parameter aus der URL">untrack - Entfernt Tracking Parameter aus der URL</a>
+ <a href="/things/untrack/" title="Entfernt Tracking Parameter aus der URL">untrack - Entfernt Tracking Parameter aus der URL</a>
</li>
<li>
- <a href="/tools/pizza/" title="Pizzarechner">Pizzarechner</a>
+ <a href="/things/pizza/" title="Pizzarechner">Pizzarechner</a>
</li>
<li>
- <a href="/tools/tanz/" title="BPM / Tanz">Click to count BPMs - Tanzbar?</a>
+ <a href="/things/tanz/" title="BPM / Tanz">Click to count BPMs - Tanzbar?</a>
</li>
</ul>
@@ -40,13 +40,13 @@
<ul>
<li>
- <a href="/tools/zeitumstellung/" title="Zeitumstellung">Zeitumstellung - Als iCal-Feed für deinen Kalender</a>
+ <a href="/things/zeitumstellung/" title="Zeitumstellung">Zeitumstellung - Als iCal-Feed für deinen Kalender</a>
</li>
<li>
<a href="/feed/dilbert/" title="Dilbert RSS Feed">Dilbert RSS Feed. With Images!</a>
</li>
<li>
- <a href="/tools/ghrss" title="GHRSS">Github Trending Repositories as RSS-Feed</a>
+ <a href="/things/ghrss" title="GHRSS">Github Trending Repositories as RSS-Feed</a>
</li>
</ul>
diff --git a/views/tools/bpm b/views/things/bpm
-Subproject e0acc0b7877a48f8add10515ac89643b2ec9629
+Subproject e0acc0b7877a48f8add10515ac89643b2ec9629
diff --git a/views/tools/faces b/views/things/faces
-Subproject b629f6b83bc1fa43788e9b09d96bcf9cff92b2c
+Subproject b629f6b83bc1fa43788e9b09d96bcf9cff92b2c
diff --git a/views/tools/ghrss/composer.json b/views/things/ghrss/composer.json
index ba92705..ba92705 100644
--- a/views/tools/ghrss/composer.json
+++ b/views/things/ghrss/composer.json
diff --git a/views/tools/ghrss/composer.lock b/views/things/ghrss/composer.lock
index 1fc94a1..1fc94a1 100644
--- a/views/tools/ghrss/composer.lock
+++ b/views/things/ghrss/composer.lock
diff --git a/views/tools/ghrss/feed.php b/views/things/ghrss/feed.php
index 7276200..a11db87 100644
--- a/views/tools/ghrss/feed.php
+++ b/views/things/ghrss/feed.php
@@ -25,7 +25,7 @@ $channel = new Channel();
$channel
->title("GHRSS")
->description("Trending Repos from Github")
- ->url( "https://www.maximilianmoehring.com/tools/ghrss/" )
+ ->url( "https://www.maximilianmoehring.com/things/ghrss/" )
->pubDate(strtotime(date("r", time())))
->lastBuildDate(strtotime(date("r", time())))
->ttl(5)
diff --git a/views/tools/ghrss/ghrss.db.php b/views/things/ghrss/ghrss.db.php
index d96f881..d96f881 100644
--- a/views/tools/ghrss/ghrss.db.php
+++ b/views/things/ghrss/ghrss.db.php
diff --git a/views/tools/ghrss/index.html b/views/things/ghrss/index.html
index 1e64fa3..1e64fa3 100644
--- a/views/tools/ghrss/index.html
+++ b/views/things/ghrss/index.html
diff --git a/views/tools/pizza b/views/things/pizza
-Subproject 94a325594c8a9e124ea75f2885e82786fb2172b
+Subproject 94a325594c8a9e124ea75f2885e82786fb2172b
diff --git a/views/tools/untrack b/views/things/untrack
-Subproject b0acc3b919f85211bf1824c5481cafa27d8a29e
+Subproject b0acc3b919f85211bf1824c5481cafa27d8a29e
diff --git a/views/tools/zeitumstellung b/views/things/zeitumstellung
-Subproject 3828fcac7c7cb75e88ca0ce10fa451ad22fc387
+Subproject 3828fcac7c7cb75e88ca0ce10fa451ad22fc387