Merge pull request #12 from WildAid/main

Back Merge 2

Author: Azzoo

src/components/boardings/boarding-edit/basic-info/basic-info.section.js

@@ -21,7 +21,7 @@ const boardingChartOptions = {
 };
 
 class BasicInfoSection extends Component {
-  state = { dateTime: new Date(), location: { latitude: 0, longitude: 0 } };
+  state = { dateTime: new Date(), location: [0, 0] };
 
   handleDateChange = (value) => {
     this.setState({
@@ -35,19 +35,13 @@ class BasicInfoSection extends Component {
   };
 
   handleLocationChange = (long, lat) => {
-    const location = {
-      longitude: parseFloat(long),
-      latitude: parseFloat(lat),
-    };
+    const location = [parseFloat(long), parseFloat(lat)];
     this.setState({
       location: location,
     });
     if (this.props.onChange) {
       const { dataObject } = this.props;
-      dataObject.location =  {
-        longitude: new BSON.Double(parseFloat(long)),
-        latitude: new BSON.Double(parseFloat(lat)),
-      };;
+      dataObject.location =  [new BSON.Double(parseFloat(long)), new BSON.Double(parseFloat(lat))];
       this.props.onChange(dataObject);
     }
   };
@@ -122,10 +116,10 @@ class BasicInfoSection extends Component {
               id="latitudeField"
               label={t("BOARDING_PAGE.VIEW_BOARDING.LATTITUDE")}
               className="half-row-view"
-              value={location.latitude}
+              value={location[1]}
               onChange={(event) => {
                 this.handleLocationChange(
-                  location.longitude,
+                  location[0],
                   event.target.value
                 );
               }}
@@ -134,11 +128,11 @@ class BasicInfoSection extends Component {
               id="longitudeField"
               label={t("BOARDING_PAGE.VIEW_BOARDING.LONGTITUDE")}
               className="half-row-view"
-              value={location.longitude}
+              value={location[0]}
               onChange={(event) => {
                 this.handleLocationChange(
                   event.target.value,
-                  location.latitude
+                  location[1]
                 );
               }}
             />

src/components/boardings/boarding-view/basic-info/basic-info.section.js

@@ -38,13 +38,13 @@ class BasicInfoSection extends Component {
               label={t("BOARDING_PAGE.VIEW_BOARDING.LATTITUDE")}
               className="half-row-view"
               name="lattitude"
-              value={location.latitude}
+              value={location[1]}
             />
             <TextField
               label={t("BOARDING_PAGE.VIEW_BOARDING.LONGTITUDE")}
               className="half-row-view"
               name="time"
-              value={location.longitude}
+              value={location[0]}
             />
           </div>
         </section>

src/components/partials/user-editor/user-editor.component.js

@@ -274,7 +274,7 @@ class UserEditor extends Component {
                         }
                         value={values.password}
                       />
-                    }
+                    )}
                     {allowRoleEditing && (
                       <Fragment>
                         <FormControl className="form-input">

src/config.js

@@ -1,10 +1,10 @@
 const config = {
-  appName: 'WildAid O-Fish',
+  appName: 'WildAid O-FISH',
   realmServiceName: 'mongodb-atlas',
   realmAppId: '',
   database: 'wildaid',
   chartsConfig: {
-    baseUrl: "https://charts-dev.mongodb.com/charts-wildaid-xxxxx",
+    baseUrl: "https://charts.mongodb.com/charts-wildaid-xxxxx",
     "boardings": {
       chartId: "chart-id"
     },