Skip to content

Commit 97ce9b1

Browse files
MichaelNodeMichaelNode
committed
validation add_article
1 parent b8e92c8 commit 97ce9b1

18 files changed

Lines changed: 536 additions & 222 deletions

File tree

.env,example renamed to .env.example

File renamed without changes.

‎admin/package-lock.json‎

Lines changed: 14 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎admin/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
"jquery": "^3.3.1",
4242
"jwt-decode": "^2.2.0",
4343
"mini-css-extract-plugin": "0.5.0",
44+
"moment": "^2.24.0",
4445
"optimize-css-assets-webpack-plugin": "5.0.1",
4546
"pnp-webpack-plugin": "1.2.1",
4647
"postcss-flexbugs-fixes": "4.1.0",

‎admin/src/AdminPanel.js‎

Lines changed: 13 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,26 @@ import './App.css';
33
import {connect} from "react-redux";
44
import Login from './components/login/Login'
55
import Loading from './components/loading/Loading'
6-
import Nav from "./components/nav/Nav";
7-
import UpdateUserForm from './components/updateUser/updateUserForm';
8-
import AddArticleForm from './components/article/add_article/addarticle_form';
9-
import styled from 'styled-components';
6+
import {Route, Switch} from "react-router-dom";
7+
import InstantLogout from "./components/login/InstantLogout";
8+
import UpdateUserForm from "./components/updateUser/updateUserForm";
9+
import Header from "./Header";
1010

1111
class AdminPanel extends Component {
1212
render() {
1313
return (
1414
<div>
1515
{
1616
this.props.token && !this.props.isLoading && (
17-
<div className="App">
18-
<NavTitle>Welldone Admin Panel</NavTitle>
19-
<Nav/>
20-
21-
</div>
17+
<React.Fragment>
18+
<Header/>
19+
<Switch>
20+
<Route exact path="/admin/logout" component={InstantLogout}/>
21+
<Route exact path="/admin/update" component={UpdateUserForm}/>
22+
</Switch>
23+
</React.Fragment>
2224
)
2325
}
24-
{
25-
this.props.token && this.props.showUpdateForm &&
26-
<UpdateUserForm/>
27-
}
28-
{
29-
this.props.token && this.props.showArticleForm &&
30-
<AddArticleForm />
31-
}
3226
{
3327
!this.props.token && !this.props.isLoading &&
3428
<Login/>
@@ -42,13 +36,7 @@ class AdminPanel extends Component {
4236
}
4337
}
4438

45-
const NavTitle = styled.h1`
46-
margin-bottom: 0;
47-
`;
48-
4939
export default connect(state => ({
5040
token: state.user.token,
51-
isLoading: state.user.isLoading,
52-
showUpdateForm: state.user.updateAccount,
53-
showArticleForm: state.article.showform
54-
}))(AdminPanel);
41+
isLoading: state.user.isLoading
42+
}))(AdminPanel);

‎admin/src/Header.js‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
import React, { Component } from 'react';
2+
import PropTypes from "prop-types";
3+
import MainNavbar from "./components/navbar/navbar";
4+
import styled from "styled-components";
5+
6+
7+
class Header extends Component{
8+
render() {
9+
return (
10+
<div className="App">
11+
<MainNavbar />
12+
</div>
13+
)
14+
}
15+
}
16+
17+
Header.contextTypes = {
18+
t: PropTypes.func.isRequired
19+
};
20+
21+
const NavTitle = styled.h1`
22+
margin-bottom: 0;
23+
`;
24+
25+
export default Header;

0 commit comments

Comments
 (0)