Merge branch 'main' into feat#86
This commit is contained in:
commit
8a93b290f7
|
@ -10,7 +10,10 @@ require('dotenv').config()
|
||||||
const app = express()
|
const app = express()
|
||||||
|
|
||||||
app.use(express.json())
|
app.use(express.json())
|
||||||
app.use(cors())
|
app.use(cors({
|
||||||
|
origin: 'http://localhost:3000'
|
||||||
|
}));
|
||||||
|
|
||||||
app.use(json())
|
app.use(json())
|
||||||
app.use(
|
app.use(
|
||||||
urlencoded({
|
urlencoded({
|
||||||
|
|
|
@ -2,13 +2,10 @@ import React from 'react'
|
||||||
import RegStyle from './Reg.style'
|
import RegStyle from './Reg.style'
|
||||||
import Image from 'next/image'
|
import Image from 'next/image'
|
||||||
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
|
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
|
||||||
import {
|
import { faUser, faEnvelope, faLock } from '@fortawesome/free-solid-svg-icons'
|
||||||
faUser,
|
import { useState, useContext } from 'react'
|
||||||
faEnvelope,
|
|
||||||
faLock,
|
|
||||||
} from '@fortawesome/free-solid-svg-icons'
|
|
||||||
import { useState } from 'react'
|
|
||||||
import { Link } from '@mui/material'
|
import { Link } from '@mui/material'
|
||||||
|
import UserAuth from 'helpers/user/usercontext'
|
||||||
|
|
||||||
function Reg() {
|
function Reg() {
|
||||||
const [userData, setUserData] = useState({
|
const [userData, setUserData] = useState({
|
||||||
|
@ -23,10 +20,15 @@ function Reg() {
|
||||||
const value = event.target.value
|
const value = event.target.value
|
||||||
setUserData({ ...userData, [name]: value })
|
setUserData({ ...userData, [name]: value })
|
||||||
}
|
}
|
||||||
|
const handleSubmit = (e) => {
|
||||||
|
e.preventDefault()
|
||||||
|
setUserData(userData)
|
||||||
|
context.createAcc(userData)
|
||||||
|
}
|
||||||
|
const context = useContext(UserAuth);
|
||||||
return (
|
return (
|
||||||
<RegStyle>
|
<RegStyle>
|
||||||
<form className="form-wrapper">
|
<form onSubmit={handleSubmit} className="form-wrapper">
|
||||||
<p className="reg-title">Sign Up</p>
|
<p className="reg-title">Sign Up</p>
|
||||||
|
|
||||||
<div className="reg-field">
|
<div className="reg-field">
|
||||||
|
|
|
@ -0,0 +1,30 @@
|
||||||
|
import UserAuth from "./usercontext"
|
||||||
|
import { useState } from 'react'
|
||||||
|
import axios from "axios"
|
||||||
|
|
||||||
|
const UserAuthProvider = ({ children }) => {
|
||||||
|
const [user, setUser] = useState(null)
|
||||||
|
const login = () => {
|
||||||
|
setUser('default')
|
||||||
|
}
|
||||||
|
const createAcc = (data) => {
|
||||||
|
axios.post('http://localhost:5000/user/register/', {
|
||||||
|
email: data.email,
|
||||||
|
password: data.password,
|
||||||
|
})
|
||||||
|
.then(function (response) {
|
||||||
|
console.log(response);
|
||||||
|
})
|
||||||
|
.catch(function (error) {
|
||||||
|
console.log(error);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const logout = () => {
|
||||||
|
setUser(null)
|
||||||
|
}
|
||||||
|
const context = { user, login, logout, createAcc }
|
||||||
|
|
||||||
|
return <UserAuth.Provider value={context}>{children}</UserAuth.Provider>
|
||||||
|
}
|
||||||
|
export default UserAuthProvider;
|
|
@ -1,24 +1,5 @@
|
||||||
import { createContext } from 'react'
|
import { createContext } from "react";
|
||||||
import { useState } from 'react'
|
|
||||||
|
|
||||||
const UserAuth = createContext({
|
const UserAuth = createContext();
|
||||||
user: null,
|
|
||||||
login: () => {},
|
|
||||||
logout: () => {},
|
|
||||||
})
|
|
||||||
|
|
||||||
export const UserAuthProvider = ({ children }) => {
|
export default UserAuth;
|
||||||
const [user, setUser] = useState(null)
|
|
||||||
const login = () => {
|
|
||||||
setUser('default')
|
|
||||||
}
|
|
||||||
|
|
||||||
const logout = () => {
|
|
||||||
setUser(null)
|
|
||||||
}
|
|
||||||
const context = { user, login, logout }
|
|
||||||
|
|
||||||
return <UserAuth.Provider value={context}>{children}</UserAuth.Provider>
|
|
||||||
}
|
|
||||||
|
|
||||||
export default UserAuth
|
|
|
@ -22,7 +22,10 @@
|
||||||
"apexcharts": "^3.33.1",
|
"apexcharts": "^3.33.1",
|
||||||
"axios": "^0.26.0",
|
"axios": "^0.26.0",
|
||||||
"bootstrap": "^5.1.3",
|
"bootstrap": "^5.1.3",
|
||||||
|
feat#86
|
||||||
"framer-motion": "^6.2.8",
|
"framer-motion": "^6.2.8",
|
||||||
|
"cors": "^2.8.5",
|
||||||
|
main
|
||||||
"nanoid": "^3.2.0",
|
"nanoid": "^3.2.0",
|
||||||
"next": "12.0.9",
|
"next": "12.0.9",
|
||||||
"qrcode": "^1.5.0",
|
"qrcode": "^1.5.0",
|
||||||
|
|
|
@ -3,7 +3,7 @@ import '../styles/logostyles.css'
|
||||||
import '../styles/formStyles.css'
|
import '../styles/formStyles.css'
|
||||||
import '../styles/index.css'
|
import '../styles/index.css'
|
||||||
import '../styles/404.css'
|
import '../styles/404.css'
|
||||||
import { UserAuthProvider } from '../helpers/user/usercontext'
|
import UserAuthProvider from 'helpers/user/userState'
|
||||||
import Page from 'react-page-loading'
|
import Page from 'react-page-loading'
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,3 @@
|
||||||
{
|
{
|
||||||
"name": "url-minify",
|
"lockfileVersion": 1
|
||||||
"lockfileVersion": 2,
|
|
||||||
"requires": true,
|
|
||||||
"packages": {}
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue