cleaner error handling

screepers · Aug 20, 2024 · 13c62a2 · 13c62a2
1 parent 6fe0641
commit 13c62a2
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 40 deletions.
diff --git a/src/clientApp.ts b/src/clientApp.ts
@@ -159,12 +159,8 @@ koa.use(async (ctx, next) => {
 koa.use(async (context, next) => {
     if (['/', 'index.html'].includes(context.path)) {
         const communityPages = getCommunityPages();
-        const serverList = await getServerListConfig(__dirname, hostAddress, port, argv.server_list);
-        if (serverList.length) {
-            await context.render(indexFile, { serverList, communityPages });
-            return;
-        }
-        await context.render(indexFile, { communityPages });
+        let serverList = await getServerListConfig(__dirname, hostAddress, port, argv.server_list);
+        await context.render(indexFile, { serverList, communityPages });
     }
 
     return next();

diff --git a/views/index.ejs b/views/index.ejs
@@ -13,44 +13,51 @@
     <main>
         <div class="card">
             <% // The serverList is passed in from the clientApp %>
-                <% serverList.forEach(section=> { %>
-                    <div class="card-section" data-section="<%= section.name %>">
-                        <% if (section.name.toLowerCase()==='official' ) { %>
-                            <div class="screeps-logo">
-                                <img src="<%= section.logo %>" alt="Screeps Logo" />
+                <% if(serverList.length===0){ %>
+                    <h1> Could not load Server List</h1>
+                    <% } %>
+                        <% serverList.forEach(section=> { %>
+                            <div class="card-section" data-section="<%= section.name %>">
+                                <% if (section.name.toLowerCase()==='official' ) { %>
+                                    <div class="screeps-logo">
+                                        <img src="<%= section.logo %>" alt="Screeps Logo" />
+                                    </div>
+                                    <% } else { %>
+                                        <h2>
+                                            <%= section.name %>
+                                        </h2>
+                                        <% } %>
+                                            <% section.servers.forEach(server=> { %>
+                                                <div class="server">
+                                                    <a href="<%= server.url %>">
+                                                        <button>
+                                                            <%= server.name %>
+                                                        </button>
+                                                    </a>
+                                                    <span class="status-circle" data-api="<%= server.api %>"></span>
+                                                </div>
+                                                <% }) %>
                             </div>
-                            <% } else { %>
-                                <h2>
-                                    <%= section.name %>
-                                </h2>
-                                <% } %>
-                                    <% section.servers.forEach(server=> { %>
-                                        <div class="server">
-                                            <a href="<%= server.url %>">
-                                                <button>
-                                                    <%= server.name %>
-                                                </button>
-                                            </a>
-                                            <span class="status-circle" data-api="<%= server.api %>"></span>
-                                        </div>
-                                        <% }) %>
-                    </div>
-                    <% }) %>
+                            <% }) %>
         </div>
         <div class="card community-card">
-            <h2>Community Content</h2>
-            <div class="comm-container">
-                <% communityPages.forEach(page=> { %>
-                    <div class="comm-page">
-                        <a href="<%= page.url %> " target="_blank" rel="noopener noreferrer">
-                            <button class="comm-page-buttom">
-                                <%= page.title %>
-                            </button>
-                        </a>
-                    </div>
-                    <% }) %>
+            <% if(communityPages.length===0){ %>
+                <h1> Could not load Community Content</h1>
+                <% } else{ %>
+                    <h2>Community Content</h2>
+                    <% } %>
+                        <div class="comm-container">
+                            <% communityPages.forEach(page=> { %>
+                                <div class="comm-page">
+                                    <a href="<%= page.url %> " target="_blank" rel="noopener noreferrer">
+                                        <button class="comm-page-buttom">
+                                            <%= page.title %>
+                                        </button>
+                                    </a>
+                                </div>
+                                <% }) %>
 
-            </div>
+                        </div>
         </div>
     </main>
     <script src="/dist/serverStatus.js"></script>