Merge pull request #21 from dabigjoe6/timezone

Send time and timezone as part of register payload

src/contexts/Auth.tsx

@@ -1,9 +1,11 @@
 import * as React from "react";
+import moment from 'moment-timezone';
 import { useLocation, useNavigate } from "react-router-dom";
 import { toast } from "react-toastify";
 import { SIGNED_IN_TOKEN, SIGNED_IN_USER_KEY } from "../config";
 import { StatusCallback } from "../types.js";
 import { SettingsI } from "./Settings.js";
+import { offsetTimesToGMTZero } from "../helpers/offsetTimeToGMTZero";
 
 const BASE_URL = process.env.REACT_APP_BASE_URL;
 
@@ -89,12 +91,13 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
 
   const registerUser = async ({ email, password }: LoginDetails, callback: StatusCallback) => {
     try {
+      const usersTimeZone = moment.tz.guess();
       const response = await fetch(BASE_URL + "/auth/register", {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
         },
-        body: JSON.stringify({ email, password }),
+        body: JSON.stringify({ email, password, time: offsetTimesToGMTZero(["09:00"], usersTimeZone), timeZone: usersTimeZone }),
       });
 
       const data = await response.json();
@@ -152,9 +155,10 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
 
   const signUserInWithGoogle = async (code: string, callback: StatusCallback) => {
     try {
+      const usersTimeZone = moment.tz.guess();
       const response = await fetch(BASE_URL + "/auth/oauth_login", {
         method: "POST",
-        body: JSON.stringify({ code }),
+        body: JSON.stringify({ code, time: offsetTimesToGMTZero(["09:00"], usersTimeZone), timeZone: usersTimeZone}),
         headers: {
           "Content-Type": "application/json",
         },

src/contexts/Settings.tsx

@@ -1,8 +1,9 @@
 import * as React from 'react';
+import moment from 'moment-timezone';
 import { toast } from 'react-toastify';
 import { StatusCallback } from '../types';
 import { AuthContext } from './Auth';
-import moment from 'moment-timezone';
+import { offsetTimesToGMTZero } from '../helpers/offsetTimeToGMTZero';
 
 const BASE_URL = process.env.REACT_APP_BASE_URL;
 
@@ -55,17 +56,6 @@ export const SettingsContext = React.createContext<SettingsContextI>({
 export const SettingsProvider = ({ children }: { children: React.ReactNode }) => {
   const { user, token, signUserOut, updateUserSettings } = React.useContext(AuthContext);
 
-  const offsetTimesToGMTZero = (times: Array<string>, timezone: string): Array<string> => {
-    const gmtZeroOffset = moment.tz("GMT+0").utcOffset();
-
-    return times.map((time) => {
-      const datetime = moment.tz(`${moment().format("YYYY-MM-DD")} ${time}`, timezone);
-      const offsetted = datetime.utcOffset(gmtZeroOffset);
-
-      return offsetted.format("HH:mm");
-    });
-  }
-
   const pauseDigest = async (cb: StatusCallback) => {
     try {
       if (user && user._id) {

src/helpers/offsetTimeToGMTZero.ts

@@ -0,0 +1,12 @@
+import moment from 'moment-timezone';
+
+export const offsetTimesToGMTZero = (times: Array<string>, timezone: string): Array<string> => {
+  const gmtZeroOffset = moment.tz("GMT+0").utcOffset();
+
+  return times.map((time) => {
+    const datetime = moment.tz(`${moment().format("YYYY-MM-DD")} ${time}`, timezone);
+    const offsetted = datetime.utcOffset(gmtZeroOffset);
+
+    return offsetted.format("HH:mm");
+  });
+}