From cf3612797dca3d332065eeb331f16ddbe829d3b9 Mon Sep 17 00:00:00 2001
From: Andre Emiliano <novaisea@coventry.ac.uk>
Date: Tue, 20 Apr 2021 16:59:43 +0000
Subject: [PATCH] Login working

---
 src/components/account.js  |  2 ++
 src/components/dog.js      |  4 ++--
 src/components/dogcard.js  |  2 +-
 src/components/login.js    |  2 +-
 src/components/register.js | 24 ++++++++++++++++++++----
 src/components/upload.js   |  4 ++--
 6 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/components/account.js b/src/components/account.js
index 38184c3..625bb32 100644
--- a/src/components/account.js
+++ b/src/components/account.js
@@ -36,6 +36,8 @@ function Account(props) {
   return (
     <>
       <h1>Account</h1>
+			<p>Username: {user.username} </p>
+			<p>Email: {user.email}</p>
       {Object.keys(profile).map(key => <li key={key}>{key}: {profile[key]}</li>)}
     </>
   );
diff --git a/src/components/dog.js b/src/components/dog.js
index 271d8d8..e3a0404 100644
--- a/src/components/dog.js
+++ b/src/components/dog.js
@@ -58,8 +58,8 @@ class Dog extends React.Component {
             <Image width={200} alt="Dog" src={dog.imageURL} />
           </Col>
           <Col span={12}>
-            <Title>{dog.title}</Title>
-            <Paragraph>{dog.allText}</Paragraph>
+            <Title>{dog.name}</Title>
+            <Paragraph>{dog.about}</Paragraph>
           </Col>
           <Col span={6} align="center">
             {icons}
diff --git a/src/components/dogcard.js b/src/components/dogcard.js
index c39c6d9..d379a8b 100644
--- a/src/components/dogcard.js
+++ b/src/components/dogcard.js
@@ -30,7 +30,7 @@ class DogCard extends React.Component {
               handleToggle={this.toggleLike} id={dogID}/>
         ]}>
         
-        <Meta title={this.props.title} description={this.props.summary} />
+        <Meta title={this.props.name} description={this.props.about} />
       </Card>
     );
   }
diff --git a/src/components/login.js b/src/components/login.js
index 4a36ef1..675ee44 100644
--- a/src/components/login.js
+++ b/src/components/login.js
@@ -39,7 +39,7 @@ class LoginForm extends React.Component {
     login(values) {
         const {username, password} = values;
         console.log(`logging in user: ${username}`)
-        fetch('https://animal-hello-3000.codio-box.uk/api/v1/users', {
+        fetch('https://animal-hello-3000.codio-box.uk/api/v1/users/login', {
             method: "POST",
             headers: {
                 "Authorization": "Basic " + btoa(username + ":" + password)
diff --git a/src/components/register.js b/src/components/register.js
index bd8df22..78ea4cf 100644
--- a/src/components/register.js
+++ b/src/components/register.js
@@ -12,6 +12,14 @@ const tailFormItemLayout = {
 };
 
 // define validation rules for the form fields
+const firstNameRules = [
+    {required: false, message: 'Please enter your First Name!' }
+];
+
+const lastNameRules = [
+    {required: false, message: 'Please enter your Last Name!' }
+];
+
 const emailRules = [
     {type: 'email', message: 'The input is not valid E-mail!'},
     {required: true, message: 'Please input your E-mail!' }
@@ -104,10 +112,22 @@ class RegistrationForm extends React.Component {
     return (
       <Form {...formItemLayout} name="register" onFinish={this.onFinish} scrollToFirstError >
         
+			<Form.Item name="firstName" label="First Name" rules={firstNameRules} >
+            <Input />
+        </Form.Item>
+
+			<Form.Item name="lastName" label="Last Name" rules={lastNameRules} >
+            <Input />
+        </Form.Item>
+			
         <Form.Item name="email" label="E-mail" rules={emailRules} >
             <Input />
         </Form.Item>
 
+			<Form.Item name="username" label="Username" rules={usernameRules} >
+            <Input />
+        </Form.Item>
+
         <Form.Item name="password" label="Password" rules={passwordRules} hasFeedback >
             <Input.Password />
         </Form.Item>
@@ -117,10 +137,6 @@ class RegistrationForm extends React.Component {
             <Input.Password />
         </Form.Item>
 
-        <Form.Item name="username" label="Username" rules={usernameRules} >
-            <Input />
-        </Form.Item>
-
 			<Form.Item name="validate_admin" label="Sign up code" rules={validateAdminRules} >
             <Input />
         </Form.Item>
diff --git a/src/components/upload.js b/src/components/upload.js
index 42ff6dc..5048f1c 100644
--- a/src/components/upload.js
+++ b/src/components/upload.js
@@ -15,8 +15,8 @@ function Uploader(props) {
     name: 'upload',
     action: 'https://animal-hello-3000.codio-box.uk/api/v1/images',
     headers: {
-      authorization: 'Basic ' + btoa(user.username + ":" + user.password)  // don't hard code credentials, this is just a demo
-																											//btoa(username + ":" + password)
+      authorization: 'Basic ' + btoa(user.username + ":" + user.password)  //Not hardcoded credentials
+
     },
     onChange(info) {
       if (info.file.status !== 'uploading') {