diff --git a/dashboard/app.js b/dashboard/app.js index bcd44792..39e4dd11 100644 --- a/dashboard/app.js +++ b/dashboard/app.js @@ -13,7 +13,7 @@ module.exports.load = async(client) => { const mainRouter = require("./routes/index"), discordAPIRouter = require("./routes/discord"), logoutRouter = require("./routes/logout"), - settingsRouter = require("./routes/settings"), + profileRouter = require("./routes/profile"), guildStatsRouter = require("./routes/guild-stats"), guildManagerRouter = require("./routes/guild-manager"), docsManagerRouter = require("./routes/docs"); @@ -51,7 +51,7 @@ module.exports.load = async(client) => { .use("/logout", logoutRouter) .use("/manage", guildManagerRouter) .use("/stats", guildStatsRouter) - .use("/settings", settingsRouter) + .use("/profile", profileRouter) .use("/", mainRouter) .use("/docs", docsManagerRouter) .use(CheckAuth, function(req, res) { diff --git a/dashboard/public/dist/css/prettyPhoto.css b/dashboard/public/dist/css/prettyPhoto.css deleted file mode 100644 index 8a2a2fd1..00000000 --- a/dashboard/public/dist/css/prettyPhoto.css +++ /dev/null @@ -1,170 +0,0 @@ -div.pp_default .pp_top,div.pp_default .pp_top .pp_middle,div.pp_default .pp_top .pp_left,div.pp_default .pp_top .pp_right,div.pp_default .pp_bottom,div.pp_default .pp_bottom .pp_left,div.pp_default .pp_bottom .pp_middle,div.pp_default .pp_bottom .pp_right{height:13px} -div.pp_default .pp_top .pp_left{background:url(../images/prettyPhoto/default/sprite.png) -78px -93px no-repeat} -div.pp_default .pp_top .pp_middle{background:url(../images/prettyPhoto/default/sprite_x.png) top left repeat-x} -div.pp_default .pp_top .pp_right{background:url(../images/prettyPhoto/default/sprite.png) -112px -93px no-repeat} -div.pp_default .pp_content .ppt{color:#f8f8f8} -div.pp_default .pp_content_container .pp_left{background:url(../images/prettyPhoto/default/sprite_y.png) -7px 0 repeat-y;padding-left:13px} -div.pp_default .pp_content_container .pp_right{background:url(../images/prettyPhoto/default/sprite_y.png) top right repeat-y;padding-right:13px} -div.pp_default .pp_next:hover{background:url(../images/prettyPhoto/default/sprite_next.png) center right no-repeat;cursor:pointer} -div.pp_default .pp_previous:hover{background:url(../images/prettyPhoto/default/sprite_prev.png) center left no-repeat;cursor:pointer} -div.pp_default .pp_expand{background:url(../images/prettyPhoto/default/sprite.png) 0 -29px no-repeat;cursor:pointer;width:28px;height:28px} -div.pp_default .pp_expand:hover{background:url(../images/prettyPhoto/default/sprite.png) 0 -56px no-repeat;cursor:pointer} -div.pp_default .pp_contract{background:url(../images/prettyPhoto/default/sprite.png) 0 -84px no-repeat;cursor:pointer;width:28px;height:28px} -div.pp_default .pp_contract:hover{background:url(../images/prettyPhoto/default/sprite.png) 0 -113px no-repeat;cursor:pointer} -div.pp_default .pp_close{width:30px;height:30px;background:url(../images/prettyPhoto/default/sprite.png) 2px 1px no-repeat;cursor:pointer} -div.pp_default .pp_gallery ul li a{background:url(../images/prettyPhoto/default/default_thumb.png) center center #f8f8f8;border:1px solid #aaa} -div.pp_default .pp_social{margin-top:7px} -div.pp_default .pp_gallery a.pp_arrow_previous,div.pp_default .pp_gallery a.pp_arrow_next{position:static;left:auto} -div.pp_default .pp_nav .pp_play,div.pp_default .pp_nav .pp_pause{background:url(../images/prettyPhoto/default/sprite.png) -51px 1px no-repeat;height:30px;width:30px} -div.pp_default .pp_nav .pp_pause{background-position:-51px -29px} -div.pp_default a.pp_arrow_previous,div.pp_default a.pp_arrow_next{background:url(../images/prettyPhoto/default/sprite.png) -31px -3px no-repeat;height:20px;width:20px;margin:4px 0 0} -div.pp_default a.pp_arrow_next{left:52px;background-position:-82px -3px} -div.pp_default .pp_content_container .pp_details{margin-top:5px} -div.pp_default .pp_nav{clear:none;height:30px;width:110px;position:relative} -div.pp_default .pp_nav .currentTextHolder{font-family:Georgia;font-style:italic;color:#999;font-size:11px;left:75px;line-height:25px;position:absolute;top:2px;margin:0;padding:0 0 0 10px} -div.pp_default .pp_close:hover,div.pp_default .pp_nav .pp_play:hover,div.pp_default .pp_nav .pp_pause:hover,div.pp_default .pp_arrow_next:hover,div.pp_default .pp_arrow_previous:hover{opacity:0.7} -div.pp_default .pp_description{font-size:11px;font-weight:700;line-height:14px;margin:5px 50px 5px 0} -div.pp_default .pp_bottom .pp_left{background:url(../images/prettyPhoto/default/sprite.png) -78px -127px no-repeat} -div.pp_default .pp_bottom .pp_middle{background:url(../images/prettyPhoto/default/sprite_x.png) bottom left repeat-x} -div.pp_default .pp_bottom .pp_right{background:url(../images/prettyPhoto/default/sprite.png) -112px -127px no-repeat} -div.pp_default .pp_loaderIcon{background:url(../images/prettyPhoto/default/loader.gif) center center no-repeat} -div.light_rounded .pp_top .pp_left{background:url(../images/prettyPhoto/light_rounded/sprite.png) -88px -53px no-repeat} -div.light_rounded .pp_top .pp_right{background:url(../images/prettyPhoto/light_rounded/sprite.png) -110px -53px no-repeat} -div.light_rounded .pp_next:hover{background:url(../images/prettyPhoto/light_rounded/btnNext.png) center right no-repeat;cursor:pointer} -div.light_rounded .pp_previous:hover{background:url(../images/prettyPhoto/light_rounded/btnPrevious.png) center left no-repeat;cursor:pointer} -div.light_rounded .pp_expand{background:url(../images/prettyPhoto/light_rounded/sprite.png) -31px -26px no-repeat;cursor:pointer} -div.light_rounded .pp_expand:hover{background:url(../images/prettyPhoto/light_rounded/sprite.png) -31px -47px no-repeat;cursor:pointer} -div.light_rounded .pp_contract{background:url(../images/prettyPhoto/light_rounded/sprite.png) 0 -26px no-repeat;cursor:pointer} -div.light_rounded .pp_contract:hover{background:url(../images/prettyPhoto/light_rounded/sprite.png) 0 -47px no-repeat;cursor:pointer} -div.light_rounded .pp_close{width:75px;height:22px;background:url(../images/prettyPhoto/light_rounded/sprite.png) -1px -1px no-repeat;cursor:pointer} -div.light_rounded .pp_nav .pp_play{background:url(../images/prettyPhoto/light_rounded/sprite.png) -1px -100px no-repeat;height:15px;width:14px} -div.light_rounded .pp_nav .pp_pause{background:url(../images/prettyPhoto/light_rounded/sprite.png) -24px -100px no-repeat;height:15px;width:14px} -div.light_rounded .pp_arrow_previous{background:url(../images/prettyPhoto/light_rounded/sprite.png) 0 -71px no-repeat} -div.light_rounded .pp_arrow_next{background:url(../images/prettyPhoto/light_rounded/sprite.png) -22px -71px no-repeat} -div.light_rounded .pp_bottom .pp_left{background:url(../images/prettyPhoto/light_rounded/sprite.png) -88px -80px no-repeat} -div.light_rounded .pp_bottom .pp_right{background:url(../images/prettyPhoto/light_rounded/sprite.png) -110px -80px no-repeat} -div.dark_rounded .pp_top .pp_left{background:url(../images/prettyPhoto/dark_rounded/sprite.png) -88px -53px no-repeat} -div.dark_rounded .pp_top .pp_right{background:url(../images/prettyPhoto/dark_rounded/sprite.png) -110px -53px no-repeat} -div.dark_rounded .pp_content_container .pp_left{background:url(../images/prettyPhoto/dark_rounded/contentPattern.png) top left repeat-y} -div.dark_rounded .pp_content_container .pp_right{background:url(../images/prettyPhoto/dark_rounded/contentPattern.png) top right repeat-y} -div.dark_rounded .pp_next:hover{background:url(../images/prettyPhoto/dark_rounded/btnNext.png) center right no-repeat;cursor:pointer} -div.dark_rounded .pp_previous:hover{background:url(../images/prettyPhoto/dark_rounded/btnPrevious.png) center left no-repeat;cursor:pointer} -div.dark_rounded .pp_expand{background:url(../images/prettyPhoto/dark_rounded/sprite.png) -31px -26px no-repeat;cursor:pointer} -div.dark_rounded .pp_expand:hover{background:url(../images/prettyPhoto/dark_rounded/sprite.png) -31px -47px no-repeat;cursor:pointer} -div.dark_rounded .pp_contract{background:url(../images/prettyPhoto/dark_rounded/sprite.png) 0 -26px no-repeat;cursor:pointer} -div.dark_rounded .pp_contract:hover{background:url(../images/prettyPhoto/dark_rounded/sprite.png) 0 -47px no-repeat;cursor:pointer} -div.dark_rounded .pp_close{width:75px;height:22px;background:url(../images/prettyPhoto/dark_rounded/sprite.png) -1px -1px no-repeat;cursor:pointer} -div.dark_rounded .pp_description{margin-right:85px;color:#fff} -div.dark_rounded .pp_nav .pp_play{background:url(../images/prettyPhoto/dark_rounded/sprite.png) -1px -100px no-repeat;height:15px;width:14px} -div.dark_rounded .pp_nav .pp_pause{background:url(../images/prettyPhoto/dark_rounded/sprite.png) -24px -100px no-repeat;height:15px;width:14px} -div.dark_rounded .pp_arrow_previous{background:url(../images/prettyPhoto/dark_rounded/sprite.png) 0 -71px no-repeat} -div.dark_rounded .pp_arrow_next{background:url(../images/prettyPhoto/dark_rounded/sprite.png) -22px -71px no-repeat} -div.dark_rounded .pp_bottom .pp_left{background:url(../images/prettyPhoto/dark_rounded/sprite.png) -88px -80px no-repeat} -div.dark_rounded .pp_bottom .pp_right{background:url(../images/prettyPhoto/dark_rounded/sprite.png) -110px -80px no-repeat} -div.dark_rounded .pp_loaderIcon{background:url(../images/prettyPhoto/dark_rounded/loader.gif) center center no-repeat} -div.dark_square .pp_left,div.dark_square .pp_middle,div.dark_square .pp_right,div.dark_square .pp_content{background:#000} -div.dark_square .pp_description{color:#fff;margin:0 85px 0 0} -div.dark_square .pp_loaderIcon{background:url(../images/prettyPhoto/dark_square/loader.gif) center center no-repeat} -div.dark_square .pp_expand{background:url(../images/prettyPhoto/dark_square/sprite.png) -31px -26px no-repeat;cursor:pointer} -div.dark_square .pp_expand:hover{background:url(../images/prettyPhoto/dark_square/sprite.png) -31px -47px no-repeat;cursor:pointer} -div.dark_square .pp_contract{background:url(../images/prettyPhoto/dark_square/sprite.png) 0 -26px no-repeat;cursor:pointer} -div.dark_square .pp_contract:hover{background:url(../images/prettyPhoto/dark_square/sprite.png) 0 -47px no-repeat;cursor:pointer} -div.dark_square .pp_close{width:75px;height:22px;background:url(../images/prettyPhoto/dark_square/sprite.png) -1px -1px no-repeat;cursor:pointer} -div.dark_square .pp_nav{clear:none} -div.dark_square .pp_nav .pp_play{background:url(../images/prettyPhoto/dark_square/sprite.png) -1px -100px no-repeat;height:15px;width:14px} -div.dark_square .pp_nav .pp_pause{background:url(../images/prettyPhoto/dark_square/sprite.png) -24px -100px no-repeat;height:15px;width:14px} -div.dark_square .pp_arrow_previous{background:url(../images/prettyPhoto/dark_square/sprite.png) 0 -71px no-repeat} -div.dark_square .pp_arrow_next{background:url(../images/prettyPhoto/dark_square/sprite.png) -22px -71px no-repeat} -div.dark_square .pp_next:hover{background:url(../images/prettyPhoto/dark_square/btnNext.png) center right no-repeat;cursor:pointer} -div.dark_square .pp_previous:hover{background:url(../images/prettyPhoto/dark_square/btnPrevious.png) center left no-repeat;cursor:pointer} -div.light_square .pp_expand{background:url(../images/prettyPhoto/light_square/sprite.png) -31px -26px no-repeat;cursor:pointer} -div.light_square .pp_expand:hover{background:url(../images/prettyPhoto/light_square/sprite.png) -31px -47px no-repeat;cursor:pointer} -div.light_square .pp_contract{background:url(../images/prettyPhoto/light_square/sprite.png) 0 -26px no-repeat;cursor:pointer} -div.light_square .pp_contract:hover{background:url(../images/prettyPhoto/light_square/sprite.png) 0 -47px no-repeat;cursor:pointer} -div.light_square .pp_close{width:75px;height:22px;background:url(../images/prettyPhoto/light_square/sprite.png) -1px -1px no-repeat;cursor:pointer} -div.light_square .pp_nav .pp_play{background:url(../images/prettyPhoto/light_square/sprite.png) -1px -100px no-repeat;height:15px;width:14px} -div.light_square .pp_nav .pp_pause{background:url(../images/prettyPhoto/light_square/sprite.png) -24px -100px no-repeat;height:15px;width:14px} -div.light_square .pp_arrow_previous{background:url(../images/prettyPhoto/light_square/sprite.png) 0 -71px no-repeat} -div.light_square .pp_arrow_next{background:url(../images/prettyPhoto/light_square/sprite.png) -22px -71px no-repeat} -div.light_square .pp_next:hover{background:url(../images/prettyPhoto/light_square/btnNext.png) center right no-repeat;cursor:pointer} -div.light_square .pp_previous:hover{background:url(../images/prettyPhoto/light_square/btnPrevious.png) center left no-repeat;cursor:pointer} -div.facebook .pp_top .pp_left{background:url(../images/prettyPhoto/facebook/sprite.png) -88px -53px no-repeat} -div.facebook .pp_top .pp_middle{background:url(../images/prettyPhoto/facebook/contentPatternTop.png) top left repeat-x} -div.facebook .pp_top .pp_right{background:url(../images/prettyPhoto/facebook/sprite.png) -110px -53px no-repeat} -div.facebook .pp_content_container .pp_left{background:url(../images/prettyPhoto/facebook/contentPatternLeft.png) top left repeat-y} -div.facebook .pp_content_container .pp_right{background:url(../images/prettyPhoto/facebook/contentPatternRight.png) top right repeat-y} -div.facebook .pp_expand{background:url(../images/prettyPhoto/facebook/sprite.png) -31px -26px no-repeat;cursor:pointer} -div.facebook .pp_expand:hover{background:url(../images/prettyPhoto/facebook/sprite.png) -31px -47px no-repeat;cursor:pointer} -div.facebook .pp_contract{background:url(../images/prettyPhoto/facebook/sprite.png) 0 -26px no-repeat;cursor:pointer} -div.facebook .pp_contract:hover{background:url(../images/prettyPhoto/facebook/sprite.png) 0 -47px no-repeat;cursor:pointer} -div.facebook .pp_close{width:22px;height:22px;background:url(../images/prettyPhoto/facebook/sprite.png) -1px -1px no-repeat;cursor:pointer} -div.facebook .pp_description{margin:0 37px 0 0} -div.facebook .pp_loaderIcon{background:url(../images/prettyPhoto/facebook/loader.gif) center center no-repeat} -div.facebook .pp_arrow_previous{background:url(../images/prettyPhoto/facebook/sprite.png) 0 -71px no-repeat;height:22px;margin-top:0;width:22px} -div.facebook .pp_arrow_previous.disabled{background-position:0 -96px;cursor:default} -div.facebook .pp_arrow_next{background:url(../images/prettyPhoto/facebook/sprite.png) -32px -71px no-repeat;height:22px;margin-top:0;width:22px} -div.facebook .pp_arrow_next.disabled{background-position:-32px -96px;cursor:default} -div.facebook .pp_nav{margin-top:0} -div.facebook .pp_nav p{font-size:15px;padding:0 3px 0 4px} -div.facebook .pp_nav .pp_play{background:url(../images/prettyPhoto/facebook/sprite.png) -1px -123px no-repeat;height:22px;width:22px} -div.facebook .pp_nav .pp_pause{background:url(../images/prettyPhoto/facebook/sprite.png) -32px -123px no-repeat;height:22px;width:22px} -div.facebook .pp_next:hover{background:url(../images/prettyPhoto/facebook/btnNext.png) center right no-repeat;cursor:pointer} -div.facebook .pp_previous:hover{background:url(../images/prettyPhoto/facebook/btnPrevious.png) center left no-repeat;cursor:pointer} -div.facebook .pp_bottom .pp_left{background:url(../images/prettyPhoto/facebook/sprite.png) -88px -80px no-repeat} -div.facebook .pp_bottom .pp_middle{background:url(../images/prettyPhoto/facebook/contentPatternBottom.png) top left repeat-x} -div.facebook .pp_bottom .pp_right{background:url(../images/prettyPhoto/facebook/sprite.png) -110px -80px no-repeat} -div.pp_pic_holder a:focus{outline:none} -div.pp_overlay{background:#000;display:none;left:0;position:absolute;top:0;width:100%;z-index:9500} -div.pp_pic_holder{display:none;position:absolute;width:100px;z-index:10000} -.pp_content{height:40px;min-width:40px} -* html .pp_content{width:40px} -.pp_content_container{position:relative;text-align:left;width:100%} -.pp_content_container .pp_left{padding-left:20px} -.pp_content_container .pp_right{padding-right:20px} -.pp_content_container .pp_details{float:left;margin:10px 0 2px} -.pp_description{display:none;margin:0} -.pp_social{float:left;margin:0} -.pp_social .facebook{float:left;margin-left:5px;width:55px;overflow:hidden} -.pp_social .twitter{float:left} -.pp_nav{clear:right;float:left;margin:3px 10px 0 0} -.pp_nav p{float:left;white-space:nowrap;margin:2px 4px} -.pp_nav .pp_play,.pp_nav .pp_pause{float:left;margin-right:4px;text-indent:-10000px} -a.pp_arrow_previous,a.pp_arrow_next{display:block;float:left;height:15px;margin-top:3px;overflow:hidden;text-indent:-10000px;width:14px} -.pp_hoverContainer{position:absolute;top:0;width:100%;z-index:2000} -.pp_gallery{display:none;left:50%;margin-top:-50px;position:absolute;z-index:10000} -.pp_gallery div{float:left;overflow:hidden;position:relative} -.pp_gallery ul{float:left;height:35px;position:relative;white-space:nowrap;margin:0 0 0 5px;padding:0} -.pp_gallery ul a{border:1px rgba(0,0,0,0.5) solid;display:block;float:left;height:33px;overflow:hidden} -.pp_gallery ul a img{border:0} -.pp_gallery li{display:block;float:left;margin:0 5px 0 0;padding:0} -.pp_gallery li.default a{background:url(../images/prettyPhoto/facebook/default_thumbnail.gif) 0 0 no-repeat;display:block;height:33px;width:50px} -.pp_gallery .pp_arrow_previous,.pp_gallery .pp_arrow_next{margin-top:7px!important} -a.pp_next{background:url(../images/prettyPhoto/light_rounded/btnNext.png) 10000px 10000px no-repeat;display:block;float:right;height:100%;text-indent:-10000px;width:49%} -a.pp_previous{background:url(../images/prettyPhoto/light_rounded/btnNext.png) 10000px 10000px no-repeat;display:block;float:left;height:100%;text-indent:-10000px;width:49%} -a.pp_expand,a.pp_contract{cursor:pointer;display:none;height:20px;position:absolute;right:30px;text-indent:-10000px;top:10px;width:20px;z-index:20000} -a.pp_close{position:absolute;right:0;top:0;display:block;line-height:22px;text-indent:-10000px} -.pp_loaderIcon{display:block;height:24px;left:50%;position:absolute;top:50%;width:24px;margin:-12px 0 0 -12px} -#pp_full_res{line-height:1!important} -#pp_full_res .pp_inline{text-align:left} -#pp_full_res .pp_inline p{margin:0 0 15px} -div.ppt{color:#fff;display:none;font-size:17px;z-index:9999;margin:0 0 5px 15px} -div.pp_default .pp_content,div.light_rounded .pp_content{background-color:#fff} -div.pp_default #pp_full_res .pp_inline,div.light_rounded .pp_content .ppt,div.light_rounded #pp_full_res .pp_inline,div.light_square .pp_content .ppt,div.light_square #pp_full_res .pp_inline,div.facebook .pp_content .ppt,div.facebook #pp_full_res .pp_inline{color:#000} -div.pp_default .pp_gallery ul li a:hover,div.pp_default .pp_gallery ul li.selected a,.pp_gallery ul a:hover,.pp_gallery li.selected a{border-color:#fff} -div.pp_default .pp_details,div.light_rounded .pp_details,div.dark_rounded .pp_details,div.dark_square .pp_details,div.light_square .pp_details,div.facebook .pp_details{position:relative} -div.light_rounded .pp_top .pp_middle,div.light_rounded .pp_content_container .pp_left,div.light_rounded .pp_content_container .pp_right,div.light_rounded .pp_bottom .pp_middle,div.light_square .pp_left,div.light_square .pp_middle,div.light_square .pp_right,div.light_square .pp_content,div.facebook .pp_content{background:#fff} -div.light_rounded .pp_description,div.light_square .pp_description{margin-right:85px} -div.light_rounded .pp_gallery a.pp_arrow_previous,div.light_rounded .pp_gallery a.pp_arrow_next,div.dark_rounded .pp_gallery a.pp_arrow_previous,div.dark_rounded .pp_gallery a.pp_arrow_next,div.dark_square .pp_gallery a.pp_arrow_previous,div.dark_square .pp_gallery a.pp_arrow_next,div.light_square .pp_gallery a.pp_arrow_previous,div.light_square .pp_gallery a.pp_arrow_next{margin-top:12px!important} -div.light_rounded .pp_arrow_previous.disabled,div.dark_rounded .pp_arrow_previous.disabled,div.dark_square .pp_arrow_previous.disabled,div.light_square .pp_arrow_previous.disabled{background-position:0 -87px;cursor:default} -div.light_rounded .pp_arrow_next.disabled,div.dark_rounded .pp_arrow_next.disabled,div.dark_square .pp_arrow_next.disabled,div.light_square .pp_arrow_next.disabled{background-position:-22px -87px;cursor:default} -div.light_rounded .pp_loaderIcon,div.light_square .pp_loaderIcon{background:url(../images/prettyPhoto/light_rounded/loader.gif) center center no-repeat} -div.dark_rounded .pp_top .pp_middle,div.dark_rounded .pp_content,div.dark_rounded .pp_bottom .pp_middle{background:url(../images/prettyPhoto/dark_rounded/contentPattern.png) top left repeat} -div.dark_rounded .currentTextHolder,div.dark_square .currentTextHolder{color:#c4c4c4} -div.dark_rounded #pp_full_res .pp_inline,div.dark_square #pp_full_res .pp_inline{color:#fff} -.pp_top,.pp_bottom{height:20px;position:relative} -* html .pp_top,* html .pp_bottom{padding:0 20px} -.pp_top .pp_left,.pp_bottom .pp_left{height:20px;left:0;position:absolute;width:20px} -.pp_top .pp_middle,.pp_bottom .pp_middle{height:20px;left:20px;position:absolute;right:20px} -* html .pp_top .pp_middle,* html .pp_bottom .pp_middle{left:0;position:static} -.pp_top .pp_right,.pp_bottom .pp_right{height:20px;left:auto;position:absolute;right:0;top:0;width:20px} -.pp_fade,.pp_gallery li.default a img{display:none} \ No newline at end of file diff --git a/dashboard/public/dist/images/prettyPhoto/dark_rounded/btnNext.png b/dashboard/public/dist/images/prettyPhoto/dark_rounded/btnNext.png deleted file mode 100644 index b28c1ef3..00000000 Binary files a/dashboard/public/dist/images/prettyPhoto/dark_rounded/btnNext.png and /dev/null differ diff --git a/dashboard/public/dist/images/prettyPhoto/dark_rounded/btnPrevious.png b/dashboard/public/dist/images/prettyPhoto/dark_rounded/btnPrevious.png deleted file mode 100644 index e0cd9c49..00000000 Binary files a/dashboard/public/dist/images/prettyPhoto/dark_rounded/btnPrevious.png and /dev/null differ diff --git a/dashboard/public/dist/images/prettyPhoto/dark_rounded/contentPattern.png b/dashboard/public/dist/images/prettyPhoto/dark_rounded/contentPattern.png deleted file mode 100644 index e5a047c3..00000000 Binary files a/dashboard/public/dist/images/prettyPhoto/dark_rounded/contentPattern.png and /dev/null differ diff --git a/dashboard/public/dist/images/prettyPhoto/dark_rounded/default_thumbnail.gif b/dashboard/public/dist/images/prettyPhoto/dark_rounded/default_thumbnail.gif deleted file mode 100644 index 2b1280f3..00000000 Binary files a/dashboard/public/dist/images/prettyPhoto/dark_rounded/default_thumbnail.gif and /dev/null differ diff --git a/dashboard/public/dist/images/prettyPhoto/dark_rounded/loader.gif b/dashboard/public/dist/images/prettyPhoto/dark_rounded/loader.gif deleted file mode 100644 index 50820eed..00000000 Binary files a/dashboard/public/dist/images/prettyPhoto/dark_rounded/loader.gif and /dev/null differ diff --git a/dashboard/public/dist/images/prettyPhoto/dark_rounded/sprite.png b/dashboard/public/dist/images/prettyPhoto/dark_rounded/sprite.png deleted file mode 100644 index fb8c0f83..00000000 Binary files a/dashboard/public/dist/images/prettyPhoto/dark_rounded/sprite.png and /dev/null differ diff --git a/dashboard/public/dist/images/prettyPhoto/dark_square/btnNext.png b/dashboard/public/dist/images/prettyPhoto/dark_square/btnNext.png deleted file mode 100644 index b28c1ef3..00000000 Binary files a/dashboard/public/dist/images/prettyPhoto/dark_square/btnNext.png and /dev/null differ diff --git a/dashboard/public/dist/images/prettyPhoto/dark_square/btnPrevious.png b/dashboard/public/dist/images/prettyPhoto/dark_square/btnPrevious.png deleted file mode 100644 index e0cd9c49..00000000 Binary files a/dashboard/public/dist/images/prettyPhoto/dark_square/btnPrevious.png and /dev/null differ diff --git a/dashboard/public/dist/images/prettyPhoto/dark_square/contentPattern.png b/dashboard/public/dist/images/prettyPhoto/dark_square/contentPattern.png deleted file mode 100644 index 7b50aff8..00000000 Binary files a/dashboard/public/dist/images/prettyPhoto/dark_square/contentPattern.png and /dev/null differ diff --git a/dashboard/public/dist/images/prettyPhoto/dark_square/default_thumbnail.gif b/dashboard/public/dist/images/prettyPhoto/dark_square/default_thumbnail.gif deleted file mode 100644 index 2b1280f3..00000000 Binary files a/dashboard/public/dist/images/prettyPhoto/dark_square/default_thumbnail.gif and /dev/null differ diff --git a/dashboard/public/dist/images/prettyPhoto/dark_square/loader.gif b/dashboard/public/dist/images/prettyPhoto/dark_square/loader.gif deleted file mode 100644 index 50820eed..00000000 Binary files a/dashboard/public/dist/images/prettyPhoto/dark_square/loader.gif and /dev/null differ diff --git a/dashboard/public/dist/images/prettyPhoto/dark_square/sprite.png b/dashboard/public/dist/images/prettyPhoto/dark_square/sprite.png deleted file mode 100644 index 4fe35475..00000000 Binary files a/dashboard/public/dist/images/prettyPhoto/dark_square/sprite.png and /dev/null differ diff --git a/dashboard/public/dist/images/prettyPhoto/default/default_thumb.png b/dashboard/public/dist/images/prettyPhoto/default/default_thumb.png deleted file mode 100644 index 1a26e4b1..00000000 Binary files a/dashboard/public/dist/images/prettyPhoto/default/default_thumb.png and /dev/null differ diff --git a/dashboard/public/dist/images/prettyPhoto/default/loader.gif b/dashboard/public/dist/images/prettyPhoto/default/loader.gif deleted file mode 100644 index 35d397c9..00000000 Binary files a/dashboard/public/dist/images/prettyPhoto/default/loader.gif and /dev/null differ diff --git a/dashboard/public/dist/images/prettyPhoto/default/sprite.png b/dashboard/public/dist/images/prettyPhoto/default/sprite.png deleted file mode 100644 index 5f07ddc5..00000000 Binary files a/dashboard/public/dist/images/prettyPhoto/default/sprite.png and /dev/null differ diff --git a/dashboard/public/dist/images/prettyPhoto/default/sprite_next.png b/dashboard/public/dist/images/prettyPhoto/default/sprite_next.png deleted file mode 100644 index 379dc0d0..00000000 Binary files a/dashboard/public/dist/images/prettyPhoto/default/sprite_next.png and /dev/null differ diff --git a/dashboard/public/dist/images/prettyPhoto/default/sprite_prev.png b/dashboard/public/dist/images/prettyPhoto/default/sprite_prev.png deleted file mode 100644 index 1ee48651..00000000 Binary files a/dashboard/public/dist/images/prettyPhoto/default/sprite_prev.png and /dev/null differ diff --git a/dashboard/public/dist/images/prettyPhoto/default/sprite_x.png b/dashboard/public/dist/images/prettyPhoto/default/sprite_x.png deleted file mode 100644 index d4433ab0..00000000 Binary files a/dashboard/public/dist/images/prettyPhoto/default/sprite_x.png and /dev/null differ diff --git a/dashboard/public/dist/images/prettyPhoto/default/sprite_y.png b/dashboard/public/dist/images/prettyPhoto/default/sprite_y.png deleted file mode 100644 index 7786ab51..00000000 Binary files a/dashboard/public/dist/images/prettyPhoto/default/sprite_y.png and /dev/null differ diff --git a/dashboard/public/dist/images/prettyPhoto/facebook/btnNext.png b/dashboard/public/dist/images/prettyPhoto/facebook/btnNext.png deleted file mode 100644 index e809c3b6..00000000 Binary files a/dashboard/public/dist/images/prettyPhoto/facebook/btnNext.png and /dev/null differ diff --git a/dashboard/public/dist/images/prettyPhoto/facebook/btnPrevious.png b/dashboard/public/dist/images/prettyPhoto/facebook/btnPrevious.png deleted file mode 100644 index 0812542c..00000000 Binary files a/dashboard/public/dist/images/prettyPhoto/facebook/btnPrevious.png and /dev/null differ diff --git a/dashboard/public/dist/images/prettyPhoto/facebook/contentPatternBottom.png b/dashboard/public/dist/images/prettyPhoto/facebook/contentPatternBottom.png deleted file mode 100644 index a9be3b2c..00000000 Binary files a/dashboard/public/dist/images/prettyPhoto/facebook/contentPatternBottom.png and /dev/null differ diff --git a/dashboard/public/dist/images/prettyPhoto/facebook/contentPatternLeft.png b/dashboard/public/dist/images/prettyPhoto/facebook/contentPatternLeft.png deleted file mode 100644 index 277c87a5..00000000 Binary files a/dashboard/public/dist/images/prettyPhoto/facebook/contentPatternLeft.png and /dev/null differ diff --git a/dashboard/public/dist/images/prettyPhoto/facebook/contentPatternRight.png b/dashboard/public/dist/images/prettyPhoto/facebook/contentPatternRight.png deleted file mode 100644 index 76e50d0f..00000000 Binary files a/dashboard/public/dist/images/prettyPhoto/facebook/contentPatternRight.png and /dev/null differ diff --git a/dashboard/public/dist/images/prettyPhoto/facebook/contentPatternTop.png b/dashboard/public/dist/images/prettyPhoto/facebook/contentPatternTop.png deleted file mode 100644 index 8b110bac..00000000 Binary files a/dashboard/public/dist/images/prettyPhoto/facebook/contentPatternTop.png and /dev/null differ diff --git a/dashboard/public/dist/images/prettyPhoto/facebook/default_thumbnail.gif b/dashboard/public/dist/images/prettyPhoto/facebook/default_thumbnail.gif deleted file mode 100644 index 2b1280f3..00000000 Binary files a/dashboard/public/dist/images/prettyPhoto/facebook/default_thumbnail.gif and /dev/null differ diff --git a/dashboard/public/dist/images/prettyPhoto/facebook/loader.gif b/dashboard/public/dist/images/prettyPhoto/facebook/loader.gif deleted file mode 100644 index 7ac990cf..00000000 Binary files a/dashboard/public/dist/images/prettyPhoto/facebook/loader.gif and /dev/null differ diff --git a/dashboard/public/dist/images/prettyPhoto/facebook/sprite.png b/dashboard/public/dist/images/prettyPhoto/facebook/sprite.png deleted file mode 100644 index 660a254f..00000000 Binary files a/dashboard/public/dist/images/prettyPhoto/facebook/sprite.png and /dev/null differ diff --git a/dashboard/public/dist/images/prettyPhoto/light_rounded/btnNext.png b/dashboard/public/dist/images/prettyPhoto/light_rounded/btnNext.png deleted file mode 100644 index b28c1ef3..00000000 Binary files a/dashboard/public/dist/images/prettyPhoto/light_rounded/btnNext.png and /dev/null differ diff --git a/dashboard/public/dist/images/prettyPhoto/light_rounded/btnPrevious.png b/dashboard/public/dist/images/prettyPhoto/light_rounded/btnPrevious.png deleted file mode 100644 index e0cd9c49..00000000 Binary files a/dashboard/public/dist/images/prettyPhoto/light_rounded/btnPrevious.png and /dev/null differ diff --git a/dashboard/public/dist/images/prettyPhoto/light_rounded/default_thumbnail.gif b/dashboard/public/dist/images/prettyPhoto/light_rounded/default_thumbnail.gif deleted file mode 100644 index 2b1280f3..00000000 Binary files a/dashboard/public/dist/images/prettyPhoto/light_rounded/default_thumbnail.gif and /dev/null differ diff --git a/dashboard/public/dist/images/prettyPhoto/light_rounded/loader.gif b/dashboard/public/dist/images/prettyPhoto/light_rounded/loader.gif deleted file mode 100644 index 7ac990cf..00000000 Binary files a/dashboard/public/dist/images/prettyPhoto/light_rounded/loader.gif and /dev/null differ diff --git a/dashboard/public/dist/images/prettyPhoto/light_rounded/sprite.png b/dashboard/public/dist/images/prettyPhoto/light_rounded/sprite.png deleted file mode 100644 index 7f283798..00000000 Binary files a/dashboard/public/dist/images/prettyPhoto/light_rounded/sprite.png and /dev/null differ diff --git a/dashboard/public/dist/images/prettyPhoto/light_square/btnNext.png b/dashboard/public/dist/images/prettyPhoto/light_square/btnNext.png deleted file mode 100644 index b28c1ef3..00000000 Binary files a/dashboard/public/dist/images/prettyPhoto/light_square/btnNext.png and /dev/null differ diff --git a/dashboard/public/dist/images/prettyPhoto/light_square/btnPrevious.png b/dashboard/public/dist/images/prettyPhoto/light_square/btnPrevious.png deleted file mode 100644 index e0cd9c49..00000000 Binary files a/dashboard/public/dist/images/prettyPhoto/light_square/btnPrevious.png and /dev/null differ diff --git a/dashboard/public/dist/images/prettyPhoto/light_square/default_thumbnail.gif b/dashboard/public/dist/images/prettyPhoto/light_square/default_thumbnail.gif deleted file mode 100644 index 2b1280f3..00000000 Binary files a/dashboard/public/dist/images/prettyPhoto/light_square/default_thumbnail.gif and /dev/null differ diff --git a/dashboard/public/dist/images/prettyPhoto/light_square/loader.gif b/dashboard/public/dist/images/prettyPhoto/light_square/loader.gif deleted file mode 100644 index 7ac990cf..00000000 Binary files a/dashboard/public/dist/images/prettyPhoto/light_square/loader.gif and /dev/null differ diff --git a/dashboard/public/dist/images/prettyPhoto/light_square/sprite.png b/dashboard/public/dist/images/prettyPhoto/light_square/sprite.png deleted file mode 100644 index 4fe35475..00000000 Binary files a/dashboard/public/dist/images/prettyPhoto/light_square/sprite.png and /dev/null differ diff --git a/dashboard/routes/settings.js b/dashboard/routes/profile.js similarity index 100% rename from dashboard/routes/settings.js rename to dashboard/routes/profile.js diff --git a/dashboard/views/docs.ejs b/dashboard/views/docs.ejs index bb7194f7..b439c8e0 100644 --- a/dashboard/views/docs.ejs +++ b/dashboard/views/docs.ejs @@ -22,7 +22,6 @@ - @@ -472,7 +471,6 @@ - diff --git a/dashboard/views/includes/sidebar.ejs b/dashboard/views/includes/sidebar.ejs index 9fad9369..5a5b8f40 100644 --- a/dashboard/views/includes/sidebar.ejs +++ b/dashboard/views/includes/sidebar.ejs @@ -54,8 +54,8 @@ diff --git a/dashboard/views/manager/guild.ejs b/dashboard/views/manager/guild.ejs index 48228b77..a5c37871 100644 --- a/dashboard/views/manager/guild.ejs +++ b/dashboard/views/manager/guild.ejs @@ -26,6 +26,64 @@
+ +
+
+
+ +
+ <%= translate("common:LEVEL") %> + <%= guild.members.find(u => u.id === user.id).level %> +
+ +
+ +
+ +
+
+ +
+ <%= translate("dashboard:EXP") %> + <%= guild.members.find(u => u.id === user.id).exp %> / <%= 5 * (guild.members.find(u => u.id === user.id).level * guild.members.find(u => u.id === user.id).level) + 80 * guild.members.find(u => u.id === user.id).level + 100 %> +
+ +
+ +
+ +
+
+ +
+ <%= translate("common:CREDITS") %> / <%= translate("economy/transactions:BANK") %> + <%= guild.members.find(u => u.id === user.id).money %> / <%= guild.members.find(u => u.id === user.id).bankSold %> +
+ +
+ +
+ +
+
+ +
+ <%= translate("dashboard:COOLDOWNS") %> + <% for (const c in memberData.cooldowns) { %> + <% if (c !== "rob") { %> + <%= translate("dashboard:" + c.toUpperCase()) %>: <%= memberData.cooldowns[c] > Date.now() ? convertTime(memberData.cooldowns[c]) : translate("dashboard:CAN_USE") %> + <% } else { %> + <%= translate("dashboard:" + c.toUpperCase()) %>: <%= memberData.cooldowns[c] > Date.now() ? convertTime(memberData.cooldowns[c]) : translate("dashboard:NO_DEFENCE") %> + <% }; %> + <% }; %> +
+ +
+ +
+ +
+
@@ -51,38 +109,6 @@
-
- -
- <%= translate("common:LEVEL") %> - <%= guild.members.find(u => u.id === user.id).level %> -
- -
-
- -
- <%= translate("common:CREDITS") %> / <%= translate("economy/transactions:BANK") %> - <%= guild.members.find(u => u.id === user.id).money %> / <%= guild.members.find(u => u.id === user.id).bankSold %> -
- -
- -
- -
- <%= translate("dashboard:COOLDOWNS") %> - <% for (const c in memberData.cooldowns) { %> - <% if (c !== "rob") { %> - <%= translate("dashboard:" + c.toUpperCase()) %>: <%= memberData.cooldowns[c] !== 0 ? convertTime(memberData.cooldowns[c]) : translate("dashboard:CAN_USE") %> - <% } else { %> - <%= translate("dashboard:" + c.toUpperCase()) %>: <%= memberData.cooldowns[c] !== 0 ? convertTime(memberData.cooldowns[c]) : translate("dashboard:NO_DEFENCE") %> - <% }; %> - <% }; %> -
- -
-
diff --git a/dashboard/views/settings.ejs b/dashboard/views/profile.ejs similarity index 93% rename from dashboard/views/settings.ejs rename to dashboard/views/profile.ejs index 5e88a28f..7fe0b4ab 100644 --- a/dashboard/views/settings.ejs +++ b/dashboard/views/profile.ejs @@ -21,15 +21,14 @@
-

<%= translate("UTILS").SETTINGS %> Dashboard v1.0

+

<%= translate("common:PROFILE") %> Dashboard v1.0

-
-
+
@@ -39,6 +38,11 @@
+
+
+ +
+
@@ -46,7 +50,7 @@
-
+
diff --git a/languages/en-US/common.json b/languages/en-US/common.json index b25e93ca..eed89347 100644 --- a/languages/en-US/common.json +++ b/languages/en-US/common.json @@ -48,7 +48,6 @@ "PAGE": "Page", "MESSAGE": "Message", "PROFILE": "Profile", - "SETTINGS": "Settings", "CONFIGURATION": "Configuration", "PREFIX": "Prefix", "LANGUAGE": "Language", diff --git a/languages/ru-RU/common.json b/languages/ru-RU/common.json index 5bcf0586..073688f6 100644 --- a/languages/ru-RU/common.json +++ b/languages/ru-RU/common.json @@ -48,7 +48,6 @@ "PAGE": "Страница", "MESSAGE": "Сообщение", "PROFILE": "Профиль", - "SETTINGS": "Настройки", "CONFIGURATION": "Конфигурация", "PREFIX": "Префикс", "LANGUAGE": "Язык", diff --git a/languages/ru-RU/dashboard.json b/languages/ru-RU/dashboard.json index f3c8113f..261492e2 100644 --- a/languages/ru-RU/dashboard.json +++ b/languages/ru-RU/dashboard.json @@ -22,7 +22,7 @@ "DISABLE_AUTOROLE": "Выключить", "SELECTOR": "Выбор серверов", "MANAGE": "Управление", - + "EXP": "Опыт", "REPUTATION": "Очки репутации", "COOLDOWNS": "Откаты", "REP": "Команда rep", diff --git a/languages/ru-RU/economy/pay.json b/languages/ru-RU/economy/pay.json index 7801c851..118bdb6e 100644 --- a/languages/ru-RU/economy/pay.json +++ b/languages/ru-RU/economy/pay.json @@ -3,7 +3,7 @@ "USAGE": "{{prefix}}pay [@пользователь] [сумма]", "EXAMPLES": "{{prefix}}pay @Jonny_Bro#4226 1000", "INVALID_MEMBER": "Вы должны упомянуть пользователя!", - "BOT_USER": "Ботам не нужны деньги!", + "BOT_USER": "Ботам не нужны кредиты!", "YOURSELF": "Вы не можете заплатить самому себе!", "INVALID_AMOUNT": "Укажите сумму", "ENOUGH_MONEY": "У вас нет {{amount}}",