diff --git a/src/main/java/com/cloudcraftgaming/discal/Main.java b/src/main/java/com/cloudcraftgaming/discal/Main.java index fa52b493..bd050eb0 100644 --- a/src/main/java/com/cloudcraftgaming/discal/Main.java +++ b/src/main/java/com/cloudcraftgaming/discal/Main.java @@ -63,6 +63,7 @@ public class Main { DiscordAccountHandler.getHandler().init(); SparkUtils.initSpark(); } catch (Exception e) { + e.printStackTrace(); Logger.getLogger().exception(null, "'Spark ERROR' by 'PANIC! AT THE WEBSITE'", e, Main.class, true); } diff --git a/src/main/java/com/cloudcraftgaming/discal/bot/module/misc/StatusChanger.java b/src/main/java/com/cloudcraftgaming/discal/bot/module/misc/StatusChanger.java index 39a92edb..b08685b0 100644 --- a/src/main/java/com/cloudcraftgaming/discal/bot/module/misc/StatusChanger.java +++ b/src/main/java/com/cloudcraftgaming/discal/bot/module/misc/StatusChanger.java @@ -28,6 +28,7 @@ public class StatusChanger extends TimerTask { statuses.add("!help for help"); statuses.add("!DisCal for info"); statuses.add("Made by NovaFox161"); + statuses.add("Powered by DreamExposure"); statuses.add("Best calendar bot!"); statuses.add("Used on %guCount% guilds!"); statuses.add("%calCount% calendars!"); diff --git a/src/main/resources/web/public/pages/about.html b/src/main/resources/web/public/pages/about.html index 1206ac0e..7992e43d 100644 --- a/src/main/resources/web/public/pages/about.html +++ b/src/main/resources/web/public/pages/about.html @@ -196,9 +196,18 @@ \ No newline at end of file diff --git a/src/main/resources/web/public/pages/commands.html b/src/main/resources/web/public/pages/commands.html index 879eb531..750a85a9 100644 --- a/src/main/resources/web/public/pages/commands.html +++ b/src/main/resources/web/public/pages/commands.html @@ -588,9 +588,18 @@ \ No newline at end of file diff --git a/src/main/resources/web/public/pages/dashboard/components/announcements.html b/src/main/resources/web/public/pages/dashboard/components/announcements.html index a7181d1d..a235ab12 100644 --- a/src/main/resources/web/public/pages/dashboard/components/announcements.html +++ b/src/main/resources/web/public/pages/dashboard/components/announcements.html @@ -289,9 +289,18 @@ \ No newline at end of file diff --git a/src/main/resources/web/public/pages/dashboard/components/calendar.html b/src/main/resources/web/public/pages/dashboard/components/calendar.html index 966892b7..e06bf192 100644 --- a/src/main/resources/web/public/pages/dashboard/components/calendar.html +++ b/src/main/resources/web/public/pages/dashboard/components/calendar.html @@ -197,9 +197,18 @@ \ No newline at end of file diff --git a/src/main/resources/web/public/pages/dashboard/components/events.html b/src/main/resources/web/public/pages/dashboard/components/events.html index c4daf98b..36544d1f 100644 --- a/src/main/resources/web/public/pages/dashboard/components/events.html +++ b/src/main/resources/web/public/pages/dashboard/components/events.html @@ -293,9 +293,18 @@ \ No newline at end of file diff --git a/src/main/resources/web/public/pages/dashboard/components/rsvp.html b/src/main/resources/web/public/pages/dashboard/components/rsvp.html index ff45f800..e02bad89 100644 --- a/src/main/resources/web/public/pages/dashboard/components/rsvp.html +++ b/src/main/resources/web/public/pages/dashboard/components/rsvp.html @@ -97,9 +97,18 @@ \ No newline at end of file diff --git a/src/main/resources/web/public/pages/dashboard/dashboard.html b/src/main/resources/web/public/pages/dashboard/dashboard.html index 848d6edd..daab1a1c 100644 --- a/src/main/resources/web/public/pages/dashboard/dashboard.html +++ b/src/main/resources/web/public/pages/dashboard/dashboard.html @@ -79,9 +79,18 @@ \ No newline at end of file diff --git a/src/main/resources/web/public/pages/dashboard/guild.html b/src/main/resources/web/public/pages/dashboard/guild.html index 86010ef9..f9d25764 100644 --- a/src/main/resources/web/public/pages/dashboard/guild.html +++ b/src/main/resources/web/public/pages/dashboard/guild.html @@ -189,9 +189,18 @@ \ No newline at end of file diff --git a/src/main/resources/web/public/pages/docs/api/errors.html b/src/main/resources/web/public/pages/docs/api/errors.html index a2a1b9b0..9f93a028 100644 --- a/src/main/resources/web/public/pages/docs/api/errors.html +++ b/src/main/resources/web/public/pages/docs/api/errors.html @@ -158,9 +158,18 @@ \ No newline at end of file diff --git a/src/main/resources/web/public/pages/docs/api/overview.html b/src/main/resources/web/public/pages/docs/api/overview.html index f4d65642..5da92420 100644 --- a/src/main/resources/web/public/pages/docs/api/overview.html +++ b/src/main/resources/web/public/pages/docs/api/overview.html @@ -88,9 +88,18 @@ \ No newline at end of file diff --git a/src/main/resources/web/public/pages/docs/api/v1/announcement.html b/src/main/resources/web/public/pages/docs/api/v1/announcement.html index bc5788f8..7dc0c54e 100644 --- a/src/main/resources/web/public/pages/docs/api/v1/announcement.html +++ b/src/main/resources/web/public/pages/docs/api/v1/announcement.html @@ -681,9 +681,18 @@ \ No newline at end of file diff --git a/src/main/resources/web/public/pages/docs/api/v1/calendar.html b/src/main/resources/web/public/pages/docs/api/v1/calendar.html index 1f45a107..72703efd 100644 --- a/src/main/resources/web/public/pages/docs/api/v1/calendar.html +++ b/src/main/resources/web/public/pages/docs/api/v1/calendar.html @@ -253,9 +253,18 @@ \ No newline at end of file diff --git a/src/main/resources/web/public/pages/docs/api/v1/events.html b/src/main/resources/web/public/pages/docs/api/v1/events.html index d538c0f7..521d3084 100644 --- a/src/main/resources/web/public/pages/docs/api/v1/events.html +++ b/src/main/resources/web/public/pages/docs/api/v1/events.html @@ -719,9 +719,18 @@ \ No newline at end of file diff --git a/src/main/resources/web/public/pages/docs/api/v1/guild.html b/src/main/resources/web/public/pages/docs/api/v1/guild.html index f482b00c..15e9622e 100644 --- a/src/main/resources/web/public/pages/docs/api/v1/guild.html +++ b/src/main/resources/web/public/pages/docs/api/v1/guild.html @@ -290,9 +290,18 @@ \ No newline at end of file diff --git a/src/main/resources/web/public/pages/docs/api/v1/rsvp.html b/src/main/resources/web/public/pages/docs/api/v1/rsvp.html index e0e982fc..cf1948da 100644 --- a/src/main/resources/web/public/pages/docs/api/v1/rsvp.html +++ b/src/main/resources/web/public/pages/docs/api/v1/rsvp.html @@ -265,9 +265,18 @@ \ No newline at end of file diff --git a/src/main/resources/web/public/pages/docs/events/event-colors.html b/src/main/resources/web/public/pages/docs/events/event-colors.html index 8b123347..c84908f8 100644 --- a/src/main/resources/web/public/pages/docs/events/event-colors.html +++ b/src/main/resources/web/public/pages/docs/events/event-colors.html @@ -44,9 +44,18 @@ \ No newline at end of file diff --git a/src/main/resources/web/public/pages/embed/calendar.html b/src/main/resources/web/public/pages/embed/calendar.html index ae6f4c64..796a8829 100644 --- a/src/main/resources/web/public/pages/embed/calendar.html +++ b/src/main/resources/web/public/pages/embed/calendar.html @@ -160,9 +160,18 @@ \ No newline at end of file diff --git a/src/main/resources/web/public/pages/index.html b/src/main/resources/web/public/pages/index.html index 21f12abf..41c646af 100644 --- a/src/main/resources/web/public/pages/index.html +++ b/src/main/resources/web/public/pages/index.html @@ -78,9 +78,18 @@ \ No newline at end of file diff --git a/src/main/resources/web/public/pages/lazy-discal.html b/src/main/resources/web/public/pages/lazy-discal.html index c7816952..9071bcf3 100644 --- a/src/main/resources/web/public/pages/lazy-discal.html +++ b/src/main/resources/web/public/pages/lazy-discal.html @@ -72,9 +72,18 @@ \ No newline at end of file diff --git a/src/main/resources/web/public/pages/policy/privacy.html b/src/main/resources/web/public/pages/policy/privacy.html index 222fb8ef..dd8767fa 100644 --- a/src/main/resources/web/public/pages/policy/privacy.html +++ b/src/main/resources/web/public/pages/policy/privacy.html @@ -506,9 +506,18 @@ \ No newline at end of file diff --git a/src/main/resources/web/public/pages/setup.html b/src/main/resources/web/public/pages/setup.html index 633bf135..24eaf76e 100644 --- a/src/main/resources/web/public/pages/setup.html +++ b/src/main/resources/web/public/pages/setup.html @@ -123,9 +123,18 @@ \ No newline at end of file diff --git a/src/main/resources/web/public/styles/global.css b/src/main/resources/web/public/styles/global.css index b0e556b5..4ed7eea7 100644 --- a/src/main/resources/web/public/styles/global.css +++ b/src/main/resources/web/public/styles/global.css @@ -3,6 +3,12 @@ html { position: relative; min-height: 100%; overflow: auto; + + box-sizing: border-box; +} + +*, *:before, *:after { + box-sizing: inherit; } body { @@ -17,7 +23,10 @@ body { footer { position: absolute; bottom: 0; - height: 25px; + background: #1b1f20; + color: white; + + width: 100%; } h1, h2, h3, h4, h5, h6 { @@ -154,12 +163,13 @@ label { #content { margin-left: 10%; margin-right: 10%; - margin-bottom: auto; + margin-bottom: 5%; background-color: #3c3d41; padding: 10px; text-align: center; + display: flow-root; }