Merge pull request #401 from HackRU/autocheckin

check-in-after
HackRU · Nov 7, 2020 · b3a0468 · b3a0468
2 parents a383437 + 5bab5ae
commit b3a0468
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/components/Dashboard/Dashboard.jsx b/src/components/Dashboard/Dashboard.jsx
@@ -47,11 +47,11 @@ class Dashboard extends Component {
             } else {
                 if (data) {
                     delete data.auth;
-                    if (defaults.autocheckin && defaults.dayof && !data["check-in"]) {
+                    if (defaults.autocheckin && defaults.dayof && !data["check-in-after"]) {
                         // Auto checkin the user
                         this.props.profile.Set(
                             {
-                                "check-in": true
+                                "check-in-after": true
                             },
                             () => {
                                 this.setState({
@@ -108,7 +108,7 @@ class Dashboard extends Component {
         user.how_you_heard_about_hackru = user.how_you_heard_about_hackru || "";
         user.reasons = user.reasons || "";
         // boolean to show the other stuff
-        let SHOW_FLAG = defaults.dayof && user["check-in"] && (user["registration_status"] === "confirmed");
+        let SHOW_FLAG = defaults.dayof && (user["check-in-after"] || user["check-in"]) && (user["registration_status"] === "confirmed");
         // let mobile = this.props.isMobile;
         let rolesString = "";
         Object.keys(user.role).forEach((key) => { if (user.role[key]) { rolesString += `${key}, `; }});

diff --git a/src/components/Profile.js b/src/components/Profile.js
@@ -199,7 +199,7 @@ class Profile {
                                     // Auto checkin the user
                                     this.Set(
                                         {
-                                            "check-in": true
+                                            "check-in-after": true
                                         },
                                         callback
                                     );