From 08fbde4f7fe9732a2355f303757ac7a1aaa15a5d Mon Sep 17 00:00:00 2001 From: srgooglo Date: Tue, 16 Nov 2021 17:53:34 +0100 Subject: [PATCH] rename folder --- packages/{comty => app}/.gitignore | 0 packages/{comty => app}/README.md | 0 .../{comty => app}/assets/dark_full_logo.svg | 0 packages/{comty => app}/assets/dark_logo.svg | 0 packages/{comty => app}/assets/favicon.ico | Bin packages/{comty => app}/assets/favicon.png | Bin packages/{comty => app}/assets/full_logo.svg | 0 packages/{comty => app}/assets/logo.svg | 0 packages/{comty => app}/config/index.js | 0 packages/{comty => app}/package.json | 0 .../{comty => app}/schemas/badges_list.json | 0 .../{comty => app}/schemas/contextMenu.json | 0 packages/{comty => app}/schemas/links.json | 0 .../{comty => app}/schemas/post_options.json | 0 .../schemas/settings_general.json | 0 .../{comty => app}/schemas/sidebar_menu.json | 0 .../schemas/theme_settings.json | 0 packages/app/src/App.jsx | 281 +++++++++++++ .../src/components/About/index.js | 0 .../src/components/About/index.less | 0 .../src/components/CardComponent/index.tsx | 0 .../src/components/FloatComponent/index.tsx | 0 .../src/components/Icons/custom.js | 0 .../src/components/Icons/index.js | 0 .../src/components/Invalid/index.js | 0 .../src/components/Invalid/index.less | 0 .../components/Layout/ContextMenu/index.less | 0 .../components/Layout/ContextMenu/index.tsx | 0 .../Overlay/components/cards/__searchBar.js | 0 .../Overlay/components/cards/__searchBar.less | 0 .../Overlay/components/cards/__suggestions.js | 0 .../components/cards/__suggestions.less | 0 .../Overlay/components/cards/__trendings.js | 0 .../Overlay/components/cards/__trendings.less | 0 .../Layout/Overlay/components/index.js | 0 .../Overlay/components/layout/Primary.tsx | 0 .../src/components/Layout/Overlay/index.js | 0 .../src/components/Layout/Overlay/reducers.js | 0 .../RightSider/components/invalid/index.js | 0 .../components/profileCard/index.js | 0 .../RightSider/components/searchBar/index.js | 0 .../components/searchBar/index.less | 0 .../src/components/Layout/RightSider/index.js | 0 .../components/Layout/Sider/default/index.js | 0 .../Layout/Sider/default/index.less | 0 .../src/components/Layout/Sider/index.js | 0 .../components/Layout/Sider/mobile/index.js | 0 .../components/Layout/Sider/mobile/index.less | 0 .../components/Layout/WindowNavbar/index.js | 0 .../components/Layout/WindowNavbar/index.less | 0 .../src/components/Layout/index.js | 0 .../src/components/ListedMenu/index.less | 0 .../src/components/ListedMenu/index.tsx | 0 .../src/components/Loader/index.js | 0 .../src/components/Loader/index.less | 0 .../src/components/MediaPlayer/index.js | 0 .../src/components/MediaPlayer/index.less | 0 .../src/components/Page/Page.less | 0 .../src/components/Page/index.js | 0 .../src/components/ParamsList/index.js | 0 .../PostCard/components/like/index.js | 0 .../PostCard/components/like/index.less | 0 .../src/components/PostCard/index.js | 0 .../src/components/PostCard/index.less | 0 .../src/components/PostCreator/index.js | 0 .../src/components/PostCreator/index.less | 0 .../src/components/PostFeed/index.js | 0 .../src/components/PostFeed/index.less | 0 .../src/components/Splash/index.js | 0 .../src/components/Splash/index.less | 0 .../src/components/StreamingOverlay/index.js | 0 .../statistics/audience/index.js | 0 .../statistics/connection/index.js | 0 .../{comty => app}/src/components/index.js | 0 packages/{comty => app}/src/core/index.js | 0 .../src/core/libs/browser/index.ts | 0 .../{comty => app}/src/core/libs/index.js | 0 .../src/core/libs/keybinds/index.js | 0 .../src/core/libs/settings/index.js | 0 .../src/core/libs/style/index.js | 0 .../{comty => app}/src/layouts/BaseLayout.js | 0 .../src/layouts/PrimaryLayout.js | 0 .../src/layouts/PublicLayout.js | 0 .../src/layouts/PublicLayout.less | 0 packages/{comty => app}/src/models/app.js | 0 .../{comty => app}/src/models/contextMenu.js | 0 packages/{comty => app}/src/models/socket.ts | 0 .../{comty => app}/src/models/streaming.js | 0 packages/{comty => app}/src/models/user.ts | 0 packages/{comty => app}/src/pages/404.js | 0 packages/{comty => app}/src/pages/404.less | 0 packages/{comty => app}/src/pages/@/[user].js | 0 .../src/pages/@/components/badges/index.js | 0 .../src/pages/@/components/follow/index.js | 0 .../src/pages/@/components/follow/index.less | 0 .../src/pages/@/components/menu/index.js | 0 .../{comty => app}/src/pages/@/index.less | 0 .../{comty => app}/src/pages/[indexer].js | 0 .../{comty => app}/src/pages/explore/index.js | 0 .../src/pages/explore/index.less | 0 packages/{comty => app}/src/pages/index.js | 0 .../{comty => app}/src/pages/login/guest.js | 0 .../{comty => app}/src/pages/login/index.js | 0 .../{comty => app}/src/pages/login/index.less | 0 .../{comty => app}/src/pages/login/login.js | 0 .../src/pages/login/register.js | 0 packages/{comty => app}/src/pages/logout.js | 0 .../src/pages/new_streaming/index.js | 0 packages/{comty => app}/src/pages/post.js | 0 packages/{comty => app}/src/pages/saves.js | 0 .../pages/settings/components/about/index.js | 0 .../settings/components/earnings/index.js | 0 .../settings/components/electron/index.js | 0 .../settings/components/electron/index.less | 0 .../settings/components/general/index.js | 0 .../pages/settings/components/help/index.js | 0 .../settings/components/keybinds/index.js | 0 .../settings/components/notification/index.js | 0 .../components/notification/index.less | 0 .../settings/components/plugins/index.js | 0 .../settings/components/security/index.js | 0 .../settings/components/security/index.less | 0 .../settings/components/security/sessions.js | 0 .../theme/components/background/index.js | 0 .../theme/components/color/index.js | 0 .../theme/components/darkmode/index.js | 0 .../settings/components/theme/configurator.js | 0 .../pages/settings/components/theme/index.js | 0 .../settings/components/theme/index.less | 0 .../src/pages/settings/index.js | 0 .../{comty => app}/src/pages/streams/index.js | 0 .../src/theme}/PostCard.less | 0 .../src/theme/fonts.css} | 2 - packages/app/src/theme/index.less | 236 +++++++++++ .../theme/base => app/src/theme}/vars.less | 0 packages/comty/src/App.jsx | 0 packages/comty/src/theme/base/index.less | 385 ------------------ .../src/theme/base/layout/LeftSider.less | 4 - .../src/theme/base/layout/Primary_Layout.less | 7 - packages/comty/src/theme/index.js | 7 - packages/comty/src/theme/index.less | 1 - 141 files changed, 517 insertions(+), 406 deletions(-) rename packages/{comty => app}/.gitignore (100%) rename packages/{comty => app}/README.md (100%) rename packages/{comty => app}/assets/dark_full_logo.svg (100%) rename packages/{comty => app}/assets/dark_logo.svg (100%) rename packages/{comty => app}/assets/favicon.ico (100%) rename packages/{comty => app}/assets/favicon.png (100%) rename packages/{comty => app}/assets/full_logo.svg (100%) rename packages/{comty => app}/assets/logo.svg (100%) rename packages/{comty => app}/config/index.js (100%) rename packages/{comty => app}/package.json (100%) rename packages/{comty => app}/schemas/badges_list.json (100%) rename packages/{comty => app}/schemas/contextMenu.json (100%) rename packages/{comty => app}/schemas/links.json (100%) rename packages/{comty => app}/schemas/post_options.json (100%) rename packages/{comty => app}/schemas/settings_general.json (100%) rename packages/{comty => app}/schemas/sidebar_menu.json (100%) rename packages/{comty => app}/schemas/theme_settings.json (100%) create mode 100644 packages/app/src/App.jsx rename packages/{comty => app}/src/components/About/index.js (100%) rename packages/{comty => app}/src/components/About/index.less (100%) rename packages/{comty => app}/src/components/CardComponent/index.tsx (100%) rename packages/{comty => app}/src/components/FloatComponent/index.tsx (100%) rename packages/{comty => app}/src/components/Icons/custom.js (100%) rename packages/{comty => app}/src/components/Icons/index.js (100%) rename packages/{comty => app}/src/components/Invalid/index.js (100%) rename packages/{comty => app}/src/components/Invalid/index.less (100%) rename packages/{comty => app}/src/components/Layout/ContextMenu/index.less (100%) rename packages/{comty => app}/src/components/Layout/ContextMenu/index.tsx (100%) rename packages/{comty => app}/src/components/Layout/Overlay/components/cards/__searchBar.js (100%) rename packages/{comty => app}/src/components/Layout/Overlay/components/cards/__searchBar.less (100%) rename packages/{comty => app}/src/components/Layout/Overlay/components/cards/__suggestions.js (100%) rename packages/{comty => app}/src/components/Layout/Overlay/components/cards/__suggestions.less (100%) rename packages/{comty => app}/src/components/Layout/Overlay/components/cards/__trendings.js (100%) rename packages/{comty => app}/src/components/Layout/Overlay/components/cards/__trendings.less (100%) rename packages/{comty => app}/src/components/Layout/Overlay/components/index.js (100%) rename packages/{comty => app}/src/components/Layout/Overlay/components/layout/Primary.tsx (100%) rename packages/{comty => app}/src/components/Layout/Overlay/index.js (100%) rename packages/{comty => app}/src/components/Layout/Overlay/reducers.js (100%) rename packages/{comty => app}/src/components/Layout/RightSider/components/invalid/index.js (100%) rename packages/{comty => app}/src/components/Layout/RightSider/components/profileCard/index.js (100%) rename packages/{comty => app}/src/components/Layout/RightSider/components/searchBar/index.js (100%) rename packages/{comty => app}/src/components/Layout/RightSider/components/searchBar/index.less (100%) rename packages/{comty => app}/src/components/Layout/RightSider/index.js (100%) rename packages/{comty => app}/src/components/Layout/Sider/default/index.js (100%) rename packages/{comty => app}/src/components/Layout/Sider/default/index.less (100%) rename packages/{comty => app}/src/components/Layout/Sider/index.js (100%) rename packages/{comty => app}/src/components/Layout/Sider/mobile/index.js (100%) rename packages/{comty => app}/src/components/Layout/Sider/mobile/index.less (100%) rename packages/{comty => app}/src/components/Layout/WindowNavbar/index.js (100%) rename packages/{comty => app}/src/components/Layout/WindowNavbar/index.less (100%) rename packages/{comty => app}/src/components/Layout/index.js (100%) rename packages/{comty => app}/src/components/ListedMenu/index.less (100%) rename packages/{comty => app}/src/components/ListedMenu/index.tsx (100%) rename packages/{comty => app}/src/components/Loader/index.js (100%) rename packages/{comty => app}/src/components/Loader/index.less (100%) rename packages/{comty => app}/src/components/MediaPlayer/index.js (100%) rename packages/{comty => app}/src/components/MediaPlayer/index.less (100%) rename packages/{comty => app}/src/components/Page/Page.less (100%) rename packages/{comty => app}/src/components/Page/index.js (100%) rename packages/{comty => app}/src/components/ParamsList/index.js (100%) rename packages/{comty => app}/src/components/PostCard/components/like/index.js (100%) rename packages/{comty => app}/src/components/PostCard/components/like/index.less (100%) rename packages/{comty => app}/src/components/PostCard/index.js (100%) rename packages/{comty => app}/src/components/PostCard/index.less (100%) rename packages/{comty => app}/src/components/PostCreator/index.js (100%) rename packages/{comty => app}/src/components/PostCreator/index.less (100%) rename packages/{comty => app}/src/components/PostFeed/index.js (100%) rename packages/{comty => app}/src/components/PostFeed/index.less (100%) rename packages/{comty => app}/src/components/Splash/index.js (100%) rename packages/{comty => app}/src/components/Splash/index.less (100%) rename packages/{comty => app}/src/components/StreamingOverlay/index.js (100%) rename packages/{comty => app}/src/components/StreamingOverlay/statistics/audience/index.js (100%) rename packages/{comty => app}/src/components/StreamingOverlay/statistics/connection/index.js (100%) rename packages/{comty => app}/src/components/index.js (100%) rename packages/{comty => app}/src/core/index.js (100%) rename packages/{comty => app}/src/core/libs/browser/index.ts (100%) rename packages/{comty => app}/src/core/libs/index.js (100%) rename packages/{comty => app}/src/core/libs/keybinds/index.js (100%) rename packages/{comty => app}/src/core/libs/settings/index.js (100%) rename packages/{comty => app}/src/core/libs/style/index.js (100%) rename packages/{comty => app}/src/layouts/BaseLayout.js (100%) rename packages/{comty => app}/src/layouts/PrimaryLayout.js (100%) rename packages/{comty => app}/src/layouts/PublicLayout.js (100%) rename packages/{comty => app}/src/layouts/PublicLayout.less (100%) rename packages/{comty => app}/src/models/app.js (100%) rename packages/{comty => app}/src/models/contextMenu.js (100%) rename packages/{comty => app}/src/models/socket.ts (100%) rename packages/{comty => app}/src/models/streaming.js (100%) rename packages/{comty => app}/src/models/user.ts (100%) rename packages/{comty => app}/src/pages/404.js (100%) rename packages/{comty => app}/src/pages/404.less (100%) rename packages/{comty => app}/src/pages/@/[user].js (100%) rename packages/{comty => app}/src/pages/@/components/badges/index.js (100%) rename packages/{comty => app}/src/pages/@/components/follow/index.js (100%) rename packages/{comty => app}/src/pages/@/components/follow/index.less (100%) rename packages/{comty => app}/src/pages/@/components/menu/index.js (100%) rename packages/{comty => app}/src/pages/@/index.less (100%) rename packages/{comty => app}/src/pages/[indexer].js (100%) rename packages/{comty => app}/src/pages/explore/index.js (100%) rename packages/{comty => app}/src/pages/explore/index.less (100%) rename packages/{comty => app}/src/pages/index.js (100%) rename packages/{comty => app}/src/pages/login/guest.js (100%) rename packages/{comty => app}/src/pages/login/index.js (100%) rename packages/{comty => app}/src/pages/login/index.less (100%) rename packages/{comty => app}/src/pages/login/login.js (100%) rename packages/{comty => app}/src/pages/login/register.js (100%) rename packages/{comty => app}/src/pages/logout.js (100%) rename packages/{comty => app}/src/pages/new_streaming/index.js (100%) rename packages/{comty => app}/src/pages/post.js (100%) rename packages/{comty => app}/src/pages/saves.js (100%) rename packages/{comty => app}/src/pages/settings/components/about/index.js (100%) rename packages/{comty => app}/src/pages/settings/components/earnings/index.js (100%) rename packages/{comty => app}/src/pages/settings/components/electron/index.js (100%) rename packages/{comty => app}/src/pages/settings/components/electron/index.less (100%) rename packages/{comty => app}/src/pages/settings/components/general/index.js (100%) rename packages/{comty => app}/src/pages/settings/components/help/index.js (100%) rename packages/{comty => app}/src/pages/settings/components/keybinds/index.js (100%) rename packages/{comty => app}/src/pages/settings/components/notification/index.js (100%) rename packages/{comty => app}/src/pages/settings/components/notification/index.less (100%) rename packages/{comty => app}/src/pages/settings/components/plugins/index.js (100%) rename packages/{comty => app}/src/pages/settings/components/security/index.js (100%) rename packages/{comty => app}/src/pages/settings/components/security/index.less (100%) rename packages/{comty => app}/src/pages/settings/components/security/sessions.js (100%) rename packages/{comty => app}/src/pages/settings/components/theme/components/background/index.js (100%) rename packages/{comty => app}/src/pages/settings/components/theme/components/color/index.js (100%) rename packages/{comty => app}/src/pages/settings/components/theme/components/darkmode/index.js (100%) rename packages/{comty => app}/src/pages/settings/components/theme/configurator.js (100%) rename packages/{comty => app}/src/pages/settings/components/theme/index.js (100%) rename packages/{comty => app}/src/pages/settings/components/theme/index.less (100%) rename packages/{comty => app}/src/pages/settings/index.js (100%) rename packages/{comty => app}/src/pages/streams/index.js (100%) rename packages/{comty/src/theme/base/components => app/src/theme}/PostCard.less (100%) rename packages/{comty/src/theme/base/fonts-import.css => app/src/theme/fonts.css} (79%) create mode 100644 packages/app/src/theme/index.less rename packages/{comty/src/theme/base => app/src/theme}/vars.less (100%) delete mode 100644 packages/comty/src/App.jsx delete mode 100644 packages/comty/src/theme/base/index.less delete mode 100644 packages/comty/src/theme/base/layout/LeftSider.less delete mode 100644 packages/comty/src/theme/base/layout/Primary_Layout.less delete mode 100644 packages/comty/src/theme/index.js delete mode 100644 packages/comty/src/theme/index.less diff --git a/packages/comty/.gitignore b/packages/app/.gitignore similarity index 100% rename from packages/comty/.gitignore rename to packages/app/.gitignore diff --git a/packages/comty/README.md b/packages/app/README.md similarity index 100% rename from packages/comty/README.md rename to packages/app/README.md diff --git a/packages/comty/assets/dark_full_logo.svg b/packages/app/assets/dark_full_logo.svg similarity index 100% rename from packages/comty/assets/dark_full_logo.svg rename to packages/app/assets/dark_full_logo.svg diff --git a/packages/comty/assets/dark_logo.svg b/packages/app/assets/dark_logo.svg similarity index 100% rename from packages/comty/assets/dark_logo.svg rename to packages/app/assets/dark_logo.svg diff --git a/packages/comty/assets/favicon.ico b/packages/app/assets/favicon.ico similarity index 100% rename from packages/comty/assets/favicon.ico rename to packages/app/assets/favicon.ico diff --git a/packages/comty/assets/favicon.png b/packages/app/assets/favicon.png similarity index 100% rename from packages/comty/assets/favicon.png rename to packages/app/assets/favicon.png diff --git a/packages/comty/assets/full_logo.svg b/packages/app/assets/full_logo.svg similarity index 100% rename from packages/comty/assets/full_logo.svg rename to packages/app/assets/full_logo.svg diff --git a/packages/comty/assets/logo.svg b/packages/app/assets/logo.svg similarity index 100% rename from packages/comty/assets/logo.svg rename to packages/app/assets/logo.svg diff --git a/packages/comty/config/index.js b/packages/app/config/index.js similarity index 100% rename from packages/comty/config/index.js rename to packages/app/config/index.js diff --git a/packages/comty/package.json b/packages/app/package.json similarity index 100% rename from packages/comty/package.json rename to packages/app/package.json diff --git a/packages/comty/schemas/badges_list.json b/packages/app/schemas/badges_list.json similarity index 100% rename from packages/comty/schemas/badges_list.json rename to packages/app/schemas/badges_list.json diff --git a/packages/comty/schemas/contextMenu.json b/packages/app/schemas/contextMenu.json similarity index 100% rename from packages/comty/schemas/contextMenu.json rename to packages/app/schemas/contextMenu.json diff --git a/packages/comty/schemas/links.json b/packages/app/schemas/links.json similarity index 100% rename from packages/comty/schemas/links.json rename to packages/app/schemas/links.json diff --git a/packages/comty/schemas/post_options.json b/packages/app/schemas/post_options.json similarity index 100% rename from packages/comty/schemas/post_options.json rename to packages/app/schemas/post_options.json diff --git a/packages/comty/schemas/settings_general.json b/packages/app/schemas/settings_general.json similarity index 100% rename from packages/comty/schemas/settings_general.json rename to packages/app/schemas/settings_general.json diff --git a/packages/comty/schemas/sidebar_menu.json b/packages/app/schemas/sidebar_menu.json similarity index 100% rename from packages/comty/schemas/sidebar_menu.json rename to packages/app/schemas/sidebar_menu.json diff --git a/packages/comty/schemas/theme_settings.json b/packages/app/schemas/theme_settings.json similarity index 100% rename from packages/comty/schemas/theme_settings.json rename to packages/app/schemas/theme_settings.json diff --git a/packages/app/src/App.jsx b/packages/app/src/App.jsx new file mode 100644 index 00000000..df0c0095 --- /dev/null +++ b/packages/app/src/App.jsx @@ -0,0 +1,281 @@ +import React from "react" +import { Helmet } from "react-helmet" +import progressBar from "nprogress" +import * as antd from "antd" +import classnames from "classnames" + +import { Sidebar, Header, Drawer, Sidedrawer } from "./layout" +import { NotFound, RenderError } from "components" +import { Icons } from "components/Icons" + +import config from "config" +import { Session, User } from "models" + +import SidebarController from "core/models/sidebar" +import SettingsController from "core/models/settings" + +import { CreateEviteApp, BindPropsProvider } from "evite" +import { API, Render, Splash, Debug, theme, Sound } from "extensions" + +import "theme/index.less" + +// append method to array prototype +Array.prototype.move = function (from, to) { + this.splice(to, 0, this.splice(from, 1)[0]) + return this +} + +const SplashExtension = Splash.extension({ + logo: config.logo.alt, + preset: "fadeOut", + velocity: 1000, + props: { + logo: { + style: { + marginBottom: "10%", + stroke: "black", + }, + }, + }, +}) + +class ThrowCrash { + constructor(message, description) { + this.message = message + this.description = description + + antd.notification.error({ + message: "Fatal error", + description: message, + }) + + window.app.eventBus.emit("crash", this.message, this.description) + } +} + +class App { + static initialize() { + this.progressBar = progressBar.configure({ parent: "html", showSpinner: false }) + + this.sessionController = new Session() + this.userController = new User() + + this.configuration = { + settings: new SettingsController(), + sidebar: new SidebarController(), + } + + this.eventBus = this.contexts.main.eventBus + + this.eventBus.on("top_loadBar_start", () => { + this.progressBar.start() + }) + this.eventBus.on("top_loadBar_stop", () => { + this.progressBar.done() + }) + + this.eventBus.on("forceInitialize", async () => { + await this.initialization() + }) + this.eventBus.on("forceReloadUser", async () => { + await this.__init_user() + }) + this.eventBus.on("forceReloadSession", async () => { + await this.__init_session() + }) + this.eventBus.on("forceToLogin", () => { + if (window.location.pathname !== "/login") { + this.beforeLoginLocation = window.location.pathname + } + window.app.setLocation("/login") + }) + + this.eventBus.on("destroyAllSessions", async () => { + await this.sessionController.destroyAllSessions() + }) + this.eventBus.on("new_session", () => { + this.eventBus.emit("forceInitialize") + + if (window.location.pathname == "/login") { + window.app.setLocation(this.beforeLoginLocation ?? "/main") + this.beforeLoginLocation = null + } + }) + this.eventBus.on("destroyed_session", () => { + this.flushState() + this.eventBus.emit("forceToLogin") + }) + + this.eventBus.on("invalid_session", (error) => { + if (window.location.pathname !== "/login") { + this.sessionController.forgetLocalSession() + + antd.notification.open({ + message: "Invalid Session", + description: error, + icon: , + }) + + this.eventBus.emit("forceToLogin") + } + }) + + this.eventBus.on("setLocation", () => { + this.eventBus.emit("top_loadBar_start") + this.setState({ isOnTransition: true }) + }) + this.eventBus.on("setLocationDone", () => { + this.eventBus.emit("top_loadBar_stop") + this.setState({ isOnTransition: false }) + }) + this.eventBus.on("cleanAll", () => { + window.app.DrawerController.closeAll() + }) + + this.eventBus.on("crash", (message, error) => { + this.setState({ crash: { message, error } }) + this.contexts.app.SoundEngine.play("crash") + }) + } + + static windowContext() { + return { + configuration: this.configuration, + isValidSession: this.isValidSession, + getSettings: (...args) => this.contexts.app.configuration?.settings?.get(...args), + } + } + + static appContext() { + return { + sessionController: this.sessionController, + userController: this.userController, + configuration: this.configuration, + progressBar: this.progressBar, + } + } + + static staticRenders = { + on404: (props) => { + return + }, + onRenderError: (props) => { + return + }, + initialization: () => { + return + } + } + + state = { + // app + isMobile: false, + crash: false, + isOnTransition: false, + + // app session + session: null, + data: null, + } + + layoutContentRef = React.createRef() + + flushState = () => { + this.setState({ session: null, data: null }) + } + + isValidSession = async () => { + return await this.sessionController.isCurrentTokenValid() + } + + componentDidMount = async () => { + await this.initialization() + } + + initialization = async () => { + try { + await this.contexts.app.initializeDefaultBridge() + await this.__init_session() + await this.__init_user() + } catch (error) { + throw new ThrowCrash(error.message, error.description) + } + } + + __init_session = async () => { + if (typeof Session.token === "undefined") { + window.app.eventBus.emit("forceToLogin") + } else { + this.session = await this.sessionController.getTokenInfo().catch((error) => { + window.app.eventBus.emit("invalid_session", error) + }) + + if (!this.session.valid) { + // try to regenerate + //const regeneration = await this.sessionController.regenerateToken() + //console.log(regeneration) + + window.app.eventBus.emit("invalid_session", this.session.error) + } + } + + this.setState({ session: this.session }) + } + + __init_user = async () => { + if (!this.session || !this.session.valid) { + return false + } + + try { + this.user = await User.data + this.setState({ user: this.user }) + } catch (error) { + console.error(error) + this.eventBus.emit("crash", "Cannot initialize user data", error) + } + } + + render() { + if (this.state.crash) { + return
+
+ +

