diff --git a/ChangeLog.md b/ChangeLog.md index fc3773c6..d45b80c1 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,4 +1,35 @@ # Changelog: +* **17.02.19** + - Removed WebAssembly as dependency (Now working with MS Edge as well (but without audio)) + - Improved channel tree performance + - Improved touch channel tree hierarchy (not selects the channel which had been actually touched) + - Added the possibility to scroll on the control bar (required for super small devices) + - Improved error handling within the codecs + - Fixed the vertical sliders for touch devices + - Added an effect on slider select/move + - Fixed query visibility setting + - Removed useless client infos for query clients + - Added an auto reconnect system + - Reworked the channel tree selected lines + +* **15.02.19** + - Fixed MS Edge loading/document issues + - Fixed invalid pattern in the yes/no modal + +* **11.02.19** + - Added a detection to the loader to avoid cached files on updates + +* **09.02.19** + - Improved UI now using the material design framework based on bootstrap + - Fixed several UI overflow or small screen issues + - Improved permission editor performance + - Added hash rate to identity improve + - Merged CSS files in release mode + - Fixed overlapping avatars + +* **04.02.19** + - Fixed channel permissions + * **27.01.19** - Made sounds configurable - Added option to mute sounds when output is muted diff --git a/TeaWeb.zip b/TeaWeb.zip deleted file mode 100644 index d6f9b88b..00000000 Binary files a/TeaWeb.zip and /dev/null differ diff --git a/asm/CMakeLists.txt b/asm/CMakeLists.txt index 80959221..9b17feb1 100644 --- a/asm/CMakeLists.txt +++ b/asm/CMakeLists.txt @@ -6,7 +6,7 @@ set(CMAKE_CXX_FLAGS_DEBUG "") #Override some config values from the parent proje set(CMAKE_CXX_COMPILER "emcc") set(CMAKE_C_COMPILER "emcc") set(CMAKE_C_LINK_EXECUTABLE "emcc") -set(CMAKE_CXX_FLAGS "-O2 --llvm-lto 1 --memory-init-file 0 -s WASM=1") #-s ASSERTIONS=2 -s ALLOW_MEMORY_GROWTH=1 -O3 +set(CMAKE_CXX_FLAGS "-O3 --llvm-lto 1 --memory-init-file 0 -s WASM=1 -s ASSERTIONS=1") # -s ALLOW_MEMORY_GROWTH=1 -O3 set(CMAKE_VERBOSE_MAKEFILE ON) set(CMAKE_EXE_LINKER_FLAGS "-s EXTRA_EXPORTED_RUNTIME_METHODS='[\"ccall\", \"cwrap\", \"Pointer_stringify\"]'") # #add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0) @@ -17,9 +17,5 @@ include_directories(libraries/tomcrypt/src/headers) include_directories(libraries/opus/include/) add_definitions(-DLTM_DESC) -#cmake .. -DCMAKE_CXX_COMPILER="emcc" -DCMAKE_C_COMPILER="emcc" -DCMAKE_C_LINK_EXECUTABLE="emcc" -add_executable(TeaWeb-Identity identity/Identity.cpp identity/TeamSpeakIdentity.cpp) -target_link_libraries(TeaWeb-Identity ${CMAKE_CURRENT_SOURCE_DIR}/libraries/tomcrypt/libtomcrypt.a ${CMAKE_CURRENT_SOURCE_DIR}/libraries/tommath/build/libtommathStatic.a) - add_executable(TeaWeb-Worker-Codec-Opus src/opus.cpp) target_link_libraries(TeaWeb-Worker-Codec-Opus ${CMAKE_CURRENT_SOURCE_DIR}/libraries/opus/.libs/libopus.a) diff --git a/asm/identity/INIReader.h b/asm/identity/INIReader.h deleted file mode 100644 index 8a0a999e..00000000 --- a/asm/identity/INIReader.h +++ /dev/null @@ -1,458 +0,0 @@ -// Read an INI file into easy-to-access name/value pairs. - -// inih and INIReader are released under the New BSD license (see LICENSE.txt). -// Go to the project home page for more info: -// -// https://github.com/benhoyt/inih -/* inih -- simple .INI file parser - -inih is released under the New BSD license (see LICENSE.txt). Go to the project -home page for more info: - -https://github.com/benhoyt/inih - -*/ - -#ifndef __INI_H__ -#define __INI_H__ - -/* Make this header file easier to include in C++ code */ -#ifdef __cplusplus -extern "C" { -#endif - -#include - -/* Typedef for prototype of handler function. */ -typedef int (*ini_handler)(void* user, const char* section, - const char* name, const char* value); - -/* Typedef for prototype of fgets-style reader function. */ -typedef char* (*ini_reader)(char* str, int num, void* stream); - -/* Parse given INI-style file. May have [section]s, name=value pairs - (whitespace stripped), and comments starting with ';' (semicolon). Section - is "" if name=value pair parsed before any section heading. name:value - pairs are also supported as a concession to Python's configparser. - - For each name=value pair parsed, call handler function with given user - pointer as well as section, name, and value (data only valid for duration - of handler call). Handler should return nonzero on success, zero on error. - - Returns 0 on success, line number of first error on parse error (doesn't - stop on first error), -1 on file open error, or -2 on memory allocation - error (only when INI_USE_STACK is zero). -*/ -int ini_parse(const char* filename, ini_handler handler, void* user); - -/* Same as ini_parse(), but takes a FILE* instead of filename. This doesn't - close the file when it's finished -- the caller must do that. */ -int ini_parse_file(FILE* file, ini_handler handler, void* user); - -inline int ini_parse_message(const std::string& message, ini_handler handler, void* user); - -/* Same as ini_parse(), but takes an ini_reader function pointer instead of - filename. Used for implementing custom or string-based I/O. */ -int ini_parse_stream(ini_reader reader, void* stream, ini_handler handler, - void* user); - -/* Nonzero to allow multi-line value parsing, in the style of Python's - configparser. If allowed, ini_parse() will call the handler with the same - name for each subsequent line parsed. */ -#ifndef INI_ALLOW_MULTILINE -#define INI_ALLOW_MULTILINE 1 -#endif - -/* Nonzero to allow a UTF-8 BOM sequence (0xEF 0xBB 0xBF) at the start of - the file. See http://code.google.com/p/inih/issues/detail?id=21 */ -#ifndef INI_ALLOW_BOM -#define INI_ALLOW_BOM 1 -#endif - -/* Nonzero to allow inline comments (with valid inline comment characters - specified by INI_INLINE_COMMENT_PREFIXES). Set to 0 to turn off and match - Python 3.2+ configparser behaviour. */ -#ifndef INI_ALLOW_INLINE_COMMENTS -#define INI_ALLOW_INLINE_COMMENTS 1 -#endif -#ifndef INI_INLINE_COMMENT_PREFIXES -#define INI_INLINE_COMMENT_PREFIXES ";" -#endif - -/* Nonzero to use stack, zero to use heap (malloc/free). */ -#ifndef INI_USE_STACK -#define INI_USE_STACK 1 -#endif - -/* Stop parsing on first error (default is to keep parsing). */ -#ifndef INI_STOP_ON_FIRST_ERROR -#define INI_STOP_ON_FIRST_ERROR 0 -#endif - -/* Maximum line length for any line in INI file. */ -#ifndef INI_MAX_LINE -#define INI_MAX_LINE 200 -#endif - -#ifdef __cplusplus -} -#endif - -/* inih -- simple .INI file parser - -inih is released under the New BSD license (see LICENSE.txt). Go to the project -home page for more info: - -https://github.com/benhoyt/inih - -*/ - -#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS) -#define _CRT_SECURE_NO_WARNINGS -#endif - -#include -#include -#include -#include - -#if !INI_USE_STACK -#include -#endif - -#define MAX_SECTION 50 -#define MAX_NAME 50 - -/* Strip whitespace chars off end of given string, in place. Return s. */ -inline static char* rstrip(char* s) -{ - char* p = s + strlen(s); - while (p > s && isspace((unsigned char)(*--p))) - *p = '\0'; - return s; -} - -/* Return pointer to first non-whitespace char in given string. */ -inline static char* lskip(const char* s) -{ - while (*s && isspace((unsigned char)(*s))) - s++; - return (char*)s; -} - -/* Return pointer to first char (of chars) or inline comment in given string, - or pointer to null at end of string if neither found. Inline comment must - be prefixed by a whitespace character to register as a comment. */ -inline static char* find_chars_or_comment(const char* s, const char* chars) -{ -#if INI_ALLOW_INLINE_COMMENTS - int was_space = 0; - while (*s && (!chars || !strchr(chars, *s)) && - !(was_space && strchr(INI_INLINE_COMMENT_PREFIXES, *s))) { - was_space = isspace((unsigned char)(*s)); - s++; - } -#else - while (*s && (!chars || !strchr(chars, *s))) { - s++; - } -#endif - return (char*)s; -} - -/* Version of strncpy that ensures dest (size bytes) is null-terminated. */ -inline static char* strncpy0(char* dest, const char* src, size_t size) -{ - strncpy(dest, src, size); - dest[size - 1] = '\0'; - return dest; -} - -/* See documentation in header file. */ -inline int ini_parse_stream(ini_reader reader, void* stream, ini_handler handler, - void* user) -{ - /* Uses a fair bit of stack (use heap instead if you need to) */ -#if INI_USE_STACK - char line[INI_MAX_LINE]; -#else - char* line; -#endif - char section[MAX_SECTION] = ""; - char prev_name[MAX_NAME] = ""; - - char* start; - char* end; - char* name; - char* value; - int lineno = 0; - int error = 0; - -#if !INI_USE_STACK - line = (char*)malloc(INI_MAX_LINE); - if (!line) { - return -2; - } -#endif - - /* Scan through stream line by line */ - while (reader(line, INI_MAX_LINE, stream) != NULL) { - lineno++; - - start = line; -#if INI_ALLOW_BOM - if (lineno == 1 && (unsigned char)start[0] == 0xEF && - (unsigned char)start[1] == 0xBB && - (unsigned char)start[2] == 0xBF) { - start += 3; - } -#endif - start = lskip(rstrip(start)); - - if (*start == ';' || *start == '#') { - /* Per Python configparser, allow both ; and # comments at the - start of a line */ - } -#if INI_ALLOW_MULTILINE - else if (*prev_name && *start && start > line) { - -#if INI_ALLOW_INLINE_COMMENTS - end = find_chars_or_comment(start, NULL); - if (*end) - *end = '\0'; - rstrip(start); -#endif - - /* Non-blank line with leading whitespace, treat as continuation - of previous name's value (as per Python configparser). */ - if (!handler(user, section, prev_name, start) && !error) - error = lineno; - } -#endif - else if (*start == '[') { - /* A "[section]" line */ - end = find_chars_or_comment(start + 1, "]"); - if (*end == ']') { - *end = '\0'; - strncpy0(section, start + 1, sizeof(section)); - *prev_name = '\0'; - } - else if (!error) { - /* No ']' found on section line */ - error = lineno; - } - } - else if (*start) { - /* Not a comment, must be a name[=:]value pair */ - end = find_chars_or_comment(start, "=:"); - if (*end == '=' || *end == ':') { - *end = '\0'; - name = rstrip(start); - value = lskip(end + 1); -#if INI_ALLOW_INLINE_COMMENTS - end = find_chars_or_comment(value, NULL); - if (*end) - *end = '\0'; -#endif - rstrip(value); - - /* Valid name[=:]value pair found, call handler */ - strncpy0(prev_name, name, sizeof(prev_name)); - if (!handler(user, section, name, value) && !error) - error = lineno; - } - else if (!error) { - /* No '=' or ':' found on name[=:]value line */ - error = lineno; - } - } - -#if INI_STOP_ON_FIRST_ERROR - if (error) - break; -#endif - } - -#if !INI_USE_STACK - free(line); -#endif - - return error; -} - -/* See documentation in header file. */ -inline int ini_parse_file(FILE* file, ini_handler handler, void* user) -{ - return ini_parse_stream((ini_reader)fgets, file, handler, user); -} - -/* See documentation in header file. */ -inline int ini_parse_message(const std::string& message, ini_handler handler, void* user) -{ - std::istringstream stream(message); - return ini_parse_stream((ini_reader) [](char* str, int num, void* ptrStream) { - auto stream = (std::istringstream*) ptrStream; - stream->getline(str, num); - return !!*stream ? str : nullptr; - }, &stream, handler, user); -} - -/* See documentation in header file. */ -inline int ini_parse(const char* filename, ini_handler handler, void* user) -{ - FILE* file; - int error; - - file = fopen(filename, "r"); - if (!file) - return -1; - error = ini_parse_file(file, handler, user); - fclose(file); - return error; -} - -#endif /* __INI_H__ */ - - -#ifndef __INIREADER_H__ -#define __INIREADER_H__ - -#include -#include -#include - -// Read an INI file into easy-to-access name/value pairs. (Note that I've gone -// for simplicity here rather than speed, but it should be pretty decent.) -class INIReader -{ - public: - // Empty Constructor - INIReader() {}; - - // Construct INIReader and parse given filename. See ini.h for more info - // about the parsing. - INIReader(std::string filename, bool raw = false); - - // Return the result of ini_parse(), i.e., 0 on success, line number of - // first error on parse error, or -1 on file open error. - int ParseError() const; - - // Return the list of sections found in ini file - std::set Sections(); - - // Get a string value from INI file, returning default_value if not found. - std::string Get(std::string section, std::string name, - std::string default_value); - - // Get an integer (long) value from INI file, returning default_value if - // not found or not a valid integer (decimal "1234", "-1234", or hex "0x4d2"). - long GetInteger(std::string section, std::string name, long default_value); - - // Get a real (floating point double) value from INI file, returning - // default_value if not found or not a valid floating point value - // according to strtod(). - double GetReal(std::string section, std::string name, double default_value); - - // Get a boolean value from INI file, returning default_value if not found or if - // not a valid true/false value. Valid true values are "true", "yes", "on", "1", - // and valid false values are "false", "no", "off", "0" (not case sensitive). - bool GetBoolean(std::string section, std::string name, bool default_value); - - private: - int _error; - std::map _values; - std::set _sections; - static std::string MakeKey(std::string section, std::string name); - static int ValueHandler(void* user, const char* section, const char* name, - const char* value); -}; - -#endif // __INIREADER_H__ - - -#ifndef __INIREADER__ -#define __INIREADER__ - -#include -#include -#include - -using std::string; - -inline INIReader::INIReader(string data, bool raw) -{ - if(raw) - _error = ini_parse_message(data, ValueHandler, this); - else - _error = ini_parse(data.c_str(), ValueHandler, this); -} - -inline int INIReader::ParseError() const -{ - return _error; -} - -inline std::set INIReader::Sections() -{ - return _sections; -} - -inline string INIReader::Get(string section, string name, string default_value) -{ - string key = MakeKey(section, name); - return _values.count(key) ? _values[key] : default_value; -} - -inline long INIReader::GetInteger(string section, string name, long default_value) -{ - string valstr = Get(section, name, ""); - const char* value = valstr.c_str(); - char* end; - // This parses "1234" (decimal) and also "0x4D2" (hex) - long n = strtol(value, &end, 0); - return end > value ? n : default_value; -} - -inline double INIReader::GetReal(string section, string name, double default_value) -{ - string valstr = Get(section, name, ""); - const char* value = valstr.c_str(); - char* end; - double n = strtod(value, &end); - return end > value ? n : default_value; -} - -inline bool INIReader::GetBoolean(string section, string name, bool default_value) -{ - string valstr = Get(section, name, ""); - // Convert to lower case to make string comparisons case-insensitive - std::transform(valstr.begin(), valstr.end(), valstr.begin(), ::tolower); - if (valstr == "true" || valstr == "yes" || valstr == "on" || valstr == "1") - return true; - else if (valstr == "false" || valstr == "no" || valstr == "off" || valstr == "0") - return false; - else - return default_value; -} - -inline string INIReader::MakeKey(string section, string name) -{ - string key = section + "=" + name; - // Convert to lower case to make section/name lookups case-insensitive - std::transform(key.begin(), key.end(), key.begin(), ::tolower); - return key; -} - -inline int INIReader::ValueHandler(void* user, const char* section, const char* name, - const char* value) -{ - INIReader* reader = (INIReader*)user; - string key = MakeKey(section, name); - if (reader->_values[key].size() > 0) - reader->_values[key] += "\n"; - reader->_values[key] += value; - reader->_sections.insert(section); - return 1; -} - -#endif // __INIREADER__ \ No newline at end of file diff --git a/asm/identity/Identity.cpp b/asm/identity/Identity.cpp deleted file mode 100644 index 0b91dd26..00000000 --- a/asm/identity/Identity.cpp +++ /dev/null @@ -1,283 +0,0 @@ -#include "Identity.h" -#include -#include "base64.h" - -#define SHA_DIGEST_LENGTH 20 -#define ECC_TYPE_INDEX 5 - -static const char *TSKEY = - "b9dfaa7bee6ac57ac7b65f1094a1c155" - "e747327bc2fe5d51c512023fe54a2802" - "01004e90ad1daaae1075d53b7d571c30" - "e063b5a62a4a017bb394833aa0983e6e"; - -using namespace std; - -inline int SHA1(const char* input, size_t length, char* result) { - hash_state ctx = {}; - if (sha1_init(&ctx) != CRYPT_OK) - { return -1; } - if (sha1_process(&ctx, (uint8_t*) input, length) != CRYPT_OK) - { return -1; } - if (sha1_done(&ctx, (uint8_t*) result) != CRYPT_OK) - { return -1; } - return 0; -} - -static int decriptIdentity(char *data, uint32_t length) { - int dataSize = std::min((uint32_t) 100, length); - for (int i = 0; i < dataSize; i++) { - data[i] ^= TSKEY[i]; - } - - char hash[SHA_DIGEST_LENGTH]; - //if(SHA1(data + 20, strlen(data + 20), hash) < 0) return -1; - - hash_state ctx = {}; - if (sha1_init(&ctx) != CRYPT_OK) - { return -1; } - if (sha1_process(&ctx, (uint8_t*)data + 20, strlen(data + 20)) != CRYPT_OK) - { return -1; } - if (sha1_done(&ctx, (uint8_t*)hash) != CRYPT_OK) - { return -1; } - - - for (int i = 0; i < 20; i++) { - data[i] ^= hash[i]; - } - - return 0; -} - -static int encriptIdentity(char *data, uint32_t length) { - char hash[SHA_DIGEST_LENGTH]; - //if(SHA1(data, length, hash) < 0) return -1; - - hash_state ctx; - if (sha1_init(&ctx) != CRYPT_OK) - { return -1; } - if (sha1_process(&ctx, (uint8_t*)data + 20, strlen(data + 20)) != CRYPT_OK) - { return -1; } - if (sha1_done(&ctx, (uint8_t*)hash) != CRYPT_OK) - { return -1; } - - - for (int i = 0; i < 20; i++) { - data[i] ^= hash[i]; - } - - int dataSize = std::min((uint32_t) 100, length); - for (int i = 0; i < dataSize; i++) { - data[i] ^= TSKEY[i]; - } - return 0; -} - -namespace ts { - Identity* Identity::createNew() { - auto result = new Identity(); - - prng_state rndState = {}; - memset(&rndState, 0, sizeof(prng_state)); - int err; - - result->keyPair = new ecc_key; - - //cout << " -> " << find_prng("sprng") << endl; - if((err = ecc_make_key_ex(&rndState, find_prng("sprng"), result->keyPair, <c_ecc_sets[ECC_TYPE_INDEX])) != CRYPT_OK){ - printf("Cant create a new identity (Keygen)\n"); - printf("Message: %s\n", error_to_string(err)); - delete result; - return nullptr; - } - - return result; - } - - Identity* Identity::parse(const std::string& data, std::string& error) { - int vindex = data.find('V'); - if(vindex <= 0) { - error = "Invalid structure"; - return nullptr; - } - - auto slevel = data.substr(0, vindex); - if(slevel.find_first_not_of("0123456789") != std::string::npos) { - error = "Invalid offset (" + slevel + ")"; - return nullptr; - } - mp_int keyOffset{}; - mp_init(&keyOffset); - mp_read_radix(&keyOffset, slevel.data(), 10); - - auto keyData = data.substr(vindex + 1); - keyData = base64::decode(keyData); - if(encriptIdentity(&keyData[0], keyData.length()) < 0) { - error = "Could not decrypt key"; - return nullptr; - } - - auto identity = new Identity(base64::decode(keyData), keyOffset, keyOffset); - if(!identity->keyPair) { - error = "Could not load key"; - delete identity; - return nullptr; - } - printf("X: %s | %s\n", slevel.c_str(), identity->lastValidKeyOffsetString().c_str()); - return identity; - } - - Identity::Identity(const std::string& asnStruct, mp_int keyOffset, mp_int lastCheckedOffset) { - this->keyOffset = keyOffset; - this->lastCheckedOffset = lastCheckedOffset; - importKey(asnStruct); - - mp_init_copy(&this->keyOffset, &keyOffset); - mp_init_copy(&this->lastCheckedOffset, &lastCheckedOffset); - } - - Identity::Identity() { - mp_init_multi(&this->keyOffset, &this->lastCheckedOffset, nullptr); - this->keyPair = nullptr; - } - - Identity::~Identity() { - delete this->keyPair; - this->keyPair = nullptr; - - mp_clear_multi(&this->keyOffset, &this->lastCheckedOffset, nullptr); - } - - void Identity::importKey(std::string asnStruct) { - this->keyPair = new ecc_key; - int err; - if((err = ecc_import_ex((const unsigned char *) asnStruct.data(), asnStruct.length(), this->keyPair, <c_ecc_sets[ECC_TYPE_INDEX])) != CRYPT_OK){ - delete this->keyPair; - this->keyPair = nullptr; - - printf("Cant import identity from asn structure\n"); - printf("Message: %s\n", error_to_string(err)); - return; - } - } - - std::string Identity::exportIdentity() { - std::string data = privateKey(); - decriptIdentity((char *) data.data(), data.length()); - return this->lastValidKeyOffsetString() + "V" + base64_encode(data); - } - - std::string Identity::uid() { - char buffer[SHA_DIGEST_LENGTH]; - auto key = this->publicKey(); - SHA1(key.data(), key.length(), buffer); - return base64::encode(buffer, SHA_DIGEST_LENGTH); - } - - inline string hex(string input, char beg, char end){ - assert(end - beg == 16); - - int len = input.length() * 2; - char output[len]; - int idx = 0; - for(int index = 0; index < input.length(); index++){ - char elm = input[index]; - output[idx++] = static_cast(beg + ((elm >> 4) & 0x0F)); - output[idx++] = static_cast(beg + ((elm & 0x0F) >> 0)); - } - - return string(output, len); - } - - std::string Identity::avatarId() { - return hex(base64::decode(this->uid()), 'a', 'q'); - } - - std::string Identity::publicKey() { - assert(this->keyPair); - - ulong32 bufferLength = 1028; - char buffer[bufferLength]; - ecc_export((unsigned char *) buffer, &bufferLength, PK_PUBLIC, this->keyPair); - - return base64_encode(std::string(buffer, bufferLength)); - } - - std::string Identity::privateKey() { - assert(this->keyPair); - - ulong32 bufferLength = 1028; - char buffer[bufferLength]; - ecc_export((unsigned char *) buffer, &bufferLength, PK_PRIVATE, this->keyPair); - - return base64_encode(std::string(buffer, bufferLength)); - } - - ecc_key& Identity::getPrivateKey() { - return *keyPair; - } - -#define MaxUlongString 20 - - bool Identity::improveSecurityLevel(int target) { - auto publicKey = this->publicKey(); - char hashBuffer[publicKey.length() + MaxUlongString]; - memcpy(hashBuffer, publicKey.data(), publicKey.length()); - - if(mp_cmp(&this->lastCheckedOffset, &this->keyOffset) < 0) - mp_copy(&this->keyOffset, &this->lastCheckedOffset); - int best = getSecurityLevel(hashBuffer, publicKey.length(), this->lastCheckedOffset); - while(true){ - if(best >= target) return true; - - int currentLevel = getSecurityLevel(hashBuffer, publicKey.length(), this->lastCheckedOffset); - if(currentLevel >= best){ - this->keyOffset = this->lastCheckedOffset; - best = currentLevel; - } - mp_add_d(&this->lastCheckedOffset, 1, &this->lastCheckedOffset); - } - } - - int Identity::getSecurityLevel() { - auto length = publicKey().length(); - char hashBuffer[length + MaxUlongString]; - - auto publicKey = this->publicKey(); - memcpy(hashBuffer, publicKey.data(), publicKey.length()); - - return getSecurityLevel(hashBuffer, publicKey.length(), this->keyOffset); - } - - int Identity::getSecurityLevel(char *hashBuffer, size_t keyLength, mp_int offset) { - char numBuffer[MaxUlongString]; - mp_todecimal(&offset, numBuffer); - /* - int numLen = 0; - do { - numBuffer[numLen] = '0' + (offset % 10); - offset /= 10; - numLen++; - } while(offset > 0); - for(int i = 0; i < numLen; i++) - hashBuffer[keyLength + i] = numBuffer[numLen - (i + 1)]; - */ - auto numLen = strlen(numBuffer); - memcpy(&hashBuffer[keyLength], numBuffer, numLen); - - char shaBuffer[SHA_DIGEST_LENGTH]; - SHA1(hashBuffer, keyLength + numLen, shaBuffer); - - //Leading zero bits - int zeroBits = 0; - int i; - for(i = 0; i < SHA_DIGEST_LENGTH; i++) - if(shaBuffer[i] == 0) zeroBits += 8; - else break; - if(i < SHA_DIGEST_LENGTH) - for(int bit = 0; bit < 8; bit++) - if((shaBuffer[i] & (1 << bit)) == 0) zeroBits++; - else break; - return zeroBits; - } -} \ No newline at end of file diff --git a/asm/identity/Identity.h b/asm/identity/Identity.h deleted file mode 100644 index 65633837..00000000 --- a/asm/identity/Identity.h +++ /dev/null @@ -1,59 +0,0 @@ -#pragma once - -#include -#include -#include - -namespace ts { - class Identity { - inline std::string toString(const mp_int& num) { - char buffer[1024]; - mp_todecimal(&num, buffer); - return std::string(buffer); - } - public: - static Identity* createNew(); - static Identity* parse(const std::string&, std::string&); - - Identity(const std::string& asnStruct,mp_int keyOffset,mp_int lastCheckedOffset); - ~Identity(); - - bool valid(){ return keyPair != nullptr; } - - std::string uid(); - std::string avatarId(); - - std::string publicKey(); - std::string privateKey(); - std::string exportIdentity(); - - ecc_key* getKeyPair(){ - return keyPair; - } - - ecc_key& getPrivateKey(); - - bool improveSecurityLevel(int target); - int getSecurityLevel(); - - mp_int lastValidKeyOffset(){ return keyOffset; } - mp_int lastTestedKeyOffset(){ return lastCheckedOffset; } - - std::string lastValidKeyOffsetString(){ - return toString(this->lastValidKeyOffset()); - } - - std::string lastTestedKeyOffsetString(){ - return toString(this->lastTestedKeyOffset()); - } - private: - Identity(); - - int getSecurityLevel(char* hasBuffer, size_t keyLength, mp_int offset); - void importKey(std::string asn1); - - ecc_key* keyPair = nullptr; - mp_int keyOffset; - mp_int lastCheckedOffset; - }; -} \ No newline at end of file diff --git a/asm/identity/TeamSpeakIdentity.cpp b/asm/identity/TeamSpeakIdentity.cpp deleted file mode 100644 index 4080ac59..00000000 --- a/asm/identity/TeamSpeakIdentity.cpp +++ /dev/null @@ -1,136 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include "Identity.h" -#include "base64.h" -#define INI_MAX_LINE 1024 -#include "INIReader.h" - -using namespace emscripten; -using namespace std; -extern "C" { - std::string errorMessage = ""; - - inline const char* cstr(const std::string& message) { - auto buffer = (char*) malloc(message.length() + 1); - cout << "Allocating at " << (void*) buffer << endl; - buffer[message.length()] = '\0'; - memcpy(buffer, message.data(), message.length()); - return buffer; - } - - EMSCRIPTEN_KEEPALIVE - const char* last_error_message() { - return cstr(errorMessage); - }; - - EMSCRIPTEN_KEEPALIVE - void destroy_string(const char* str) { - cout << "Deallocating at " << (void*) str << endl; - if(str) free((void *) str); - }; - - inline void clear_error() { errorMessage = ""; } - - EMSCRIPTEN_KEEPALIVE - int tomcrypt_initialize() { - init_LTM(); - if(register_prng(&sprng_desc) == -1) { - printf("could not setup prng\n"); - return EXIT_FAILURE; - } - if (register_cipher(&rijndael_desc) == -1) { - printf("could not setup rijndael\n"); - return EXIT_FAILURE; - } - cout << "Initialized!" << endl; - return 0; - } - - EMSCRIPTEN_KEEPALIVE - void* parse_identity(const char* input) { - cout << "Got messsage: " << input << endl; - clear_error(); - return ts::Identity::parse(input, errorMessage); - } - - EMSCRIPTEN_KEEPALIVE - void* parse_identity_file(const char* input) { - clear_error(); - INIReader reader(input, true); - if(reader.ParseError() != 0) { - errorMessage = "Could not parse file " + to_string(reader.ParseError()); - return nullptr; - } - auto identity = reader.Get("Identity", "identity", ""); - if(!identity.empty() && identity[0] == '"') - identity = identity.substr(1); - if(!identity.empty() && identity.back() == '"') - identity = identity.substr(0, identity.length() - 1); - if(identity.empty()) { - errorMessage = "Mussing identity value at Identity::identity"; - return nullptr; - } - return ts::Identity::parse(identity, errorMessage); - } - -#define IDENTITIEFY(_ret) \ -auto identity = dynamic_cast((ts::Identity*) ptrIdentity); \ -if(!identity) { \ - errorMessage = "Invalid identity pointer!"; \ - return _ret; \ -} - - - EMSCRIPTEN_KEEPALIVE - void delete_identity(void* ptrIdentity) { - IDENTITIEFY(;); - delete identity; - } - - EMSCRIPTEN_KEEPALIVE - const char* identity_security_level(void* ptrIdentity) { - IDENTITIEFY(""); - return cstr(std::to_string(identity->getSecurityLevel())); - } - - EMSCRIPTEN_KEEPALIVE - const char* identity_export(void* ptrIdentity) { - IDENTITIEFY(""); - return cstr(identity->exportIdentity()); - } - - EMSCRIPTEN_KEEPALIVE - const char* identity_key_public(void* ptrIdentity) { - IDENTITIEFY(""); - return cstr(identity->publicKey()); - } - - EMSCRIPTEN_KEEPALIVE - const char* identity_uid(void* ptrIdentity) { - IDENTITIEFY(""); - return cstr(identity->uid()); - } - - EMSCRIPTEN_KEEPALIVE - const char* identity_sign(void* ptrIdentity, const char* message, int length) { - IDENTITIEFY(""); - - ulong32 bufferLength = 128; - char signBuffer[bufferLength]; - - prng_state rndState = {}; - memset(&rndState, 0, sizeof(prng_state)); - - auto state = ecc_sign_hash((const unsigned char*) message, length, reinterpret_cast(signBuffer), &bufferLength, &rndState, find_prng("sprng"), identity->getKeyPair()); - if(state != CRYPT_OK) { - errorMessage = "Could not sign message (" + std::string(error_to_string(state)) + "|" + std::to_string(state) + ")"; - return ""; - } - - return cstr(base64::encode(signBuffer, bufferLength)); - } -} \ No newline at end of file diff --git a/asm/identity/base64.h b/asm/identity/base64.h deleted file mode 100644 index af8f873c..00000000 --- a/asm/identity/base64.h +++ /dev/null @@ -1,59 +0,0 @@ -#pragma once - -#include -#include -#include - - -namespace base64 { - /** - * Encodes a given string in Base64 - * @param input The input string to Base64-encode - * @param inputSize The size of the input to decode - * @return A Base64-encoded version of the encoded string - */ - inline std::string encode(const char* input, const unsigned long inputSize) { - auto outlen = static_cast(inputSize + (inputSize / 3.0) + 16); - auto outbuf = new unsigned char[outlen]; //Reserve output memory - if(base64_encode((unsigned char*) input, inputSize, outbuf, &outlen) != CRYPT_OK){ - std::cerr << "Invalid input '" << input << "'" << std::endl; - return ""; - } - std::string ret((char*) outbuf, outlen); - delete[] outbuf; - return ret; - } - - /** - * Encodes a given string in Base64 - * @param input The input string to Base64-encode - * @return A Base64-encoded version of the encoded string - */ - inline std::string encode(const std::string& input) { return encode(input.c_str(), input.size()); } - - - /** - * Decodes a Base64-encoded string. - * @param input The input string to decode - * @return A string (binary) that represents the Base64-decoded data of the input - */ - inline std::string decode(const char* input, ulong32 size) { - auto out = new unsigned char[size]; - if(base64_strict_decode((unsigned char*) input, size, out, &size) != CRYPT_OK){ - std::cerr << "Invalid base 64 string '" << input << "'" << std::endl; - return ""; - } - std::string ret((char*) out, size); - delete[] out; - return ret; - } - - /** - * Decodes a Base64-encoded string. - * @param input The input string to decode - * @return A string (binary) that represents the Base64-decoded data of the input - */ - inline std::string decode(const std::string& input) { return decode(input.c_str(), input.size()); } -} -inline std::string base64_encode(const char* input, const unsigned long inputSize) { return base64::encode(input, inputSize); } -inline std::string base64_encode(const std::string& input) { return base64::encode(input.c_str(), input.size()); } \ No newline at end of file diff --git a/asm/make_opus.sh b/asm/make_opus.sh deleted file mode 100755 index 8be8b0ce..00000000 --- a/asm/make_opus.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash - -if ! [ -d generated ]; then - mkdir generated -fi -OPUS_FN="'_free','_malloc','_opus_strerror','_opus_get_version_string','_opus_encoder_get_size','_opus_encoder_init','_opus_encode','_opus_encode_float','_opus_encoder_ctl','_opus_decoder_get_size','_opus_decoder_init','_opus_decode','_opus_decode_float','_opus_decoder_ctl','_opus_packet_get_nb_samples'" -cd libraries/opus/ - -git checkout v1.1.2 -./autogen.sh -emconfigure ./configure --disable-extra-programs --disable-doc --disable-rtcd -emmake make -cd ../../ -emcc -o generated/libopus.js -O3 --memory-init-file 0 --closure 1 -s NO_FILESYSTEM=1 -s MODULARIZE=1 -s EXPORTED_FUNCTIONS="[$OPUS_FN]" libraries/opus/.libs/libopus.a - diff --git a/auth/auth.php b/auth/auth.php index ba880336..2238fee5 100644 --- a/auth/auth.php +++ b/auth/auth.php @@ -242,6 +242,10 @@ } } + function setup_forum_auth() { + getXF(); /* Initialize XF */ + } + if(!$_INCLIDE_ONLY) { $app = getXF(); if(!$app) return; diff --git a/client/css/main.scss b/client/css/static/main.scss similarity index 100% rename from client/css/main.scss rename to client/css/static/main.scss diff --git a/files.php b/files.php index 1e7da7f0..4e1645dc 100644 --- a/files.php +++ b/files.php @@ -37,13 +37,37 @@ "path" => "js/workers/", "local-path" => "./shared/js/workers/" ], - [ /* shared css files */ + [ /* shared developer single css files */ + "type" => "css", + "search-pattern" => "/.*\.css$/", + "build-target" => "dev", + + "path" => "css/", + "local-path" => "./shared/css/" + ], + [ /* shared release css files */ + "type" => "css", + "search-pattern" => "/.*\.css$/", + "build-target" => "rel", + + "path" => "css/", + "local-path" => "./shared/generated/" + ], + [ /* shared release css files */ + "type" => "css", + "search-pattern" => "/.*\.css$/", + "build-target" => "rel", + + "path" => "css/loader/", + "local-path" => "./shared/css/loader/" + ], + [ /* shared release css files */ "type" => "css", "search-pattern" => "/.*\.css$/", "build-target" => "dev|rel", - "path" => "css/", - "local-path" => "./shared/css/" + "path" => "css/theme/", + "local-path" => "./shared/css/theme/" ], [ /* shared sound files */ "type" => "wav", diff --git a/out.d.ts b/out.d.ts deleted file mode 100644 index e69de29b..00000000 diff --git a/package.json b/package.json index 15ec0a76..b0abb3d9 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "dtsgen": "node tools/dtsgen/index.js", "trgen": "node tools/trgen/index.js", "ttsc": "ttsc", + "csso": "csso", "rebuild-structure-web-dev": "php files.php generate web dev" }, "author": "TeaSpeak (WolverinDEV)", @@ -22,6 +23,7 @@ "@types/node": "^9.4.6", "@types/sha256": "^0.2.0", "@types/websocket": "0.0.38", + "csso-cli": "^2.0.2", "electron": "^3.0.2", "gulp": "^3.9.1", "sass": "^1.14.1", @@ -37,5 +39,8 @@ "bugs": { "url": "https://github.com/TeaSpeak/TeaWeb/issues" }, - "homepage": "https://www.teaspeak.de" + "homepage": "https://www.teaspeak.de", + "dependencies": { + "clean-css": "^4.2.1" + } } diff --git a/scripts/build_declarations.sh b/scripts/build_declarations.sh index 23700fdb..afbc292e 100755 --- a/scripts/build_declarations.sh +++ b/scripts/build_declarations.sh @@ -5,8 +5,8 @@ source "${BASEDIR}/resolve_commands.sh" cd "$BASEDIR/../" function generate_link() { - if [ ! -L $2 ] || [ "${BASH_ARGV[0]}" == "force" ]; then - if [ -e $2 ] || [ -L $2 ]; then + if [[ ! -L $2 ]] || [[ "${BASH_ARGV[0]}" == "force" ]]; then + if [[ -e $2 ]] || [[ -L $2 ]]; then rm $2 fi ln -rs $1 $2 @@ -42,9 +42,9 @@ echo "Generated shared declarations" #Now build the merged declaration for the shared project #Link the declaration files (All interface declarations should be equal!) -if [ ! -d shared/declarations ]; then +if [[ ! -d shared/declarations ]]; then mkdir shared/declarations - if [ $? -ne 0 ]; then + if [[ $? -ne 0 ]]; then echo "Failed to create directory shared/declarations" exit 1 fi diff --git a/scripts/deploy_ui_files.sh b/scripts/deploy_ui_files.sh index 8284cd25..45cd70b2 100755 --- a/scripts/deploy_ui_files.sh +++ b/scripts/deploy_ui_files.sh @@ -8,26 +8,26 @@ TMP_DIR_NAME="tmp" BASEDIR=$(dirname "$0") cd "$BASEDIR/../" -if [ "$#" -ne 3 ]; then +if [[ "$#" -ne 3 ]]; then echo "Illegal number of parameters (url | channel | required version)" exit 1 fi -if [ ! -d client-api/environment/ui-files/ ]; then +if [[ ! -d client&&pi/environment/ui-files/ ]]; then echo "Missing UI Files" exit 1 fi -if [ "${teaclient_deploy_secret}" == "" ]; then +if [[ "${teaclient_deploy_secret}" == "" ]]; then echo "Missing deploy secret!" exit 1 fi -if [ -e "${TMP_FILE_NAME}" ]; then +if [[ -e "${TMP_FILE_NAME}" ]]; then echo "Temp file already exists!" echo "Deleting it!" rm ${TMP_FILE_NAME} - if [ $? -ne 0 ]; then + if [[ $? -ne 0 ]]; then echo "Failed to delete file" exit 1 fi @@ -39,9 +39,9 @@ echo "Git hash ${GIT_HASH} on version ${APPLICATION_VERSION} on channel $2" #Packaging the app cd client-api/environment/ui-files/ -if [ -e ${TMP_DIR_NAME} ]; then +if [[ -e ${TMP_DIR_NAME} ]]; then rm -r ${TMP_DIR_NAME} - if [ $? -ne 0 ]; then + if [[ $? -ne 0 ]]; then echo "Failed to remove temporary directory!" exit 1 fi @@ -52,7 +52,7 @@ for file in $(find ${TMP_DIR_NAME} -name '*.php'); do echo "Evaluating php file $file" RESULT=$(php "${file}" 2> /dev/null) CODE=$? - if [ ${CODE} -ne 0 ]; then + if [[ ${CODE} -ne 0 ]]; then echo "Failed to evaluate php file $file!" echo "Return code $CODE" exit 1 @@ -63,7 +63,7 @@ done cd ${TMP_DIR_NAME} tar chvzf ${TMP_FILE_NAME} * -if [ $? -ne 0 ]; then +if [[ $? -ne 0 ]]; then echo "Failed to pack file" exit 1 fi @@ -87,9 +87,9 @@ RESP=$(curl \ echo "$RESP" SUCCESS=$(echo ${RESP} | python -c "import sys, json; print(json.load(sys.stdin)['success'])") -if [ ! "${SUCCESS}" == "True" ]; then +if [[ ! "${SUCCESS}" == "True" ]]; then ERROR=$(echo ${RESP} | python -c "import sys, json; print(json.load(sys.stdin)['error'])" 2>/dev/null) - if [ $? -ne 0 ]; then + if [[ $? -ne 0 ]]; then ERROR=$(echo ${RESP} | python -c "import sys, json; print(json.load(sys.stdin)['msg'])" 2>/dev/null) fi echo "Failed to deploy build!" diff --git a/scripts/git_index.sh b/scripts/git_index.sh index 781e6b55..7c4a963f 100755 --- a/scripts/git_index.sh +++ b/scripts/git_index.sh @@ -1,25 +1,25 @@ #!/usr/bin/env bash response=$(git diff-index HEAD -- . ':!asm/libraries/' ':!package-lock.json' ':!vendor/') -if [ "$response" != "" ]; then - if [ "$1" == "sort-tag" ]; then +if [[ "$response" != "" ]]; then + if [[ "$1" == "sort-tag" ]]; then echo "0000000" fi - if [ "$1" == "name" ]; then + if [[ "$1" == "name" ]]; then echo "custom build" fi - if [ "$1" == "file-name" ]; then + if [[ "$1" == "file-name" ]]; then echo "custom" fi exit 1 else - if [ "$1" == "sort-tag" ]; then + if [[ "$1" == "sort-tag" ]]; then echo "$(git rev-parse --short HEAD)" fi - if [ "$1" == "name" ]; then + if [[ "$1" == "name" ]]; then echo "$(git rev-parse --short HEAD)" fi - if [ "$1" == "file-name" ]; then + if [[ "$1" == "file-name" ]]; then echo "$(git rev-parse --short HEAD)" fi exit 0 diff --git a/scripts/resolve_commands.sh b/scripts/resolve_commands.sh index 9e69e802..280ba780 100755 --- a/scripts/resolve_commands.sh +++ b/scripts/resolve_commands.sh @@ -13,11 +13,11 @@ function execute_npm_command() { command_variable="command_$command_name" #echo "Variable names $command_variable" - if [ "${!command_variable}" == "" ]; then + if [[ "${!command_variable}" == "" ]]; then node_bin=$(npm bin) #echo "Node root ${node_bin}" - if [ ! -e "${node_bin}/${command_name}" ]; then + if [[ ! -e "${node_bin}/${command_name}" ]]; then echo "Could not find \"$command_name\" command" echo "May type npm install" exit 1 diff --git a/scripts/web_build.sh b/scripts/web_build.sh index 116839ea..f06d1336 100755 --- a/scripts/web_build.sh +++ b/scripts/web_build.sh @@ -1,17 +1,17 @@ #!/usr/bin/env bash +source `dirname $0`/resolve_commands.sh BASEDIR=$(dirname "$0") cd "$BASEDIR/../" -source ./scripts/resolve_commands.sh -if [ "$1" == "development" ] || [ "$1" == "dev" ]; then +if [[ "$1" == "development" ]] || [[ "$1" == "dev" ]]; then source_path="web/environment/development" type="development" -elif [ "$1" == "release" ] || [ "$1" == "rel" ]; then +elif [[ "$1" == "release" ]] || [[ "$1" == "rel" ]]; then source_path="web/environment/release" type="release" else - if [ $# -lt 1 ]; then + if [[ $# -lt 1 ]]; then echo "Invalid argument count!" else echo "Invalid option $1" @@ -22,14 +22,14 @@ fi echo "Generating style files" npm run compile-sass -if [ $? -ne 0 ]; then +if [[ $? -ne 0 ]]; then echo "Failed to generate style files" exit 1 fi echo "Generating web workers" npm run build-worker -if [ $? -ne 0 ]; then +if [[ $? -ne 0 ]]; then echo "Failed to build web workers" exit 1 fi @@ -37,7 +37,7 @@ fi #Lets build some tools #dtsgen should be already build by build_declarations.sh ./tools/build_trgen.sh -if [ $? -ne 0 ]; then +if [[ $? -ne 0 ]]; then echo "Failed to build typescript translation generator" exit 1 fi @@ -45,16 +45,16 @@ fi #Now lets build the declarations echo "Building declarations" ./scripts/build_declarations.sh -if [ $? -ne 0 ]; then +if [[ $? -ne 0 ]]; then echo "Failed to generate declarations" exit 1 fi -if [ "$type" == "release" ]; then #Compile everything for release mode +if [[ "$type" == "release" ]]; then #Compile everything for release mode #Compile the shared source first echo "Building shared source" ./shared/generate_packed.sh - if [ $? -ne 0 ]; then + if [[ $? -ne 0 ]]; then echo "Failed to build shared source" exit 1 fi @@ -62,21 +62,21 @@ if [ "$type" == "release" ]; then #Compile everything for release mode #Now compile the web client itself echo "Building web client" ./web/generate_packed.sh - if [ $? -ne 0 ]; then + if [[ $? -ne 0 ]]; then echo "Failed to build web client" exit 1 fi -elif [ "$type" == "development" ]; then +elif [[ "$type" == "development" ]]; then echo "Building shared source" execute_ttsc -p ./shared/tsconfig/tsconfig.json - if [ $? -ne 0 ]; then + if [[ $? -ne 0 ]]; then echo "Failed to compile shared sources" exit 1 fi echo "Building web client source" execute_ttsc -p ./web/tsconfig/tsconfig.json - if [ $? -ne 0 ]; then + if [[ $? -ne 0 ]]; then echo "Failed to compile web sources" exit 1 fi @@ -84,7 +84,7 @@ fi echo "Generating environment" php files.php generate web ${type} -if [ $? -ne 0 ]; then +if [[ $? -ne 0 ]]; then echo "Failed to generate environment" exit 1 fi diff --git a/scripts/web_package.sh b/scripts/web_package.sh index d34a7822..18c49d1c 100755 --- a/scripts/web_package.sh +++ b/scripts/web_package.sh @@ -3,14 +3,14 @@ BASEDIR=$(dirname "$0") cd "$BASEDIR/../" -if [ "$1" == "development" ] || [ "$1" == "dev" ]; then +if [[ "$1" == "development" ]] || [[ "$1" == "dev" ]]; then source_path="web/environment/development" type="development" -elif [ "$1" == "release" ] || [ "$1" == "rel" ]; then +elif [[ "$1" == "release" ]] || [[ "$1" == "rel" ]]; then source_path="web/environment/release" type="release" else - if [ $# -lt 1 ]; then + if [[ $# -lt 1 ]]; then echo "Invalid argument count!" else echo "Invalid option $1" @@ -19,14 +19,14 @@ else exit 1 fi -if [ ! -d "$source_path" ]; then +if [[ ! -d "$source_path" ]]; then echo "Could not find environment! ($source_path)" echo "Please generate it first!" exit 1 fi response=$(git diff-index HEAD -- . ':!asm/libraries/' ':!package-lock.json' ':!vendor/') -if [ "$response" != "" ]; then +if [[ "$response" != "" ]]; then echo "You're using a private modified build!" echo "Cant assign git hash!" NAME="TeaWeb.zip" @@ -34,7 +34,7 @@ else NAME="TeaWeb-$(git rev-parse --short HEAD).zip" fi -if [ -e ${NAME} ]; then +if [[ -e ${NAME} ]]; then echo "Found old file. Deleting it." rm -r ${NAME} fi @@ -43,7 +43,7 @@ current_path=$(pwd) cd "$source_path" zip -9 -r ${NAME} * -if [ $? -ne 0 ]; then +if [[ $? -ne 0 ]]; then echo "Failed to package environment!" exit 1 fi diff --git a/shared/css/general.scss b/shared/css/general.scss deleted file mode 100644 index 2c2120aa..00000000 --- a/shared/css/general.scss +++ /dev/null @@ -1,396 +0,0 @@ -*, -*::before, -*::after { - box-sizing: border-box; -} - -.align_row { - display: flex; - flex-direction: row; -} - -.align_column { - display: flex; - flex-direction: column; -} - -.icon_loading { - border: 2px solid #f3f3f3; /* Light grey */ - border-top: 2px solid #3498db; /* Blue */ - border-radius: 50%; - animation: spin 2s linear infinite; - - width: 14px!important; - height: 14px!important; -} - -.avatar_loading { - border: 2px solid #f3f3f3; /* Light grey */ - border-top: 2px solid #3498db; /* Blue */ - border-radius: 50%; - animation: spin 2s linear infinite; - - width: 14px!important; - height: 14px!important; -} - -@keyframes spin { - 0% { transform: rotate(0deg); } - 100% { transform: rotate(360deg); } -} - -.select_info { - font-family: Arial; - font-size: 12px; - /*white-space: pre;*/ - line-height: 1; - height: 100%; - display: flex; - flex-direction: column; -} - -/* The Modal (background) */ -.modal { - display: none; /* Hidden by default */ - position: fixed; /* Stay in place */ - z-index: 1; /* Sit on top */ - left: 0; - top: 0; - width: 100%; /* Full width */ - height: 100%; /* Full height */ - overflow: auto; /* Enable scroll if needed */ - background-color: rgb(0,0,0); /* Fallback color */ - background-color: rgba(0,0,0,0.4); /* Black w/ opacity */ -} - -/* Modal Header */ -.modal-header { - padding: 2px 16px; - min-height: 30px; - vertical-align: middle; - display: flex; - align-items: center; - - border: grey solid; - border-width: 0 0 1px 0; - - background-color: lightgreen; -} - -/* Modal Body */ -.modal-body:not(:empty) { - display: flex; - padding: 2px 16px; - flex-grow: 1; - flex-direction: column; - justify-content: stretch; -} - -/* Modal Footer */ -.modal-footer:not(:empty) { - padding: 2px 16px; -} - -/* The Close Button */ -.close { - color: #aaa; - float: right; - font-size: 28px; - font-weight: bold; - position: absolute; - top: 0px; - right: 4px; -} - -.close:hover, -.close:focus { - color: black; - text-decoration: none; - cursor: pointer; -} - -/* Modal Content */ -.modal-content:not(:empty) { - position: absolute; - display: inline-flex; - flex-direction: column; - justify-content: stretch; - background-color: #fefefe; - margin: auto; - padding: 0; - border: 2px solid #888; - width: auto; - max-width: 90%; - box-shadow: 0 4px 15px 0 rgba(0,0,0,0.2), 2px 6px 20px 0 rgba(0,0,0,0.19); - animation-name: modalFlyIn; - animation-duration: 0.4s; - top: 10%; - max-height: 80%; - - left: 0; - right: 0; -} - -/* Add Animation */ -@keyframes modalFlyIn { - from {top: 0%; opacity: 0} - to {top: 10%; opacity: 1} -} - -.channel_perm_tbl input { - width: 30px; -} - -.channel_perm_tbl .key { - width: 120px; -} - -.channel_general_properties .value { - width: 100%; -} - -html { - background-color: gray; -} - -fieldset { - border: unset; - display: unset; -} - -.modal-head-error { - background: darkred; - - font-family: Arial; - font-size: 15px; - font-weight: bold; - - vertical-align: middle; -} - -.modal-button-group { - -} - -.modal-button-group button { - width: 100px; - margin-right: 5px; - margin-left: 5px; -} - -.modal-button-group button:last-of-type { - margin-right: 0px; -} - -.invalid_input { - border-color: red; -} - -.GroupBox { - border: gray solid; - border-width: 2px; - border-radius: 0px 6px 6px 6px; -} - -.vad_vad_bar { - position: relative; - width: 100%; - height: 20px; -} - -.vad_vad_bar .vad_vad_bar_filler { - background-color: green; - width: 50%; - height: 100%; -} - -/* The slider itself */ -.vad_vad_slider { - margin: 0px; - background-color: gray; - -webkit-appearance: none; /* Override default CSS styles */ - appearance: none; - width: 100%; - height: 100%; - outline: none; - opacity: 0.7; /* Set transparency (for mouse-over effects on hover) */ - -webkit-transition: .2s; /* 0.2 seconds transition on hover */ - transition: opacity .2s; -} - -/* The slider handle (use -webkit- (Chrome, Opera, Safari, Edge) and -moz- (Firefox) to override default look) */ -.vad_vad_slider::-webkit-slider-thumb { - -webkit-appearance: none; /* Override default look */ - appearance: none; - width: 2px; /* Set a specific slider handle width */ - height: 20px; /* Slider handle height */ - background: #000000; /* Green background */ - cursor: pointer; /* Cursor on hover */ -} - -.vad_vad_slider::-moz-range-thumb { - width: 2px; /* Set a specific slider handle width */ - height: 100%; /* Slider handle height */ - background: #000000; /* Green background */ - cursor: pointer; /* Cursor on hover */ -} - -code { - background-color: lightgray; - padding: 2px; -} - -footer { - position: fixed; - width: 100%; - bottom: 0px; - left: 0px; - right: 0px; - height: 25px; - background-color: lightgray; - - display: flex; -} - -footer .container { - width: 100%; - display: flex; - position: relative; - vertical-align: center; - justify-content: center; -} - -$separator_thickness: 4px; -.app { - .container-app-main { - display: flex; - flex-direction: row; - justify-content: stretch; - - height: 100%; - width: 100%; - - - border: $separator_thickness solid lightgray; - border-top-width: 0; - } - - .container-control-bar { - height: 45px; - width: 100%; - border-radius: 2px 0 0 0; - border-bottom-width: 0; - background-color: lightgrey; - - display: flex; - flex-direction: column; - justify-content: center; - } - - .container-channel-chat { - min-width: 100px; - width: 60%; - - display: flex; - flex-direction: column; - justify-content: stretch; - - .container-channel { - background: white; - - display: flex; - justify-content: stretch; - height: calc(100% - 250px); - min-height: 100px; - - /* - overflow: auto; - overflow-x: visible; - */ - overflow: hidden; - overflow-y: auto; - } - - .container-chat { - background: white; - - display: flex; - flex-direction: column; - justify-content: stretch; - - //max-height: 400px; - height: 250px; - min-height: 100px; - } - } - - .container-info { - background: white; - - min-width: 100px; - width: 40%; - - display: flex; - flex-direction: row; - justify-content: stretch; - } -} - -.container-seperator { - background: lightgray; - flex-grow: 0; - flex-shrink: 0; - - &.horizontal { - height: $separator_thickness; - width: 100%; - - cursor: row-resize; - } - - &.vertical { - width: $separator_thickness; - height: 100%; - - cursor: col-resize; - } -} - -#mouse-move { - display: none; - position: absolute; - z-index: 10000; - - .container { - position: relative; - display: block; - - border: 2px solid gray; - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; - } -} - -html, body { - min-height: 500px; - min-width: 500px; - overflow: hidden; -} - -.icon-playlist-manage { - display: inline-block; - width: 32px; - height: 32px; - - background: url('../img/music/playlist.svg') no-repeat; - background-position: -11px -9px; - background-size: 50px; -} - -x-content { - flex-grow: 1; - flex-shrink: 1; - display: flex; - flex-direction: column; -} \ No newline at end of file diff --git a/shared/css/loader.scss b/shared/css/loader/loader.scss similarity index 100% rename from shared/css/loader.scss rename to shared/css/loader/loader.scss diff --git a/shared/css/modal-bancreate.scss b/shared/css/modal-bancreate.scss deleted file mode 100644 index c6f67565..00000000 --- a/shared/css/modal-bancreate.scss +++ /dev/null @@ -1,73 +0,0 @@ -.bancreate { - display: flex; - flex-direction: column; - - .frame-container { - display: flex; - flex-direction: column; - - .container { - display: block; - flex-shrink: 0; - flex-grow: 0; - - a { - display: block; - } - - input, textarea { - width: 100%; - } - - textarea { - resize: vertical; - max-height: 100%; - overflow-y: auto; - } - - &:not(:first-of-type) { - margin-top: 5px; - } - - &.container-reason { - max-height: 500px; - display: flex; - flex-direction: column; - } - - .container-name-type { - display: flex; - flex-direction: row; - justify-content: space-between; - margin-top: 2px; - - * { - display: inline-block; - } - } - - .container-time-input { - display: flex; - flex-direction: row; - justify-content: stretch; - } - } - - .footer { - display: flex; - flex-direction: row; - justify-content: space-between; - - .container-global { - display: inline-block; - - .input-global { - vertical-align: bottom; - } - } - .container-buttons { - display: inline-block; - } - } - } -} \ No newline at end of file diff --git a/shared/css/modal-banlist.scss b/shared/css/modal-banlist.scss deleted file mode 100644 index 70e70c4e..00000000 --- a/shared/css/modal-banlist.scss +++ /dev/null @@ -1,164 +0,0 @@ -.banlist { - display: flex; - flex-direction: column; - justify-content: stretch; - flex-grow: 1; - - height: 100%; - width: 100%; - - .frame-container { - display: flex; - flex-direction: column; - justify-content: stretch; - flex-grow: 1; - - .top-menu { - display: flex; - flex-direction: row; - justify-content: stretch; - flex-grow: 0; - flex-shrink: 0; - margin-bottom: 5px; - - .manage-buttons { - flex-grow: 0; - flex-shrink: 0; - - margin-right: 5px; - } - - .search { - flex-grow: 1; - - input { - width: 100%; - } - } - } - - .entry-container { - display: inline-flex; - flex-grow: 1; - margin-bottom: 5px; - position: relative; - - width: 100%; - height: 100%; - - .table-container { - width: 100%; - } - - .ban-entry.selected { - background: blue; - } - - .ban-entry-global { - color: red; - } - - .ban-entry { - .field-properties { - a { - display: block; - } - } - .field-reason { - word-wrap: break-word; - white-space: pre-wrap; - } - - &.ban-entry-own-bold { - font-weight: bold; - } - } - - table { - border: grey solid 1px; - - display: block; - width: 100%; - height: 100%; - text-align: left; - min-width: 610px; - - tr { - td, th { - text-align: center; - vertical-align: top; - - &:nth-child(1) { - width: 25%; - text-align: left; - } - &:nth-child(2) { - width: 25%; - float: left; - } - &:nth-child(3) { - width: 25%; - float: left; - } - &:nth-child(4) { - width: 25%; - float: left; - } - } - } - - th { - border: grey solid; - border-width: 0 0 1px 1px; - - &:first-of-type { - border-width: 0 0 1px 0; - } - } - - tbody { - height: calc(100% - 22px); - overflow-y: auto; - overflow-x: hidden; - } - th, td, thead,tbody { - display: block; - } - tr { - display: inline-block; - width: 100%; - - &:nth-of-type(even) { - background-color: lightgray; - } - } - td,th { - float: left; - } - } - } - - .bottom-menu { - display: flex; - flex-direction: row; - justify-content: space-between; - flex-grow: 0; - flex-shrink: 0; - margin-bottom: 5px; - - .left { - display: flex; - flex-direction: row; - - div { - margin-left: 2px; - margin-right: 2px; - } - } - - input { - vertical-align: bottom; - } - } - } -} \ No newline at end of file diff --git a/shared/css/modal-connect.scss b/shared/css/modal-connect.scss deleted file mode 100644 index fa0c55b8..00000000 --- a/shared/css/modal-connect.scss +++ /dev/null @@ -1,30 +0,0 @@ -.modal .modal-connect { - margin-top: 5px; - - > div:not(:first-of-type) { - margin-top: 5px; - } - - .profile-select-container { - display: flex; - flex-direction: row; - justify-content: space-between; - - select { - width: 150px; - } - } - - .profile-invalid { - display: flex; - flex-direction: column; - justify-content: start; - - > div { - display: inline-flex; - flex-direction: row; - } - - color: red; - } -} \ No newline at end of file diff --git a/shared/css/modal-playlist.scss b/shared/css/modal-playlist.scss deleted file mode 100644 index 66691cfa..00000000 --- a/shared/css/modal-playlist.scss +++ /dev/null @@ -1,460 +0,0 @@ - -.playlist-management { - height: 100%; - display: flex; - flex-direction: column; - - .container { - display: flex; - flex-direction: column; - justify-content: stretch; - - .header, .footer { - flex-grow: 0; - flex-shrink: 0; - } - - .header { - display: flex; - flex-direction: row; - justify-content: stretch; - - .buttons { - flex-grow: 0; - } - - .search { - margin-left: 5px; - flex-grow: 1; - - input { - width: 100%; - } - } - } - - .playlist-list { - margin-top: 5px; - - display: flex; - flex-grow: 1; - flex-direction: column; - justify-content: stretch; - - $width_id: 80px; - $width_type: 150px; - $width_used: 40px; - .column { - &.column-id { - width: 80px; - text-align: center; - } - - &.column-title { - width: calc(50% - 95px - 40px); - } - - &.column-creator { - width: calc(50% - 95px - 40px); - text-align: center; - } - - &.column-type { - width: 150px; - flex-grow: 0; - text-align: center; - } - - &.column-used { - width: 40px; - flex-grow: 0; - text-align: center; - - - display: flex; - flex-direction: row; - justify-content: center; - align-self: center; - } - } - - .playlist-list-header { - flex-grow: 0; - flex-shrink: 0; - display: flex; - flex-direction: row; - height: 20px; - - .column { - border: 1px solid lightgray; - text-align: center; - } - } - - .playlist-list-entries-container { - flex-grow: 1; - display: flex; - flex-direction: column; - justify-content: start; - overflow-y: auto; - min-height: 250px; - - .entry { - display: flex; - flex-direction: row; - - .column { - margin-left: 2px; - } - - cursor: pointer; - - &.selected { - background-color: blue; - } - - &.highlighted { - font-weight: bold; - } - } - - &.scrollbar { - .column-title { - width: calc(50% - 95px - 40px + 30px) - } - - .column-creator { - width: calc(50% - 95px - 40px + 30px) - } - } - } - } - - .footer { - margin-top: 5px; - display: flex; - flex-direction: row; - justify-content: space-between; - - .buttons { - display: flex; - flex-direction: row; - justify-content: stretch; - - .highlight-own { - display: flex; - flex-direction: row; - justify-content: stretch; - - margin-right: 10px; - align-self: center; - } - } - } - } -} - -.playlist-edit { - display: flex; - flex-direction: column; - justify-content: stretch; - - .container { - display: flex; - flex-direction: column; - /* justify-content: stretch; */ - - .tab-content { - padding: 0; /* override tab-content setting */ - } - - .general-properties, .playback-properties { - padding: 5px; - width: 100%; - display: flex; - - flex-direction: column; - - .property { - display: flex; - flex-direction: row; - margin-bottom: 5px; - - .key { - width: 150px; - flex-grow: 0; - } - - .value { - flex-grow: 1; - flex-shrink: 1; - } - - .checkbox-container { - input { - margin-left: 0; - } - } - - &.property-description { - textarea { - resize: vertical; - max-height: 400px; - } - } - } - - flex-shrink: 0; - flex-grow: 0; - } - - .playback-properties { - .property .key { - width: 175px; - } - } - - .container-permissions { - padding: 5px; - display: flex; - flex-direction: row; - justify-content: space-around; - - .permissions-list { - display: flex; - flex-direction: column; - - .permission { - display: flex; - flex-direction: row; - margin-bottom: 5px; - - .key { - width: 150px; - flex-grow: 0; - } - - .value { - flex-grow: 1; - flex-shrink: 1; - } - } - } - } - - .container-no-permissions { - background: lightgray; - padding: 50px; - text-align: center; - } - - .tab-content, x-content { - overflow-y: hidden; - display: flex; - flex-direction: column; - } - - .container-songs { - display: flex; - flex-direction: column; - padding: 5px; - - .song-list { - min-height: 300px; - - margin-top: 5px; - - display: flex; - flex-grow: 1; - flex-direction: column; - justify-content: stretch; - - .column { - &.column-id { - width: 50px; - } - - &.column-url { - width: calc(100% - 140px) - } - - &.column-loaded { - width: 50px; - flex-grow: 0; - - display: flex; - justify-content: center; - flex-direction: row; - } - - &.column-buttons { - width: 40px; - flex-grow: 0; - - display: flex; - justify-content: center; - flex-direction: row; - - .button { - display: flex; - flex-direction: column; - justify-content: center; - - &:hover { - background: #00000033; - } - } - } - } - - .song-list-header { - flex-grow: 0; - flex-shrink: 0; - display: flex; - flex-direction: row; - justify-content: center; - height: 20px; - - - .column { - border: 1px solid lightgray; - text-align: center; - } - } - - .song-list-entries-container { - flex-grow: 1; - display: flex; - flex-direction: column; - justify-content: start; - overflow-y: auto; - min-height: 250px; - - .entry { - display: flex; - flex-direction: row; - - .column { - margin-left: 2px; - } - - cursor: pointer; - - &.selected { - background-color: blue; - } - - &.playing { - background-color: lightgreen; - } - } - - &.scrollbar { - &.column-url { - width: calc(100% - 140px + 30px) - } - } - } - } - - .footer { - display: flex; - flex-direction: row; - justify-content: space-between; - align-items: center; - - flex-grow: 0; - flex-shrink: 0; - margin-top: 5px; - } - } - - > .buttons { - margin-top: 5px; - align-self: flex-end; - - button { - width: 100px; - } - } - } -} - -.container-song-info { - display: flex; - flex-shrink: 1; - flex-direction: column; - - .properties { - display: flex; - flex-direction: column; - padding-bottom: 5px; - - .property { - display: flex; - flex-direction: row; - justify-content: stretch; - flex-shrink: 0; - - .key { - width: 150px; - flex-grow: 0; - } - - .value { - flex-grow: 1; - } - - &.property-metadata-raw { - flex-direction: column; - flex-shrink: 1; - margin-top: 5px; - - .line { - width: 100%; - display: flex; - flex-direction: row; - justify-content: stretch; - flex-shrink: 0; - } - - textarea { - margin-top: 5px; - - width: 100%; - max-height: 100%; - resize: vertical; - } - } - } - } -} - -.container-song-add { - display: flex; - flex-shrink: 1; - flex-direction: column; - - .properties { - display: flex; - flex-direction: column; - padding-bottom: 5px; - - .property { - margin-bottom: 5px; - display: flex; - flex-direction: row; - justify-content: stretch; - flex-shrink: 0; - - .key { - width: 150px; - flex-grow: 0; - } - - .value { - flex-grow: 1; - } - } - } -} diff --git a/shared/css/modal-query.scss b/shared/css/modal-query.scss deleted file mode 100644 index 16c70228..00000000 --- a/shared/css/modal-query.scss +++ /dev/null @@ -1,173 +0,0 @@ -.query-create { - display: flex; - flex-direction: column; - - .row-name { - width: 100%; - - display: flex; - flex-direction: row; - justify-content: stretch; - - input { - flex-grow: 1; - flex-shrink: 1; - margin-left: 5px; - } - } - - .buttons { - margin-top: 5px; - text-align: right; - } -} - -.query-created { - display: flex; - flex-direction: column; - - .property-row { - width: 100%; - - display: flex; - flex-direction: row; - justify-content: stretch; - align-items: center; - - margin-top: 2px; - - input { - flex-grow: 1; - flex-shrink: 1; - margin-left: 5px; - } - - a:first-of-type { - width: 150px; - } - - div:last-of-type { - margin-left: 5px; - cursor: pointer; - } - } - - .buttons { - margin-top: 5px; - text-align: right; - } -} - -.query-management { - height: 100%; - display: flex; - flex-direction: column; - - .container { - display: flex; - flex-direction: column; - justify-content: stretch; - - .header, .footer { - flex-grow: 0; - flex-shrink: 0; - } - - .header { - display: flex; - flex-direction: row; - justify-content: stretch; - - .buttons { - flex-grow: 0; - } - - .search { - margin-left: 5px; - flex-grow: 1; - - input { - width: 100%; - } - } - } - - .query-list { - margin-top: 5px; - - display: flex; - flex-grow: 1; - flex-direction: column; - justify-content: stretch; - - .column { - &.column-username { - width: calc(50% - 75px) - } - - &.column-unique-id { - width: calc(50% - 75px) - } - - &.column-bound-server { - width: 150px; - flex-grow: 0; - } - } - - .query-list-header { - flex-grow: 0; - flex-shrink: 0; - display: flex; - flex-direction: row; - height: 20px; - - .column { - border: 1px solid lightgray; - text-align: center; - } - } - - .query-list-entries-container { - flex-grow: 1; - display: flex; - flex-direction: column; - justify-content: start; - overflow-y: auto; - min-height: 250px; - - .entry { - display: flex; - flex-direction: row; - - .column { - margin-left: 2px; - } - - cursor: pointer; - - &.selected { - background-color: blue; - } - } - - &.scrollbar { - .column-username { - width: calc(50% - 75px + 30px) - } - - .column-unique-id { - width: calc(50% - 75px + 30px) - } - } - } - } - - .footer { - margin-top: 5px; - display: flex; - flex-direction: row; - justify-content: space-between; - } - } -} \ No newline at end of file diff --git a/shared/css/static/channel-tree.scss b/shared/css/static/channel-tree.scss new file mode 100644 index 00000000..21c92257 --- /dev/null +++ b/shared/css/static/channel-tree.scss @@ -0,0 +1,239 @@ +/* the channel tree */ +.channel-tree { + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + + width: 100%; + + display: -ms-flex; + display: flex; + + flex-direction: column; + + * { + font-family: sans-serif; + font-size: 12px; + white-space: pre; + line-height: 1; + } + + .tree-entry { + display: flex; + flex-direction: row; + justify-content: stretch; + + /* margin-left: 16px; */ + min-height: 16px; + + flex-grow: 0; + flex-shrink: 0; + + &.server { + display: flex; + flex-direction: row; + justify-content: stretch; + + margin-left: 0; + + .server_type { + flex-grow: 0; + flex-shrink: 0; + + margin-right: 2px; + } + + .name { + flex-grow: 1; + flex-shrink: 1; + + align-self: center; + } + + .icon_property { + flex-grow: 0; + flex-shrink: 0; + } + + &.selected { + background-color: blue; + } + } + + &.channel { + display: flex; + flex-direction: column; + + .container-channel { + display: flex; + flex-direction: row; + justify-content: stretch; + + width: 100%; + min-height: 16px; + + align-items: center; + cursor: pointer; + + &.selected { + background-color: blue; + } + + .channel-type { + flex-grow: 0; + flex-shrink: 0; + + margin-right: 2px; + } + + .container-channel-name { + display: flex; + flex-direction: row; + + flex-grow: 1; + flex-shrink: 1; + + justify-content: left; + + max-width: 100%; /* important for the repetitive channel name! */ + overflow-x: hidden; + height: 16px; + + &.align-right { + justify-content: right; + } + + &.align-center, &.align-repetitive { + justify-content: center; + } + + .channel-name { + align-self: center; + } + } + + .icons { + display: flex; + flex-direction: row; + + flex-grow: 0; + flex-shrink: 0; + } + + &.move-selected { + border-bottom: 1px solid black; + } + + .show-channel-normal-only { + display: none; + + &.channel-normal { + display: block; + } + } + } + + .container-clients { + display: flex; + flex-direction: column; + } + } + + &.client { + cursor: pointer; + + position: relative; + + display: flex; + flex-direction: row; + + align-items: center; + + > div { + margin-right: 2px; + } + + .client-name { + &.client-name-own { + font-weight: bold; + } + } + + .container-icons { + margin-right: 0; /* override from previous thing */ + + position: absolute; + right: 0; + + display: flex; + flex-direction: row; + + align-items: center; + + .container-icons-group { + display: flex; + flex-direction: row; + + .container-group-icon { + display: flex; + flex-direction: column; + justify-content: center; + } + } + } + + &.selected { + background-color: blue; + } + } + } +} + +/* all icons related to basic_icons */ +.clicon {width:16px;height:16px;background:url('../../img/ts/basic_icons.png') no-repeat;background-size: 16px 608px;} + +.host {background-position: 0 -448px} + +.server_open {background-position: 0 -352px} +.server_full {background-position: 0 -128px} +.server_pass {background-position: 0 -432px} + +/* Server group icon */ +.group_0 {background-position: 0 -464px} +.group_100 {background-position: 0 -16px} +.group_200 {background-position: 0 -304px} +.group_300 {background-position: 0 -80px} +.group_400 {background-position: 0 -528px} +.group_500 {background-position: 0 -416px} +.group_600 {background-position: 0 -272px} + +.group_server{background-position: 0 -496px} +.group_channel {background-position: 0 -400px} + +/* Channel icons */ +.channel_open {background-position: 0 -64px} +.channel_pass {background-position: 0 -112px} +.channel_full {background-position: 0 -256px} +.channel_flag_music {background-position: 0 -32px} +.channel_flag_default {background-position: 0 -48px} +.channel_flag_moderated {background-position: 0 -192px} +.channel_flag_password {background-position: 0 -480px} + +/* Client icons */ +.client_mic_muted {background-position: 0 -96px} +.client_talker {background-position: 0 -144px} +.client_idle {background-position: 0 -160px} +.client_talk {background-position: 0 -208px} +.client_snd_muted {background-position: 0 -176px} +.client_query {background-position: 0 -224px} +.client_talker_request {background-position: 0 -240px} +.client_snd_disabled {background-position: 0 -320px} +.client_priority {background-position: 0 -336px} +.client_away {background-position: 0 -368px} +.client_cc {background-position: 0 -384px} +.client_cc_talk {background-position: 0 -544px} +.client_cc_idle {background-position: 0 -288px} +.client_mic_disabled {background-position: 0 -512px} \ No newline at end of file diff --git a/shared/css/context_menu.scss b/shared/css/static/context_menu.scss similarity index 96% rename from shared/css/context_menu.scss rename to shared/css/static/context_menu.scss index ca588293..afa899dc 100644 --- a/shared/css/context_menu.scss +++ b/shared/css/static/context_menu.scss @@ -1,7 +1,7 @@ .context-menu { overflow: visible; display: none; - z-index: 1000; + z-index: 2000; position: absolute; border: 1px solid #CCC; white-space: nowrap; @@ -18,6 +18,11 @@ vertical-align: middle; } + hr { + margin-top: 8px; + margin-bottom: 8px; + } + .entry { /*padding: 8px 12px;*/ padding-right: 12px; diff --git a/shared/css/control_bar.scss b/shared/css/static/control_bar.scss similarity index 96% rename from shared/css/control_bar.scss rename to shared/css/static/control_bar.scss index a25953c7..8f4abda1 100644 --- a/shared/css/control_bar.scss +++ b/shared/css/static/control_bar.scss @@ -6,6 +6,10 @@ $background:lightgray; display: flex; flex-direction: row; + /* tmp fix for ultra small devices */ + overflow-x: auto; + overflow-y: hidden; + .divider { border-left:2px solid gray; height: auto; @@ -132,6 +136,12 @@ $background:lightgray; display: block; } } + + + hr { + margin-top: 5px; + margin-bottom: 5px; + } } .bookmark-dropdown { diff --git a/shared/css/frame/SelectInfo.scss b/shared/css/static/frame/SelectInfo.scss similarity index 91% rename from shared/css/frame/SelectInfo.scss rename to shared/css/static/frame/SelectInfo.scss index cfa164aa..bcf52dff 100644 --- a/shared/css/frame/SelectInfo.scss +++ b/shared/css/static/frame/SelectInfo.scss @@ -94,4 +94,15 @@ } } } + + .client-avatar { + > div { + flex-grow: 1; + flex-shrink: 1; + > img { + max-width: 100%; + max-height: 100%; + } + } + } } \ No newline at end of file diff --git a/shared/css/static/general.scss b/shared/css/static/general.scss new file mode 100644 index 00000000..8217371c --- /dev/null +++ b/shared/css/static/general.scss @@ -0,0 +1,387 @@ +*, +*::before, +*::after { + box-sizing: border-box; +} + +.align_row { + display: flex; + flex-direction: row; +} + +.align_column { + display: flex; + flex-direction: column; +} + +.icon_loading { + border: 2px solid #f3f3f3; /* Light grey */ + border-top: 2px solid #3498db; /* Blue */ + border-radius: 50%; + animation: spin 2s linear infinite; + + width: 14px !important; + height: 14px !important; +} + +.avatar_loading { + border: 2px solid #f3f3f3; /* Light grey */ + border-top: 2px solid #3498db; /* Blue */ + border-radius: 50%; + animation: spin 2s linear infinite; + + width: 14px !important; + height: 14px !important; +} + +@keyframes spin { + 0% { + transform: rotate(0deg); + } + 100% { + transform: rotate(360deg); + } +} + +.select_info { + font-family: Arial; + font-size: 12px; + /*white-space: pre;*/ + line-height: 1; + height: 100%; + display: flex; + flex-direction: column; +} + +/* The Modal (background) */ +.modal_disabled { + display: none; /* Hidden by default */ + position: fixed; /* Stay in place */ + z-index: 1; /* Sit on top */ + left: 0; + top: 0; + width: 100%; /* Full width */ + height: 100%; /* Full height */ + overflow: auto; /* Enable scroll if needed */ + background-color: rgb(0, 0, 0); /* Fallback color */ + background-color: rgba(0, 0, 0, 0.4); /* Black w/ opacity */ + + /* Modal Header */ + .modal-header { + padding: 2px 16px; + min-height: 30px; + vertical-align: middle; + display: flex; + align-items: center; + + border: grey solid; + border-width: 0 0 1px 0; + + background-color: lightgreen; + } + + /* Modal Body */ + .modal-body:not(:empty) { + display: flex; + padding: 2px 16px; + flex-grow: 1; + flex-direction: column; + justify-content: stretch; + } + + /* Modal Footer */ + .modal-footer:not(:empty) { + padding: 2px 16px; + } + + /* The Close Button */ + .close { + color: #aaa; + float: right; + font-size: 28px; + font-weight: bold; + position: absolute; + top: 0px; + right: 4px; + } + + .close:hover, + .close:focus { + color: black; + text-decoration: none; + cursor: pointer; + } + + /* Modal Content */ + .modal-content:not(:empty) { + position: absolute; + display: inline-flex; + flex-direction: column; + justify-content: stretch; + background-color: #fefefe; + margin: auto; + padding: 0; + border: 2px solid #888; + width: auto; + max-width: 90%; + box-shadow: 0 4px 15px 0 rgba(0, 0, 0, 0.2), 2px 6px 20px 0 rgba(0, 0, 0, 0.19); + animation-name: modalFlyIn; + animation-duration: 0.4s; + top: 10%; + max-height: 80%; + + left: 0; + right: 0; + } +} + +/* Add Animation */ +@keyframes modalFlyIn { + from { + top: 0%; + opacity: 0 + } + to { + top: 10%; + opacity: 1 + } +} + +.channel_perm_tbl input { + width: 30px; +} + +.channel_perm_tbl .key { + width: 120px; +} + +.channel_general_properties .value { + width: 100%; +} + +html { + background-color: gray; +} + +fieldset { + border: unset; + display: unset; +} + +.modal-head-error { + background: darkred; + + font-family: Arial; + font-size: 15px; + font-weight: bold; + + vertical-align: middle; +} + +.modal-button-group { + +} + +.modal-button-group button { + width: 100px; + margin-right: 5px; + margin-left: 5px; +} + +.modal-button-group button:last-of-type { + margin-right: 0px; +} + +.invalid_input { + border-color: red; +} + +.GroupBox { + border: gray solid; + border-width: 2px; + border-radius: 0px 6px 6px 6px; +} + +code { + background-color: lightgray; + padding: 2px; +} + +footer { + position: fixed; + width: 100%; + bottom: 0px; + left: 0px; + right: 0px; + height: 25px; + background-color: lightgray; + + display: flex; +} + +footer .container { + width: 100%; + display: flex; + position: relative; + vertical-align: center; + justify-content: center; +} + +$separator_thickness: 4px; +.app { + .container-app-main { + display: flex; + flex-direction: row; + justify-content: stretch; + + height: 100%; + width: 100%; + + + border: $separator_thickness solid lightgray; + border-top-width: 0; + } + + .container-control-bar { + height: 45px; + width: 100%; + border-radius: 2px 0 0 0; + border-bottom-width: 0; + background-color: lightgrey; + + display: flex; + flex-direction: column; + justify-content: center; + } + + .container-channel-chat { + min-width: 100px; + width: 60%; + + display: flex; + flex-direction: column; + justify-content: stretch; + + .container-channel-tree { + background: white; + + display: flex; + justify-content: stretch; + height: calc(100% - 250px); + min-height: 100px; + + /* + overflow: auto; + overflow-x: visible; + */ + overflow: hidden; + overflow-y: auto; + } + + .container-chat { + background: white; + + display: flex; + flex-direction: column; + justify-content: stretch; + + //max-height: 400px; + height: 250px; + min-height: 100px; + } + } + + .container-info { + background: white; + + min-width: 100px; + width: 40%; + + display: flex; + flex-direction: row; + justify-content: stretch; + } +} + +.container-seperator { + background: lightgray; + flex-grow: 0; + flex-shrink: 0; + + &.horizontal { + height: $separator_thickness; + width: 100%; + + cursor: row-resize; + } + + &.vertical { + width: $separator_thickness; + height: 100%; + + cursor: col-resize; + } + + &.seperator-selected { + background-color: #00000011; + } +} + +.icon-container { + display: inline-block; + height: 16px; + width: 16px; + + > img { + position: absolute; + } +} + +#mouse-move { + display: none; + position: absolute; + z-index: 10000; + + .container { + position: relative; + display: block; + + border: 2px solid gray; + -webkit-border-radius: 2px; + -moz-border-radius: 2px; + border-radius: 2px; + } +} + +html, body { + min-height: 500px; + min-width: 500px; + overflow: hidden; +} + +body { + padding: 8px; + background: darkgray !important; +} + +.icon-playlist-manage { + display: inline-block; + width: 32px; + height: 32px; + + background: url('../../img/music/playlist.svg') no-repeat; + background-position: -11px -9px; + background-size: 50px; +} + +x-content { + flex-grow: 1; + flex-shrink: 1; + display: flex; + flex-direction: column; + height: auto; +} + +[class*=" bmd-label"], [class^=bmd-label] { + color: rgba(0, 0, 0, .6) !important; +} \ No newline at end of file diff --git a/shared/css/helptag.scss b/shared/css/static/helptag.scss similarity index 100% rename from shared/css/helptag.scss rename to shared/css/static/helptag.scss diff --git a/shared/css/htmltags.scss b/shared/css/static/htmltags.scss similarity index 100% rename from shared/css/htmltags.scss rename to shared/css/static/htmltags.scss diff --git a/shared/css/static/modal-bancreate.scss b/shared/css/static/modal-bancreate.scss new file mode 100644 index 00000000..ac5a9338 --- /dev/null +++ b/shared/css/static/modal-bancreate.scss @@ -0,0 +1,62 @@ +.bancreate { + display: flex; + flex-direction: column; + + .frame-container { + display: flex; + flex-direction: column; + + select.form-control { + height: 2rem!important; + } + + .form-row { + margin-right: 0; + margin-left: 0; + + display: flex; + flex-direction: row; + justify-content: stretch; + + div:first-of-type { + flex-grow: 1; + flex-shrink: 1; + + margin-right: 10px; + } + + div:nth-of-type(2) { + min-width: 150px; + } + } + + .form-group, .form-row { + flex-grow: 0; + flex-shrink: 0; + + &.container-reason { + flex-grow: 1; + flex-shrink: 1; + + overflow-y: auto; + } + } + + .footer { + display: flex; + flex-direction: row; + justify-content: space-between; + + .container-global { + display: inline-block; + + .input-global { + vertical-align: bottom; + } + } + .container-buttons { + display: inline-block; + } + } + } +} \ No newline at end of file diff --git a/shared/css/static/modal-banlist.scss b/shared/css/static/modal-banlist.scss new file mode 100644 index 00000000..8f50ea38 --- /dev/null +++ b/shared/css/static/modal-banlist.scss @@ -0,0 +1,180 @@ +.banlist { + display: flex; + flex-direction: column; + justify-content: stretch; + flex-grow: 1; + + height: 100%; + width: 100%; + + .frame-container { + display: flex; + flex-direction: column; + justify-content: stretch; + flex-grow: 1; + + .top-menu { + display: flex; + flex-direction: row; + justify-content: stretch; + flex-grow: 0; + flex-shrink: 0; + margin-bottom: 5px; + + .manage-buttons { + flex-grow: 0; + flex-shrink: 0; + + margin-right: 5px; + } + + .search { + flex-grow: 1; + + input { + width: 100%; + } + } + } + + .entry-container { + flex-grow: 1; + flex-shrink: 1; + + display: flex; + flex-direction: column; + + margin-bottom: 5px; + position: relative; + + width: 100%; + height: 100%; + + .entries { + width: 100%; + min-height: 300px; + + overflow-y: scroll; + overflow-x: hidden; + + display: flex; + flex-direction: column; + } + + .ban-entry { + flex-grow: 0; + flex-shrink: 0; + + display: flex; + flex-direction: row; + justify-content: stretch; + + &.header { + .column { + font-weight: bold; + + &.column-time { + margin-right: 0!important; + } + } + } + + &:not(.header) { + cursor: pointer; + + &:hover { + background-color: #00000011; + } + + &.selected { + background: blue; + + &:hover { + background-color: #0000FFAA; + } + } + } + + .column { + flex-grow: 1; + + &.column-keys { + width: 25%; + + display: flex; + flex-direction: column; + } + + &.column-reason { + + width: 25%; + } + + &.column-creator { + + width: 25%; + } + + &.column-time { + width: 25%; + min-width: 230px; + max-width: 300px; + + display: flex; + flex-direction: column; + + margin-right: -15px; /* because of the scroll bar */ + + > div { + display: flex; + flex-direction: row; + } + + a { + display: inline; + width: 100px; + } + } + } + + &.ban-entry-global { + color: red; + } + + &.ban-entry-own-bold { + font-weight: bold; + } + } + } + + .bottom-menu { + display: flex; + flex-direction: row; + justify-content: space-between; + flex-grow: 0; + flex-shrink: 0; + margin-bottom: 5px; + + .left { + display: flex; + flex-direction: row; + + div { + margin-left: 2px; + margin-right: 2px; + } + } + + input { + vertical-align: bottom; + } + + .bmd-form-group { + padding-top: 0; + align-self: center; + + margin-left: 20px; + } + } + } +} \ No newline at end of file diff --git a/shared/css/modal-bookmarks.scss b/shared/css/static/modal-bookmarks.scss similarity index 90% rename from shared/css/modal-bookmarks.scss rename to shared/css/static/modal-bookmarks.scss index 28721bc2..7b3679cb 100644 --- a/shared/css/modal-bookmarks.scss +++ b/shared/css/static/modal-bookmarks.scss @@ -105,6 +105,17 @@ flex-shrink: 0; } } + + .container-default-channel-select { + display: flex; + flex-direction: row; + justify-content: stretch; + + .container-default-channel { + flex-grow: 1; + flex-shrink: 1; + } + } } } diff --git a/shared/css/static/modal-channel.scss b/shared/css/static/modal-channel.scss new file mode 100644 index 00000000..8c9bae58 --- /dev/null +++ b/shared/css/static/modal-channel.scss @@ -0,0 +1,171 @@ +.container-channel-settings-standard { + flex-grow: 1; + display: flex; + flex-direction: row; + justify-content: stretch; + + .container-divider { + border-left:1px solid #000; + height: auto; + + flex-grow: 0; + flex-shrink: 0; + } + + .container-left, .container-right { + display: flex; + justify-content: space-around; + align-self: center; + + flex-grow: 1; + flex-shrink: 1; + + width: 50%; + } + + .container-right { + flex-direction: column; + align-content: stretch; + vertical-align: center; + + margin: 20px 50px 20px 50px; + } + + .container-channel-type { + padding: 5px; + + border: lightgrey 2px solid; + border-radius: 2px; + text-align: left; + } +} + +.container-channel-settings-audio { + flex-grow: 1; + display: flex; + flex-direction: row; + justify-content: stretch; + + .container-divider { + border-left:1px solid #000; + height: auto; + + flex-grow: 0; + flex-shrink: 0; + } + + .container-presets, .container-custom { + display: flex; + justify-content: space-around; + text-align: left; + align-self: center; + + flex-grow: 1; + flex-shrink: 1; + + width: 50%; + } + + .container-custom { + margin: 20px 50px 20px 50px; + justify-content: stretch; + + > .group_box { + flex-grow: 1; + flex-shrink: 1; + } + } +} + +.container-channel-settings-permission { + flex-grow: 1; + + display: flex; + justify-content: space-evenly; + + align-items: center; + + + .container-left, .container-right { + margin-top: 20px; + margin-bottom: 20px; + + display: flex; + justify-content: space-around; + align-self: center; + + flex-grow: 1; + flex-shrink: 1; + + width: 50%; + + > .group_box { + flex-grow: 1; + flex-shrink: 1; + } + + .form-placeholder { + display: block; + visibility: hidden; + } + } + + .container-left { + margin-left: 10%; + margin-right: 10px; + } + + .container-right { + margin-right: 10%; + margin-left: 10px; + } +} + +.container-channel-settings-advanced { + flex-grow: 1; + + display: flex; + flex-direction: column; + align-items: center; + + .container-max-users, .container-other { + width: 100%; + } + + .container-max-users { + margin-top: 20px; + + display: flex; + flex-direction: row; + justify-content: stretch; + + .group_box:not(:first-of-type) { + margin-left: 40px; + } + + > .group_box { + flex-grow: 1; + flex-shrink: 1; + } + + fieldset { + padding-top: 1rem; + } + + .form-row { + margin-left: 20px; + + display: flex; + flex-direction: row; + justify-content: stretch; + + .bmd-form-group { + padding-top: 0; + } + + label { + width: 100px; + } + } + } +} \ No newline at end of file diff --git a/shared/css/static/modal-connect.scss b/shared/css/static/modal-connect.scss new file mode 100644 index 00000000..ca88fbac --- /dev/null +++ b/shared/css/static/modal-connect.scss @@ -0,0 +1,73 @@ +.modal .modal-connect { + + /* + margin-top: 5px; + + > div:not(:first-of-type) { + margin-top: 5px; + } + + .profile-select-container { + display: flex; + flex-direction: row; + justify-content: space-between; + + select { + width: 150px; + } + } + + .profile-invalid { + display: flex; + flex-direction: column; + justify-content: start; + + > div { + display: inline-flex; + flex-direction: row; + } + + color: red; + } + */ + + .container-address-password { + display: flex; + flex-direction: row; + justify-content: stretch; + + .container-address { + flex-grow: 1; + flex-shrink: 1; + } + + .container-password { + flex-grow: 0; + flex-shrink: 0; + + margin-left: 15px; + } + } + + .container-profile-manage { + display: flex; + flex-direction: row; + justify-content: stretch; + + .container-select-profile { + flex-grow: 1; + flex-shrink: 1; + } + + .container-manage { + flex-grow: 0; + flex-shrink: 0; + + margin-left: 15px; + } + } + + .invalid-feedback { + position: absolute; + } +} \ No newline at end of file diff --git a/shared/css/static/modal-permissions.scss b/shared/css/static/modal-permissions.scss new file mode 100644 index 00000000..7a2ff463 --- /dev/null +++ b/shared/css/static/modal-permissions.scss @@ -0,0 +1,302 @@ +permission-editor { + display: flex; + flex-direction: column; + flex-grow: 1; + flex-shrink: 1; +} + + +.container-permissions { + flex-grow: 1; + flex-shrink: 1; + + display: flex; + height: 100%; +} + +.permission-explorer { + width: 100%; + + display: flex; + flex-direction: column; + justify-content: stretch; + + user-select: none; + + .container-filter, .container-footer { + flex-grow: 0; + flex-shrink: 0; + + display: flex; + flex-direction: row; + justify-content: stretch; + + .container-input { + flex-grow: 1; + flex-shrink: 1; + + margin-right: 10px; + } + } + + .container-permission-list { + flex-grow: 1; + flex-shrink: 1; + + display: flex; + flex-direction: column; + + .header { + border: solid 1px lightgray; + + display: flex; + flex-direction: row; + + .column-granted { + width: 75px + 15px !important; /* because of the scroll bar */ + } + + .column-name { + padding-left: 4px; + } + } + + .entries { + flex-grow: 1; + + overflow-y: scroll; + overflow-x: hidden; + + padding-left: 3px; /* because of the arrow */ + padding-right: 3px; /* because of the scroll bar */ + } + + .entry { + flex-grow: 0; + flex-shrink: 0; + + width: 100%; + + display: flex; + flex-direction: row; + justify-content: stretch; + + .column-name { + flex-grow: 1; + flex-shrink: 1; + } + + + .column-value, .column-granted { + flex-grow: 0; + flex-shrink: 0; + + width: 75px; + text-align: center; + align-self: center; + + display: flex; + flex-direction: row; + justify-content: space-around; + + input[type=number] { + width: 68px; + } + } + + .column-skip, .column-negate { + flex-grow: 0; + flex-shrink: 0; + + width: 75px; + + text-align: center; + align-self: center; + + display: flex; + flex-direction: row; + justify-content: space-around; + } + + &.value-unset { + .column-value, .column-skip, .column-negate { + .checkbox, input { + visibility: hidden; + } + } + } + + &.grant-unset { + .column-granted { + .checkbox, input { + visibility: hidden; + } + } + } + + .checkbox { + display: flex; + flex-direction: row; + justify-content: center; + margin-bottom: 0!important; + } + + .form-group { + margin-bottom: 0px; + } + + &.group { + display: flex; + flex-direction: column; + + .group-entries { + padding-left: 30px; + } + } + + .bmd-form-group { + padding-top: 0; + } + + &.permission { + height: 33px; + + &:hover { + background: #00000011; + + + .checkbox { + .checkmark { + background-color: #bbb; + } + + &:hover input ~ .checkmark { + background-color: #aaa; + } + + input:checked ~ .checkmark { + background-color: #2196F3; + } + } + } + + .checkbox { + height: 16px; + width: 16px; + + display: block; + position: relative; + cursor: pointer; + font-size: 22px; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + + /* Hide the browser's default checkbox */ + input { + position: absolute; + opacity: 0; + cursor: pointer; + + left: 0; + top: 0; + } + + .checkmark { + position: absolute; + top: 0; + left: 0; + height: 16px; + width: 16px; + background-color: #eee; + + &:after { + content: ""; + position: absolute; + display: none; + + left: 6px; + top: 2px; + width: 5px; + height: 10px; + border: solid white; + border-width: 0 3px 3px 0; + -webkit-transform: rotate(45deg); + -ms-transform: rotate(45deg); + transform: rotate(45deg); + } + } + + &:hover input ~ .checkmark { + background-color: #ccc; + } + + input:checked ~ .checkmark { + background-color: #2196F3; + } + + input:checked ~ .checkmark:after { + display: block; + } + } + } + } + + .arrow { + cursor: pointer; + margin-right: 5px; + } + } + + .container-footer { + margin-top: 10px; + + justify-content: flex-end; + } + + .container-mode { + display: flex; + + flex-grow: 1; + flex-shrink: 1; + + &.container-mode-unset { + background-color: lightgray; + } + + &.container-mode-no-permissions { + background-color: lightgray; + text-align: center; + + justify-content: space-around; + display: flex; + flex-direction: column; + } + } +} + +.tab-client, .tab-client-channel { + .client-select { + padding-bottom: 20px; /* for the error message */ + + .invalid-feedback { + position: absolute; + } + } +} + +.tab-client-channel { + .container-client-channel { + display: flex; + flex-direction: column; + justify-content: stretch; + + .list-channel { + flex-grow: 1; + flex-shrink: 1; + + width: 100%; + } + } +} \ No newline at end of file diff --git a/shared/css/static/modal-playlist.scss b/shared/css/static/modal-playlist.scss new file mode 100644 index 00000000..a05ce0b3 --- /dev/null +++ b/shared/css/static/modal-playlist.scss @@ -0,0 +1,438 @@ + +.playlist-management { + height: 100%; + display: flex; + flex-direction: column; + + .header, .footer { + flex-grow: 0; + flex-shrink: 0; + } + + .header { + display: flex; + flex-direction: row; + justify-content: stretch; + + .buttons { + flex-grow: 0; + } + + .search { + margin-left: 5px; + flex-grow: 1; + + input { + width: 100%; + } + } + } + + .playlist-list { + margin-top: 5px; + + display: flex; + flex-grow: 1; + flex-direction: column; + justify-content: stretch; + + $width_id: 80px; + $width_type: 150px; + $width_used: 40px; + .column { + &.column-id { + width: 80px; + text-align: center; + } + + &.column-title { + width: calc(50% - 95px - 40px); + } + + &.column-creator { + width: calc(50% - 95px - 40px); + text-align: center; + } + + &.column-type { + width: 150px; + flex-grow: 0; + text-align: center; + } + + &.column-used { + width: 40px; + flex-grow: 0; + text-align: center; + + + display: flex; + flex-direction: row; + justify-content: center; + align-self: center; + } + } + + .playlist-list-header { + flex-grow: 0; + flex-shrink: 0; + display: flex; + flex-direction: row; + + .column { + border: 1px solid lightgray; + text-align: center; + } + } + + .playlist-list-entries-container { + flex-grow: 1; + display: flex; + flex-direction: column; + justify-content: start; + overflow-y: auto; + min-height: 250px; + + .entry { + display: flex; + flex-direction: row; + + .column { + margin-left: 2px; + } + + cursor: pointer; + + &.selected { + background-color: blue; + } + + &.highlighted { + font-weight: bold; + } + } + + &.scrollbar { + .column-title { + width: calc(50% - 95px - 40px + 30px) + } + + .column-creator { + width: calc(50% - 95px - 40px + 30px) + } + } + } + } + + .footer { + margin-top: 5px; + display: flex; + flex-direction: row; + justify-content: space-between; + + .info { + align-self: center; + } + + .buttons { + display: flex; + flex-direction: row; + justify-content: stretch; + + .highlight-own { + display: flex; + flex-direction: row; + justify-content: stretch; + + margin-right: 10px; + align-self: center; + } + } + } +} + +.playlist-edit { + display: flex; + flex-direction: column; + justify-content: stretch; + + .tab-content { + padding: 0; /* override tab-content setting */ + } + + .general-properties, .playback-properties { + padding: 5px; + width: 100%; + display: flex; + + flex-direction: column; + + .property { + display: flex; + flex-direction: row; + margin-bottom: 5px; + + .key { + width: 150px; + flex-grow: 0; + } + + .value { + flex-grow: 1; + flex-shrink: 1; + } + + .checkbox-container { + input { + margin-left: 0; + } + } + + &.property-description { + textarea { + resize: vertical; + max-height: 400px; + } + } + } + + flex-shrink: 0; + flex-grow: 0; + } + + .playback-properties { + .property .key { + width: 175px; + } + } + + .container-permissions { + padding: 5px; + display: flex; + flex-direction: row; + justify-content: space-around; + + .group_box { + min-width: 30%; + } + + .permissions-list { + display: flex; + flex-direction: column; + } + } + + .container-no-permissions { + background: lightgray; + padding: 50px; + text-align: center; + } + + .tab-content, x-content { + overflow-y: hidden; + display: flex; + flex-direction: column; + } + + .container-songs { + display: flex; + flex-direction: column; + padding: 5px; + + .song-list { + min-height: 300px; + + margin-top: 5px; + + display: flex; + flex-grow: 1; + flex-direction: column; + justify-content: stretch; + + .column { + &.column-id { + width: 50px; + } + + &.column-url { + width: calc(100% - 140px) + } + + &.column-loaded { + width: 50px; + flex-grow: 0; + + display: flex; + justify-content: center; + flex-direction: row; + } + + &.column-buttons { + width: 40px; + flex-grow: 0; + + display: flex; + justify-content: center; + flex-direction: row; + + .button { + display: flex; + flex-direction: column; + justify-content: center; + + &:hover { + background: #00000033; + } + } + } + } + + .song-list-header { + flex-grow: 0; + flex-shrink: 0; + display: flex; + flex-direction: row; + justify-content: center; + + + .column { + border: 1px solid lightgray; + text-align: center; + } + } + + .song-list-entries-container { + flex-grow: 1; + display: flex; + flex-direction: column; + justify-content: start; + overflow-y: auto; + min-height: 250px; + + .entry { + display: flex; + flex-direction: row; + + .column { + margin-left: 2px; + } + + cursor: pointer; + + &.selected { + background-color: blue; + } + + &.playing { + background-color: lightgreen; + } + } + + &.scrollbar { + &.column-url { + width: calc(100% - 140px + 30px) + } + } + } + } + + .footer { + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + + flex-grow: 0; + flex-shrink: 0; + margin-top: 5px; + } + } + + > .buttons { + margin-top: 5px; + align-self: flex-end; + + button { + width: 100px; + } + } +} + +.container-song-info { + display: flex; + flex-shrink: 1; + flex-direction: column; + + .properties { + display: flex; + flex-direction: column; + padding-bottom: 5px; + + .property { + display: flex; + flex-direction: row; + justify-content: stretch; + flex-shrink: 0; + + .key { + width: 150px; + flex-grow: 0; + } + + .value { + flex-grow: 1; + } + + &.property-metadata-raw { + flex-direction: column; + flex-shrink: 1; + margin-top: 5px; + + .line { + width: 100%; + display: flex; + flex-direction: row; + justify-content: stretch; + flex-shrink: 0; + } + + textarea { + margin-top: 5px; + + width: 100%; + max-height: 100%; + resize: vertical; + } + } + } + } +} + +.container-song-add { + display: flex; + flex-shrink: 1; + flex-direction: column; + + .properties { + display: flex; + flex-direction: column; + padding-bottom: 5px; + + .property { + margin-bottom: 5px; + display: flex; + flex-direction: row; + justify-content: stretch; + flex-shrink: 0; + + .key { + width: 150px; + flex-grow: 0; + } + + .value { + flex-grow: 1; + } + } + } +} diff --git a/shared/css/modal-poke.scss b/shared/css/static/modal-poke.scss similarity index 100% rename from shared/css/modal-poke.scss rename to shared/css/static/modal-poke.scss diff --git a/shared/css/static/modal-query.scss b/shared/css/static/modal-query.scss new file mode 100644 index 00000000..ae447b08 --- /dev/null +++ b/shared/css/static/modal-query.scss @@ -0,0 +1,159 @@ +.query-create { + display: flex; + flex-direction: column; + + .row-name { + width: 100%; + + display: flex; + flex-direction: row; + justify-content: stretch; + + input { + flex-grow: 1; + flex-shrink: 1; + margin-left: 5px; + } + } + + .buttons { + margin-top: 5px; + text-align: right; + } +} + +.query-created { + display: flex; + flex-direction: column; + + .buttons { + text-align: right; + } + + .form-row { + margin-right: 0!important; + margin-left: 0!important; + + display: flex; + flex-direction: row; + justify-content: stretch; + + .icon_x32 { + align-self: center; + margin-right: 5px; + + cursor: pointer; + } + + .form-group { + flex-grow: 1; + } + } +} + +.query-management { + height: 100%; + display: flex; + flex-direction: column; + + .header, .footer { + flex-grow: 0; + flex-shrink: 0; + } + + .header { + display: flex; + flex-direction: row; + justify-content: stretch; + + .buttons { + flex-grow: 0; + } + + .search { + margin-left: 5px; + flex-grow: 1; + + input { + width: 100%; + } + } + } + + .query-list { + margin-top: 5px; + + display: flex; + flex-grow: 1; + flex-direction: column; + justify-content: stretch; + + .column { + &.column-username { + width: calc(50% - 75px) + } + + &.column-unique-id { + width: calc(50% - 75px) + } + + &.column-bound-server { + width: 150px; + flex-grow: 0; + } + } + + .query-list-header { + flex-grow: 0; + flex-shrink: 0; + display: flex; + flex-direction: row; + + .column { + border: 1px solid lightgray; + text-align: center; + } + } + + .query-list-entries-container { + flex-grow: 1; + display: flex; + flex-direction: column; + justify-content: start; + overflow-y: auto; + min-height: 250px; + + .entry { + display: flex; + flex-direction: row; + + .column { + margin-left: 2px; + } + + cursor: pointer; + + &.selected { + background-color: blue; + } + } + + &.scrollbar { + .column-username { + width: calc(50% - 75px + 30px) + } + + .column-unique-id { + width: calc(50% - 75px + 30px) + } + } + } + } + + .footer { + margin-top: 5px; + display: flex; + flex-direction: row; + justify-content: space-between; + } +} \ No newline at end of file diff --git a/shared/css/static/modal-server.scss b/shared/css/static/modal-server.scss new file mode 100644 index 00000000..357af6b1 --- /dev/null +++ b/shared/css/static/modal-server.scss @@ -0,0 +1,76 @@ +.container-server-settings-general { + .container-server-settings-slots { + display: flex; + flex-direction: row; + justify-content: stretch; + + margin-right: 0; + margin-left: 0; + + .form-group:not(:first-of-type) { + margin-left: 10px; + + flex-grow: 30; + flex-shrink: 30; + } + + .form-group:first-of-type { + flex-grow: 70; + flex-shrink: 70; + } + } +} +.container-server-settings-host { + padding: 5px; + + .properties-hostbanner, .properties-hostbutton { + .form-row { + margin-left: 5px; + margin-right: 5px; + + display: flex; + flex-direction: row; + justify-content: stretch; + + > .form-group { + flex-grow: 1; + flex-shrink: 1; + } + + > .form-group:not(:first-of-type) { + margin-left: 10px; + } + } + } + + .virtualserver_hostbanner_gfx_interval { + height: calc(2.4375rem + 2px); + } +} + +.container-server-settings-file-transfer, .container-server-settings-anti-flood, .container-server-settings-security { + padding: 5px; +} + +.container-server-settings-misc { + padding: 5px; + + .container-complains { + display: flex; + flex-direction: row; + justify-content: stretch; + + > div { + flex-grow: 1; + flex-shrink: 1; + } + + > div:not(:first-of-type) { + padding-left: 10px; + } + } +} + +.container-server-settings-messages { + padding: 5px; +} \ No newline at end of file diff --git a/shared/css/modal-settings.scss b/shared/css/static/modal-settings.scss similarity index 75% rename from shared/css/modal-settings.scss rename to shared/css/static/modal-settings.scss index e4ee7572..9f001ea5 100644 --- a/shared/css/modal-settings.scss +++ b/shared/css/static/modal-settings.scss @@ -1,3 +1,6 @@ +$small_device: 800px; /* tested out via audio tab */ + + .modal .settings_audio { display: flex; flex-direction: column; @@ -7,6 +10,7 @@ user-select: none; margin: 3px; + > div { margin: 2px; } @@ -15,6 +19,10 @@ align-self: center; } + .settings-device-error { + display: none; + } + .group_box { display: flex; flex-direction: column; @@ -24,7 +32,7 @@ flex-shrink: 1; .content { - display: flex; + display: block; flex-direction: column; } } @@ -32,34 +40,19 @@ .settings-device { display: flex; - flex-direction: column; - width: 100%; - - a { - flex-grow: 0; - } - - .settings-device-error { - display: none; - - width: 100%; - margin-bottom: 3px; - padding: 2px; - - align-self: center; - text-align: center; - - vertical-align: center; - border: darkred 2px solid; - border-radius: 4px; - background: #be00006b; - } + flex-direction: row; + justify-items: stretch; .settings-device-select { + flex-grow: 1; + flex-shrink: 1; + display: flex; flex-direction: row; justify-content: stretch; + margin-right: 5px; + > div { flex-grow: 1; flex-shrink: 1; @@ -75,11 +68,35 @@ .settings-vad-container { display: flex; - flex-direction: row; margin-top: 5px; + min-height: 150px; + flex-direction: column; + width: 100%; > div { - width: 50%; + width: 100%; + + flex-grow: 1; + flex-shrink: 1; + } + + /* for "normal" devices */ + @media (min-width: $small_device) { + flex-direction: row; + + > div { + width: unset; + } + } + + .group_box { + min-width: 250px; + } + + .content { + display: flex; + flex-direction: column; + justify-content: space-around; } fieldset { @@ -94,6 +111,12 @@ } .settings-vad-impl { + .setting-vad-ppt { + @media (min-width: $small_device) { + margin-bottom: -35px; + } + } + display: flex; justify-content: space-around; padding: 5px; @@ -105,6 +128,74 @@ .settings-vad-impl-entry { display: none; } + + .setting-vad-vad { + .vad_vad_bar { + position: relative; + width: 100%; + height: 20px; + + background-image: linear-gradient(to right, green, yellow, red); + background-repeat: no-repeat; + background-size: 100%; + background-position: 0 100%; + + display: flex; + flex-direction: column; + + .bmd-form-group { + display: flex; + padding: 0px; + } + + .container-hider { + position: absolute; + height: 100%; + width: 100%; + + display: flex; + flex-direction: row-reverse; + + .hider { + width: 50%; + height: 100%; + + background-color: grey; + } + } + } + + /* The slider itself */ + .vad_vad_slider { + margin: 0; + background-color: gray; + -webkit-appearance: none; /* Override default CSS styles */ + appearance: none; + width: 100%; + height: 100%; + outline: none; + opacity: 0.7; /* Set transparency (for mouse-over effects on hover) */ + -webkit-transition: .2s; /* 0.2 seconds transition on hover */ + transition: opacity .2s; + } + + /* The slider handle (use -webkit- (Chrome, Opera, Safari, Edge) and -moz- (Firefox) to override default look) */ + .vad_vad_slider::-webkit-slider-thumb { + -webkit-appearance: none; /* Override default look */ + appearance: none; + width: 2px; /* Set a specific slider handle width */ + height: 20px; /* Slider handle height */ + background: #000000FF; /* Green background */ + cursor: pointer; /* Cursor on hover */ + } + + .vad_vad_slider::-moz-range-thumb { + width: 2px; /* Set a specific slider handle width */ + height: 100%; /* Slider handle height */ + background: #000000FF; /* Green background */ + cursor: pointer; /* Cursor on hover */ + } + } } .property { @@ -116,8 +207,19 @@ margin-right: 5px; } + &.ppt-key { + .key { + align-self: center; + } + + button { + min-width: 100px; + } + } + &.ppt-delay { margin-top: 5px; + .value { display: inline-block; position: relative; @@ -156,11 +258,14 @@ justify-content: stretch; .key { - width: 150px; + /* + width: 250px; &.muted-sounds { width: 230px; } + */ + margin-right: 10px; } .value { @@ -182,6 +287,19 @@ text-align: right; } } + + .bmd-form-group { + padding: 0; + + label { + margin: 0; + top: -7px; + } + + .bmd-switch-track { + top: 0; + } + } } } @@ -202,8 +320,17 @@ width: 150px; flex-grow: 0; - input { - margin-left: 75px; + .bmd-form-group { + padding: 0; + + label { + margin: 0 0 0 75px; + top: -7px; + } + + .bmd-switch-track { + top: 0; + } } } } @@ -213,7 +340,7 @@ flex-shrink: 0; display: flex; flex-direction: row; - height: 20px; + align-items: center; .column { border: 1px solid lightgray; @@ -264,6 +391,7 @@ } } + /* .sound-list-filter { margin-top: 3px; @@ -280,11 +408,13 @@ margin-right: 8px; } } + */ } } .modal .settings-translations { margin: 5px; + .setting-list { user-select: none; @@ -311,7 +441,8 @@ flex-direction: row; justify-content: stretch; - .default { } + .default { + } .name { flex-grow: 1; @@ -423,6 +554,7 @@ display: flex; flex-direction: column; } + .contributor { display: block; } @@ -508,6 +640,7 @@ .modal .settings-profiles { margin: 5px; + > div:not(:first-of-type) { margin-top: 5px; } @@ -620,10 +753,6 @@ flex-grow: 1; flex-shrink: 1; } - - .select-container { - text-align: right; - } } } @@ -643,6 +772,26 @@ } &.identity-settings-teamspeak { + .level { + padding-right: 5px; + padding-left: 5px; + + display: flex; + flex-direction: row; + justify-content: stretch; + + .container-input { + flex-grow: 1; + flex-shrink: 1; + + display: flex; + flex-direction: row; + justify-content: stretch; + + margin-right: 10px; + } + } + .property { &:not(:first-of-type) { margin-top: 5px; @@ -664,18 +813,6 @@ width: 100%; } } - - &.level { - .value { - display: flex; - flex-direction: row; - justify-content: stretch; - - button { - margin-left: 5px; - } - } - } } .identity-undefined { @@ -739,45 +876,15 @@ display: flex; flex-direction: column; - .property { - &:not(:first-of-type) { - margin-top: 5px; - } - + .bmd-label-static { display: flex; flex-direction: row; - justify-content: stretch; - - .key { - display: flex; - flex-direction: row; - flex-grow: 0; - flex-shrink: 0; - width: 120px; - - .help-tagged { - width: 80px; - } - } - - .value { - flex-grow: 1; - flex-shrink: 2; - - input { - width: 100%; - } - } } - .row { - display: flex; - flex-direction: row; + .form-row { + margin-right: 0!important; + margin-left: 0!important; justify-content: space-between; - - .property { - margin-top: 0px; - } } .buttons { @@ -787,7 +894,7 @@ flex-direction: row; justify-content: space-between; - button { + button { width: 100px; } } diff --git a/shared/css/modals.scss b/shared/css/static/modals.scss similarity index 58% rename from shared/css/modals.scss rename to shared/css/static/modals.scss index ec8d4048..9e1e7087 100644 --- a/shared/css/modals.scss +++ b/shared/css/static/modals.scss @@ -1,3 +1,21 @@ +body { + padding-right: 8px!important; /* remove the fucking bootstrap override */ +} + +/* backdrop fix */ +.modal-backdrop { + visibility: hidden !important; +} +.modal { + background-color: rgba(0,0,0,0.5); + padding-right: 8% !important; +} + +modal-body { + display: flex; + flex-direction: column; +} + .modal { //General style .properties { @@ -13,42 +31,12 @@ width: 100%; } - .general_properties, .properties_general, .server_properties, .properties_messages { - width: 100%; - - .group_box { - margin-top: 5px; - - &:first-of-type { - margin-top: 0px; - } - } - } .input_error { border-radius: 1px; border: solid red; } - .server_properties { - .properties { - grid-template-columns: 135px auto; - &:first-of-type { - margin-top: 5px; - } - } - - .virtualserver_welcomemessage { - height: 70px; - resize: none; - } - } - - .properties_messages textarea { - height: 70px; - resize: none; - } - .properties_misc { .complains { display: grid; @@ -62,34 +50,78 @@ .container { padding: 6px; } -} + .modal-dialog { + max-height: 80%; + display: flex; + flex-direction: column; + justify-content: stretch; -.container-file-transfer { - .settings { - .setting { - display: flex; - flex-direction: row; + &.modal-dialog-centered { justify-content: stretch; + } + } - &:not(:first-of-type) { - margin-top: 5px; + .modal-content { + /* max-height: 500px; */ + flex-direction: column; + justify-content: stretch; + + .modal-header { + flex-shrink: 0; + flex-grow: 0; + + &.modal-header-error { + background-color: #ce0000; } - div { - flex-grow: 0; - - &.suffix { - width: 50px; - margin-left: 5px; - } - &:first-of-type { - width: 130px; - } + &.modal-header-info { + background-color: #03a9f4; } - input { - flex-grow: 1; + &.modal-header-warning, &.modal-header-info, &.modal-header-error { + border-top-left-radius: .125rem; + border-top-right-radius: .125rem; + } + } + + .modal-body { + flex-grow: 1; + flex-shrink: 1; + display: flex; + flex-direction: column; + + input.is-invalid { + background-image: linear-gradient(0deg, #d50000 2px, rgba(213, 0, 0, 0) 0), linear-gradient(0deg, rgba(241, 1, 1, 0.61) 1px, transparent 0); + } + + &.modal-body-input { + .form-group:not(.with-title) { + padding-top: .75rem; + } + + input.is-invalid ~ .container-help-feedback > .invalid-feedback { + display: block; + } + + .container-help-feedback { + position: absolute; + } + } + } + + .modal-footer { + flex-shrink: 0; + flex-grow: 0; + + &.modal-footer-button-group { + button { + min-width: 100px; + } + + button:not(:first-of-type) { + margin-left: 15px; + }; } } } @@ -178,197 +210,6 @@ flex-direction: column; } -.container-permissions { - display: flex; - height: 100%; -} - -.permission-explorer { - width: 100%; - display: grid; - grid-template-rows: min-content auto min-content; - grid-gap: 5px; - - .bar-filter { - display: grid; - grid-gap: 5px; - grid-template-columns: max-content auto max-content; - - input[type="text"] { - width: 100%; - } - - } - - &.disabled { - pointer-events: none; - - .overlay-disabled { - display: block; - } - - input { - background-color: #00000033; - } - } - - .overlay-disabled { - display: none; - position: absolute; - background-color: #00000033; - z-index: 1000; - height: 100%; - width: 100%; - } - - .list { - display: flex; - position: relative; - flex-direction: column; - border: lightgray solid 2px; - user-select: none; - padding-bottom: 2px; - overflow-y: scroll; - overflow-x: hidden; - - .header { - position: sticky; - top: 0; - z-index: 1; - background-color: lightgray; - padding-left: 0!important; - - & > div { - border: grey solid; - border-width: 0 2px 0 0; - padding-left: 2px; - } - - & > div:last-of-type { - border: none; - } - } - - & > .entry { - padding-left: 4px; - } - - .entry { - display: grid; - grid-template-columns: auto 100px 100px 100px 100px; - - & > div { - padding-left: 2px; - } - - &.selected { - background-color: #11111122; - } - - &.unset { - & > .permission-value, & > .permission-skip, & > .permission-negate { - visibility: hidden; - } - & > .permission-name { - color: lightgray; - } - } - } - - .group { - grid-template-columns: auto; - grid-template-rows: auto auto; - - .group-entries { - margin-left: 50px; - } - - - .title { - &.selected { - background-color: #11111122; - } - } - } - - .arrow { - cursor: pointer; - pointer-events: all; - width: 7px; - height: 7px; - padding: 0; - margin-right: 5px; - margin-left: 3px; - } - - input { - border: none; - background: transparent; - vertical-align: text-bottom; - max-width: 90%; - } - - .checkbox { - margin-top: 1px; - margin-left: 1px; - display: block; - position: relative; - padding-left: 35px; - margin-bottom: 12px; - cursor: pointer; - font-size: 22px; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - - /* Hide the browser's default checkbox */ - input { - position: absolute; - opacity: 0; - cursor: pointer; - } - - .checkmark { - position: absolute; - top: 0; - left: 0; - height: 16px; - width: 16px; - background-color: #eee; - - &:after { - content: ""; - position: absolute; - display: none; - - left: 6px; - top: 2px; - width: 5px; - height: 10px; - border: solid white; - border-width: 0 3px 3px 0; - -webkit-transform: rotate(45deg); - -ms-transform: rotate(45deg); - transform: rotate(45deg); - } - } - - &:hover input ~ .checkmark { - background-color: #ccc; - } - - input:checked ~ .checkmark { - background-color: #2196F3; - } - - input:checked ~ .checkmark:after { - display: block; - } - } - } -} - .container-ban-type { margin: 5px; } @@ -417,6 +258,7 @@ position: relative; width: 175px; flex-grow: 0; + min-width: 125px; .entries { display: table; @@ -499,30 +341,6 @@ } } -.layout-client, .layout-client-channel { - .client-info { - display: flex; - flex-direction: column; - width: 200px; - - & > div:not(.list-channel) { - display: grid; - grid-template-columns: auto; - grid-template-rows: max-content; - } - - .client-info { - input { - pointer-events: none; - } - } - - .list-channel { - flex-grow: 1; - } - } -} - .group-assignment-list { .group-list { border: lightgray solid 1px; diff --git a/shared/css/music/info_plate.scss b/shared/css/static/music/info_plate.scss similarity index 94% rename from shared/css/music/info_plate.scss rename to shared/css/static/music/info_plate.scss index 8aa15737..a6c76995 100644 --- a/shared/css/music/info_plate.scss +++ b/shared/css/static/music/info_plate.scss @@ -15,6 +15,10 @@ $ease: cubic-bezier(.45, 0, .55, 1); perspective-origin: 50% 50%; perspective: 1200px; + label { + margin-bottom: 0!important; /* bootstrap fix */ + } + .flip-card, .static-card { background: white; @@ -128,17 +132,17 @@ $ease: cubic-bezier(.45, 0, .55, 1); .btn-forward span { background-size: calc(42px * 2) calc(42px * 2); margin-left: 10px; - background: url("../../img/music/forward.svg") no-repeat center; + background: url("%%base_path%%/img/music/forward.svg") no-repeat center; } .btn-rewind span { background-size: calc(42px * 2) calc(42px * 2); margin-left: 10px; - background: url("../../img/music/rewind.svg") no-repeat center; + background: url("%%base_path%%/img/music/rewind.svg") no-repeat center; } .btn-settings span { background-size: calc(42px * 2) calc(42px * 2); margin-left: 10px; - background: url("../../img/music/playlist.svg") no-repeat center; + background: url("%%base_path%%/img/music/playlist.svg") no-repeat center; } } diff --git a/shared/css/scroll.scss b/shared/css/static/scroll.scss similarity index 100% rename from shared/css/scroll.scss rename to shared/css/static/scroll.scss diff --git a/shared/css/static/ts/chat.scss b/shared/css/static/ts/chat.scss new file mode 100644 index 00000000..51a68352 --- /dev/null +++ b/shared/css/static/ts/chat.scss @@ -0,0 +1,127 @@ +#chat { + font-family: Arial, serif; + font-size: 12px; + /*white-space: pre;*/ + line-height: 1; + padding: 2px; + height: 100%; + display: flex; + flex-direction: column; + + flex-grow: 1; + + div, a { + vertical-align: middle; + } + + .messages { + border-color: #6f6f6f; + border-radius: 2px 2px 2px 0; + border-style: solid; + overflow-y: auto; + flex-grow: 1; + + .message_box { + flex-wrap: wrap; + display: flex; + align-items: flex-start; + height: auto; + + .message { + width: 100%; + display: inline-block; + + * { + display: inline-block; + vertical-align: top; + } + } + } + } + + + .chats { + max-width: 100%; + flex-shrink: 0; + flex-grow: 0; + overflow: auto; + overflow-y: hidden; + white-space: nowrap; + margin-top: -1px; + display: flex; + user-select: none; + + .chat { + background: #5f5f5f5f; + display: inline-block; + border: 1px solid #6f6f6f; + border-radius: 0 0 2px 2px; + vertical-align: middle; + padding-right: 5px; + padding-left: 2px; + cursor: pointer; + height: 18px; + + &.active { + background: #11111111; + } + + .btn_close { + float: none; + margin-right: -5px; + margin-left: 8px; + + &:hover, &:focus { + color: black; + text-decoration: none; + cursor: pointer; + } + } + + .name, .chatIcon { + display: inline-block; + } + } + } + + .input { + display: flex; + flex-direction: row; + justify-content: stretch; + + height: auto; + width: 100%; + margin-top: 2px; + position: relative; + flex-shrink: 0; + + .bmd-form-group { + flex-grow: 1; + flex-shrink: 1; + + margin-right: 5px; + padding-top: 0; + } + + + .form-group { + flex-grow: 1; + flex-shrink: 1; + margin: 0 5px 0 0; + + textarea { + height: 30px; + min-height: 30px; + max-height: 80px; + + resize: vertical; + overflow-y: auto; + } + } + + button { + padding-top: 1px; + padding-bottom: 1px; + } + } +} diff --git a/shared/css/ts/icons.scss b/shared/css/static/ts/icons.scss similarity index 99% rename from shared/css/ts/icons.scss rename to shared/css/static/ts/icons.scss index df4b36d9..9eb76e8b 100644 --- a/shared/css/ts/icons.scss +++ b/shared/css/static/ts/icons.scss @@ -8,7 +8,7 @@ width: 16px; height: 16px; - background: url('../../img/client_icon_sprite.svg') no-repeat; + background: url('../../../img/client_icon_sprite.svg') no-repeat; } /* Icons x16 */ @@ -612,7 +612,7 @@ .icon_x32 { display: inline-block; - background: url('../../img/client_icon_sprite.svg') no-repeat; + background: url('../../../img/client_icon_sprite.svg') no-repeat; background-size: calc(496px * 2) calc(400px * 2); height: 32px; width: 32px; diff --git a/shared/css/ts/tab.scss b/shared/css/static/ts/tab.scss similarity index 98% rename from shared/css/ts/tab.scss rename to shared/css/static/ts/tab.scss index 5316e32c..0f6c28e9 100644 --- a/shared/css/ts/tab.scss +++ b/shared/css/static/ts/tab.scss @@ -16,6 +16,8 @@ x-content { } .tab .tab-content { + min-height: 200px; + border-color: #6f6f6f; border-radius: 0px 2px 2px 2px; border-style: solid; diff --git a/shared/css/ts/chat.scss b/shared/css/ts/chat.scss deleted file mode 100644 index 1b177cbf..00000000 --- a/shared/css/ts/chat.scss +++ /dev/null @@ -1,109 +0,0 @@ -#chat { - font-family: Arial; - font-size: 12px; - /*white-space: pre;*/ - line-height: 1; - padding: 2px; - height: 100%; - display: flex; - flex-direction: column; - - flex-grow: 1; -} - -#chat div { - vertical-align: middle; -} - -#chat .messages { - border-color: #6f6f6f; - border-radius: 2px 2px 2px 0px; - border-style: solid; - overflow-y: auto; - flex-grow: 1; -} - -#chat .message_box { - flex-wrap: wrap; - display: flex; - align-items: flex-start; - height: auto; -} - -#chat .message { - width: 100%; - display: inline-block; -} - -#chat .message *{ - display: inline-block; - vertical-align: top; -} - -#chat .chats { - max-width: 100%; - flex-shrink: 0; - flex-grow: 0; - /*height: 24px;*/ - overflow: auto; - overflow-y: hidden; - white-space: nowrap; - margin-top: -1px; - display: flex; - user-select: none; -} - -#chat .chat { - background: #5f5f5f5f; - display: inline-block; - border: #6f6f6f; - border-width: 1px; - border-style: solid; - border-radius: 0px 0px 2px 2px; - vertical-align: middle; - padding-right: 5px; - padding-left: 2px; - cursor: pointer; -} - -#chat .active { - background: #11111111; -} - -#chat a { - vertical-align: middle; -} - -#chat .btn_close { - float: none; - margin-right: -5px; - margin-left: 8px; -} - -#chat .btn_close:hover, -#chat .btn_close:focus { - color: black; - text-decoration: none; - cursor: pointer; -} - -#chat .input { - width: 100%; - margin-top: 2px; - display: flex; - height: auto; - position: relative; - flex-shrink: 0; -} - -#chat .input .input_box { - width: 100%; - - display:inline-block; - border: solid 1px #000; - height: 22px; - min-height: 22px; - max-height: 80px; - overflow-y: auto; - resize: vertical; -} \ No newline at end of file diff --git a/shared/css/ts/client.scss b/shared/css/ts/client.scss deleted file mode 100644 index e05c6a6a..00000000 --- a/shared/css/ts/client.scss +++ /dev/null @@ -1,216 +0,0 @@ -.channelTree { - width: 100%; max-width: 100%; - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - vertical-align: center; - outline: none; -} -.channelTree * { - font-family: Arial; - font-size: 12px; - white-space: pre; - line-height: 1; -} -.channelTree div { - max-width: 100%; - height: 16px; - position: relative; -} - -.channelTree .channel_type { - margin-right: 4px; -} -.channelTree .icon_client_state { - margin-right: 4px; -} -.channelTree .server_type { - margin-right: 4px; -} - -.channelTree .icons .icon_entry { - margin-left: 2px; -} - -.channelTree img.loading {width: 50px;height: 50px;-webkit-animation:spin 2s linear infinite;-moz-animation:spin 2s linear infinite;animation:spin 2s linear infinite;} -@-moz-keyframes spin { 100% { -moz-transform: rotate(360deg); } } -@-webkit-keyframes spin { 100% { -webkit-transform: rotate(360deg); } } -@keyframes spin { 100% { -webkit-transform: rotate(360deg); transform:rotate(360deg); } } - -.channelTree div.l {justify-content: flex-start; } -.channelTree div.c {justify-content: center;} -.channelTree div.r {justify-content: flex-end;} - -.channelTree div.solidline{ background: url('../images/viewer/spacer_solidline.gif') repeat-x left center;margin: 0px; } -.channelTree div.dashline{ background: url('../images/viewer/spacer_dashline.gif') repeat-x left center;margin: 0px; } -.channelTree div.dashdotline{ background: url('../images/viewer/spacer_dashdotline.gif') repeat-x left center;margin: 0px; } -.channelTree div.dashdotdotline{ background: url('../images/viewer/spacer_dashdotdotline.gif') repeat-x left center;margin: 0px; } -.channelTree div.dotline{ background: url('../images/viewer/spacer_dotline.gif') repeat-x left center;margin: 0px; } - -.channelTree div * {vertical-align: middle;display:inline-block;height: 16px;padding: 0px;} -.channelTree div img {border: 0;} -.channelTree div > span {position: absolute; right: 0;} -.channelTree { - .name, .group_prefix, .group_suffix, .away { - vertical-align: middle; - margin-top: 1px; - height: 14px; - display: inline; - } - - .group_prefix { - margin-right: 3px; - } - - .group_suffix { - margin-left: 3px; - } -} -.channelTree .own_name { - font-weight: bold; - display: inline; -} -.channelTree .channel_name { - display: flex; - align-items: center; -} - -.channelTree .channel_name_container { - display: inline-flex; - width: 100%; - overflow-x: hidden; -} - -.channelTree .country {width:16px;height:11px;} - -.channelTree .siblings { - position: absolute; - margin-top: 16px; - margin-bottom: -2px; - display: grid; - width: 100%; - left: 16px; -} - -.channelTree .channel { - cursor: pointer; - margin-top: 1px; -} - -.channelTree .clients { - position: absolute; - margin-top: 16px; - margin-bottom: -2px; - display: grid; - width: 100%; - left: 16px; -} - -.channelTree .client { - cursor: pointer; - margin-top: 1px; - width: calc(100%); -} - -.channelTree .client span > div { - margin-left: 3px; -} - -.channelTree .server { - cursor: pointer; - margin-top: 0px; - width: calc(100%); -} - -.channelTree .channelLine { - position: absolute; - width: calc(100% - 16px); - display: flex; - flex-direction: row; - top: 0px; - left: 16px; - - &.move-selected { - border: 1px black solid; - } -} - - -.channelTree .selected { - background: #005cbf; -} - -.clicon {width:16px;height:16px;background:url('../../img/ts/basic_icons.png') no-repeat;background-size: 16px 608px;} -.host {background-position: 0 -448px} - -.server_open {background-position: 0 -352px} -.server_full {background-position: 0 -128px} -.server_pass {background-position: 0 -432px} - -/* Server group icon -.group_0 {background-position: 0 -464px} -.group_100 {background-position: 0 -16px} -.group_200 {background-position: 0 -304px} -.group_300 {background-position: 0 -80px} -.group_400 {background-position: 0 -528px} -.group_500 {background-position: 0 -416px} -.group_600 {background-position: 0 -272px} - -.group_server{background-position: 0 -496px} -.group_channel {background-position: 0 -400px} - -/* Channel icons -.channel_open {background-position: 0 -64px} -.channel_pass {background-position: 0 -112px} -.channel_full {background-position: 0 -256px} -.channel_flag_music {background-position: 0 -32px} -.channel_flag_default {background-position: 0 -48px} -.channel_flag_moderated {background-position: 0 -192px} -.channel_flag_password {background-position: 0 -480px} - -/* Client icons */ -.client_mic_muted {background-position: 0 -96px} -.client_talker {background-position: 0 -144px} -.client_idle {background-position: 0 -160px} -.client_talk {background-position: 0 -208px} -.client_snd_muted {background-position: 0 -176px} -.client_query {background-position: 0 -224px} -.client_talker_request {background-position: 0 -240px} -.client_snd_disabled {background-position: 0 -320px} -.client_priority {background-position: 0 -336px} -.client_away {background-position: 0 -368px} -.client_cc {background-position: 0 -384px} -.client_cc_talk {background-position: 0 -544px} -.client_cc_idle {background-position: 0 -288px} -.client_mic_disabled {background-position: 0 -512px} - -/* Channel tree icons -.tree_line {background-position: 0 -560px} -.tree_mid {background-position: 0 -576px} -.tree_end {background-position: 0 -592px} - -.badges {width:16px;height:16px;background-size: 16px !important;} -.badges.overwolf {background:url('../images/viewer/client_overwolf.png') no-repeat;} -*/ - -/* menu header via data attribute */ -.data-title:before { - content: attr(data-menutitle); - display: block; - position: absolute; - top: 0; - right: 0; - left: 0; - background: #DDD; - padding: 2px; - - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 11px; - font-weight: bold; -} -.data-title :first-child { - margin-top: 50px; -} \ No newline at end of file diff --git a/shared/generate_packed.sh b/shared/generate_packed.sh index 6fdcca1f..324c918c 100755 --- a/shared/generate_packed.sh +++ b/shared/generate_packed.sh @@ -6,29 +6,37 @@ source ../scripts/resolve_commands.sh #Generate the loader definitions first LOADER_FILE="declarations/exports_loader.d.ts" -if [ -e ${LOADER_FILE} ]; then +if [[ -e ${LOADER_FILE} ]]; then rm ${LOADER_FILE} - if [ $? -ne 0 ]; then + if [[ $? -ne 0 ]]; then echo "Failed to remove loader file!\nThis could be critical later!" fi fi npm run dtsgen -- --config $(pwd)/tsconfig/dtsconfig_loader.json -v -if [ ! -e ${LOADER_FILE} ]; then +if [[ ! -e ${LOADER_FILE} ]]; then echo "Failed to generate definitions" echo "$result" exit 1 fi execute_ttsc -p tsconfig/tsconfig_packed.json -if [ $? -ne 0 ]; then +if [[ $? -ne 0 ]]; then echo "Failed to generate packed file!" exit 1 fi #Now link the loader file -if [ ! -L generated/load.js ]; then +if [[ ! -L generated/load.js ]]; then + rm generated/load.js 2>/dev/null ln -rs js/load.js generated/load.js fi +if [[ ! -d generated/static/ ]]; then + mkdir -p generated/static/ +fi + +# Create packed CSS file +find css/static/ -name '*.css' -exec cat {} \; | npm run csso -- --output `pwd`/generated/static/base.css + echo "Packed file generated!" exit 0 \ No newline at end of file diff --git a/shared/html/index.php b/shared/html/index.php index e7142d64..8a0d60c3 100644 --- a/shared/html/index.php +++ b/shared/html/index.php @@ -20,6 +20,10 @@ return false; } } + + if(function_exists("setup_forum_auth")) + setup_forum_auth(); + $localhost |= gethostname() == "WolverinDEV"; if(!$localhost || $testXF) { //redirectOnInvalidSession(); @@ -27,11 +31,13 @@ $WEB_CLIENT = http_response_code() !== false; ?> - + + + TeaClient"; @@ -40,51 +46,29 @@ } ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - + - '; + if(isset($value)) + echo "\t\t\t\r\n"; } - spawnProperty('connect_default_host', $localhost ? "localhost" : "ts.TeaSpeak.de"); - spawnProperty('localhost_debug', $localhost ? "true" : "false"); - spawnProperty('forum_user_data', isset($GLOBALS["COOKIE_NAME_USER_DATA"]) ? $_COOKIE[$GLOBALS["COOKIE_NAME_USER_DATA"]] : ""); - spawnProperty('forum_user_sign', isset($GLOBALS["COOKIE_NAME_USER_SIGN"]) ? $_COOKIE[$GLOBALS["COOKIE_NAME_USER_SIGN"]] : ""); - spawnProperty('forum_path', authPath()); + spawn_property('connect_default_host', $localhost ? "localhost" : "ts.TeaSpeak.de"); + spawn_property('localhost_debug', $localhost ? "true" : "false"); + if(isset($_COOKIE)) { + if(array_key_exists("COOKIE_NAME_USER_DATA", $GLOBALS) && array_key_exists($GLOBALS["COOKIE_NAME_USER_DATA"], $_COOKIE)) + spawn_property('forum_user_data', $_COOKIE[$GLOBALS["COOKIE_NAME_USER_DATA"]]); + if(array_key_exists("COOKIE_NAME_USER_SIGN", $GLOBALS) && array_key_exists($GLOBALS["COOKIE_NAME_USER_SIGN"], $_COOKIE)) + spawn_property('forum_user_sign', $_COOKIE[$GLOBALS["COOKIE_NAME_USER_SIGN"]]); + } + spawn_property('forum_path', authPath()); $version = file_get_contents("./version"); if ($version === false) $version = "unknown"; - spawnProperty("version", $version); + spawn_property("version", $version, "app_version"); ?> @@ -100,20 +84,47 @@ gtag('js', new Date()); gtag('config', 'UA-113151733-4'); - + + + + +
+ +
- -
-
+
+

Please enable JavaScript

TeaSpeak web could not run without it!

@@ -125,7 +136,6 @@ while (elements.length > 0) //Removing these elements (even self) elements.item(0).remove(); -
@@ -145,10 +155,10 @@
-