diff --git a/app/Models/ChaosEvents.php b/app/Models/ChaosEvents.php
index 0b3854d..e377606 100644
--- a/app/Models/ChaosEvents.php
+++ b/app/Models/ChaosEvents.php
@@ -24,6 +24,6 @@ class ChaosEvents extends Model
public static function getActiveEvents(){
return self::where('active', 1)->where('to_date_internal', '>=', today())
- ->where('from_date_internal', '<=', today())->get();
+ ->where('from_date_internal', '<=', today())->orderBy('to_date_internal')->get();
}
}
diff --git a/lang/de/app.php b/lang/de/app.php
index 33b9ee1..856726b 100644
--- a/lang/de/app.php
+++ b/lang/de/app.php
@@ -23,6 +23,9 @@ return [
'editApplications' => 'Anträge bearbeiten',
'logout' => 'Abmelden'
],
+ 'index' => [
+ 'welcome' => 'Willkommen auf der Internetpräsenz des C3Gov'
+ ],
'about' => [
'subtitle' => 'Unbeschwertes Einreisen in die stationären sowie temporären CCC Bezirksregionen',
'text1' => 'Das C3Gov bietet Ihnen die Ausstellung unserer zertifizierten Reisepässe an, mit denen Sie unbeschwert in die Botschaften [Hackspaces] sowie temporär bestehenden Bezirksregionen des CCC einreisen und Ihren Aufenthalt verifizieren lassen können.',
@@ -86,6 +89,7 @@ return [
Nachdem Sie den Vorantrag abgeschickt haben, erhalten Sie eine Bestätigung via elektronischer Post.',
'noevent' => 'Es sind derzeit keine Termine verfügbar.',
'region' => 'Bezirksregion',
+ 'time_ends' => 'Frist endet am',
'passport_type' => 'Reisepass-Typ',
'passport' => [
'standard' => 'Hacker*innen-Reisepass',
diff --git a/lang/en/app.php b/lang/en/app.php
index e943c4b..83a85f6 100644
--- a/lang/en/app.php
+++ b/lang/en/app.php
@@ -23,6 +23,9 @@ return [
'editApplications' => 'Edit applications',
'logout' => 'Logout'
],
+ 'index' => [
+ 'welcome' => 'Welcome to the Internet presence of the C3Gov'
+ ],
'about' => [
'subtitle' => 'Hassle-Free Entry into CCC\'s Permanent and Temporary District Regions',
'text1' => 'C3Gov offers you the issuance of our certified travel documents, which allow you to enter the CCC\'s permanent and temporary district regions hassle-free and have your stay verified.',
@@ -86,6 +89,7 @@ return [
After you have submitted the pre-application, you will receive a confirmation by e-mail.',
'noevent' => 'Currently, there are no open appointment slots available.',
'region' => 'District region',
+ 'time_ends' => 'Time ends on',
'passport_type' => 'Passport type',
'passport' => [
'standard' => 'Hacker Passport',
diff --git a/public/css/style.css b/public/css/style.css
index 4e532da..c543e70 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -257,3 +257,40 @@ nav {
text-align: center;
flex-shrink: 0;
}
+
+.split-left {
+ float: left;
+ width: 50%;
+}
+.split-right {
+ float: left;
+ width: 50%;
+ border-left: 1px dotted #000;
+ padding-left: 30px;
+}
+.content::after {
+ content: "";
+ display: table;
+ clear: both;
+}
+
+.apply-button {
+ font-size: 2.5em;
+ padding: 20px 40px;
+ border: 5px solid cyan;
+ border-radius: 10px;
+ cursor: pointer;
+ font-weight: bold;
+ animation: blink 2s infinite;
+}
+
+@keyframes blink {
+ 0%, 100% {
+ background-color: white;
+ color: #4b0600;
+ }
+ 50% {
+ background-color: cyan;
+ color: black;
+ }
+}
diff --git a/public/css/ticker/ticker.css b/public/css/ticker/ticker.css
deleted file mode 100644
index 87eeb92..0000000
--- a/public/css/ticker/ticker.css
+++ /dev/null
@@ -1,10 +0,0 @@
-.split-left {
- float: left;
- width: 21%;
-}
-.split-right {
- float: left;
- width: 50%;
- border-left: 1px dotted #000;
- padding-left: 30px;
-}
diff --git a/resources/views/application/apply.blade.php b/resources/views/application/apply.blade.php
index 25e84e4..969f647 100644
--- a/resources/views/application/apply.blade.php
+++ b/resources/views/application/apply.blade.php
@@ -16,14 +16,17 @@
{!! __('app.preapplication.content') !!}
- @forelse (ChaosEvents::getActiveEvents() as $event) + @if (ChaosEvents::getActiveEvents()->count() > 0)