diff --git a/app/_layout.tsx b/app/_layout.tsx
index 22c9479..b50abb3 100644
--- a/app/_layout.tsx
+++ b/app/_layout.tsx
@@ -36,6 +36,9 @@ const CustomTopBar = ({ navigation }: StackHeaderProps) => {
navigation.navigate('mainMealTracker')}>
+ navigation.navigate('accountSetting')}>
+
+
navigation.navigate('mainFinanceTracker')}>
@@ -45,9 +48,6 @@ const CustomTopBar = ({ navigation }: StackHeaderProps) => {
navigation.navigate('notes')}>
- navigation.navigate('accountSetting')}>
-
-
);
};
diff --git a/app/addCalendarEvents.tsx b/app/addCalendarEvents.tsx
index f21aa8f..6a6b34e 100644
--- a/app/addCalendarEvents.tsx
+++ b/app/addCalendarEvents.tsx
@@ -19,7 +19,6 @@ export default function AddCalendarEvents() {
fields={calendarFields}
mainPage="mainCalendarEvents"
updateEndpoint={`/add_calendar_event`}
- method="POST"
/>
);
}
diff --git a/app/addFinanceEvents.tsx b/app/addFinanceEvents.tsx
index f62ca01..d959542 100644
--- a/app/addFinanceEvents.tsx
+++ b/app/addFinanceEvents.tsx
@@ -19,7 +19,6 @@ export default function AddFinanceEvents() {
fields={financeFields}
mainPage='mainFinanceTracker'
updateEndpoint={`/add_finance_events`}
- method="POST"
/>
);
}
diff --git a/app/addHealthEvents.tsx b/app/addHealthEvents.tsx
index f8bd924..355b933 100644
--- a/app/addHealthEvents.tsx
+++ b/app/addHealthEvents.tsx
@@ -18,7 +18,6 @@ export default function AddHealthEvents() {
fields={healthFields}
mainPage='mainHealthTracker'
updateEndpoint={`/add_health_events`}
- method="POST"
/>
);
}
diff --git a/app/addMeals.tsx b/app/addMeals.tsx
index 2168f3d..0114b3f 100644
--- a/app/addMeals.tsx
+++ b/app/addMeals.tsx
@@ -19,7 +19,6 @@ export default function AddMeals() {
updateEndpoint={`/add_meal_events`}
fetchEndpoint={`/get_ingredients`}
keyValue={{'key':"id", "value":"ingredientName"}}
- method="POST"
/>
);
};
diff --git a/app/genericAddViewEventPage.tsx b/app/genericAddViewEventPage.tsx
index 8147042..bb21ba7 100644
--- a/app/genericAddViewEventPage.tsx
+++ b/app/genericAddViewEventPage.tsx
@@ -12,19 +12,17 @@ import AsyncStorage from '@react-native-async-storage/async-storage';
import { verifyToken } from '@/constants/constants';
import { call } from '../components/apiCall';
-const GenericAddViewPageForm: React.FC = ({ title, initialData = {}, fields, mainPage, updateEndpoint, fetchEndpoint, keyValue, method }) => {
+const GenericAddViewPageForm: React.FC = ({ title, initialData = {}, fields, mainPage, updateEndpoint, fetchEndpoint, keyValue, method="POST" }) => {
const [showDatePicker, setShowDatePicker] = useState(false);
const [showTimePicker, setShowTimePicker] = useState(false);
const [additionalData, setAdditionalData] = useState([]);
const [currentField, setCurrentField] = useState(null);
const route = useRoute>();
const navigation = useNavigation>();
- cLog("Initial Data:");
- cLog(initialData);
+ cLog({"Initial Data": initialData});
let event = initialData.event ? initialData.event : initialData;
if(route.params)event = route.params?.event.event;
- cLog("Event:");
- cLog(event);
+ cLog({"Event":event});
const [formData, setFormData] = useState({
...event,
event_date: event.event_date ? new Date(event.event_date) : new Date(),
diff --git a/app/genericMainPage.tsx b/app/genericMainPage.tsx
index 2816c5d..b1c5a79 100644
--- a/app/genericMainPage.tsx
+++ b/app/genericMainPage.tsx
@@ -51,7 +51,7 @@ const GenericMainPageForm: React.FC = ({
if (route.thisPage === 'index') {
route.thisPage = getPageFromEventType(route.event.event_type) as keyof RootStackParamList;
}
- cLog("Route:", route);
+ cLog({"Route": route});
navigation.navigate(getPageName(route.thisPage) as any, { event: route });
}
@@ -85,8 +85,7 @@ const GenericMainPageForm: React.FC = ({
setIsGoogleCalendarLinked(googleCalendarLinked);
}
const eventsArray = Array.isArray(events) ? events : response.data;
- cLog(`eventsArray:`);
- cLog(eventsArray);
+ cLog({'eventsArray':eventsArray});
const formattedEvents = eventsArray.map((event: any) => ({
id: eventIdFunc(event),
title: eventTitleFunc(event),
diff --git a/backend/.idea/dataSources.local.xml b/backend/.idea/dataSources.local.xml
index e1e2d3f..e6efc0e 100644
--- a/backend/.idea/dataSources.local.xml
+++ b/backend/.idea/dataSources.local.xml
@@ -1,6 +1,6 @@
-
+
no-auth
diff --git a/backend/omniplanner.db b/backend/omniplanner.db
index d1cd670..ac35275 100644
Binary files a/backend/omniplanner.db and b/backend/omniplanner.db differ
diff --git a/components/Types.tsx b/components/Types.tsx
index bbf9b38..d442301 100644
--- a/components/Types.tsx
+++ b/components/Types.tsx
@@ -63,7 +63,7 @@ export type GenericEventPageProps = {
fetchEndpoint?: string;
mainPage: string;
keyValue?: { key: string; value: string };
- method: string;
+ method?: string;
};
export type EventParams = {
diff --git a/components/apiCall.tsx b/components/apiCall.tsx
index fed8bad..4cd4d9e 100644
--- a/components/apiCall.tsx
+++ b/components/apiCall.tsx
@@ -4,7 +4,7 @@ import { cLog } from './log';
export const call = async (endpoint: string, method: string, headers?: string, data?: any): Promise> => {
const fullUrl = `${IPAddr}${endpoint}`;
- cLog('Full URL:', fullUrl);
+ cLog('API Call URL:', fullUrl);
try {
const response = await axios({