remove legacy logo from the app

.gitignore

@@ -48,11 +48,9 @@ app/core/src/main/resources/static/assets/
 app/core/src/main/resources/static/index.html
 app/core/src/main/resources/static/locales/
 app/core/src/main/resources/static/Login/
-app/core/src/main/resources/static/classic-logo/
-app/core/src/main/resources/static/modern-logo/
+app/core/src/main/resources/static/logo/
 app/core/src/main/resources/static/og_images/
 app/core/src/main/resources/static/samples/
-app/core/src/main/resources/static/manifest-classic.json
 app/core/src/main/resources/static/robots.txt
 app/core/src/main/resources/static/pdfium/
 app/core/src/main/resources/static/pdfjs/

app/common/src/main/java/stirling/software/common/model/ApplicationProperties.java

@@ -1132,7 +1132,6 @@ public String toString() {
     public static class Ui {
         private String appNameNavbar;
         private List<String> languages;
-        private String logoStyle = "classic"; // Options: "classic" (default) or "modern"
         private boolean defaultHideUnavailableTools = false;
         private boolean defaultHideUnavailableConversions = false;
         private HideDisabledTools hideDisabledTools = new HideDisabledTools();
@@ -1141,14 +1140,6 @@ public String getAppNameNavbar() {
             return appNameNavbar != null && !appNameNavbar.trim().isEmpty() ? appNameNavbar : null;
         }
 
-        public String getLogoStyle() {
-            // Validate and return either "modern" or "classic"
-            if ("modern".equalsIgnoreCase(logoStyle)) {
-                return "modern";
-            }
-            return "classic"; // default
-        }
-
         @Data
         public static class HideDisabledTools {
             private boolean googleDrive = false;

app/common/src/main/java/stirling/software/common/util/RequestUriUtils.java

@@ -31,8 +31,7 @@ public static boolean isStaticResource(String contextPath, String requestURI) {
                 || normalizedUri.startsWith("/locales/")
                 || normalizedUri.startsWith("/Login/")
                 || normalizedUri.startsWith("/samples/")
-                || normalizedUri.startsWith("/classic-logo/")
-                || normalizedUri.startsWith("/modern-logo/")
+                || normalizedUri.startsWith("/logo/")
                 || normalizedUri.startsWith("/og_images/")) {
             return true;
         }
@@ -42,7 +41,6 @@ public static boolean isStaticResource(String contextPath, String requestURI) {
                 || "/favicon.ico".equals(normalizedUri)
                 || "/manifest.json".equals(normalizedUri)
                 || "/site.webmanifest".equals(normalizedUri)
-                || "/manifest-classic.json".equals(normalizedUri)
                 || "/index.html".equals(normalizedUri)) {
             return true;
         }

app/core/build.gradle

@@ -218,13 +218,9 @@ def generatedFrontendPaths = [
     'site.webmanifest.br',
     'browserconfig.xml.gz',
     'browserconfig.xml.br',
-    'manifest-classic.json',
-    'manifest-classic.json.gz',
-    'manifest-classic.json.br',
     'locales',
     'Login',
-    'classic-logo',
-    'modern-logo',
+    'logo',
     'og_images',
     'samples',
     'pdfium',

app/core/src/main/java/stirling/software/SPDF/config/WebMvcConfig.java

@@ -81,8 +81,7 @@ public void addResourceHandlers(ResourceHandlerRegistry registry) {
                         "/mstile-*.png",
                         "/safari-pinned-tab.svg",
                         "/icons/**",
-                        "/modern-logo/**",
-                        "/classic-logo/**",
+                        "/logo/**",
                         "/robots.txt",
                         "/3rdPartyLicenses.json",
                         "/pdfjs/**",
@@ -94,8 +93,7 @@ public void addResourceHandlers(ResourceHandlerRegistry registry) {
                         "/vendor/**",
                         "/samples/**",
                         "/og_images/**",
-                        "/Login/**",
-                        "/manifest-classic.json")
+                        "/Login/**")
                 .addResourceLocations(
                         staticPath,
                         "classpath:/static/",
@@ -121,10 +119,8 @@ public void addResourceHandlers(ResourceHandlerRegistry registry) {
                         "classpath:/static/Login/",
                         staticPath + "icons/",
                         "classpath:/static/icons/",
-                        staticPath + "modern-logo/",
-                        "classpath:/static/modern-logo/",
-                        staticPath + "classic-logo/",
-                        "classpath:/static/classic-logo/")
+                        staticPath + "logo/",
+                        "classpath:/static/logo/")
                 .setCacheControl(
                         CacheControl.maxAge(Duration.ofDays(1))
                                 .cachePublic()

app/core/src/main/java/stirling/software/SPDF/controller/api/misc/ConfigController.java

@@ -208,7 +208,6 @@ public ResponseEntity<Map<String, Object>> getAppConfig(HttpServletRequest reque
             // Extract values from ApplicationProperties
             configData.put("appNameNavbar", applicationProperties.getUi().getAppNameNavbar());
             configData.put("languages", applicationProperties.getUi().getLanguages());
-            configData.put("logoStyle", applicationProperties.getUi().getLogoStyle());
             configData.put("defaultLocale", applicationProperties.getSystem().getDefaultLocale());
 
             // User preference defaults

app/core/src/main/java/stirling/software/SPDF/controller/web/ReactRoutingController.java

@@ -203,13 +203,13 @@ public ResponseEntity<String> serveTauriAuthCallback(HttpServletRequest request)
     // (Real storage endpoints live under /api/v1/storage/files, already
     // excluded by the leading `api` token in the same regex.)
     @GetMapping(
-            "/{path:^(?!api|static|robots\\.txt|favicon\\.ico|manifest.*\\.json|pipeline|pdfjs|pdfjs-legacy|pdfium|vendor|fonts|images|css|js|assets|locales|modern-logo|classic-logo|Login|og_images|samples)[^\\.]*$}")
+            "/{path:^(?!api|static|robots\\.txt|favicon\\.ico|manifest.*\\.json|pipeline|pdfjs|pdfjs-legacy|pdfium|vendor|fonts|images|css|js|assets|locales|logo|Login|og_images|samples)[^\\.]*$}")
     public ResponseEntity<String> forwardRootPaths(HttpServletRequest request) throws IOException {
         return serveIndexHtml(request);
     }
 
     @GetMapping(
-            "/{path:^(?!api|static|pipeline|pdfjs|pdfjs-legacy|pdfium|vendor|fonts|images|css|js|assets|locales|modern-logo|classic-logo|Login|og_images|samples)[^\\.]*}/{subpath:^(?!.*\\.).*$}")
+            "/{path:^(?!api|static|pipeline|pdfjs|pdfjs-legacy|pdfium|vendor|fonts|images|css|js|assets|locales|logo|Login|og_images|samples)[^\\.]*}/{subpath:^(?!.*\\.).*$}")
     public ResponseEntity<String> forwardNestedPaths(HttpServletRequest request)
             throws IOException {
         return serveIndexHtml(request);

app/core/src/main/resources/settings.yml.template

@@ -301,7 +301,6 @@ autoPipeline:
 
 ui:
   appNameNavbar: "" # name displayed on the navigation bar
-  logoStyle: classic # Options: 'classic' (default - classic S icon) or 'modern' (minimalist logo)
   languages: [] # If empty, all languages are enabled. To restrict to specific languages, use a whitelist like ["de_DE", "pl_PL", "sv_SE"]. Empty list or not restricting any languages will enable all available languages.
   defaultHideUnavailableTools: false # Default user preference: hide disabled tools instead of greying them out
   defaultHideUnavailableConversions: false # Default user preference: hide disabled conversion options instead of greying them out

app/core/src/main/resources/static/manifest.json

@@ -3,17 +3,17 @@
   "name": "Stirling PDF",
   "icons": [
     {
-      "src": "modern-logo/favicon.ico",
+      "src": "logo/favicon.ico",
       "sizes": "64x64 32x32 24x24 16x16",
       "type": "image/x-icon"
     },
     {
-      "src": "modern-logo/logo192.png",
+      "src": "logo/logo192.png",
       "type": "image/png",
       "sizes": "192x192"
     },
     {
-      "src": "modern-logo/logo512.png",
+      "src": "logo/logo512.png",
       "type": "image/png",
       "sizes": "512x512"
     }

frontend/editor/index.html

@@ -3,14 +3,14 @@
   <head>
     <meta charset="UTF-8" />
     <base href="%BASE_URL%" />
-    <link rel="icon" href="modern-logo/favicon.ico" />
+    <link rel="icon" href="logo/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="theme-color" content="#000000" />
     <meta
       name="description"
       content="The Free Adobe Acrobat alternative (10M+ Downloads)"
     />
-    <link rel="apple-touch-icon" href="modern-logo/logo192.png" />
+    <link rel="apple-touch-icon" href="logo/logo192.png" />
     <link rel="manifest" href="manifest.json" />
 
     <title>Stirling PDF</title>

frontend/editor/public/locales/en-US/translation.toml

@@ -1034,14 +1034,6 @@ description = "Languages that users can select from (leave empty to enable all l
 label = "Available Languages"
 placeholder = "Select languages"
 
-[admin.settings.general.logoStyle]
-classic = "Classic"
-classicAlt = "Classic logo"
-description = "Set the default logo style for all users on this server. Users can override this setting in their personal preferences."
-label = "Logo Style"
-modern = "Modern"
-modernAlt = "Modern logo"
-
 [admin.settings.general.showUpdate]
 description = "Display notifications when a new version is available"
 label = "Show Update Notifications"

frontend/editor/public/manifest.json

@@ -3,17 +3,17 @@
   "name": "Stirling PDF",
   "icons": [
     {
-      "src": "modern-logo/favicon.ico",
+      "src": "logo/favicon.ico",
       "sizes": "64x64 32x32 24x24 16x16",
       "type": "image/x-icon"
     },
     {
-      "src": "modern-logo/logo192.png",
+      "src": "logo/logo192.png",
       "type": "image/png",
       "sizes": "192x192"
     },
     {
-      "src": "modern-logo/logo512.png",
+      "src": "logo/logo512.png",
       "type": "image/png",
       "sizes": "512x512"
     }