Merge pull request #738 from rmuif/new-rel

3.4.0
rmuif · Dec 15, 2020 · 63fe85b · 63fe85b
2 parents bb8b63a + 57a56de
commit 63fe85b
Show file tree

Hide file tree

Showing 12 changed files with 79 additions and 85 deletions.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,4 +1,4 @@
-blank_issues_enabled: false
+blank_issues_enabled: true
 contact_links:
   - name: Discord
     about: This is the primary channel for external communication and the quickest way to get help

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,37 +9,30 @@ on:
       - dev
 
 jobs:
-  install-build-test:
-    name: Install, build, and test
+  test:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-
-    - uses: actions/setup-node@v1
-
-    - name: Get yarn cache directory path
-      id: yarn-cache-directory-path
-      run: echo "::set-output name=dir::$(yarn cache dir)"
-
-    - name: Restore cache
-      uses: actions/cache@v1
-      id: yarn-cache
-      with:
-        path: ${{ steps.yarn-cache-directory-path.outputs.dir }}
-        key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-yarn-
-
-    - name: Install dependencies
-      run: yarn install
-      working-directory: ./template
-
-    - name: Build app
-      run: yarn build
-      working-directory: ./template
-
-    - name: Test app
-      run: yarn test
-      working-directory: ./template
-      env:
-        CI: true
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+
+      - id: yarn-cache-directory-path
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+
+      - uses: actions/cache@v1
+        id: yarn-cache
+        with:
+          path: ${{ steps.yarn-cache-directory-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      - run: yarn install
+        working-directory: ./template
+
+      - run: yarn build
+        working-directory: ./template
+
+      - run: yarn test
+        working-directory: ./template
+        env:
+          CI: true
diff --git a/README.md b/README.md
@@ -8,18 +8,19 @@
 
 ## Features
 
-- Bootstrapped with Create React App
-- Google’s [Material Design](https://material.io) through Material-UI
-- Firebase back-end with most of their products for the web included, e.g., [Authentication](https://firebase.google.com/products/auth) and [Cloud Firestore](https://firebase.google.com/products/firestore)
-- Routing with [React Router](https://reacttraining.com/react-router/web), including protected routes and error handling
-- Extensive and well-tested mobile support with full-screen dialogs and swipeable tabs
-- Cross-platform application monitoring with [Sentry](https://sentry.io)
+- Bootstrapped with Create React App.
+- Google’s [Material Design](https://material.io) through Material-UI.
+- Firebase back-end with most of their products for the web included, e.g., [Authentication](https://firebase.google.com/products/auth) and [Cloud Firestore](https://firebase.google.com/products/firestore).
+- Routing with [React Router](https://reacttraining.com/react-router/web), including protected routes and error handling.
+- Extensive and well-tested mobile support with full-screen dialogs and swipeable tabs.
+- Cross-platform application monitoring with [Sentry](https://sentry.io).
 
 ## Demos
 
 <p align="center">
   <a href="https://demo.rmuif.com">
-    <img src="https://user-images.githubusercontent.com/7033377/78246649-c46e8200-74e9-11ea-8137-c519dd1f7c30.png" alt="Preview">
+    <img src="https://user-images.githubusercontent.com/7033377/101923139-524d5180-3bcf-11eb-8b81-b2e5ad9f6b8d.png" alt="Preview">
+    <img src="https://user-images.githubusercontent.com/7033377/101923127-4feaf780-3bcf-11eb-9d65-f56fed2ec8e6.png" alt="Preview">
   </a>
 </p>
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "cra-template-rmuif",
-  "version": "3.3.0",
-  "description": "Supercharged version of Create React App with all the bells and whistles",
+  "version": "3.4.0",
+  "description": "Supercharged version of Create React App with all the bells and whistles.",
   "keywords": [
     "react",
     "create-react-app",

diff --git a/template.json b/template.json
@@ -2,28 +2,28 @@
   "package": {
     "dependencies": {
       "@material-ui/codemod": "^4.5.0",
-      "@material-ui/core": "^4.11.0",
-      "@material-ui/icons": "^4.9.1",
-      "@material-ui/styles": "^4.9.6",
-      "@sentry/browser": "^5.22.3",
-      "@testing-library/jest-dom": "^5.11.4",
-      "@testing-library/react": "^11.0.2",
-      "@testing-library/user-event": "^12.1.3",
-      "babel-plugin-import": "^1.13.0",
-      "camelcase": "^6.0.0",
+      "@material-ui/core": "^4.11.2",
+      "@material-ui/icons": "^4.11.2",
+      "@material-ui/styles": "^4.11.1",
+      "@sentry/browser": "^5.29.0",
+      "@testing-library/jest-dom": "^5.11.6",
+      "@testing-library/react": "^11.2.2",
+      "@testing-library/user-event": "^12.5.0",
+      "babel-plugin-import": "^1.13.3",
+      "camelcase": "^6.2.0",
       "customize-cra": "^1.0.0",
-      "firebase": "^7.19.1",
-      "mdi-material-ui": "^6.18.0",
-      "moment": "^2.26.0",
-      "react": "^16.13.1",
-      "react-app-rewired": "^2.1.6",
-      "react-dom": "^16.13.1",
+      "firebase": "^8.2.0",
+      "mdi-material-ui": "^6.20.0",
+      "moment": "^2.29.1",
+      "react": "^16.14.0",
+      "react-app-rewired": "^2.1.8",
+      "react-dom": "^16.14.0",
       "react-router-dom": "^5.2.0",
-      "react-scripts": "3.4.3",
+      "react-scripts": "4.0.1",
       "react-swipeable-views": "0.13.9",
-      "reading-time": "^1.1.3",
-      "source-map-explorer": "^2.5.0",
-      "typeface-roboto": "^0.0.75",
+      "reading-time": "^1.2.1",
+      "source-map-explorer": "^2.5.1",
+      "typeface-roboto": "^1.1.13",
       "validate.js": "^0.13.1"
     },
 

diff --git a/template/src/components/App/App.js b/template/src/components/App/App.js
@@ -431,12 +431,6 @@ class App extends Component {
 
               // The user doesn’t have a data point, equivalent to not signed in.
               if (!snapshot.exists || !data) {
-                if (this.userDocumentSnapshotListener) {
-                  this.userDocumentSnapshotListener();
-                }
-
-                this.resetState();
-
                 return;
               }
 

diff --git a/template/src/components/EmptyState/EmptyState.js b/template/src/components/EmptyState/EmptyState.js
@@ -18,7 +18,7 @@ function EmptyState(props) {
     case "medium":
       imageWidth = 60;
       imageHeight = 60;
-      variant = "h5";
+      variant = "h6";
       break;
 
     case "large":
@@ -55,13 +55,13 @@ function EmptyState(props) {
         )}
 
         {props.title && (
-          <Box mb={!props.description && props.button ? 2 : 0}>
+          <Box mb={!props.description && props.button ? 2 : 0.5}>
             <Typography variant={variant}>{props.title}</Typography>
           </Box>
         )}
 
         {props.description && (
-          <Box mb={props.button && 2}>
+          <Box mb={props.button && 3}>
             <Typography variant="body1">{props.description}</Typography>
           </Box>
         )}

diff --git a/template/src/components/HomePage/HomePage.js b/template/src/components/HomePage/HomePage.js
@@ -73,14 +73,20 @@ class HomePage extends Component {
     const { user } = this.props;
 
     if (user) {
-      return <EmptyState image={<CabinIllustration />} />;
+      return (
+        <EmptyState
+          image={<CabinIllustration />}
+          title="Home"
+          description="This is the home page. You can edit it from HomePage.js."
+        />
+      );
     }
 
     return (
       <EmptyState
         image={<InsertBlockIllustration />}
         title="RMUIF"
-        description="Supercharged version of Create React App with all the bells and whistles"
+        description="Supercharged version of Create React App with all the bells and whistles."
       />
     );
   }

diff --git a/template/src/components/NotFoundPage/NotFoundPage.js b/template/src/components/NotFoundPage/NotFoundPage.js
@@ -15,8 +15,8 @@ class NotFoundPage extends Component {
     return (
       <EmptyState
         image={<NotFoundIllustration />}
-        title="Page doesn’t exist"
-        description="The page you’re trying to access doesn’t exist"
+        title="Page doesn’t exist."
+        description="The page you’re trying to access doesn’t exist."
         button={
           <Fab variant="extended" color="primary" component={Link} to="/">
             <Box clone mr={1}>

diff --git a/template/src/components/UserPage/UserPage.js b/template/src/components/UserPage/UserPage.js
@@ -52,8 +52,8 @@ function UserPage() {
     return (
       <EmptyState
         image={<ErrorIllustration />}
-        title="Couldn’t retrieve user"
-        description="Something went wrong when trying to retrieve the requested user"
+        title="Couldn’t retrieve user."
+        description="Something went wrong when trying to retrieve the requested user."
         button={
           <Fab
             variant="extended"
@@ -78,8 +78,8 @@ function UserPage() {
     return (
       <EmptyState
         image={<NoDataIllustration />}
-        title="User doesn’t exist"
-        description="The requested user doesn’t exist"
+        title="User doesn’t exist."
+        description="The requested user doesn’t exist."
         button={
           <Fab variant="extended" color="primary" component={Link} to="/">
             <Box clone mr={1}>
@@ -97,7 +97,7 @@ function UserPage() {
   if (hasProfile) {
     return (
       <Grid className={classes.grid} container justify="center" spacing={5}>
-        <Grid item xs={6}>
+        <Grid item xs={4}>
           <UserCard user={user} />
         </Grid>
       </Grid>
@@ -107,8 +107,8 @@ function UserPage() {
   return (
     <EmptyState
       image={<NoDataIllustration />}
-      title="No profile"
-      description="The user hasn‘t setup their profile"
+      title="No profile."
+      description="The user hasn‘t setup their profile."
     />
   );
 }

diff --git a/template/src/firebase.js b/template/src/firebase.js
@@ -1,4 +1,4 @@
-import * as firebase from "firebase/app";
+import firebase from "firebase/app";
 
 import "firebase/analytics";
 import "firebase/auth";

diff --git a/yarn.lock b/yarn.lock
@@ -787,9 +787,9 @@ inherits@~2.0.1:
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
 ini@^1.3.4, ini@~1.3.0:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
-  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84"
+  integrity sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ==
 
 [email protected]:
   version "5.2.0"