Merge master and fix conflicts

boost-entropy-javascript · Jan 25, 2018 · dda7ecf · dda7ecf
2 parents a873c04 + 9bef49d
commit dda7ecf
Show file tree

Hide file tree

Showing 73 changed files with 8,717 additions and 17,945 deletions.
diff --git a/admin/package-lock.json b/admin/package-lock.json
diff --git a/admin/package.json b/admin/package.json
@@ -3,10 +3,12 @@
   "version": "0.1.0",
   "private": true,
   "devDependencies": {
+    "add": "^2.0.6",
     "flow-bin": "^0.57.3",
-    "react-scripts": "1.0.13",
-    "recompose": "^0.23.4",
-    "styled-components": "^2.1.2"
+    "react-scripts": "1.1.0",
+    "recompose": "^0.26.0",
+    "styled-components": "^3.0.1",
+    "yarn": "^1.3.2"
   },
   "dependencies": {
     "@vx/curve": "^0.0.127",
@@ -16,12 +18,30 @@
     "@vx/scale": "^0.0.127",
     "@vx/shape": "^0.0.131",
     "@vx/tooltip": "^0.0.134",
+    "apollo-cache-inmemory": "^1.1.5",
+    "apollo-client": "2.x",
+    "apollo-engine": "^0.8.3",
+    "apollo-link": "^1.0.7",
+    "apollo-link-http": "^1.3.2",
+    "apollo-link-ws": "^1.0.4",
+    "apollo-upload-client": "6.x",
+    "apollo-upload-server": "^2.0.4",
+    "apollo-utilities": "^1.0.4",
     "d3-array": "^1.2.0",
-    "react": "^15.5.4",
-    "react-dom": "^15.5.4",
+    "graphql": "^0.12.3",
+    "graphql-tag": "^2.6.1",
+    "moment": "^2.20.1",
+    "react": "16.x",
+    "react-apollo": "2.x",
+    "react-dom": "16.x",
     "react-redux": "^5.0.5",
     "react-router": "^4.1.1",
-    "recharts": "^1.0.0-alpha.6"
+    "react-router-dom": "^4.2.2",
+    "react-trend": "^1.2.4",
+    "recharts": "^1.0.0-alpha.6",
+    "redux": "^3.6.0",
+    "redux-thunk": "^2.2.0",
+    "subscriptions-transport-ws": "^0.9.5"
   },
   "scripts": {
     "start": "react-scripts start",

diff --git a/admin/src/api/apollo-options.js b/admin/src/api/apollo-options.js
@@ -0,0 +1,64 @@
+var apollo = require('apollo-utilities'),
+  toIdValue = apollo.toIdValue;
+
+function dataIdFromObject(result) {
+  if (result.__typename) {
+    // Custom Community cache key based on slug
+    if (result.__typename === 'Community' && !!result.slug) {
+      return result.__typename + ':' + result.slug;
+    }
+    // Custom Channel cache key based on slug and community slug
+    if (
+      result.__typename === 'Channel' &&
+      !!result.slug &&
+      !!result.community &&
+      !!result.community.slug
+    ) {
+      return (
+        result.__typename + ':' + result.community.slug + ':' + result.slug
+      );
+    }
+    // This was copied from the default dataIdFromObject
+    if (result.id !== undefined) {
+      return result.__typename + ':' + result.id;
+    }
+    if (result._id !== undefined) {
+      return result.__typename + ':' + result._id;
+    }
+  }
+  return null;
+}
+
+var getSharedApolloClientOptions = function getSharedApolloClientOptions() {
+  return {
+    queryDeduplication: true,
+    dataIdFromObject: dataIdFromObject,
+    customResolvers: {
+      Query: {
+        thread: function thread(_, _ref) {
+          var id = _ref.id;
+          return toIdValue(dataIdFromObject({ __typename: 'Thread', id: id }));
+        },
+        community: function community(_, _ref2) {
+          var slug = _ref2.slug;
+          return toIdValue(
+            dataIdFromObject({ __typename: 'Community', slug: slug })
+          );
+        },
+        channel: function channel(_, _ref3) {
+          var channelSlug = _ref3.channelSlug,
+            communitySlug = _ref3.communitySlug;
+          return toIdValue(
+            dataIdFromObject({
+              __typename: 'Channel',
+              slug: channelSlug,
+              community: { slug: communitySlug },
+            })
+          );
+        },
+      },
+    },
+  };
+};
+
+module.exports = getSharedApolloClientOptions;
diff --git a/admin/src/api/community.js b/admin/src/api/community.js
@@ -1,5 +1,8 @@
-import { graphql, gql } from 'react-apollo';
+import gql from 'graphql-tag';
+import { graphql } from 'react-apollo';
 import { communityInfoFragment } from './fragments/community/communityInfo';
+import { communityMemberConnectionFragment } from './fragments/community/communityMembers';
+import { userInfoFragment } from './fragments/user/userInfo';
 
 const COMMUNITY_INFORMATION_QUERY = gql`
   query {
@@ -36,33 +39,24 @@ export const getCommunityBySlug = graphql(
   GET_COMMUNITY_BY_SLUG_OPTIONS
 );
 
-/*
-  Gets top communities for the onboarding flow.
-*/
-export const topCommunitiesQuery = graphql(
-  gql`
-    {
-      topCommunities {
-        ...communityInfo
-      }
-    }
-    ${communityInfoFragment}
-  `,
-  {
-    name: 'top',
-  }
-);
-
 export const recentCommunitiesQuery = graphql(
   gql`
-    {
+    query recentCommunities($filter: MemberConnectionFilter) {
       recentCommunities {
         ...communityInfo
+        ...communityMembers
       }
     }
     ${communityInfoFragment}
+    ${communityMemberConnectionFragment}
   `,
   {
     name: 'recent',
+    options: () => ({
+      variables: {
+        filter: { isOwner: true, isMember: true },
+      },
+      fetchPolicy: 'cache-and-network',
+    }),
   }
 );
diff --git a/admin/src/api/fragments/channel/channelInfo.js b/admin/src/api/fragments/channel/channelInfo.js
@@ -1,4 +1,4 @@
-import { gql } from 'react-apollo';
+import gql from 'graphql-tag';
 import { communityInfoFragment } from '../community/communityInfo';
 
 export const channelInfoFragment = gql`

diff --git a/admin/src/api/fragments/channel/channelMetaData.js b/admin/src/api/fragments/channel/channelMetaData.js
@@ -1,4 +1,4 @@
-import { gql } from 'react-apollo';
+import gql from 'graphql-tag';
 
 export const channelMetaDataFragment = gql`
   fragment channelMetaData on Channel {

diff --git a/admin/src/api/fragments/channel/channelSubscribers.js b/admin/src/api/fragments/channel/channelSubscribers.js
@@ -1,4 +1,4 @@
-import { gql } from 'react-apollo';
+import gql from 'graphql-tag';
 import { userInfoFragment } from '../user/userInfo';
 
 export const channelMembersFragment = gql`

diff --git a/admin/src/api/fragments/channel/channelThreads.js b/admin/src/api/fragments/channel/channelThreads.js
@@ -1,4 +1,4 @@
-import { gql } from 'react-apollo';
+import gql from 'graphql-tag';
 import { threadInfoFragment } from '../thread/threadInfo';
 
 export const channelThreadsFragment = gql`

diff --git a/admin/src/api/fragments/community/communityInfo.js b/admin/src/api/fragments/community/communityInfo.js
@@ -1,26 +1,22 @@
-import { gql } from 'react-apollo';
+import gql from 'graphql-tag';
 
 export const communityInfoFragment = gql`
   fragment communityInfo on Community {
-    # admin
     id
     createdAt
-    # meta
     name
     slug
     description
     website
     profilePhoto
     coverPhoto
-    # roles
     communityPermissions {
       isMember
       isBlocked
       isOwner
       isModerator
       receiveNotifications
     }
-    # counts
     metaData {
       members
       channels

diff --git a/admin/src/api/fragments/community/communityMembers.js b/admin/src/api/fragments/community/communityMembers.js
@@ -1,16 +1,18 @@
-import { gql } from 'react-apollo';
+import gql from 'graphql-tag';
 import { userInfoFragment } from '../user/userInfo';
 
-export const communityMembersFragment = gql`
+export const communityMemberConnectionFragment = gql`
   fragment communityMembers on Community {
-    memberConnection {
+    memberConnection(filter: $filter) {
       pageInfo {
         hasNextPage
         hasPreviousPage
       }
       edges {
         node {
           ...userInfo
+          isPro
+          email
         }
       }
     }

diff --git a/admin/src/api/fragments/community/communityMetaData.js b/admin/src/api/fragments/community/communityMetaData.js
@@ -1,4 +1,4 @@
-import { gql } from 'react-apollo';
+import gql from 'graphql-tag';
 
 export const communityMetaDataFragment = gql`
   fragment communityMetaData on Community {

diff --git a/admin/src/api/fragments/community/communityThreads.js b/admin/src/api/fragments/community/communityThreads.js
@@ -1,4 +1,4 @@
-import { gql } from 'react-apollo';
+import gql from 'graphql-tag';
 import { threadInfoFragment } from '../thread/threadInfo';
 
 export const communityThreadsFragment = gql`

diff --git a/admin/src/api/fragments/directMessageThread/directMessageThreadInfo.js b/admin/src/api/fragments/directMessageThread/directMessageThreadInfo.js
@@ -1,4 +1,4 @@
-import { gql } from 'react-apollo';
+import gql from 'graphql-tag';
 
 export const directMessageThreadInfoFragment = gql`
   fragment directMessageThreadInfo on DirectMessageThread {

diff --git a/admin/src/api/fragments/message/messageInfo.js b/admin/src/api/fragments/message/messageInfo.js
@@ -1,6 +1,5 @@
 // @flow
-// $FlowFixMe
-import { gql } from 'react-apollo';
+import gql from 'graphql-tag';
 import { userInfoFragment } from '../user/userInfo';
 
 export const messageInfoFragment = gql`

diff --git a/admin/src/api/fragments/notification/notificationInfo.js b/admin/src/api/fragments/notification/notificationInfo.js
@@ -1,6 +1,5 @@
 // @flow
-// $FlowFixMe
-import { gql } from 'react-apollo';
+import gql from 'graphql-tag';
 
 export const notificationInfoFragment = gql`
   fragment notificationInfo on Notification {

diff --git a/admin/src/api/fragments/reaction/reactionInfo.js b/admin/src/api/fragments/reaction/reactionInfo.js
@@ -1,6 +1,5 @@
 // @flow
-// $FlowFixMe
-import { gql } from 'react-apollo';
+import gql from 'graphql-tag';
 
 export const reactionInfoFragment = gql`
   fragment reactionInfo on Reaction {

diff --git a/admin/src/api/fragments/thread/threadInfo.js b/admin/src/api/fragments/thread/threadInfo.js
@@ -1,4 +1,4 @@
-import { gql } from 'react-apollo';
+import gql from 'graphql-tag';
 import { userInfoFragment } from '../user/userInfo';
 
 export const threadInfoFragment = gql`
@@ -26,7 +26,7 @@ export const threadInfoFragment = gql`
     isPublished
     isLocked
     isCreator
-		type
+    type
     participants {
       ...userInfo
     }

diff --git a/admin/src/api/fragments/thread/threadMessages.js b/admin/src/api/fragments/thread/threadMessages.js
@@ -1,6 +1,5 @@
 // @flow
-// $FlowFixMe
-import { gql } from 'react-apollo';
+import gql from 'graphql-tag';
 import { messageInfoFragment } from '../message/messageInfo';
 
 export const threadMessagesFragment = gql`

diff --git a/admin/src/api/fragments/user/userCommunities.js b/admin/src/api/fragments/user/userCommunities.js
@@ -1,4 +1,4 @@
-import { gql } from 'react-apollo';
+import gql from 'graphql-tag';
 import { communityInfoFragment } from '../community/communityInfo';
 
 export const userCommunitiesFragment = gql`

diff --git a/admin/src/api/fragments/user/userDirectMessageThreads.js b/admin/src/api/fragments/user/userDirectMessageThreads.js
@@ -1,6 +1,5 @@
 // @flow
-// $FlowFixme
-import { gql } from 'react-apollo';
+import gql from 'graphql-tag';
 import { directMessageThreadInfoFragment } from '../directMessageThread/directMessageThreadInfo';
 
 export const userDirectMessageThreadsFragment = gql`

diff --git a/admin/src/api/fragments/user/userEverything.js b/admin/src/api/fragments/user/userEverything.js
@@ -1,11 +1,9 @@
-import { gql } from 'react-apollo';
+import gql from 'graphql-tag';
 import { threadInfoFragment } from '../thread/threadInfo';
-// import { channelInfoFragment } from '../channel/channelInfo';
-// import { communityInfoFragment } from '../community/communityInfo';
 
 export const userEverythingFragment = gql`
   fragment userEverything on User {
-    everything(first: 10, after: $after){
+    everything(first: 10, after: $after) {
       pageInfo {
         hasNextPage
         hasPreviousPage

diff --git a/admin/src/api/fragments/user/userFrequencies.js b/admin/src/api/fragments/user/userFrequencies.js
@@ -1,4 +1,4 @@
-import { gql } from 'react-apollo';
+import gql from 'graphql-tag';
 import { channelInfoFragment } from '../channel/channelInfo';
 
 export const userChannelsFragment = gql`

diff --git a/admin/src/api/fragments/user/userInfo.js b/admin/src/api/fragments/user/userInfo.js
@@ -1,4 +1,4 @@
-import { gql } from 'react-apollo';
+import gql from 'graphql-tag';
 
 export const userInfoFragment = gql`
   fragment userInfo on User {

diff --git a/admin/src/api/fragments/user/userThreads.js b/admin/src/api/fragments/user/userThreads.js
@@ -1,4 +1,4 @@
-import { gql } from 'react-apollo';
+import gql from 'graphql-tag';
 import { threadInfoFragment } from '../thread/threadInfo';
 
 export const userThreadsFragment = gql`