From 314205917778db959caac2c4b81eab210a5b59f8 Mon Sep 17 00:00:00 2001 From: srgooglo Date: Wed, 7 Oct 2020 15:11:43 +0200 Subject: [PATCH] refactor & other changes --- src/components/Layout/WindowNavbar/index.js | 4 +- src/components/ListedMenu/index.js | 0 src/components/PostCard/index.js | 2 +- src/components/PostCreator/index.js | 2 +- src/core/libs/errorhandler/index.js | 4 +- src/core/libs/socket/index.ts | 8 +-- src/models/app.js | 44 +++------------ src/pages/debug/debuggers/verbosity.js | 59 ++++++++++++++++++++- src/pages/debug/index.js | 2 +- 9 files changed, 76 insertions(+), 49 deletions(-) create mode 100644 src/components/ListedMenu/index.js diff --git a/src/components/Layout/WindowNavbar/index.js b/src/components/Layout/WindowNavbar/index.js index c604ee5b..8e38174a 100644 --- a/src/components/Layout/WindowNavbar/index.js +++ b/src/components/Layout/WindowNavbar/index.js @@ -7,13 +7,13 @@ import { connect } from 'umi'; export default class WindowNavbar extends React.Component{ handleMinimize(){ this.props.dispatch({ - type: "app/appControl", + type: "app/ipcInvoke", payload: "minimize-window" }) } handleClose(){ this.props.dispatch({ - type: "app/appControl", + type: "app/ipcInvoke", payload: "hide-window" }) } diff --git a/src/components/ListedMenu/index.js b/src/components/ListedMenu/index.js new file mode 100644 index 00000000..e69de29b diff --git a/src/components/PostCard/index.js b/src/components/PostCard/index.js index 90cca605..79aacba6 100644 --- a/src/components/PostCard/index.js +++ b/src/components/PostCard/index.js @@ -141,7 +141,7 @@ export default class PostCard extends React.Component {

router.go(`@${publisher.username}`)} className={styles.titleUser}> @{publisher.username} - {core.booleanFix(publisher.verified)? () : null} + {core.booleanFix(publisher.verified)? () : null} {core.booleanFix(publisher.nsfw_flag)? ( NSFW ) : null}

diff --git a/src/components/PostCreator/index.js b/src/components/PostCreator/index.js index 853ec017..3a35a078 100755 --- a/src/components/PostCreator/index.js +++ b/src/components/PostCreator/index.js @@ -281,7 +281,7 @@ class PostCreator extends React.PureComponent { > {this.state.uploader ? ( - + ) : ( )} diff --git a/src/core/libs/errorhandler/index.js b/src/core/libs/errorhandler/index.js index f96a4e00..f9cbb33a 100644 --- a/src/core/libs/errorhandler/index.js +++ b/src/core/libs/errorhandler/index.js @@ -9,7 +9,9 @@ export const INVALID_PROPS = `Some props failed!` // HANDLERS export const onError = { internal_proccess: (...rest) => { - verbosity({...rest}) + verbosity({...rest}, { + type: "error" + }) appInterface.notify.open({ message: INTERNAL_PROCESS_FAILED, description: diff --git a/src/core/libs/socket/index.ts b/src/core/libs/socket/index.ts index 45933007..d7db7a5a 100644 --- a/src/core/libs/socket/index.ts +++ b/src/core/libs/socket/index.ts @@ -1,5 +1,5 @@ import io from 'socket.io-client' -import { verbosityConsole } from 'core/libs/verbosity' +import { verbosity } from 'core/libs/verbosity' import { connect } from 'umi' import settings from 'core/libs/settings' @@ -63,11 +63,11 @@ export class SocketConnection{ this.conn.open() this.ioConn.on("connect_error", () => { if (this.state.connAttemps >= maxDeep_Attemp) { - verbosityConsole('Maximun nº of attemps reached => max', maxDeep_Attemp + 1) + verbosity(['Maximun nº of attemps reached => max', maxDeep_Attemp + 1]) this.conn.close() return false } - verbosityConsole(`Strike [${this.state.connAttemps + 1}] / ${maxDeep_Attemp + 1} !`) + verbosity([`Strike [${this.state.connAttemps + 1}] / ${maxDeep_Attemp + 1} !`]) this.state.connAttemps = this.state.connAttemps + 1 }) @@ -81,7 +81,7 @@ export class SocketConnection{ this.ioConn.disconnect() }, close: () => { - verbosityConsole("Connection closed!") + verbosity("Connection closed!") this.ioConn.close() }, destroy: () => { diff --git a/src/models/app.js b/src/models/app.js index 4a27c3b1..584d0b2c 100755 --- a/src/models/app.js +++ b/src/models/app.js @@ -94,28 +94,13 @@ export default { window.PluginGlobals = [] if (!service) { + } if (!sessionDataframe && session ) { yield put({ type: 'handleUpdateData' }) } - // if (session) { - // if (pathMatchRegexp(['/', '/login'], window.location.pathname)) { - // app.router.push({ pathname: `${app_config.MainPath}` }); - // } - - // return true; - // } else if ( - // !pathMatchRegexp(['', '/login'], window.location.pathname) && - // queryLayout(config.layouts, window.location.pathname) !== 'public' - // ) { - // if (validBackup == true) { - // // logout normal - // } else { - // core.router.push({ pathname: '/login' }); - // } - // } }, *logout({ payload }, { call, put, select }) { const uuid = yield select(state => state.app.session_uuid) @@ -131,9 +116,6 @@ export default { if (!payload) return false; const { user_id, access_token } = payload.authFrame yield put({ type: 'handleLogin', payload: { user_id, access_token, user_data: payload.dataFrame } }) - }, - *guestLogin({ payload }, { put, select }) { - }, *initializeSocket({payload}, {select}){ if(!payload) return false @@ -364,14 +346,15 @@ export default { } } }) - - }, - handleThemeChange(state, { payload }) { - state.theme = payload; }, handleCollapseSidebar(state, { payload }){ state.sidebar_collapsed = payload }, + handleUpdateTheme(state, { payload }) { + verbosity(payload) + store.set(app_config.appTheme_container, payload); + state.app_theme = payload + }, isUser(state, { payload, callback }){ if(!payload || !callback) return false switch (payload) { @@ -398,11 +381,6 @@ export default { } } }, - appControl(state, {payload}){ - if (!payload) return false - const ipc = state.electron.ipcRenderer - ipc.invoke(payload) - }, ipcInvoke(state, {payload}){ if (!payload || !state.embedded) { return false @@ -418,16 +396,6 @@ export default { const ipc = state.electron.ipcRenderer ipc.send(payload.key, payload.payload) }, - allNotificationsRead(state) { - state.notifications = []; - }, - - handleUpdateTheme(state, { payload }) { - verbosity(payload) - store.set(app_config.appTheme_container, payload); - state.app_theme = payload - }, - sessionErase(state) { state.service_valid = false; state.session_valid = false; diff --git a/src/pages/debug/debuggers/verbosity.js b/src/pages/debug/debuggers/verbosity.js index 1ce7c0ae..e40280ab 100644 --- a/src/pages/debug/debuggers/verbosity.js +++ b/src/pages/debug/debuggers/verbosity.js @@ -1,13 +1,70 @@ import React from 'react' import settings from 'core/libs/settings' +import verbosity from 'core/libs/verbosity' +import * as antd from 'antd' const verbosity_enabled = settings('verbosity') export default class Verbosity extends React.Component{ + state = { + + } + + componentDidMount(){ + verbosity("Single text test") + } + + handleSend(){ + const { raw0, raw1, color, type, method, line, file, time } = this.state + let data = [] + let params = { color, type} + let stackTraceParams = { line, file, time, method } + + if (typeof(raw0) !== "undefined") { + data[0] = raw0 + } + if (typeof(raw1) !== "undefined") { + data[1] = raw1 + } + + verbosity( + data, + params, + stackTraceParams + ) + } + render(){ + const handleRawChange = (e) => { + const obj = {} + obj[e.target.id] = e.target.value + this.setState(obj) + } + const handleCheckChange = (e) => { + const obj = {} + obj[e.target.id] = e.target.checked + this.setState(obj) + } return(
verbosity => {verbosity_enabled ? "enabled" : "disabled"} - + + + +
+ this.handleSend()}> send + {this.setState({ type: e})}} > + log + debug + error + + handleRawChange(e)} placeholder="color" /> + method + line + file + time + +
+
) } diff --git a/src/pages/debug/index.js b/src/pages/debug/index.js index c6a16d62..40240d05 100644 --- a/src/pages/debug/index.js +++ b/src/pages/debug/index.js @@ -56,7 +56,7 @@ const menuList = [ export default class Debug extends React.Component { state = { loading: true, - selectKey: '', + selectKey: 'verbosity', menus: [] }