Add request() to Helpers and replace all fetches with it.

src/Helpers.js

@@ -199,3 +199,16 @@ export function getWordsStats (words, partsOfSpeech, isCaseSensitive = false) {
 
   return wordStats;
 }
+
+export function request (action, data, callback) {
+  const request = new Request('./api/', {
+    method: 'POST',
+    mode: 'cors',
+    redirect: 'follow',
+    headers: new Headers({
+      'Content-Type': 'application/json'
+    }),
+    body: JSON.stringify(Object.assign({action}, data)),
+  });
+  return fetch(request).then(response => response.json()).then(callback);
+}

src/components/management/AccountManager/LoginForm.jsx

@@ -7,7 +7,7 @@ import store from 'store';
 import { Modal } from '../../structure/Modal';
 import { SearchBox } from '../../management/SearchBox';
 
-import helpMarkdown from '../../../assets/text/help.md';
+import { request } from '../../../Helpers';
 
 export class LoginForm extends Component {
   constructor (props) {
@@ -81,30 +81,10 @@ export class LoginForm extends Component {
     if (uniqueFields.includes(field)) {
       const errorFieldName = `${field}Error`;
 
-      const request = new Request('./api/', {
+      request('check-email', value, (response) => {
-        method: 'POST',
+
-        mode: 'cors',
-        redirect: 'follow',
-        headers: new Headers({
-          'Content-Type': 'application/json'
-        }),
-        body: JSON.stringify({
-          action: 'login',
-          email,
-          password,
-        }),
-      });
-      return fetch(request).then(response => response.json()).then(responseJSON => {
-        const { data, error } = responseJSON;
-        if (error) {
-          console.error(data);
-        } else {
-          store.set('LexicongaToken', data);
-          this.setState({ isLoggedIn: true }, () => {
-            this.props.updater.sync();
-          });
-        }
       });
+      
       if (value === '') {
         isUnique = false;
         fieldUpdate[errorFieldName] = 'This field must not be blank';

src/components/management/AccountManager/index.jsx

@@ -7,7 +7,7 @@ import store from 'store';
 import { Modal } from '../../structure/Modal';
 import { LoginForm } from './LoginForm';
 
-import helpMarkdown from '../../../assets/text/help.md';
+import { request } from '../../../Helpers';
 
 export class AccountManager extends Component {
   constructor (props) {
@@ -23,21 +23,8 @@ export class AccountManager extends Component {
   }
 
   logIn (email, password) {
-    const request = new Request('./api/', {
+    return request('login', { email, password }, response => {
-      method: 'POST',
+      const { data, error } = response;
-      mode: 'cors',
-      redirect: 'follow',
-      headers: new Headers({
-        'Content-Type': 'application/json'
-      }),
-      body: JSON.stringify({
-        action: 'login',
-        email,
-        password,
-      }),
-    });
-    return fetch(request).then(response => response.json()).then(responseJSON => {
-      const {data, error} = responseJSON;
       if (error) {
         console.error(data);
       } else {

src/managers/Updater.js

@@ -1,6 +1,6 @@
 import store from 'store';
 
-import { timestampInSeconds } from "../Helpers";
+import { timestampInSeconds, request } from "../Helpers";
 
 export class Updater {
   constructor (appWithDictionaryState, dictionary) {
@@ -86,58 +86,24 @@ export class Updater {
   }
 
   sendDictionaryDetails (dictionaryDetails) {
-    const request = new Request('./api/', {
+    return request('set-dictionary-details', {
-      method: 'POST',
+      token: store.get('LexicongaToken'),
-      mode: 'cors',
+      details: dictionaryDetails,
-      redirect: 'follow',
+    }, response => console.log(response))
-      headers: new Headers({
-        'Content-Type': 'application/json'
-      }),
-      body: JSON.stringify({
-        action: 'set-dictionary-details',
-        token: store.get('LexicongaToken'),
-        details: dictionaryDetails,
-      }),
-    });
-    return fetch(request).then(response => response.json()).then(responseJSON => {
-      console.log(responseJSON);
-    });
   }
 
   sendWords (words) {
-    const request = new Request('./api/', {
+    return request('set-dictionary-words', {
-      method: 'POST',
+      token: store.get('LexicongaToken'),
-      mode: 'cors',
+      words,
-      redirect: 'follow',
+    }, response => console.log(response));
-      headers: new Headers({
-        'Content-Type': 'application/json'
-      }),
-      body: JSON.stringify({
-        action: 'set-dictionary-words',
-        token: store.get('LexicongaToken'),
-        words,
-      }),
-    });
-    return fetch(request).then(response => response.json()).then(responseJSON => {
-      console.log(responseJSON);
-    });
   }
 
   sync () {
-    const request = new Request('./api/', {
+    return request('get-current-dictionary', {
-      method: 'POST',
+      token: store.get('LexicongaToken'),
-      mode: 'cors',
+    }, response => {
-      redirect: 'follow',
+      const { data, error } = response;
-      headers: new Headers({
-        'Content-Type': 'application/json'
-      }),
-      body: JSON.stringify({
-        action: 'get-current-dictionary',
-        token: store.get('LexicongaToken'),
-      }),
-    });
-    return fetch(request).then(response => response.json()).then(responseJSON => {
-      const {data, error} = responseJSON;
       if (error) {
         console.error(data);
       } else {

src/managers/Word.js

@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import store from 'store';
 import wordDb from './WordDatabase';
-import {timestampInSeconds} from '../Helpers';
+import { timestampInSeconds, request } from '../Helpers';
 
 export class Word {
   constructor (values = {}) {
@@ -80,21 +80,12 @@ export class Word {
   }
 
   send () {
-    const request = new Request('./api/', {
+    const token = store.get('LexicongaToken');
-      method: 'POST',
+    if (token) {
-      mode: 'cors',
+      return request('set-dictionary-words', {
-      redirect: 'follow',
-      headers: new Headers({
-        'Content-Type': 'application/json'
-      }),
-      body: JSON.stringify({
-        action: 'set-dictionary-words',
         token: store.get('LexicongaToken'),
         words: [this],
-      }),
+      }, response => console.log(response));
-    });
+    }
-    return fetch(request).then(response => response.json()).then(responseJSON => {
-      console.log(responseJSON);
-    });
   }
 }