1
0
Fork 0
mirror of https://github.com/muerwre/vault-frontend.git synced 2025-04-25 04:46:40 +07:00

fixed shadows, added author panel

This commit is contained in:
Fedor Katurov 2021-09-22 14:18:09 +07:00
parent c1279c538a
commit f2fbca80e1
21 changed files with 209 additions and 55 deletions

View file

@ -0,0 +1,28 @@
import React, { FC, useCallback } from 'react';
import { getURLFromString } from '~/utils/dom';
import { PRESETS } from '~/constants/urls';
import styles from './styles.module.scss';
import classNames from 'classnames';
import { openUserProfile } from '~/utils/user';
interface Props {
url?: string;
username?: string;
size?: number;
className?: string;
}
const CommentAvatar: FC<Props> = ({ url, username, size, className }) => {
const backgroundImage = !!url ? `url('${getURLFromString(url, PRESETS.avatar)}')` : undefined;
const onOpenProfile = useCallback(() => openUserProfile(username), [username]);
return (
<div
className={classNames(styles.avatar, className)}
style={{ backgroundImage }}
onClick={onOpenProfile}
/>
);
};
export { CommentAvatar };

View file

@ -0,0 +1,19 @@
@import "~/styles/variables";
.avatar {
@include outer_shadow;
width: $comment_height;
height: $comment_height;
background-color: transparentize(black, 0.9);
flex-shrink: 0;
overflow: hidden;
border-radius: $radius;
background-position: center;
background-size: cover;
cursor: pointer;
img {
object-fit: cover;
}
}

View file

