From 42a78e861c375123c9613e7e2f97100cb3d74cf1 Mon Sep 17 00:00:00 2001 From: Gabriel Weinbrenner Date: Sat, 7 Nov 2020 13:31:50 -0500 Subject: [PATCH 1/3] check-in-after --- src/components/Dashboard/Dashboard.jsx | 2 +- src/components/Profile.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Dashboard/Dashboard.jsx b/src/components/Dashboard/Dashboard.jsx index 24f6f3d2d..fdf80c179 100644 --- a/src/components/Dashboard/Dashboard.jsx +++ b/src/components/Dashboard/Dashboard.jsx @@ -51,7 +51,7 @@ class Dashboard extends Component { // Auto checkin the user this.props.profile.Set( { - "check-in": true + "check-in-after": true }, () => { this.setState({ diff --git a/src/components/Profile.js b/src/components/Profile.js index b905c4a77..05d63d924 100644 --- 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 ); From c78a89df8b536e5fdbe905b725e9fffb7e518280 Mon Sep 17 00:00:00 2001 From: Gabriel Weinbrenner Date: Sat, 7 Nov 2020 13:38:34 -0500 Subject: [PATCH 2/3] fixes --- src/components/Dashboard/Dashboard.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Dashboard/Dashboard.jsx b/src/components/Dashboard/Dashboard.jsx index fdf80c179..59b98d416 100644 --- a/src/components/Dashboard/Dashboard.jsx +++ b/src/components/Dashboard/Dashboard.jsx @@ -47,7 +47,7 @@ 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( { @@ -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["registration_status"] === "confirmed"); // let mobile = this.props.isMobile; let rolesString = ""; Object.keys(user.role).forEach((key) => { if (user.role[key]) { rolesString += `${key}, `; }}); From 5bab5aeccb5592ced1321473e102d255ceaa9aff Mon Sep 17 00:00:00 2001 From: Gabriel Weinbrenner Date: Sat, 7 Nov 2020 14:09:15 -0500 Subject: [PATCH 3/3] show_flag --- src/components/Dashboard/Dashboard.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Dashboard/Dashboard.jsx b/src/components/Dashboard/Dashboard.jsx index 59b98d416..d4a9b3e82 100644 --- a/src/components/Dashboard/Dashboard.jsx +++ b/src/components/Dashboard/Dashboard.jsx @@ -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-after"] && (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}, `; }});