mirror of
https://github.com/muerwre/vault-frontend.git
synced 2025-04-25 04:46:40 +07:00
added updated nodes to flow
This commit is contained in:
parent
6f76bec2c0
commit
74cd181530
13 changed files with 128 additions and 30 deletions
|
@ -21,6 +21,7 @@ export const FlowGrid: FC<IProps> = ({
|
|||
nodes,
|
||||
heroes,
|
||||
recent,
|
||||
updated,
|
||||
onSelect,
|
||||
onChangeCellView,
|
||||
}) => (
|
||||
|
@ -30,7 +31,7 @@ export const FlowGrid: FC<IProps> = ({
|
|||
<FlowHero heroes={heroes} />
|
||||
</div>
|
||||
<div className={styles.stamp}>
|
||||
<FlowRecent recent={recent} />
|
||||
<FlowRecent recent={recent} updated={updated} />
|
||||
</div>
|
||||
|
||||
{nodes.map(node => (
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
$cols: $content_width / $cell;
|
||||
$stamp_color: $content_bg;
|
||||
|
||||
.grid {
|
||||
padding: $gap / 2;
|
||||
|
@ -11,8 +12,8 @@ $cols: $content_width / $cell;
|
|||
grid-template-rows: 50vh $cell;
|
||||
grid-auto-rows: $cell;
|
||||
grid-auto-flow: row dense;
|
||||
grid-column-gap: $grid_line;
|
||||
grid-row-gap: $grid_line;
|
||||
grid-column-gap: $gap;
|
||||
grid-row-gap: $gap;
|
||||
|
||||
@include tablet {
|
||||
padding: 0 $gap;
|
||||
|
@ -72,10 +73,11 @@ $cols: $content_width / $cell;
|
|||
}
|
||||
|
||||
.stamp {
|
||||
@include outer_shadow();
|
||||
// grid-row: -1 / 3;
|
||||
grid-row-end: span 2;
|
||||
grid-column: -2 / -1;
|
||||
background: darken($content_bg, 8%);
|
||||
background: $stamp_color;
|
||||
border-radius: $radius;
|
||||
padding: $gap;
|
||||
display: flex;
|
||||
|
@ -85,4 +87,16 @@ $cols: $content_width / $cell;
|
|||
display: flex;
|
||||
align-items: stretch;
|
||||
justify-content: stretch;
|
||||
overflow: hidden;
|
||||
position: relative;
|
||||
|
||||
&::after {
|
||||
content: '';
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
height: 60px;
|
||||
width: 100%;
|
||||
background: linear-gradient(transparentize($stamp_color, 1), $stamp_color 90%);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,19 +1,45 @@
|
|||
import React, { FC } from 'react';
|
||||
import * as styles from './styles.scss';
|
||||
import { IFlowState } from '~/redux/flow/reducer';
|
||||
import { getURL } from '~/utils/dom';
|
||||
import { Link } from 'react-router-dom';
|
||||
import { URLS } from '~/constants/urls';
|
||||
import classNames from 'classnames';
|
||||
|
||||
interface IProps {
|
||||
recent: IFlowState['recent'];
|
||||
updated: IFlowState['updated'];
|
||||
}
|
||||
|
||||
const FlowRecent: FC<IProps> = ({ recent }) => (
|
||||
const FlowRecent: FC<IProps> = ({ recent, updated }) => (
|
||||
<div className={styles.grid}>
|
||||
{updated &&
|
||||
updated.slice(0, 20).map(node => (
|
||||
<Link key={node.id} className={styles.item} to={URLS.NODE_URL(node.id)}>
|
||||
<div
|
||||
className={classNames(styles.thumb, styles.new)}
|
||||
style={{ backgroundImage: `url("${getURL({ url: node.thumbnail })}")` }}
|
||||
/>
|
||||
|
||||
<div className={styles.info}>
|
||||
<div className={styles.title}>{node.title}</div>
|
||||
<div className={styles.comment}>{node.created_at}</div>
|
||||
</div>
|
||||
</Link>
|
||||
))}
|
||||
|
||||
{recent &&
|
||||
recent.slice(0, 9).map(node => (
|
||||
<div key={node.id} className={styles.item}>
|
||||
<div className={styles.thumb} />
|
||||
<div className={styles.info}>{node.title}</div>
|
||||
</div>
|
||||
recent.slice(0, 20).map(node => (
|
||||
<Link key={node.id} className={styles.item} to={URLS.NODE_URL(node.id)}>
|
||||
<div
|
||||
className={styles.thumb}
|
||||
style={{ backgroundImage: `url("${getURL({ url: node.thumbnail })}")` }}
|
||||
/>
|
||||
<div className={styles.info}>
|
||||
<div className={styles.title}>{node.title}</div>
|
||||
<div className={styles.comment}>{node.created_at}</div>
|
||||
</div>
|
||||
</Link>
|
||||
))}
|
||||
</div>
|
||||
);
|
||||
|
|
|
@ -1,9 +1,7 @@
|
|||
.grid {
|
||||
display: grid;
|
||||
grid-template-rows: repeat(9, 1fr);
|
||||
grid-template-columns: auto;
|
||||
row-gap: $grid_line;
|
||||
display: flex;
|
||||
justify-content: stretch;
|
||||
flex-direction: column;
|
||||
flex: 1;
|
||||
|
||||
& > div {
|
||||
|
@ -20,17 +18,51 @@
|
|||
font: $font_12_regular;
|
||||
border-radius: $radius;
|
||||
flex-direction: row;
|
||||
margin-bottom: $gap;
|
||||
color: white;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.thumb {
|
||||
height: 100%;
|
||||
width: 40px;
|
||||
margin-right: $grid_line;
|
||||
// padding-left: 100%;
|
||||
background: red;
|
||||
// flex:
|
||||
height: 48px;
|
||||
margin-right: $gap;
|
||||
background: 50% 50% no-repeat/cover;
|
||||
border-radius: $radius;
|
||||
flex: 0 0 48px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
position: relative;
|
||||
|
||||
&.new {
|
||||
&::after {
|
||||
content: ' ';
|
||||
width: 12px;
|
||||
height: 12px;
|
||||
border-radius: 100%;
|
||||
background: $red;
|
||||
box-shadow: $content_bg 0 0 0 5px;
|
||||
position: absolute;
|
||||
right: -2px;
|
||||
bottom: -2px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.info {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.title {
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
overflow: hidden;
|
||||
font: $font_16_semibold;
|
||||
}
|
||||
|
||||
.comment {
|
||||
font: $font_12_regular;
|
||||
margin-top: 4px;
|
||||
opacity: 0.5;
|
||||
}
|
||||
|
|
|
@ -8,7 +8,7 @@ import pick from 'ramda/es/pick';
|
|||
import { selectUser } from '~/redux/auth/selectors';
|
||||
|
||||
const mapStateToProps = state => ({
|
||||
flow: pick(['nodes', 'heroes', 'recent'], selectFlow(state)),
|
||||
flow: pick(['nodes', 'heroes', 'recent', 'updated'], selectFlow(state)),
|
||||
user: pick(['role', 'id'], selectUser(state)),
|
||||
});
|
||||
|
||||
|
@ -20,7 +20,7 @@ const mapDispatchToProps = {
|
|||
type IProps = ReturnType<typeof mapStateToProps> & typeof mapDispatchToProps & {};
|
||||
|
||||
const FlowLayoutUnconnected: FC<IProps> = ({
|
||||
flow: { nodes, heroes, recent },
|
||||
flow: { nodes, heroes, recent, updated },
|
||||
user,
|
||||
nodeLoadNode,
|
||||
flowSetCellView,
|
||||
|
@ -29,6 +29,7 @@ const FlowLayoutUnconnected: FC<IProps> = ({
|
|||
nodes={nodes}
|
||||
heroes={heroes}
|
||||
recent={recent}
|
||||
updated={updated}
|
||||
onSelect={nodeLoadNode}
|
||||
user={user}
|
||||
onChangeCellView={flowSetCellView}
|
||||
|
|
|
@ -17,6 +17,11 @@ export const flowSetRecent = (recent: IFlowState['recent']) => ({
|
|||
type: FLOW_ACTIONS.SET_RECENT,
|
||||
});
|
||||
|
||||
export const flowSetUpdated = (updated: IFlowState['updated']) => ({
|
||||
updated,
|
||||
type: FLOW_ACTIONS.SET_UPDATED,
|
||||
});
|
||||
|
||||
export const flowSetCellView = (id: INode['id'], flow: INode['flow']) => ({
|
||||
type: FLOW_ACTIONS.SET_CELL_VIEW,
|
||||
id,
|
||||
|
|
|
@ -5,5 +5,6 @@ export const FLOW_ACTIONS = {
|
|||
SET_NODES: `${prefix}SET_NODES`,
|
||||
SET_HEROES: `${prefix}SET_HEROES`,
|
||||
SET_RECENT: `${prefix}SET_RECENT`,
|
||||
SET_UPDATED: `${prefix}SET_UPDATED`,
|
||||
SET_CELL_VIEW: `${prefix}SET_CELL_VIEW`,
|
||||
};
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import assocPath from 'ramda/es/assocPath';
|
||||
import { FLOW_ACTIONS } from './constants';
|
||||
import { flowSetNodes, flowSetHeroes, flowSetRecent } from './actions';
|
||||
import { flowSetNodes, flowSetHeroes, flowSetRecent, flowSetUpdated } from './actions';
|
||||
import { IFlowState } from './reducer';
|
||||
|
||||
const setNodes = (state: IFlowState, { nodes }: ReturnType<typeof flowSetNodes>) =>
|
||||
|
@ -12,8 +12,12 @@ const setHeroes = (state: IFlowState, { heroes }: ReturnType<typeof flowSetHeroe
|
|||
const setRecent = (state: IFlowState, { recent }: ReturnType<typeof flowSetRecent>) =>
|
||||
assocPath(['recent'], recent, state);
|
||||
|
||||
const setUpdated = (state: IFlowState, { updated }: ReturnType<typeof flowSetUpdated>) =>
|
||||
assocPath(['updated'], updated, state);
|
||||
|
||||
export const FLOW_HANDLERS = {
|
||||
[FLOW_ACTIONS.SET_NODES]: setNodes,
|
||||
[FLOW_ACTIONS.SET_HEROES]: setHeroes,
|
||||
[FLOW_ACTIONS.SET_RECENT]: setRecent,
|
||||
[FLOW_ACTIONS.SET_UPDATED]: setUpdated,
|
||||
};
|
||||
|
|
|
@ -7,6 +7,7 @@ export type IFlowState = Readonly<{
|
|||
nodes: INode[];
|
||||
heroes: Partial<INode>[];
|
||||
recent: Partial<INode>[];
|
||||
updated: Partial<INode>[];
|
||||
error: IError;
|
||||
}>;
|
||||
|
||||
|
@ -14,6 +15,7 @@ const INITIAL_STATE: IFlowState = {
|
|||
nodes: [],
|
||||
heroes: [],
|
||||
recent: [],
|
||||
updated: [],
|
||||
is_loading: false,
|
||||
error: null,
|
||||
};
|
||||
|
|
|
@ -2,7 +2,13 @@ import { takeLatest, call, put, select } from 'redux-saga/effects';
|
|||
import { REHYDRATE } from 'redux-persist';
|
||||
import { FLOW_ACTIONS } from './constants';
|
||||
import { getNodes } from '../node/api';
|
||||
import { flowSetNodes, flowSetCellView, flowSetHeroes, flowSetRecent } from './actions';
|
||||
import {
|
||||
flowSetNodes,
|
||||
flowSetCellView,
|
||||
flowSetHeroes,
|
||||
flowSetRecent,
|
||||
flowSetUpdated,
|
||||
} from './actions';
|
||||
import { IResultWithStatus, INode } from '../types';
|
||||
import { selectFlowNodes } from './selectors';
|
||||
import { reqWrapper } from '../auth/sagas';
|
||||
|
@ -11,23 +17,26 @@ import { IFlowState } from './reducer';
|
|||
|
||||
function* onGetFlow() {
|
||||
const {
|
||||
data: { nodes = null, heroes = null, recent = null },
|
||||
data: { nodes = null, heroes = null, recent = [], updated = [] },
|
||||
}: IResultWithStatus<{
|
||||
nodes: IFlowState['nodes'];
|
||||
heroes: IFlowState['heroes'];
|
||||
recent: IFlowState['recent'];
|
||||
}> = yield call(getNodes, {});
|
||||
updated: IFlowState['updated'];
|
||||
}> = yield call(reqWrapper, getNodes, {});
|
||||
|
||||
if (!nodes || !nodes.length) {
|
||||
yield put(flowSetNodes([]));
|
||||
yield put(flowSetHeroes([]));
|
||||
yield put(flowSetRecent([]));
|
||||
yield put(flowSetUpdated([]));
|
||||
return;
|
||||
}
|
||||
|
||||
yield put(flowSetNodes(nodes));
|
||||
yield put(flowSetHeroes(heroes));
|
||||
yield put(flowSetRecent(recent));
|
||||
yield put(flowSetUpdated(updated));
|
||||
}
|
||||
|
||||
function* onSetCellView({ id, flow }: ReturnType<typeof flowSetCellView>) {
|
||||
|
|
|
@ -19,11 +19,13 @@ export const postNode = ({
|
|||
|
||||
export const getNodes = ({
|
||||
skip = 0,
|
||||
access,
|
||||
}: {
|
||||
skip?: number;
|
||||
access: string;
|
||||
}): Promise<IResultWithStatus<{ nodes: INode[] }>> =>
|
||||
api
|
||||
.get(API.NODE.GET, { params: { skip } })
|
||||
.get(API.NODE.GET, configWithToken(access, { params: { skip } }))
|
||||
.then(resultMiddleware)
|
||||
.catch(errorMiddleware);
|
||||
|
||||
|
|
|
@ -129,8 +129,9 @@ export interface INode {
|
|||
|
||||
tags: ITag[];
|
||||
|
||||
createdAt?: string;
|
||||
updatedAt?: string;
|
||||
created_at?: string;
|
||||
updated_at?: string;
|
||||
commented_at?: string;
|
||||
}
|
||||
|
||||
export interface IComment {
|
||||
|
|
|
@ -8,7 +8,7 @@ $spc: $gap * 2;
|
|||
$comment_height: 72px;
|
||||
$bar_height: 64px;
|
||||
|
||||
$radius: 8px;
|
||||
$radius: 2px;
|
||||
$cell_radius: $radius;
|
||||
$panel_radius: $radius;
|
||||
$input_radius: $radius;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue