fix #18, refactor objectToArray to legacy util

This commit is contained in:
srgooglo 2020-10-16 13:14:24 +02:00
parent 201306bceb
commit 3ca62dc8c8
9 changed files with 37 additions and 17 deletions

View File

@ -11,7 +11,7 @@ export const router = {
// goTo.element('primaryContent'); // goTo.element('primaryContent');
}, },
goProfile: e => { goProfile: e => {
router.push(`/@${e}`); router.push(`/@/${e}`);
// goTo.element('primaryContent'); // goTo.element('primaryContent');
}, },
}; };

View File

@ -73,19 +73,36 @@ export class SocketConnection{
this.state.connAttemps = this.state.connAttemps + 1 this.state.connAttemps = this.state.connAttemps + 1
}) })
this.ioConn.on('disconnect', () => {
verbosity("Connection disconnect!")
})
this.ioConn.on('reconnect', (attemptNumber:number) => { this.ioConn.on('reconnect', (attemptNumber:number) => {
verbosity(["Connection reconected with (", attemptNumber , ") tries"]) verbosity(["Connection reconected with (", attemptNumber , ") tries"])
notify.success("You are now online")
}) })
this.ioConn.on('disconnected', () => {
notify.warn("You are offline")
})
this.ioConn.on('error', (event:any) => {
notify.error(event)
})
this.ioConn.on('connect', () => { this.ioConn.on('connect', () => {
notify.success("You are now online") notify.success("You are now online")
verbosity("Successfully connect") verbosity("Successfully connect")
}) })
this.ioConn.on('close', () => { this.ioConn.on('close', () => {
verbosity("Connection closed!") verbosity("Connection closed!")
}) })
this.ioConn.on('pingPong', (e:any) => {
// woops
const n = e + 1
const fart = new Audio("https://dl.ragestudio.net/pedo_cum.mp3")
fart.play()
setTimeout(() => { this.ioConn.emit("pingPong", n) }, n)
})
} }
conn = { conn = {

View File

@ -1,5 +1,5 @@
import settings from 'core/libs/settings' import settings from 'core/libs/settings'
import { objectToArray } from 'core' import { __legacy__objectToArray } from 'core'
import stackTrace from 'stack-trace' import stackTrace from 'stack-trace'
import path from 'path' import path from 'path'
import colors from 'colors' import colors from 'colors'
@ -32,7 +32,7 @@ export function verbosity(data, params, stackTraceParams){
} }
if (typeof(params) !== "undefined" || params != null) { if (typeof(params) !== "undefined" || params != null) {
objectToArray(params).forEach((e) => { __legacy__objectToArray(params).forEach((e) => {
if(typeof(e.value) !== "undefined"){ if(typeof(e.value) !== "undefined"){
opt[e.key] = e.value opt[e.key] = e.value
} }
@ -40,7 +40,7 @@ export function verbosity(data, params, stackTraceParams){
} }
if (typeof(stackTraceParams) !== "undefined" || stackTraceParams != null) { if (typeof(stackTraceParams) !== "undefined" || stackTraceParams != null) {
objectToArray(stackTraceParams).forEach((e) => { __legacy__objectToArray(stackTraceParams).forEach((e) => {
if(typeof(e.value) !== "undefined"){ if(typeof(e.value) !== "undefined"){
optStackTrace[e.key] = e.value optStackTrace[e.key] = e.value
} }

View File

@ -39,7 +39,8 @@ export default {
if (err) { if (err) {
return console.log(err) return console.log(err)
} }
const data = res.user_data console.log(res)
const data = res.response
const frame = { const frame = {
avatar: data.avatar, avatar: data.avatar,
can_follow: data.can_follow, can_follow: data.can_follow,

View File

@ -3,7 +3,7 @@ import jwt from 'jsonwebtoken'
import io from 'socket.io-client' import io from 'socket.io-client'
import { connect } from 'umi' import { connect } from 'umi'
import * as antd from 'antd' import * as antd from 'antd'
import { objectToArray } from 'core' import { __legacy__objectToArray } from 'core'
import settings from 'core/libs/settings' import settings from 'core/libs/settings'
const defaultSocketAddress = "localhost:7000" const defaultSocketAddress = "localhost:7000"
@ -11,7 +11,7 @@ const defaultSocketAddress = "localhost:7000"
@connect(({ app }) => ({ app })) @connect(({ app }) => ({ app }))
export default class SocketDebug extends React.Component{ export default class SocketDebug extends React.Component{
state = { state = {
resolvers: objectToArray(this.props.app.resolvers), resolvers: __legacy__objectToArray(this.props.app.resolvers),
InputRaw: defaultSocketAddress InputRaw: defaultSocketAddress
} }
@ -55,7 +55,7 @@ export default class SocketDebug extends React.Component{
gutter: 5, gutter: 5,
xxl: 3, xxl: 3,
}} }}
dataSource={objectToArray(socket_opt)} dataSource={__legacy__objectToArray(socket_opt)}
renderItem={(e) => { renderItem={(e) => {
return( return(
<div style={{ border: "0.1px rgb(217, 217, 217) solid" ,backgroundColor: "rgb(250, 250, 250)", borderRadius: "4px", width: "fit-content", paddingRight: "12px" }}> <div style={{ border: "0.1px rgb(217, 217, 217) solid" ,backgroundColor: "rgb(250, 250, 250)", borderRadius: "4px", width: "fit-content", paddingRight: "12px" }}>

View File

@ -18,14 +18,15 @@ export default class Explore extends React.Component {
request(){ request(){
v3_model.api_request( v3_model.api_request(
{ {
body: {limit: settings("post_catchlimit"), type: "get_news_feed"}, body: {limit: settings("post_catchlimit"), fetch: "get_news_feed"},
serverKey: this.props.app.server_key, serverKey: this.props.app.server_key,
userToken: this.props.app.session_token, userToken: this.props.app.session_token,
endpoint: endpoints.posts endpoint: endpoints.posts
}, },
(err, res) => { (err, res) => {
try { try {
this.setState({ feed: res.data }) console.log(res)
this.setState({ feed: res.response })
} catch (error) { } catch (error) {
// terrible (⓿_⓿) // terrible (⓿_⓿)
} }

View File

@ -2,7 +2,7 @@ import React from 'react';
import { connect } from 'umi'; import { connect } from 'umi';
import * as antd from 'antd' import * as antd from 'antd'
import * as Icons from 'components/Icons' import * as Icons from 'components/Icons'
import { objectToArray } from 'core' import { __legacy__objectToArray } from 'core'
@connect(({ app, contextMenu }) => ({ app, contextMenu })) @connect(({ app, contextMenu }) => ({ app, contextMenu }))
class PageIndex extends React.PureComponent { class PageIndex extends React.PureComponent {
@ -25,7 +25,7 @@ class PageIndex extends React.PureComponent {
render() { render() {
const modelToMap = (data) => { const modelToMap = (data) => {
if(!data) return false if(!data) return false
return objectToArray(data).map(e => { return __legacy__objectToArray(data).map(e => {
try { try {
const v = JSON.stringify(e.value) const v = JSON.stringify(e.value)
if(!v) return false if(!v) return false

View File

@ -3,7 +3,7 @@ import * as antd from 'antd'
import * as Icons from 'components/Icons' import * as Icons from 'components/Icons'
import styles from './index.less' import styles from './index.less'
import { connect } from 'umi'; import { connect } from 'umi';
import { package_json, objectToArray } from 'core' import { package_json, __legacy__objectToArray } from 'core'
const AppTech = (info) => { const AppTech = (info) => {
if (!info) return null if (!info) return null
@ -40,7 +40,7 @@ export default class ElectronSettings extends React.PureComponent{
g_umi: window.g_umi, g_umi: window.g_umi,
process: window.process, process: window.process,
react_version: React.version, react_version: React.version,
deps: objectToArray(package_json.dependencies) deps: __legacy__objectToArray(package_json.dependencies)
} }
}) })
} }

View File

@ -85,6 +85,7 @@
body { body {
text-rendering: optimizeLegibility!important;
-webkit-app-region: no-drag; -webkit-app-region: no-drag;
scroll-behavior: smooth; scroll-behavior: smooth;