finished removing all from resources/public

docker/hangar/application.yml

@@ -39,10 +39,10 @@ hangar:
 
   sponsors:
     - name: Beer
-      image: /assets/images/sponsors/beer.jpg
+      image: images/sponsors/beer.jpg
       link: https://minidigger.me
     - name: MiniDigger
-      image: https://avatars2.githubusercontent.com/u/2185527?s=400&v=4
+      image: images/sponsors/minidigger.png
       link: https://minidigger.me
 
   homepage:

src/main/frontend/public/images/ore-colored.svg

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 24.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
+<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+     viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
 <style type="text/css">
 	.st0{fill:#0C0C0C;}
 	.st1{fill:#FFFFFF;}

src/main/frontend/vue.config.js

@@ -5,9 +5,12 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const sourceDir = path.resolve(__dirname, 'src');
 const entryDir = path.resolve(sourceDir, 'entrypoints');
 const jsDir = path.resolve(sourceDir, 'js');
-const outputDir = path.resolve(__dirname, '..', '..', '..', 'target', 'classes', 'public', 'build');
+const outputDir = path.resolve(__dirname, '..', '..', '..', 'target', 'classes', 'public');
 
 module.exports = {
+  devServer: {
+    port: 8081
+  },
   chainWebpack: config => {
     // clear default
     config.entry('app').clear();

src/main/java/io/papermc/hangar/controller/ApplicationController.java

@@ -3,6 +3,7 @@ package io.papermc.hangar.controller;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import io.papermc.hangar.config.hangar.HangarConfig;
 import io.papermc.hangar.controller.util.StatusZ;
 import io.papermc.hangar.db.customtypes.LoggedActionType;
 import io.papermc.hangar.db.customtypes.LoggedActionType.ProjectContext;
@@ -51,6 +52,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.server.ResponseStatusException;
 import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.View;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDate;
@@ -75,11 +77,12 @@ public class ApplicationController extends HangarController {
     private final StatsService statsService;
     private final StatusZ statusZ;
     private final ObjectMapper mapper;
+    private final HangarConfig hangarConfig;
 
     private final HttpServletRequest request;
 
     @Autowired
-    public ApplicationController(HangarDao<PlatformVersionsDao> platformVersionsDao, UserService userService, ProjectService projectService, OrgService orgService, VersionService versionService, FlagService flagService, UserActionLogService userActionLogService, JobService jobService, SitemapService sitemapService, StatsService statsService, StatusZ statusZ, ObjectMapper mapper, HttpServletRequest request) {
+    public ApplicationController(HangarDao<PlatformVersionsDao> platformVersionsDao, UserService userService, ProjectService projectService, OrgService orgService, VersionService versionService, FlagService flagService, UserActionLogService userActionLogService, JobService jobService, SitemapService sitemapService, StatsService statsService, StatusZ statusZ, ObjectMapper mapper, HangarConfig hangarConfig, HttpServletRequest request) {
         this.platformVersionsDao = platformVersionsDao;
         this.userService = userService;
         this.projectService = projectService;
@@ -91,6 +94,7 @@ public class ApplicationController extends HangarController {
         this.sitemapService = sitemapService;
         this.statusZ = statusZ;
         this.mapper = mapper;
+        this.hangarConfig = hangarConfig;
         this.request = request;
         this.statsService = statsService;
     }
@@ -353,7 +357,12 @@ public class ApplicationController extends HangarController {
     @GetMapping(value = "/robots.txt", produces = MediaType.TEXT_PLAIN_VALUE)
     @ResponseBody
     public Object robots() {
-        return new ClassPathResource("public/robots.txt");
+        if (hangarConfig.isUseWebpack()) {
+            request.setAttribute(View.RESPONSE_STATUS_ATTRIBUTE, HttpStatus.MOVED_PERMANENTLY);
+            return new ModelAndView("redirect:http://localhost:8081/robots.txt");
+        } else {
+            return new ClassPathResource("public/robots.txt");
+        }
     }
 
     @GetMapping(value = "/sitemap.xml", produces = MediaType.APPLICATION_XML_VALUE)

src/main/resources/application.yml

@@ -51,10 +51,10 @@ hangar:
 
   sponsors:
     - name: Beer
-      image: /assets/images/sponsors/beer.jpg
+      image: images/sponsors/beer.jpg
       link: https://minidigger.me
     - name: MiniDigger
-      image: https://avatars2.githubusercontent.com/u/2185527?s=400&v=4
+      image: images/sponsors/minidigger.png
       link: https://minidigger.me
 
   homepage:

src/main/resources/templates/createOrganization.ftlh

@@ -3,9 +3,9 @@
 <#import "*/layout/base.ftlh" as base />
 
 <#assign scripts>
-    <script type="text/javascript" src="<@hangar.url "build/js/orgCreate.js" />"></script>
-    <script type="text/javascript" src="<@hangar.url "build/js/userSearch.js" />"></script>
-    <script type="text/javascript" src="<@hangar.url "build/js/membersConfig.js" />"></script>
+    <script type="text/javascript" src="<@hangar.url "js/orgCreate.js" />"></script>
+    <script type="text/javascript" src="<@hangar.url "js/userSearch.js" />"></script>
+    <script type="text/javascript" src="<@hangar.url "js/membersConfig.js" />"></script>
 </#assign>
 
 <#assign message><@spring.message "org.create.title" /></#assign>

src/main/resources/templates/home.ftlh

@@ -8,11 +8,11 @@ sorted according to different criteria.
 <#import "*/layout/base.ftlh" as base>
 
 <#macro scripts>
-    <script src="<@hangar.url "build/js/home.js" />"></script>
+    <script src="<@hangar.url "js/home.js" />"></script>
 </#macro>
 
 <#macro stylesheets>
-    <link rel="stylesheet" type="text/css" href="<@hangar.url "build/css/home.css" />" />
+    <link rel="stylesheet" type="text/css" href="<@hangar.url "css/home.css" />" />
 </#macro>
 
 <#macro meta>
@@ -54,7 +54,7 @@ sorted according to different criteria.
                         <#-- @ftlvariable name="sponsor" type="io.papermc.hangar.config.hangar.HangarConfig.Sponsor" -->
                         <#assign sponsor=randomSponsor() />
                         <a href="${sponsor.link}">
-                            <img class="logo" src="${sponsor.image}" alt="${sponsor.name}" />
+                            <img class="logo" src="<@hangar.url sponsor.image />" alt="${sponsor.name}" />
                         </a>
                     </div>
                 </div>

src/main/resources/templates/layout/base.ftlh

@@ -20,13 +20,13 @@ showFooter: Boolean = true, noContainer: Boolean = false, additionalMeta: Html =
 
         <link rel="prefetch" href="<@hangar.url "images/favicon.ico" />">
         <link rel="prefetch" href="https://fonts.googleapis.com/css?family=Montserrat:400,700">
-        <link rel="prefetch" href="<@hangar.url "build/css/chunk-common.css" />">
-        <link rel="prefetch" href="<@hangar.url "build/css/chunk-vendors.css" />">
-        <link rel="prefetch" href="<@hangar.url "build/css/main.css" />">
+        <link rel="prefetch" href="<@hangar.url "css/chunk-common.css" />">
+        <link rel="prefetch" href="<@hangar.url "css/chunk-vendors.css" />">
+        <link rel="prefetch" href="<@hangar.url "css/main.css" />">
 
 
         <link rel="prefetch" href="<@hangar.url "manifest/manifest.json" />">
-        <link rel="prefetch" href="<@hangar.url "build/js/bootstrap.js" />">
+        <link rel="prefetch" href="<@hangar.url "js/bootstrap.js" />">
 
         <link rel="prefetch" href="<@hangar.url "lib/jquery/dist/jquery.min.js" />"> <#--TODO this to go away-->
 
@@ -46,9 +46,9 @@ showFooter: Boolean = true, noContainer: Boolean = false, additionalMeta: Html =
 
 
         <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Montserrat:400,700" >
-        <link rel="stylesheet" type="text/css" href="<@hangar.url "build/css/chunk-common.css" />"/>
-        <link rel="stylesheet" type="text/css" href="<@hangar.url "build/css/chunk-vendors.css" />">
-        <link rel="stylesheet" type="text/css" href="<@hangar.url "build/css/main.css" />"/>
+        <link rel="stylesheet" type="text/css" href="<@hangar.url "css/chunk-common.css" />"/>
+        <link rel="stylesheet" type="text/css" href="<@hangar.url "css/chunk-vendors.css" />">
+        <link rel="stylesheet" type="text/css" href="<@hangar.url "css/main.css" />"/>
 
         ${additionalStyling}
 
@@ -112,12 +112,12 @@ showFooter: Boolean = true, noContainer: Boolean = false, additionalMeta: Html =
         </#if>
 
         <script type="text/javascript" src="${Routes.JAVA_SCRIPT_ROUTES.getRouteUrl()}"></script>
-        <script type="text/javascript" src="<@hangar.url "build/js/chunk-vendors.js" />"></script>
-        <script type="text/javascript" src="<@hangar.url "build/js/font-awesome.js" />"></script>
-        <script type="text/javascript" src="<@hangar.url "build/js/chunk-common.js" />"></script>
+        <script type="text/javascript" src="<@hangar.url "js/chunk-vendors.js" />"></script>
+        <script type="text/javascript" src="<@hangar.url "js/font-awesome.js" />"></script>
+        <script type="text/javascript" src="<@hangar.url "js/chunk-common.js" />"></script>
         <script type="text/javascript" src="<@hangar.url "lib/moment/min/moment.min.js" />"></script> <#-- TODO this to go away -->
-        <script type="text/javascript" src="<@hangar.url "build/js/bootstrap.js" />"></script>
-        <script type="text/javascript" src="<@hangar.url "build/js/main.js" />"></script>
+        <script type="text/javascript" src="<@hangar.url "js/bootstrap.js" />"></script>
+        <script type="text/javascript" src="<@hangar.url "js/main.js" />"></script>
         ${additionalScripts}
     </#if>
 

src/main/resources/templates/projects/admin/notes.ftlh

@@ -3,7 +3,7 @@
 <#import "*/layout/base.ftlh" as base />
 
 <#assign scriptsVar>
-    <script <#--@CSPNonce.attr--> type="text/javascript" src="<@hangar.url "build/js/showNotes.js" />"></script>
+    <script <#--@CSPNonce.attr--> type="text/javascript" src="<@hangar.url "js/showNotes.js" />"></script>
     <script<#--@CSPNonce.attr-->> window.resourcePath = '${project.ownerName}/${project.slug}'</script>
 </#assign>
 

src/main/resources/templates/projects/channels/list.ftlh

@@ -13,7 +13,7 @@
       window.DEFAULT_HEX = '${config.channels.colorDefault.hex}';
       window.CHANNEL_CREATE_ROUTE = '${Routes.CHANNELS_CREATE.getRouteUrl(p.project.ownerName, p.project.slug)}';
     </script>
-    <script type="text/javascript" src="<@hangar.url "build/js/channelManage.js" />"></script>
+    <script type="text/javascript" src="<@hangar.url "js/channelManage.js" />"></script>
 </#assign>
 
 <#assign message><@spring.messageArgs code="channel.list.title" args=[p.project.ownerName, p.project.slug] /></#assign>

src/main/resources/templates/projects/create.ftlh

@@ -6,8 +6,8 @@
 Page used for uploading and creating new projects.
 -->
 <#assign scriptsVar>
-    <script type="text/javascript" src="<@hangar.url "build/js/projectCreateValidate.js" />"></script>
-    <script type="text/javascript" src="<@hangar.url "build/js/pluginUpload.js" />"></script>
+    <script type="text/javascript" src="<@hangar.url "js/projectCreateValidate.js" />"></script>
+    <script type="text/javascript" src="<@hangar.url "js/pluginUpload.js" />"></script>
 </#assign>
 
 <#assign message><@spring.message "project.create" /></#assign>

src/main/resources/templates/projects/discuss.ftlh

@@ -15,7 +15,7 @@ Discussion page within Project overview.
             topicId: ${p.project.topicId}
         };
     </script>
-    <script type="text/javascript" src="<@hangar.url "build/js/projectDiscuss.js" />"></script>
+    <script type="text/javascript" src="<@hangar.url "js/projectDiscuss.js" />"></script>
     <script <#--@CSPNonce.attr-->>$(function() { $('.btn-edit').click(); });</script>
 </#assign>
 

src/main/resources/templates/projects/pages/view.ftlh

@@ -22,9 +22,9 @@ Documentation page within Project overview.
       window.PLUGIN_ID = '${p.getProject().pluginId}';
       window.NAMESPACE = '${p.getFullSlug()}';
     </script>
-    <script type="text/javascript" src="<@hangar.url "build/js/pageCollapse.js" />"></script>
-    <script type="text/javascript" src="<@hangar.url "build/js/userSearch.js" />"></script>
-    <script type="text/javascript" src="<@hangar.url "build/js/memberList.js" />"></script>
+    <script type="text/javascript" src="<@hangar.url "js/pageCollapse.js" />"></script>
+    <script type="text/javascript" src="<@hangar.url "js/userSearch.js" />"></script>
+    <script type="text/javascript" src="<@hangar.url "js/memberList.js" />"></script>
     <#if editorOpen>
         <script <#--@CSPNonce.attr-->>$(function() { $('.btn-edit').click(); });</script>
     </#if>

src/main/resources/templates/projects/settings.ftlh

@@ -21,12 +21,12 @@
       window.keyGenText = "<@spring.message "project.settings.genKey" />";
       window.keyRevokeText = "<@spring.message "project.settings.revokeKey" />";
     </script>
-    <script type="text/javascript" src="<@hangar.url "build/js/projectManage.js" />"></script>
-    <script type="text/javascript" src="<@hangar.url "build/js/hideProject.js" />"></script>
-    <script type="text/javascript" src="<@hangar.url "build/js/iconUpload.js" />"></script>
-    <script type="text/javascript" src="<@hangar.url "build/js/keyGen.js" />"></script>
-    <script type="text/javascript" src="<@hangar.url "build/js/userSearch.js" />"></script>
-    <script type="text/javascript" src="<@hangar.url "build/js/memberList.js" />"></script>
+    <script type="text/javascript" src="<@hangar.url "js/projectManage.js" />"></script>
+    <script type="text/javascript" src="<@hangar.url "js/hideProject.js" />"></script>
+    <script type="text/javascript" src="<@hangar.url "js/iconUpload.js" />"></script>
+    <script type="text/javascript" src="<@hangar.url "js/keyGen.js" />"></script>
+    <script type="text/javascript" src="<@hangar.url "js/userSearch.js" />"></script>
+    <script type="text/javascript" src="<@hangar.url "js/memberList.js" />"></script>
 </#assign>
 
 <#assign Permission=@helper["io.papermc.hangar.model.Permission"]>

src/main/resources/templates/projects/versions/create.ftlh

@@ -11,16 +11,16 @@
 <#assign mainWidth = "col-md-10">
 
 <#assign scriptsVar>
-    <script type="text/javascript" src="<@hangar.url "build/js/channelManage.js" />"></script>
-    <script type="text/javascript" src="<@hangar.url "build/js/pluginUpload.js" />"></script>
-    <script type="text/javascript" src="<@hangar.url "build/js/projectDetail.js" />"></script>
+    <script type="text/javascript" src="<@hangar.url "js/channelManage.js" />"></script>
+    <script type="text/javascript" src="<@hangar.url "js/pluginUpload.js" />"></script>
+    <script type="text/javascript" src="<@hangar.url "js/projectDetail.js" />"></script>
     <#if pending?? && !pending.dependencies??>
-        <script type="text/javascript" src="<@hangar.url "build/js/platform-choice.js" />"></script>
+        <script type="text/javascript" src="<@hangar.url "js/platform-choice.js" />"></script>
     </#if>
     <script>
              window.DEFAULT_COLOR = '${config.channels.colorDefault.hex}';
     </script>
-    <script type="text/javascript" src="<@hangar.url "build/js/versionCreateChannelNew.js" />"></script>
+    <script type="text/javascript" src="<@hangar.url "js/versionCreateChannelNew.js" />"></script>
 </#assign>
 
 <#assign message><@spring.message "version.create.pageTitle" /></#assign>

src/main/resources/templates/projects/versions/list.ftlh

@@ -7,18 +7,18 @@ Versions page within Project overview.
 -->
 
 <#assign scriptsVar>
-    <script type="text/javascript" src="<@hangar.url "build/js/userSearch.js" />"></script>
-    <script type="text/javascript" src="<@hangar.url "build/js/memberList.js" />"></script>
+    <script type="text/javascript" src="<@hangar.url "js/userSearch.js" />"></script>
+    <script type="text/javascript" src="<@hangar.url "js/memberList.js" />"></script>
     <script>
             window.PLUGIN_ID = '${p.project.pluginId}';
             window.PROJECT_OWNER = '${p.project.ownerName}';
             window.PROJECT_SLUG = '${p.project.slug}';
     </script>
-    <script type="text/javascript" src="<@hangar.url "build/js/version-list.js" />"></script>
+    <script type="text/javascript" src="<@hangar.url "js/version-list.js" />"></script>
 </#assign>
 
 <#assign stylesheetsVar>
-    <link rel="stylesheet" type="text/css" href="<@hangar.url "build/css/version-list.css" />" />
+    <link rel="stylesheet" type="text/css" href="<@hangar.url "css/version-list.css" />" />
 </#assign>
 
 <@projects.view p=p sp=sp active="#versions" additionalScripts=scriptsVar additionalStyling=stylesheetsVar>

src/main/resources/templates/projects/view.ftlh

@@ -20,8 +20,8 @@ Base template for Project overview.
           window.ALREADY_STARRED = ${sp.starred?c};
           $(function() { $(".nav").find("${active}").addClass("active"); });
         </script>
-        <script type="text/javascript" src="<@hangar.url "build/js/projectDetail.js" />"></script>
-        <script type="text/javascript" src="<@hangar.url "build/js/pageEdit.js" />"></script>
+        <script type="text/javascript" src="<@hangar.url "js/projectDetail.js" />"></script>
+        <script type="text/javascript" src="<@hangar.url "js/pageEdit.js" />"></script>
         ${additionalScripts}
     </#assign>
 

src/main/resources/templates/swagger.ftlh

@@ -10,8 +10,8 @@ Mostly copied from swagger-ui's index file
     <script type="text/javascript" src="<@hangar.url "lib/jquery/dist/jquery.min.js" />"></script>
     <script src="<@hangar.url "lib/swagger-ui/swagger-ui-bundle.js" />"></script>
     <script src="<@hangar.url "lib/swagger-ui/swagger-ui-standalone-preset.js" />"></script>
-    <script src="<@hangar.url "build/js/apiRequests.js" />"></script>
-    <script @CSPNonce.attr>
+    <script src="<@hangar.url "js/apiRequests.js" />"></script>
+    <script <#--@CSPNonce.attr-->>
         window.onload = () => {
             window.ui = SwaggerUIBundle({
                 url: "/v2/api-docs",
@@ -43,7 +43,7 @@ Mostly copied from swagger-ui's index file
         }
     </script>
     <#if request??>
-        <script @CSPNonce.attr>
+        <script <#--@CSPNonce.attr-->>
             csrf = '@play.filters.csrf.CSRF.getToken.get.value';
             isLoggedIn = ${request.hasUser};
         </script>

src/main/resources/templates/users/admin/flags.ftlh

@@ -4,8 +4,8 @@
 <#import "*/projects/helper/btnHide.ftlh" as hide />
 
 <#assign scriptsVar>
-    <script type="text/javascript" src="<@hangar.url "build/js/adminFlags.js" />"></script>
-    <script type="text/javascript" src="<@hangar.url "build/js/hideProject.js" />"></script>
+    <script type="text/javascript" src="<@hangar.url "js/adminFlags.js" />"></script>
+    <script type="text/javascript" src="<@hangar.url "js/hideProject.js" />"></script>
 </#assign>
 
 <@base.base title="Flags" additionalScripts=scriptsVar>

src/main/resources/templates/users/admin/log.ftlh

@@ -3,7 +3,7 @@
 <#import "*/layout/base.ftlh" as base />
 
 <#assign scriptsVar>
-    <script type="text/javascript" src="<@hangar.url "build/js/actionLog.js" />"></script>
+    <script type="text/javascript" src="<@hangar.url "js/actionLog.js" />"></script>
 </#assign>
 
 <#assign message><@spring.message "admin.log.title" /></#assign>

src/main/resources/templates/users/admin/platformVersions.ftlh

@@ -5,11 +5,11 @@
 <#import "*/layout/base.ftlh" as base />
 
 <#assign scriptsVar>
-    <link rel="stylesheet" href="<@hangar.url "build/css/platform-version-table.css" />">
+    <link rel="stylesheet" href="<@hangar.url "css/platform-version-table.css" />">
     <script>
         window.PLATFORMS = ${platformVersions}
     </script>
-    <script type="text/javascript" src="<@hangar.url "build/js/platform-version-table.js" />"></script>
+    <script type="text/javascript" src="<@hangar.url "js/platform-version-table.js" />"></script>
 </#assign>
 
 <#assign message><@spring.message "admin.platformVersions.title" /></#assign>

src/main/resources/templates/users/admin/queue.ftlh

@@ -3,7 +3,7 @@
 <#import "*/layout/base.ftlh" as base />
 
 <#assign scriptsVar>
-    <script <#--@CSPNonce.attr--> type="text/javascript" src="<@hangar.url "build/js/queue.js" />"></script>
+    <script <#--@CSPNonce.attr--> type="text/javascript" src="<@hangar.url "js/queue.js" />"></script>
     <script <#--@CSPNonce.attr-->>
         $(function(){
             var momentNow = moment();

src/main/resources/templates/users/admin/reviews.ftlh

@@ -3,7 +3,7 @@
 <#import "*/layout/base.ftlh" as base />
 
 <#assign scripts>
-    <script <#--@CSPNonce.attr--> type="text/javascript" src="<@hangar.url "build/js/review.js" />"></script>
+    <script <#--@CSPNonce.attr--> type="text/javascript" src="<@hangar.url "js/review.js" />"></script>
     <script <#--@CSPNonce.attr-->>window.versionPath = '${utils.urlEncode(project.project.ownerName)}/${utils.urlEncode(project.project.slug)}/versions/${utils.urlEncode(version.v.versionString)}'</script>
 </#assign>
 

src/main/resources/templates/users/admin/stats.ftlh

@@ -89,7 +89,7 @@
             });
         });
     </script>
-    <script <#--@CSPNonce.attr--> type="text/javascript" src="<@hangar.url "build/js/stats.js" />"></script>
+    <script <#--@CSPNonce.attr--> type="text/javascript" src="<@hangar.url "js/stats.js" />"></script>
 </#assign>
 
 <@base.base title="Stats" additionalScripts=scriptsVar>

src/main/resources/templates/users/admin/userAdmin.ftlh

@@ -24,7 +24,7 @@
 <#assign projectRoles=Role.values()?filter(role -> role.category == RoleCategory.PROJECT) />
 
 <#assign scriptsVar>
-    <script type="text/javascript" src="<@hangar.url "build/js/userAdmin.js" />"></script>
+    <script type="text/javascript" src="<@hangar.url "js/userAdmin.js" />"></script>
 </#assign>
 
 <@base.base title=(prefix + u.user.name) additionalScripts=scriptsVar>

src/main/resources/templates/users/admin/visibility.ftlh

@@ -39,7 +39,7 @@
 </#macro>
 
 <#assign scriptsVar>
-    <script type="text/javascript" src="<@hangar.url "build/js/hideProject.js" />"></script>
+    <script type="text/javascript" src="<@hangar.url "js/hideProject.js" />"></script>
 </#assign>
 
 <@base.base title="Project Visibility" additionalScripts=scriptsVar>

src/main/resources/templates/users/apiKeys.ftlh

@@ -11,7 +11,7 @@
       window.NAMED_USED = '<@spring.message "user.apiKeys.error.nameAlreadyUsed" />';
       window.DELETE_KEY = '<@spring.message "user.apiKeys.keyDeleteButton" />';
     </script>
-    <script type="text/javascript" src="<@hangar.url "build/js/apiKeysManagement.js" />"></script>
+    <script type="text/javascript" src="<@hangar.url "js/apiKeysManagement.js" />"></script>
 </#assign>
 
 <#assign NamedPermission=@helper["io.papermc.hangar.model.NamedPermission"] />

src/main/resources/templates/users/authors.ftlh

@@ -38,7 +38,7 @@
 
 <#assign scriptsVar>
     <script <#--@CSPNonce.attr-->>window.CURRENT_PAGE = ${page};</script>
-	<script type="text/javascript" src="<@hangar.url "build/js/userList.js" />"></script>
+	<script type="text/javascript" src="<@hangar.url "js/userList.js" />"></script>
 </#assign>
 
 <#-- @ftlvariable name="page" type="java.lang.Integer" -->

src/main/resources/templates/users/notifications.ftlh

@@ -25,7 +25,7 @@
 </#macro>
 
 <#assign scriptsVar>
-    <script type="text/javascript" src="<@hangar.url "build/js/notifications.js" />"></script>
+    <script type="text/javascript" src="<@hangar.url "js/notifications.js" />"></script>
 </#assign>
 
 <#assign NotificationFilter=@helper["io.papermc.hangar.model.NotificationFilter"] />

src/main/resources/templates/users/projects.ftlh

@@ -20,12 +20,12 @@
 </#function>
 
 <#assign scriptsVar>
-    <script type="text/javascript" src="<@hangar.url "build/js/user-profile.js" />"></script>
+    <script type="text/javascript" src="<@hangar.url "js/user-profile.js" />"></script>
     <#if u.isOrga() && o?? && canEditOrgMembers()>
-    <script type="text/javascript" src="<@hangar.url "build/js/orgInvites.js" />"></script>
+    <script type="text/javascript" src="<@hangar.url "js/orgInvites.js" />"></script>
     </#if>
-    <script type="text/javascript" src="<@hangar.url "build/js/userSearch.js" />"></script>
-    <script type="text/javascript" src="<@hangar.url "build/js/memberList.js" />"></script>
+    <script type="text/javascript" src="<@hangar.url "js/userSearch.js" />"></script>
+    <script type="text/javascript" src="<@hangar.url "js/memberList.js" />"></script>
 </#assign>
 
 <@users.view u=u o=o additionalScripts=scriptsVar>

src/main/resources/templates/users/staff.ftlh

@@ -20,7 +20,7 @@
 
 <#assign scriptsVar>
 	<script <#--@CSPNonce.attr-->>window.CURRENT_PAGE = ${page};</script>
-	<script type="text/javascript" src="<@hangar.url "build/js/userList.js" />"></script>
+	<script type="text/javascript" src="<@hangar.url "js/userList.js" />"></script>
 </#assign>
 
 <@base.base title="Staff - Hangar" additionalScripts=scriptsVar>

src/main/resources/templates/users/view.ftlh

@@ -31,7 +31,7 @@
                 window.NO_ACTION_MESSAGE.starred = '<@spring.messageArgs code="user.noStars" args=[u.user.name] />';
                 window.NO_ACTION_MESSAGE.watching = '<@spring.messageArgs code="user.noWatching" args=[u.user.name] />';
         </script>
-        <script type="text/javascript" src="<@hangar.url "build/js/userPage.js" />"></script>
+        <script type="text/javascript" src="<@hangar.url "js/userPage.js" />"></script>
         ${additionalScripts}
     </#assign>
 

src/main/resources/templates/utils/hangar.ftlh

@@ -5,16 +5,12 @@
 
 <#macro url path>
     <#compress>
-        <#if path?starts_with("build") && config.useWebpack>
-            http://localhost:8081/${path[6..]}
-        <#elseif path?starts_with("bootstrap") || path?starts_with("build") || path?starts_with("diff-match-patch") || path?starts_with("highlight") || path?starts_with("images") || path?starts_with("javascripts") || path?starts_with("manifest") || path?starts_with('jquery-ui')>
-            /assets/${path}
-        <#else>
+        <#if path?starts_with("lib")>
             /${path}
+        <#elseif config.useWebpack>
+            http://localhost:8081/${path}
+        <#else>
+            /assets/${path}
         </#if>
-<#--            <#if path?starts_with("bootstrap") || path?starts_with("build") || path?starts_with("diff-match-patch") || path?starts_with("highlight") || path?starts_with("images") || path?starts_with("javascripts") || path?starts_with("manifest") || path?starts_with('jquery-ui')>
-            /assets
-            </#if>
-            /${path}-->
     </#compress>
 </#macro>