Skip to content

Commit

Permalink
Merge pull request #1838 from ResearchHub/various-copy-changes
Browse files Browse the repository at this point in the history
Various copy changes
  • Loading branch information
TylerDiorio authored Sep 24, 2024
2 parents b709f62 + 1440c17 commit 0429a32
Show file tree
Hide file tree
Showing 6 changed files with 94 additions and 32 deletions.
2 changes: 1 addition & 1 deletion components/Comment/CommentReviewCategorySelector.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ function CommentReviewCategorySelector({ handleSelect }): ReactElement {
ref={dropdownRef}
>
{Object.values(reviewCategories)
.filter((cat) => !cat.isDefault)
.filter((cat) => !cat.isDefault && !cat.hidden)
.map((cat) => (
<div
className={css(styles.dropdownOpt)}
Expand Down
15 changes: 12 additions & 3 deletions components/Comment/lib/options.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@ export const sortOpts = [

export const reviewCategories = {
overall: {
label: "Overall Rating",
label: "Overall Assessment",
value: "overall",
description: "What are your overall impressions of this paper?",
description: "What is your overall rating of this paper?",
isDefault: true,
},
impact: {
Expand All @@ -96,7 +96,16 @@ export const reviewCategories = {
description:
"Is the research question innovative? Do the study's findings advance the authors' field in a meaningful way?",
isDefault: false,
// Tyler: Use hidden flag to deprecate peer review sections without renaming old entries to "Unkown Category"
hidden: true,
},
introduction: {
label: "Introduction",
value: "introduction",
description:
"Does the introduction clearly articulate the research question and provide adequate context? Is the study's significance within the field convincingly established?",
isDefault: false,
},
methods: {
label: "Methods",
value: "methods",
Expand All @@ -108,7 +117,7 @@ export const reviewCategories = {
label: "Results",
value: "results",
description:
"Were the study's findings analyzed and interpreted reasonably? Is the resulting data open and auditable?",
"Were the study's findings analyzed and interpreted reasonably? Is the resulting data open and auditable? Are the figures of high resolution, describe data appropriately and adequately labelled? Please provide comments - positive or negative on each figure including supplementary ones.",
isDefault: false,
},
discussion: {
Expand Down
11 changes: 4 additions & 7 deletions components/Home/sidebar/RootLeftSidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
faWavePulse,
} from "@fortawesome/pro-solid-svg-icons";
import {
faMedium,
faLinkedin,
faDiscord,
faXTwitter,
faGithub,
Expand Down Expand Up @@ -536,13 +536,11 @@ function RootLeftSidebar({
{<FontAwesomeIcon icon={faGithub}></FontAwesomeIcon>}
</ALink>
<ALink
href="https://medium.com/researchhub"
overrideStyle={
(styles.leftSidebarFooterIcon, styles.mediumIconOverride)
}
href="https://www.linkedin.com/company/researchhubtechnologies"
overrideStyle={styles.leftSidebarFooterIcon}
target="__blank"
>
{<FontAwesomeIcon icon={faMedium}></FontAwesomeIcon>}
{<FontAwesomeIcon icon={faLinkedin}></FontAwesomeIcon>}
</ALink>
</div>
<div className={formattedFooterItemsButtonRow}>
Expand Down Expand Up @@ -751,7 +749,6 @@ const styles = StyleSheet.create({
marginLeft: 0,
},
},
mediumIconOverride: { fontSize: 18, marginTop: "-4px" },
subheader: {
borderTop: `1px solid ${colors.GREY_BORDER}`,
marginTop: 12,
Expand Down
11 changes: 4 additions & 7 deletions components/Home/sidebar/RootLeftSidebarSlider.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import {
faMedium,
faLinkedin,
faDiscord,
faXTwitter,
faGithub,
Expand Down Expand Up @@ -156,13 +156,11 @@ function RootLeftSidebarSlider({
{<FontAwesomeIcon icon={faGithub}></FontAwesomeIcon>}
</ALink>
<ALink
href="https://medium.com/researchhub"
overrideStyle={
(styles.leftSidebarSliderFooterIcon, styles.mediumIconOverride)
}
href="https://www.linkedin.com/company/researchhubtechnologies"
overrideStyle={styles.leftSidebarSliderFooterIcon}
target="__blank"
>
{<FontAwesomeIcon icon={faMedium}></FontAwesomeIcon>}
{<FontAwesomeIcon icon={faLinkedin}></FontAwesomeIcon>}
</ALink>
</div>
<div className={css(styles.leftSidebarSliderFooterItemsBottomRow)}>
Expand Down Expand Up @@ -272,7 +270,6 @@ const styles = StyleSheet.create({
fontSize: 18,
display: "block",
},
mediumIconOverride: { fontSize: 18, marginTop: "-4px" },
newPostButtonContainer: {
width: "100%",
display: "flex",
Expand Down
87 changes: 73 additions & 14 deletions components/Verification/VerificationSmallBanner.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import React from 'react';
import { StyleSheet, css } from "aphrodite";
import Button from "../Form/Button";
import VerifiedBadge from "./VerifiedBadge";
Expand All @@ -6,6 +7,8 @@ import { CloseIcon } from "~/config/themes/icons";
import VerifyIdentityModal from "~/components/Verification/VerifyIdentityModal";
import { ROUTES as WS_ROUTES } from "~/config/ws";
import { useSelector } from "react-redux";
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import { faCheck } from '@fortawesome/free-solid-svg-icons';

const VerificationSmallBanner = ({ handleDismiss }: { handleDismiss: Function }) => {
const auth = useSelector((state: any) => state.auth);
Expand All @@ -15,22 +18,42 @@ const VerificationSmallBanner = ({ handleDismiss }: { handleDismiss: Function })
<div className={css(styles.closeButtonWrapper)} onClick={() => handleDismiss()}>
<CloseIcon color={"white"} onClick={() => null} />
</div>
<VerifiedBadge height={32} width={32} showTooltipOnHover={false} />
<div className={css(styles.title)}>Verify Identity</div>
<p className={css(styles.description)}>
Verify your identity to stand out and get faster withdraws.
</p>

{/* @ts-ignore */}
<div className={css(styles.avatarSection)}>
<div className={css(styles.avatarWrapper)}>
<img
src="/static/EinsteinAvatar.png"
alt="Einstein Avatar"
className={css(styles.avatar)}
/>
<span className={css(styles.badgeWrapper)}>
<VerifiedBadge height={28} width={28} showTooltipOnHover={false} />
</span>
</div>
</div>
<div className={css(styles.title)}>Verify & Unlock Perks</div>
<ul className={css(styles.ctaWrapper)}>
<li className={css(styles.listItem)}>
<FontAwesomeIcon icon={faCheck} className={css(styles.checkIcon)} />
Auto sync all of your papers
</li>
<li className={css(styles.listItem)}>
<FontAwesomeIcon icon={faCheck} className={css(styles.checkIcon)} />
Get a verified badge
</li>
<li className={css(styles.listItem)}>
<FontAwesomeIcon icon={faCheck} className={css(styles.checkIcon)} />
Fast track your earnings
</li>
</ul>
<VerifyIdentityModal
// @ts-ignore legacy
wsUrl={WS_ROUTES.NOTIFICATIONS(auth?.user?.id)}
// @ts-ignore legacy
wsAuth
>
<div className={css(styles.ctaWrapper)}>
<Button fullWidth type="primary" variant="outlined" size="small">
Learn more
<Button fullWidth type="primary" variant="outlined" size="med">
Verify now
</Button>
</div>
</VerifyIdentityModal>
Expand All @@ -48,7 +71,8 @@ const styles = StyleSheet.create({
color: "white",
},
ctaWrapper: {
marginTop: 20,
marginTop: 10,
fontSize: 16,
},
wrapper: {
backgroundImage: "url('/static/background/small-banner-background.png')",
Expand All @@ -62,20 +86,55 @@ const styles = StyleSheet.create({
flexDirection: "column",
},
title: {
marginTop: 14,
marginTop: 10,
marginBottom: 2,
marginLeft: 10,
fontSize: 22,
fontWeight: 500,
letterSpacing: "0.25px",
[`@media only screen and (max-width: ${breakpoints.xsmall.str})`]: {
fontSize: 16,
},
},
description: {
avatarSection: {
display: 'flex',
alignItems: 'center',
marginTop: 5,
marginBottom: 10,
fontSize: 16,
lineHeight: "19px",
marginLeft: 10,
},
avatarWrapper: {
position: 'relative',
width: 50,
height: 50,
},
avatar: {
width: '115%',
height: '115%',
borderRadius: '50%',
objectFit: 'cover',
},
badgeWrapper: {
position: 'absolute',
bottom: -13,
right: -13,
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
borderRadius: '50%',
padding: 2,
},
listItem: {
marginLeft: -30,
display: 'flex',
alignItems: 'center',
marginBottom: 5,
},
checkIcon: {
marginRight: 10,
color: 'white',
width: 16,
height: 16,
},
});

Expand Down
Binary file added static/EinsteinAvatar.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 0429a32

Please sign in to comment.