diff --git a/front-end-project-week/todo-project/src/App.js b/front-end-project-week/todo-project/src/App.js
index 6f5144e..da65f62 100644
--- a/front-end-project-week/todo-project/src/App.js
+++ b/front-end-project-week/todo-project/src/App.js
@@ -1,10 +1,6 @@
import React, { Component } from 'react';
import { Route } from 'react-router-dom'
import NoteContainer from './NoteContainer'
-import NavContainer from './NavContainer'
-import CreateNote from './CreateNote/CreateNote'
-import ViewNote from './NoteView/NoteView'
-import EditNote from './EditNote/EditNote'
import Authentication from './Authentication/Authenticate'
import './App.css';
@@ -13,16 +9,8 @@ class App extends Component {
render() {
return (
+
);
}
}
diff --git a/front-end-project-week/todo-project/src/CreateNote/CreateNote.js b/front-end-project-week/todo-project/src/CreateNote/CreateNote.js
deleted file mode 100644
index 5923a6c..0000000
--- a/front-end-project-week/todo-project/src/CreateNote/CreateNote.js
+++ /dev/null
@@ -1,61 +0,0 @@
-import React, { Component } from 'react'
-import axios from 'axios'
-import Form from './form'
-
-
-const titleBold = {
- 'fontWeight': 'bold',
- 'fontSize': '2rem',
- 'marginLeft': '1.3%'
-}
-
-export default class CreateNote extends Component {
- constructor(props){
- super(props)
- this.state = {
- title: '',
- content: '',
- }
- }
-
- handleInput = e => {
- this.setState({ [e.target.name]: e.target.value })
- }
-
- id = localStorage.getItem('id')
-
- saveNote = () => {
- if(this.state.title.length >= 60) {
- window.alert('Please keep title under 60 charecters')
- } else if (!this.state.title || !this.state.content) {
- window.alert('Please provide a title and content')
- } else {
- const myObj = { title: this.state.title, content: this.state.content, userId: this.id }
- axios
- .post('https://fsw-14-project-notes.herokuapp.com/notes', myObj)
- .then(response => {
- console.log(response)
- window.location.replace('/')
- })
- .catch(err => {
- console.log(err)
- })
- this.setState({ title: '', content: '' })
- }
- }
-
- render() {
- return (
-
-
- )
- }
-}
\ No newline at end of file
diff --git a/front-end-project-week/todo-project/src/CreateNote/form.css b/front-end-project-week/todo-project/src/CreateNote/form.css
deleted file mode 100644
index 383786c..0000000
--- a/front-end-project-week/todo-project/src/CreateNote/form.css
+++ /dev/null
@@ -1,25 +0,0 @@
-.form {
- margin-left: 1%;
- display: flex;
- flex-direction: column;
- height: 85vh;
-}
-.textBody {
- width: 98.5%;
- margin-top: 1%;
- height: 35vh;
-}
-.titleForm {
- width: 60%;
- height: 3.5vh;
- border-radius: 1px;
-}
-.formButton {
- width: 20%;
- margin-top: 1%;
- padding: 1% 1%;
- background: #24B8BD;
- color: white;
- font-weight: bold;
- font-size: 1rem;
-}
\ No newline at end of file
diff --git a/front-end-project-week/todo-project/src/CreateNote/form.js b/front-end-project-week/todo-project/src/CreateNote/form.js
deleted file mode 100644
index e5fd448..0000000
--- a/front-end-project-week/todo-project/src/CreateNote/form.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import React from 'react'
-import './form.css'
-
-function form(props) {
- return (
-
-
-
-
-
- );
-}
-
-
-export default form;
\ No newline at end of file
diff --git a/front-end-project-week/todo-project/src/EditNote/EditNote.js b/front-end-project-week/todo-project/src/EditNote/EditNote.js
deleted file mode 100644
index c6cb33d..0000000
--- a/front-end-project-week/todo-project/src/EditNote/EditNote.js
+++ /dev/null
@@ -1,90 +0,0 @@
-import React, { Component } from 'react'
-import axios from 'axios'
-import Form from './form'
-import { Route } from 'react-router-dom';
-
-
-const titleBold = {
- 'fontWeight': 'bold',
- 'fontSize': '2rem',
- 'marginLeft': '1.3%'
-}
-
-export default class CreateNote extends Component {
- constructor(props){
- super(props)
- this.state = {
- notes: [],
- title: '',
- content: '',
- }
- }
-
- componentDidMount() {
- this.fetchData()
- }
-
- fetchData() {
- axios
- .get('https://fsw-14-project-notes.herokuapp.com/notes')
- .then(response => {
- console.log(response)
- this.setState({ notes: response.data })
- })
- .catch(error => {
- console.log(error)
- })
- }
-
-
- handleInput = e => {
- this.setState({ [e.target.name]: e.target.value })
- }
-
- id = localStorage.getItem('id')
-
- updateNote = (id, userId) => {
- if(this.state.title.length >= 60) {
- window.alert('Please keep title under 60 charecters')
- } else if (!this.state.title || !this.state.content) {
- window.alert('Please provide a title and content')
- } else if (userId !== parseInt(this.id)) {
- window.alert('please dont edit sample notes')
- window.location.replace('/')
- } else {
- axios
- .put(`https://fsw-14-project-notes.herokuapp.com/${id}/edit-note`, {title: this.state.title, content: this.state.content})
- .then(response => {
- console.log(response)
- window.location.replace('/')
- })
- .catch(err => {
- console.log(err)
- })
- }
- }
-
-
- render() {
- return (
-
-
Edit Note:
- {this.state.notes.map(note => {
- return (
-
(
-
- )}>
- )
- })}
-
-
- )
- }
-}
\ No newline at end of file
diff --git a/front-end-project-week/todo-project/src/EditNote/form.css b/front-end-project-week/todo-project/src/EditNote/form.css
deleted file mode 100644
index 383786c..0000000
--- a/front-end-project-week/todo-project/src/EditNote/form.css
+++ /dev/null
@@ -1,25 +0,0 @@
-.form {
- margin-left: 1%;
- display: flex;
- flex-direction: column;
- height: 85vh;
-}
-.textBody {
- width: 98.5%;
- margin-top: 1%;
- height: 35vh;
-}
-.titleForm {
- width: 60%;
- height: 3.5vh;
- border-radius: 1px;
-}
-.formButton {
- width: 20%;
- margin-top: 1%;
- padding: 1% 1%;
- background: #24B8BD;
- color: white;
- font-weight: bold;
- font-size: 1rem;
-}
\ No newline at end of file
diff --git a/front-end-project-week/todo-project/src/EditNote/form.js b/front-end-project-week/todo-project/src/EditNote/form.js
deleted file mode 100644
index 19c468a..0000000
--- a/front-end-project-week/todo-project/src/EditNote/form.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import React from 'react'
-import './form.css'
-
-class Form extends React.Component {
-
-
- render(){
- return (
-
-
-
-
-
- );
-}
-}
-
-
-
-
-export default Form;
-
diff --git a/front-end-project-week/todo-project/src/Login/Login.js b/front-end-project-week/todo-project/src/Login/Login.js
index 78726ec..19acb4a 100644
--- a/front-end-project-week/todo-project/src/Login/Login.js
+++ b/front-end-project-week/todo-project/src/Login/Login.js
@@ -20,11 +20,13 @@ class Login extends Component {
login() {
axios
- .post('https://fsw-14-project-notes.herokuapp.com/login', {username: this.state.username, password: this.state.password})
+ .post('https://wunderlist-buildweek.herokuapp.com/login', {username: this.state.username, password: this.state.password})
.then(response => {
- console.log(response)
- const user = response.data.welcome
- const id = response.data.id
+ console.log('login user',response.data);
+ localStorage.setItem('token', response.data.token);
+ // debugger;
+ const user = response.data.username;
+ const id = response.data.id;
localStorage.setItem('username', user)
localStorage.setItem('id', id)
window.location.reload()
diff --git a/front-end-project-week/todo-project/src/NavContainer/index.css b/front-end-project-week/todo-project/src/NavContainer/index.css
deleted file mode 100644
index 701c36d..0000000
--- a/front-end-project-week/todo-project/src/NavContainer/index.css
+++ /dev/null
@@ -1,23 +0,0 @@
-.noteButtonContainer {
- margin-left: 5%;
- margin-right: 5%;
-}
-.titleNav {
- font-size: 2.3rem;
- font-weight: bold;
-}
-.navDiv {
- display: flex;
- flex-direction: column;
-}
-.button {
- border: 1px solid grey;
- color: white;
- background: #24B9BD;
- width: 90%;
- text-align: center;
- padding: 5% 5%;
- text-decoration: none;
- margin-bottom: 8%;
- font-weight: bold;
-}
\ No newline at end of file
diff --git a/front-end-project-week/todo-project/src/NavContainer/index.js b/front-end-project-week/todo-project/src/NavContainer/index.js
deleted file mode 100644
index fcce58b..0000000
--- a/front-end-project-week/todo-project/src/NavContainer/index.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import React, { Component } from 'react'
-import { NavLink } from 'react-router-dom';
-import './index.css'
-
-
-export default class NavContainer extends Component {
- render() {
- return (
-
-
WunderList
2.0
-
- View Your Notes
- +Create New Note
-
-
- )
- }
-}
-
diff --git a/front-end-project-week/todo-project/src/NoteContainer/NoteDisplay/Note.css b/front-end-project-week/todo-project/src/NoteContainer/NoteDisplay/Note.css
deleted file mode 100644
index f4d669c..0000000
--- a/front-end-project-week/todo-project/src/NoteContainer/NoteDisplay/Note.css
+++ /dev/null
@@ -1,31 +0,0 @@
-.noteCard {
- border: 1px solid grey;
- width: 23%;
- margin-bottom: 1%;
- background: #FFFFFF;
- overflow: hidden;
- height: 33.04vh;
- word-wrap: break-word;
- text-overflow: ellipsis;
-}
-.title {
- font-size: 1.5rem;
- padding-bottom: 2%;
- border-bottom: 2px solid grey;
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
-}
-.innerContent {
- padding: 0 5%;
-}
-.body {
- font-size: 1rem;
- text-overflow: ellipsis;
- overflow: hidden;
- word-wrap: break-word;
-}
-a {
- text-decoration: none;
- color: black;
-}
\ No newline at end of file
diff --git a/front-end-project-week/todo-project/src/NoteContainer/NoteDisplay/Note.js b/front-end-project-week/todo-project/src/NoteContainer/NoteDisplay/Note.js
deleted file mode 100644
index 46c3841..0000000
--- a/front-end-project-week/todo-project/src/NoteContainer/NoteDisplay/Note.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import React from 'react'
-import { NavLink } from 'react-router-dom';
-import './Note.css'
-
-
-const Note = props => {
-
- let noteBody = () => {
- if(props.note.content.length >= 410) {
- let str = props.note.content.substr(0,410)
- return str.concat('.....')
- } else {
- return props.note.content
- }
- }
-
- const id = localStorage.getItem('id')
-
- const notes = () => {
- if(props.note.userId === parseInt(id) || props.note.userId === null ) {
- return (
-
-
{props.note.title}
-
{noteBody()}
-
- )
- }
- }
-
- return (
-
-
- {notes()}
-
-
-
- )
-}
-
-
-export default Note;
\ No newline at end of file
diff --git a/front-end-project-week/todo-project/src/NoteContainer/NoteDisplay/NotesList.js b/front-end-project-week/todo-project/src/NoteContainer/NoteDisplay/NotesList.js
deleted file mode 100644
index 830b838..0000000
--- a/front-end-project-week/todo-project/src/NoteContainer/NoteDisplay/NotesList.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import React from 'react'
-import Note from './Note'
-import './Noteslist.css'
-
-
-const NoteList = props => {
-
- const id = localStorage.getItem('id')
-
- return (
-
- {props.notes.map(note => {
- if(note.userId === parseInt(id) || note.userId === null) {
- return
- }
- })}
-
-
- )
-}
-
-export default NoteList;
-
diff --git a/front-end-project-week/todo-project/src/NoteContainer/NoteDisplay/NotesMain.js b/front-end-project-week/todo-project/src/NoteContainer/NoteDisplay/NotesMain.js
deleted file mode 100644
index dbbf6ac..0000000
--- a/front-end-project-week/todo-project/src/NoteContainer/NoteDisplay/NotesMain.js
+++ /dev/null
@@ -1,61 +0,0 @@
-import React, { Component } from 'react'
-import axios from 'axios'
-import NotesList from './NotesList'
-
-const titleBold = {
- 'fontWeight': 'bold',
- 'fontSize': '2rem',
- 'marginLeft': '1.3%',
- 'marginTop': '4%'
-}
-const logoutButton = {
- 'display': 'flex',
- 'justifyContent': 'flex-end',
- 'marginRight': '1%',
- 'cursor': 'pointer',
- 'textDecoration': 'underline'
-}
-
-export default class NotesMain extends Component {
- constructor(props){
- super(props)
- this.state = {
- notes: [],
- }
- }
-
- username = localStorage.getItem('username')
-
- componentDidMount() {
- setInterval(() => {
- axios
- .get('https://fsw-14-project-notes.herokuapp.com/notes')
- .then(response => {
- this.setState({ notes: response.data })
- })
- .catch(error => {
- console.log(error)
- })
- }, 500)
- }
-
- logout = function() {
- localStorage.clear()
- if(window.localStorage.getItem('user') === null) {
- window.location.reload();
- }
- }
-
- render() {
- return (
-
-
Logout
-
-
{this.username}'s notes:
-
-
-
-
- )
- }
-}
\ No newline at end of file
diff --git a/front-end-project-week/todo-project/src/NoteContainer/NoteDisplay/Noteslist.css b/front-end-project-week/todo-project/src/NoteContainer/NoteDisplay/Noteslist.css
deleted file mode 100644
index 23d42dd..0000000
--- a/front-end-project-week/todo-project/src/NoteContainer/NoteDisplay/Noteslist.css
+++ /dev/null
@@ -1,5 +0,0 @@
-.noteCardContainer {
- display: flex;
- flex-wrap: wrap;
- justify-content: space-evenly;
-}
\ No newline at end of file
diff --git a/front-end-project-week/todo-project/src/NoteContainer/index.js b/front-end-project-week/todo-project/src/NoteContainer/index.js
index 99997d5..bf39c7b 100644
--- a/front-end-project-week/todo-project/src/NoteContainer/index.js
+++ b/front-end-project-week/todo-project/src/NoteContainer/index.js
@@ -1,18 +1,104 @@
import React, { Component } from 'react'
-import NotesMain from './NoteDisplay/NotesMain'
-import styled from 'styled-components'
+import axios from "axios";
-const NotesContainer = styled.div`
- margin: 0 auto;
- width: 100%;
-`
export default class NoteContainer extends Component {
- render() {
+ constructor(props) {
+ super(props);
+ this.state = {
+ todos: [],
+ title: '',
+ task: '',
+ notes: '',
+ setDate: '',
+ completed: false
+ }
+ }
+ componentDidMount() {
+ let token = localStorage.getItem('token');
+ axios
+ .get(`https://wunderlist-buildweek.herokuapp.com/todos/list`, { headers: {'Authorization': token}})
+ .then(response => {
+ console.log('axios get', response.data);
+ this.setState({ todos: response.data })
+ })
+ .catch(err => {
+ console.log(err)
+ })
+ };
+ handleChange = e => {
+ this.setState({
+ [e.target.name]: e.target.value
+ })
+ };
+
+ addTodo = () => {
+ let token = localStorage.getItem('token');
+ const todo = { title: this.state.title, task: this.state.task, notes: this.state.notes, setDate: this.state.setDate, completed: this.state.completed };
+ axios
+ .post(`https://wunderlist-buildweek.herokuapp.com/todos/list`, { headers: {'Authorization': token}}, todo)
+ .then(todo => {
+ console.log('POST todo', todo)
+ this.setState({ todos: todo.data })
+ })
+ .catch(e => {
+ console.log(e)
+ })
+ };
+ deleteTodo = id => {
+ let token = localStorage.getItem('token');
+ axios
+ .delete(`https://wunderlist-buildweek.herokuapp.com/todos/delete/${id}`, { headers: {'Authorization': token}})
+ .then(res => {
+ console.log('DELETE user', res)
+ this.setState({ todos: res.data })
+ })
+ .catch(e => {
+ console.log(e)
+ })
+ };
+updateTodo = id => {
+ let token = localStorage.getItem('token');
+ axios
+ .put(`https://wunderlist-buildweek.herokuapp.com/todos/edit/${id}`, { headers: {'Authorization': token}})
+ .then(res => {
+ console.log('PUT user', res);
+ this.setState({ todos: res.data })
+ })
+ .catch(e => {
+ console.log(e)
+ })
+}
+ render() {
return (
-
-
-
+
+ {this.state.todos.map(todo =>
{todo}
)}
+
)
}
-}
\ No newline at end of file
+}
+
+// //{name: this.state.name, age: this.state.age, email: this.state.email})
+// //this.setState({ notes: response.data })
+//
+// render() {
+// return (
+//
+//
+//
+//
+// );
+// }
+// }
+//
+// export default App;
\ No newline at end of file
diff --git a/front-end-project-week/todo-project/src/NoteView/NoteView.js b/front-end-project-week/todo-project/src/NoteView/NoteView.js
deleted file mode 100644
index 1a9851f..0000000
--- a/front-end-project-week/todo-project/src/NoteView/NoteView.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import React, { Component } from 'react'
-import { Route } from 'react-router-dom';
-import View from './View'
-import axios from 'axios'
-
-
-export default class ViewNote extends Component {
- constructor(props){
- super(props)
- this.state = {
- notes: [],
- }
- }
-
- componentDidMount() {
- axios
- .get(`https://fsw-14-project-notes.herokuapp.com/notes`)
- .then(response => {
- console.log(response)
- this.setState({ notes: response.data })
- })
- .catch(error => {
- console.log(error)
- })
- }
-
- id = localStorage.getItem('id')
-
- deleteNote = (id, userId) => {
- console.log(userId)
- if(userId === parseInt(this.id)) {
- axios
- .delete(`https://fsw-14-project-notes.herokuapp.com/notes/${id}`)
- .then(response => {
- console.log(response)
- })
- .catch(err => {
- console.log(err)
- })
- } else {
- window.alert('Please do not delete sample notes')
- }
- }
-
- render() {
- return (
- {this.state.notes.map(note => {
- return (
-
- )} >
- })}
-
- )
- }
-}
-
diff --git a/front-end-project-week/todo-project/src/NoteView/View.css b/front-end-project-week/todo-project/src/NoteView/View.css
deleted file mode 100644
index 44a5699..0000000
--- a/front-end-project-week/todo-project/src/NoteView/View.css
+++ /dev/null
@@ -1,60 +0,0 @@
-.modal {
- position: fixed;
- top: 0;
- left: 0;
- width:100%;
- height: 100%;
- background: rgba(0, 0, 0, 0.6);
-}
-.modal-main {
- position:fixed;
- background: white;
- border: 1px solid black;
- width: 30%;
- height: auto;
- top:16%;
- left:50%;
- transform: translate(-50%,-50%);
- cursor: auto;
- text-align: center;
- }
-
- .display-block {
- display: block;
- }
-
- .display-none {
- display: none;
- }
- .containNote {
- margin: 4% 1.5%
- }
- .links {
- display: flex;
- justify-content: flex-end;
- font-weight: bold;
- text-decoration: underline;
- cursor: pointer
- }
- .spacing {
- margin-right: 1%;
- }
- .modalButton2 {
- background: #24B8BD;
- color: white;
- margin-left: 1.5%;
- padding: .5rem 4rem;
- cursor: pointer;
- }
- .modalButton1 {
- background: #CA001A;
- color: white;
- margin-right: 1.5%;
- padding: .5rem 4rem;
- cursor: pointer;
- word-wrap: normal;
- }
- .buttonDiv {
- display: flex;
- justify-content: center;
- }
\ No newline at end of file
diff --git a/front-end-project-week/todo-project/src/NoteView/View.js b/front-end-project-week/todo-project/src/NoteView/View.js
deleted file mode 100644
index 4ed7c8f..0000000
--- a/front-end-project-week/todo-project/src/NoteView/View.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import React from 'react'
-import { NavLink } from 'react-router-dom'
-import './View.css'
-
-
-
-
-class View extends React.Component {
- constructor(props) {
- super(props)
- this.state = {
- show: false
- }
- }
-
- showModal = () => {
- this.setState({ show: true })
- }
-
- hideModal = () => {
- this.setState({ show: false })
- }
-
- Modal = ({ handleClose, show, children }) => {
- const showHideClassName = show ? 'display-block' : 'display-none';
-
- return (
-
-
- {children}
-
-
this.props.deleteNote(this.props.note.id, this.props.note.userId)} className='modalButton1'>Delete
-
No
-
-
-
- )
- }
-
-
- render() {
- return (
-
-
-
edit
-
- Are you sure you want to delete this?
-
-
delete
-
-
-
{this.props.note.title}
-
{this.props.note.content}
-
-
- )
- }
-}
-
-
-
-export default View;
\ No newline at end of file
diff --git a/front-end-project-week/todo-project/src/Register/Register.js b/front-end-project-week/todo-project/src/Register/Register.js
index eae39b7..67ad3d2 100644
--- a/front-end-project-week/todo-project/src/Register/Register.js
+++ b/front-end-project-week/todo-project/src/Register/Register.js
@@ -20,9 +20,9 @@ class Login extends Component {
registerUser() {
axios
- .post('https://fsw-14-project-notes.herokuapp.com/register', {username: this.state.username, password: this.state.password})
+ .post('https://wunderlist-buildweek.herokuapp.com/register', {username: this.state.username, password: this.state.password})
.then(response => {
- console.log(response)
+ console.log('register user', response);
window.location.replace('/')
})
.catch(error => {