clean themes

This commit is contained in:
srgooglo 2020-11-17 15:09:09 +01:00
parent 2bb5adb423
commit d7b890fbeb
21 changed files with 34670 additions and 332 deletions

View File

@ -7,6 +7,7 @@ module.exports = {
siteName: 'Comty™',
copyright: 'RageStudio©',
MainPath: '/',
defaultStyleClass: "app_",
LogoPath: '/logo.svg',
FullLogoPath: '/full_logo.svg',

34573
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,7 @@
{
"name": "comty-development",
"name": "comty",
"UUID": "C8mVSr-4nmPp2-pr5Vrz-CU4kg4",
"version": "0.10.29",
"version": "0.11.15",
"stage": "alpha",
"description": "An prototype of a social network",
"author": "RageStudio",
@ -41,7 +41,7 @@
"@ragestudio/nodecore-utils": "^0.1.18",
"@types/jest": "^26.0.15",
"@types/lodash": "^4.14.162",
"antd": "^4.8.0",
"antd": "^4.8.2",
"axios": "^0.21.0",
"babel-core": "^6.26.3",
"classnames": "^2.2.6",
@ -50,7 +50,6 @@
"cookie_js": "^1.4.0",
"cryptr": "^6.0.2",
"dotenv": "^8.2.0",
"dutier": "^1.1.4",
"electron-config": "^2.0.0",
"electron-is": "^3.0.0",
"electron-log": "^4.2.4",
@ -61,13 +60,11 @@
"feather-reactjs": "^2.0.13",
"howler": "^2.2.1",
"html2canvas": "^1.0.0-rc.7",
"jquery": "^3.5.1",
"jsonwebtoken": "^8.5.1",
"less-vars-to-js": "^1.3.0",
"localforage": "^1.7.4",
"lodash": "^4.17.19",
"moment": "^2.28.0",
"nprogress": "^0.2.0",
"path-to-regexp": "^6.1.0",
"platform": "^1.3.6",
"react": "^16.14.0",
@ -81,7 +78,6 @@
"react-helmet": "^5.2.1",
"react-linkify": "^1.0.0-alpha",
"react-perfect-scrollbar": "^1.5.8",
"react-redux": "^7.2.2",
"react-resizable": "^1.11.0",
"react-reveal": "^1.2.2",
"react-rnd": "^10.2.3",
@ -94,7 +90,6 @@
"stack-trace": "0.0.10",
"store": "^2.0.12",
"timeago.js": "^4.0.2",
"ts-jest": "^26.4.3",
"wait-on": "^5.2.0"
},
"devDependencies": {

View File

@ -10,17 +10,17 @@
background-color: transparent;
border: 0!important;
outline: 0!important;
color: @AppTheme_global_color_accent;
color: @__app_backgroundAccent;
padding: 0 0 0 48px;
background-image: url("data:image/svg+xml;charset=UTF-8,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 56.966 56.966' fill='%23c1c7cd'%3e%3cpath d='M55.146 51.887L41.588 37.786A22.926 22.926 0 0046.984 23c0-12.682-10.318-23-23-23s-23 10.318-23 23 10.318 23 23 23c4.761 0 9.298-1.436 13.177-4.162l13.661 14.208c.571.593 1.339.92 2.162.92.779 0 1.518-.297 2.079-.837a3.004 3.004 0 00.083-4.242zM23.984 6c9.374 0 17 7.626 17 17s-7.626 17-17 17-17-7.626-17-17 7.626-17 17-17z'/%3e%3c/svg%3e");
background-repeat: no-repeat;
background-size: 16px;
background-position: 0 48%;
font-family: @__Global_texted_font;
font-family: @__app_secondaryFont;
font-weight: 600;
font-size: 15px;
&::placeholder {
color: @AppTheme_global_color_accent;
color: @__app_backgroundAccent;
}
transition: all 150ms ease-in-out;

View File

@ -3,7 +3,6 @@
.render_component {
width: 100%;
height: 100%;
// box-shadow: 0px 24px 64px rgba(45, 48, 58, 0.06);
background-color: #fff;
border-radius: 8px;
@ -67,7 +66,7 @@
max-width: calc(100% + 150px);
}
transition: all @__Global_SwapAnimDuration ease-in-out;
transition: all @__app_SwapDuration ease-in-out;
}
.overlay_primary_wrapper {
@ -84,7 +83,7 @@
padding: 30px 30px 30px 35px;
@media (max-width: @bp-medium) {
@media (max-width: @screen-md) {
padding: 30px 5px;
}
@ -126,7 +125,7 @@
}
}
transition: all @__Global_SwapAnimDuration ease-in-out;
transition: all @__app_SwapDuration ease-in-out;
border-radius: @__Global_layout_border-rd;
}
@ -152,7 +151,7 @@
}
transition: all @__Global_SwapAnimDuration ease-in-out;
transition: all @__app_SwapDuration ease-in-out;
}
@ -161,7 +160,7 @@
height: 87vh;
overflow: hidden;
margin: 20px 0 0;
font-family: @__Global_general_font_family;
font-family: @__app_generalFont;
h2 {
color: #ffffff;
}

