Change request (#22)

PedroFonsecaDEV · Apr 16, 2021 · 0e95b4f · 0e95b4f
1 parent 497b4f8
commit 0e95b4f
Show file tree

Hide file tree

Showing 6 changed files with 91 additions and 89 deletions.
diff --git a/docker/production.yml b/docker/production.yml
@@ -30,6 +30,7 @@ services:
         - AUTH_URL=${AUTH_URL}
         - POSTS_URL=${POSTS_URL}
         - SEARCH_URL=${SEARCH_URL}
+        - FEED_DISCOVERY_URL=${FEED_DISCOVERY_URL}
     container_name: 'telescope'
     restart: unless-stopped
     environment:
@@ -49,6 +50,7 @@ services:
       - API_URL
       - WEB_URL
       - SEARCH_URL
+      - FEED_DISCOVERY_URL
       - LOG_LEVEL
       - FEED_URL
       - FEED_URL_INTERVAL_MS

diff --git a/src/web/src/components/SignUp/Forms/GitHubAccount.tsx b/src/web/src/components/SignUp/Forms/GitHubAccount.tsx
@@ -1,15 +1,14 @@
-/* eslint-disable camelcase */
-import { useEffect, useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
+import Button from '@material-ui/core/Button';
 import { createStyles, makeStyles, Theme } from '@material-ui/core';
 import { connect } from 'formik';
-import useSWR from 'swr';
 
 import { SignUpForm } from '../../../interfaces';
 import formModels from '../Schema/FormModel';
 import { TextInput, CheckBoxInput } from '../FormFields';
 import PostAvatar from '../../Posts/PostAvatar';
 
-const { githubUsername, github: githubModel, githubOwnership } = formModels;
+const { githubUsername, github, githubOwnership } = formModels;
 
 const useStyles = makeStyles((theme: Theme) =>
   createStyles({
@@ -56,7 +55,7 @@ const useStyles = makeStyles((theme: Theme) =>
     inputsContainer: {
       width: '100%',
       display: 'grid',
-      gridTemplateColumns: '100%',
+      gridTemplateColumns: '80% 20%',
       '& .MuiFormHelperText-root': {
         fontSize: '0.9em',
         color: 'black',
@@ -65,6 +64,22 @@ const useStyles = makeStyles((theme: Theme) =>
         color: 'black',
       },
     },
+    button: {
+      height: '35px',
+      width: '50%',
+      alignSelf: 'center',
+      fontSize: '0.8em',
+      background: '#121D59',
+      color: '#A0D1FB',
+      marginLeft: '5%',
+      '&:hover': {
+        color: 'black',
+        border: '1px solid #121D59',
+      },
+      '&.Mui-disabled': {
+        backgroundColor: 'inherit',
+      },
+    },
     avatarPreview: {
       textAlign: 'center',
       justifyItems: 'center',
@@ -89,52 +104,51 @@ const gitHubApiUrl = 'https://api.github.com/users';
 const GitHubAccount = connect<{}, SignUpForm>((props) => {
   const classes = useStyles();
   const { values, setFieldValue } = props.formik;
-  const [username, setUsername] = useState(values.githubUsername);
-  const [inputTimeout, setInputTimeout] = useState(setTimeout(() => {}, 0));
+  const [validating, setValidating] = useState(false);
+  const [error, setError] = useState('');
+  const controllerRef = useRef<AbortController | null>();
 
-  const { data: github, error } = useSWR(
-    values.githubUsername ? `${gitHubApiUrl}/${values.githubUsername}` : null,
-    async (u) => {
+  const validateGit = async () => {
+    if (values.githubUsername) {
+      setValidating(true);
+      if (controllerRef.current) {
+        controllerRef.current.abort();
+      }
+      controllerRef.current = new AbortController();
       try {
-        const response = await fetch(u);
+        const response = await fetch(`${gitHubApiUrl}/${values.githubUsername}`, {
+          signal: controllerRef.current?.signal,
+        });
         if (!response.ok) {
           throw new Error(response.statusText);
         }
-        return response.json();
+        const res = await response.json();
+
+        setFieldValue('github', {
+          username: res.login,
+          avatarUrl: res.avatar_url,
+        });
+        setError('');
       } catch (err) {
-        throw err;
+        console.error(err, 'Unable to get GitHub profile');
+
+        setError('Unable to get GitHub profile');
+        setFieldValue('github', {}, true);
+      } finally {
+        setValidating(false);
+        controllerRef.current = null;
       }
+    } else {
+      setError('');
+      setFieldValue('github', {}, true);
     }
-  );
-
-  const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    setUsername(e.target.value);
-    clearTimeout(inputTimeout);
-
-    // Update githubUsername 1000ms after input change
-    setInputTimeout(
-      setTimeout(() => {
-        setFieldValue('githubUsername', e.target.value);
-      }, 1000)
-    );
   };
 
   useEffect(() => {
-    if (error) {
-      setFieldValue('github', {}, true);
-    }
-
-    if (github) {
-      setFieldValue(
-        'github',
-        {
-          username: github.login,
-          avatarUrl: github.avatar_url,
-        },
-        true
-      );
-    }
-  }, [github, error, setFieldValue]);
+    return () => {
+      controllerRef.current?.abort();
+    };
+  }, []);
 
   return (
     <div className={classes.root}>
@@ -147,15 +161,20 @@ const GitHubAccount = connect<{}, SignUpForm>((props) => {
               label={githubUsername.label}
               name={githubUsername.name}
               error={!!error}
-              helperText={!!error && githubModel.invalidErrorMsg}
-              onChange={handleInputChange}
-              value={username}
+              helperText={error || github.invalidErrorMsg}
             />
+            <Button className={classes.button} onClick={validateGit} disabled={validating}>
+              Get profile
+            </Button>
           </div>
-          {!error && github && (
+          {!error && (
             <div className={classes.avatarPreview}>
-              <PostAvatar name={github.login} blog={github.avatar_url} img={github.avatar_url} />
-              <h2 className={classes.username}>{github.login}</h2>
+              <PostAvatar
+                name={values.github.username || values.displayName}
+                blog={values.github.avatarUrl}
+                img={values.github?.avatarUrl}
+              />
+              <h2 className={classes.username}>{values.github.username}</h2>
             </div>
           )}
         </div>

diff --git a/src/web/src/components/SignUp/Forms/RSSFeeds.tsx b/src/web/src/components/SignUp/Forms/RSSFeeds.tsx
@@ -1,4 +1,4 @@
-import { useState, useEffect } from 'react';
+import { useState, useEffect, useRef } from 'react';
 import { Button, createStyles, makeStyles, Theme } from '@material-ui/core';
 import { connect } from 'formik';
 import FormControl from '@material-ui/core/FormControl';
@@ -142,19 +142,18 @@ const RSSFeeds = connect<{}, SignUpForm>((props) => {
   const [feedUrls, setFeedUrls] = useState<Array<string>>([]);
   const [blogUrlError, setBlogUrlError] = useState('');
   const [validating, setValidating] = useState(false);
-
-  // A controller to cancel undesired requests
-  const [controller, setController] = useState(new AbortController());
+  const controllerRef = useRef<AbortController | null>();
 
   const validateBlog = async () => {
-    if (!errors.blogUrl && feedDiscoveryServiceUrl) {
+    if (!errors.blogUrl) {
       try {
         setValidating(true);
-        const abortController = new AbortController();
-        setController(abortController);
-        const signal = abortController.signal;
-        const response = await fetch(feedDiscoveryServiceUrl, {
-          signal,
+        if (controllerRef.current) {
+          controllerRef.current.abort();
+        }
+        controllerRef.current = new AbortController();
+        const response = await fetch(`${feedDiscoveryServiceUrl}`, {
+          signal: controllerRef.current?.signal,
           method: 'post',
           headers: {
             Authorization: `bearer ${token}`,
@@ -164,19 +163,20 @@ const RSSFeeds = connect<{}, SignUpForm>((props) => {
             blogUrl: values.blogUrl,
           }),
         });
-        console.log(values.blogUrl);
         if (!response.ok) {
           throw new Error(response.statusText);
         }
         const res = await response.json();
 
         setBlogUrlError('');
         setFeedUrls(res.feedUrls);
-        setValidating(false);
       } catch (err) {
         console.error(err, 'Unable to discover feeds');
-        setBlogUrlError(`Unable to find RSS link at ${values.blogUrl}`);
+
+        setBlogUrlError('Unable to discover feeds');
         setFeedUrls([]);
+      } finally {
+        controllerRef.current = null;
         setValidating(false);
       }
     } else {
@@ -197,9 +197,8 @@ const RSSFeeds = connect<{}, SignUpForm>((props) => {
       validateBlog();
     }
 
-    // Abort feed-discovery on component unmounting
     return () => {
-      controller.abort();
+      controllerRef.current?.abort();
     };
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);

diff --git a/src/web/src/components/SignUp/Schema/FormModel.tsx b/src/web/src/components/SignUp/Schema/FormModel.tsx
@@ -2,19 +2,16 @@ export default {
   displayName: {
     name: 'displayName',
     label: 'Display Name',
-    invalidErrorMsg: 'Make sure display name contains 2-16 characters',
   },
   firstName: {
     name: 'firstName',
     label: 'First name',
     requiredErrorMsg: 'First name is required',
-    invalidErrorMsg: 'Make sure first name contains 2-16 characters',
   },
   lastName: {
     name: 'lastName',
     label: 'Last name',
     requiredErrorMsg: 'Last name is required',
-    invalidErrorMsg: 'Make sure last name contains 2-16 characters',
   },
   email: {
     name: 'email',

diff --git a/src/web/src/components/SignUp/Schema/FormSchema.tsx b/src/web/src/components/SignUp/Schema/FormSchema.tsx
@@ -14,28 +14,15 @@ const {
   blogOwnership,
 } = formModels;
 
-const validateLength = (min: number, max: number) => (val: string | undefined): boolean =>
-  !!val && val.length >= min && val.length <= max;
-
-const validateCheckBox = (val: boolean | undefined) => !!val;
-
 // Each signup step has one validation schema
 export default [
   // First step has no validation logic
   Yup.object().shape({}),
 
   Yup.object().shape({
-    [firstName.name]: Yup.string()
-      .required(`${firstName.requiredErrorMsg}`)
-      .test('len', firstName.invalidErrorMsg, validateLength(2, 16)),
-    [lastName.name]: Yup.string()
-      .required(`${lastName.requiredErrorMsg}`)
-      .test('len', lastName.invalidErrorMsg, validateLength(2, 16)),
-    [displayName.name]: Yup.string().test(
-      'len',
-      displayName.invalidErrorMsg,
-      validateLength(2, 16)
-    ),
+    [firstName.name]: Yup.string().required(`${firstName.requiredErrorMsg}`),
+    [lastName.name]: Yup.string().required(`${lastName.requiredErrorMsg}`),
+    [displayName.name]: Yup.string(),
   }),
 
   Yup.object().shape({
@@ -49,7 +36,7 @@ export default [
     [githubOwnership.name]: Yup.boolean().test(
       'agreed',
       githubOwnership.invalidErrorMsg,
-      validateCheckBox
+      (val) => !!val
     ),
   }),
 
@@ -59,7 +46,7 @@ export default [
     [blogOwnership.name]: Yup.boolean().test(
       'agreed',
       blogOwnership.invalidErrorMsg,
-      validateCheckBox
+      (val) => !!val
     ),
   }),
 

diff --git a/src/web/src/pages/signup.tsx b/src/web/src/pages/signup.tsx
@@ -1,8 +1,7 @@
 import { createStyles, makeStyles, Theme } from '@material-ui/core';
 import { useState, useEffect } from 'react';
-
-import Button from '@material-ui/core/Button';
 import { Formik, Form, FormikHelpers } from 'formik';
+import Button from '@material-ui/core/Button';
 
 import useAuth from '../hooks/use-auth';
 import Overview from '../components/SignUp/Forms/Overview';
@@ -15,7 +14,7 @@ import DynamicImage from '../components/DynamicImage';
 import { SignUpForm } from '../interfaces';
 import formModels from '../components/SignUp/Schema/FormModel';
 import formSchema from '../components/SignUp/Schema/FormSchema';
-import { usersServiceUrl, webUrl } from '../config';
+import { usersServiceUrl } from '../config';
 
 const {
   firstName,
@@ -136,7 +135,7 @@ const SignUpPage = () => {
   const [activeStep, setActiveStep] = useState<number>(0);
   const currentSchema = formSchema[activeStep];
   const { user, token, login } = useAuth();
-  const [loggedIn, setLoggedIn] = useState(false);
+  const [loggedIn, setLoggedIn] = useState(!!user);
 
   const handleNext = () => {
     setActiveStep(activeStep + 1);
@@ -164,6 +163,7 @@ const SignUpPage = () => {
           github,
           feeds,
         };
+        // TODO Update register URL
         const response = await fetch(`${usersServiceUrl}/${user?.id}`, {
           method: 'post',
           headers: {
@@ -174,14 +174,12 @@ const SignUpPage = () => {
         });
 
         if (!response.ok) {
-          alert('Unable to create account.');
-          throw new Error('Unable to post - create account');
+          throw new Error(response.statusText);
         }
         login();
         return;
       } catch (err) {
         console.error(err, 'Unable to Post');
-        window.location.href = `${webUrl}`;
       }
     } else {
       handleNext();