Merge branch 'develop'

chunyenHuang · Sep 15, 2020 · e67ad53 · e67ad53
2 parents e9fdd4f + 25ccdad
commit e67ad53
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/...uth/piggybankofhappinesscf2e2c90/piggybankofhappinesscf2e2c90-cloudformation-template.yml b/...uth/piggybankofhappinesscf2e2c90/piggybankofhappinesscf2e2c90-cloudformation-template.yml
@@ -240,7 +240,7 @@ Resources:
 
 
       AdminCreateUserConfig:
-          AllowAdminCreateUserOnly: True
+          AllowAdminCreateUserOnly: false
           InviteMessageTemplate:
               EmailMessage: |
                 [幸福存摺] 開發測試登入資訊

diff --git a/data/README.md b/data/README.md
@@ -11,7 +11,7 @@ https://github.com/aws-amplify/amplify-cli/issues/2187
     Properties:
       # Add this to make admin only
       AdminCreateUserConfig:
-          AllowAdminCreateUserOnly: True
+          AllowAdminCreateUserOnly: false
           InviteMessageTemplate:
               EmailMessage: |
                 [幸福存摺] 開發測試登入資訊

diff --git a/web/src/components/UserAvatar.js b/web/src/components/UserAvatar.js
@@ -3,8 +3,17 @@ import PropTypes from 'prop-types';
 import { Storage } from 'aws-amplify';
 
 import Avatar from '@material-ui/core/Avatar';
+import { makeStyles } from '@material-ui/core/styles';
+
+const useStyles = makeStyles((theme) => ({
+  avatar: {
+    border: '1px solid rgba(255,255,255,0.3)',
+  },
+}));
 
 export default function UserAvatar({ username }) {
+  const classes = useStyles();
+
   const [uri, setUri] = useState();
   const [s3Key, setS3Key] = useState();
 
@@ -19,7 +28,12 @@ export default function UserAvatar({ username }) {
   }, [username]);
 
   return (
-    <Avatar alt={''} src={uri} />
+    <Avatar
+      alt={''}
+      src={uri}
+      variant="circle"
+      className={classes.avatar}
+    />
   );
 }