Crash

+
+

{this.state.crash.message}

+ 
{this.state.crash.error}
+
+ } + + return ( + + + {config.app.siteName} + + + + + +
+ +
+ + + +
+ + + + + + ) + } +} + +export default CreateEviteApp(App, { + extensions: [Sound.extension, Render.extension, theme, API, SplashExtension, Debug], +}) \ No newline at end of file diff --git a/packages/comty/src/components/About/index.js b/packages/app/src/components/About/index.js similarity index 100% rename from packages/comty/src/components/About/index.js rename to packages/app/src/components/About/index.js diff --git a/packages/comty/src/components/About/index.less b/packages/app/src/components/About/index.less similarity index 100% rename from packages/comty/src/components/About/index.less rename to packages/app/src/components/About/index.less diff --git a/packages/comty/src/components/CardComponent/index.tsx b/packages/app/src/components/CardComponent/index.tsx similarity index 100% rename from packages/comty/src/components/CardComponent/index.tsx rename to packages/app/src/components/CardComponent/index.tsx diff --git a/packages/comty/src/components/FloatComponent/index.tsx b/packages/app/src/components/FloatComponent/index.tsx similarity index 100% rename from packages/comty/src/components/FloatComponent/index.tsx rename to packages/app/src/components/FloatComponent/index.tsx diff --git a/packages/comty/src/components/Icons/custom.js b/packages/app/src/components/Icons/custom.js similarity index 100% rename from packages/comty/src/components/Icons/custom.js rename to packages/app/src/components/Icons/custom.js diff --git a/packages/comty/src/components/Icons/index.js b/packages/app/src/components/Icons/index.js similarity index 100% rename from packages/comty/src/components/Icons/index.js rename to packages/app/src/components/Icons/index.js diff --git a/packages/comty/src/components/Invalid/index.js b/packages/app/src/components/Invalid/index.js similarity index 100% rename from packages/comty/src/components/Invalid/index.js rename to packages/app/src/components/Invalid/index.js diff --git a/packages/comty/src/components/Invalid/index.less b/packages/app/src/components/Invalid/index.less similarity index 100% rename from packages/comty/src/components/Invalid/index.less rename to packages/app/src/components/Invalid/index.less diff --git a/packages/comty/src/components/Layout/ContextMenu/index.less b/packages/app/src/components/Layout/ContextMenu/index.less similarity index 100% rename from packages/comty/src/components/Layout/ContextMenu/index.less rename to packages/app/src/components/Layout/ContextMenu/index.less diff --git a/packages/comty/src/components/Layout/ContextMenu/index.tsx b/packages/app/src/components/Layout/ContextMenu/index.tsx similarity index 100% rename from packages/comty/src/components/Layout/ContextMenu/index.tsx rename to packages/app/src/components/Layout/ContextMenu/index.tsx diff --git a/packages/comty/src/components/Layout/Overlay/components/cards/__searchBar.js b/packages/app/src/components/Layout/Overlay/components/cards/__searchBar.js similarity index 100% rename from packages/comty/src/components/Layout/Overlay/components/cards/__searchBar.js rename to packages/app/src/components/Layout/Overlay/components/cards/__searchBar.js diff --git a/packages/comty/src/components/Layout/Overlay/components/cards/__searchBar.less b/packages/app/src/components/Layout/Overlay/components/cards/__searchBar.less similarity index 100% rename from packages/comty/src/components/Layout/Overlay/components/cards/__searchBar.less rename to packages/app/src/components/Layout/Overlay/components/cards/__searchBar.less diff --git a/packages/comty/src/components/Layout/Overlay/components/cards/__suggestions.js b/packages/app/src/components/Layout/Overlay/components/cards/__suggestions.js similarity index 100% rename from packages/comty/src/components/Layout/Overlay/components/cards/__suggestions.js rename to packages/app/src/components/Layout/Overlay/components/cards/__suggestions.js diff --git a/packages/comty/src/components/Layout/Overlay/components/cards/__suggestions.less b/packages/app/src/components/Layout/Overlay/components/cards/__suggestions.less similarity index 100% rename from packages/comty/src/components/Layout/Overlay/components/cards/__suggestions.less rename to packages/app/src/components/Layout/Overlay/components/cards/__suggestions.less diff --git a/packages/comty/src/components/Layout/Overlay/components/cards/__trendings.js b/packages/app/src/components/Layout/Overlay/components/cards/__trendings.js similarity index 100% rename from packages/comty/src/components/Layout/Overlay/components/cards/__trendings.js rename to packages/app/src/components/Layout/Overlay/components/cards/__trendings.js diff --git a/packages/comty/src/components/Layout/Overlay/components/cards/__trendings.less b/packages/app/src/components/Layout/Overlay/components/cards/__trendings.less similarity index 100% rename from packages/comty/src/components/Layout/Overlay/components/cards/__trendings.less rename to packages/app/src/components/Layout/Overlay/components/cards/__trendings.less diff --git a/packages/comty/src/components/Layout/Overlay/components/index.js b/packages/app/src/components/Layout/Overlay/components/index.js similarity index 100% rename from packages/comty/src/components/Layout/Overlay/components/index.js rename to packages/app/src/components/Layout/Overlay/components/index.js diff --git a/packages/comty/src/components/Layout/Overlay/components/layout/Primary.tsx b/packages/app/src/components/Layout/Overlay/components/layout/Primary.tsx similarity index 100% rename from packages/comty/src/components/Layout/Overlay/components/layout/Primary.tsx rename to packages/app/src/components/Layout/Overlay/components/layout/Primary.tsx diff --git a/packages/comty/src/components/Layout/Overlay/index.js b/packages/app/src/components/Layout/Overlay/index.js similarity index 100% rename from packages/comty/src/components/Layout/Overlay/index.js rename to packages/app/src/components/Layout/Overlay/index.js diff --git a/packages/comty/src/components/Layout/Overlay/reducers.js b/packages/app/src/components/Layout/Overlay/reducers.js similarity index 100% rename from packages/comty/src/components/Layout/Overlay/reducers.js rename to packages/app/src/components/Layout/Overlay/reducers.js diff --git a/packages/comty/src/components/Layout/RightSider/components/invalid/index.js b/packages/app/src/components/Layout/RightSider/components/invalid/index.js similarity index 100% rename from packages/comty/src/components/Layout/RightSider/components/invalid/index.js rename to packages/app/src/components/Layout/RightSider/components/invalid/index.js diff --git a/packages/comty/src/components/Layout/RightSider/components/profileCard/index.js b/packages/app/src/components/Layout/RightSider/components/profileCard/index.js similarity index 100% rename from packages/comty/src/components/Layout/RightSider/components/profileCard/index.js rename to packages/app/src/components/Layout/RightSider/components/profileCard/index.js diff --git a/packages/comty/src/components/Layout/RightSider/components/searchBar/index.js b/packages/app/src/components/Layout/RightSider/components/searchBar/index.js similarity index 100% rename from packages/comty/src/components/Layout/RightSider/components/searchBar/index.js rename to packages/app/src/components/Layout/RightSider/components/searchBar/index.js diff --git a/packages/comty/src/components/Layout/RightSider/components/searchBar/index.less b/packages/app/src/components/Layout/RightSider/components/searchBar/index.less similarity index 100% rename from packages/comty/src/components/Layout/RightSider/components/searchBar/index.less rename to packages/app/src/components/Layout/RightSider/components/searchBar/index.less diff --git a/packages/comty/src/components/Layout/RightSider/index.js b/packages/app/src/components/Layout/RightSider/index.js similarity index 100% rename from packages/comty/src/components/Layout/RightSider/index.js rename to packages/app/src/components/Layout/RightSider/index.js diff --git a/packages/comty/src/components/Layout/Sider/default/index.js b/packages/app/src/components/Layout/Sider/default/index.js similarity index 100% rename from packages/comty/src/components/Layout/Sider/default/index.js rename to packages/app/src/components/Layout/Sider/default/index.js diff --git a/packages/comty/src/components/Layout/Sider/default/index.less b/packages/app/src/components/Layout/Sider/default/index.less similarity index 100% rename from packages/comty/src/components/Layout/Sider/default/index.less rename to packages/app/src/components/Layout/Sider/default/index.less diff --git a/packages/comty/src/components/Layout/Sider/index.js b/packages/app/src/components/Layout/Sider/index.js similarity index 100% rename from packages/comty/src/components/Layout/Sider/index.js rename to packages/app/src/components/Layout/Sider/index.js diff --git a/packages/comty/src/components/Layout/Sider/mobile/index.js b/packages/app/src/components/Layout/Sider/mobile/index.js similarity index 100% rename from packages/comty/src/components/Layout/Sider/mobile/index.js rename to packages/app/src/components/Layout/Sider/mobile/index.js diff --git a/packages/comty/src/components/Layout/Sider/mobile/index.less b/packages/app/src/components/Layout/Sider/mobile/index.less similarity index 100% rename from packages/comty/src/components/Layout/Sider/mobile/index.less rename to packages/app/src/components/Layout/Sider/mobile/index.less diff --git a/packages/comty/src/components/Layout/WindowNavbar/index.js b/packages/app/src/components/Layout/WindowNavbar/index.js similarity index 100% rename from packages/comty/src/components/Layout/WindowNavbar/index.js rename to packages/app/src/components/Layout/WindowNavbar/index.js diff --git a/packages/comty/src/components/Layout/WindowNavbar/index.less b/packages/app/src/components/Layout/WindowNavbar/index.less similarity index 100% rename from packages/comty/src/components/Layout/WindowNavbar/index.less rename to packages/app/src/components/Layout/WindowNavbar/index.less diff --git a/packages/comty/src/components/Layout/index.js b/packages/app/src/components/Layout/index.js similarity index 100% rename from packages/comty/src/components/Layout/index.js rename to packages/app/src/components/Layout/index.js diff --git a/packages/comty/src/components/ListedMenu/index.less b/packages/app/src/components/ListedMenu/index.less similarity index 100% rename from packages/comty/src/components/ListedMenu/index.less rename to packages/app/src/components/ListedMenu/index.less diff --git a/packages/comty/src/components/ListedMenu/index.tsx b/packages/app/src/components/ListedMenu/index.tsx similarity index 100% rename from packages/comty/src/components/ListedMenu/index.tsx rename to packages/app/src/components/ListedMenu/index.tsx diff --git a/packages/comty/src/components/Loader/index.js b/packages/app/src/components/Loader/index.js similarity index 100% rename from packages/comty/src/components/Loader/index.js rename to packages/app/src/components/Loader/index.js diff --git a/packages/comty/src/components/Loader/index.less b/packages/app/src/components/Loader/index.less similarity index 100% rename from packages/comty/src/components/Loader/index.less rename to packages/app/src/components/Loader/index.less diff --git a/packages/comty/src/components/MediaPlayer/index.js b/packages/app/src/components/MediaPlayer/index.js similarity index 100% rename from packages/comty/src/components/MediaPlayer/index.js rename to packages/app/src/components/MediaPlayer/index.js diff --git a/packages/comty/src/components/MediaPlayer/index.less b/packages/app/src/components/MediaPlayer/index.less similarity index 100% rename from packages/comty/src/components/MediaPlayer/index.less rename to packages/app/src/components/MediaPlayer/index.less diff --git a/packages/comty/src/components/Page/Page.less b/packages/app/src/components/Page/Page.less similarity index 100% rename from packages/comty/src/components/Page/Page.less rename to packages/app/src/components/Page/Page.less diff --git a/packages/comty/src/components/Page/index.js b/packages/app/src/components/Page/index.js similarity index 100% rename from packages/comty/src/components/Page/index.js rename to packages/app/src/components/Page/index.js diff --git a/packages/comty/src/components/ParamsList/index.js b/packages/app/src/components/ParamsList/index.js similarity index 100% rename from packages/comty/src/components/ParamsList/index.js rename to packages/app/src/components/ParamsList/index.js diff --git a/packages/comty/src/components/PostCard/components/like/index.js b/packages/app/src/components/PostCard/components/like/index.js similarity index 100% rename from packages/comty/src/components/PostCard/components/like/index.js rename to packages/app/src/components/PostCard/components/like/index.js diff --git a/packages/comty/src/components/PostCard/components/like/index.less b/packages/app/src/components/PostCard/components/like/index.less similarity index 100% rename from packages/comty/src/components/PostCard/components/like/index.less rename to packages/app/src/components/PostCard/components/like/index.less diff --git a/packages/comty/src/components/PostCard/index.js b/packages/app/src/components/PostCard/index.js similarity index 100% rename from packages/comty/src/components/PostCard/index.js rename to packages/app/src/components/PostCard/index.js diff --git a/packages/comty/src/components/PostCard/index.less b/packages/app/src/components/PostCard/index.less similarity index 100% rename from packages/comty/src/components/PostCard/index.less rename to packages/app/src/components/PostCard/index.less diff --git a/packages/comty/src/components/PostCreator/index.js b/packages/app/src/components/PostCreator/index.js similarity index 100% rename from packages/comty/src/components/PostCreator/index.js rename to packages/app/src/components/PostCreator/index.js diff --git a/packages/comty/src/components/PostCreator/index.less b/packages/app/src/components/PostCreator/index.less similarity index 100% rename from packages/comty/src/components/PostCreator/index.less rename to packages/app/src/components/PostCreator/index.less diff --git a/packages/comty/src/components/PostFeed/index.js b/packages/app/src/components/PostFeed/index.js similarity index 100% rename from packages/comty/src/components/PostFeed/index.js rename to packages/app/src/components/PostFeed/index.js diff --git a/packages/comty/src/components/PostFeed/index.less b/packages/app/src/components/PostFeed/index.less similarity index 100% rename from packages/comty/src/components/PostFeed/index.less rename to packages/app/src/components/PostFeed/index.less diff --git a/packages/comty/src/components/Splash/index.js b/packages/app/src/components/Splash/index.js similarity index 100% rename from packages/comty/src/components/Splash/index.js rename to packages/app/src/components/Splash/index.js diff --git a/packages/comty/src/components/Splash/index.less b/packages/app/src/components/Splash/index.less similarity index 100% rename from packages/comty/src/components/Splash/index.less rename to packages/app/src/components/Splash/index.less diff --git a/packages/comty/src/components/StreamingOverlay/index.js b/packages/app/src/components/StreamingOverlay/index.js similarity index 100% rename from packages/comty/src/components/StreamingOverlay/index.js rename to packages/app/src/components/StreamingOverlay/index.js diff --git a/packages/comty/src/components/StreamingOverlay/statistics/audience/index.js b/packages/app/src/components/StreamingOverlay/statistics/audience/index.js similarity index 100% rename from packages/comty/src/components/StreamingOverlay/statistics/audience/index.js rename to packages/app/src/components/StreamingOverlay/statistics/audience/index.js diff --git a/packages/comty/src/components/StreamingOverlay/statistics/connection/index.js b/packages/app/src/components/StreamingOverlay/statistics/connection/index.js similarity index 100% rename from packages/comty/src/components/StreamingOverlay/statistics/connection/index.js rename to packages/app/src/components/StreamingOverlay/statistics/connection/index.js diff --git a/packages/comty/src/components/index.js b/packages/app/src/components/index.js similarity index 100% rename from packages/comty/src/components/index.js rename to packages/app/src/components/index.js diff --git a/packages/comty/src/core/index.js b/packages/app/src/core/index.js similarity index 100% rename from packages/comty/src/core/index.js rename to packages/app/src/core/index.js diff --git a/packages/comty/src/core/libs/browser/index.ts b/packages/app/src/core/libs/browser/index.ts similarity index 100% rename from packages/comty/src/core/libs/browser/index.ts rename to packages/app/src/core/libs/browser/index.ts diff --git a/packages/comty/src/core/libs/index.js b/packages/app/src/core/libs/index.js similarity index 100% rename from packages/comty/src/core/libs/index.js rename to packages/app/src/core/libs/index.js diff --git a/packages/comty/src/core/libs/keybinds/index.js b/packages/app/src/core/libs/keybinds/index.js similarity index 100% rename from packages/comty/src/core/libs/keybinds/index.js rename to packages/app/src/core/libs/keybinds/index.js diff --git a/packages/comty/src/core/libs/settings/index.js b/packages/app/src/core/libs/settings/index.js similarity index 100% rename from packages/comty/src/core/libs/settings/index.js rename to packages/app/src/core/libs/settings/index.js diff --git a/packages/comty/src/core/libs/style/index.js b/packages/app/src/core/libs/style/index.js similarity index 100% rename from packages/comty/src/core/libs/style/index.js rename to packages/app/src/core/libs/style/index.js diff --git a/packages/comty/src/layouts/BaseLayout.js b/packages/app/src/layouts/BaseLayout.js similarity index 100% rename from packages/comty/src/layouts/BaseLayout.js rename to packages/app/src/layouts/BaseLayout.js diff --git a/packages/comty/src/layouts/PrimaryLayout.js b/packages/app/src/layouts/PrimaryLayout.js similarity index 100% rename from packages/comty/src/layouts/PrimaryLayout.js rename to packages/app/src/layouts/PrimaryLayout.js diff --git a/packages/comty/src/layouts/PublicLayout.js b/packages/app/src/layouts/PublicLayout.js similarity index 100% rename from packages/comty/src/layouts/PublicLayout.js rename to packages/app/src/layouts/PublicLayout.js diff --git a/packages/comty/src/layouts/PublicLayout.less b/packages/app/src/layouts/PublicLayout.less similarity index 100% rename from packages/comty/src/layouts/PublicLayout.less rename to packages/app/src/layouts/PublicLayout.less diff --git a/packages/comty/src/models/app.js b/packages/app/src/models/app.js similarity index 100% rename from packages/comty/src/models/app.js rename to packages/app/src/models/app.js diff --git a/packages/comty/src/models/contextMenu.js b/packages/app/src/models/contextMenu.js similarity index 100% rename from packages/comty/src/models/contextMenu.js rename to packages/app/src/models/contextMenu.js diff --git a/packages/comty/src/models/socket.ts b/packages/app/src/models/socket.ts similarity index 100% rename from packages/comty/src/models/socket.ts rename to packages/app/src/models/socket.ts diff --git a/packages/comty/src/models/streaming.js b/packages/app/src/models/streaming.js similarity index 100% rename from packages/comty/src/models/streaming.js rename to packages/app/src/models/streaming.js diff --git a/packages/comty/src/models/user.ts b/packages/app/src/models/user.ts similarity index 100% rename from packages/comty/src/models/user.ts rename to packages/app/src/models/user.ts diff --git a/packages/comty/src/pages/404.js b/packages/app/src/pages/404.js similarity index 100% rename from packages/comty/src/pages/404.js rename to packages/app/src/pages/404.js diff --git a/packages/comty/src/pages/404.less b/packages/app/src/pages/404.less similarity index 100% rename from packages/comty/src/pages/404.less rename to packages/app/src/pages/404.less diff --git a/packages/comty/src/pages/@/[user].js b/packages/app/src/pages/@/[user].js similarity index 100% rename from packages/comty/src/pages/@/[user].js rename to packages/app/src/pages/@/[user].js diff --git a/packages/comty/src/pages/@/components/badges/index.js b/packages/app/src/pages/@/components/badges/index.js similarity index 100% rename from packages/comty/src/pages/@/components/badges/index.js rename to packages/app/src/pages/@/components/badges/index.js diff --git a/packages/comty/src/pages/@/components/follow/index.js b/packages/app/src/pages/@/components/follow/index.js similarity index 100% rename from packages/comty/src/pages/@/components/follow/index.js rename to packages/app/src/pages/@/components/follow/index.js diff --git a/packages/comty/src/pages/@/components/follow/index.less b/packages/app/src/pages/@/components/follow/index.less similarity index 100% rename from packages/comty/src/pages/@/components/follow/index.less rename to packages/app/src/pages/@/components/follow/index.less diff --git a/packages/comty/src/pages/@/components/menu/index.js b/packages/app/src/pages/@/components/menu/index.js similarity index 100% rename from packages/comty/src/pages/@/components/menu/index.js rename to packages/app/src/pages/@/components/menu/index.js diff --git a/packages/comty/src/pages/@/index.less b/packages/app/src/pages/@/index.less similarity index 100% rename from packages/comty/src/pages/@/index.less rename to packages/app/src/pages/@/index.less diff --git a/packages/comty/src/pages/[indexer].js b/packages/app/src/pages/[indexer].js similarity index 100% rename from packages/comty/src/pages/[indexer].js rename to packages/app/src/pages/[indexer].js diff --git a/packages/comty/src/pages/explore/index.js b/packages/app/src/pages/explore/index.js similarity index 100% rename from packages/comty/src/pages/explore/index.js rename to packages/app/src/pages/explore/index.js diff --git a/packages/comty/src/pages/explore/index.less b/packages/app/src/pages/explore/index.less similarity index 100% rename from packages/comty/src/pages/explore/index.less rename to packages/app/src/pages/explore/index.less diff --git a/packages/comty/src/pages/index.js b/packages/app/src/pages/index.js similarity index 100% rename from packages/comty/src/pages/index.js rename to packages/app/src/pages/index.js diff --git a/packages/comty/src/pages/login/guest.js b/packages/app/src/pages/login/guest.js similarity index 100% rename from packages/comty/src/pages/login/guest.js rename to packages/app/src/pages/login/guest.js diff --git a/packages/comty/src/pages/login/index.js b/packages/app/src/pages/login/index.js similarity index 100% rename from packages/comty/src/pages/login/index.js rename to packages/app/src/pages/login/index.js diff --git a/packages/comty/src/pages/login/index.less b/packages/app/src/pages/login/index.less similarity index 100% rename from packages/comty/src/pages/login/index.less rename to packages/app/src/pages/login/index.less diff --git a/packages/comty/src/pages/login/login.js b/packages/app/src/pages/login/login.js similarity index 100% rename from packages/comty/src/pages/login/login.js rename to packages/app/src/pages/login/login.js diff --git a/packages/comty/src/pages/login/register.js b/packages/app/src/pages/login/register.js similarity index 100% rename from packages/comty/src/pages/login/register.js rename to packages/app/src/pages/login/register.js diff --git a/packages/comty/src/pages/logout.js b/packages/app/src/pages/logout.js similarity index 100% rename from packages/comty/src/pages/logout.js rename to packages/app/src/pages/logout.js diff --git a/packages/comty/src/pages/new_streaming/index.js b/packages/app/src/pages/new_streaming/index.js similarity index 100% rename from packages/comty/src/pages/new_streaming/index.js rename to packages/app/src/pages/new_streaming/index.js diff --git a/packages/comty/src/pages/post.js b/packages/app/src/pages/post.js similarity index 100% rename from packages/comty/src/pages/post.js rename to packages/app/src/pages/post.js diff --git a/packages/comty/src/pages/saves.js b/packages/app/src/pages/saves.js similarity index 100% rename from packages/comty/src/pages/saves.js rename to packages/app/src/pages/saves.js diff --git a/packages/comty/src/pages/settings/components/about/index.js b/packages/app/src/pages/settings/components/about/index.js similarity index 100% rename from packages/comty/src/pages/settings/components/about/index.js rename to packages/app/src/pages/settings/components/about/index.js diff --git a/packages/comty/src/pages/settings/components/earnings/index.js b/packages/app/src/pages/settings/components/earnings/index.js similarity index 100% rename from packages/comty/src/pages/settings/components/earnings/index.js rename to packages/app/src/pages/settings/components/earnings/index.js diff --git a/packages/comty/src/pages/settings/components/electron/index.js b/packages/app/src/pages/settings/components/electron/index.js similarity index 100% rename from packages/comty/src/pages/settings/components/electron/index.js rename to packages/app/src/pages/settings/components/electron/index.js diff --git a/packages/comty/src/pages/settings/components/electron/index.less b/packages/app/src/pages/settings/components/electron/index.less similarity index 100% rename from packages/comty/src/pages/settings/components/electron/index.less rename to packages/app/src/pages/settings/components/electron/index.less diff --git a/packages/comty/src/pages/settings/components/general/index.js b/packages/app/src/pages/settings/components/general/index.js similarity index 100% rename from packages/comty/src/pages/settings/components/general/index.js rename to packages/app/src/pages/settings/components/general/index.js diff --git a/packages/comty/src/pages/settings/components/help/index.js b/packages/app/src/pages/settings/components/help/index.js similarity index 100% rename from packages/comty/src/pages/settings/components/help/index.js rename to packages/app/src/pages/settings/components/help/index.js diff --git a/packages/comty/src/pages/settings/components/keybinds/index.js b/packages/app/src/pages/settings/components/keybinds/index.js similarity index 100% rename from packages/comty/src/pages/settings/components/keybinds/index.js rename to packages/app/src/pages/settings/components/keybinds/index.js diff --git a/packages/comty/src/pages/settings/components/notification/index.js b/packages/app/src/pages/settings/components/notification/index.js similarity index 100% rename from packages/comty/src/pages/settings/components/notification/index.js rename to packages/app/src/pages/settings/components/notification/index.js diff --git a/packages/comty/src/pages/settings/components/notification/index.less b/packages/app/src/pages/settings/components/notification/index.less similarity index 100% rename from packages/comty/src/pages/settings/components/notification/index.less rename to packages/app/src/pages/settings/components/notification/index.less diff --git a/packages/comty/src/pages/settings/components/plugins/index.js b/packages/app/src/pages/settings/components/plugins/index.js similarity index 100% rename from packages/comty/src/pages/settings/components/plugins/index.js rename to packages/app/src/pages/settings/components/plugins/index.js diff --git a/packages/comty/src/pages/settings/components/security/index.js b/packages/app/src/pages/settings/components/security/index.js similarity index 100% rename from packages/comty/src/pages/settings/components/security/index.js rename to packages/app/src/pages/settings/components/security/index.js diff --git a/packages/comty/src/pages/settings/components/security/index.less b/packages/app/src/pages/settings/components/security/index.less similarity index 100% rename from packages/comty/src/pages/settings/components/security/index.less rename to packages/app/src/pages/settings/components/security/index.less diff --git a/packages/comty/src/pages/settings/components/security/sessions.js b/packages/app/src/pages/settings/components/security/sessions.js similarity index 100% rename from packages/comty/src/pages/settings/components/security/sessions.js rename to packages/app/src/pages/settings/components/security/sessions.js diff --git a/packages/comty/src/pages/settings/components/theme/components/background/index.js b/packages/app/src/pages/settings/components/theme/components/background/index.js similarity index 100% rename from packages/comty/src/pages/settings/components/theme/components/background/index.js rename to packages/app/src/pages/settings/components/theme/components/background/index.js diff --git a/packages/comty/src/pages/settings/components/theme/components/color/index.js b/packages/app/src/pages/settings/components/theme/components/color/index.js similarity index 100% rename from packages/comty/src/pages/settings/components/theme/components/color/index.js rename to packages/app/src/pages/settings/components/theme/components/color/index.js diff --git a/packages/comty/src/pages/settings/components/theme/components/darkmode/index.js b/packages/app/src/pages/settings/components/theme/components/darkmode/index.js similarity index 100% rename from packages/comty/src/pages/settings/components/theme/components/darkmode/index.js rename to packages/app/src/pages/settings/components/theme/components/darkmode/index.js diff --git a/packages/comty/src/pages/settings/components/theme/configurator.js b/packages/app/src/pages/settings/components/theme/configurator.js similarity index 100% rename from packages/comty/src/pages/settings/components/theme/configurator.js rename to packages/app/src/pages/settings/components/theme/configurator.js diff --git a/packages/comty/src/pages/settings/components/theme/index.js b/packages/app/src/pages/settings/components/theme/index.js similarity index 100% rename from packages/comty/src/pages/settings/components/theme/index.js rename to packages/app/src/pages/settings/components/theme/index.js diff --git a/packages/comty/src/pages/settings/components/theme/index.less b/packages/app/src/pages/settings/components/theme/index.less similarity index 100% rename from packages/comty/src/pages/settings/components/theme/index.less rename to packages/app/src/pages/settings/components/theme/index.less diff --git a/packages/comty/src/pages/settings/index.js b/packages/app/src/pages/settings/index.js similarity index 100% rename from packages/comty/src/pages/settings/index.js rename to packages/app/src/pages/settings/index.js diff --git a/packages/comty/src/pages/streams/index.js b/packages/app/src/pages/streams/index.js similarity index 100% rename from packages/comty/src/pages/streams/index.js rename to packages/app/src/pages/streams/index.js diff --git a/packages/comty/src/theme/base/components/PostCard.less b/packages/app/src/theme/PostCard.less similarity index 100% rename from packages/comty/src/theme/base/components/PostCard.less rename to packages/app/src/theme/PostCard.less diff --git a/packages/comty/src/theme/base/fonts-import.css b/packages/app/src/theme/fonts.css similarity index 79% rename from packages/comty/src/theme/base/fonts-import.css rename to packages/app/src/theme/fonts.css index 2bd44ba2..e2f85742 100644 --- a/packages/comty/src/theme/base/fonts-import.css +++ b/packages/app/src/theme/fonts.css @@ -4,6 +4,4 @@ @import url('https://fonts.googleapis.com/css?family=Kulim+Park&display=swap'); @import url('https://fonts.googleapis.com/css?family=Nunito&display=swap'); @import url("https://fonts.googleapis.com/css?family=Manrope:300,400,500,600,700&display=swap&subset=latin-ext"); -@import url("https://api.ragestudio.net/fonts/netflix_sans/font.css"); -@import url("https://api.ragestudio.net/fonts/trueno/font.css"); diff --git a/packages/app/src/theme/index.less b/packages/app/src/theme/index.less new file mode 100644 index 00000000..c6f2a7fe --- /dev/null +++ b/packages/app/src/theme/index.less @@ -0,0 +1,236 @@ +@import "antd/dist/antd.less"; +@import "theme/vars.less"; +@import "theme/fonts.css"; + +.ant-layout { + background: @app_layout_backgroundColor!important; + background-color: @app_layout_backgroundColor!important; + + width: 100%; + height: 100%; + max-height: 100%; + + overflow: hidden; +} + +.app_layout { + background: @app_layout_backgroundColor!important; + background-color: @app_layout_backgroundColor!important; + + position: relative; + -webkit-overflow-scrolling: touch; + + width: 100%; + height: 100%; + max-height: 100%; + + overflow: hidden; +} + +.app_wrapper { + position: relative; + + height: 100%; + max-height: 100%; + + margin: 10px 10px 30px 16px; + + overflow-x: hidden; + overflow-y: overlay; +} + +::-webkit-scrollbar { + position: absolute; + + width: 14px; + height: 18px; + z-index: 200; + transition: all 200ms ease-in-out; +} + +::-webkit-scrollbar-thumb { + position: absolute; + z-index: 200; + + height: 6px; + margin: 5px 10px 5px 5px; + transition: all 200ms ease-in-out; + + border: 4px solid rgba(0, 0, 0, 0); + background-color: rgba(0, 0, 0, 0.15); + background-clip: padding-box; + + -webkit-border-radius: 7px; +} + +::-webkit-scrollbar-button { + width: 0; + height: 0; + display: none; +} + +::-webkit-scrollbar-corner { + background-color: transparent; +} + +html { + position: fixed; + overflow: hidden; + -webkit-overflow-scrolling: touch; + background-color: @app_layout_backgroundColor!important; + + height: 100vh; + max-height: 100vh; + min-height: 100vh; +} + +body { + text-rendering: optimizeLegibility !important; + -webkit-app-region: no-drag; + + user-select: none; + background-color: @app_layout_backgroundColor!important; + font-family: "Varela Round", sans-serif; + + scroll-behavior: smooth; + height: 100%; + + overflow: hidden; +} + +#root { + position: fixed; + -webkit-overflow-scrolling: touch; + overflow: hidden; + //position: absolute; + width: 100%; + height: 100%; + + height: 100vh; + + overflow-x: hidden; + overflow-y: hidden; + background-color: @app_layout_backgroundColor!important; +} + +#nprogress { + position: absolute; + top: 0; + width: 100vw; + + .bar { + height: 2px; + background: #48acf0; + } +} + +// @media (min-width: @screen-xs) { + +// } + +// @media (min-width: @screen-md) { + +// } + +// @media (min-width: @screen-lg) { + +// } + +// @media (min-width: @screen-xl) { + +// } + +// @media (min-width: @screen-xxl) { + +// } + +.horizontal_actions_cascade { + > div:first-child { + transform: unset; + } + + > div { + transform: translate(0, -10px); + } +} + +.horizontal_actions { + display: flex; + flex-direction: row; + + align-items: center; + + > div { + padding: 0 10px; + } + + padding: 20px 0; + + border-bottom: #424242 solid 1px; + border-left: #424242 solid 1px; + border-right: #424242 solid 1px; + + border-radius: 0 0 12px 12px; +} + +.component_bottom_centered { + position: absolute; + bottom: 0; + left: 0; + width: 100%; + + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; +} + +.fade-transverse-active { + transition: all 250ms; + height: 100%; + width: 100%; +} + +.fade-transverse-enter { + opacity: 0; + transform: translateX(-30px); +} +.fade-transverse-leave { + opacity: 0; + transform: translateX(30px); +} + +.fade-scale-leave-active, +.fade-scale-enter-active { + transition: all 0.3s; +} +.fade-scale-enter { + opacity: 0; + transform: scale(1.2); +} +.fade-scale-leave { + opacity: 0; + transform: scale(0.8); +} + +.app_crash { + width: 100vw; + height: 100vh; + + display: flex; + flex-direction: column; + + justify-content: center; + align-items: center; + + .header { + display: flex; + text-align: center; + flex-direction: column; + justify-content: center; + svg { + width: 100px; + height: 100px; + } + } +} \ No newline at end of file diff --git a/packages/comty/src/theme/base/vars.less b/packages/app/src/theme/vars.less similarity index 100% rename from packages/comty/src/theme/base/vars.less rename to packages/app/src/theme/vars.less diff --git a/packages/comty/src/App.jsx b/packages/comty/src/App.jsx deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/comty/src/theme/base/index.less b/packages/comty/src/theme/base/index.less deleted file mode 100644 index ebd7030f..00000000 --- a/packages/comty/src/theme/base/index.less +++ /dev/null @@ -1,385 +0,0 @@ -@import './vars.less'; -@import './fonts-import.css'; - -@import './layout/Primary_Layout.less'; -@import './layout/LeftSider.less'; - -@import './components/PostCard.less'; - - -// Resolutions variables -@screen-sm: 48em; // 768px -@screen-md: 64em; // 1024px -@screen-lg: 85.375em; // 1366px -@screen-xl: 120em; // 1920px -@screen-xxl: 160em; // 2560px - -::-webkit-scrollbar { - position: absolute; - width: 14px; - height: 18px; - } - -::-webkit-scrollbar-thumb { - height: 6px; - border: 4px solid rgba(0, 0, 0, 0); - background-clip: padding-box; - margin: 5px 10px 5px 5px; - -webkit-border-radius: 7px; - background-color: rgba(0, 0, 0, 0.15); - -webkit-box-shadow: inset -1px -1px 0 rgba(0, 0, 0, 0.05), inset 1px 1px 0 rgba(0, 0, 0, 0.05); -} -::-webkit-scrollbar-button { - width: 0; - height: 0; - display: none; -} -::-webkit-scrollbar-corner { - background-color: transparent; -} - -.app{ - &.overlayActive { - .app_layout_container{ - filter: saturate(10%); - transform: translate(-150px, 0);// to do: get from overlay direction variable - } - } - - &.interfaced{ - .app_layout_container{ - height: 98%; - } - } - - &.mobile{ - .app_layout_container { - width: 100%; - padding: 0; - overflow-y: overlay; - overflow-x: hidden; - min-width: unset; - } - .app_layout_content{ - padding: 35px 15px 15px; - } - } - - &.dark_mode{ - :global{ - filter: invert(100%); - img, svg, video { - filter: invert(100%); - color: @__app_background; - } - } - } -} - -#app { - -webkit-app-region: no-drag; - overflow: hidden; - position: absolute; - bottom: 0; - - background-repeat: repeat-x; - background-size: cover; - background-position-y: center; - background-color: transparent; - margin: auto; - height: 100vh; - width: 100vw; - - transition: all 150ms linear; -} - - -body { - text-rendering: optimizeLegibility!important; - -webkit-app-region: no-drag; - - scroll-behavior: smooth; - height: 100vh; - - overflow: hidden; - - font-size: 1em; - - font-family: @__app_secondaryFont; - color: @__app_color!important; - background-color: @__app_background; - - &.dark{ - background-color: @__app_color; - } -} - -// Layout -.app_layout_container { - background-color: transparent; - transition: all 150ms ease-in-out; - backdrop-filter: blur(2px); - - overflow-x: hidden; - // overflow-y: overlay; - - width: auto; - height: 100vh; - padding: 15px 0; - align-self: baseline; - - position: relative; - bottom: 0; - display: flex; - align-self: center; - - max-width: 750px; - min-width: 570px; -} - -.app_layout_content { - vertical-align: middle; - width: 100%; - padding: @__app_layout_content_padding; - transition: all 150ms ease-in-out; -} - - -// Right Sidebar -@__app_overlay_padding: 30px 30px 30px 35px; -.app_right_sidebar_wrapper { - opacity: 1; - height: 100%; - width: 100%; - - max-width: @Overlay_wrapper_maxwidth; - min-width: 200px; - - display: flex; - z-index: 50; - - padding: @__app_overlay_padding; - - @media (max-width: @screen-md) { - padding: 30px 5px; - } - - transition: all @__app_SwapDuration ease-in-out; - - &.swapped { - opacity: 0; - transform: translate(100%, 0); - } -} - -.app_right_sidebar_content{ - height: 100%; - width: 100%; - > div { - margin-bottom: 35px; - } -} - -// Overlay -.app_overlay_wrapper { - user-select: none; - position: absolute; - right: 0; - top: 0; - z-index: 50; - - height: 100%; - width: 0; - backdrop-filter: blur(2px); - - &.half { - padding: @__app_overlay_padding; - background-color: #2d2d2d; - color: @Overlay_container1_active_color; - width: 26vw; - } - - &.full{ - padding: @__app_overlay_padding; - max-width: none; - background-color: transparent; - position: absolute; - width: 100vw; - height: 100vh; - } - - transition: all @__app_SwapDuration ease-in-out; - border-radius: @__Global_layout_border-rd; -} - -.app_overlay_content { - height: 100%; - width: 100%; - - max-width: @Overlay_wrapper_maxwidth; - min-width: 200px; - - display: flex; - z-index: 50; - - right: 0; - padding: @__app_overlay_padding; - - color: @Overlay_container1_def_color; - - transition: all @__app_SwapDuration ease-in-out; -} - -.app_overlay_content_body{ - height: 100%; - width: 100%; - word-break: break-all; - - > div { - margin-bottom: 35px; - } -} - -.app_overlay_backButton{ - margin: 0 0 15px; - background-color: #fff; - border-radius: 8px; - color: @Overlay_container_1_btn_color; - background-color: @Overlay_container_1_btn_backgroud; - border-color: transparent; - border-radius: 12px; -} - -.app_overlay_backButton:hover { - box-shadow: @Overlay_container_1_btn_shadow; - transition: all @__Global_Components_transitions_dur linear; -} - -// Streaming Drawer -.app_streamingPanel_wrapper { - h1 { - color: #fff; - } - -} - -.app_streamingPanel_content { - h1 { - color: #333; - } - - display: inline-block; - align-items: center; - margin: auto; - color: #333; - border-radius: 14px; - background-color: #fff; - width: 100%; - padding: 40px; -} - -.app_streamingPanel_onlivetag { - color: #9597A1; - background-color: #cecece; - padding: 5px; - border-radius: 5px; - text-align: center; - font-size: 14; - - transition: all 150ms ease-in-out; - - &.active { - color: #fff; - background-color: red; - } -} - - -.app_streamingPanel_connectionIndicator { - background-color: #cecece; - width: 1em; - height: 1em; - - border-radius: 24px; - transition: all 150ms ease-in-out; - margin-right: 12px; - - &.active { - background-color: #38b000; - } -} - -.app_streamingPanel_cardBody { - > div { - margin-bottom: 15px; - } -} - -.app_streamingPanel_hiddenkey { - text-align: center; - background-color: #cecece; - border-radius: 7px; - padding: 12px 0; - filter: blur(4px); - transition: all 150ms ease-in-out; - - user-select: all; - - -} - -.app_streamingPanel_hiddenkey:hover { - filter: none; -} - -// CardComponent (External Module) -.cardComponent_wrapper { - width: 100%; - height: 100%; - - background-color: #fff; - border-radius: 8px; - padding: 10px; - - - h1,h2,h3,h4{ - color: #9597A1; - font-family: Netflix Sans; - font-style: normal; - font-weight: 300; - font-size: 12px; - line-height: 15px; - } -} - - - -// Media queries -@media (min-width: @screen-sm){ - ::-webkit-scrollbar{ - display: none; - } -} - -@media (min-width: @screen-md) { - .app_layout_container{ - min-width: 750px; - } - .app_layout_content{ - padding: 0; - } -} - -@media (min-width: @screen-lg) { - .app_layout_container{ - min-width: 1112px; - } -} - -// @media (min-width: @screen-xl) { - -// } - -// @media (min-width: @screen-xxl) { - -// } diff --git a/packages/comty/src/theme/base/layout/LeftSider.less b/packages/comty/src/theme/base/layout/LeftSider.less deleted file mode 100644 index 59f59e70..00000000 --- a/packages/comty/src/theme/base/layout/LeftSider.less +++ /dev/null @@ -1,4 +0,0 @@ -@left_sider_color: @__app_color; -@left_sider_sizeIcons: 19px; -@left_sider_menu__onhover_backgroud: rgb(80, 80, 80); -@left_sider_menu__onhover_color: rgb(80, 80, 80); \ No newline at end of file diff --git a/packages/comty/src/theme/base/layout/Primary_Layout.less b/packages/comty/src/theme/base/layout/Primary_Layout.less deleted file mode 100644 index f20346da..00000000 --- a/packages/comty/src/theme/base/layout/Primary_Layout.less +++ /dev/null @@ -1,7 +0,0 @@ -@primary_layout_backgroud: #F8F6F8; // #2d2d2d; - -@primary_layout_container_backgroud: @__Global_layout_backgroud; -@primary_layout_container_border-rd: @__Global_layout_border-rd; - -@primary_layout_content_padding: 0 40px 20px 0; - diff --git a/packages/comty/src/theme/index.js b/packages/comty/src/theme/index.js deleted file mode 100644 index 227d19fd..00000000 --- a/packages/comty/src/theme/index.js +++ /dev/null @@ -1,7 +0,0 @@ -const { resolve } = require('path'); -const lessToJs = require('less-vars-to-js'); -const fs = require('fs'); - -const convToVars = file => lessToJs(fs.readFileSync(resolve(__dirname, file), 'utf8')) - -module.exports = convToVars('./index.less') \ No newline at end of file diff --git a/packages/comty/src/theme/index.less b/packages/comty/src/theme/index.less deleted file mode 100644 index 0bdefb44..00000000 --- a/packages/comty/src/theme/index.less +++ /dev/null @@ -1 +0,0 @@ -@import './base/index.less';