+
);
export default notFound;
diff --git a/src/component/register.js b/src/component/Register.jsx
similarity index 99%
rename from src/component/register.js
rename to src/component/Register.jsx
index 21dfaf3..bf7273a 100644
--- a/src/component/register.js
+++ b/src/component/Register.jsx
@@ -100,4 +100,4 @@ export default connect(
{
signUpUser, loginUser,
}
- )(RegistrationForm);
\ No newline at end of file
+ )(RegistrationForm);
diff --git a/src/component/SingleEntry.jsx b/src/component/SingleEntry.jsx
new file mode 100644
index 0000000..4b4fba6
--- /dev/null
+++ b/src/component/SingleEntry.jsx
@@ -0,0 +1,68 @@
+import React, { Component } from 'react';
+import {connect} from 'react-redux';
+import renderHTML from 'react-render-html';
+import Navbar from './Navbar'
+import Footer from './Footer';
+import Menu from './menu';
+import {
+ singleEntry,
+ } from '../actions/AuthAction';
+class ViewEntry extends Component {
+ state = {
+ title:"",
+ body:""
+ }
+ componentWillMount(){
+ if (this.props.match.params.id) {
+ const id = this.props.match.params.id;
+ this.props.singleEntry(id)
+ }
+ }
+ goUpdate=(id)=>{
+ const { history } = this.props;
+ history.push(`/entry/${id}/edit`);}
+
+ render() {
+ const entry=this.props.entry.entry.result;
+ let showEntry;
+ let entry_id;
+ if(entry){
+ entry_id = entry[0].id;
+ showEntry = entry.map(entry => (
+
+
{entry.title}
+
{renderHTML(entry.body)}
+
+
+
+ ));}
+ return (
+
+ < Navbar />
+
+
+
+
+
+
+
+
+ {showEntry}
+
+
+
+ );
+}
+}
+const mapStateToProps= state =>({
+ entry:state.entries,
+})
+
+export default connect(
+ mapStateToProps,
+ {
+ singleEntry
+ }
+ )(ViewEntry);
diff --git a/src/component/UpdateEntry.jsx b/src/component/UpdateEntry.jsx
new file mode 100644
index 0000000..2dd0c00
--- /dev/null
+++ b/src/component/UpdateEntry.jsx
@@ -0,0 +1,44 @@
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import Main from './Main';
+import {
+ singleEntry,
+} from '../actions/AuthAction';
+
+class UpdateEntry extends Component {
+ componentWillMount() {
+ this.props.singleEntry(this.props.match.params.id);
+ }
+
+ render() {
+ if (this.props.entry.result) {
+ const data = this.props.entry.result[0];
+ this.title = data.title;
+ this.body = data.body;
+ }
+ return (
+
+
+
+ );
+ }
+}
+
+const mapStateToProps = state => ({
+ entry: state.entries.entry,
+});
+
+export default connect(
+ mapStateToProps,
+ {
+ singleEntry,
+ },
+)(UpdateEntry);
diff --git a/src/component/footer.js b/src/component/footer.js
deleted file mode 100644
index 502fcd4..0000000
--- a/src/component/footer.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import React, { Component } from 'react';
-class Footer extends Component {
- state = { }
- render() {
- return (
-
- );
- }
-}
-
-export default Footer;
\ No newline at end of file
diff --git a/src/component/login.js b/src/component/login.jsx
similarity index 89%
rename from src/component/login.js
rename to src/component/login.jsx
index c8f51a9..548bd90 100644
--- a/src/component/login.js
+++ b/src/component/login.jsx
@@ -7,7 +7,7 @@ import {
class LoginForm extends Component {
state = {
username:"",
- loginpassword: "",
+ password: "",
message:"",
}
@@ -25,6 +25,11 @@ class LoginForm extends Component {
}
this.props.loginUser(data)
}
+ componentDidUpdate=()=>{
+ if(this.props.user.user.token){
+ const { history } = this.props;
+ history.push("/createEntry");}
+ }
render() {
if(this.props.user.user.token){
LoggedInUser(this.props.user.user.token,this.state.username)
@@ -56,4 +61,4 @@ export default connect(
{
loginUser,
}
- )(LoginForm);
\ No newline at end of file
+ )(LoginForm);
diff --git a/src/component/menu.jsx b/src/component/menu.jsx
new file mode 100644
index 0000000..6b61bb7
--- /dev/null
+++ b/src/component/menu.jsx
@@ -0,0 +1,11 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+
+const Menu = () => (
+
+
CREATE AN ENTRY
+
ALL ENTRIES
+
PROFILE
+
+);
+export default Menu;
diff --git a/src/component/navbar.js b/src/component/navbar.js
deleted file mode 100644
index c39f609..0000000
--- a/src/component/navbar.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import React, { Component } from 'react';
-class Nabar extends Component {
- state = { }
- render() {
- return (
-
- );
- }
-}
-
-export default Nabar;
\ No newline at end of file
diff --git a/src/container/landingpage.js b/src/container/landingpage.js
deleted file mode 100644
index 16ec6fc..0000000
--- a/src/container/landingpage.js
+++ /dev/null
@@ -1,55 +0,0 @@
-import React, { Component } from 'react';
-import Navbar from '../component/navbar'
-import Footer from '../component/footer'
-import RegistrationForm from '../component/login'
-import LoginForm from '../component/register'
-class Landingpage extends Component {
- state = { }
- render() {
- return (
-
-
-
-
-
-
-
-
WELCOME TO OUR ONLINE FREE DIARY
- KEEP ALL YOUR DAILY MEMORIES IN ONE PLACE
-
-
-
-
TO GET STARTED, REGISTER WITH US OR LOGIN
-
-
-
-
-
-
- );
- }
-}
-
-export default Landingpage;
\ No newline at end of file
diff --git a/src/container/landingpage.jsx b/src/container/landingpage.jsx
new file mode 100644
index 0000000..fc29c4b
--- /dev/null
+++ b/src/container/landingpage.jsx
@@ -0,0 +1,55 @@
+import React from 'react';
+import Navbar from '../component/Navbar';
+import Footer from '../component/Footer';
+import RegistrationForm from '../component/Register';
+import LoginForm from '../component/login';
+
+const Landingpage = props => (
+
+
+
+
+
+
+
+
+ WELCOME TO OUR ONLINE FREE DIARY
+
+ KEEP ALL YOUR DAILY MEMORIES IN ONE PLACE
+
+
+
+
+
+
TO GET STARTED, REGISTER WITH US OR LOGIN
+
+
+
+
+
+
+);
+
+export default Landingpage;
diff --git a/src/index.css b/src/index.css
index 42953d5..8171241 100644
--- a/src/index.css
+++ b/src/index.css
@@ -33,7 +33,8 @@ margin-bottom:10px;
font-weight: bold;
}
.landing-row{
- height:60vh;
+ min-height:60vh;
+ max-height:auto;
}
.error{
margin-top:15px;
@@ -47,4 +48,55 @@ margin-bottom:10px;
text-align:center;
margin-top:100px;
}
+*[contenteditable=true] {
+ padding: 5px 9px;
+ color:black;
+ height:100%;
+ border-radius: 4px;
+ outline: 0;
+}
+.entry_row{
+ text-align:center !important;
+ margin-bottom:20px;
+ color:white;
+ font-size:25px;
+ }
+.truncate *{
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+.title{
+ font-weight:bold;
+ font-size:20px;
+}
+.entry_footer{
+ font-size:15px;
+ font-weight: 500;
+}
+.entry_body{
+ font-weight: 100;
+}
+.artcle_card{
+ background-color:#D3D3D3;
+}
+.scroll{
+ width:100%;
+ height:800px;
+ margin-bottom:30px;
+ border-radius:5px;
+ overflow:auto;
+}
+.word_wrap{
+ word-wrap: break-word;
+}
+.links a{
+ color: white;
+ border:2px solid white;
+ border-radius:5px;
+ padding:10px;
+}
+.links :hover{
+ text-decoration:none;
+}
\ No newline at end of file
diff --git a/src/index.js b/src/index.js
index ca5efa8..f36b57a 100644
--- a/src/index.js
+++ b/src/index.js
@@ -8,4 +8,7 @@ import Popper from 'popper.js';
import './index.css';
import App from './App';
-ReactDOM.render(
, document.getElementById('root'));
\ No newline at end of file
+ReactDOM.render(
+
,
+ document.getElementById('root') || document.createElement('div'),
+ );
\ No newline at end of file
diff --git a/src/reducers/EntryReducer.js b/src/reducers/EntryReducer.js
new file mode 100644
index 0000000..46d5310
--- /dev/null
+++ b/src/reducers/EntryReducer.js
@@ -0,0 +1,23 @@
+import {
+ CREATE_ENTRY, FETCH_ENTRIES, SINGLE_ENTRY, UPDATE_ENTRY,
+} from '../actions/ActionTypes';
+
+const initialState = {
+ entry: [],
+ entries: [],
+};
+const entryReducer = (state = initialState, action) => {
+ switch (action.type) {
+ case CREATE_ENTRY:
+ return { ...state, entry: action.payload };
+ case FETCH_ENTRIES:
+ return { ...state, entries: action.payload };
+ case SINGLE_ENTRY:
+ return { ...state, entry: action.payload };
+ case UPDATE_ENTRY:
+ return { ...state, entry: action.payload };
+ default:
+ return state;
+ }
+};
+export default entryReducer;
diff --git a/src/reducers/index.jsx b/src/reducers/index.jsx
index f3d117a..f284761 100644
--- a/src/reducers/index.jsx
+++ b/src/reducers/index.jsx
@@ -1,6 +1,8 @@
import { combineReducers } from 'redux';
import authReducer from './AuthReducer';
+import entryReducer from './EntryReducer';
export default combineReducers({
users: authReducer,
+ entries: entryReducer,
});
diff --git a/src/App.test.js b/src/tests/App.test.js
similarity index 89%
rename from src/App.test.js
rename to src/tests/App.test.js
index a754b20..823bacb 100644
--- a/src/App.test.js
+++ b/src/tests/App.test.js
@@ -1,6 +1,6 @@
import React from 'react';
import ReactDOM from 'react-dom';
-import App from './App';
+import App from '../App';
it('renders without crashing', () => {
const div = document.createElement('div');
diff --git a/src/tests/Entry.test.jsx b/src/tests/Entry.test.jsx
new file mode 100644
index 0000000..54f884b
--- /dev/null
+++ b/src/tests/Entry.test.jsx
@@ -0,0 +1,85 @@
+import Enzyme, { shallow, mount } from 'enzyme';
+import Adapter from 'enzyme-adapter-react-16';
+import React from 'react';
+import { Provider } from 'react-redux';
+import { BrowserRouter as Router } from 'react-router-dom';
+import configureMockStore from 'redux-mock-store';
+import CreateEntries from '../component/CreateEntry';
+import RegistrationForm from '../component/Register';
+import LoginForm from '../component/login';
+import Main from '../component/Main';
+import UpdateEntry from '../component/UpdateEntry';
+import GetEntries from '../component/GetEntries';
+import ViewEntry from '../component/SingleEntry';
+import store from '../store';
+
+
+Enzyme.configure({ adapter: new Adapter() });
+
+describe('entries components', () => {
+ const mockStore = configureMockStore();
+ beforeEach(() => {
+ mockStore({});
+ });
+ const getEvent = () => ({
+ preventDefault: jest.fn(),
+ });
+
+ it('should test get all entries without crashing', () => {
+ mount(
);
+ });
+ it('should test create entry without crashing', () => {
+ mount(
);
+ });
+ it('should test update entry without crashing', () => {
+ const props = {
+ entry: {
+ results: { title: 'man' },
+ },
+ };
+ mount(
);
+ });
+ it('should test view entry without crashing', () => {
+ mount(
);
+ });
+ it('should test register user without crashing', () => {
+ const props = {
+ user: {
+ user: { token: 'kjbhvgftryfuv' },
+ },
+ loginUser: jest.fn(),
+ LoggedInUser: jest.fn(),
+ };
+ const component = shallow(
).dive().instance();
+ component.change({ target: { value: 'firstname' } });
+ component.handleSubmit({ preventDefault() {} });
+ });
+ it('should test login user without crashing', () => {
+ const component = shallow(
).dive().instance();
+ component.Change({ target: { value: 'firstname' } });
+ component.handleSubmit({ preventDefault() {} });
+ });
+ it('should test main page create entry without crashing', () => {
+ const props = {
+ action_to_main: 'create_entry',
+ id: 1,
+ CreateEntries: jest.fn(),
+ UpdateEntries: jest.fn(),
+ };
+ const component = shallow(
).dive().instance();
+ component.onchange({ target: { value: 'title' } });
+ component.handleChange({ target: { value: 'body' } });
+ component.onhandleSubmit({ preventDefault() {} });
+ });
+ it('should test main page update entry without crashing', () => {
+ const props = {
+ action_to_main: 'update_entry',
+ id: 2,
+ UpdateEntries: jest.fn(),
+ };
+ const component = shallow(
).dive().instance();
+ component.onchange({ target: { value: 'title1' } });
+ component.handleChange({ target: { value: 'body1' } });
+ component.onhandleSubmit({ preventDefault() {} });
+ });
+});
diff --git a/src/tests/EntryReducers.test.jsx b/src/tests/EntryReducers.test.jsx
new file mode 100644
index 0000000..a165d67
--- /dev/null
+++ b/src/tests/EntryReducers.test.jsx
@@ -0,0 +1,54 @@
+import {
+ SIGNUP, LOGIN, CREATE_ENTRY, FETCH_ENTRIES, SINGLE_ENTRY, UPDATE_ENTRY,
+} from '../actions/ActionTypes';
+import entryReducer from '../reducers/EntryReducer';
+import authReducer from '../reducers/AuthReducer';
+
+it('sign up entry reducer ', () => {
+ authReducer(
+ {},
+ {
+ type: SIGNUP,
+ },
+ );
+});
+it('login entry reducer', () => {
+ authReducer(
+ {},
+ {
+ type: LOGIN,
+ },
+ );
+});
+it('create entry reducer', () => {
+ entryReducer(
+ {},
+ {
+ type: CREATE_ENTRY,
+ },
+ );
+});
+it('fetch entries reducer', () => {
+ entryReducer(
+ {},
+ {
+ type: FETCH_ENTRIES,
+ },
+ );
+});
+it('fetch single entry reducer', () => {
+ entryReducer(
+ {},
+ {
+ type: SINGLE_ENTRY,
+ },
+ );
+});
+it('update entry reducer', () => {
+ entryReducer(
+ {},
+ {
+ type: UPDATE_ENTRY,
+ },
+ );
+});
diff --git a/src/tests/functions.test.jsx b/src/tests/functions.test.jsx
new file mode 100644
index 0000000..54371d6
--- /dev/null
+++ b/src/tests/functions.test.jsx
@@ -0,0 +1,6 @@
+import LoggedInUser from '../common/getToken';
+
+test('set token in local storage', () => {
+ expect(LoggedInUser('token', 'username'));
+});
+
diff --git a/src/tests/index.test.jsx b/src/tests/index.test.jsx
new file mode 100644
index 0000000..e0ba1a3
--- /dev/null
+++ b/src/tests/index.test.jsx
@@ -0,0 +1,9 @@
+import Index from '../index';
+
+it('renders without crashing', () => {
+ expect(
+ JSON.stringify(
+ Object.assign({}, Index, { _reactInternalInstance: 'censored' }),
+ ),
+ )
+});