Update to release announcements display

Narvuk · Dec 1, 2020 · 91bede9 · 91bede9
1 parent ed67fb8
commit 91bede9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/src/Controller/System/CoreController.php b/src/Controller/System/CoreController.php
@@ -254,6 +254,8 @@ public function SystemAboutInformation(Request $request, ReleaseInfo $releaseinf
         $servicestatus = $releaseinfo->ServiceStatus();
         $devstage = $releaseinfo->DevStage();
 
+        $announcements = $releaseinfo->Announcements();
+
 
 
         return $this->render('system/sysinfo.html.twig',
@@ -267,6 +269,7 @@ public function SystemAboutInformation(Request $request, ReleaseInfo $releaseinf
                 'servicestatus' => $servicestatus,
                 'devstage' => $devstage,
                 'uscron' => $uscron,
+                'announcements' => $announcements,
             ]
         );
     }

diff --git a/src/Service/ReleaseInfo.php b/src/Service/ReleaseInfo.php
@@ -73,12 +73,13 @@ public function UpdateCheck()
     public function Announcements()
     {
         try{
-            $announcements = file_get_contents('https://update.stormdevelopers.com/get/details/2/announcements');
+            $url = 'https://update.stormdevelopers.com/api/announcements/2';
+            $json = file_get_contents($url);
+            $announcements = json_decode($json, TRUE);
         }
         catch(\Exception $e){
             $announcements = 'Announcements are offline or no new announcements been sent, They will be some very soon';
         }
-
         return $announcements;
     }
 

diff --git a/templates/system/sysinfo.html.twig b/templates/system/sysinfo.html.twig
@@ -130,27 +130,27 @@
     </div>
 
 
-    <noscript>
         <div class="row">
-            <div class="col-md-12">
+            {% for a in announcements %}
+            <div class="col-md-6">
                 <div class="card">
                     <div class="card-header">
                         <h3 class="card-title">
-                            <i class="fas fa-users-cog"></i>
-                            Change Log
+                            <i class="fas fa-bullhorn"></i>
+                            {{ a.title }}
                         </h3>
                     </div>
                     <!-- /.card-header -->
                     <div class="card-body">
-                        Changes being recorded soon
+                            {{ a.announcement }}
                     </div>
                     <!-- /.card-body -->
                 </div>
                 <!-- /.card -->
             </div>
             <!-- ./col -->
+            {% endfor %}
         </div>
-    </noscript>
 {% endblock %}
 {% block pageJS %}
     <!-- Additional Javascript or Jquery  -->