lib/globals.dart

@@ -1,3 +0,0 @@
-// lib/globals.dart
-//const String apiurl = "https://api.dthpp.mercurio.moe";
-const String apiurl = "http://10.0.0.10:9134";

lib/main.dart

@@ -17,7 +17,7 @@ class MyApp extends StatelessWidget {
       title: 'Ping Pong Tracker',
       theme: ThemeData.dark(useMaterial3: true).copyWith(
         colorScheme: ColorScheme.dark(
-          primary: Colors.blue.shade800,
+          primary: Colors.blue.shade900,
         ),
       ),
       home: EntryPoint(),

lib/pages/login.dart

@@ -3,7 +3,7 @@ import 'package:shared_preferences/shared_preferences.dart';
 import 'package:http/http.dart' as http;
 import 'dart:convert';
 import 'home.dart';
-import '../globals.dart';
+
 
 class LoginPage extends StatefulWidget {
   @override
@@ -18,6 +18,8 @@ class _LoginPageState extends State<LoginPage> {
   bool _isLogin = true;
   bool _isLoading = false;
 
+  final String baseUrl = 'http://api.dthpp.mercurio.moe';
+
   Future<void> _handleAuth() async {
     final email = _emailController.text.trim();
     final password = _passwordController.text.trim();
@@ -36,14 +38,13 @@ class _LoginPageState extends State<LoginPage> {
               context, MaterialPageRoute(builder: (context) => HomePage()));
         }
       } else {
-        final uid = await _register(
+        final uid = await _register(email, password, _displayNameController.text.trim());
-            email, password, _displayNameController.text.trim());
         if (uid != null) {
           setState(() {
             _isLogin = true;
           });
-          ScaffoldMessenger.of(context).showSnackBar(SnackBar(
+          ScaffoldMessenger.of(context).showSnackBar(
-              content: Text('Registration successful! Please login.')));
+              SnackBar(content: Text('Registration successful! Please login.')));
         }
       }
     } catch (e) {
@@ -57,7 +58,7 @@ class _LoginPageState extends State<LoginPage> {
   }
 
   Future<String?> _login(String email, String password) async {
-    final url = Uri.parse('$apiurl/login');
+    final url = Uri.parse('$baseUrl/login');
     final response = await http.post(
       url,
       headers: {'Content-Type': 'application/json'},
@@ -72,9 +73,8 @@ class _LoginPageState extends State<LoginPage> {
     }
   }
 
-  Future<String?> _register(
+  Future<String?> _register(String email, String password, String displayName) async {
-      String email, String password, String displayName) async {
+    final url = Uri.parse('$baseUrl/register');
-    final url = Uri.parse('$apiurl/register');
     final response = await http.post(
       url,
       headers: {'Content-Type': 'application/json'},

lib/pages/views/creatematch.dart

@@ -2,7 +2,6 @@ import 'dart:convert';
 import 'package:flutter/material.dart';
 import 'package:http/http.dart' as http;
 import 'package:shared_preferences/shared_preferences.dart';
-import '../../globals.dart';
 
 class CreateMatchPage extends StatefulWidget {
   @override
@@ -13,8 +12,7 @@ class _CreateMatchPageState extends State<CreateMatchPage> {
   String? _matchId;
   bool _isLoading = false;
 
-  final String _createMatchApiUrl =
+  final String _createMatchApiUrl = 'http://api.dthpp.mercurio.moe/creatematch';  // Replace with your API endpoint
-      '$apiurl/creatematch'; // Replace with your API endpoint
 
   // Method to create a match
   Future<void> _createMatch() async {

lib/pages/views/friendlist.dart

@@ -2,7 +2,6 @@ import 'dart:convert';
 import 'package:flutter/material.dart';
 import 'package:http/http.dart' as http;
 import 'package:shared_preferences/shared_preferences.dart';
-import '../../globals.dart';
 
 class AddFriendPage extends StatefulWidget {
   @override
@@ -14,8 +13,8 @@ class _AddFriendPageState extends State<AddFriendPage> {
   List<dynamic> _friends = [];
   bool _isLoading = false;
 
-  final String _addFriendApiUrl = '$apiurl/add_friend';
+  final String _addFriendApiUrl = 'http://api.dthpp.mercurio.moe/add_friend';
-  final String _getFriendsApiUrl = '$apiurl/get_friends';
+  final String _getFriendsApiUrl = 'http://api.dthpp.mercurio.moe/get_friends';
 
   // Method to add a friend
   Future<void> _addFriend(String friendUid) async {

lib/pages/views/joinmatch.dart

@@ -2,7 +2,6 @@ import 'dart:convert';
 import 'package:flutter/material.dart';
 import 'package:http/http.dart' as http;
 import 'package:shared_preferences/shared_preferences.dart';
-import '../../globals.dart';
 
 class JoinMatchPage extends StatefulWidget {
   @override
@@ -17,9 +16,10 @@ class _JoinMatchPageState extends State<JoinMatchPage> {
   int _player2Score = 0;
   String? _matchId;
 
-  final String _joinMatchApiUrl = '$apiurl/joinmatch';
+  final String _joinMatchApiUrl = 'http://api.dthpp.mercurio.moe/joinmatch'; // Replace with your API endpoint
-  final String _endMatchApiUrl = '$apiurl/endmatch';
+  final String _endMatchApiUrl = 'http://api.dthpp.mercurio.moe/endmatch';   // Replace with your API endpoint
 
+  // Join Match Function
   Future<void> _joinMatch() async {
     setState(() {
       _isLoading = true;
@@ -64,6 +64,7 @@ class _JoinMatchPageState extends State<JoinMatchPage> {
     }
   }
 
+  // Increment/Decrement Player Scores
   void _updateScore(int player, int delta) {
     setState(() {
       if (player == 1) {
@@ -74,6 +75,7 @@ class _JoinMatchPageState extends State<JoinMatchPage> {
     });
   }
 
+  // End Match Function
   Future<void> _endMatch() async {
     setState(() {
       _isLoading = true;

lib/pages/views/leaderboard.dart

@@ -1,7 +1,6 @@
 import 'dart:convert';
 import 'package:flutter/material.dart';
 import 'package:http/http.dart' as http;
-import '../../globals.dart';
 
 class LeaderboardPage extends StatefulWidget {
   @override
@@ -12,7 +11,7 @@ class _LeaderboardPageState extends State<LeaderboardPage> {
   List<dynamic> _leaderboard = [];
   bool _isLoading = true;
 
-  final String _leaderboardApi = '$apiurl/leaderboards';
+  final String _apiUrl = 'http://api.dthpp.mercurio.moe/leaderboards';
 
   Future<void> _fetchLeaderboard() async {
     setState(() {
@@ -20,7 +19,7 @@ class _LeaderboardPageState extends State<LeaderboardPage> {
     });
 
     try {
-      final response = await http.get(Uri.parse(_leaderboardApi));
+      final response = await http.get(Uri.parse(_apiUrl));
 
       if (response.statusCode == 200) {
         List<dynamic> data = json.decode(response.body);

lib/pages/views/myprofile.dart

@@ -3,7 +3,6 @@ import 'dart:math';
 import 'package:flutter/material.dart';
 import 'package:http/http.dart' as http;
 import 'package:shared_preferences/shared_preferences.dart';
-import '../../globals.dart';
 
 class ProfilePage extends StatefulWidget {
   @override
@@ -17,7 +16,7 @@ class _ProfilePageState extends State<ProfilePage> {
   int? _elo;
   List<dynamic> _matches = [];
 
-  final String _getProfileApiUrl = '$apiurl/getprofile';
+  final String _getProfileApiUrl = 'http://api.dthpp.mercurio.moe/getprofile';
 
   @override
   void initState() {
@@ -145,8 +144,7 @@ class _ProfilePageState extends State<ProfilePage> {
                     child: Padding(
                       padding: const EdgeInsets.all(16.0),
                       child: Column(
-                                    crossAxisAlignment:
+                        crossAxisAlignment: CrossAxisAlignment.start,
-                                        CrossAxisAlignment.start,
                         children: [
                           Text(
                             'Match ID: ${match['match_id']}',
@@ -155,8 +153,7 @@ class _ProfilePageState extends State<ProfilePage> {
                               fontWeight: FontWeight.bold,
                             ),
                           ),
-                                      Text(
+                          Text('Opponent: ${match['opponent_name']}'),
-                                          'Opponent: ${match['opponent_name']}'),
                           Row(
                             children: [
                               Text(

pubspec.yaml

@@ -1,8 +1,8 @@
 name: pingpongapp
-description: "DTH Ping Pong Score tracking app"
+description: "A new Flutter project."
 publish_to: 'none'
 
-version: 0.0.34+1
+version: 0.0.32+1
 
 environment:
   sdk: '>=3.4.3 <4.0.0'