From 3e403ff990803e3d9a240a4e49e12809df142041 Mon Sep 17 00:00:00 2001
From: srgooglo <38926803+srgooglo@users.noreply.github.com>
Date: Mon, 20 Apr 2020 12:21:40 +0200
Subject: [PATCH] update: 0.3.18
---
package.json | 2 +-
src/@ycore/libs/comty_ng/comty_user.js | 16 ++
.../Layout/Secondary/components/__sec.less | 6 +-
.../Layout/Secondary/components/__sec.tsx | 10 +-
src/components/Layout/Secondary/index.js | 17 +-
src/components/Layout/Secondary/index.less | 6 +-
src/components/Layout/Secondary/renders.js | 25 +--
src/components/Layout/Secondary/renders.less | 17 +-
src/components/MediaPlayer/index.less | 32 +--
src/components/UserProfile/index.js | 185 +++++++++---------
src/components/UserProfile/reducers.js | 18 ++
src/components/UserProfile/styles.less | 41 ++--
src/layouts/PrimaryLayout.js | 2 +-
src/layouts/PrimaryLayout.less | 4 +
src/pages/$page/index.js | 2 +-
src/themes/base/index.less | 4 +-
16 files changed, 230 insertions(+), 157 deletions(-)
create mode 100644 src/components/UserProfile/reducers.js
diff --git a/package.json b/package.json
index c3e04bce..66098246 100755
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
"UUID": "C8mVSr-4nmPp2-pr5Vrz-CU4kg4",
"title": "Comty™",
"DevBuild": true,
- "version": "0.3.13",
+ "version": "0.3.18",
"stage": "dev-pre",
"description": "",
"author": "RageStudio",
diff --git a/src/@ycore/libs/comty_ng/comty_user.js b/src/@ycore/libs/comty_ng/comty_user.js
index ac374d98..92ed9ded 100755
--- a/src/@ycore/libs/comty_ng/comty_user.js
+++ b/src/@ycore/libs/comty_ng/comty_user.js
@@ -3,6 +3,22 @@ import { comty_rsa } from '../rs_cloud/pre'
export const comty_user = {
setData: () => {},
+ getFollowers: (callback, payload) => {
+ if (!payload)return false
+ const { user_id } = payload
+
+ let formdata = new FormData()
+ formdata.append('user_id', user_id)
+ formdata.append('fetch', 'followers')
+
+ API_Call(
+ (err,res) => {
+ return callback(err,res)
+ },
+ comty_rsa.endpoint('get-user-data'),
+ formdata
+ )
+ },
follow: (callback, payload) => {
if (!payload) {
return false
diff --git a/src/components/Layout/Secondary/components/__sec.less b/src/components/Layout/Secondary/components/__sec.less
index 0ca8f202..42363021 100644
--- a/src/components/Layout/Secondary/components/__sec.less
+++ b/src/components/Layout/Secondary/components/__sec.less
@@ -26,11 +26,12 @@
opacity: 0;
top: unset;
- overflow: hidden;
+ transform: translate(0, 86%);
border-radius: 12px 12px 0 0;
flex-direction: column;
- overflow-y: scroll;
+
+ overflow-y: overlay;
overflow-x: hidden;
touch-action: none;
@@ -56,7 +57,6 @@
&.active {
opacity: 1;
height: 100%;
- transform: translate(0, 86%);
}
&.full_open {
diff --git a/src/components/Layout/Secondary/components/__sec.tsx b/src/components/Layout/Secondary/components/__sec.tsx
index 56dfe469..9faad91e 100644
--- a/src/components/Layout/Secondary/components/__sec.tsx
+++ b/src/components/Layout/Secondary/components/__sec.tsx
@@ -23,9 +23,6 @@ const isOpen = (props: __sec_props) => {
}
return false
}
-const isMobile = (props: __sec_props) => {
- props.isMobile? true : false
-}
const renderExit = (props: __sec_props) => {
const {functs} = props
@@ -38,9 +35,9 @@ const renderExit = (props: __sec_props) => {
}
const __sec = (props: __sec_props) => {
- const { render, getRef, y, type } = props
- const t_full = type === 'full_open'? true : false
- const t_def = type === 'active'? true: false
+ const { render, getRef, y, type, isMobile } = props
+ const t_full = type == 'full_open'? true : false
+ const t_def = type == 'active'? true: false
return (
{
[styles.full_open]: t_full,
})}
style={{
- position: 'relative',
top: y,
}}
ref={getRef}
diff --git a/src/components/Layout/Secondary/index.js b/src/components/Layout/Secondary/index.js
index 8351c69b..4e7efdc6 100755
--- a/src/components/Layout/Secondary/index.js
+++ b/src/components/Layout/Secondary/index.js
@@ -13,6 +13,7 @@ import {
__priSearch,
__trendings,
__pro,
+ __footer
} from './renders.js'
export const SwapMode = {
@@ -185,9 +186,17 @@ export default class Secondary extends React.PureComponent {
componentDidMount() {
this.handle_genData()
+ if(this.props.isMobile){
+ window.addEventListener('popstate', function(event) {
+ SwapMode.close()
+ }, false);
+ }
}
componentWillUnmount() {
+ if(this.props.isMobile){
+ document.removeEventListener('popstate', null)
+ }
document.removeEventListener('keydown', this.handle_Exit, false)
}
@@ -203,10 +212,15 @@ export default class Secondary extends React.PureComponent {
try {
const trending_data = JSON.parse(this.state.gen_data)['trending_hashtag']
return (
+ <>
{ycore.IsThisUser.pro() ? <__pro /> : <__pro />}
<__trendings data={trending_data} />
+
+ {__footer()}
+
+
)
} catch (error) {
return null
@@ -271,6 +285,7 @@ export default class Secondary extends React.PureComponent {
render() {
const { userData, isMobile } = this.props
const __sec_functs = (this.Swapper)
+
if (!this.state.loading)
return (
<>
@@ -307,7 +322,7 @@ export default class Secondary extends React.PureComponent {
{this.renderTarget('__pri')}
- {postText ? (
-
-
{' '}
-
- ) : null}
-
{postFile_full ?
: null}
- {postText ? (
-
-
{' '}
-
- ) : null}
+ v{ycore.AppInfo.version} | About | Legal | Help
+
}
\ No newline at end of file
diff --git a/src/components/Layout/Secondary/renders.less b/src/components/Layout/Secondary/renders.less
index cc022932..6e299ae4 100755
--- a/src/components/Layout/Secondary/renders.less
+++ b/src/components/Layout/Secondary/renders.less
@@ -93,7 +93,7 @@
position: absolute;
vertical-align: bottom;
border-radius: 7px;
- bottom: 0;
+ top: 0;
max-width: 50vw;
background-color: #2d2d2d4b;
@@ -145,13 +145,14 @@
.comments_cards_wrapper {
z-index: 50;
- overflow: scroll;
+ overflow-y: scroll!important;
height: 84%;
:global {
- overflow: scroll;
+ overflow-y: scroll!important;
}
.comment_card {
+ overflow-y: scroll!important;
position: relative;
width: 100%;
background-color: #ffffff;
@@ -353,4 +354,14 @@
font-weight: 600;
}
}
+}
+
+.__footer{
+ position: absolute;
+ bottom: 0;
+ font-size: 11px;
+ margin-bottom: 10px;
+ color: #f3f3f3;
+ letter-spacing: 2px;
+ width: 100%;
}
\ No newline at end of file
diff --git a/src/components/MediaPlayer/index.less b/src/components/MediaPlayer/index.less
index 6478f35f..eb853b44 100755
--- a/src/components/MediaPlayer/index.less
+++ b/src/components/MediaPlayer/index.less
@@ -19,8 +19,8 @@
&.entire {
- max-width: 52vw;
- max-height: 80vh;
+ max-width: 52%;
+ max-height: 80%;
position: fixed;
top: 50%;
left: 50%;
@@ -49,19 +49,23 @@
}
&.mobile {
- max-width: 52vw;
- max-height: 80vh;
- position: fixed;
- top: 50%;
- left: 50%;
- transform: translate(-50%, -50%);
+ max-width: unset;
+ max-height: unset;
+ top: unset;
+ left: unset;
+ transform: unset;
+ width: 100%;
+ position: relative;
+ height: 60vh;
+ display: flex;
+
img {
object-fit: contain;
- height: 100%;
+ height: auto;
width: 100%;
- max-width: 52vw;
- max-height: 80vh;
+ max-width: unset;
+ max-height: unset;
}
audio {
@@ -71,10 +75,10 @@
video {
object-fit: contain;
- height: 100%;
+ height: auto;
width: 100%;
- max-width: 52vw;
- max-height: 80vh;
+ max-width: unset;
+ max-height: unset;
}
}
}
diff --git a/src/components/UserProfile/index.js b/src/components/UserProfile/index.js
index abd674e5..9e121638 100755
--- a/src/components/UserProfile/index.js
+++ b/src/components/UserProfile/index.js
@@ -10,7 +10,7 @@ import Follow_btn from './components/Follow_btn.js'
import { BadgesType } from 'globals/badges_list'
import classnames from 'classnames'
-const isMobile = localStorage.getItem('mobile_src')
+import * as reducers from './reducers.js'
class UserProfile extends React.PureComponent {
constructor(props) {
@@ -93,6 +93,15 @@ class UserProfile extends React.PureComponent {
Followed: ycore.booleanFix(rp['0'].is_following),
})
+ reducers.get.followers((res)=>{
+ try {
+ this.setState({followers_data: res, followers: res.length})
+ } catch (error) {
+ return false
+ }
+
+ },rp['0'].user_id)
+
ycore.comty_user.__tags(
(err, res) => {
if (err) return false
@@ -125,104 +134,100 @@ class UserProfile extends React.PureComponent {
const moreMenu = (
- 1st antd.Menu item
- 2nd antd.Menu item
+ __
+ __set2
);
- const { loading, UUID, invalid, RenderValue } = this.state
+ const { loading, UUID, invalid, RenderValue, followers } = this.state
+ const { isMobile } = this.props
+ if(loading) return
+ if(invalid) return null
return (
- {loading ? (
-
- ) : (
-
- {invalid ? null : (
-
-
-
-
+
-
-
-
-
-
-
- {this.state.UserTags.length > 0 ? (
-
(
-
-
- {item.title} {item.icon}
-
-
- )}
- />
- ) : null}
-
- {ycore.IsThisUser.same(RenderValue.id) ? null : (
-
this.handleFollowUser()}
- >
-
-
- )}
-
-
- {RenderValue.username}
-
- {ycore.booleanFix(RenderValue.verified) ? (
-
- ) : null}
-
-
- { ycore.IsThisUser.same(UUID)?
-
-
-
- : null }
+
+
+
-
-
-
-
-
-
- )}
- {ycore.IsThisUser.same(UUID) ? (
-
- ) : null}
-
+
+
+
+
+
+ {this.state.UserTags.length > 0 ? (
+
(
+
+
+ {item.title} {item.icon}
+
+
+ )}
+ />
+ ) : null}
+
+ {ycore.IsThisUser.same(RenderValue.id) ? null : (
+
this.handleFollowUser()}
+ >
+
)}
+
+
+
+
+
+ {RenderValue.username}
+
+
+
+ {ycore.booleanFix(RenderValue.verified) ? (
+
+ ) : null}
+
+
+ { ycore.IsThisUser.same(UUID)?
+
+
+
+ : null }
+
+
+
+
+
+
+ {ycore.IsThisUser.same(UUID) ? (
) : null}
+
)
}
diff --git a/src/components/UserProfile/reducers.js b/src/components/UserProfile/reducers.js
new file mode 100644
index 00000000..e3f8bbc4
--- /dev/null
+++ b/src/components/UserProfile/reducers.js
@@ -0,0 +1,18 @@
+import * as ycore from 'ycore'
+
+// REDUCERS, USERPROFILE
+export const get = {
+ followers: (callback,id) => {
+ const payload = { user_id: id }
+ ycore.comty_user.getFollowers((err,res) => {
+ try {
+ const a = JSON.parse(res)['followers']
+ callback(a)
+ return false
+ } catch (error) {
+ callback(false)
+ return false
+ }
+ }, payload)
+ },
+}
\ No newline at end of file
diff --git a/src/components/UserProfile/styles.less b/src/components/UserProfile/styles.less
index 727d2b1a..b8be36ab 100755
--- a/src/components/UserProfile/styles.less
+++ b/src/components/UserProfile/styles.less
@@ -29,26 +29,20 @@
.userWrapper {
padding: 0 68px 15px 68px;
margin: auto;
+ background-color: #ffffff;
+ border-radius: 0 0 20px 20px;
+ padding: 20px 0 3px 0;
+
+ padding-top: 0;
+ overflow: initial !important;
+
&.mobile{
max-width: 510px;
min-width: 265px;
width: auto;
- padding: 0 15px 0 15px;
- }
- :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;
- }
}
+
}
.TagWrappers {
@@ -58,6 +52,19 @@
margin: 0 0 7px 0 !important;
}
+.followers_count{
+ float: right;
+ font-size: 14px;
+ width: auto;
+ max-width: 200px;
+ padding: 0 20px;
+ background-color: #f3f3f3;
+ text-align: center;
+ border-radius: 8px;
+ transform: translate(90px, -64px);
+
+}
+
.UserCover {
border-radius: 15px 15px 0 0;
position: relative;
@@ -90,6 +97,11 @@
height: 100%;
}
+ &.mobile{
+ transform: translate(0,-90px);
+ margin: auto;
+ }
+
:global {
.ant-avatar {
box-shadow: 13px 13px 17px 4px rgba(69, 69, 69, 0.151);
@@ -105,6 +117,7 @@
.pageHeaderContent {
vertical-align: top;
display: flex;
+ padding: 20px;
.content {
font-family: "Poppins", sans-serif;
diff --git a/src/layouts/PrimaryLayout.js b/src/layouts/PrimaryLayout.js
index dfbc20d2..397420c5 100755
--- a/src/layouts/PrimaryLayout.js
+++ b/src/layouts/PrimaryLayout.js
@@ -91,7 +91,7 @@ class PrimaryLayout extends React.Component {
return (
{/* {isMobile ? : null} */}
-
+
diff --git a/src/layouts/PrimaryLayout.less b/src/layouts/PrimaryLayout.less
index 29d41079..b95ad596 100755
--- a/src/layouts/PrimaryLayout.less
+++ b/src/layouts/PrimaryLayout.less
@@ -5,6 +5,10 @@
position: absolute;
bottom: 0;
z-index: 30;
+ &.mobile{
+ top: 0;
+ bottom: unset;
+ }
}
.primary_layout {
diff --git a/src/pages/$page/index.js b/src/pages/$page/index.js
index 37a3c3fc..4440b39a 100755
--- a/src/pages/$page/index.js
+++ b/src/pages/$page/index.js
@@ -15,7 +15,7 @@ class PageIndexer extends PureComponent {
ycore.yconsole.log(`User matched! ${location.pathname}`)
return (
-
+
)
}
diff --git a/src/themes/base/index.less b/src/themes/base/index.less
index cfbb9be8..67069d58 100755
--- a/src/themes/base/index.less
+++ b/src/themes/base/index.less
@@ -138,7 +138,7 @@ body {
// .secondary_*
@__secondary_colider_width: 31.2vw;
@secondary_wrapper_hidden_width: 22vw;
-@secondary_wrapper_showFull_width: 94.2vw;
+@secondary_wrapper_showFull_width: 94.2%;
@secondary_wrapper_showHalf_width: 35vw;
@secondary_container_bg_background: #201F23;
@secondary_container_1_color: #fff;
@@ -161,7 +161,7 @@ body {
// .post_card*
@post_card_general_border-rd: 7px;
@post_card_wrapper_shadow: 0 1px 3px rgba(0, 0, 0, 0.15);
-@post_card_wrapper_actions_backgroud: rgba(235, 235, 235, 0.815);
+@post_card_wrapper_actions_backgroud: rgb(235, 235, 235);
@post_card_wrapper_actions_icon_backgroud: #fff;
@post_card_wrapper_tags_color_default: rgb(249, 179, 64);