KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-12-08 20:48:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Modified rest, and added client-version

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2018-03-12 17:06:47 +01:00
parent 79fa8805b2
commit c21eee838a
17 changed files with 329 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
server/public/assets/js/admin.js
View File

@@ -33,11 +33,15 @@ var Admin = {
if($(".password_protected").prop("checked")) {
$(".change_user_pass").removeClass("hide");
}
if(!Helper.contains($(".playlist-tabs").attr("class").split(" "), "hide")) {
$(".playlist-tabs-loggedIn").removeClass("hide");
$(".playlist-tabs").addClass("hide");
if(!client) {
if(!Helper.contains($(".playlist-tabs").attr("class").split(" "), "hide")) {
$(".playlist-tabs-loggedIn").removeClass("hide");
$(".playlist-tabs").addClass("hide");
}
if($(".tabs").length > 0 && !changing_to_frontpage) {
$('ul.playlist-tabs-loggedIn').tabs('select_tab', $(".playlist-tabs li a.active").attr("href").substring(1));
}
}
if($("#admin-lock").html() != "lock_open"){
$("#admin-lock").addClass("clickable");
$("#admin-lock").html("lock_open");
@@ -49,9 +53,6 @@ var Admin = {
});
}
}
if($(".tabs").length > 0 && !changing_to_frontpage) {
$('ul.playlist-tabs-loggedIn').tabs('select_tab', $(".playlist-tabs li a.active").attr("href").substring(1));
}
},
conf: function(msg) {
@@ -120,18 +121,19 @@ var Admin = {
if(!$(".change_user_pass").hasClass("hide")) {
$(".change_user_pass").addClass("hide");
}
if(!client) {
if(!Helper.contains($(".playlist-tabs-loggedIn").attr("class").split(" "), "hide")) {
$(".playlist-tabs-loggedIn").addClass("hide");
$(".playlist-tabs").removeClass("hide");
}
if(!Helper.contains($(".playlist-tabs-loggedIn").attr("class").split(" "), "hide")) {
$(".playlist-tabs-loggedIn").addClass("hide");
$(".playlist-tabs").removeClass("hide");
}
if($("ul.playlist-tabs-loggedIn .playlist-tab-links.active").attr("href") == "#suggestions" && $(".tabs").length > 0 && !changing_to_frontpage)
{
$('ul.playlist-tabs').tabs('select_tab', 'wrapper');
$('ul.playlist-tabs-loggedIn').tabs('select_tab', 'wrapper');
} else if($(".tabs").length > 0 && !changing_to_frontpage){
$('ul.playlist-tabs').tabs('select_tab', $(".playlist-tabs-loggedIn li a.active").attr("href").substring(1));
if($("ul.playlist-tabs-loggedIn .playlist-tab-links.active").attr("href") == "#suggestions" && $(".tabs").length > 0 && !changing_to_frontpage)
{
$('ul.playlist-tabs').tabs('select_tab', 'wrapper');
$('ul.playlist-tabs-loggedIn').tabs('select_tab', 'wrapper');
} else if($(".tabs").length > 0 && !changing_to_frontpage){
$('ul.playlist-tabs').tabs('select_tab', $(".playlist-tabs-loggedIn li a.active").attr("href").substring(1));
}
}
$("#admin-lock").removeClass("clickable");
$("#password").attr("placeholder", "Enter admin password");

145
server/public/assets/js/channel.js
View File

@@ -1,5 +1,22 @@
var Channel = {
init: function() {
if(client) {
$(".tabs").addClass("hide");
$("#wrapper").removeClass("tabs_height");
$("#wrapper").addClass("client-wrapper");
$(".embed-button-footer").addClass("hide");
$(".skip_next_client").removeClass("hide");
if(!Helper.mobilecheck()) {
$(".skip_next_client").tooltip({
delay: 5,
position: "bottom",
tooltip: "Skip"
});
}
$("#results").addClass("client-results-height");
$(".pagination-results").addClass("client-pagination-height");
$(".control-list").addClass("client-control-list");
}
Admin.display_logged_out();
number_suggested = 0;
var no_socket = true;
@@ -24,11 +41,13 @@ var Channel = {
if(window.location.hostname == "zoff.me" || window.location.hostname == "fb.zoff.me") add = "https://zoff.me";
else add = window.location.hostname;
if(Player !== undefined) Player.stopInterval= false;
if(Player !== undefined && !client) Player.stopInterval= false;
$('ul.playlist-tabs').tabs();
$('ul.playlist-tabs-loggedIn').tabs();
$('ul.chatTabs').tabs();
if(!client) {
$('ul.playlist-tabs').tabs();
$('ul.playlist-tabs-loggedIn').tabs();
$('ul.chatTabs').tabs();
}
$("#settings").sideNav({
menuWidth: 310,
edge: side,
@@ -55,9 +74,17 @@ var Channel = {
$('.collapsible').collapsible({
accordion : true
});
$("#help").modal();
if(!client) {
$("#help").modal();
$("#embed").modal();
} else {
$("#help").remove();
$("#embed").remove();
$(".help-button-footer").remove();
$(".embed-button-footer").remove();
$(".tabs").remove();
}
$("#contact").modal();
$("#embed").modal();
$("#channel-share-modal").modal();
$("#delete_song_alert").modal({
dismissible: false
@@ -122,25 +149,34 @@ var Channel = {
$("#player").css("opacity", "1");
$("#controls").css("opacity", "1");
$(".playlist").css("opacity", "1");
Player.readyLooks();
Playercontrols.initYoutubeControls(Player.player);
Playercontrols.initSlider();
Player.player.setVolume(Crypt.get_volume());
$(".video-container").removeClass("no-opacity");
var codeURL = "https://remote."+window.location.hostname+"/"+id;
$("#code-text").text(id);
$("#code-qr").attr("src", "https://chart.googleapis.com/chart?chs=221x221&cht=qr&choe=UTF-8&chld=L|1&chl="+codeURL);
$("#code-link").attr("href", codeURL);
if(!client) {
Player.readyLooks();
Playercontrols.initYoutubeControls(Player.player);
Playercontrols.initSlider();
Player.player.setVolume(Crypt.get_volume());
$(".video-container").removeClass("no-opacity");
var codeURL = "https://remote."+window.location.hostname+"/"+id;
$("#code-text").text(id);
$("#code-qr").attr("src", "https://chart.googleapis.com/chart?chs=221x221&cht=qr&choe=UTF-8&chld=L|1&chl="+codeURL);
$("#code-link").attr("href", codeURL);
}
}
var shareCodeUrl = window.location.protocol + "//"+window.location.hostname+"/"+chan.toLowerCase();
$("#share-join-qr").attr("src", "https://chart.googleapis.com/chart?chs=221x221&cht=qr&choe=UTF-8&chld=L|1&chl="+shareCodeUrl);
$("#channel-name-join").text(window.location.hostname + "/" + chan.toLowerCase());
if(!client) {
var shareCodeUrl = window.location.protocol + "//client."+window.location.hostname+"/"+chan.toLowerCase();
$("#share-join-qr").attr("src", "https://chart.googleapis.com/chart?chs=221x221&cht=qr&choe=UTF-8&chld=L|1&chl="+shareCodeUrl);
$("#channel-name-join").text("client." + window.location.hostname + "/" + chan.toLowerCase());
} else {
$(".video-container").remove();
$(".offline-panel").remove();
$(".remote-panel").remove();
$(".mobile-remote-panel").remove();
$(".import-panel").remove();
$(".export-panel").remove();
}
if(no_socket || Helper.mobilecheck()){
var add = "";
if(private_channel) add = Crypt.getCookie("_uI") + "_";
socket.emit("list", {version: parseInt(localStorage.getItem("VERSION")), channel: add + chan.toLowerCase(), pass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()), true)});
emit_list();
}
if((!localStorage.getItem("_jSeen") || localStorage.getItem("_jSeen") != "seen") && !Helper.mobilecheck()) {
@@ -184,29 +220,64 @@ var Channel = {
});
}
window.onYouTubeIframeAPIReady = Player.onYouTubeIframeAPIReady;
if(Player.player === "" || Player.player === undefined || Helper.mobilecheck()) Player.loadPlayer();
if(!client) {
window.onYouTubeIframeAPIReady = Player.onYouTubeIframeAPIReady;
if(Player.player === "" || Player.player === undefined || Helper.mobilecheck()) Player.loadPlayer();
}
//}
if(Helper.mobilecheck()) {
Mobile_remote.initiate_volume();
if(!client) {
Mobile_remote.initiate_volume();
}
$(".close-settings").addClass("hide");
} else {
$('input#chan_description').characterCounter();
Channel.window_width_volume_slider();
if(!client) {
Channel.window_width_volume_slider();
}
}
setup_admin_listener();
setup_list_listener();
setup_chat_listener();
get_history();
if(!client) {
setup_chat_listener();
get_history();
//console.log(Crypt.get_userpass(chan.toLowerCase()));
} else {
var c = Crypt.get_userpass(chan.toLowerCase());
$.ajax({
type: "POST",
data: {
userpass: c,
},
url: "/api/list/" + chan.toLowerCase(),
success: function(response) {
if(response.results.length > 0) {
$("#channel-load").remove();
if(response.status == 403) {
start_auth();
}
$("#channel-load").remove();
List.populate_list(response.results);
}
},
error: function(response) {
if(response.responseJSON.status == 403) {
start_auth();
}
$("#channel-load").remove();
//List.populate_list(response.responseJSON.results);
}
});
}
if(!Helper.msieversion() && !Helper.mobilecheck()) Notification.requestPermission();
if(!Helper.msieversion() && !Helper.mobilecheck() && !client) Notification.requestPermission();
$(".search_input").focus();
Helper.sample();
if(!Helper.mobilecheck()) {
if(!Helper.mobilecheck() && !client) {
$('.castButton').tooltip({
delay: 5,
position: "top",
@@ -242,21 +313,21 @@ var Channel = {
$("#embed-area").val(embed_code(embed_autoplay, embed_width, embed_height, color));
$("#search").attr("placeholder", "Find song on YouTube...");
if(!$("footer").hasClass("padding-bottom-novideo")) {
if(!$("footer").hasClass("padding-bottom-novideo") && !client) {
$("footer").addClass("padding-bottom-novideo");
}
if(!/chrom(e|ium)/.test(navigator.userAgent.toLowerCase()) && !Helper.mobilecheck()){
if(!/chrom(e|ium)/.test(navigator.userAgent.toLowerCase()) && !Helper.mobilecheck() && !client){
$(".castButton").css("display", "none");
}
Helper.log(["chromecastAvailable " + chromecastAvailable, "chromecastReady " + chromecastReady]);
if(chromecastAvailable){
if(chromecastAvailable && !client){
hide_native(1);
} else if(chromecastReady) {
} else if(chromecastReady && !client) {
initializeCastApi();
} else {
} else if(!client){
window['__onGCastApiAvailable'] = function(loaded, errorInfo) {
if (loaded) {
setTimeout(function(){
@@ -483,6 +554,10 @@ var Channel = {
if(private_channel) add = Crypt.getCookie("_uI") + "_";
socket.emit("list", {version: parseInt(localStorage.getItem("VERSION")), channel: add + chan.toLowerCase(), pass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()), true)});
} else if(url_split[3] === "") {
if(client) {
var host = window.location.hostname.split(".");
window.location.hostname = host[host.length -1];
}
clearTimeout(timed_remove_check);
changing_to_frontpage = true;
$.contextMenu( 'destroy', ".playlist-element" );

1
server/public/assets/js/embed.js
View File

@@ -3,6 +3,7 @@ var timed_remove_check;
var gotten_np = false;
var song_title = "";
var paused = false;
var client = false;
var startTime = 0;
var player_ready = false;
var list_html = $("#list-song-html").html();

38
server/public/assets/js/functions.js
View File

@@ -136,8 +136,8 @@ function chromecastListener(evt, data) {
}
}
function setup_auth_listener() {
socket.on('auth_required', function() {
function start_auth() {
if(!user_auth_started) {
user_auth_started = true;
$("#player_overlay").removeClass("hide");
$("#player_overlay").css("display", "block");
@@ -145,6 +145,24 @@ function setup_auth_listener() {
Crypt.remove_userpass(chan.toLowerCase());
before_toast();
Materialize.toast("That is not the correct password, try again..", 4000);
}
}
function emit_list() {
var add = "";
if(private_channel) add = Crypt.getCookie("_uI") + "_";
if(socket.id) {
socket.emit("list", {version: parseInt(localStorage.getItem("VERSION")), channel: add + chan.toLowerCase(), pass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()), true)});
} else {
setTimeout(function(){
emit_list();
}, 50);
}
}
function setup_auth_listener() {
socket.on('auth_required', function() {
start_auth();
});
socket.on('auth_accepted', function(msg) {
@@ -232,7 +250,9 @@ function setup_chat_listener(){
}
function setup_list_listener(){
socket.on("color", Player.setBGimage);
//if(!client) {
socket.on("color", Player.setBGimage);
//}
socket.on("channel", List.channel_function);
}
@@ -242,13 +262,17 @@ function setup_playlist_listener(){
}
function setup_host_initialization(){
Helper.log(["Setting up host initialization listener"]);
socket.on("id", Hostcontroller.host_listener);
if(!client) {
Helper.log(["Setting up host initialization listener"]);
socket.on("id", Hostcontroller.host_listener);
}
}
function setup_host_listener(id){
Helper.log(["Setting up host action listener"]);
socket.on(id, Hostcontroller.host_on_action);
if(!client) {
Helper.log(["Setting up host action listener"]);
socket.on(id, Hostcontroller.host_on_action);
}
}
function enable_debug(){

9
server/public/assets/js/list.js
View File

@@ -152,17 +152,20 @@ var List = {
populate_list: function(msg, no_reset) {
// This math is fucked and I don't know how it works. Should be fixed sometime
if(!Helper.mobilecheck() && !embed){
if(!Helper.mobilecheck() && !embed && !client){
List.can_fit = Math.round(($("#wrapper").height()) / 71)+1;
List.element_height = (($("#wrapper").height()) / List.can_fit)-5.3;
} else if(embed) {
List.can_fit = Math.round(($("#wrapper").height()) / 91) + 1;
List.element_height = (($("#wrapper").height()) / List.can_fit)-4;
} else {
} else if(!client){
List.can_fit = Math.round(($(window).height() - $(".tabs").height() - $("header").height() - 64 - 40) / 71)+1;
List.element_height = (($(window).height() - $(".tabs").height() - $("header").height() - 64 - 40) / List.can_fit)-5;
} else {
List.can_fit = Math.round(($(window).height() - $("header").height() - $("#pageButtons").height()) / 80)+1;
List.element_height = (($(window).height() - $("header").height() - $("#pageButtons").height()) / List.can_fit) - 8;
}
if(List.element_height < 55.2){
if(List.element_height < 55.2 && !client){
List.can_fit = List.can_fit - 1;
List.element_height = 55.2;
List.can_fit = Math.round(($(window).height() - $(".tabs").height() - $("header").height() - 64 - 40) / 71);

9
server/public/assets/js/listeners.js
View File

@@ -1,5 +1,10 @@
var chan = window.chan === undefined ? $("#chan").html() : window.chan;
var w_p = true;
var domain = window.location.host.split(".");
var client = false;
if(domain.length > 0 && domain[0] == "client") {
client = true;
}
var hasadmin = 0;
var list_html = $("#list-song-html").html();
var unseen = false;
@@ -866,6 +871,10 @@ $(document).on("click", "#skipbutton_remote", function(e) {
Mobile_remote.skip_remote();
});
$(document).on("click", ".skip_next_client", function(e) {
e.preventDefault();
});
$(document).on("submit", "#remoteform", function(e) {
e.preventDefault();
Mobile_remote.get_input($("#remote_channel").val());

23
server/public/assets/js/player.js
View File

@@ -527,12 +527,13 @@ var Player = {
title = titt;
}
if(window.location.pathname != "/"){
var elem = document.getElementById('song-title');
var getTitleViews = document.getElementById('viewers');
//var elem = document.getElementById('song-title');
//var getTitleViews = document.getElementById('viewers');
elem.innerHTML = title;
getTitleViews.innerHTML = outPutWord + " " + v;
elem.title = title;
$("#song-title").text(title);
$("#viewers").html(outPutWord + " " + v);
$("#song-title").attr("title", title);
//elem.title = title;
if(chromecastAvailable){
$("#player_overlay").css("background", "url(https://img.youtube.com/vi/" + video_id + "/hqdefault.jpg)");
$("#player_overlay").css("background-position", "center");
@@ -622,11 +623,13 @@ var Player = {
if(window.location.pathname != "/" && ((offline && c.only) || (!offline && !c.only) || (!offline && c.only))) {
document.getElementById("main-container").style.backgroundColor = Helper.rgbToHsl(color,true);
$("meta[name=theme-color]").attr("content", Helper.rgbToHex(color[0], color[1], color[2]));
var new_color = Helper.rgbToHex(color[0], color[1], color[2]);
new_color = Helper.hexToComplimentary(new_color);
new_color = Helper.hexToRgb(new_color);
new_color = Helper.rgbToHsl([new_color.r, new_color.g, new_color.b], true);
$("#controls").css("background", new_color);
if(!client) {
var new_color = Helper.rgbToHex(color[0], color[1], color[2]);
new_color = Helper.hexToComplimentary(new_color);
new_color = Helper.hexToRgb(new_color);
new_color = Helper.rgbToHsl([new_color.r, new_color.g, new_color.b], true);
$("#controls").css("background", new_color);
}
}
},