diff --git a/client/src/Cards/cardType/Card.js b/client/src/Cards/cardType/Card.js
index 5566b48..33e87c0 100644
--- a/client/src/Cards/cardType/Card.js
+++ b/client/src/Cards/cardType/Card.js
@@ -1,10 +1,7 @@
import PropTypes from 'prop-types'
export const PropTypeCard = PropTypes.shape({
- id: PropTypes.oneOfType([
- PropTypes.string,
- PropTypes.number,
- ]),
+ id: PropTypes.string,
name: PropTypes.string,
color: PropTypes.string,
text: PropTypes.string,
@@ -12,7 +9,7 @@ export const PropTypeCard = PropTypes.shape({
export function checkCard(card) {
return (
- (typeof card.id === "number" || typeof card.id === "string") &&
+ (typeof card.id === "string") &&
typeof card.name === "string" &&
typeof card.color === "string" &&
typeof card.text === "string"
@@ -34,7 +31,7 @@ export function checkCardsArr(cardsArr) {
export class Card {
constructor({ id, name, color, text }) {
- this.id = Number(id)
+ this.id = String(id)
this.name = String(name)
this.color = String(color)
this.text = String(text)
diff --git a/client/src/Context/cardsContext.js b/client/src/Context/cardsContext.js
new file mode 100644
index 0000000..084eb5e
--- /dev/null
+++ b/client/src/Context/cardsContext.js
@@ -0,0 +1,5 @@
+import {createContext} from 'react'
+
+const CardsContext = createContext()
+
+export default CardsContext
\ No newline at end of file
diff --git a/client/src/Login/ModalLogin.js b/client/src/Login/ModalLogin.js
deleted file mode 100644
index da5ffd8..0000000
--- a/client/src/Login/ModalLogin.js
+++ /dev/null
@@ -1,133 +0,0 @@
-import React from "react"
-import Modal, { ModalProps } from "../Shared/Modal/Modal"
-import PropTypes from 'prop-types'
-import useInputValue from '../Shared/useInputValue.hook'
-import LoginService from '../Services/LoginService'
-const { logIn, logOut } = LoginService()
-
-function checkUsername(str) {
- return str && typeof str === 'string' && str.length > 3 && str.length < 20 && str === validateUsername(str)
-}
-
-function validateUsername(str) {
- return String(str).replace(/@|;|:|\.|,|\/|\\|\||\$|\?|!|#|%|\*|\^|\+|=|\[|\]| |\\ |«|<|>/gi, "").trim()
-}
-
-function ModalLogin(props) {
- const { onLogin, onLogout, logged, userName, isOpen, setOpenState } = props
-
- const input = useInputValue("")
-
- const modalProps = new ModalProps()
- modalProps.isOpen = isOpen
- modalProps.setOpenState = setOpenState
- modalProps.sideClose = true
-
- const [labelAlert, setLabelAlert] = React.useState("");
-
- // eslint-disable-next-line no-unused-vars
- function open() {
- setOpenState(true)
- }
-
- function close() {
- clearInput()
- setLabelAlert("")
- setOpenState(false)
- }
-
- function clearInput() {
- input.clear()
- }
-
- function tryLogin() {
- if (checkUsername(input.value)) {
- logIn(input.value.trim())
- .then((name) => {
- onLogin(name)
- close()
- console.log('Login:', name)
- })
- .catch((err) => {
- console.log("Не удалось залогиниться")
- console.log(err)
- setLabelAlert(
- Не удалось залогиниться {err && {String(err)}}
-
)
- })
- } else if (input.value) {
- setLabelAlert(
{input.value.length > 3 ? "Исправьте логин" : "Слишком короткий логин"}
)
- } else {
- setLabelAlert(
Поле "Username" не должно быть пустым
)
- }
- }
-
- function tryLogout() {
- logOut()
- .then((name) => {
- onLogout(name)
- console.log('Logged out')
- })
- .catch((err) => {
- console.log("Не удалось разлогиниться")
- console.log(err)
- setLabelAlert(
- Не удалось разлогиниться {err && {String(err)}}
-
)
- })
- //close()
- }
-
- return (
-
-
-
-
-
- {logged ? AUTORISED : 'UNAUTORISED'}
-
- {userName ? {userName} : ``}
-
-
-
-
- {labelAlert}
-
- e.key === 'Enter' && tryLogin()}
- {...input.bind}
- />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- )
-}
-
-ModalLogin.propTypes = {
- logged: PropTypes.oneOfType([PropTypes.bool, PropTypes.number]),
- userName: PropTypes.oneOfType([PropTypes.bool, PropTypes.string]),
- login: PropTypes.func,
- logout: PropTypes.func,
-
- isOpen: PropTypes.bool,
- setOpenState: PropTypes.func
-}
-
-export default ModalLogin
diff --git a/client/src/Services/DataService.js b/client/src/Services/DataService.js
deleted file mode 100644
index 01fc03c..0000000
--- a/client/src/Services/DataService.js
+++ /dev/null
@@ -1,139 +0,0 @@
-import { ajax } from "jquery"
-import Card, { checkCardsArr } from '../Cards/cardType/Card'
-
-export default function DataService() {
- ////////////////////////////////////////////////////////////
- var user = null
- const baseUrl = '/api/server/'
-
- ////////////////////////////////////////////////////////////
- function updDataServLogin(login) {
- return new Promise((res, rej) => {
- if (login && typeof login === "string") {
- user = login
- //console.log("data serv login set")
- res(user)
- } else if (login === null) {
- user = null
- //console.log("data serv login unset")
- res()
- } else {
- //console.log("data serv cant set login", login)
- rej(login)
- }
- })
- }
- ////////////////////////////////////////////////////////////
-
- ////////////////////////////////////////////////////////////
- //let recuestCount = 1;
- function request(target, data) {
- //const rc = recuestCount++
- //console.log(` \nrequest ${rc} - "${target}" started \n params - user:"${user}" data:"${data}"`)
- return new Promise((res, rej) => {
- ajax({
- url: baseUrl,
- type: "POST",
- dataType: "html",
- data: {
- user: user,
- target: target,
- data: data,
- },
- })
- .done(resdata => res(resdata))
- .fail(rejdata => rej(rejdata))
- /*.always(() => console.log(
- `requested - newUser:"${user}" resolveData:"${data}" \n
- request ${rc} - "${target}" ended \n `
- ))*/
- })
- }
- ////////////////////////////////////////////////////////////
-
- ////////////////////////////////////////////////////////////
- function requestGetData() {
- return request('getData', null)
- }
-
- function requestPostData(data) {
- return request('setData', data || [])
- }
- ////////////////////////////////////////////////////////////
-
- ////////////////////////////////////////////////////////////
- function tryParce(str) {
- try {
- return JSON.parse(str);
- } catch (e) {
- return str;
- }
- }
-
- function checkData(data) {
- //console.log('start check data')
- try {
- if (data === null) console.log("null data");
- return data === null || data === [] || checkCardsArr(data)
- } catch {
- return false
- }
-
- }
- ////////////////////////////////////////////////////////////
-
- ////////////////////////////////////////////////////////////
- function loadData() {
- return new Promise((res, rej) => {
- try {
- (user === null
- ? Promise.reject(rej())
- : requestGetData())
- .then((d) => {
- let data = tryParce(d)//here we parce json
- //console.log("[DATA] from loadData(): ", data)
- if (!data) console.log("empty data from server");
- if (!checkData(data)) {
- console.error("[loadData] Bad data format")
- console.log(data)
- let checkDel = user !== null
- if (checkDel && window.confirm("Bad data: " + data + ". Delete data on server?")) {
- console.log('clear data')
- requestPostData([new Card({ id: 0, color: "orange", name: "Error", text: "Данные были очищены из за ошибки" })]).then(() => loadData().then(res, rej), rej)//очистка данных
- } else rej("Not format data" + !user ? " & unlogged" : "")
- } else {
- res(data || [])
- }
- })
- .catch(rej)
- } catch (e) {
- rej(e)
- console.error(e)
- }
- })
- }
-
- function postData(data) {
- return new Promise((res, rej) => {
- try {
- (user === null
- ? Promise.reject(rej())
- : loadData())
- .then((d) => {
- if (!data) console.log("empty data to post");
- if (!d) console.log("empty loaded to check");
- let pDat = data === null ? (d || []) : data
- if (!pDat) console.log("empty will be posted");
- requestPostData(pDat).then(res, rej)
- })
- .catch(rej)
- } catch (e) {
- rej(e)
- console.error(e)
- }
- })
- }
- ////////////////////////////////////////////////////////////
-
- return { loadData, postData, updDataServLogin }
-}
diff --git a/client/src/Services/LoginService.js b/client/src/Services/LoginService.js
deleted file mode 100644
index a900754..0000000
--- a/client/src/Services/LoginService.js
+++ /dev/null
@@ -1,31 +0,0 @@
-export default function DataService() {
- // ПОКА ЭТО ТУПО ЗАГЛУШКА
- var user = null
-
- ////////////////////////////////////////////////////////////
-
- function logIn(login) {
- return new Promise((res, rej) => {
- if (login && typeof login === "string") {
- user = login
- //console.log("login serv login set")
- res(user)
- } else {
- //console.log("login serv cant set login", login)
- rej(login)
- }
- })
- }
-
- function logOut() {
- return new Promise((res, rej) => {
- user = null
- //console.log("login serv dislogin")
- res()
- })
- }
-
- ////////////////////////////////////////////////////////////
-
- return { logIn, logOut }
-}
diff --git a/client/src/context.js b/client/src/context.js
deleted file mode 100644
index f015347..0000000
--- a/client/src/context.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import React from 'react'
-
-const Context = React.createContext()
-
-export default Context
\ No newline at end of file
diff --git a/client/src/context/AuthContext.js b/client/src/context/AuthContext.js
new file mode 100644
index 0000000..b302288
--- /dev/null
+++ b/client/src/context/AuthContext.js
@@ -0,0 +1,12 @@
+import {createContext} from 'react'
+
+function noop() {}
+
+export const AuthContext = createContext({
+ token: null,
+ userId: null,
+ email: null,
+ login: noop,
+ logout: noop,
+ isAuthenticated: false
+})
diff --git a/client/src/context/PageContext.js b/client/src/context/PageContext.js
new file mode 100644
index 0000000..0410d50
--- /dev/null
+++ b/client/src/context/PageContext.js
@@ -0,0 +1,5 @@
+import { createContext } from 'react'
+
+function noop() { }
+
+export const PageContext = createContext({ setNav: noop })
diff --git a/client/src/hooks/auth.hook.js b/client/src/hooks/auth.hook.js
new file mode 100644
index 0000000..588548f
--- /dev/null
+++ b/client/src/hooks/auth.hook.js
@@ -0,0 +1,42 @@
+import {useState, useCallback, useEffect} from 'react'
+
+const storageName = 'userData'
+
+export const useAuth = () => {
+ const [token, setToken] = useState(null)
+ const [ready, setReady] = useState(false)
+ const [userId, setUserId] = useState(null)
+ const [email, setEmail] = useState(null)
+
+ const login = useCallback((jwtToken, id, email) => {
+ setToken(jwtToken)
+ setUserId(id)
+ setEmail(email)
+
+ localStorage.setItem(storageName, JSON.stringify({
+ userId: id, token: jwtToken, email: email
+ }))
+
+ }, [])
+
+
+ const logout = useCallback(() => {
+
+ setToken(null)
+ setUserId(null)
+ setEmail(null)
+ localStorage.removeItem(storageName)
+ }, [])
+
+ useEffect(() => {
+ const data = JSON.parse(localStorage.getItem(storageName))
+
+ if (data && data.token) {
+ login(data.token, data.userId, data.email)
+ }
+ setReady(true)
+ }, [login])
+
+
+ return { login, logout, token, userId, email, ready }
+}
diff --git a/client/src/hooks/http.hook.js b/client/src/hooks/http.hook.js
new file mode 100644
index 0000000..4c8fec0
--- /dev/null
+++ b/client/src/hooks/http.hook.js
@@ -0,0 +1,35 @@
+import {useState, useCallback} from 'react'
+
+export const useHttp = () => {
+ const [loading, setLoading] = useState(false)
+ const [error, setError] = useState(null)
+
+ const request = useCallback(async (url, method = 'GET', body = null, headers = {}) => {
+ setLoading(true)
+ try {
+ if (body) {
+ body = JSON.stringify(body)
+ headers['Content-Type'] = 'application/json'
+ }
+
+ const response = await fetch(url, {method, body, headers})
+ const data = await response.json()
+
+ if (!response.ok) {
+ throw new Error(data.message || 'Что-то пошло не так')
+ }
+
+ setLoading(false)
+
+ return data
+ } catch (e) {
+ setLoading(false)
+ setError(e.message)
+ throw e
+ }
+ }, [])
+
+ const clearError = useCallback(() => setError(null), [])
+
+ return { loading, request, error, clearError }
+}
diff --git a/client/src/Shared/useDebouncedEffect.hook.js b/client/src/hooks/useDebouncedEffect.hook.js
similarity index 100%
rename from client/src/Shared/useDebouncedEffect.hook.js
rename to client/src/hooks/useDebouncedEffect.hook.js
diff --git a/client/src/Shared/useInputValue.hook.js b/client/src/hooks/useInputValue.hook.js
similarity index 100%
rename from client/src/Shared/useInputValue.hook.js
rename to client/src/hooks/useInputValue.hook.js
diff --git a/client/src/pages/AuthPage.css b/client/src/pages/AuthPage.css
new file mode 100644
index 0000000..1424231
--- /dev/null
+++ b/client/src/pages/AuthPage.css
@@ -0,0 +1,8 @@
+
+.form-body {
+ width: 100%;
+ max-width: 620px;
+ max-height: 100%;
+ overflow-y: auto;
+ height: fit-content;
+}
diff --git a/client/src/pages/AuthPage.js b/client/src/pages/AuthPage.js
new file mode 100644
index 0000000..9432fb0
--- /dev/null
+++ b/client/src/pages/AuthPage.js
@@ -0,0 +1,144 @@
+import React, { useContext, useEffect, useState } from 'react'
+import { useHttp } from '../hooks/http.hook'
+
+import { AuthContext } from '../context/AuthContext'
+import { PageContext } from '../context/PageContext'
+
+import { NavLink, useHistory } from 'react-router-dom'
+import './AuthPage.css'
+
+function AuthPage() {
+ const auth = useContext(AuthContext)
+ const page = useContext(PageContext)
+ const history = useHistory()
+
+ const { loading, request, error, clearError } = useHttp()
+ const [form, setForm] = useState({
+ email: '', password: ''
+ })
+ const [message, setMessage] = useState(null)
+
+ useEffect(() => {
+ if (error) setMessage([error, false])
+ clearError()
+ }, [error, clearError])
+
+ const changeHandler = event => {
+ setForm({ ...form, [event.target.name]: event.target.value })
+ }
+
+ const registerHandler = async () => {
+ try {
+ const data = await request('/api/auth/register', 'POST', { ...form })
+ if (data.message) setMessage([data.message, true])
+ } catch (e) { }
+ }
+
+ const loginHandler = async () => {
+ try {
+ const data = await request('/api/auth/login', 'POST', { ...form })
+ auth.login(data.token, data.userId, data.email)
+ history.push("/")
+ } catch (e) { }
+ }
+
+ const logoutHandler = event => {
+ event.preventDefault()
+ auth.logout()
+ }
+
+ React.useEffect(() => {
+ page.setNav(auth.isAuthenticated &&
+
+ К заметкам
+
+ )
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [auth.isAuthenticated, auth.token])
+
+ return (
+
+
+
+
+
+
Авторизация
+
+
+
+
+
+ {auth.isAuthenticated ? AUTORISED : 'UNAUTORISED'}
+
+ {auth.email ? {auth.email} : ``}
+
+
+
+
+ {
+ message &&
+
+ {message[1] ? "Инфо" : "Ошибка"}
+ {String(message[0])}
+
+ }
+
+
+
e.key === 'Enter' && loginHandler()}
+ />
+
+
+
e.key === 'Enter' && loginHandler()}
+ />
+
+
+
+ {!auth.isAuthenticated ? (
+
+
+
+
+
+
+
+
+
+
+
+ ) : (
+
+
+
+
+
+
+
+ )}
+
+
+
+
+
+
+ )
+}
+
+export default AuthPage
\ No newline at end of file
diff --git a/client/src/pages/CardsPage.css b/client/src/pages/CardsPage.css
new file mode 100644
index 0000000..76fa444
--- /dev/null
+++ b/client/src/pages/CardsPage.css
@@ -0,0 +1,23 @@
+.card:hover {
+ box-shadow: 0 0 10px rgba(0, 0, 0, 0.5);
+}
+
+.card {
+ transition: box-shadow 0.3s;
+}
+
+.card-text > h1 {
+ font-size: 1.625em;
+}
+.card-text > h2 {
+ font-size: 1.5em;
+}
+.card-text > h3 {
+ font-size: 1.375em;
+}
+.card-text > h4 {
+ font-size: 1.25em;
+}
+.card-text > h5 {
+ font-size: 1.125em;
+}
diff --git a/client/src/pages/CardsPage.js b/client/src/pages/CardsPage.js
new file mode 100644
index 0000000..62cf3e9
--- /dev/null
+++ b/client/src/pages/CardsPage.js
@@ -0,0 +1,206 @@
+import React from 'react';
+
+import './CardsPage.css';
+import CardList from '../Cards/CardList'
+import AddCard from '../Cards/AddCard'
+import CardsContext from '../context/CardsContext'
+import Loader from '../shared/Loader'
+import ModalCardEdit from '../Cards/ModalCardEdit'
+
+import Card, { checkCardsArr } from '../Cards/cardType/Card'
+
+
+import { NavLink } from 'react-router-dom'
+import { AuthContext } from '../context/AuthContext'
+import { PageContext } from '../context/PageContext'
+
+import { useHttp } from '../hooks/http.hook'
+
+function useCardsArr(defaultValue) {
+ const [value, setValue] = React.useState(defaultValue)
+
+ function trySetValue(cardsArr) {
+ if (checkCardsArr(cardsArr) || cardsArr === null) setValue(cardsArr)
+ else console.error('Массив cardsArr не прошел проверку \n', cardsArr)
+ }
+
+ return [value, trySetValue]
+}
+
+function useUpdater() {
+ const [updaterVal, setUpdaterVal] = React.useState(null)
+ const timer = React.useRef()
+ React.useEffect(() => {
+ if (timer.current) clearTimeout(timer.current)
+ timer.current = setTimeout(() => {
+ console.log("Timed update")
+ setUpdaterVal(Date.now())
+ }, 60 * 1000) // обновяем через минуту
+ return () => clearTimeout(timer.current)
+ }, []) // eslint-disable-line react-hooks/exhaustive-deps
+ return [updaterVal]
+}
+
+function CardsPage() {
+
+ const auth = React.useContext(AuthContext)
+ const page = React.useContext(PageContext)
+
+ const { loading, request, error, clearError } = useHttp()
+ const fetchNotes = React.useCallback(async (url = "", method = "GET", body = null, resCallback = () => { }) => {
+ try {
+ const fetched = await request(`/api/notes${url ? ("/" + url) : ""}`, method, body, { Authorization: `Bearer ${auth.token}` })
+ resCallback(tryParce(fetched))
+ } catch (e) { }
+ function tryParce(str) {
+ try {
+ return JSON.parse(str);
+ } catch (e) {
+ return str;
+ }
+ }
+ }, [auth.token, request])
+
+ const [message, setMessage] = React.useState(null)
+
+ React.useEffect(() => {
+ if (error) setMessage([error, false])
+ clearError()
+ }, [error, clearError])
+
+
+
+ const [cardsArr, setCardsArr] = useCardsArr(null)
+ const [editCardId, setEditCardId] = React.useState(null)
+
+ const [updaterVal] = useUpdater()
+
+ const updatingEnable = React.useRef(true)
+
+ React.useEffect(() => {
+ updatingEnable.current = true
+ loadDataFromServer()
+ return () => updatingEnable.current = false
+ }, [auth.isAuthenticated, auth.email, updaterVal]) // eslint-disable-line react-hooks/exhaustive-deps
+
+ React.useEffect(clearOldData, [auth.isAuthenticated]) // eslint-disable-line react-hooks/exhaustive-deps
+
+ ///////////
+ function clearOldData() {
+ //console.log("clearOldData, auth.isAuthenticated:", auth.isAuthenticated)
+ if (!auth.isAuthenticated) setCardsArr(null)
+ }
+ ///////////
+
+ ///////////
+ function loadDataFromServer() {
+ fetchNotes("", "GET", null, setLoadedCards)
+ }
+
+ function setLoadedCards(cards) {
+ if (updatingEnable.current) setCardsArr([...cards])
+ }
+ ///////////
+
+ ///////////
+
+ function loadDataToServer(card = new Card(), target = 'set') {
+ fetchNotes(target, "POST", { card })
+ }
+
+ function removeCard(index) {
+ const toDelete = cardsArr.splice(index, 1)[0]
+ setCardsArr([...cardsArr])
+ loadDataToServer(toDelete, "delete")
+ }
+
+ function addCard(cardData = {}) {
+ const newId = String(auth.email) + String(Date.now()) + String(Math.random())
+ const newCard = new Card({ id: newId, name: cardData.name, color: cardData.color, text: cardData.text })
+ //console.log(newId, newCard.id);
+ setCardsArr(
+ (cardsArr != null) ? cardsArr.concat([newCard]) : [newCard]
+ )
+ loadDataToServer(newCard, "set")
+
+ }
+
+ function changeCardColor(index, color) {
+ cardsArr[index].color = color
+ setCardsArr([...cardsArr])
+ loadDataToServer(cardsArr[index], "set")
+ }
+
+ function editCardContent(index, name, text) {
+ if (cardsArr[index]) {
+ let card = new Card(cardsArr[index])
+ card.name = name
+ card.text = text
+ cardsArr[index] = card
+ }
+ setCardsArr([...cardsArr])
+ loadDataToServer(cardsArr[index], "set")
+ }
+ ///////////
+
+ ///////////
+ function getCardByIndex(index) {
+ return index !== null ? cardsArr[index] : null
+ }
+ function setEditCard(index) {
+ setEditCardId(index)
+ }
+ function unsetEditCard() {
+ setEditCardId(null)
+ }
+ ///////////
+
+ React.useEffect(() => {
+ page.setNav(
+
+
+
+
+ {auth.email}
+
+
+ )
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [auth.email, auth.token])
+
+ return (
+
+
+
+
+
+
+
+ {cardsArr && cardsArr.length ? (
+
+ ) : (loading) ? null : !message ? (
+
+
No cards. You can add a new one!
+
+
Data not loaded
+
{message}
+
+
+
+ }
+
+
+ );
+}
+
+export default CardsPage
diff --git a/client/src/pages/SharedComponents/Header.css b/client/src/pages/SharedComponents/Header.css
new file mode 100644
index 0000000..a8a7697
--- /dev/null
+++ b/client/src/pages/SharedComponents/Header.css
@@ -0,0 +1,29 @@
+.App-logo {
+ height: 3em;
+ pointer-events: none;
+ user-select: none;
+}
+
+@media (prefers-reduced-motion: no-preference) {
+ .App-logo {
+ animation: App-logo-spin infinite 20s linear;
+ }
+}
+
+@keyframes App-logo-spin {
+ from {
+ transform: rotate(0deg);
+ }
+ to {
+ transform: rotate(360deg);
+ }
+}
+
+@import url("https://fonts.googleapis.com/css2?family=Roboto:wght@500&display=swap");
+
+.brand {
+ font-family: "Roboto", sans-serif;
+ padding-top: 0.2rem !important;
+ pointer-events: none;
+ user-select: none;
+}
diff --git a/client/src/pages/SharedComponents/Header.js b/client/src/pages/SharedComponents/Header.js
new file mode 100644
index 0000000..11e3d8e
--- /dev/null
+++ b/client/src/pages/SharedComponents/Header.js
@@ -0,0 +1,27 @@
+import React from 'react';
+import logo from '../../shared/Logo/logo.svg';
+import './Header.css';
+
+const brandText = "Notes"
+
+function Header(props) {
+
+ return (
+
+
+
+
+
+ );
+}
+
+export default Header;
diff --git a/client/src/routes.js b/client/src/routes.js
new file mode 100644
index 0000000..c38e31f
--- /dev/null
+++ b/client/src/routes.js
@@ -0,0 +1,33 @@
+import React from 'react'
+import { Switch, Route, Redirect } from 'react-router-dom'
+
+import CardsPage from './pages/CardsPage'
+
+import AuthPage from './pages/AuthPage'
+
+export const useRoutes = isAuthenticated => {
+ if (isAuthenticated) {
+ return (
+
+
+
+
+
+
+
+
+
+
+
+ )
+ }
+
+ return (
+
+
+
+
+
+
+ )
+}
diff --git a/models/Note.js b/models/Note.js
new file mode 100644
index 0000000..4262ca8
--- /dev/null
+++ b/models/Note.js
@@ -0,0 +1,13 @@
+const { Schema, model, Types } = require('mongoose')
+
+const schema = new Schema({
+ id: { type: String, required: true, unique: true /*, default: String(Date.now) + String(Math.random)*/ },
+ name: { type: String },
+ text: { type: String },
+ color: { type: String },
+ image: { type: String },
+ //date: { type: Date, default: Date.now },
+ owner: { type: Types.ObjectId, ref: 'User', required: true }
+})
+
+module.exports = model('Note', schema)
diff --git a/models/User.js b/models/User.js
index 170b64b..3bc1240 100644
--- a/models/User.js
+++ b/models/User.js
@@ -2,7 +2,8 @@ const {Schema, model, Types} = require('mongoose')
const schema = new Schema({
email: {type: String, required: true, unique: true},
- password: {type: String, required: true}
+ password: {type: String, required: true},
+ notes: [{ type: Types.ObjectId, ref: 'Note' }]
})
module.exports = model('User', schema)
diff --git a/package.json b/package.json
index 115dca4..2f242d5 100644
--- a/package.json
+++ b/package.json
@@ -57,4 +57,4 @@
"cross-env": "^7.0.3",
"nodemon": "^2.0.7"
}
-}
\ No newline at end of file
+}
diff --git a/routes/auth.routes.js b/routes/auth.routes.js
index 98c99c7..380f8c0 100644
--- a/routes/auth.routes.js
+++ b/routes/auth.routes.js
@@ -1,8 +1,8 @@
-const {Router} = require('express')
+const { Router } = require('express')
const bcrypt = require('bcryptjs')
require('dotenv').config()
const jwt = require('jsonwebtoken')
-const {check, validationResult} = require('express-validator')
+const { check, validationResult } = require('express-validator')
const User = require('../models/User')
const router = Router()
@@ -15,35 +15,35 @@ router.post(
.isLength({ min: 6 })
],
async (req, res) => {
- try {
- const errors = validationResult(req)
-
- if (!errors.isEmpty()) {
- return res.status(400).json({
- errors: errors.array(),
- message: 'Некорректный данные при регистрации'
- })
- }
+ try {
+ const errors = validationResult(req)
- const {email, password} = req.body
+ if (!errors.isEmpty()) {
+ return res.status(400).json({
+ errors: errors.array(),
+ message: 'Некорректный данные при регистрации'
+ })
+ }
- const candidate = await User.findOne({ email })
+ const { email, password } = req.body
- if (candidate) {
- return res.status(400).json({ message: 'Такой пользователь уже существует' })
- }
+ const candidate = await User.findOne({ email })
- const hashedPassword = await bcrypt.hash(password, 12)
- const user = new User({ email, password: hashedPassword })
+ if (candidate) {
+ return res.status(400).json({ message: 'Такой пользователь уже существует' })
+ }
- await user.save()
+ const hashedPassword = await bcrypt.hash(password, 12)
+ const user = new User({ email, password: hashedPassword })
- res.status(201).json({ message: 'Пользователь создан' })
+ await user.save()
- } catch (e) {
- res.status(500).json({ message: 'Что-то пошло не так, попробуйте снова' })
- }
-})
+ res.status(201).json({ message: 'Пользователь создан' })
+
+ } catch (e) {
+ res.status(500).json({ message: 'Что-то пошло не так, попробуйте снова' })
+ }
+ })
// /api/auth/login
router.post(
@@ -53,42 +53,42 @@ router.post(
check('password', 'Введите пароль').exists()
],
async (req, res) => {
- try {
- const errors = validationResult(req)
-
- if (!errors.isEmpty()) {
- return res.status(400).json({
- errors: errors.array(),
- message: 'Некорректный данные при входе в систему'
- })
- }
+ try {
+ const errors = validationResult(req)
- const {email, password} = req.body
+ if (!errors.isEmpty()) {
+ return res.status(400).json({
+ errors: errors.array(),
+ message: 'Некорректный данные при входе в систему'
+ })
+ }
- const user = await User.findOne({ email })
+ const { email, password } = req.body
- if (!user) {
- return res.status(400).json({ message: 'Пользователь не найден' })
- }
+ const user = await User.findOne({ email })
- const isMatch = await bcrypt.compare(password, user.password)
+ if (!user) {
+ return res.status(400).json({ message: 'Пользователь не найден' })
+ }
- if (!isMatch) {
- return res.status(400).json({ message: 'Неверный пароль, попробуйте снова' })
- }
+ const isMatch = await bcrypt.compare(password, user.password)
- const token = jwt.sign(
- { userId: user.id },
- process.env.jwtSecret,
- { expiresIn: '1h' }
- )
+ if (!isMatch) {
+ return res.status(400).json({ message: 'Неверный пароль, попробуйте снова' })
+ }
- res.json({ token, userId: user.id })
+ const token = jwt.sign(
+ { userId: user.id },
+ process.env.jwtSecret,
+ { expiresIn: '1h' }
+ )
- } catch (e) {
- res.status(500).json({ message: 'Что-то пошло не так, попробуйте снова' })
- }
-})
+ res.json({ token, userId: user.id, email: user.email })
+
+ } catch (e) {
+ res.status(500).json({ message: 'Что-то пошло не так, попробуйте снова' })
+ }
+ })
module.exports = router
diff --git a/routes/notes.routes.js b/routes/notes.routes.js
new file mode 100644
index 0000000..da913ac
--- /dev/null
+++ b/routes/notes.routes.js
@@ -0,0 +1,95 @@
+const { Router } = require('express')
+
+const Note = require('../models/Note')
+const auth = require('../middleware/auth.middleware')
+const router = Router()
+
+const { checkCard } = require('../validation/CardCheck')
+
+
+router.post('/set', auth, async (req, res) => {
+ try {
+ const card = tryParce(req.body.card)
+ if (checkCard(card)) {
+ postNote(card)
+ res.status(201).json({ card: card })
+ } else {
+ res.status(500).json({ message: 'Неверный формат данных заметки' })
+ }
+ } catch (e) {
+ res.status(500).json({ message: 'Что-то пошло не так, попробуйте снова' })
+ }
+
+ async function postNote(noteToSave) {
+
+ noteToSave.owner = req.user.userId
+
+ const existing = await Note.findOne({ id: noteToSave.id })
+
+ if (existing) {
+ //console.log("EXITING");
+ existing.overwrite(noteToSave)
+ existing.save()
+ } else {
+ //console.log("NON EXITING")
+ const note = new Note(noteToSave)
+ await note.save()
+ }
+
+ }
+})
+
+
+
+router.post('/delete', auth, async (req, res) => {
+ try {
+
+ const card = tryParce(req.body.card)
+ if (checkCard(card)) {
+ deleteNote(card)
+ res.status(201).json({ card: card })
+ } else {
+ res.status(500).json({ message: 'Неверный формат данных заметки' })
+ }
+ } catch (e) {
+ res.status(500).json({ message: 'Что-то пошло не так, попробуйте снова' })
+ }
+
+ async function deleteNote(noteToSave) {
+ noteToSave.owner = req.user.userId
+
+ const existing = await Note.findOne({ id: noteToSave.id })
+
+ if (existing) {
+ //console.log("EXITING");
+
+ existing.remove()
+
+ } else res.status(500).json({ message: 'уже удален' })
+ }
+})
+
+
+
+router.get('/', auth, async (req, res) => {
+ try {
+ //console.log(req.user.userId);
+ const notes = await Note.find({ owner: req.user.userId })
+ //console.log(notes);
+ res.json(notes)
+ } catch (e) {
+ //console.log("\n\n\n GET");
+ //console.log(e);
+ res.status(500).json({ message: '[GET] Что-то пошло не так, попробуйте снова' })
+ }
+})
+
+function tryParce(str) {
+ try {
+ return JSON.parse(str);
+ } catch (e) {
+ return str;
+ }
+}
+
+module.exports = router
\ No newline at end of file
diff --git a/routes/phpserver.routes.js b/routes/phpserver.routes.js
deleted file mode 100644
index f9b6b81..0000000
--- a/routes/phpserver.routes.js
+++ /dev/null
@@ -1,18 +0,0 @@
-const { Router } = require('express')
-//const auth = require('../middleware/auth.middleware')
-const router = Router()
-
-//temporary backend url
-const phpBaseUrl = 'https://php-server-notes.herokuapp.com/'
-
-//auth not used
-router.post('/', /*auth,*/ async (req, res) => {
- try {
- //console.log("backend redirect", req.url)
- res.redirect(307, phpBaseUrl)
- } catch (e) {
- res.status(500).json({ message: 'Что-то пошло не так, попробуйте снова' })
- }
-})
-
-module.exports = router
diff --git a/validation/CardCheck.js b/validation/CardCheck.js
new file mode 100644
index 0000000..4e60bb1
--- /dev/null
+++ b/validation/CardCheck.js
@@ -0,0 +1,10 @@
+function checkCard(card) {
+ return (
+ typeof card.id === "string" &&
+ typeof card.name === "string" &&
+ typeof card.color === "string" &&
+ typeof card.text === "string"
+ )
+}
+
+module.exports = { checkCard }
\ No newline at end of file