diff --git a/src/controllers/api/admin/tokeCommandController.js b/src/controllers/api/admin/tokeCommandController.js index ce4a452..2af4c40 100644 --- a/src/controllers/api/admin/tokeCommandController.js +++ b/src/controllers/api/admin/tokeCommandController.js @@ -57,7 +57,6 @@ module.exports.post = async function(req, res){ res.status(400); return res.send({errors: validResult.array()}) } - }catch(err){ return exceptionHandler(res, err); } @@ -87,7 +86,6 @@ module.exports.delete = async function(req, res){ res.status(400); return res.send({errors: validResult.array()}) } - }catch(err){ return exceptionHandler(res, err); } diff --git a/src/views/partial/adminPanel/channelList.ejs b/src/views/partial/adminPanel/channelList.ejs index 2ca358e..c32a049 100644 --- a/src/views/partial/adminPanel/channelList.ejs +++ b/src/views/partial/adminPanel/channelList.ejs @@ -15,34 +15,36 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see .-->

Channel List:

- - - - - - - <% chanGuide.forEach((channel) => { %> - - - - - - <% }); %> -
-

Img

- 		-

Name

- 		-

Description

-
- - - - - - <%- channel.name %> - - - <%- channel.description %> -
+
+ + + + + + + <% chanGuide.forEach((channel) => { %> + + + + + + <% }); %> +
+

Img

+ 		+

Name

+ 		+

Description

+
+ + + + + + <%- channel.name %> + + + <%- channel.description %> +
+
\ No newline at end of file diff --git a/src/views/partial/adminPanel/permList.ejs b/src/views/partial/adminPanel/permList.ejs index 2820e2c..4b03936 100644 --- a/src/views/partial/adminPanel/permList.ejs +++ b/src/views/partial/adminPanel/permList.ejs @@ -15,31 +15,33 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see .-->

Permissions:

-
- <% Object.keys(permList).forEach((key)=>{ %> - <% if(key != "channelOverrides"){ %> - - - - - <% } %> - <% }); %> -

Channel Overrides:

- <% Object.keys(permList.channelOverrides).forEach((key)=>{ %> - <% if(key != "channelOverrides"){ %> - - - - - <% } %> - <% }); %> -
+
+
+ <% Object.keys(permList).forEach((key)=>{ %> + <% if(key != "channelOverrides"){ %> + + + + + <% } %> + <% }); %> +

Channel Overrides:

+ <% Object.keys(permList.channelOverrides).forEach((key)=>{ %> + <% if(key != "channelOverrides"){ %> + + + + + <% } %> + <% }); %> +
+
\ No newline at end of file diff --git a/src/views/partial/adminPanel/tokeCommandList.ejs b/src/views/partial/adminPanel/tokeCommandList.ejs new file mode 100644 index 0000000..f16e71f --- /dev/null +++ b/src/views/partial/adminPanel/tokeCommandList.ejs @@ -0,0 +1,18 @@ + +
+

Toke Command List:

+
\ No newline at end of file diff --git a/src/views/partial/adminPanel/userBanList.ejs b/src/views/partial/adminPanel/userBanList.ejs index d9ad5f3..3e74414 100644 --- a/src/views/partial/adminPanel/userBanList.ejs +++ b/src/views/partial/adminPanel/userBanList.ejs @@ -15,32 +15,34 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see .-->

User Ban List:

- - - - - - - - - - - -
-

Img

- 		-

ID

- 		-

Name

- 		-

Sign-Up
Date

- 		-

Ban
Date

- 		-

Expires

- 		-

Expiration
Action

- 		-   -
+
+ + + + + + + + + + + +
+

Img

+ 		+

ID

+ 		+

Name

+ 		+

Sign-Up
Date

+ 		+

Ban
Date

+ 		+

Expires

+ 		+

Expiration
Action

+ 		+   +
+
\ No newline at end of file diff --git a/src/views/partial/adminPanel/userList.ejs b/src/views/partial/adminPanel/userList.ejs index c5a6b4c..6119dcd 100644 --- a/src/views/partial/adminPanel/userList.ejs +++ b/src/views/partial/adminPanel/userList.ejs @@ -15,69 +15,71 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see .-->

User List:

- - - - - - - - - - - <% userList.forEach((curUser) => { %> - - - - - - - - - - <% }); %> -
-

Img

- 		-

ID

- 		-

Name

- 		-

Rank

- 		-

E-Mail

- 		-

Sign-Up
Date

