diff --git a/checkup_details.pdf b/checkup_details.pdf
deleted file mode 100644
index 3eb1ced..0000000
--- a/checkup_details.pdf
+++ /dev/null
@@ -1,83 +0,0 @@
-%PDF-1.4
-%öäüß
-1 0 obj
-<<
-/Type /Catalog
-/Version /1.4
-/Pages 2 0 R
->>
-endobj
-2 0 obj
-<<
-/Type /Pages
-/Kids [3 0 R]
-/Count 1
->>
-endobj
-3 0 obj
-<<
-/Type /Page
-/MediaBox [0.0 0.0 595.27563 841.8898]
-/Parent 2 0 R
-/Contents 4 0 R
-/Resources 5 0 R
->>
-endobj
-4 0 obj
-<<
-/Length 260
-/Filter /FlateDecode
->>
-stream
-xœu‘ÁRà E÷|Å[tQi€�f§Å:uÔq,ãžI_4'¡~¿Ô$“º`Ã=¼—xÍ€qPaéB€z 7Š
-Wa©™?koÐzØØÂe ÞÈꑤEžô3¸w¥é𛡵ãB¼‘Y0$©˜$×ûp.™ìÿ
-X+¸C‹µ®ÎÝárÙ"¯¦1¤öa"§\D”Et91J—{Wg ëlÆ—gÜñšÃI\ôŠ®‰-ÖŸ&Çøw&7áL¢×¦ji:HW®ñ}ŸªŠ’ž±Í±ò¡xgÇ’äo#«ó÷ãÇXÖQ3AGmu…þ÷Öÿ¹±ð‚•Áb<¹#fügò“öŒq
-endstream
-endobj
-5 0 obj
-<<
-/Font 6 0 R
->>
-endobj
-6 0 obj
-<<
-/F1 7 0 R
-/F2 8 0 R
->>
-endobj
-7 0 obj
-<<
-/Type /Font
-/Subtype /Type1
-/BaseFont /Helvetica
-/Encoding /WinAnsiEncoding
->>
-endobj
-8 0 obj
-<<
-/Type /Font
-/Subtype /Type1
-/BaseFont /Helvetica-Bold
-/Encoding /WinAnsiEncoding
->>
-endobj
-xref
-0 9
-0000000000 65535 f
-0000000015 00000 n
-0000000078 00000 n
-0000000135 00000 n
-0000000254 00000 n
-0000000588 00000 n
-0000000621 00000 n
-0000000662 00000 n
-0000000759 00000 n
-trailer
-<<
-/Root 1 0 R
-/ID [<0D096FE5232DC05955FD1862642B6A74> <0D096FE5232DC05955FD1862642B6A74>]
-/Size 9
->>
-startxref
-861
-%%EOF
diff --git a/config/config.properties b/config/config.properties
index d704b01..c4b479c 100644
--- a/config/config.properties
+++ b/config/config.properties
@@ -8,6 +8,6 @@ google.drive.enabled=true
google.drive.root.folder=BSK_Clinic_Patient_Files
server.address=127.0.0.1
server.port=1999
-storage.checkup_media_base_dir=src/main/resources/image/checkup_media
+storage.checkup_media_base_dir=image/checkup_media
storage.ultrasound_folder_path=ANH SIEU AM
app.auto_change_status_to_finished=false
\ No newline at end of file
diff --git a/src/main/resources/database/BSK.db b/database/BSK.db
similarity index 99%
rename from src/main/resources/database/BSK.db
rename to database/BSK.db
index 5536d2f..b45b7ca 100644
Binary files a/src/main/resources/database/BSK.db and b/database/BSK.db differ
diff --git a/image/checkup_media/3/IMG_3_20250731_025744.jpg b/image/checkup_media/3/IMG_3_20250731_025744.jpg
new file mode 100644
index 0000000..9be1e9e
Binary files /dev/null and b/image/checkup_media/3/IMG_3_20250731_025744.jpg differ
diff --git a/image/checkup_media/3/IMG_3_20250731_025745.jpg b/image/checkup_media/3/IMG_3_20250731_025745.jpg
new file mode 100644
index 0000000..c8fe4f7
Binary files /dev/null and b/image/checkup_media/3/IMG_3_20250731_025745.jpg differ
diff --git a/image/checkup_media/3/IMG_3_20250731_025746.jpg b/image/checkup_media/3/IMG_3_20250731_025746.jpg
new file mode 100644
index 0000000..21c6c57
Binary files /dev/null and b/image/checkup_media/3/IMG_3_20250731_025746.jpg differ
diff --git a/image/checkup_media/3/ultrasound_3_20250801_201117_348.png b/image/checkup_media/3/ultrasound_3_20250801_201117_348.png
new file mode 100644
index 0000000..7263d8e
Binary files /dev/null and b/image/checkup_media/3/ultrasound_3_20250801_201117_348.png differ
diff --git a/medical_invoice.pdf b/medical_invoice.pdf
deleted file mode 100644
index 027b59e..0000000
Binary files a/medical_invoice.pdf and /dev/null differ
diff --git a/organize.ps1 b/organize.ps1
deleted file mode 100644
index 360a49c..0000000
--- a/organize.ps1
+++ /dev/null
@@ -1,197 +0,0 @@
-# Create directories if they don't exist
-New-Item -ItemType Directory -Force -Path "BSK-Application"
-New-Item -ItemType Directory -Force -Path "BSK-Application\lib"
-New-Item -ItemType Directory -Force -Path "BSK-Application\resources"
-New-Item -ItemType Directory -Force -Path "BSK-Application\resources\images"
-New-Item -ItemType Directory -Force -Path "BSK-Application\resources\icons"
-New-Item -ItemType Directory -Force -Path "BSK-Application\resources\fonts"
-New-Item -ItemType Directory -Force -Path "BSK-Application\resources\database"
-New-Item -ItemType Directory -Force -Path "BSK-Application\config"
-New-Item -ItemType Directory -Force -Path "BSK-Application\logs"
-
-# Create resources directory in source if it doesn't exist
-New-Item -ItemType Directory -Force -Path "src\main\resources\images"
-New-Item -ItemType Directory -Force -Path "src\main\resources\icons"
-New-Item -ItemType Directory -Force -Path "src\main\resources\fonts"
-
-# Copy assets from the UI assets folder
-if (Test-Path "src\main\java\BsK\client\ui\assets\img") {
- Copy-Item "src\main\java\BsK\client\ui\assets\img\*" -Destination "src\main\resources\images\" -Force -Recurse
- Copy-Item "src\main\java\BsK\client\ui\assets\img\*" -Destination "BSK-Application\resources\images\" -Force -Recurse
-}
-
-if (Test-Path "src\main\java\BsK\client\ui\assets\icon") {
- Copy-Item "src\main\java\BsK\client\ui\assets\icon\*" -Destination "src\main\resources\icons\" -Force -Recurse
- Copy-Item "src\main\java\BsK\client\ui\assets\icon\*" -Destination "BSK-Application\resources\icons\" -Force -Recurse
-}
-
-if (Test-Path "src\main\java\BsK\client\ui\assets\font") {
- Copy-Item "src\main\java\BsK\client\ui\assets\font\*" -Destination "src\main\resources\fonts\" -Force -Recurse
- Copy-Item "src\main\java\BsK\client\ui\assets\font\*" -Destination "BSK-Application\resources\fonts\" -Force -Recurse
-}
-
-# Copy executables
-Copy-Item "target\BSK-Server.exe" -Destination "BSK-Application\" -Force
-Copy-Item "target\BSK-Client.exe" -Destination "BSK-Application\" -Force
-
-# Copy JAR files
-Copy-Item "target\bsk-server-jar-with-dependencies.jar" -Destination "BSK-Application\lib\" -Force
-Copy-Item "target\bsk-client-jar-with-dependencies.jar" -Destination "BSK-Application\lib\" -Force
-
-# Copy all resources from src/main/resources
-Copy-Item "src\main\resources\*" -Destination "BSK-Application\resources\" -Recurse -Force
-
-# Create log4j2 configuration file
-@"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-"@ | Out-File -FilePath "BSK-Application\config\log4j2.xml" -Encoding UTF8 -Force
-
-# Create config file with detailed comments
-@"
-# BSK Clinic Management System Configuration
-# ----------------------------------------
-# This configuration file is used by both the server and client applications.
-
-# Server Configuration
-# -------------------
-# The address where the server is running
-# Use "localhost" if running server and client on the same machine
-# Use the actual IP address if running on different machines
-# Examples:
-# server.address=localhost (same machine)
-# server.address=192.168.1.100 (local network)
-# server.address=example.com (domain name)
-server.address=localhost
-
-# The port number that the server will listen on and clients will connect to
-# Default: 1999
-server.port=1999
-
-# Log Configuration
-# ----------------
-# Log files will be created in the logs directory
-# See config/log4j2.xml for detailed logging configuration
-
-# Important Notes:
-# 1. Server Address:
-# - Use "localhost" if server and client are on the same machine
-# - Use the server's IP address if running on different machines
-# - Make sure the server is reachable from the client machine
-#
-# 2. After changing any settings:
-# - Close all running clients
-# - Stop the server
-# - Start the server again
-# - Start the clients
-#
-# 3. Network Configuration:
-# - Ensure the chosen port is not blocked by firewalls
-# - If using a domain name, make sure DNS resolution works
-# - For remote connections, the server must be accessible from the client
-"@ | Out-File -FilePath "BSK-Application\config\config.properties" -Encoding UTF8 -Force
-
-# Create batch files for easy startup
-@"
-@echo off
-echo Starting BSK Server...
-start "" "BSK-Server.exe"
-"@ | Out-File -FilePath "BSK-Application\start-server.bat" -Encoding ASCII -Force
-
-@"
-@echo off
-echo Starting BSK Client...
-start "" "BSK-Client.exe"
-"@ | Out-File -FilePath "BSK-Application\start-client.bat" -Encoding ASCII -Force
-
-# Create README file
-@"
-BSK Clinic Management System
-===========================
-
-This folder contains both the server and client applications for the BSK Clinic Management System.
-
-Quick Start
-----------
-1. Run 'start-server.bat' to start the server
-2. Run 'start-client.bat' to start the client
-
-Directory Structure
------------------
-BSK-Application/
-├── BSK-Server.exe - Server application
-├── BSK-Client.exe - Client application
-├── start-server.bat - Server startup script
-├── start-client.bat - Client startup script
-├── lib/ - Required libraries
-├── resources/ - Application resources
-│ ├── images/ - Images
-│ ├── icons/ - Icons
-│ ├── fonts/ - Fonts
-│ └── database/ - Database files
-├── config/ - Configuration files
-│ ├── config.properties - Main configuration
-│ └── log4j2.xml - Logging configuration
-└── logs/ - Application logs
-
-Configuration
-------------
-1. Edit config/config.properties to change:
- - Server address (default: localhost)
- - Server port (default: 1999)
-
-2. Logging:
- - Logs are stored in the logs/ directory
- - Configure logging in config/log4j2.xml
- - Log files rotate automatically
-
-Important Notes
--------------
-1. Always start the server before the client
-2. After changing config.properties:
- - Stop all clients
- - Stop the server
- - Start server again
- - Start clients
-
-Troubleshooting
---------------
-1. Check logs/ directory for error messages
-2. Verify server is running before starting clients
-3. Ensure config.properties has correct server address
-4. Check if port 1999 is not blocked by firewall
-
-Support
--------
-For technical support, please contact:
-[Your support contact information]
-"@ | Out-File -FilePath "BSK-Application\README.txt" -Encoding UTF8 -Force
-
-Write-Host "`nApplication has been built and organized in the BSK-Application folder!"
-Write-Host "`nTo start the application:"
-Write-Host "1. Run start-server.bat"
-Write-Host "2. Run start-client.bat"
-Write-Host "`nConfiguration files are in the config/ directory"
-Write-Host "Logs will be written to the logs/ directory"
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 374ffc8..eebabc2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,325 +1,251 @@
- 4.0.0
- BsK
- ldS_BsK
- 1.0-SNAPSHOT
-
- UTF-8
- 21
- BsK.LdS_BsK
-
-
-
-
- src/main/resources
- false
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.13.0
-
-
-
- lombok
- org.projectlombok
- 1.18.36
-
-
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
- 3.5.2
-
- true
-
-
-
- org.apache.maven.plugins
- maven-assembly-plugin
- 3.7.1
-
-
- server-jar
-
-
-
- BsK.server.Server
-
-
-
- jar-with-dependencies
-
- bsk-server
-
-
- single
-
- package
-
-
- client-jar
-
-
-
- BsK.client.Client
-
-
-
- jar-with-dependencies
-
- bsk-client
-
-
- single
-
- package
-
-
-
-
- com.akathist.maven.plugins.launch4j
- launch4j-maven-plugin
- 2.4.1
-
-
- server-exe
- package
-
- launch4j
-
-
- console
- target/BSK-Server.exe
- target/bsk-server-jar-with-dependencies.jar
- BSK Server Error
-
- BsK.server.Server
-
-
- 21.0.0
- C:\Program Files\Java\jdk-21
- true
- true
-
-
-
-
- client-exe
- package
-
- launch4j
-
-
- gui
- target/BSK-Client.exe
- target/bsk-client-jar-with-dependencies.jar
- BSK Client Error
-
- BsK.client.Client
-
-
- 21.0.0
- C:\Program Files\Java\jdk-21
- true
- true
-
-
-
-
-
-
-
-
-
- com.google.code.gson
- gson
- 2.11.0
-
-
- io.github.classgraph
- classgraph
- 4.8.179
-
-
- io.netty
- netty-all
- 4.1.116.Final
-
-
- org.apache.logging.log4j
- log4j-core
- 2.24.3
-
-
- org.apache.logging.log4j
- log4j-slf4j2-impl
- 2.24.3
-
-
- org.projectlombok
- lombok
- 1.18.36
- provided
-
-
- org.slf4j
- slf4j-api
- 2.0.16
-
-
- org.xerial
- sqlite-jdbc
- 3.47.1.0
-
-
-
- org.jdatepicker
- jdatepicker
- 1.3.4
-
-
- org.swinglabs
- swingx
- 1.6.1
-
-
-
- com.itextpdf
- itextpdf
- 5.5.13.2
-
-
-
- org.apache.pdfbox
- pdfbox
- 2.0.27
-
-
-
- com.itextpdf
- itext7-core
- 7.1.12
- pom
-
-
-
- com.github.sarxos
- webcam-capture
- 0.3.12
-
-
-
- org.bytedeco
- javacv
- 1.5.10
-
-
- org.bytedeco
- javacpp
- 1.5.10
-
-
- org.bytedeco
- ffmpeg
- 6.1.1-1.5.10
-
-
- org.bytedeco
- ffmpeg-platform
- 6.1.1-1.5.10
-
-
- org.bytedeco
- opencv
- 4.9.0-1.5.10
-
-
- org.bytedeco
- opencv-platform
- 4.9.0-1.5.10
-
-
-
- net.sf.jasperreports
- jasperreports
- 7.0.3
-
-
-
-
- net.sf.barcode4j
- barcode4j
- 2.1
-
-
-
-
- net.sf.jasperreports
- jasperreports-barcode4j
- 7.0.3
-
-
-
-
- net.sf.jasperreports
- jasperreports-pdf
- 7.0.3
-
-
-
-
- com.google.apis
- google-api-services-drive
- v3-rev20240914-2.0.0
-
-
-
-
- com.google.auth
- google-auth-library-oauth2-http
- 1.27.0
-
-
-
-
- com.google.oauth-client
- google-oauth-client-jetty
- 1.36.0
-
-
-
-
- com.google.zxing
- core
- 3.5.3
-
-
- com.google.zxing
- javase
- 3.5.3
-
-
- org.apache.poi
- poi
- 5.2.5
-
-
- org.apache.poi
- poi-ooxml
- 5.2.5
-
-
- com.zaxxer
- HikariCP
- 5.1.0
-
-
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ 4.0.0
+ BsK
+ ldS_BsK
+ 1.0-SNAPSHOT
+
+ UTF-8
+ 21
+ BsK.LdS_BsK
+
+
+
+
+ src/main/resources
+ false
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.13.0
+
+
+
+ lombok
+ org.projectlombok
+ 1.18.36
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+ 3.5.2
+
+ true
+
+
+
+ org.apache.maven.plugins
+ maven-assembly-plugin
+ 3.7.1
+
+
+ server-jar
+
+
+
+ BsK.server.Server
+
+
+
+ jar-with-dependencies
+
+ bsk-server
+
+
+ single
+
+ package
+
+
+ client-jar
+
+
+
+ BsK.client.Client
+
+
+
+ jar-with-dependencies
+
+ bsk-client
+
+
+ single
+
+ package
+
+
+
+
+
+
+
+ com.google.code.gson
+ gson
+ 2.11.0
+
+
+ io.github.classgraph
+ classgraph
+ 4.8.179
+
+
+ io.netty
+ netty-all
+ 4.1.116.Final
+
+
+ org.apache.logging.log4j
+ log4j-core
+ 2.24.3
+
+
+ org.apache.logging.log4j
+ log4j-slf4j2-impl
+ 2.24.3
+
+
+ org.projectlombok
+ lombok
+ 1.18.36
+ provided
+
+
+ org.slf4j
+ slf4j-api
+ 2.0.16
+
+
+ org.xerial
+ sqlite-jdbc
+ 3.47.1.0
+
+
+ org.jdatepicker
+ jdatepicker
+ 1.3.4
+
+
+ org.swinglabs
+ swingx
+ 1.6.1
+
+
+ org.apache.pdfbox
+ pdfbox
+ 2.0.27
+
+
+ com.itextpdf
+ itext7-core
+ 7.1.12
+ pom
+
+
+ com.github.sarxos
+ webcam-capture
+ 0.3.12
+
+
+ org.bytedeco
+ javacv
+ 1.5.10
+
+
+ org.bytedeco
+ javacpp
+ 1.5.10
+
+
+ org.bytedeco
+ ffmpeg
+ 6.1.1-1.5.10
+
+
+ org.bytedeco
+ ffmpeg-platform
+ 6.1.1-1.5.10
+
+
+ org.bytedeco
+ opencv
+ 4.9.0-1.5.10
+
+
+ org.bytedeco
+ opencv-platform
+ 4.9.0-1.5.10
+
+
+
+ net.sf.jasperreports
+ jasperreports
+ 7.0.3
+
+
+
+ net.sf.barcode4j
+ barcode4j
+ 2.1
+
+
+
+ net.sf.jasperreports
+ jasperreports-barcode4j
+ 7.0.3
+
+
+
+ net.sf.jasperreports
+ jasperreports-pdf
+ 7.0.3
+
+
+
+ com.google.apis
+ google-api-services-drive
+ v3-rev20240914-2.0.0
+
+
+
+ com.google.auth
+ google-auth-library-oauth2-http
+ 1.27.0
+
+
+
+ com.google.oauth-client
+ google-oauth-client-jetty
+ 1.36.0
+
+
+
+ com.google.zxing
+ core
+ 3.5.3
+
+
+ com.google.zxing
+ javase
+ 3.5.3
+
+
+ org.apache.poi
+ poi
+ 5.2.5
+
+
+ org.apache.poi
+ poi-ooxml
+ 5.2.5
+
+
diff --git a/src/main/java/BsK/client/LocalStorage.java b/src/main/java/BsK/client/LocalStorage.java
index 1030738..91d10a2 100644
--- a/src/main/java/BsK/client/LocalStorage.java
+++ b/src/main/java/BsK/client/LocalStorage.java
@@ -38,7 +38,7 @@ public class LocalStorage {
// these variable can be changed by settings page
// need restart
- public static String checkupMediaBaseDir = "src/main/resources/image/checkup_media";
+ public static String checkupMediaBaseDir = "image/checkup_media";
public static String ULTRASOUND_FOLDER_PATH = "ANH SIEU AM";
public static String ClinicName = "Phòng khám BSK";
public static String ClinicAddress = "Số ABC, Ä�ưá»�ng XYZ, Quáºn 1, TP.HCM";
diff --git a/src/main/java/BsK/client/ui/component/CheckUpPage/CheckUpPage.java b/src/main/java/BsK/client/ui/component/CheckUpPage/CheckUpPage.java
index b35244a..770bd38 100644
--- a/src/main/java/BsK/client/ui/component/CheckUpPage/CheckUpPage.java
+++ b/src/main/java/BsK/client/ui/component/CheckUpPage/CheckUpPage.java
@@ -3592,7 +3592,7 @@ public class CheckUpPage extends JPanel {
SwingUtilities.invokeLater(() -> {
try {
// Create media directory for this checkup if it doesn't exist
- java.io.File mediaDir = new java.io.File("src/main/resources/image/checkup_media", response.getCheckupId());
+ java.io.File mediaDir = new java.io.File("image/checkup_media", response.getCheckupId());
if (!mediaDir.exists()) {
mediaDir.mkdirs();
}
diff --git a/src/main/java/BsK/client/ui/component/CheckUpPage/PrintDialog/print_forms/medserinvoice.jasper b/src/main/java/BsK/client/ui/component/CheckUpPage/PrintDialog/print_forms/medserinvoice.jasper
new file mode 100644
index 0000000..c826a78
Binary files /dev/null and b/src/main/java/BsK/client/ui/component/CheckUpPage/PrintDialog/print_forms/medserinvoice.jasper differ
diff --git a/src/main/java/BsK/client/ui/component/CheckUpPage/PrintDialog/print_forms/ultrasoundresult.jasper b/src/main/java/BsK/client/ui/component/CheckUpPage/PrintDialog/print_forms/ultrasoundresult.jasper
new file mode 100644
index 0000000..85a7db4
Binary files /dev/null and b/src/main/java/BsK/client/ui/component/CheckUpPage/PrintDialog/print_forms/ultrasoundresult.jasper differ
diff --git a/src/main/java/BsK/server/Server.java b/src/main/java/BsK/server/Server.java
index 14671d9..6058cd6 100644
--- a/src/main/java/BsK/server/Server.java
+++ b/src/main/java/BsK/server/Server.java
@@ -41,7 +41,7 @@ public class Server {
private static boolean googleDriveEnabled = true; // Can be configured
private static String googleDriveRootFolderName = "BSK_Clinic_Patient_Files"; // Default
public static String imageDbPath = "img_db"; // Default
- public static String checkupMediaBaseDir = "src/main/resources/image/checkup_media"; // Default
+ public static String checkupMediaBaseDir = "image/checkup_media"; // Default
static {
try {
@@ -116,7 +116,7 @@ public class Server {
log.info("Checkup media base dir: {}", checkupMediaBaseDir);
// Directly use the provided database path
- String dbPath = "src/main/resources/database/BSK.db";
+ String dbPath = "database/BSK.db";
connection = DriverManager.getConnection("jdbc:sqlite:" + dbPath);
// Initialize Google Drive service if enabled
@@ -346,7 +346,7 @@ public class Server {
}
// Define the path to the database
- String dbPath = "src/main/resources/database/BSK.db";
+ String dbPath = "database/BSK.db";
java.io.File dbFile = new java.io.File(dbPath);
if (!dbFile.exists()) {
diff --git a/src/main/java/BsK/server/service/GoogleDriveServiceOAuth.java b/src/main/java/BsK/server/service/GoogleDriveServiceOAuth.java
index 75f2caa..5788751 100644
--- a/src/main/java/BsK/server/service/GoogleDriveServiceOAuth.java
+++ b/src/main/java/BsK/server/service/GoogleDriveServiceOAuth.java
@@ -31,7 +31,7 @@ public class GoogleDriveServiceOAuth {
private static final List SCOPES = Collections.singletonList(DriveScopes.DRIVE_FILE);
// Path to OAuth2 client credentials file
- private static final String OAUTH_CREDENTIALS_PATH = "src/main/resources/google-oauth-credentials.json";
+ private static final String OAUTH_CREDENTIALS_PATH = "google-oauth-credentials.json";
// Directory to store authorization tokens
private static final String TOKENS_DIRECTORY_PATH = "tokens";
diff --git a/src/main/resources/assets/font/SVN-Arial Bold.ttf b/src/main/resources/assets/font/SVN-Arial Bold.ttf
new file mode 100644
index 0000000..b8a5542
Binary files /dev/null and b/src/main/resources/assets/font/SVN-Arial Bold.ttf differ
diff --git a/src/main/resources/assets/font/SVN-Arial Regular.ttf b/src/main/resources/assets/font/SVN-Arial Regular.ttf
new file mode 100644
index 0000000..c2fb14a
Binary files /dev/null and b/src/main/resources/assets/font/SVN-Arial Regular.ttf differ
diff --git a/src/main/resources/assets/gif/Heart beat.gif b/src/main/resources/assets/gif/Heart beat.gif
new file mode 100644
index 0000000..638c467
Binary files /dev/null and b/src/main/resources/assets/gif/Heart beat.gif differ
diff --git a/src/main/resources/assets/icon/add.png b/src/main/resources/assets/icon/add.png
new file mode 100644
index 0000000..3697b35
Binary files /dev/null and b/src/main/resources/assets/icon/add.png differ
diff --git a/src/main/resources/assets/icon/cashier-machine.png b/src/main/resources/assets/icon/cashier-machine.png
new file mode 100644
index 0000000..58c827a
Binary files /dev/null and b/src/main/resources/assets/icon/cashier-machine.png differ
diff --git a/src/main/resources/assets/icon/chat.png b/src/main/resources/assets/icon/chat.png
new file mode 100644
index 0000000..7263d8e
Binary files /dev/null and b/src/main/resources/assets/icon/chat.png differ
diff --git a/src/main/resources/assets/icon/cont.png b/src/main/resources/assets/icon/cont.png
new file mode 100644
index 0000000..dcd8650
Binary files /dev/null and b/src/main/resources/assets/icon/cont.png differ
diff --git a/src/main/resources/assets/icon/dashboard.png b/src/main/resources/assets/icon/dashboard.png
new file mode 100644
index 0000000..1107002
Binary files /dev/null and b/src/main/resources/assets/icon/dashboard.png differ
diff --git a/src/main/resources/assets/icon/data.png b/src/main/resources/assets/icon/data.png
new file mode 100644
index 0000000..1411c8f
Binary files /dev/null and b/src/main/resources/assets/icon/data.png differ
diff --git a/src/main/resources/assets/icon/database.png b/src/main/resources/assets/icon/database.png
new file mode 100644
index 0000000..c0e903e
Binary files /dev/null and b/src/main/resources/assets/icon/database.png differ
diff --git a/src/main/resources/assets/icon/delete.png b/src/main/resources/assets/icon/delete.png
new file mode 100644
index 0000000..0d30fb0
Binary files /dev/null and b/src/main/resources/assets/icon/delete.png differ
diff --git a/src/main/resources/assets/icon/edit.png b/src/main/resources/assets/icon/edit.png
new file mode 100644
index 0000000..53c3cf6
Binary files /dev/null and b/src/main/resources/assets/icon/edit.png differ
diff --git a/src/main/resources/assets/icon/exit.png b/src/main/resources/assets/icon/exit.png
new file mode 100644
index 0000000..29ebdab
Binary files /dev/null and b/src/main/resources/assets/icon/exit.png differ
diff --git a/src/main/resources/assets/icon/expense.png b/src/main/resources/assets/icon/expense.png
new file mode 100644
index 0000000..94f8901
Binary files /dev/null and b/src/main/resources/assets/icon/expense.png differ
diff --git a/src/main/resources/assets/icon/google-drive.png b/src/main/resources/assets/icon/google-drive.png
new file mode 100644
index 0000000..e1e4f64
Binary files /dev/null and b/src/main/resources/assets/icon/google-drive.png differ
diff --git a/src/main/resources/assets/icon/health-check.png b/src/main/resources/assets/icon/health-check.png
new file mode 100644
index 0000000..180fd68
Binary files /dev/null and b/src/main/resources/assets/icon/health-check.png differ
diff --git a/src/main/resources/assets/icon/income.png b/src/main/resources/assets/icon/income.png
new file mode 100644
index 0000000..7876b1b
Binary files /dev/null and b/src/main/resources/assets/icon/income.png differ
diff --git a/src/main/resources/assets/icon/info.png b/src/main/resources/assets/icon/info.png
new file mode 100644
index 0000000..a762a6c
Binary files /dev/null and b/src/main/resources/assets/icon/info.png differ
diff --git a/src/main/resources/assets/icon/line.png b/src/main/resources/assets/icon/line.png
new file mode 100644
index 0000000..181131b
Binary files /dev/null and b/src/main/resources/assets/icon/line.png differ
diff --git a/src/main/resources/assets/icon/logo.jpg b/src/main/resources/assets/icon/logo.jpg
new file mode 100644
index 0000000..c98dcc4
Binary files /dev/null and b/src/main/resources/assets/icon/logo.jpg differ
diff --git a/src/main/resources/assets/icon/loupe.png b/src/main/resources/assets/icon/loupe.png
new file mode 100644
index 0000000..e9a225e
Binary files /dev/null and b/src/main/resources/assets/icon/loupe.png differ
diff --git a/src/main/resources/assets/icon/medicine.png b/src/main/resources/assets/icon/medicine.png
new file mode 100644
index 0000000..462ff58
Binary files /dev/null and b/src/main/resources/assets/icon/medicine.png differ
diff --git a/src/main/resources/assets/icon/printer.png b/src/main/resources/assets/icon/printer.png
new file mode 100644
index 0000000..4f8c116
Binary files /dev/null and b/src/main/resources/assets/icon/printer.png differ
diff --git a/src/main/resources/assets/icon/reload.png b/src/main/resources/assets/icon/reload.png
new file mode 100644
index 0000000..51ef1a2
Binary files /dev/null and b/src/main/resources/assets/icon/reload.png differ
diff --git a/src/main/resources/assets/icon/report.png b/src/main/resources/assets/icon/report.png
new file mode 100644
index 0000000..cf74a58
Binary files /dev/null and b/src/main/resources/assets/icon/report.png differ
diff --git a/src/main/resources/assets/icon/save.png b/src/main/resources/assets/icon/save.png
new file mode 100644
index 0000000..49f89eb
Binary files /dev/null and b/src/main/resources/assets/icon/save.png differ
diff --git a/src/main/resources/assets/icon/service.png b/src/main/resources/assets/icon/service.png
new file mode 100644
index 0000000..97fb5b1
Binary files /dev/null and b/src/main/resources/assets/icon/service.png differ
diff --git a/src/main/resources/assets/icon/settings.png b/src/main/resources/assets/icon/settings.png
new file mode 100644
index 0000000..21dd605
Binary files /dev/null and b/src/main/resources/assets/icon/settings.png differ
diff --git a/src/main/resources/assets/icon/ultrasound.png b/src/main/resources/assets/icon/ultrasound.png
new file mode 100644
index 0000000..14bc6e8
Binary files /dev/null and b/src/main/resources/assets/icon/ultrasound.png differ
diff --git a/src/main/resources/assets/icon/user.png b/src/main/resources/assets/icon/user.png
new file mode 100644
index 0000000..f829b46
Binary files /dev/null and b/src/main/resources/assets/icon/user.png differ
diff --git a/src/main/resources/assets/icon/view.png b/src/main/resources/assets/icon/view.png
new file mode 100644
index 0000000..c5b58c0
Binary files /dev/null and b/src/main/resources/assets/icon/view.png differ
diff --git a/src/main/resources/assets/icon/warehouse.png b/src/main/resources/assets/icon/warehouse.png
new file mode 100644
index 0000000..7cb1d31
Binary files /dev/null and b/src/main/resources/assets/icon/warehouse.png differ
diff --git a/src/main/resources/assets/img/landingpagebg.jpeg b/src/main/resources/assets/img/landingpagebg.jpeg
new file mode 100644
index 0000000..038dc80
Binary files /dev/null and b/src/main/resources/assets/img/landingpagebg.jpeg differ
diff --git a/src/main/resources/config.properties b/src/main/resources/config.properties
deleted file mode 100644
index 8e474ee..0000000
--- a/src/main/resources/config.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-# Default configuration - will be overridden by external config/config.properties
-
-# Server Configuration
-# ------------------
-# The address where the server is running
-# Use "localhost" if running server and client on the same machine
-# Use the IP address if running on different machines
-server.address=127.0.0.1
-
-# The port number that the server will listen on and clients will connect to
-server.port=1999
-
-# Google Drive Integration Settings
-# --------------------------------
-# Set to true to enable Google Drive integration for patient file storage
-# Requires google-oauth-credentials.json to be properly configured
-# If disabled, the server will run without Google Drive features
-google.drive.enabled=true
-
-# Root folder name in Google Drive where all patient folders will be created
-# This folder will remain private, only individual patient folders will be shared
-# Use alphanumeric characters, dots, dashes, and underscores only
-google.drive.root.folder=BSK_Clinic_Patient_Files
-
-# Storage paths
-# -------------
-# The local path for storing checkup-related images and PDFs.
-storage.image_db_path=img_db
-
-# The base directory for checkup media resources (currently unused but defined for future use).
-storage.checkup_media_base_dir=src/main/resources/image/checkup_media
-
-
-app.auto_change_status_to_finished=false
\ No newline at end of file
diff --git a/ultrasound_result.pdf b/ultrasound_result.pdf
deleted file mode 100644
index 1f8acde..0000000
Binary files a/ultrasound_result.pdf and /dev/null differ