From cf73fac82a3d4b296aa28d18479e23e76d5d8d28 Mon Sep 17 00:00:00 2001 From: srgooglo <38926803+srgooglo@users.noreply.github.com> Date: Thu, 13 Feb 2020 22:40:20 +0100 Subject: [PATCH] Settings and DevOptions Fix --- .umirc.js | 1 + config/app.settings.js | 16 ++++++++++++ config/ycore.config.js | 36 ++------------------------- globals/endpoints.js | 22 ++++++++++++++++ globals/settings.js | 6 ++--- src/@ycore/libs/yulio_id/pre.js | 6 ++--- src/@ycore/ycore_worker.js | 23 +++++++++++------ src/components/UserProfile/index.js | 1 + src/pages/settings/components/base.js | 15 +++-------- 9 files changed, 66 insertions(+), 60 deletions(-) create mode 100644 config/app.settings.js create mode 100644 globals/endpoints.js diff --git a/.umirc.js b/.umirc.js index 9412f468..9cd6fc22 100644 --- a/.umirc.js +++ b/.umirc.js @@ -65,6 +65,7 @@ export default { alias: { ycore: resolve(__dirname, './src/@ycore/ycore_worker.js'), api: resolve(__dirname, './src/services/'), + globals: resolve(__dirname, './globals'), components: resolve(__dirname, './src/components'), config: resolve(__dirname, './config/ycore.config.js'), models: resolve(__dirname, './src/models'), diff --git a/config/app.settings.js b/config/app.settings.js new file mode 100644 index 00000000..1c05e2b2 --- /dev/null +++ b/config/app.settings.js @@ -0,0 +1,16 @@ +import {ReturnDevOption} from 'ycore' +export var DevOptions = { + // Global Behaviors + InfiniteLoading: false, + InfiniteLogin: false, + InfiniteRegister: false, + DisableLogin: false, + DisableRegister: true, + DisablePasswordRecover: true, + // Activating this, the logs must be trowed + ShowFunctionsLogs: ReturnDevOption('force_showDevLogs'), + StrictLightMode: ReturnDevOption('strict_lightMode'), + SignForNotExpire: ReturnDevOption('force_showDevLogs'), + MaxJWTexpire: '1556952', + MaxLengthPosts: '512' +} \ No newline at end of file diff --git a/config/ycore.config.js b/config/ycore.config.js index 0a073f9d..91a9f37e 100644 --- a/config/ycore.config.js +++ b/config/ycore.config.js @@ -25,40 +25,8 @@ module.exports = { server_key: "f706b0a535b6c2d36545c4137a0a3a26853ea8b5-1223c9ba7923152cae28e5a2e7501b2b-50600768", openwheater_apiKey:'2acf34be0b8f033b89ba4de1e674d42a', }, - Endpoints: { - get_user_posts: "https://api.ragestudio.net/RS-YIBTP/yid/posts?access_token=", - find_user: "https://api.ragestudio.net/RS-YIBTP/yid/find_user?access_token=", - search_endpoint: "https://api.ragestudio.net/RS-YIBTP/yid/search?access_token=", - get_sessions: "https://api.ragestudio.net/RS-YIBTP/yid/session_id?access_token=", - auth_endpoint: "https://api.ragestudio.net/RS-YIBTP/yid/auth", - new_post: "https://api.ragestudio.net/RS-YIBTP/yid/new_post?access_token=", - get_servicesHandler: 'https://api.ragestudio.net/RS-YIBTP/rs/servicesHandler', - get_modhandler: "https://api.ragestudio.net/RS-YIBTP/rs/modHandler", - get_subscriptionHandler: "https://api.ragestudio.net/RS-YIBTP/rs/subscriptionHandler", - get_marketplace_global: "https://api.ragestudio.net/RS-YIBTP/rs/marketplaceHandler?access_token=", - get_config_endpoint: "https://api.ragestudio.net/RS-YIBTP/yid/get-site-settings?access_token=", - get_userData_endpoint: "https://api.ragestudio.net/RS-YIBTP/yid/get-user-data?access_token=", - get_userPostFeed: "https://api.ragestudio.net/RS-YIBTP/yid/posts?access_token=", - update_userData_endpoint: "https://api.ragestudio.net/RS-YIBTP/yid/update-user-data?access_token=", - removeToken: "https://api.ragestudio.net/RS-YIBTP/yid/delete-access-token?access_token=", - register_endpoint: "https://api.ragestudio.net/RS-YIBTP/yid/create-account", - resetPassword_endpoint: "https://api.ragestudio.net/RS-YIBTP/yid/send-reset-password-email?access_token=", - logotype_uri: 'https://api.ragestudio.net/branding/svg/STUDIO-JETBLACK-Generic_template.png', - }, - DevOptions: { - defaultSettings: [{id: 'strict_lightMode', value: false}, {id: 'force_collapse', value: false}, {id: 'force_showDevLogs', value: true}], - // Global Behaviors - InfiniteLoading: false, - InfiniteLogin: false, - InfiniteRegister: false, - DisableLogin: false, - DisableRegister: true, - DisablePasswordRecover: true, - // Activating this, the logs must be trowed - ShowFunctionsLogs: true, - StrictLightMode: false, - MaxLengthPosts: '512' - }, + + /* I18n configuration, `languages` and `defaultLanguage` are required currently. */ i18n: { /* Countrys flags: https://www.flaticon.com/packs/countrys-flags */ diff --git a/globals/endpoints.js b/globals/endpoints.js new file mode 100644 index 00000000..6f9faf8f --- /dev/null +++ b/globals/endpoints.js @@ -0,0 +1,22 @@ +module.exports = { + Endpoints: { + get_user_posts: "https://api.ragestudio.net/RS-YIBTP/yid/posts?access_token=", + find_user: "https://api.ragestudio.net/RS-YIBTP/yid/find_user?access_token=", + search_endpoint: "https://api.ragestudio.net/RS-YIBTP/yid/search?access_token=", + get_sessions: "https://api.ragestudio.net/RS-YIBTP/yid/session_id?access_token=", + auth_endpoint: "https://api.ragestudio.net/RS-YIBTP/yid/auth", + new_post: "https://api.ragestudio.net/RS-YIBTP/yid/new_post?access_token=", + get_servicesHandler: 'https://api.ragestudio.net/RS-YIBTP/rs/servicesHandler', + get_modhandler: "https://api.ragestudio.net/RS-YIBTP/rs/modHandler", + get_subscriptionHandler: "https://api.ragestudio.net/RS-YIBTP/rs/subscriptionHandler", + get_marketplace_global: "https://api.ragestudio.net/RS-YIBTP/rs/marketplaceHandler?access_token=", + get_config_endpoint: "https://api.ragestudio.net/RS-YIBTP/yid/get-site-settings?access_token=", + get_userData_endpoint: "https://api.ragestudio.net/RS-YIBTP/yid/get-user-data?access_token=", + get_userPostFeed: "https://api.ragestudio.net/RS-YIBTP/yid/posts?access_token=", + update_userData_endpoint: "https://api.ragestudio.net/RS-YIBTP/yid/update-user-data?access_token=", + removeToken: "https://api.ragestudio.net/RS-YIBTP/yid/delete-access-token?access_token=", + register_endpoint: "https://api.ragestudio.net/RS-YIBTP/yid/create-account", + resetPassword_endpoint: "https://api.ragestudio.net/RS-YIBTP/yid/send-reset-password-email?access_token=", + logotype_uri: 'https://api.ragestudio.net/branding/svg/STUDIO-JETBLACK-Generic_template.png', + } +} \ No newline at end of file diff --git a/globals/settings.js b/globals/settings.js index 5f78d590..71f3719b 100644 --- a/globals/settings.js +++ b/globals/settings.js @@ -6,7 +6,7 @@ function StorageValued(e){ const fr = Ite.filter(Boolean) return fr.toString() } -export default [ +export var AppSettings = [ { "SettingID": "strict_lightMode", "title": "Strict Light Mode", @@ -23,7 +23,7 @@ export default [ "SettingID": "force_showDevLogs", "title": "Show Functions Logs", "description": "Show all console logs... [Developer]", - "value": StorageValued('force_showDevLogs') || true + "value": StorageValued('force_showDevLogs') || false }, { "SettingID": "sessions_noexpire", @@ -31,4 +31,4 @@ export default [ "description": "Force the app to not expire any session... [Developer]", "value": StorageValued('sessions_noexpire') || true } -] \ No newline at end of file +] diff --git a/src/@ycore/libs/yulio_id/pre.js b/src/@ycore/libs/yulio_id/pre.js index e5d8f9d9..5fba4dd3 100644 --- a/src/@ycore/libs/yulio_id/pre.js +++ b/src/@ycore/libs/yulio_id/pre.js @@ -7,16 +7,16 @@ var jquery = require("jquery"); var jwt = require("jsonwebtoken") function __API__User (payload){ - var ExpireTime = '1556952' + var ExpireTime = ycore.DevOptions.MaxJWTexpire const now = new Date() now.setDate(now.getDate() + 1) const { UserID, UserToken } = payload - const frame = { UserID, UserToken, deadline: now.getTime()} + const frame = { UserID, UserToken, deadline: ( ycore.DevOptions.SignForNotExpire? null : now.getTime() )} console.debug(frame) jwt.sign( frame, keys.secretOrKey, - { expiresIn: ExpireTime }, + ycore.DevOptions.SignForNotExpire? { expiresIn: '0' } : { expiresIn: ExpireTime }, (err, token) => { Cookies.set('token', token) ycore.RefreshONCE() diff --git a/src/@ycore/ycore_worker.js b/src/@ycore/ycore_worker.js index 960f1b09..eae4b9ba 100644 --- a/src/@ycore/ycore_worker.js +++ b/src/@ycore/ycore_worker.js @@ -1,18 +1,25 @@ +import {AppSettings} from '../../globals/settings.js' +import {Endpoints} from 'globals/endpoints.js' import umiRouter from 'umi/router'; import * as antd from "antd" - +import config from 'config' import './libs.js' -export * from "./libs.js" -import * as AppSettings from '../../globals/settings.js' -export var DevOptions = AppSettings; +export * from "./libs.js" +export * from "../../config/app.settings.js" +export var { router } = require("utils") +export var endpoints = Endpoints; +export var yConfig = config.yConfig; var package_json = require("../../package.json"); -var config = require("config"); -export var { router } = require("utils") -export var endpoints = config.Endpoints; -export var yConfig = config.yConfig; +export function ReturnDevOption(e){ + const Ite = AppSettings.map(item => { + return item.SettingID === e? item.value : null + }) + const fr = Ite.filter(Boolean) + return fr.toString() +} export function booleanFix(e){ if(e == 1){ diff --git a/src/components/UserProfile/index.js b/src/components/UserProfile/index.js index bf74d818..02d7aa7d 100644 --- a/src/components/UserProfile/index.js +++ b/src/components/UserProfile/index.js @@ -28,6 +28,7 @@ const UserHeader = ({ values }) => {
+ {ycore.DevOptions.ShowFunctionsLogs? 'si' : 'sad'}

{values.username}{ycore.booleanFix(values.verified)? : null}

{values.about}
diff --git a/src/pages/settings/components/base.js b/src/pages/settings/components/base.js index ab14d826..7acd980f 100644 --- a/src/pages/settings/components/base.js +++ b/src/pages/settings/components/base.js @@ -1,15 +1,13 @@ import React, { Component, Fragment } from 'react'; import { List, Icon, Switch, Button, notification } from 'antd'; -import Settings from '../../../../globals/settings.js' +import { AppSettings } from '../../../../globals/settings.js' import { DevOptions, ControlBar } from 'ycore' -import update from 'immutability-helper' class Base extends Component { constructor(props){ super(props), this.state = { - SettingRepo: Settings, - backupSettings: JSON.parse(localStorage.getItem('app_settings')) || Settings, + SettingRepo: AppSettings, forSave: false } } @@ -21,7 +19,6 @@ class Base extends Component { } SettingRender = data =>{ try{ - const {SettingRepo} = this.state return( -
) ] ControlBar.set(ListControls) } - handleCancel(){ - const back = this.state.backupSettings; - this.setState({ SettingRepo: back, forSave: false}) - DevOptions.ShowFunctionsLogs? console.log(`Restored ${JSON.stringify(back)}`) : null - ControlBar.close() - } + saveChanges(){ localStorage.setItem('app_settings', JSON.stringify(this.state.SettingRepo)) this.setState({ forSave: false })