- 		-   -
- - - - - - <%- curUser.id %> - - - - <%- curUser.user %> - - - <% if(rankEnum.indexOf(curUser.rank) < rankEnum.indexOf(user.rank)){%> - - <% }else{ %> - <%- curUser.rank %> - <% } %> - - <%- curUser.email ? curUser.email : "N/A" %> - - <%- curUser.date.toUTCString() %> - - - -
+
+ + + + + + + + + + + <% userList.forEach((curUser) => { %> + + + + + + + + + + <% }); %> +
+

Img

+ 		+

ID

+ 		+

Name

+ 		+

Rank

+ 		+

E-Mail

+ 		+

Sign-Up
Date

+ 		+   +
+ + + + + + <%- curUser.id %> + + + + <%- curUser.user %> + + + <% if(rankEnum.indexOf(curUser.rank) < rankEnum.indexOf(user.rank)){%> + + <% }else{ %> + <%- curUser.rank %> + <% } %> + + <%- curUser.email ? curUser.email : "N/A" %> + + <%- curUser.date.toUTCString() %> + + + +
+
\ No newline at end of file diff --git a/src/views/partial/channelSettings/banList.ejs b/src/views/partial/channelSettings/banList.ejs index 969ce43..15399a6 100644 --- a/src/views/partial/channelSettings/banList.ejs +++ b/src/views/partial/channelSettings/banList.ejs @@ -19,16 +19,18 @@ along with this program. If not, see .--> - - - - - - - - - - - -

Img

ID

Name

Ban
Alts

Ban Date

Expires

 
+
+ + + + + + + + + + + +

Img

ID

Name

Ban
Alts

Ban Date

Expires

 
+
\ No newline at end of file diff --git a/src/views/partial/channelSettings/permList.ejs b/src/views/partial/channelSettings/permList.ejs index 163e1fc..7cfa513 100644 --- a/src/views/partial/channelSettings/permList.ejs +++ b/src/views/partial/channelSettings/permList.ejs @@ -15,18 +15,20 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see .-->

Permissions:

-
- <% Object.keys(channel.permissions.toObject()).forEach((key)=>{ %> - <% if(key != "channelOverrides"){ %> - - - - - <% } %> - <% }); %> -
+
+
+ <% Object.keys(channel.permissions.toObject()).forEach((key)=>{ %> + <% if(key != "channelOverrides"){ %> + + + + + <% } %> + <% }); %> +
+
\ No newline at end of file diff --git a/src/views/partial/channelSettings/settings.ejs b/src/views/partial/channelSettings/settings.ejs index 082eec1..55a9dc3 100644 --- a/src/views/partial/channelSettings/settings.ejs +++ b/src/views/partial/channelSettings/settings.ejs @@ -15,12 +15,14 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see .-->

Channel Preferences:

-
- <% Object.keys(channel.settings).forEach((key) => { %> - - - class="channel-preference-list-item" type="checkbox" <% if(channel.settings[key]){ %> checked <% } %>> - - <% }); %> -
+
+
+ <% Object.keys(channel.settings).forEach((key) => { %> + + + class="channel-preference-list-item" type="checkbox" <% if(channel.settings[key]){ %> checked <% } %>> + + <% }); %> +
+
\ No newline at end of file diff --git a/src/views/partial/channelSettings/userList.ejs b/src/views/partial/channelSettings/userList.ejs index 3360ed3..97beb79 100644 --- a/src/views/partial/channelSettings/userList.ejs +++ b/src/views/partial/channelSettings/userList.ejs @@ -24,13 +24,15 @@ along with this program. If not, see .--> <% }); %> - - - - - - - - -

Img

ID

Name

Rank

+
+ + + + + + + + +

Img

ID

Name

Rank

+
\ No newline at end of file diff --git a/www/css/global.css b/www/css/global.css index 65562a6..8040036 100644 --- a/www/css/global.css +++ b/www/css/global.css @@ -30,10 +30,12 @@ body{ form{ display: flex; flex-direction: column; + padding: 1em; } table{ border-spacing: 0px; + width: 100% } td{ @@ -65,6 +67,10 @@ input.control-prompt{ flex: 1; } +div.dynamic-container{ + overflow: auto; +} + /* Navbar */ #navbar{ display: flex; diff --git a/www/css/theme/movie-night.css b/www/css/theme/movie-night.css index f5300a0..3e2794d 100644 --- a/www/css/theme/movie-night.css +++ b/www/css/theme/movie-night.css @@ -137,16 +137,13 @@ button:active{ background-color: var(--focus0-alt1); } -table, form{ +.dynamic-container{ background-color: var(--bg1); color: var(--accent1); box-shadow: 3px 3px 1px var(--bg1-alt0) inset; border-radius: 1em; } -form{ - padding: 1em; -} tr{ box-shadow: var(--accent1) 0px 1em 1px -2em, var(--accent1) 0px -1em 1px -1em;