sebclem/ClaptrapBot
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 1 Wiki Activity

Add Guild name on navbar

Browse Source
This commit is contained in:
Sebastien 2018-05-14 11:57:05 +02:00
parent 0d6e32bded
commit 7ae7ae9bf6
8 changed files with 41 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/net/Broken/RestApi/MusicWebAPIController.java
View File

@ -32,11 +32,16 @@ import java.util.List;
@RequestMapping("/api/music/") @RequestMapping("/api/music/")
public class MusicWebAPIController { public class MusicWebAPIController {
Logger logger = LogManager.getLogger(); Logger logger = LogManager.getLogger();
@Autowired private final
UserRepository userRepository; UserRepository userRepository;
UserUtils userUtils = UserUtils.getInstance(); UserUtils userUtils = UserUtils.getInstance();
@Autowired
public MusicWebAPIController(UserRepository userRepository) {
this.userRepository = userRepository;
}
@RequestMapping("/currentMusicInfo") @RequestMapping("/currentMusicInfo")
public ResponseEntity<CurrentMusicData> getCurrentM(@RequestParam(value = "guild") String guildId){ public ResponseEntity<CurrentMusicData> getCurrentM(@RequestParam(value = "guild") String guildId){

11
src/main/java/net/Broken/webView/GeneralWebView.java
View File

@ -4,11 +4,15 @@ import net.Broken.DB.Entity.PlaylistEntity;
import net.Broken.DB.Entity.TrackEntity; import net.Broken.DB.Entity.TrackEntity;
import net.Broken.DB.Entity.UserEntity; import net.Broken.DB.Entity.UserEntity;
import net.Broken.DB.Repository.UserRepository; import net.Broken.DB.Repository.UserRepository;
import net.Broken.MainBot;
import net.Broken.RestApi.Commands.Play; import net.Broken.RestApi.Commands.Play;
import net.dv8tion.jda.core.entities.Guild;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.CookieValue;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -21,7 +25,12 @@ public class GeneralWebView {
@RequestMapping("/") @RequestMapping("/")
public String music(Model model){ public String music(Model model, @CookieValue(value = "guild", defaultValue = "1") String guildId){
Guild guild = MainBot.jda.getGuildById(guildId);
if(guild != null)
model.addAttribute("guild_name", guild.getName());
else
model.addAttribute("guild_name", "");
return CheckPage.getPageIfReady("index"); return CheckPage.getPageIfReady("index");
} }

11
src/main/java/net/Broken/webView/MusicWebView.java
View File

@ -1,7 +1,10 @@
package net.Broken.webView; package net.Broken.webView;
import net.Broken.MainBot;
import net.dv8tion.jda.core.entities.Guild;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.CookieValue;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
/** /**
@ -10,7 +13,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
@Controller @Controller
public class MusicWebView { public class MusicWebView {
@RequestMapping("/music") @RequestMapping("/music")
public String music(Model model){ public String music(Model model, @CookieValue(value = "guild", defaultValue = "1") String guildId){
Guild guild = MainBot.jda.getGuildById(guildId);
if(guild != null)
model.addAttribute("guild_name", guild.getName());
else
model.addAttribute("guild_name", "");
return CheckPage.getPageIfReady("music"); return CheckPage.getPageIfReady("music");
} }
} }

4
src/main/resources/static/js/navabar.js
View File

@ -79,7 +79,9 @@ function disconnected() {
console.log("Disconnected"); console.log("Disconnected");
nav_bar_account_link.html(disconnected_link); nav_bar_account_link.html(disconnected_link);
var modalConnection = $('#modal_connection'); var modalConnection = $('#modal_connection');
modalConnection.modal(); modalConnection.modal({
dismissible: false // Modal can be dismissed by clicking outside of the modal
});
if (typeof needLogin !== 'undefined'){ if (typeof needLogin !== 'undefined'){
modalConnection.modal('open'); modalConnection.modal('open');
} }

12
src/main/resources/templates/header.html
View File

@ -4,24 +4,30 @@
<head> <head>
<meta charset="UTF-8"/> <meta charset="UTF-8"/>
</head> </head>
<body> <body>
<!--__________________________________________________________--> <!--__________________________________________________________-->
<!-- NAV BAR --> <!-- NAV BAR -->
<!-- AND --> <!-- AND -->
<!-- LOGIN --> <!-- LOGIN -->
<!--__________________________________________________________--> <!--__________________________________________________________-->
<div th:fragment="header (page)"> <link href="css/materialize.css" type="text/css" rel="stylesheet" media="screen,projection"/>
<div th:fragment="header (page, guild_name)">
<nav class="blue-grey darken-4 z-depth-3" role="navigation" > <nav class="blue-grey darken-4 z-depth-3" role="navigation" >
<div class="nav-wrapper container"> <div class="nav-wrapper container">
<a id="logo-container" href="/" class="brand-logo">Claptrap Bot</a> <a id="logo-container" href="/" class="brand-logo">Claptrap Bot</a>
<ul class="right hide-on-med-and-down"> <ul class="right hide-on-med-and-down">
<li>
<a class="nav-change-guild truncate waves-effect waves-light btn-flat grey-text text-darken-1" th:text="${guild_name}" style="margin-top: 2px;margin-right: 0px;"></a>
</li>
<li class="" th:classappend="(${page} == 'home')? 'active' : ''"> <li class="" th:classappend="(${page} == 'home')? 'active' : ''">
<a class="waves-effect waves-light" href="/">Home</a> <a class="waves-effect waves-light" href="/">Home</a>
</li> </li>
<li class="" th:classappend="(${page} == 'music')? 'active' : ''"> <li class="disable" th:classappend="(${page} == 'music')? 'active' : ''">
<a class="waves-effect waves-light" href="/music">Music Control</a> <a class="waves-effect waves-light" href="/music">Music Control</a>
</li> </li>
<li id="nav-bar-account"> <li id="nav-bar-account">
<a class="dropdown-account dropdown-trigger" data-target="dropdown_connected"><i class="material-icons">account_box</i></a> <a class="dropdown-account dropdown-trigger" data-target="dropdown_connected"><i class="material-icons">account_box</i></a>
</li> </li>

2
src/main/resources/templates/index.html
View File

@ -16,7 +16,7 @@
<body class="blue-grey lighten-5" > <body class="blue-grey lighten-5" >
<div th:replace="header :: header ('home')">...</div> <div th:replace="header :: header ('home',${guild_name})">...</div>
<div class="section no-pad-bot main" id="index-banner"> <div class="section no-pad-bot main" id="index-banner">
<div class="center center-align"> <div class="center center-align">

2
src/main/resources/templates/music.html
View File

@ -16,7 +16,7 @@
<body class="blue-grey lighten-5" > <body class="blue-grey lighten-5" >
<div th:replace="header :: header ('music')">...</div> <div th:replace="header :: header ('music',${guild_name})">...</div>
<div class="section no-pad-bot main" id="index-banner"> <div class="section no-pad-bot main" id="index-banner">
<div class="row"> <div class="row">

2
src/main/resources/templates/register.html
View File

@ -14,7 +14,7 @@
<body class="blue-grey lighten-5" > <body class="blue-grey lighten-5" >
<div th:replace="header :: header ('')">...</div> <div th:replace="header :: header ('','')">...</div>