Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

components 수정 #198

Merged
merged 4 commits into from
Aug 25, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { connect } from 'react-redux'
import { matchPath, withRouter } from 'react-router'
import { Redirect, Route, Switch } from 'react-router-dom'
import { clearAccount, getAccount } from './actions'
import Navigation from './container/Navigation'
import Navigation from './containers/Navigation'
import { routes } from './Route'
import './App.scss'

Expand Down
36 changes: 18 additions & 18 deletions src/Route.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
import React from 'react'
import Accounting from './container/Accounting'
import Cleaning from './container/Cleaning'
import Deactivate from './container/Deactivate'
import Doorlock from './container/Doorlock'
import EditUserProfile from './container/EditUserProfile'
import Enrollment from './container/Enrollment'
import Law from './container/Law'
import Login from './container/Login'
import Members from './container/Members'
import Notifications from './container/Notifications'
import OldNoties from './container/OldNoties'
import OldTexts from './container/OldTexts'
import Page404 from './container/Page404'
import Portal from './container/Portal'
import Registration from './container/Registration'
import Sider from './container/Sider'
import SingleFeed from './container/SingleFeed'
import Userpage from './container/Userpage'
import Accounting from './containers/Accounting'
import Cleaning from './containers/Cleaning'
import Deactivate from './containers/Deactivate'
import Doorlock from './containers/Doorlock'
import EditUserProfile from './containers/EditUserProfile'
import Enrollment from './containers/Enrollment'
import Law from './containers/Law'
import Login from './containers/Login'
import Members from './containers/Members'
import Notifications from './containers/Notifications'
import OldNoties from './containers/OldNoties'
import OldTexts from './containers/OldTexts'
import Page404 from './containers/Page404'
import Portal from './containers/Portal'
import Registration from './containers/Registration'
import Sider from './containers/Sider'
import SingleFeed from './containers/SingleFeed'
import Userpage from './containers/Userpage'


// eslint-disable-next-line
Expand Down
27 changes: 13 additions & 14 deletions src/components/Activity.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { Col, Row } from 'antd'
import PropTypes from 'prop-types'
import React, { Component } from 'react'
import { Link } from 'react-router-dom'
Expand All @@ -7,43 +8,41 @@ class Activity extends Component {
render() {
const account = this.props.content
return (
<div style={{
height: '98px',
display: 'flex',
flexDirection: 'row',
<Row style={{
height: '10vh',
fontSize: '16pt',
padding: '12px',
textAlign: 'center',
}}
>
<div style={{ width: '34%' }}>
<div style={{ height: '50%' }}>글</div>
<Col span={8}>
<Link
className="ant-anchor-link-title"
to={`/members/${account.username}`}
>
{account.documentsCount}
</Link>
</div>
<div style={{ width: '33%' }}>
<div style={{ height: '50%' }}>댓글</div>
</Col>
<Col span={8}>
댓글
<Link
className="ant-anchor-link-title"
to={`/members/${account.username}/comments`}
>
{account.commentsCount}
</Link>
</div>
<div style={{ width: '33%' }}>
<div style={{ height: '50%' }}>좋아요</div>
</Col>
<Col span={8}>
좋아요
<Link
className="ant-anchor-link-title"
to={`/members/${account.username}/likes`}
>
{account.likedDocumentsCount}
</Link>
</div>
</div>
</Col>
</Row>
)
}
}
Expand Down
233 changes: 0 additions & 233 deletions src/components/Album.js

This file was deleted.

Loading