fix ignored files and move lib/* -> utils/

vinaypuppal · vinaypuppal · commit 950a8a8c88ff · 2017-08-02T23:21:49.000+05:30
diff --git a/.babelrc b/.babelrc
diff --git a/.gitignore b/.gitignore
@@ -115,6 +115,5 @@ $RECYCLE.BIN/
 *.lnk
 
 # Others
-lib/
 data/
 .next/
diff --git a/package.json b/package.json
@@ -55,7 +55,7 @@
     "feathers-authentication-client": "^0.3.3",
     "feathers-hooks": "^2.0.2",
     "feathers-rest": "^1.8.0",
-    "isomorphic-fetch": "^2.2.1",
+    "isomorphic-unfetch": "^2.0.0",
     "js-cookie": "^2.1.4",
     "next": "2.4.7",
     "nprogress": "^0.2.0",
diff --git a/pages/jobs/index.js b/pages/jobs/index.js
@@ -6,7 +6,7 @@ import FaLocation from 'react-icons/lib/fa/map-marker';
 // Import FaArrowRight from 'react-icons/lib/fa/angle-right'
 
 import publicPage from '../../hocs/public-page';
-import { client as feathersClient } from '../../lib/feathers-client';
+import { client as feathersClient } from '../../utils/feathers-client';
 import truncateString from '../../utils';
 
 const _jobTypes = ['FullTime', 'PartTime', 'Remote', 'Consulting', 'Freelance'];
diff --git a/pages/jobs/new.js b/pages/jobs/new.js
@@ -12,7 +12,7 @@ import {
 } from 'semantic-ui-react';
 
 import secretPage from '../../hocs/secret-page';
-import { client as feathersClient } from '../../lib/feathers-client';
+import { client as feathersClient } from '../../utils/feathers-client';
 
 const _jobTypes = ['FullTime', 'PartTime', 'Remote', 'Consulting', 'Freelance'];
 
diff --git a/pages/profile/new.js b/pages/profile/new.js
@@ -11,7 +11,7 @@ import {
   Grid,
 } from 'semantic-ui-react';
 
-import feathersClient from '../../lib/feathers';
+import { client as feathersClient } from '../../utils/feathers-client';
 import secretPage from '../../hocs/secret-page';
 
 const technologies = [
diff --git a/server.js b/server.js
@@ -1,7 +1,7 @@
 const express = require('express');
 const next = require('next');
 const cookieParser = require('cookie-parser');
-const fetch = require('isomorphic-fetch');
+const fetch = require('isomorphic-unfetch');
 const feathers = require('feathers/client');
 const hooks = require('feathers-hooks');
 const auth = require('feathers-authentication-client');
diff --git a/utils/authenticate.js b/utils/authenticate.js
@@ -1,6 +1,6 @@
 import Cookie from 'js-cookie';
 
-import { client as feathersClient, baseUrl } from '../lib/feathers-client';
+import { client as feathersClient, baseUrl } from './feathers-client';
 
 export function login(service, url) {
   let href;
diff --git a/utils/feathers-client.js b/utils/feathers-client.js
@@ -0,0 +1,19 @@
+import fetch from 'isomorphic-unfetch';
+import feathers from 'feathers/client';
+import hooks from 'feathers-hooks';
+import auth from 'feathers-authentication-client';
+import rest from 'feathers-rest/client';
+
+const baseUrl =
+  process.env.NODE_ENV === 'production'
+    ? `https://api.coderplex.org`
+    : 'http://localhost:4000';
+
+const client = feathers();
+
+client
+  .configure(rest(baseUrl).fetch(fetch))
+  .configure(hooks())
+  .configure(auth());
+
+export { client, baseUrl };
diff --git a/yarn.lock b/yarn.lock
@@ -3015,13 +3015,20 @@ isobject@^2.0.0:
   dependencies:
     isarray "1.0.0"
 
-isomorphic-fetch@^2.1.1, isomorphic-fetch@^2.2.1:
+isomorphic-fetch@^2.1.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
   dependencies:
     node-fetch "^1.0.1"
     whatwg-fetch ">=0.10.0"
 
+isomorphic-unfetch@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isomorphic-unfetch/-/isomorphic-unfetch-2.0.0.tgz#f50140a4c163d7582b5f37f1591968c4f809a645"
+  dependencies:
+    node-fetch "^1.7.1"
+    unfetch "^3.0.0"
+
 isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
@@ -3683,7 +3690,7 @@ next@2.4.7:
     write-file-webpack-plugin "4.0.2"
     xss-filters "1.2.7"
 
-node-fetch@^1.0.1:
+node-fetch@^1.0.1, node-fetch@^1.7.1:
   version "1.7.1"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.1.tgz#899cb3d0a3c92f952c47f1b876f4c8aeabd400d5"
   dependencies:
@@ -5217,6 +5224,10 @@ unfetch@2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/unfetch/-/unfetch-2.1.2.tgz#684fee4d8acdb135bdb26c0364c642fc326ca95b"
 
+unfetch@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/unfetch/-/unfetch-3.0.0.tgz#8d1e0513a4ecd0e5ff2d41a6ba77771aae8b6482"
+
 unique-string@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a"

-Original file line number
+Diff line change
 *.lnk
 # Others
 -lib/
 data/
 .next/