Merge branch 'master' into subscriptions

client/coral-admin/src/services/client.js

@@ -1,7 +1,9 @@
 import ApolloClient, {addTypename} from 'apollo-client';
 import getNetworkInterface from './transport';
+import fragmentMatcher from './fragmentMatcher';
 
 export const client = new ApolloClient({
+  fragmentMatcher,
   addTypename: true,
   queryTransformer: addTypename,
   dataIdFromObject: (result) => {

client/coral-admin/src/services/fragmentMatcher.js

@@ -0,0 +1,33 @@
+import {IntrospectionFragmentMatcher} from 'apollo-client';
+
+// TODO this is a short-term fix
+// we need to set up something to query the server for the schema before ApolloClient initialization
+// https://github.com/apollographql/apollo-client/issues/1555#issuecomment-295834774
+const fm = new IntrospectionFragmentMatcher({
+  introspectionQueryResultData: {
+    __schema: {
+      types: [
+        {
+          kind: 'INTERFACE',
+          name: 'Action',
+          possibleTypes: [
+            {name: 'FlagAction'},
+            {name: 'LikeAction'},
+            {name: 'DontAgreeAction'}
+          ],
+        },
+        {
+          kind: 'INTERFACE',
+          name: 'ActionSummary',
+          possibleTypes: [
+            {name: 'FlagActionSummary'},
+            {name: 'LikeActionSummary'},
+            {name: 'DontAgreeActionSummary'}
+          ],
+        }
+      ],
+    },
+  }
+});
+
+export default fm;

client/coral-embed-stream/style/default.css

@@ -396,6 +396,7 @@ button.comment__action-button[disabled],
   margin-left: 20px;
   margin-top: 5px;
   width: 75%;
+  font-size: 16px;
 }
 
 /* Close comments */
@@ -490,4 +491,4 @@ button.comment__action-button[disabled],
   .commentActionsLeft.comment__action-container .coral-plugin-replies-reply-button .coral-plugin-replies-icon {
     visibility: visible;
   }
-}
+}

client/coral-sign-in/components/CreateUsernameDialog.js

@@ -38,6 +38,7 @@ const CreateUsernameDialog = ({open, handleClose, formData, handleSubmitUsername
           <div className={styles.saveusername}>
             <TextField
               id="username"
+              style={{fontSize: 16}}
               type="string"
               label={lang.t('createdisplay.username')}
               value={formData.username}

client/coral-sign-in/components/ForgotContent.js

@@ -31,6 +31,7 @@ class ForgotContent extends React.Component {
             <input
               ref={input => this.emailInput = input}
               type="text"
+              style={{fontSize: 16}}
               id="email"
               name="email" />
           </div>

client/coral-sign-in/components/SignInContent.js

@@ -58,6 +58,7 @@ const SignInContent = ({
                 type="email"
                 label={lang.t('signIn.email')}
                 value={formData.email}
+                style={{fontSize: 16}}
                 onChange={handleChange}
               />
               <TextField
@@ -65,6 +66,7 @@ const SignInContent = ({
                 type="password"
                 label={lang.t('signIn.password')}
                 value={formData.password}
+                style={{fontSize: 16}}
                 onChange={handleChange}
               />
               <div className={styles.action}>

client/coral-sign-in/components/SignUpContent.js

@@ -83,6 +83,7 @@ class SignUpContent extends React.Component {
                 type="email"
                 label={lang.t('signIn.email')}
                 value={formData.email}
+                style={{fontSize: 16}}
                 showErrors={showErrors}
                 errorMsg={errors.email}
                 onChange={handleChange}
@@ -93,6 +94,7 @@ class SignUpContent extends React.Component {
                 label={lang.t('signIn.username')}
                 value={formData.username}
                 showErrors={showErrors}
+                style={{fontSize: 16}}
                 errorMsg={errors.username}
                 onChange={handleChange}
               />
@@ -102,6 +104,7 @@ class SignUpContent extends React.Component {
                 label={lang.t('signIn.password')}
                 value={formData.password}
                 showErrors={showErrors}
+                style={{fontSize: 16}}
                 errorMsg={errors.password}
                 onChange={handleChange}
                 minLength="8"
@@ -112,6 +115,7 @@ class SignUpContent extends React.Component {
                 type="password"
                 label={lang.t('signIn.confirmPassword')}
                 value={formData.confirmPassword}
+                style={{fontSize: 16}}
                 showErrors={showErrors}
                 errorMsg={errors.confirmPassword}
                 onChange={handleChange}

graph/resolvers/flag_action.js

@@ -8,7 +8,9 @@ const FlagAction = {
     return group_id;
   },
   user({user_id}, _, {loaders: {Users}}) {
-    return Users.getByID.load(user_id);
+    if (user_id) {
+      return Users.getByID.load(user_id);
+    }
   },
 };
 

views/embed/stream.ejs

@@ -1,6 +1,8 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, user-scalable=no">
     <meta property="csrf" content="<%= csrfToken %>">
     <link rel="stylesheet" type="text/css" href="/client/embed/stream/default.css">
     <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">