diff --git a/src/Components/Private/MemberCard.js b/src/Components/Private/MemberCard.js index 9df84397..d00ae747 100644 --- a/src/Components/Private/MemberCard.js +++ b/src/Components/Private/MemberCard.js @@ -305,6 +305,31 @@ export default function MemberCard(props) { { member.color ? Color: {color} : "" } { privacyView ? "" : proxyView ? "" : Privacy: setPrivacyView(true)}>View } { privacyView ? "" : proxyView ? "" : Proxy tags: setProxyView(true)}>View } + { privacyView || proxyView || !member.banner ? "" : + + Banner:{" "} + + View + + } + className="banner" + modal + > + {(close) => ( + close()}> + + + + + )} + + + } Created: {created} { privacyEdit ? diff --git a/src/Components/Private/MemberPage.js b/src/Components/Private/MemberPage.js index d9d38eef..107ec047 100644 --- a/src/Components/Private/MemberPage.js +++ b/src/Components/Private/MemberPage.js @@ -237,9 +237,9 @@ export default function MemberPage(props) { history.push("/dash/reload")}>Back : <> - { member.banner && !localStorage.getItem("hidebanners") ? : ""} { localStorage.getItem('colorbg') && member.color ? "" : <> { !localStorage.getItem('fullbg') ? : "" }> } + { member.banner && !localStorage.getItem("hidebanners") ? : ""} { member.visibility === 'public' ? Color: {color} : "" } { privacyView ? "" : proxyView ? "" : Privacy: setPrivacyView(true)}>View } { privacyView ? "" : proxyView ? "" : Proxy tags: setProxyView(true)}>View } + { privacyView || proxyView || !member.banner ? "" : + + Banner:{" "} + + View + + } + className="banner" + modal + > + {(close) => ( + close()}> + + + + + )} + + + } Created: {created} { privacyMode ? diff --git a/src/Components/Private/System.js b/src/Components/Private/System.js index 0b3eaeee..3288c13b 100644 --- a/src/Components/Private/System.js +++ b/src/Components/Private/System.js @@ -108,11 +108,9 @@ export default function System(props) { > {(close) => ( close()}> - + + + )} @@ -161,6 +159,7 @@ export default function System(props) { {privacyView ? ( "" ) : ( + <> Privacy:{" "} - )} + {user.banner ? + + Banner:{" "} + + View + + } + className="banner" + modal + > + {(close) => ( + close()}> + + + + + )} + + + : "" } + > + )} {privacyEdit ? ( } className="avatar" modal> {close => ( close()}> - + + + )} : @@ -92,6 +94,31 @@ export default function Profile () { ID: {system.id} Tag: {tag} Timezone: {timezone} + {system.banner ? + + Banner:{" "} + + View + + } + className="banner" + modal + > + {(close) => ( + close()}> + + + + + )} + + + : "" } Description: { localStorage.getItem('twemoji') ? : } diff --git a/src/Components/Public/ProfileCard.js b/src/Components/Public/ProfileCard.js index 618a6b64..a85f9914 100644 --- a/src/Components/Public/ProfileCard.js +++ b/src/Components/Public/ProfileCard.js @@ -19,6 +19,7 @@ export default function MemberCard(props) { const [ displayName, setDisplayName ] = useState(""); const [ birthday, setBirthday ] = useState(""); const [ pronouns, setPronouns ] = useState(""); + const [ banner, setBanner ] = useState(""); const [ color, setColor ] = useState(""); const [ desc, setDesc ] = useState(""); const proxyTags = member.proxy_tags; @@ -60,10 +61,14 @@ export default function MemberCard(props) { setColor(member.color); } else setColor(''); + if (member.banner) { + setBanner(member.banner); + } else setBanner(""); + if (member.description) { setDesc(toHTML(member.description)); } else setDesc("(no description)"); - }, [member.description, member.color, member.birthday, member.display_name, member.pronouns, member.avatar_url, member.proxy_tags]); + }, [member.description, member.color, member.birthday, member.display_name, member.pronouns, member.avatar_url, member.proxy_tags, member.banner]); function copyLink() { var link = `https://pk-webs.spectralitree.com/profile/${sysID}/${member.id}` @@ -90,6 +95,31 @@ export default function MemberCard(props) { Pronouns: : "" } { member.color ? Color: {color} : "" } { proxyView ? "" : Proxy tags: setProxyView(true)}>View } + { proxyView || !member.banner ? "" : + + Banner:{" "} + + View + + } + className="banner" + modal + > + {(close) => ( + close()}> + + + + + )} + + + } { proxyView ? <> diff --git a/src/Components/Public/ProfilePage.js b/src/Components/Public/ProfilePage.js index 2d4c48f7..97e8c116 100644 --- a/src/Components/Public/ProfilePage.js +++ b/src/Components/Public/ProfilePage.js @@ -85,9 +85,9 @@ export default function ProfilePage(props) { return ( <> - { member.banner && !localStorage.getItem("hidebanners") ? : ""} { localStorage.getItem('colorbg') && member.color ? "" : <> { !localStorage.getItem('fullbg') ? : "" }> } + { member.banner && !localStorage.getItem("hidebanners") ? : ""} You are currently viewing a member. @@ -118,6 +118,31 @@ export default function ProfilePage(props) { Pronouns: : "" } { member.color ? Color: {color} : "" } { proxyView ? "" : Proxy tags: setProxyView(true)}>View } + { proxyView || !member.banner ? "" : + + Banner:{" "} + + View + + } + className="banner" + modal + > + {(close) => ( + close()}> + + + + + )} + + + } { proxyView ? <> diff --git a/src/Custom.scss b/src/Custom.scss index 44d3d881..ca780daf 100644 --- a/src/Custom.scss +++ b/src/Custom.scss @@ -65,6 +65,7 @@ body { .navbar { background-color: $gray-100; flex: 0 0 auto; + z-index: 5; } .dark-mode .navbar { @@ -334,8 +335,7 @@ textarea { background-size: cover; background-position: center; z-index: -1; - box-shadow: inset 0 -3px 10px -10px #000000, inset 0 10px 10px -10px #000000;; - + box-shadow: inset 0 -3px 10px -10px #000000, inset 0 10px 10px -10px #000000; } @media only screen and (min-width: 992px) { @@ -343,3 +343,7 @@ textarea { height: 50vh; } } + +.banner-content { + max-height: 650px !important; +}
Description: