diff --git a/be/database/15042025_create_counters_table.sql b/be/database/15042025_create_counters_table.sql index fb93c25..e1ada5a 100644 --- a/be/database/15042025_create_counters_table.sql +++ b/be/database/15042025_create_counters_table.sql @@ -12,5 +12,4 @@ CREATE TABLE counters ( open_account_receipt_id UUID, FOREIGN KEY (regular_receipt_id) REFERENCES regular_receipt(regular_receipt_id) ON DELETE SET NULL , FOREIGN KEY (priority_receipt_id) REFERENCES priority_receipt(priority_receipt_id) ON DELETE SET NULL, - FOREIGN KEY (open_account_receipt_id) REFERENCES open_account_receipt(open_account_receipt_id) ON DELETE SET NULL, -); \ No newline at end of file + FOREIGN KEY (open_account_receipt_id) REFERENCES open_account_receipt(open_account_receipt_id) ON DELETE SET NULL); \ No newline at end of file diff --git a/be/database/connection.ts b/be/database/connection.ts index 60dbff1..ee4a3dc 100644 --- a/be/database/connection.ts +++ b/be/database/connection.ts @@ -5,8 +5,9 @@ const pool = new Pool({ user: "postgres", host: "localhost", database: "smart_queue", - //password: "rhenz", - password: "ymmahs13", + //password: "rhenz", + //password: "ymmahs13" + password: "password", port: 5432, }); diff --git a/fe/App.tsx b/fe/App.tsx index 8cd6303..e4220f0 100644 --- a/fe/App.tsx +++ b/fe/App.tsx @@ -104,3 +104,4 @@ const App = () => { }; export default App; +`` \ No newline at end of file diff --git a/fe/assets/adaptive-icon.png b/fe/assets/adaptive-icon.png index b88be3c..03d6f6b 100644 Binary files a/fe/assets/adaptive-icon.png and b/fe/assets/adaptive-icon.png differ diff --git a/fe/assets/favicon.png b/fe/assets/favicon.png index b88be3c..e75f697 100644 Binary files a/fe/assets/favicon.png and b/fe/assets/favicon.png differ diff --git a/fe/assets/icon.png b/fe/assets/icon.png index b88be3c..a0b1526 100644 Binary files a/fe/assets/icon.png and b/fe/assets/icon.png differ diff --git a/fe/assets/splash-icon.png b/fe/assets/splash-icon.png index b88be3c..03d6f6b 100644 Binary files a/fe/assets/splash-icon.png and b/fe/assets/splash-icon.png differ diff --git a/fe/constant/constant.ts b/fe/constant/constant.ts index 61959d4..9c6fe3d 100644 --- a/fe/constant/constant.ts +++ b/fe/constant/constant.ts @@ -1,3 +1,3 @@ -const WS_URL = "ws://192.168.0.41:5000" +const WS_URL = "ws://192.168.8.108:5000" export default WS_URL; \ No newline at end of file diff --git a/fe/screens/ConfirmationScreen.tsx b/fe/screens/ConfirmationScreen.tsx new file mode 100644 index 0000000..fbed536 --- /dev/null +++ b/fe/screens/ConfirmationScreen.tsx @@ -0,0 +1,12 @@ +import { View, Text } from 'react-native' +import React from 'react' + +const ConfirmationScreen = () => { + return ( + + ConfirmationScreen + + ) +} + +export default ConfirmationScreen \ No newline at end of file diff --git a/fe/screens/ReceiptScreen.tsx b/fe/screens/ReceiptScreen.tsx index 5afaa7b..9b4dc0f 100644 --- a/fe/screens/ReceiptScreen.tsx +++ b/fe/screens/ReceiptScreen.tsx @@ -5,6 +5,7 @@ import { format } from "date-fns"; import { Dimensions } from "react-native"; import HomeBackground from "../assets/backgrounds/home-background.svg"; + let globalQueueCounter = 0; const { width } = Dimensions.get("window"); @@ -118,30 +119,30 @@ const ReceiptScreen: React.FC = ({ route, navigation }) => { : "None selected"; return ( - - + - + - {isPrinting ? 'Printing your queue receipt...' : 'Receipt Printed'} {!isPrinting && ( - @@ -150,15 +151,15 @@ const ReceiptScreen: React.FC = ({ route, navigation }) => { )} - = ({ route, navigation }) => { - - - - - = ({ route, navigation }) => { - diff --git a/fe/screens/TellerScreen.tsx b/fe/screens/TellerScreen.tsx index 392c0a6..ddeb550 100644 --- a/fe/screens/TellerScreen.tsx +++ b/fe/screens/TellerScreen.tsx @@ -20,8 +20,9 @@ import WS_URL from "../constant/constant"; type TellerScreenRouteProp = RouteProp; type TellerScreenNavigationProp = NativeStackNavigationProp< RootStackParamLists, - "TellerScreen" ->; + "TellerScreen"> +; + interface TellerScreenProps { route: TellerScreenRouteProp; @@ -319,4 +320,4 @@ const TellerScreen: React.FC = ({ route, navigation }) => { ); }; -export default TellerScreen; +export default TellerScreen; \ No newline at end of file diff --git a/fe/screens/TransactionScreen.tsx b/fe/screens/TransactionScreen.tsx index 35165fa..c3d2c8b 100644 --- a/fe/screens/TransactionScreen.tsx +++ b/fe/screens/TransactionScreen.tsx @@ -1,6 +1,6 @@ import React, { useState } from 'react'; import { View, Text, Dimensions, TouchableOpacity, Modal } from 'react-native'; -import { receiptProps } from '../types/receiptProps'; +import { receiptProps } from '../types/ReceiptProps'; import { format } from 'date-fns'; // Assets (Icons and Backgrounds) import Back from "../assets/icons/back.svg"; diff --git a/fe/screens/WelcomeScreen.tsx b/fe/screens/WelcomeScreen.tsx index 611f500..72e78ba 100644 --- a/fe/screens/WelcomeScreen.tsx +++ b/fe/screens/WelcomeScreen.tsx @@ -1,3 +1,4 @@ + import React from "react"; import { View, Text, Dimensions, TouchableOpacity } from "react-native"; import Logo from "../assets/icons/logo.svg"; diff --git a/fe/websocket/useWebSocket.ts b/fe/websocket/useWebSocket.ts index c45848d..e015e52 100644 --- a/fe/websocket/useWebSocket.ts +++ b/fe/websocket/useWebSocket.ts @@ -44,6 +44,7 @@ const useWebSocket = (url: string) => { + // FUNCTIONS const fetchCounterStatus = () => { if (ws.current?.readyState == WebSocket.OPEN) {