Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

connected frontend to backend #29

Merged
merged 1 commit into from
Feb 24, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Server/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
node_modules

#dotenv files
key.env
# key.env
3 changes: 1 addition & 2 deletions Server/emails/welcome.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,4 @@ mailTransporter.sendMail(mailDetails, function(err, data) {

module.exports = {
sendWelcomeEmail
}

}
3 changes: 3 additions & 0 deletions Server/key.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
PORT = 5000
MONGODB_CONNECTION = "mongodb://127.0.0.1:27017/ClaimPrizeDB"
SECRET_KEY_JWT = "sample_password"
2 changes: 1 addition & 1 deletion client/.env
Original file line number Diff line number Diff line change
@@ -1 +1 @@
REACT_APP_API=
REACT_APP_API=http://localhost:5000/
62 changes: 36 additions & 26 deletions client/src/components/about.jsx
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
import React from 'react';
import React, { useEffect, useState } from 'react';
import Navbar from './nav';
import { useNavigate } from 'react-router-dom';
import SessionService from "../services/SessionService";
import "../styles/register.css";
import registrationImg from "../assets/registration_img.png";

const About = () => {
const navigate = useNavigate();
// const [name,setName]= useState("User Name");
// const [email,setEmail]= useState("User Email");
// const [phone,setPhone]= useState("User Phone");
// const [address,setAddress]= useState("User Address");
// const [city,setCity]= useState("User City");
// const [state,setState]= useState("User State");
// const [pin, setPin] = useState("User Pincode");

// const onNameChange = (name) => {
// setName(name);
// }
Expand All @@ -35,40 +38,47 @@ const About = () => {
// setState(state);
// }

useEffect(() => {
const token = SessionService.getSession();
if (!token) {
navigate("/login")
}
// console.log('token', token);
}, [])

return <>
< Navbar />
<div className="registration">
<img src={registrationImg} alt="registration" className="registrationImage" />
<img src={registrationImg} alt="registration" className="registrationImage" />

<div className="registrationForm">
<div>
<h1 className='header'>User Details</h1>
</div>
<p className="user-details">
<i class="fa fa-user" aria-hidden="true"></i> name
</p>
<p className="user-details">
<i class="fa fa-envelope" aria-hidden="true"></i>email
</p>
<p className="user-details">
<i class="fa fa-phone" aria-hidden="true"></i>phone
</p>
<p className="user-details">
<i class="fa fa-address-card" aria-hidden="true"></i>address
</p>
<p className="user-details">
<i class="fa fa-home" aria-hidden="true"></i>city
</p>
<p className="user-details">
<i class="fa fa-location-arrow" aria-hidden="true"></i>state
</p>
<p className="user-details">
<i class="fa fa-map-marker" aria-hidden="true"></i>pin
</p>
<p className="user-details">
<i class="fa fa-user" aria-hidden="true"></i> name
</p>
<p className="user-details">
<i class="fa fa-envelope" aria-hidden="true"></i>email
</p>
<p className="user-details">
<i class="fa fa-phone" aria-hidden="true"></i>phone
</p>
<p className="user-details">
<i class="fa fa-address-card" aria-hidden="true"></i>address
</p>
<p className="user-details">
<i class="fa fa-home" aria-hidden="true"></i>city
</p>
<p className="user-details">
<i class="fa fa-location-arrow" aria-hidden="true"></i>state
</p>
<p className="user-details">
<i class="fa fa-map-marker" aria-hidden="true"></i>pin
</p>
</div>
</div>
</>;
</>;
};

export default About;
6 changes: 5 additions & 1 deletion client/src/components/login.jsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import React, {useState} from "react";
import { useNavigate } from 'react-router-dom';
import logo from '../assets/logo512.png'
import Navbar from './nav';
import AuthService from "../services/AuthService";
import Modal from "./modal";

const Login = (props) => {

const navigate = useNavigate();
const [email,setEmail] = useState("");
const [password,setPassword] = useState("");
const [modalOpen,setModalOpen] = useState(false);
Expand All @@ -27,7 +29,9 @@ const Login = (props) => {
AuthService.login(email,password).then(
(response) => {

console.log(email)
console.log(response);
alert("Logged in successfully!");
navigate('/about');
},
(error) => {
const resMessage =
Expand Down
8 changes: 7 additions & 1 deletion client/src/components/register.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React ,{ useRef } from 'react';
import { useNavigate } from 'react-router-dom';
import "../styles/register.css";
import registration_img from "../assets/registration_img.png";
import Navbar from './nav';
Expand All @@ -7,7 +8,8 @@ import { Link } from "react-router-dom";


const Register = () => {


const navigate = useNavigate();
const nameRef = useRef();
const emailRef = useRef();
const phoneNumberRef= useRef();
Expand All @@ -22,7 +24,11 @@ const Register = () => {
password : passwordRef.current.value,
cpassword : cpasswordRef.current.value}

// console.log('[data]', data);

AuthService.register(data);
alert("Registration Successful!! Log in to continue...");
navigate('/login');
}
return <>
<Navbar /><div className="registration">
Expand Down
3 changes: 1 addition & 2 deletions client/src/services/AuthService.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ const login = (email, password) => {
if (response.data.accessToken) {
console.log(response.data.accessToken)
//Session Saving
SessionService.setSession(response.data);

SessionService.setSession(response.data);
}
return response.data;
});
Expand Down