Merge branch 'main' into feature/invitations

backend/Dockerfile

@@ -0,0 +1,14 @@
+FROM maven:3.9.11-eclipse-temurin-21
+
+WORKDIR /app
+
+COPY pom.xml .
+COPY application.yml .
+
+RUN mvn dependency:go-offline -B
+
+COPY src ./src
+
+EXPOSE 8080
+
+CMD ["mvn", "spring-boot:run"]

backend/application.yml

@@ -0,0 +1,21 @@
+spring:
+  datasource:
+    url: ${DB_URL}
+    username: ${DB_USER}
+    password: ${DB_PASSWORD}
+    driver-class-name: org.postgresql.Driver
+
+  jpa:
+    hibernate:
+      ddl-auto: update
+    show-sql: true
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.PostgreSQLDialect
+        format_sql: true
+
+  application:
+    name: wesal
+
+server:
+  port: 8080

backend/pom.xml

@@ -28,6 +28,8 @@
 	</scm>
 	<properties>
 		<java.version>21</java.version>
+		<maven.compiler.source>21</maven.compiler.source>
+		<maven.compiler.target>21</maven.compiler.target>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -96,7 +98,17 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.13.0</version>
+				<configuration>
+					<source>21</source>
+					<target>21</target>
+					<release>21</release>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 
-</project>
+</project>

docker-compose.yml

@@ -17,4 +17,21 @@ services:
     depends_on: 
       - db
     ports:
-      - 8100:8080
+      - 8100:8080
+
+  server:
+    restart: unless-stopped
+    build:
+      context: ./backend
+      dockerfile: Dockerfile
+    ports:
+      - 4044:8080
+
+
+  web:
+    restart: unless-stopped
+    build:
+      context: ./frontend
+      dockerfile: Dockerfile
+    ports:
+      - 6060:80

frontend/Dockerfile

@@ -0,0 +1,13 @@
+FROM ghcr.io/cirruslabs/flutter:3.32.6 AS build
+WORKDIR /app
+
+COPY . .
+
+RUN flutter pub get
+RUN flutter build web --release
+
+FROM nginx:alpine
+COPY --from=build /app/build/web /usr/share/nginx/html
+
+EXPOSE 80
+CMD ["nginx", "-g", "daemon off;"]

frontend/lib/constants/api_constants.dart

@@ -1,5 +1,5 @@
 class ApiConstants {
-  static const String baseUrl = 'http://localhost:8080';
+  static const String baseUrl = 'https://api.wesal.online';
 
   // Auth endpoints
   static const String loginEndpoint = '/login';
@@ -7,7 +7,7 @@ class ApiConstants {
   // User endpoints
   static const String getUserEndpoint = '/getUser';
   static const String updateUserEndpoint = '/updateUser';
-
+  
   // Invitation endpoints
   static const String invitationsEndpoint = '/invitations';
   static const String getAllInvitationsEndpoint = '/invitations/all';

frontend/lib/screens/pages/profile_page.dart

@@ -150,6 +150,7 @@ class _ProfilePageState extends State<ProfilePage> {
           preferredSize: Size.fromHeight(1),
           child: Container(height: 1, color: Colors.grey[200]),
         ),
+        automaticallyImplyLeading: false,
       ),
       body: SingleChildScrollView(
         child: Column(
@@ -492,7 +493,7 @@ class _SettingsPageState extends State<SettingsPage> {
         bottom: PreferredSize(
           preferredSize: Size.fromHeight(1),
           child: Container(height: 1, color: Colors.grey[200]),
-        ),
+        ),        
         automaticallyImplyLeading: true,
       ),
       body: Padding(