-
-
-
+
+
+
+
{children}
-
+
diff --git a/src/layouts/PrimaryLayout.less b/src/layouts/PrimaryLayout.less
index 55b6e20f..e23ff3ed 100644
--- a/src/layouts/PrimaryLayout.less
+++ b/src/layouts/PrimaryLayout.less
@@ -19,12 +19,18 @@
}
.content {
- height: 100vh;
- /* width: 100vw; */
- margin: 5px 15px 5px 50px;
+ vertical-align: middle;
+ width: 100%;
+ float: right;
+ padding: 35px 25px 15px 60px;
+ transition: all 0.2s ease;
+ &.collapsed {
+ width: ~'calc(100% - 180px)';
+ transition: all 0.2s ease;
+ }
}
.container_light {
- background-color: #E2E6E9;
+ background-color: @Theme-Layout-Backgroud; //#E2E6E9;
transition: background-color 200ms linear;
}
// TODO: Complete full dark theme
diff --git a/src/models/app.js b/src/models/app.js
index cd0e4681..919dd28b 100644
--- a/src/models/app.js
+++ b/src/models/app.js
@@ -76,7 +76,7 @@ export default {
// Runtime
ycore.MakeBackup()
ycore.UpdateSDCP()
-
+ return
}
else if(!pathMatchRegexp(['','/login'], window.location.pathname)) {
console.log('REP')
@@ -84,12 +84,14 @@ export default {
ycore.LogoutCall()
}
else{
+ router.push({pathname: '/login',})
ycore.RefreshONCE()
}
}
- if(pathMatchRegexp(['/'], window.location.pathname)){
+ if(pathMatchRegexp([''], window.location.pathname)){
router.push({pathname: '/login',})
}
+
},
},
reducers: {
diff --git a/src/pages/about/index.js b/src/pages/about/index.js
new file mode 100644
index 00000000..b531c78f
--- /dev/null
+++ b/src/pages/about/index.js
@@ -0,0 +1,21 @@
+import React from 'react'
+import styles from './index.less'
+import * as ycore from 'ycore'
+import * as antd from 'antd'
+
+
+class AppAbout extends React.Component {
+ render(){
+ return(
+
+
+
+
+ {ycore.AppInfo.name}
+ v{ycore.AppInfo.version}{ycore.DetectNoNStableBuild('TagComponent')}
+
+
+ )
+ }
+}
+export default AppAbout
\ No newline at end of file
diff --git a/src/pages/about/index.less b/src/pages/about/index.less
new file mode 100644
index 00000000..83de9678
--- /dev/null
+++ b/src/pages/about/index.less
@@ -0,0 +1,17 @@
+.aboutWrapper{
+ margin: auto;
+ max-width: 70vw;
+ width: 500px;
+ vertical-align: middle;
+ position: relative;
+ background-color: rgba(73, 72, 72, 0.349);
+ img{
+ width: 100%;
+ padding: 15px;
+ }
+}
+
+.appName {
+ font-family: "Poppins", sans-serif;
+ font-size: 27px;
+}
\ No newline at end of file
diff --git a/src/pages/main/index.js b/src/pages/main/index.js
index 83162799..465d43a1 100644
--- a/src/pages/main/index.js
+++ b/src/pages/main/index.js
@@ -37,7 +37,7 @@ class Main extends React.Component {
)
} catch (err) {
ycore.notifyError(err)
- const paylodd = {user: 'Error', ago: '', avatar: '', content: 'Error displaying data :/', publisher: '' }
+ const paylodd = {user: '', ago: '', avatar: '', content: '', publisher: '' }
return
}
@@ -48,15 +48,12 @@ class Main extends React.Component {
const { loading, createPost } = this.state;
return (
-
-
{createPost?
{this.handleRefreshList()}} /> : null}
{loading?
:
-
document.getElementById("PostsWrapper") } />
{this.renderFeedPosts()}