diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ac493c4 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +app/vendor \ No newline at end of file diff --git a/composer.json b/app/composer.json similarity index 100% rename from composer.json rename to app/composer.json diff --git a/composer.lock b/app/composer.lock similarity index 100% rename from composer.lock rename to app/composer.lock diff --git a/css/event.css b/app/css/event.css similarity index 100% rename from css/event.css rename to app/css/event.css diff --git a/css/events.css b/app/css/events.css similarity index 100% rename from css/events.css rename to app/css/events.css diff --git a/css/home.css b/app/css/home.css similarity index 100% rename from css/home.css rename to app/css/home.css diff --git a/css/kontakt.css b/app/css/kontakt.css similarity index 100% rename from css/kontakt.css rename to app/css/kontakt.css diff --git a/css/main.css b/app/css/main.css similarity index 99% rename from css/main.css rename to app/css/main.css index d9ec6eb..0e8e121 100644 --- a/css/main.css +++ b/app/css/main.css @@ -26,6 +26,7 @@ a { a:hover { text-decoration: underline; + cursor: pointer; } a:visited { diff --git a/events/0.md b/app/events/0.md similarity index 100% rename from events/0.md rename to app/events/0.md diff --git a/events/brunch.md b/app/events/brunch.md similarity index 100% rename from events/brunch.md rename to app/events/brunch.md diff --git a/events/repaircafe.md b/app/events/repaircafe.md similarity index 100% rename from events/repaircafe.md rename to app/events/repaircafe.md diff --git a/events/topictreff.md b/app/events/topictreff.md similarity index 100% rename from events/topictreff.md rename to app/events/topictreff.md diff --git a/events/treff.md b/app/events/treff.md similarity index 100% rename from events/treff.md rename to app/events/treff.md diff --git a/images/adresse_knopf.webp b/app/images/adresse_knopf.webp similarity index 100% rename from images/adresse_knopf.webp rename to app/images/adresse_knopf.webp diff --git a/images/chat_knopf.webp b/app/images/chat_knopf.webp similarity index 100% rename from images/chat_knopf.webp rename to app/images/chat_knopf.webp diff --git a/images/events/ctdo-logo-reperaturcafe.png b/app/images/events/ctdo-logo-reperaturcafe.png similarity index 100% rename from images/events/ctdo-logo-reperaturcafe.png rename to app/images/events/ctdo-logo-reperaturcafe.png diff --git a/images/header.jpg b/app/images/header.jpg similarity index 100% rename from images/header.jpg rename to app/images/header.jpg diff --git a/images/logo_ctdo.svg b/app/images/logo_ctdo.svg similarity index 100% rename from images/logo_ctdo.svg rename to app/images/logo_ctdo.svg diff --git a/images/mail_knopf.webp b/app/images/mail_knopf.webp similarity index 100% rename from images/mail_knopf.webp rename to app/images/mail_knopf.webp diff --git a/images/posts/DORTBUNT.nebenan_Banner-fuer-Anmeldende-768x154.png b/app/images/posts/DORTBUNT.nebenan_Banner-fuer-Anmeldende-768x154.png similarity index 100% rename from images/posts/DORTBUNT.nebenan_Banner-fuer-Anmeldende-768x154.png rename to app/images/posts/DORTBUNT.nebenan_Banner-fuer-Anmeldende-768x154.png diff --git a/images/tel_knopf.webp b/app/images/tel_knopf.webp similarity index 100% rename from images/tel_knopf.webp rename to app/images/tel_knopf.webp diff --git a/index.php b/app/index.php similarity index 97% rename from index.php rename to app/index.php index 27dc1f1..30c5d68 100644 --- a/index.php +++ b/app/index.php @@ -54,7 +54,7 @@ if(isset($_GET['page'])) { switch ($page) { case 'index': $content = $converter->convert(file_get_contents(__DIR__ . '/pages/index.md')); - $content = $twig_templates->render('index.twig', ['content' => $content, 'topic' => $topic, 'treff' => $treff, 'repaircafe' => $repaircafe, 'brunch' => $brunch, 'events' => generate_event_list() ]); + $content = $twig_templates->render('index.twig', ['content' => $content, 'topic' => $topic, 'treff' => $treff, 'repaircafe' => $repaircafe, 'brunch' => $brunch, 'events' => generate_event_list(4) ]); $filetoedit = "pages/index.md"; $css[] = 'home'; $css[] = 'events'; @@ -70,7 +70,7 @@ if(isset($_GET['page'])) { break; case 'blog': if(!isset($_GET['id'])) { - $content = $twig_templates->render('blog.twig', [ 'posts' => generate_post_list() ]); + $content = $twig_templates->render('blog.twig', [ 'posts' => generate_post_list(10) ]); $filetoedit = "templates/blog.twig"; $css[] = 'events'; } else { @@ -81,7 +81,7 @@ if(isset($_GET['page'])) { break; case 'events': if(!isset($_GET['id'])) { - $content = $twig_templates->render('events.twig', [ 'topic' => $topic, 'treff' => $treff, 'repaircafe' => $repaircafe, 'brunch' => $brunch, 'events' => generate_event_list() ]); + $content = $twig_templates->render('events.twig', [ 'topic' => $topic, 'treff' => $treff, 'repaircafe' => $repaircafe, 'brunch' => $brunch, 'events' => generate_event_list(10) ]); $filetoedit = "templates/events.twig"; $css[] = 'events'; } else { @@ -137,8 +137,9 @@ if(isset($_GET['page'])) { } else { $active_page = 'index'; $title = $active_page; + $filetoedit = "pages/index.md"; $content = $converter->convert(file_get_contents(__DIR__ . '/pages/index.md')); - $content = $twig_templates->render('index.twig', ['content' => $content, 'topic' => $topic, 'treff' => $treff, 'repaircafe' => $repaircafe, 'brunch' => $brunch, 'events' => generate_event_list() ]); + $content = $twig_templates->render('index.twig', ['content' => $content, 'topic' => $topic, 'treff' => $treff, 'repaircafe' => $repaircafe, 'brunch' => $brunch, 'events' => generate_event_list(4) ]); $css[] = 'home'; $css[] = 'events'; } diff --git a/js/nav.js b/app/js/nav.js similarity index 100% rename from js/nav.js rename to app/js/nav.js diff --git a/pages/.DS_Store b/app/pages/.DS_Store similarity index 100% rename from pages/.DS_Store rename to app/pages/.DS_Store diff --git a/pages/about.md b/app/pages/about.md similarity index 100% rename from pages/about.md rename to app/pages/about.md diff --git a/pages/datenschutz.md b/app/pages/datenschutz.md similarity index 100% rename from pages/datenschutz.md rename to app/pages/datenschutz.md diff --git a/pages/impressum.md b/app/pages/impressum.md similarity index 100% rename from pages/impressum.md rename to app/pages/impressum.md diff --git a/pages/index.md b/app/pages/index.md similarity index 100% rename from pages/index.md rename to app/pages/index.md diff --git a/pages/kontakt/.DS_Store b/app/pages/kontakt/.DS_Store similarity index 100% rename from pages/kontakt/.DS_Store rename to app/pages/kontakt/.DS_Store diff --git a/pages/kontakt/adresse.md b/app/pages/kontakt/adresse.md similarity index 100% rename from pages/kontakt/adresse.md rename to app/pages/kontakt/adresse.md diff --git a/pages/kontakt/irc.md b/app/pages/kontakt/irc.md similarity index 100% rename from pages/kontakt/irc.md rename to app/pages/kontakt/irc.md diff --git a/pages/kontakt/mail.md b/app/pages/kontakt/mail.md similarity index 100% rename from pages/kontakt/mail.md rename to app/pages/kontakt/mail.md diff --git a/pages/kontakt/tel.md b/app/pages/kontakt/tel.md similarity index 100% rename from pages/kontakt/tel.md rename to app/pages/kontakt/tel.md diff --git a/pages/support.md b/app/pages/support.md similarity index 100% rename from pages/support.md rename to app/pages/support.md diff --git a/pages/treff.md b/app/pages/treff.md similarity index 100% rename from pages/treff.md rename to app/pages/treff.md diff --git a/pages/verein.md b/app/pages/verein.md similarity index 100% rename from pages/verein.md rename to app/pages/verein.md diff --git a/php/events.php b/app/php/events.php similarity index 92% rename from php/events.php rename to app/php/events.php index ed2f920..a40a147 100644 --- a/php/events.php +++ b/app/php/events.php @@ -10,7 +10,7 @@ function scan_for_events() { return $output; } -function generate_event_list($limit = -1) { +function generate_event_list($limit = -1, $page = 0) { $events = scan_for_events(); $output = ""; if ($limit == -1) { @@ -23,9 +23,12 @@ function generate_event_list($limit = -1) { $output .= '

'.$veranstaltungsort.'

'.$date.'

'.$title.'

'.$desc.'

'; } } else { - if($limit > count($events)) - $limit = count($events); - for ($i = 0; $i < $limit; $i++) { + $start_index = $page * $limit; + $end_index = $start_index + $limit; + if($end_index > count($events)) + $end_index = count($events); + for ($i = $start_index; $i < $end_index; $i++) { + $event = $events[$i]; $lines = file(__DIR__ . '/../events/' . $event); $title = $lines[0]; $desc = $lines[1]; diff --git a/php/posts.php b/app/php/posts.php similarity index 83% rename from php/posts.php rename to app/php/posts.php index 543d536..5be85d5 100644 --- a/php/posts.php +++ b/app/php/posts.php @@ -10,7 +10,7 @@ function scan_for_posts() { return $output; } -function generate_post_list($limit = -1) { +function generate_post_list($limit = -1, $page = 0) { $events = scan_for_posts(); $output = ""; if ($limit == -1) { @@ -23,9 +23,11 @@ function generate_post_list($limit = -1) { $output .= '

'.$signatur.'
'.$date.'

'.$title.'

'.$desc.'

'; } } else { - if($limit > count($events)) - $limit = count($events); - for ($i = 0; $i < $limit; $i++) { + $start_index = $page * $limit; + $end_index = $start_index + $limit; + if($end_index > count($events)) + $end_index = count($events); + for ($i = $start_index; $i < $end_index; $i++) { $lines = file(__DIR__ . '/../posts/' . $events[$i]); $title = $lines[0]; $desc = $lines[1]; diff --git a/php/util.php b/app/php/util.php similarity index 100% rename from php/util.php rename to app/php/util.php diff --git a/posts/0.md b/app/posts/0.md similarity index 100% rename from posts/0.md rename to app/posts/0.md diff --git a/posts/1.md b/app/posts/1.md similarity index 100% rename from posts/1.md rename to app/posts/1.md diff --git a/templates/404.twig b/app/templates/404.twig similarity index 100% rename from templates/404.twig rename to app/templates/404.twig diff --git a/templates/blog.twig b/app/templates/blog.twig similarity index 100% rename from templates/blog.twig rename to app/templates/blog.twig diff --git a/templates/default.twig b/app/templates/default.twig similarity index 95% rename from templates/default.twig rename to app/templates/default.twig index 1de7cb8..0e57b82 100644 --- a/templates/default.twig +++ b/app/templates/default.twig @@ -16,7 +16,7 @@
- = + =