View File

@ -6,11 +6,11 @@
user-select: none;
border-color: transparent;
font-size: 15px;
font-family: @__Global_texted_font;
font-family: @__app_secondaryFont;
font-weight: 600;
width: 65%;
height: 100%;
height: 100vh;
z-index: 40;
float: left;
@ -34,7 +34,6 @@
}
}
.left_sider_header {
cursor: pointer;
margin: 15px 0 0 22px;
@ -104,9 +103,7 @@
border-radius: 8px;
transform: translate(10px,0);
// background: linear-gradient(49deg, rgba(255,255,255,1) 32%, rgba(255, 255, 255, 0) 100%);
backdrop-filter: blur(2px);
// border-left: 10px @app_accent_gradient solid;
box-shadow: -2px 2px 1px 0 rgba(51, 51, 51, 0.13);
color: rgb(102, 102, 102);
}
@ -133,7 +130,7 @@
}
.ant-menu-item a {
color: @AppTheme_global_color;
color: @__app_color;
}
}
}

View File

@ -13,7 +13,7 @@
border-color: transparent;
font-size: 13px;
font-family: @__Global_general_font_family;
font-family: @__app_generalFont;
padding: 0 27px;
:global {

View File

@ -5,7 +5,7 @@
-webkit-app-region: drag;
text-align: right;
height: @AppTheme_global_winavbar_height;
height: @__app_winavar_height;
width: 100%;
position: absolute;
z-index: 5000;
@ -17,7 +17,7 @@
.navbar:hover{
background-color: rgba(54, 54, 54, 0.65);
height: calc(@AppTheme_global_winavbar_height + @aumentSize);
height: calc(@__app_winavar_height + @aumentSize);
}
.controls{

View File

@ -7,7 +7,7 @@
position: absolute;
z-index: 20;
background: @post_card_flaggedWarning_backgroud;
font-family: @__Global_general_font_family;
font-family: @__app_generalFont;
padding: @post_card_flaggedWarning_padding;
:global {
@ -151,7 +151,7 @@
.titleUser {
display: flex;
font-family: @__Global_general_font_family;
font-family: @__app_generalFont;
margin: 0 0 0 50px;
}
@ -185,7 +185,7 @@
h3 {
user-select: all;
font-family: @__Global_general_font_family;
font-family: @__app_generalFont;
color: @post_card_wrapper_post_content_color;
font-weight: @post_card_wrapper_post_content_weight;
font-size: @post_card_wrapper_post_content_fontSize;

View File

@ -8,6 +8,7 @@ export function parseLocalStorage(){
console.log(error)
}
}
export function newSetting(key, value) {
let setting = {}
setting.id = key

View File

@ -2,7 +2,6 @@ import React from 'react'
import PropTypes from 'prop-types'
import { Helmet } from 'react-helmet'
import { Loader } from 'components'
import NProgress from 'nprogress'
import { withRouter, connect } from 'umi'
import { queryLayout } from 'core'
import WindowNavbar from 'components/Layout/WindowNavbar'
@ -11,7 +10,8 @@ import { Splash } from 'components'
import PrimaryLayout from './PrimaryLayout'
import PublicLayout from './PublicLayout'
import './BaseLayout.less'
import 'theme'
const LayoutMap = {
primary: PrimaryLayout,
@ -30,12 +30,10 @@ class BaseLayout extends React.Component {
const currentPath = location.pathname + location.search
if (currentPath !== this.previousPath) {
NProgress.start()
this.renderLoading = true
}
if (!loading.global) {
NProgress.done()
this.previousPath = currentPath
this.renderLoading = false
}

View File

@ -1,74 +0,0 @@
@import '~theme/index.less';
:global {
#nprogress {
pointer-events: none;
.bar {
background: transparent;
position: fixed;
z-index: 2048;
top: 0;
left: 0;
right: 0;
width: 100%;
height: 2px;
}
.peg {
display: block;
position: absolute;
right: 0;
width: 100px;
height: 100%;
box-shadow: 0 0 10px @primary-color, 0 0 5px @primary-color;
opacity: 1;
transform: rotate(3deg) translate(0, -4px);
}
.spinner {
display: block;
position: fixed;
z-index: 1031;
top: 15px;
right: 15px;
}
.spinner-icon {
width: 18px;
height: 18px;
box-sizing: border-box;
border: solid 2px transparent;
border-top-color: @primary-color;
border-left-color: @primary-color;
border-radius: 50%;
:local {
animation: nprogress-spinner 400ms linear infinite;
}
}
}
.nprogress-custom-parent {
overflow: hidden;
position: relative;
#nprogress {
.bar,
.spinner {
position: absolute;
}
}
}
}
@keyframes nprogress-spinner {
0% {
transform: rotate(0deg);
}
100% {
transform: rotate(360deg);
}
}

View File

@ -1,5 +1,3 @@
/* global window */
/* global document */
import React from 'react'
import PropTypes from 'prop-types'
import { withRouter, connect } from 'umi'
@ -14,9 +12,8 @@ import { app } from 'config'
import { theme } from 'core/libs/style'
import * as antd from 'antd'
import contextMenuList from 'globals/contextMenu'
import styles from './PrimaryLayout.less'
import ReduxDebugger from 'debuggers/redux'
import styles from 'theme'
const { Content } = antd.Layout
const { Sider, Overlay } = AppLayout
@ -140,10 +137,10 @@ class PrimaryLayout extends React.Component {
[styles.mobile]: isMobile
})}>
<Sider {...SiderProps} />
<div className={styles.primary_layout_container}>
<div className={window.classToStyle("layout_container")}>
<Content
id="primaryContent"
className={styles.primary_layout_content}
className={window.classToStyle("layout_container")}
>
{children ? children : null}
</Content>

View File

@ -1,42 +0,0 @@
@import '~theme/index.less';
// PRIMARY LAYOUT
.primary_layout_container {
background-color: transparent;
transition: all 150ms ease-in-out;
backdrop-filter: blur(2px);
overflow-x: hidden;
// overflow-y: overlay;
width: auto;
height: 100%;
padding: 15px 0;
align-self: baseline;
position: relative;
bottom: 0;
display: flex;
align-self: center;
max-width: 750px;
min-width: 570px;
@media (min-width: @bp-medium) {
min-width: 750px;
}
@media (min-width: @bp-xlarge) {
min-width: 1112px;
}
}
.primary_layout_content {
vertical-align: middle;
width: 100%;
padding: @primary_layout_content_padding;
transition: all 150ms ease-in-out;
@media (min-width: @bp-medium) {
padding: 0;
}
}

View File

@ -1,5 +1,5 @@
import store from 'store'
import { app } from 'config'
import config from 'config'
import keys from 'config/app_keys'
import { session } from 'core/models'
import { router, verbosity, ui } from 'core/libs'
@ -19,6 +19,7 @@ export default {
fadeout: false
},
queryDone: false,
style_prefix: config.app.defaultStyleClass ?? "app_",
env_proccess: process.env,
server_key: keys.server_key,
@ -37,8 +38,8 @@ export default {
dispatcher: null,
electron: null,
app_settings: store.get(app.storage_appSettings) || [],
app_theme: store.get(app.storage_theme) || [],
app_settings: store.get(config.app.storage_appSettings) || [],
app_theme: store.get(config.app.storage_theme) || [],
notifications: [],
},
subscriptions: {
@ -84,6 +85,26 @@ export default {
window.PluginGlobals = []
window.Internal = []
window.classToStyle = (key) => {
if (typeof (key) !== "string") {
try {
const toString = JSON.stringify(key)
console.log(toString)
if (toString) {
return toString
} else {
return null
}
} catch (error) {
return null
}
}
if (typeof (state.style_prefix) !== "undefined") {
return `${state.style_prefix}${key}`
}
return key
}
queryIndexer([
{
match: '/s;:id',
@ -260,7 +281,7 @@ export default {
},
callback: (callbackResponse) => {
try {
sessionStorage.setItem(app.storage_dataFrame, btoa(JSON.stringify(callbackResponse.response)))
sessionStorage.setItem(config.app.storage_dataFrame, btoa(JSON.stringify(callbackResponse.response)))
return state.dispatcher({ type: "updateState", payload: { session_data: callbackResponse.response } })
} catch (error) {
verbosity([error])
@ -294,8 +315,8 @@ export default {
},
*updateFrames({ payload }, { select, put }) {
try {
let sessionAuthframe = cookie.get(app.storage_authFrame)
let sessionDataframe = atob(sessionStorage.getItem(app.storage_dataFrame))
let sessionAuthframe = cookie.get(config.app.storage_authFrame)
let sessionDataframe = atob(sessionStorage.getItem(config.app.storage_dataFrame))
if (sessionAuthframe) {
try {
@ -309,7 +330,7 @@ export default {
}
})
} catch (error) {
cookie.remove(app.storage_authFrame)
cookie.remove(config.app.storage_authFrame)
}
}
if (sessionDataframe) {
@ -347,12 +368,12 @@ export default {
state.session_authframe = jwt.decode(payload.token)
state.session_valid = true
cookie.set(app.storage_authFrame, payload.token)
sessionStorage.setItem(app.storage_dataFrame, btoa(JSON.stringify(payload.dataFrame)))
cookie.set(config.app.storage_authFrame, payload.token)
sessionStorage.setItem(config.app.storage_dataFrame, btoa(JSON.stringify(payload.dataFrame)))
},
handleUpdateTheme(state, { payload }) {
verbosity([payload])
store.set(app.storage_theme, payload)
store.set(config.app.storage_theme, payload)
state.app_theme = payload
},
requireQuery(state, { payload, callback }) {
@ -401,7 +422,7 @@ export default {
state.session_data = null;
state.session_token = null;
state.session_authframe = null;
cookie.remove(app.storage_authFrame)
cookie.remove(config.app.storage_authFrame)
sessionStorage.clear()
location.reload()
},

View File

@ -5,7 +5,6 @@ import { user, session } from 'core/models'
import { router, verbosity, ui } from 'core/libs'
import settings from 'core/libs/settings'
import { __legacy__objectToArray } from 'core'
import { Howl, Howler } from 'howler'
import SocketConnection from 'core/libs/socket/index.ts'

View File

@ -1,13 +1,8 @@
// @import '../../../node_modules/antd/lib/style/themes/dark.less';
// @import '../../../node_modules/antd/dist/antd.dark.css';
@import '../../../node_modules/antd/lib/style/themes/dark.less';
@import '../../../node_modules/antd/lib/style/themes/default.less';
@import './vars.less';
@import './fonts-import.css';
@import './resolutions.less';
@import './layout/Overlay.less';
@import './layout/Primary_Layout.less';
@import './layout/LeftSider.less';
@ -18,6 +13,7 @@
width: 14px;
height: 18px;
}
::-webkit-scrollbar-thumb {
height: 6px;
border: 4px solid rgba(0, 0, 0, 0);
@ -40,7 +36,6 @@
&.interfaced{
.primary_layout_container{
height: 98%;
//height: calc(100% - @AppTheme_global_winavbar_height)!important;
}
}
@ -58,12 +53,11 @@
}
&.dark_mode{
:global{
filter: invert(100%);
img, svg, video {
filter: invert(100%);
color: @AppTheme_global_background;
color: @__app_background;
}
}
}
@ -83,11 +77,10 @@
height: 100vh;
width: 100vw;
transition: all @__Global_Components_transitions_dur linear;
transition: all 150ms linear;
}
body {
text-rendering: optimizeLegibility!important;
-webkit-app-region: no-drag;
@ -97,62 +90,72 @@ body {
overflow: hidden;
font-size: @base-font-size;
line-height: @base-line-height;
font-size: 1em;
font-family: @__Global_texted_font;
color: @AppTheme_global_color!important;
background-color: @AppTheme_global_background;
font-family: @__app_secondaryFont;
color: @__app_color!important;
background-color: @__app_background;
&.dark{
background-color: @AppTheme_global_color;
background-color: @__app_color;
}
}
@media (max-width: @bp-small){
@media (max-width: @screen-sm){
::-webkit-scrollbar{
display: none;
}
}
// @media (min-width: @bp-medium) {
// }
// @media (min-width: @bp-large) {
// }
// @media (min-width: @bp-xlarge) {
// }
// @media (min-width: @bp-xxlarge) {
// }
.text-overflow {
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
.text-gradient {
background-image: -webkit-gradient(
linear,
37.219838% 34.532506%,
36.425669% 93.178216%,
from(#29cdff),
to(#0a60ff),
color-stop(0.37, #148eff)
);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
}
.background-hover {
transition: @transition-ease-in;
&:hover {
background-color: @hover-color;
@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) {
// }
.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;
}

View File

@ -1,4 +1,4 @@
@left_sider_color: @AppTheme_global_color;
@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);

View File

@ -1,14 +0,0 @@
@Overlay_wrapper_maxwidth: 23vw;
@Overlay_container1_def_color: #201F23;
@Overlay_container1_active_color: #fff;
@Overlay_container1_def_backgroud: @primary_layout_backgroud;
@Overlay_container1_active_backgroud: #2d2d2d;
@Overlay_container2_active_width: 35vw;
@Overlay_container2_color: #201F23;
@Overlay_container2_backgroud: #fff;
@Overlay_container1_padding: 30px 70px 30px 75px;
@Overlay_container2_padding: 20px 15px 15px 15px;

View File

@ -1,20 +0,0 @@
@bp-small: 48em; // 768px
@bp-medium: 64em; // 1024px
@bp-large: 85.375em; // 1366px
@bp-xlarge: 120em; // 1920px
@bp-xxlarge: 160em; // 2560px
// Media Queries
@mq-small: "min-width: @bp-small";
@mq-medium: "(min-width: @bp-medium)";
@mq-large: "(min-width: @bp-large)";
@mq-xlarge: "(min-width: @bp-xlarge)";
@mq-xxlarge: "(min-width: @bp-xxlarge)";
@mq-retina: "(-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi)";
// Font-Size
@base-font-size: 1em;
// Line-Height
@base-line-height: 1.5;
@header-line-height: 1.25;

View File

@ -1,17 +1,18 @@
@__app_background: rgb(249, 249, 249);
@__app_backgroundAccent: rgb(162, 162, 162);
@__app_color: rgb(51, 51, 51);
@__app_Accent:#2d2d2d;
@AppTheme_global_color_accent: rgb(162, 162, 162);
@__app_winavar_height: 25px;
@AppTheme_global_color: rgb(51, 51, 51);
@AppTheme_global_background: rgb(248, 246, 248);
@__app_generalFont: "Poppins", sans-serif;
@__app_secondaryFont: "Manrope", sans-serif;
@AppTheme_global_color_dark: rgb(162, 162, 162);
@AppTheme_global_background_dark: rgb(51, 51, 51);
@__app_SwapDuration: 170ms;
@AppTheme_global_winavbar_height: 25px;
@__Global_general_font_family: "Poppins", sans-serif;
@__Global_texted_font: "Manrope", sans-serif;
@__Global_alternative_font: "Netflix Sans", sans-serif;
@__app_layout_content_padding: 0 40px 20px 0;
@__Global_layout_backgroud: #F9F9F9;
@__Global_layout_color: #2d2d2d;
@ -19,10 +20,6 @@
@__Global_layout_transitions-dur: 200ms;
@__Global_Components_transitions_dur: 150ms;
@__Global_SwapAnimDuration: 170ms;
@__Global_backdrop_backgroud: rgba(158, 158, 158, 0.5);
@app_accent_gradient: linear-gradient(90deg, rgba(237,111,86,1) 0%, rgba(234,89,89,1) 100%);
@transition-ease-in: all 0.3s ease-out;
@transition-ease-out: all 0.3s ease-out;
@ -33,26 +30,19 @@
@Overlay_wrapper_showFull_width: 94.2%;
@Overlay_wrapper_showHalf_width: 35vw;
@Overlay_container_1_btn_backgroud: #4c4c4c;
@Overlay_container_1_btn_color: #fff;
@Overlay_container_1_btn_shadow: 0px 0px 10px 0px rgba(255, 255, 255, 0.205);
@border-radius-base: 3px;
@border-radius-sm: 2px;
@shadow-color: rgba(0, 0, 0, 0.05);
@shadow-1-down: 4px 4px 40px @shadow-color;
@border-color-split: #f4f4f4;
@border-color-base: #e5e5e5;
@font-size-base: 13px;
@text-color: #666;
@hover-color: #f9f9fc;
@dark-half: #494949;
@purple: #d897eb;
@shadow-1: 4px 4px 20px 0 rgba(0, 0, 0, 0.01);
@shadow-2: 4px 4px 40px 0 rgba(0, 0, 0, 0.05);
@transition-ease-in: all 0.3s ease-out;
@transition-ease-out: all 0.3s ease-out;
@ease-in: ease-in;
@Overlay_wrapper_maxwidth: 23vw;
@Overlay_container1_def_color: #201F23;
@Overlay_container1_active_color: #fff;
@Overlay_container2_active_width: 35vw;
@Overlay_container2_color: #201F23;
@Overlay_container2_backgroud: #fff;
@Overlay_container1_padding: 30px 70px 30px 75px;
@Overlay_container2_padding: 20px 15px 15px 15px;