From 3d040d85130c55ca867cf2dfd456633394b24138 Mon Sep 17 00:00:00 2001 From: Sidney Alcantara Date: Sun, 29 Nov 2020 16:30:57 +1100 Subject: [PATCH] clean up Date, DateTime fields --- www/src/components/fields/Date/index.tsx | 3 +-- www/src/components/fields/Date/styles.ts | 13 ------------- www/src/components/fields/DateTime/index.tsx | 3 +-- www/src/components/fields/DateTime/styles.ts | 13 ------------- www/src/components/fields/types.ts | 2 +- 5 files changed, 3 insertions(+), 31 deletions(-) delete mode 100644 www/src/components/fields/Date/styles.ts delete mode 100644 www/src/components/fields/DateTime/styles.ts diff --git a/www/src/components/fields/Date/index.tsx b/www/src/components/fields/Date/index.tsx index fc08ca6c..e436857d 100644 --- a/www/src/components/fields/Date/index.tsx +++ b/www/src/components/fields/Date/index.tsx @@ -18,8 +18,7 @@ const SideDrawerField = lazy( export const config: IFieldConfig = { type: FieldType.date, name: "Date", - dataType: "boolean", - initialValue: false, + dataType: "firebase.firestore.Timestamp", icon: , description: "Date displayed and input as YYYY/MM/DD or input using a picker module.", diff --git a/www/src/components/fields/Date/styles.ts b/www/src/components/fields/Date/styles.ts deleted file mode 100644 index 947880c2..00000000 --- a/www/src/components/fields/Date/styles.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { makeStyles, createStyles } from "@material-ui/core"; -import { green } from "@material-ui/core/colors"; - -export const useSwitchStyles = makeStyles(() => - createStyles({ - switchBase: { - "&$checked": { color: green["A700"] }, - "&$checked + $track": { backgroundColor: green["A700"] }, - }, - checked: {}, - track: {}, - }) -); diff --git a/www/src/components/fields/DateTime/index.tsx b/www/src/components/fields/DateTime/index.tsx index 1af2924f..f1cbad9e 100644 --- a/www/src/components/fields/DateTime/index.tsx +++ b/www/src/components/fields/DateTime/index.tsx @@ -20,8 +20,7 @@ const SideDrawerField = lazy( export const config: IFieldConfig = { type: FieldType.dateTime, name: "Time & Date", - dataType: "boolean", - initialValue: false, + dataType: "firebase.firestore.Timestamp", icon: , description: "Time and Date can be written as YYYY/MM/DD hh:mm (am/pm) or input using a picker module.", diff --git a/www/src/components/fields/DateTime/styles.ts b/www/src/components/fields/DateTime/styles.ts deleted file mode 100644 index 947880c2..00000000 --- a/www/src/components/fields/DateTime/styles.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { makeStyles, createStyles } from "@material-ui/core"; -import { green } from "@material-ui/core/colors"; - -export const useSwitchStyles = makeStyles(() => - createStyles({ - switchBase: { - "&$checked": { color: green["A700"] }, - "&$checked + $track": { backgroundColor: green["A700"] }, - }, - checked: {}, - track: {}, - }) -); diff --git a/www/src/components/fields/types.ts b/www/src/components/fields/types.ts index 8c6d193e..62d294aa 100644 --- a/www/src/components/fields/types.ts +++ b/www/src/components/fields/types.ts @@ -9,7 +9,7 @@ export interface IFieldConfig { type: FieldType; name: string; dataType: string; - initialValue: any; + initialValue?: any; icon?: React.ReactNode; description?: string; setupGuideLink?: string;