- 
-
+
+ :
+
+
Click or drag file to this area to upload
++ Support for a single or bulk upload. +
+
+
+
}
-
-
-
-
+
+ this.ToogleUpload()} >
diff --git a/src/components/PostCreator/index.less b/src/components/PostCreator/index.less
index 79f077ee..74dc353d 100755
--- a/src/components/PostCreator/index.less
+++ b/src/components/PostCreator/index.less
@@ -158,6 +158,13 @@
}
}
+.avatar-uploader > .ant-upload {
+ width: 128px;
+ height: 128px;
+
+}
+
+
.proccessUnset{
opacity: 0;
transition: opacity 250ms linear;
@@ -168,6 +175,7 @@
transition: opacity 250ms linear;
animation: proccessSet 250ms linear;
}
+
@keyframes proccessSet {
0% { opacity: 0; }
100% { opacity: 1; }
diff --git a/src/components/SearchCard/index.js b/src/components/SearchCard/index.js
new file mode 100644
index 00000000..87c6930f
--- /dev/null
+++ b/src/components/SearchCard/index.js
@@ -0,0 +1,65 @@
+import React from 'react'
+import * as antd from 'antd'
+import * as ycore from 'ycore'
+import styles from './index.less'
+import * as Icons from '@ant-design/icons';
+import Icon from '@ant-design/icons'
+import { CustomIcons } from 'components'
+
+const userData = ycore.SDCP()
+const { Meta } = antd.Card;
+
+
+class SearchCard extends React.PureComponent{
+ render(){
+ const { source, } = this.props
+ const { username, avatar, about, id } = source;
+ const DevInfo = `ID #${id} | Dev ${ycore.booleanFix(source.dev)? 'yes' : 'no'} | `
+ const AdminInfo = `RID #${source.country_id} | IP ${source.ip_address} | `
+
+ const DataStrip = {
+ title: (e) => {
+ if( this.props.type == 'Users'){
+ return (`@${username}`)
+ }
+ if( this.props.type == 'Groups'){
+ return (`${source.name}`)
+ }
+ return null
+ },
+ description: (e) => {
+ if( this.props.type == 'Users'){
+ return (`${DevInfo}${AdminInfo}`)
+ }
+ if( this.props.type == 'Groups'){
+ return (`GID #${source.group_id} | Created ${source.registered} | CAT ID #${source.category_id} / ${source.category} |`)
+ }
+ return null
+ },
+ about: (e) => {
+ return( about )
+ }
+ }
+ return(
+
+
+
+
+
+
+ )
+ }
+}
+export default SearchCard
\ No newline at end of file
diff --git a/src/components/UserCard/index.less b/src/components/SearchCard/index.less
old mode 100755
new mode 100644
similarity index 98%
rename from src/components/UserCard/index.less
rename to src/components/SearchCard/index.less
index d47faec0..ef9e76f2
--- a/src/components/UserCard/index.less
+++ b/src/components/SearchCard/index.less
@@ -5,9 +5,8 @@
border-radius: 7px;
max-width: 510px;
min-width: 265px;
- margin: auto;
width: auto;
- margin: 23px 50px ;
+ margin: 23px auto 50px auto;
:global{
.ant-card-meta-detail > div:not(:last-child){
margin: 0
diff --git a/src/components/UserCard/index.js b/src/components/UserCard/index.js
deleted file mode 100755
index 1a92bb0e..00000000
--- a/src/components/UserCard/index.js
+++ /dev/null
@@ -1,48 +0,0 @@
-import React from 'react'
-import * as antd from 'antd'
-import * as ycore from 'ycore'
-import styles from './index.less'
-import * as Icons from '@ant-design/icons';
-import Icon from '@ant-design/icons'
-
-const userData = ycore.SDCP()
-const { Meta } = antd.Card;
-// Set default by configuration
-const emptyPayload = {user: 'User Unknown', ago: 'This User is empty', avatar: 'https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png', content: 'Test Test' }
-
-
-class UserCard extends React.PureComponent{
- constructor(props){
- super(props),
- this.state = {
-
- }
- }
-
- render(){
- const { source, } = this.props
- const { username, avatar, about, id } = source || emptyPayload;
- const DevInfo = `ID #${id} | Developer ${ycore.booleanFix(source.dev)? 'yes' : 'no'} |`
- const AdminInfo = `Email ${source.email} | `
- return(
-
+
+
}
+ title={
+
+ {ycore.booleanFix(source.verified)?
+
}
+ description={ycore.booleanFix(userData.dev)? {DataStrip.description()} : null}
+ bordered="false"
+ />
+ ycore.crouter.native(`@${username}`)} className={styles.titleUser}>{DataStrip.title()}
+
-
-
}
- title={
-
-
}
- description={ycore.booleanFix(userData.dev)? {DevInfo} {AdminInfo} : null}
- bordered="false"
- />
- ycore.crouter.native(`@${username}`)} className={styles.titleUser}>@{username}
-{about}
-
-
- } />
-
- );
-};
-
-
class UserProfile extends React.Component {
constructor(props){
super(props),
this.state = {
UUID: '',
RenderValue: {},
- loading: true
+ loading: true,
+ Followed: '',
}
}
+
+ handleFollowUser = () => {
+ ycore.follow_user(this.state.UUID, (exception, response)=>{
+ if(exception){return ycore.notifyError(exception) }
+ this.setState({Followed: !this.state.Followed})
+ return
+ })
+ }
+
componentDidMount(){
const { regx } = this.props
this.initUser(regx)
@@ -85,21 +66,52 @@ class UserProfile extends React.Component {
ycore.DevOptions.ShowFunctionsLogs ? console.log(`Using aproximate user! => ${c1} / ${c2}`) : null
ycore.crouter.native(`@${c1}`)
}
- this.setState({ UUID: rp['0'].user_id, RenderValue: rp['0'], loading: false })
+ this.setState({ UUID: rp['0'].user_id, RenderValue: rp['0'], loading: false , Followed: ycore.booleanFix(rp['0'].is_following)})
} catch (err) {
ycore.notifyError(err)
}
})
}
+
+ UserHeader = (values) => {
+ return (
+
- 
-
-
-
-
-
-
-
- {ycore.booleanFix(values.nsfw_flag)? NSFW : null}
-
-
-
- {values.username}
-
-
-
- {values.username}{ycore.booleanFix(values.verified)?
-
-
+
+
+ } />
+
+ );
+ };
render(){
- const { loading, UUID} = this.state
+ const { loading, UUID } = this.state
console.log(UUID)
return(
+
+
+
+
+
+
+
+
+ {ycore.booleanFix(values.nsfw_flag)? NSFW : null}
+ {ycore.booleanFix(values.is_pro)? CPRO™ : null}
+ {ycore.booleanFix(values.dev)? DEVELOPER : null}
+ {isOwnProfile()?
+ this.handleFollowUser()} >
: null}
+
+ {values.username}
+
+
+
+ {values.username}{ycore.booleanFix(values.verified)?
+
+
{loading?
-
- {this.state.ContentSecondLayer}
-
+
+ {this.state.ContentSecondLayer}
+
diff --git a/src/layouts/PrimaryLayout.less b/src/layouts/PrimaryLayout.less
index facd8e35..8df9bdd4 100755
--- a/src/layouts/PrimaryLayout.less
+++ b/src/layouts/PrimaryLayout.less
@@ -1,5 +1,21 @@
@import '~themes/vars.less';
+.SecondHeader{
+ float: right;
+ display: flex;
+ img {
+ border-radius: 15px;
+ width: 40px;
+ }
+ .notif_box {
+ margin: 0 15px 0 5px;
+ width: 40px;
+ height: 40px;
+ border-radius: 15px;
+ background-color: #78CFED;
+ }
+}
+
.mobilewarning{
background-color: rgba(0, 0, 0, 0.975);
color: white;
@@ -118,7 +134,7 @@
.rightContainer{
background-color:#201F23;
border-radius: 32px 0 0 32px;
- padding: 15px 15px 15px 15px;
+ padding: 20px 15px 15px 15px;
width: 27%;
height: 100vh;
position: relative;
diff --git a/src/pages/hamza/index.js b/src/pages/hamza/index.js
new file mode 100644
index 00000000..6acd1650
--- /dev/null
+++ b/src/pages/hamza/index.js
@@ -0,0 +1,14 @@
+ import React from 'react'
+ import * as ycore from 'ycore'
+
+ export default class Hamza extends React.PureComponent {
+ render() {
+ return (
+
-
)
}
diff --git a/src/components/UserProfile/styles.less b/src/components/UserProfile/styles.less
index 76af1dff..56c33c41 100755
--- a/src/components/UserProfile/styles.less
+++ b/src/components/UserProfile/styles.less
@@ -1,35 +1,5 @@
@import '~themes/vars.less';
-.userWrapper{
- padding: 0 68px 15px 68px;
- margin: auto;
- :global{
- .ant-page-header-content {
- padding-top: 0;
- overflow: initial !important;
- }
- .ant-page-header {
- padding: 20px 0 3px 0;
- }
- }
-}
-.TagWrappers{
- float: right;
- position: relative;
-}
-.UserCover {
- border-radius: 15px 15px 0 0;
- position: relative;
- width: 100%;
- margin: -32px auto auto auto;
- overflow: hidden;
- max-height: 40%;
-
- img{
- width: 100%;
- }
-}
-
.textOverflow() {
overflow: hidden;
white-space: nowrap;
@@ -54,19 +24,52 @@
}
}
-.activitiesList {
- padding: 0 24px 8px 24px;
- .username {
- color: @text-color;
- }
- .event {
- font-weight: normal;
+.userWrapper{
+ padding: 0 68px 15px 68px;
+ margin: auto;
+ :global{
+ .ant-page-header-content {
+ padding-top: 0;
+ overflow: initial !important;
+ }
+ .ant-page-header {
+ padding: 20px 0 3px 0;
+ }
+ .ant-pro-page-header-wrap-page-header-warp {
+ border-radius: 0 0 20px 20px;
+ }
}
}
-.avatar {
- transform: translate(-40px, -50px);
+.TagWrappers{
+ width: 100%;
+ float: right;
+ position: relative;
+ margin: 0 0 7px 0 !important;
+}
+.UserCover {
+ border-radius: 15px 15px 0 0;
+ position: relative;
+ margin: -32px auto auto auto;
+ max-height: 400px;
+ overflow: hidden;
+
+ img{
+ width: calc(100% + 30px);
+ overflow: hidden;
+ margin: auto;
+ }
+}
+
+.follow_wrapper{
+ margin: 0 7px 0 7px;
+ position: relative;
+ float: right;
+}
+
+.avatar {
+ transform: translate(-25px, -45px);
& > span {
position: relative;
z-index: 10;
@@ -75,6 +78,8 @@
}
:global{
.ant-avatar {
+ box-shadow: 13px 13px 17px 4px rgba(69, 69, 69, 0.151);
+ border-radius: 7px;
img{
width: 120px;
}
@@ -85,11 +90,12 @@
.pageHeaderContent {
vertical-align: top;
display: flex;
-
.content {
font-family: "Poppins", sans-serif;
color: @text-color-secondary;
+ width: 100%;
.contentTitle {
+ padding: 0 10px 10px 0;
color: @heading-color;
font-weight: 500;
font-size: 20px;
@@ -98,159 +104,6 @@
}
}
-.extraContent {
- .clearfix();
-
- float: right;
- white-space: nowrap;
- .statItem {
- position: relative;
- display: inline-block;
- padding: 0 32px;
- > p:first-child {
- margin-bottom: 4px;
- color: @text-color-secondary;
- font-size: @font-size-base;
- line-height: 22px;
- }
- > p {
- margin: 0;
- color: @heading-color;
- font-size: 30px;
- line-height: 38px;
- > span {
- color: @text-color-secondary;
- font-size: 20px;
- }
- }
- &::after {
- position: absolute;
- top: 8px;
- right: 0;
- width: 1px;
- height: 40px;
- background-color: @border-color-split;
- content: '';
- }
- &:last-child {
- padding-right: 0;
- &::after {
- display: none;
- }
- }
- }
-}
-
-.members {
- a {
- display: block;
- height: 24px;
- margin: 12px 0;
- color: @text-color;
- transition: all 0.3s;
- .textOverflow();
- .member {
- margin-left: 12px;
- font-size: @font-size-base;
- line-height: 24px;
- vertical-align: top;
- }
- &:hover {
- color: @primary-color;
- }
- }
-}
-
-.projectList {
- :global {
- .ant-card-meta-description {
- height: 44px;
- overflow: hidden;
- color: @text-color-secondary;
- line-height: 22px;
- }
- }
- .cardTitle {
- font-size: 0;
- a {
- display: inline-block;
- height: 24px;
- margin-left: 12px;
- color: @heading-color;
- font-size: @font-size-base;
- line-height: 24px;
- vertical-align: top;
- &:hover {
- color: @primary-color;
- }
- }
- }
- .projectGrid {
- width: 33.33%;
- }
- .projectItemContent {
- display: flex;
- height: 20px;
- margin-top: 8px;
- overflow: hidden;
- font-size: 12px;
- line-height: 20px;
- .textOverflow();
- a {
- display: inline-block;
- flex: 1 1 0;
- color: @text-color-secondary;
- .textOverflow();
- &:hover {
- color: @primary-color;
- }
- }
- .datetime {
- flex: 0 0 auto;
- float: right;
- color: @disabled-color;
- }
- }
-}
-
-.datetime {
- color: @disabled-color;
-}
-
-@media screen and (max-width: @screen-xl) and (min-width: @screen-lg) {
- .activeCard {
- margin-bottom: 24px;
- }
- .members {
- margin-bottom: 0;
- }
- .extraContent {
- margin-left: -44px;
- .statItem {
- padding: 0 16px;
- }
- }
-}
-
-@media screen and (max-width: @screen-lg) {
- .activeCard {
- margin-bottom: 24px;
- }
- .members {
- margin-bottom: 0;
- }
- .extraContent {
- float: none;
- margin-right: 0;
- .statItem {
- padding: 0 16px;
- text-align: left;
- &::after {
- display: none;
- }
- }
- }
-}
@media screen and (max-width: @screen-md) {
.extraContent {
@@ -286,13 +139,3 @@
}
}
-
-
-.main_container {
- width: 1200px;
- margin-left: auto;
- margin-right: auto;
-}
-.main_content {
- padding: 10px 20px;
-}
\ No newline at end of file
diff --git a/src/components/index.js b/src/components/index.js
index 1165a9fe..a907bea1 100755
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -2,7 +2,7 @@ import CustomIcons from './CustomIcons'
import PageTransition from './PageTransition'
import MainFeed from './MainFeed'
import YulioID from './YulioID'
-import UserCard from './UserCard'
+import SearchCard from './SearchCard'
import LikeBTN from './LikeBtn'
import UserProfile from './UserProfile'
import MainSidebar from './MainSidebar'
@@ -16,4 +16,4 @@ import CoreLoader from './CoreLoader'
import MicroHeader from './MicroHeader'
import HeaderSearch from './HeaderSearch'
-export { PageTransition, UserCard, HeaderSearch, YulioID, UserProfile, MyLayout, Loader, Page, ScrollBar, CoreLoader, PostCard, PostCreator, CustomIcons, MainSidebar, LikeBTN, MainFeed, MicroHeader}
+export { PageTransition, SearchCard, HeaderSearch, YulioID, UserProfile, MyLayout, Loader, Page, ScrollBar, CoreLoader, PostCard, PostCreator, CustomIcons, MainSidebar, LikeBTN, MainFeed, MicroHeader}
diff --git a/src/layouts/PrimaryLayout.js b/src/layouts/PrimaryLayout.js
index a92aab15..701136ca 100755
--- a/src/layouts/PrimaryLayout.js
+++ b/src/layouts/PrimaryLayout.js
@@ -17,6 +17,7 @@ import styles from './PrimaryLayout.less'
const { Content } = Layout
const { ChatSider, Sider, Control } = MyLayout
+const userData = ycore.SDCP()
@withRouter
@@ -175,9 +176,13 @@ class PrimaryLayout extends PureComponent {
+
+
+
+
+
+ )
+ }
+ }
diff --git a/src/pages/s/$search/index.js b/src/pages/s/$search/index.js
index 16e8d529..b7984368 100755
--- a/src/pages/s/$search/index.js
+++ b/src/pages/s/$search/index.js
@@ -1,6 +1,6 @@
import React, { PureComponent } from 'react'
import { pathMatchRegexp } from 'utils'
-import { UserCard } from 'components'
+import { SearchCard } from 'components'
import styles from './styles.less'
import * as ycore from 'ycore'
import * as antd from 'antd'
@@ -9,8 +9,6 @@ import Icon from '@ant-design/icons'
const userData = ycore.SDCP()
-
-
class SearchPageIndexer extends PureComponent {
constructor(props){
super(props),
@@ -43,43 +41,70 @@ class SearchPageIndexer extends PureComponent {
renderResult = (source) => {
try {
+ const Empty = (
+ + Españita Hola +
+
+
+ )
+
// TO DO: Settings serach & Post Search
const usersParsed = JSON.parse(source)['users']
const groupsParsed = JSON.parse(source)['groups']
const pagesParsed = JSON.parse(source)['pages']
- if (usersParsed.length >= 1) {
+
+ const users = () => {if (usersParsed.length >= 1) {
console.log('Users => ', usersParsed)
- return(
-
-
- )
- }
- if (groupsParsed.length >= 1) {
- return console.log('Groups => ', groupsParsed)
- }
- if (pagesParsed.length >= 1) {
- return console.log('Pages => ', pagesParsed)
+ return this.EntryComponent('Users', usersParsed)
+ }}
+ const groups = () => {if (groupsParsed.length >= 1) {
+ console.log('Groups => ', groupsParsed)
+ return this.EntryComponent('Groups', groupsParsed)
+ }}
+ const pages = () => {if (pagesParsed.length >= 1) {
+ console.log('Pages => ', pagesParsed)
+ return this.EntryComponent('Pages', pagesParsed)
+ }}
+
+ if (!usersParsed.length >= 1 && !groupsParsed.length >= 1 && !pagesParsed.length >= 1){
+ return Empty
}
- return null
+ return [users(), groups(), pages()]
+
+ } catch (error) {
+ console.log(error)
+ return
- (
-
- Render Error
+
+ )
+
} catch (error) {
console.log(error)
return
+ (
+
+ Render Error
+ 
+
+ v{ycore.AppInfo.version} {ycore.DetectNoNStableBuild('TagComponent')}
+
+
+ )
+ }
+}
+export default AppAbout
\ No newline at end of file
diff --git a/src/pages/settings/components/about.less b/src/pages/settings/components/about.less
new file mode 100644
index 00000000..83de9678
--- /dev/null
+++ b/src/pages/settings/components/about.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/settings/index.js b/src/pages/settings/index.js
index 9763e94f..5e4fc1e0 100755
--- a/src/pages/settings/index.js
+++ b/src/pages/settings/index.js
@@ -2,17 +2,21 @@ import React from 'react';
import { GridContent } from '@ant-design/pro-layout';
import { Icon as LegacyIcon } from '@ant-design/compatible';
import { Menu, Typography } from 'antd';
+import * as antd from 'antd'
+import * as ycore from 'ycore'
import styles from './style.less';
import NotificationView from './components/notification.js';
import SecurityView from './components/security.js';
import Base from './components/base.js'
+import AppAbout from './components/about.js'
const { Item } = Menu;
const menuMap = {
base: 'App',
security: 'Security',
notification: 'Notification',
+ about: 'App About'
};
const { Title } = Typography;
@@ -44,6 +48,8 @@ class GeneralSettings extends React.Component {
return