feat(#193): include room ui as java application page

build.gradle

@@ -95,3 +95,25 @@ jar {
 task runExecutableJar(type: JavaExec) {
     classpath = files(tasks.jar)
 }
+
+task downloadJavascriptDependencies() {
+    ext.downloadFile = { localPath, remoteURL ->
+        def f = new File(localPath)
+        if (!f.exists()) {
+            new URL(remoteURL).withInputStream{ i -> f.withOutputStream{ it << i }}
+        }
+    }
+
+    doLast {
+        // https://github.com/vuejs/
+        downloadFile('./src/html/common/vue/vue.global.prod.js', 'https://unpkg.com/[email protected]/dist/vue.global.prod.js')
+
+        // https://github.com/intlify/vue-i18n
+        downloadFile('./src/html/common/vue/vue-i18n.global.prod.js', 'https://unpkg.com/[email protected]/dist/vue-i18n.global.prod.js')
+
+        // https://github.com/axios/axios
+        downloadFile('./src/html/common/vue/axios.min.js', 'https://unpkg.com/[email protected]/dist/axios.min.js')
+    }
+}
+
+jar.dependsOn(downloadJavascriptDependencies)

doc/config-template.yaml

@@ -41,6 +41,8 @@ sepa:
   subject_prefix: 'AWECON'
   success_redirect: 'http://localhost:10000/app/register'
   failure_redirect: 'http://localhost:10000/app/register'
+rooms:
+  manage: false
 choices:
   flags:
     hc:

src/html/common/vue/localizations/de-DE.js

@@ -1,9 +1,7 @@
 export const de_DE = {
     rooms: {
-        app: {
-            title: 'Zimmerverwaltung',
-        },
         list: {
+            title: 'Zimmerliste',
             empty: 'Aktuell sind keine Zimmer definiert. Du solltest welche anlegen.',
             header: {
                 no: "Nr.",

src/html/common/vue/localizations/en-US.js

@@ -1,9 +1,7 @@
 export const en_US = {
     rooms: {
-        app: {
-            title: 'Manage Rooms',
-        },
         list: {
+            title: 'Current Rooms',
             empty: 'There are currently no rooms. You should create one.',
             header: {
                 no: "No.",

src/html/common/vue/rooms/app.js

@@ -8,13 +8,13 @@ export const App = {
         RoomList,
         RoomCreateForm,
     },
-    template: `<td class="contentbox">
-   <div class="headline"><br/>{{ $t('rooms.app.title') }}</div>
-   <hr class="contentbox"/>
+    template: `
         <ErrorList />
+   <div class="headline"><br/>{{ $t('rooms.list.title') }}</div>
+   <hr class="contentbox"/>
         <RoomList />
    <div class="headline"><br/>{{ $t('rooms.create.title') }}</div>
    <hr class="contentbox"/>
         <RoomCreateForm />
-    </td>`
+   `
 }

src/html/common/vue/rooms/index.js

@@ -1,3 +1,7 @@
+// main entry point of the room application, for use in a script tag of type module
+//
+// see templates rooms_js.vm and rooms.vm
+
 import { de_DE } from '../localizations/de-DE.js'
 import { en_US } from '../localizations/en-US.js'
 import { App } from './app.js'

src/java/org/eurofurence/regsys/backend/Strings.java

@@ -47,4 +47,5 @@ public class Strings extends StringsEF {
     public static SepaPageMsgs sepaPage = new SepaPageMsgs();
     public static StartPageMsgs startPage = new StartPageMsgs();
     public static StatsPageMsgs statsPage = new StatsPageMsgs();
+    public static RoomsPageMsgs roomsPage = new RoomsPageMsgs();
 }

src/java/org/eurofurence/regsys/backend/StringsEF.java

@@ -298,4 +298,8 @@ public String timeUntilStart(long days, long hours, long mins, long secs) {
     public static class StatsPageMsgs {
         public String pageTitle = "Statistics";
     }
+
+    public static class RoomsPageMsgs {
+        public String pageTitle = "Rooms";
+    }
 }

src/java/org/eurofurence/regsys/backend/StringsMMC.java

@@ -309,4 +309,8 @@ public String timeUntilStart(long days, long hours, long mins, long secs) {
     public static class StatsPageMsgs {
         public String pageTitle = "Statistiken";
     }
+
+    public static class RoomsPageMsgs {
+        public String pageTitle = "Zimmer";
+    }
 }

src/java/org/eurofurence/regsys/repositories/config/Configuration.java

@@ -167,6 +167,11 @@ public static class SepaConfig {
         public String failureRedirect;
     }
 
+    public static class RoomsConfig {
+        @JsonProperty("manage")
+        public boolean manage;
+    }
+
     @JsonProperty("choices")
     public Choices choices;
 
@@ -193,4 +198,7 @@ public static class SepaConfig {
 
     @JsonProperty("sepa")
     public SepaConfig sepa;
+
+    @JsonProperty("rooms")
+    public RoomsConfig rooms;
 }

src/java/org/eurofurence/regsys/web/forms/NavbarForm.java

@@ -5,6 +5,7 @@
 import org.eurofurence.regsys.backend.Strings;
 import org.eurofurence.regsys.backend.enums.RoomManagementOption;
 import org.eurofurence.regsys.repositories.attendees.Attendee;
+import org.eurofurence.regsys.repositories.config.Configuration;
 import org.eurofurence.regsys.repositories.errors.UnauthorizedException;
 
 import java.util.function.Predicate;
@@ -167,6 +168,17 @@ public String getSendAnnouncementsURL() {
         return "bulkmail";
     }
 
+    // rooms
+
+    public boolean showManageRooms() {
+        Configuration conf = getPage().getConfiguration();
+        return conf.rooms != null && conf.rooms.manage;
+    }
+
+    public String getManageRoomsURL() {
+        return "rooms";
+    }
+
     // edit own registration
 
     private boolean loggedInRegisteredAttendeeStatusCondition(Predicate<Constants.MemberStatus> condition) {

src/java/org/eurofurence/regsys/web/pages/RoomsPage.java

@@ -0,0 +1,47 @@
+package org.eurofurence.regsys.web.pages;
+
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import org.eurofurence.regsys.backend.Strings;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+public class RoomsPage extends Page {
+    @Override
+    public String handleRequest() throws ServletException {
+        refreshSessionTimeout();
+
+        HashMap<String, Object> veloContext = new HashMap<>();
+
+        veloContext.put("navbar", getNavbarForm());
+        veloContext.put("page", this);
+
+        return Page.renderTemplate(getServletContext(), "html.vm", veloContext);
+    }
+
+    @Override
+    protected String getPageTitle() {
+        return Strings.roomsPage.pageTitle;
+    }
+
+    @Override
+    public String getPageTemplateFile() {
+        return "rooms.vm";
+    }
+
+    @Override
+    public ArrayList<String> getHeaderJsFileList() {
+        ArrayList<String> lst = new ArrayList<>();
+        lst.add("js/rooms_js.vm");
+        return lst;
+    }
+
+    @Override
+    public void initialize(ServletContext servletContext, HttpServletRequest request, HttpServletResponse response, HttpSession session) {
+        super.initialize(servletContext, request, response, session);
+    }
+}

src/java/org/eurofurence/regsys/web/servlets/page/PageRequestHandlerFactory.java

@@ -23,6 +23,7 @@ public class PageRequestHandlerFactory {
         suppliersByPathInfo.put("/list", ListPage::new);
         suppliersByPathInfo.put("/mass-approve", MassApprovePage::new);
         suppliersByPathInfo.put("/payment", PaymentPage::new);
+        suppliersByPathInfo.put("/rooms", RoomsPage::new);
         suppliersByPathInfo.put("/search", SearchPage::new);
         suppliersByPathInfo.put("/sepa", SepaPage::new);
         suppliersByPathInfo.put("/start", StartPage::new);

src/tpl/common/pages/js/rooms_js.vm

@@ -0,0 +1,4 @@
+<script src="../vue/vue.global.prod.js"></script>
+<script src="../vue/vue-i18n.global.prod.js"></script>
+<script src="../vue/axios.min.js"></script>
+<script src="../vue/rooms/index.js" type="module"></script>

src/tpl/common/pages/navbar.vm

@@ -55,6 +55,9 @@
 #if( $navbar.showAnnouncementsEditAndSend() )##
       <img src="$pathImages/bullet.jpg"/>&nbsp;<a class="navigation" HREF="$navbar.EditAnnouncementsURL">$strNavEditAnnouncements</a><br/>
 #end##
+#if( $navbar.showManageRooms() )##
+    <img src="$pathImages/bullet.jpg"/>&nbsp;<a class="navigation" HREF="$navbar.ManageRoomsURL">$strNavManageRooms</a><br/>
+#end##
 ##
 ##
 #if( $navbar.showEditOwnRegistration() )##

src/tpl/common/pages/rooms.vm

@@ -0,0 +1,10 @@
+#parse( "strings/rooms.strings.vm" )
+<td class="contentbox">
+    #parse( "local/localmessage.vm" )
+
+    <div class="pageheader">$strRoomManagementTitle</div>
+    <hr class="contentbox"/>
+
+    <noscript><b>$strJavascriptDisabled</b> $strPleaseEnableJavascript</noscript>
+    <div id="app"></div>
+</td>

src/tpl/common/pages/strings/navbar.strings.vm

@@ -24,6 +24,7 @@
 #set($strNavExport = "Export")##
 #set($strNavManageBans = "Manage Bans")##
 #set($strNavEditAnnouncements = "Edit Announcements")##
+#set($strNavManageRooms = "Rooms")##
 #set($strNavMarkOverdue = "Mark Overdue")##
 #set($strNavSendNotifications = "Send Notifications")##
 #set($strNavEditOwnRegistration = "Edit my Registration")##

src/tpl/common/pages/strings/rooms.strings.vm

@@ -0,0 +1,4 @@
+## Strings used in the room management template wrapper
+#set( $strRoomManagementTitle = "Manage Rooms")##
+#set( $strJavascriptDisabled = "Javascript is disabled!")##
+#set( $strPleaseEnableJavascript = "Please enable it to use this page.")##

src/tpl/mmc/pages/strings/navbar.strings.vm

@@ -24,6 +24,7 @@
 #set($strNavExport = "Exportieren")##
 #set($strNavManageBans = "Sperrungen verwalten")##
 #set($strNavEditAnnouncements = "Bearbeite Ankündigungen")##
+#set($strNavManageRooms = "Zimmer")##
 #set($strNavMarkOverdue = "Markiere offene Zahlungen")##
 #set($strNavSendNotifications = "Sende Benachrichtigungen")##
 #set($strNavEditOwnRegistration = "Bearbeite meine Registrierung")##

src/tpl/mmc/pages/strings/rooms.strings.vm

@@ -0,0 +1,4 @@
+## Strings used in the room management template wrapper
+#set( $strRoomManagementTitle = "Zimmerverwaltung")##
+#set( $strJavascriptDisabled = "Javascript ist deaktiviert!")##
+#set( $strPleaseEnableJavascript = "Bitte einschalten, um diese Seite zu benutzen.")##