Skip to content

Commit 7f32bd9

Browse files
SquTMRealMangorage
andauthored
Add frontend CSS and JS assets with a new modern sleek design (#1)
* New Design * Got more java stuff working * More work done! * Updated to latest mangobotcore/mangobotplugin * Fixed last few issues. --------- Co-authored-by: Archie Cunningham <Archie@m1c.co.uk> Co-authored-by: RealMangoRage <64402114+RealMangorage@users.noreply.github.com>
1 parent 0ae0405 commit 7f32bd9

52 files changed

Lines changed: 2324 additions & 1981 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,4 @@ bin/
4141
### Mac OS ###
4242
.DS_Store
4343
/src/main/resources/installer-data/dependencies.json
44+
/.idea/

.idea/.gitignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

.idea/gradle.xml

Lines changed: 0 additions & 17 deletions
This file was deleted.

.idea/hotswap_agent.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

.idea/inspectionProfiles/Project_Default.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

.idea/misc.xml

Lines changed: 0 additions & 7 deletions
This file was deleted.

.idea/vcs.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

build.gradle

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import org.mangorage.mangobotgradle.util.GitVersion
2-
31

42
buildscript {
53
repositories {
@@ -18,7 +16,7 @@ buildscript {
1816
}
1917

2018
dependencies {
21-
classpath 'org.mangorage:MangoBotGradle:6.0.22'
19+
classpath 'org.mangorage:MangoBotGradle:6.0.24'
2220
}
2321
}
2422

@@ -31,7 +29,7 @@ apply plugin: 'maven-publish'
3129
apply plugin: 'MangoBotGradle'
3230

3331
group = 'org.mangorage'
34-
version = GitVersion.getGitVersion().getVersionAsString()
32+
version = "0.0.0"
3533

3634
println("Version: " + version)
3735

@@ -93,8 +91,8 @@ dependencies {
9391

9492
launchtarget("org.mangorage:mangobotlaunchtarget:0.1.8")
9593

96-
plugin('org.mangorage:mangobot:12.0.96')
97-
plugin('org.mangorage:mangobotplugin:12.0.57')
94+
plugin('org.mangorage:mangobot:12.0.109')
95+
plugin('org.mangorage:mangobotplugin:12.0.63')
9896

9997
library('org.eclipse.jetty:jetty-server:11.0.16')
10098
library('org.eclipse.jetty:jetty-servlet:11.0.16')

src/main/java/module-info.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@
1212
requires org.mangorage.bootstrap;
1313

1414
// Files
15-
opens templates.file;
16-
opens templates.general;
1715
opens templates;
1816

17+
// TODO: Deal with it
18+
exports org.mangorage.mangobotsite.website.servlet.data;
19+
1920
exports org.mangorage.mangobotsite;
2021
exports org.mangorage.mangobotsite.website.file;
2122
exports org.mangorage.mangobotsite.website.servlet.entity;

src/main/java/org/mangorage/mangobotsite/website/WebServer.java

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,7 @@
1919
import org.mangorage.mangobotsite.website.filters.RequestInterceptorFilter;
2020
import org.mangorage.mangobotsite.website.handlers.DefaultErrorHandler;
2121
import org.mangorage.mangobotsite.website.impl.ObjectMap;
22-
import org.mangorage.mangobotsite.website.servlet.AccountServlet;
23-
24-
import org.mangorage.mangobotsite.website.servlet.EntitiesServlet;
25-
import org.mangorage.mangobotsite.website.servlet.EntityServlet;
26-
import org.mangorage.mangobotsite.website.servlet.FileServlet;
27-
import org.mangorage.mangobotsite.website.servlet.FileUploadServlet;
2822
import org.mangorage.mangobotsite.website.servlet.HomeServlet;
29-
import org.mangorage.mangobotsite.website.servlet.InfoServlet;
30-
import org.mangorage.mangobotsite.website.servlet.LoginServlet;
31-
import org.mangorage.mangobotsite.website.servlet.StreamingServlet;
32-
import org.mangorage.mangobotsite.website.servlet.TestAuthServlet;
3323
import org.mangorage.mangobotsite.website.servlet.TricksServlet;
3424
import org.mangorage.mangobotsite.website.util.ResolveString;
3525
import org.mangorage.mangobotsite.website.util.ServletContextHandlerBuilder;
@@ -111,22 +101,10 @@ public static void startWebServer(ObjectMap objectMap) throws Exception {
111101
h.setErrorHandler(new DefaultErrorHandler());
112102
})
113103

114-
.addServlet(StreamingServlet.class, "/watch")
115104

116105
.addHttpServlet(HomeServlet.class, "/home")
117-
.addHttpServlet(InfoServlet.class, "/info")
118-
.addHttpServlet(TricksServlet.class, "/trick")
119-
.addHttpServlet(FileServlet.class, "/file")
120-
.addHttpServlet(TestAuthServlet.class, "/testAuth")
121-
.addHttpServlet(LoginServlet.class, "/login")
122-
.addHttpServlet(AccountServlet.class, "/account")
123-
.addHttpServlet(FileUploadServlet.class, "/upload", h -> {
124-
h.getRegistration().setMultipartConfig(
125-
new MultipartConfigElement("/tmp/uploads")
126-
);
127-
})
128-
.addHttpServlet(EntityServlet.class, "/api/entity/*")
129-
.addHttpServlet(EntitiesServlet.class, "/api/entities/*")
106+
.addServlet(TricksServlet.class, "/tricks")
107+
130108
.setAttribute(WebConstants.WEB_OBJECT_ID, objectMap)
131109
.addFilter(RequestInterceptorFilter.class, "/*", EnumSet.of(DispatcherType.REQUEST))
132110
.configureLoginBuilder(security -> {

0 commit comments

Comments
 (0)