@ -3,6 +3,7 @@
.wrap {
position: relative;
@include row_shadow;
}
.lock,
@ -51,13 +52,10 @@
.edit {
top: 28px;
background: blue;
}
.block {
@include outer_shadow();
min-height: $comment_height;
// box-shadow: inset rgba(255, 255, 255, 0.05) 1px 1px, inset rgba(0, 0, 0, 0.1) -1px -1px;
display: flex;
align-items: flex-start;
justify-content: flex-start;
@ -108,7 +106,7 @@
.date {
position: absolute;
bottom: 0;
bottom: 1px;
right: 0;
font: $font_12_regular;
color: transparentize($color: white, $amount: 0.8);

View file

@ -43,7 +43,7 @@
left: 0;
width: 100%;
height: 100%;
background: transparentize($comment_bg, 0.15) 50% 50%;
background: transparentize($content_bg, 0.15) 50% 50%;
background-size: cover;
z-index: 15;
border-radius: $radius;

View file

@ -10,10 +10,9 @@
}
.input {
@include outer_shadow();
position: relative;
flex: 1;
padding: ($gap / 2) ($gap / 2 + 1px);
padding: 5px;
}
.buttons {

View file

@ -2,14 +2,12 @@ import React, { FC, HTMLAttributes } from 'react';
import classNames from 'classnames';
import styles from './styles.module.scss';
import { Card } from '../Card';
import { IUser } from '~/redux/auth/types';
import { getURL } from '~/utils/dom';
import { path } from 'ramda';
import { PRESETS } from '~/constants/urls';
import { CommentAvatar } from '~/components/comment/CommentAvatar';
import { Card } from '~/components/containers/Card';
type IProps = HTMLAttributes<HTMLDivElement> & {
// photo?: string;
user: IUser;
is_empty?: boolean;
is_loading?: boolean;
@ -26,22 +24,19 @@ const CommentWrapper: FC<IProps> = ({
user,
...props
}) => (
<Card
className={classNames(styles.wrap, className, { is_empty, is_loading, is_same })}
seamless
{...props}
>
<div className={classNames(styles.wrap, className, { is_empty, is_loading, is_same })} {...props}>
<div className={styles.thumb}>
<div
<CommentAvatar
url={path(['photo', 'url'], user)}
username={user.username}
className={styles.thumb_image}
style={{ backgroundImage: `url("${getURL(path(['photo'], user), PRESETS.avatar)}")` }}
onClick={() => window.postMessage({ type: 'username', username: user.username }, '*')}
/>
<div className={styles.thumb_user}>~{path(['username'], user)}</div>
</div>
<div className={styles.text}>{children}</div>
</Card>
</div>
);
export { CommentWrapper };

View file

@ -1,12 +1,14 @@
@import "src/styles/variables";
.wrap {
@include outer_shadow;
background: $comment_bg;
min-height: $comment_height;
display: flex;
position: relative;
box-shadow: none;
min-width: 0;
border-radius: $radius;
&:global(.is_empty) {
opacity: 0.5;
@ -54,7 +56,7 @@
}
}
.thumb_image {
div.thumb_image {
height: $comment_height;
background: transparentize(white, 0.97) no-repeat 50% 50%;
border-radius: $panel_radius 0 0 $panel_radius;
@ -65,6 +67,7 @@
@include tablet {
height: 32px;
width: 32px;
flex: 0 0 32px;
border-radius: $panel_radius;
}

View file

@ -7,6 +7,6 @@
flex-wrap: wrap;
&> * {
margin: 0 $gap $gap 0;
margin: $gap / 2;
}
}

View file

@ -0,0 +1,32 @@
import React, { FC, useCallback } from 'react';
import { INode } from '~/redux/types';
import styles from './styles.module.scss';
import { CommentAvatar } from '~/components/comment/CommentAvatar';
import { openUserProfile } from '~/utils/user';
interface Props {
node?: INode;
}
const NodeAuthorBlock: FC<Props> = ({ node }) => {
if (!node?.user) {
return null;
}
const { fullname, username, description, photo } = node.user;
const onOpenProfile = useCallback(() => openUserProfile(username), [username]);
return (
<div className={styles.block} onClick={onOpenProfile}>
<CommentAvatar username={username} url={photo?.url} className={styles.avatar} />
<div className={styles.info}>
<div className={styles.username}>{fullname || username}</div>
{description && <div className={styles.description}>{description}</div>}
</div>
</div>
);
};
export { NodeAuthorBlock };

View file

@ -0,0 +1,39 @@
@import "~/styles/variables.scss";
div.block {
@include inner_shadow_active;
cursor: pointer;
background: $inset_bg;
padding: $gap;
border-radius: $radius;
display: flex;
flex-direction: row;
align-items: center;
justify-content: stretch;
}
.info {
}
.username {
font: $font_16_semibold;
line-height: 21px;
}
.description {
@include clamp(3, 12 * 1.25);
margin-top: 3px;
font: $font_12_regular;
line-height: 1.25em;
opacity: 0.5;
}
.avatar {
width: 48px;
height: 48px;
margin-right: 10px;
flex-shrink: 0;
align-self: flex-start;
}

View file

@ -12,6 +12,7 @@ import { NodeTagsBlock } from '~/components/node/NodeTagsBlock';
import { INodeRelated } from '~/redux/node/types';
import StickyBox from 'react-sticky-box/dist/esnext';
import styles from './styles.module.scss';
import { NodeAuthorBlock } from '~/components/node/NodeAuthorBlock';
interface IProps {
node: INode;
@ -60,10 +61,17 @@ const NodeBottomBlock: FC<IProps> = ({
<div className={styles.panel}>
<StickyBox className={styles.sticky} offsetTop={72}>
<Group className={styles.left}>
<div className={styles.left}>
<div className={styles.left_item}>
<NodeAuthorBlock node={node} />
</div>
<div className={styles.left_item}>
<NodeTagsBlock node={node} isLoading={isLoading} />
</div>
<div className={styles.left_item}>
<NodeRelatedBlock isLoading={isLoading} node={node} related={related} />
</Group>
</div>
</div>
</StickyBox>
</div>
</Group>

View file

@ -28,7 +28,6 @@
display: flex;
align-items: flex-start;
justify-content: flex-start;
padding-left: $gap / 2;
min-width: 0;
position: relative;
z-index: 10;
@ -51,3 +50,7 @@
flex: 1;
min-width: 0;
}
.left_item {
padding-bottom: $gap * 2;
}

View file

@ -11,7 +11,7 @@
left: 50%;
bottom: $gap * 2;
transform: translate(-50%, 0);
background: darken($comment_bg, 4%);
background: darken($content_bg, 4%);
width: auto;
padding: 5px 10px;
border-radius: 10px;

View file

@ -1,7 +1,7 @@
@import "src/styles/variables";
.place {
// height: 72px;
@include row_shadow;
position: relative;
z-index: 3;
margin-top: -$radius;

View file

@ -38,7 +38,6 @@
justify-content: center;
box-sizing: border-box;
min-width: 0;
background-color: $content_bg;
&:global(.stack) {
padding: 0 $gap;
@ -59,12 +58,10 @@
justify-content: stretch;
border-radius: $radius $radius 0 0;
box-sizing: border-box;
padding: $gap $gap;
padding: $gap;
height: 64px;
min-width: 0;
@include outer_shadow();
@include tablet {
border-radius: 0;
height: auto;

View file

@ -5,6 +5,7 @@ import { INode } from '~/redux/types';
import { PRESETS, URLS } from '~/constants/urls';
import { RouteComponentProps, withRouter } from 'react-router';
import { getURL, stringToColour } from '~/utils/dom';
import { CommentAvatar } from '~/components/comment/CommentAvatar';
type IProps = RouteComponentProps & {
item: Partial<INode>;
@ -59,6 +60,8 @@ const NodeRelatedItemUnconnected: FC<IProps> = memo(({ item, history }) => {
return 'small';
}, [width]);
const image = useMemo(() => getURL({ url: item.thumbnail }, PRESETS.avatar), [item.thumbnail]);
return (
<div
className={classNames(styles.item, styles[size], { [styles.is_loaded]: is_loaded })}
@ -66,11 +69,10 @@ const NodeRelatedItemUnconnected: FC<IProps> = memo(({ item, history }) => {
onClick={onClick}
ref={ref}
>
<div
className={styles.thumb}
style={{
backgroundImage: `url("${thumb}")`,
}}
<CommentAvatar
username={item.title}
url={item.thumbnail}
className={classNames(styles.thumb, { [styles.is_loaded]: is_loaded })}
/>
{!item.thumbnail && size === 'small' && (
@ -85,11 +87,7 @@ const NodeRelatedItemUnconnected: FC<IProps> = memo(({ item, history }) => {
</div>
)}
<img
src={getURL({ url: item.thumbnail }, PRESETS.avatar)}
alt="loader"
onLoad={() => setIsLoaded(true)}
/>
<img src={image} alt="loader" onLoad={() => setIsLoaded(true)} />
</div>
);
});

View file

@ -16,13 +16,10 @@
}
}
.thumb {
div.thumb {
position: absolute;
width: 100%;
height: 100%;
border-radius: $cell_radius;
background: lighten($content_bg, 2%) 50% 50% no-repeat;
background-size: cover;
opacity: 0;
transition: opacity 0.5s;
will-change: opacity;
@ -33,6 +30,8 @@
}
.letters, .title {
@include outer_shadow;
position: absolute;
display: flex;
align-items: center;

View file

@ -5,7 +5,6 @@
color: darken(white, 50%);
text-transform: uppercase;
padding: 0 $gap / 2;
padding-bottom: $gap / 2;
}
.tags.tags {
@ -20,7 +19,7 @@
@include lab_shadow;
border-radius: $radius;
background-color: $comment_bg;
background: $comment_bg;
padding: $gap;
}

View file

@ -49,7 +49,9 @@ $text_sign: 22px;
$input_bg_color: darken($content_bg, 2%);
$button_bg_color: $red_gradient;
$comment_bg: lighten($content_bg, 2%);
$inset_bg: linear-gradient(135deg, darken($content_bg, 2%), $content_bg);
$comment_bg: linear-gradient(135deg, $content_bg, lighten($content_bg, 2%));
$panel_bg: transparent;
$node_bg: darken($content_bg, 2%);
$node_image_bg: darken($main_bg_color, 4%);

View file

@ -88,11 +88,38 @@ $login_dialog_padding: $gap $gap 30px $gap;
$sidebar_border: transparentize(white, 0.95);
@mixin outer_shadow() {
box-shadow: inset transparentize(white, 0.95) 0 1px, transparentize(black, 0.8) -1px -1px;
box-shadow:
inset transparentize(white, 0.95) 1px 1px,
transparentize(black, 0.8) 1px 1px,
transparentize(black, 0.6) 0 1px 5px;
}
@mixin row_shadow() {
&:not(last-child) {
box-shadow:
transparentize(white, 0.95) 0 1px,
inset transparentize(black, 0.8) 0 -1px;
}
&:only-child {
box-shadow: none;
}
}
@mixin inner_shadow() {
box-shadow: inset transparentize(white, 0.95) 0 -1px, inset transparentize(black, 0.5) 0 1px;
box-shadow:
inset transparentize(white, 0.92) -1px -1px,
inset transparentize(black, 0.5) 1px 1px,
inset transparentize(black, 0.7) 0 0 10px;
}
@mixin inner_shadow_active() {
@include inner_shadow;
transition: background-color 250ms;
&:hover {
background: transparentize(white, 0.95);
}
}
@mixin input_shadow() {
@ -232,7 +259,8 @@ $sidebar_border: transparentize(white, 0.95);
}
@mixin lab_shadow {
box-shadow: transparentize(black, 0.5) 0 0 0 1px,
box-shadow:
transparentize(black, 0.5) 0 0 0 1px,
inset transparentize(white, 0.9) 0 1px,
lighten(black, 10%) 0 4px;
lighten(black, 0.1) 0 4px;
}

7
src/utils/user.ts Normal file
View file

@ -0,0 +1,7 @@
export const openUserProfile = (username?: string) => {
if (!username) {
return;
}
window.postMessage({ type: 'username', username }, '*');
};