Mercury/dth-pingpong-mobileapp
1
0
Fork 0
Code Issues 4 Pull requests Actions Packages Projects 1 Releases 3 Wiki Activity

Add global page for api url

Browse source
This commit is contained in:
Mercurio 2024-12-23 21:48:34 +01:00
parent b7d48043df
commit b6f8a4b320
9 changed files with 245 additions and 237 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/globals.dart Normal file
View file

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

2
lib/main.dart
View file

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

18
lib/pages/login.dart
View file

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

4
lib/pages/views/creatematch.dart
View file

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

5
lib/pages/views/friendlist.dart
View file

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

8
lib/pages/views/joinmatch.dart
View file

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

5
lib/pages/views/leaderboard.dart
View file

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

9
lib/pages/views/myprofile.dart
View file

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

4
pubspec.yaml
View file

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