Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e9de38091e | ||
|
|
a582bbee29 | ||
|
|
30786f9706 | ||
|
|
fb4ab95f13 |
@@ -28,6 +28,7 @@ jobs:
|
||||
flutter create --platforms=android --org nfteam --project-name gamemanager .
|
||||
python3 tool/patch_android.py
|
||||
flutter pub get
|
||||
dart run flutter_launcher_icons
|
||||
flutter build apk --release --build-name="${NAME}" --build-number="${RUN}"
|
||||
cp build/app/outputs/flutter-apk/app-release.apk gamemanager.apk
|
||||
printf '{"version":"1.0.%s","version_code":%s,"notes":"Build CI #%s"}' "${RUN}" "${RUN}" "${RUN}" > version.json
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 20 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 22 KiB |
+2
-2
@@ -18,9 +18,9 @@ class GameManagerApp extends StatelessWidget {
|
||||
return MaterialApp(
|
||||
title: 'GameManager',
|
||||
debugShowCheckedModeBanner: false,
|
||||
theme: AppTheme.light(),
|
||||
theme: AppTheme.dark(),
|
||||
darkTheme: AppTheme.dark(),
|
||||
themeMode: ThemeMode.system,
|
||||
themeMode: ThemeMode.dark,
|
||||
home: AuthGate(auth: auth, api: api),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -17,6 +17,8 @@ class GameServer {
|
||||
final String? motd;
|
||||
final bool hasIcon;
|
||||
final bool hasImage;
|
||||
final bool custom;
|
||||
final String? bluemapUrl;
|
||||
|
||||
const GameServer({
|
||||
required this.id,
|
||||
@@ -34,6 +36,8 @@ class GameServer {
|
||||
this.motd,
|
||||
this.hasIcon = false,
|
||||
this.hasImage = false,
|
||||
this.custom = false,
|
||||
this.bluemapUrl,
|
||||
});
|
||||
|
||||
factory GameServer.fromJson(Map<String, dynamic> json) => GameServer(
|
||||
@@ -52,8 +56,12 @@ class GameServer {
|
||||
motd: json['motd'] as String?,
|
||||
hasIcon: json['has_icon'] as bool? ?? false,
|
||||
hasImage: json['has_image'] as bool? ?? false,
|
||||
custom: json['custom'] as bool? ?? false,
|
||||
bluemapUrl: json['bluemap_url'] as String?,
|
||||
);
|
||||
|
||||
bool get hasMap => (bluemapUrl ?? '').isNotEmpty;
|
||||
|
||||
bool get isUp => status == 'online' || status == 'running';
|
||||
bool get isBusy => status == 'starting' || status == 'partial';
|
||||
bool get isPreprod => env == 'preprod';
|
||||
@@ -84,3 +92,64 @@ class GameServer {
|
||||
_ => (label: 'Éteint', color: const Color(0xFF8E8E93)),
|
||||
};
|
||||
}
|
||||
|
||||
/// Conteneur Docker (pour lier un serveur depuis l'app).
|
||||
class DockerContainer {
|
||||
DockerContainer({required this.name, required this.image, required this.state});
|
||||
final String name;
|
||||
final String image;
|
||||
final String state;
|
||||
|
||||
factory DockerContainer.fromJson(Map<String, dynamic> j) => DockerContainer(
|
||||
name: j['name'] as String,
|
||||
image: (j['image'] as String?) ?? '',
|
||||
state: (j['state'] as String?) ?? '',
|
||||
);
|
||||
|
||||
bool get running => state == 'running';
|
||||
|
||||
/// Image sans le registre ni le digest, pour la lisibilité.
|
||||
/// ex: git.nfteam.ovh/neckfire/the-cycle:preprod → the-cycle:preprod
|
||||
String get prettyImage {
|
||||
var s = image.split('/').last;
|
||||
if (s.length > 34) s = '${s.substring(0, 33)}…';
|
||||
return s;
|
||||
}
|
||||
}
|
||||
|
||||
/// Infos « Se connecter » d'un serveur (API `/api/servers/{id}/connect`).
|
||||
class ConnectInfo {
|
||||
const ConnectInfo({
|
||||
this.address,
|
||||
this.mcVersion,
|
||||
this.loader,
|
||||
this.bluemapUrl,
|
||||
this.voiceChatPort,
|
||||
this.mrpackUrl,
|
||||
this.instructions,
|
||||
});
|
||||
|
||||
final String? address;
|
||||
final String? mcVersion;
|
||||
final String? loader;
|
||||
final String? bluemapUrl;
|
||||
final int? voiceChatPort;
|
||||
final String? mrpackUrl; // absolue (préfixée par la base API)
|
||||
final List<String>? instructions;
|
||||
|
||||
bool get hasPack => (mrpackUrl ?? '').isNotEmpty;
|
||||
|
||||
/// `base` = URL de l'API, pour rendre `mrpack_url` (relatif) absolu.
|
||||
factory ConnectInfo.fromJson(Map<String, dynamic> j, String base) {
|
||||
final rel = j['mrpack_url'] as String?;
|
||||
return ConnectInfo(
|
||||
address: j['address'] as String?,
|
||||
mcVersion: j['mc_version'] as String?,
|
||||
loader: j['loader'] as String?,
|
||||
bluemapUrl: j['bluemap_url'] as String?,
|
||||
voiceChatPort: (j['voice_chat_port'] as num?)?.toInt(),
|
||||
mrpackUrl: rel == null ? null : '$base$rel',
|
||||
instructions: (j['instructions'] as List?)?.map((e) => e.toString()).toList(),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,230 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import '../models.dart';
|
||||
import '../services/api_service.dart';
|
||||
|
||||
/// Formulaire d'ajout d'un serveur : infos + sélection du/des conteneur(s)
|
||||
/// Docker liés (liste lisible : nom + image courte + état).
|
||||
class AddServerScreen extends StatefulWidget {
|
||||
const AddServerScreen({super.key, required this.api});
|
||||
final ApiService api;
|
||||
|
||||
@override
|
||||
State<AddServerScreen> createState() => _AddServerScreenState();
|
||||
}
|
||||
|
||||
class _AddServerScreenState extends State<AddServerScreen> {
|
||||
final _name = TextEditingController();
|
||||
final _game = TextEditingController();
|
||||
final _subtitle = TextEditingController();
|
||||
final _connect = TextEditingController();
|
||||
final _openUrl = TextEditingController();
|
||||
final _minecraft = TextEditingController();
|
||||
final _search = TextEditingController();
|
||||
|
||||
String _env = 'prod';
|
||||
bool _web = false;
|
||||
bool _onDemand = false;
|
||||
final _selected = <String>{};
|
||||
|
||||
List<DockerContainer>? _containers;
|
||||
String? _error;
|
||||
bool _saving = false;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
_loadContainers();
|
||||
_search.addListener(() => setState(() {}));
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
for (final c in [_name, _game, _subtitle, _connect, _openUrl, _minecraft, _search]) {
|
||||
c.dispose();
|
||||
}
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
Future<void> _loadContainers() async {
|
||||
try {
|
||||
final list = await widget.api.containers();
|
||||
if (mounted) setState(() => _containers = list);
|
||||
} catch (e) {
|
||||
if (mounted) setState(() => _error = '$e');
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _save() async {
|
||||
if (_name.text.trim().isEmpty || _selected.isEmpty) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
const SnackBar(content: Text('Nom et au moins un conteneur requis.')),
|
||||
);
|
||||
return;
|
||||
}
|
||||
setState(() => _saving = true);
|
||||
try {
|
||||
await widget.api.createServer({
|
||||
'name': _name.text.trim(),
|
||||
'game': _game.text.trim(),
|
||||
'subtitle': _subtitle.text.trim(),
|
||||
'env': _env,
|
||||
'containers': _selected.toList(),
|
||||
'connect': _web ? _openUrl.text.trim() : _connect.text.trim(),
|
||||
'web': _web,
|
||||
'open_url': _web ? _openUrl.text.trim() : null,
|
||||
'minecraft': _minecraft.text.trim(),
|
||||
'on_demand': _onDemand,
|
||||
});
|
||||
if (mounted) Navigator.pop(context, true);
|
||||
} catch (e) {
|
||||
if (mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('$e')));
|
||||
setState(() => _saving = false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
appBar: AppBar(title: const Text('Nouveau serveur')),
|
||||
body: ListView(
|
||||
padding: const EdgeInsets.fromLTRB(16, 8, 16, 100),
|
||||
children: [
|
||||
TextField(
|
||||
controller: _name,
|
||||
textCapitalization: TextCapitalization.words,
|
||||
decoration: const InputDecoration(labelText: 'Nom *', hintText: 'ex: Valheim'),
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
TextField(
|
||||
controller: _game,
|
||||
decoration: const InputDecoration(labelText: 'Jeu', hintText: 'ex: Valheim'),
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
TextField(
|
||||
controller: _subtitle,
|
||||
decoration: const InputDecoration(labelText: 'Sous-titre', hintText: 'ex: serveur privé'),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
_envSelector(),
|
||||
const SizedBox(height: 16),
|
||||
SwitchListTile(
|
||||
contentPadding: EdgeInsets.zero,
|
||||
title: const Text('Jeu web (bouton « Ouvrir »)'),
|
||||
value: _web,
|
||||
onChanged: (v) => setState(() => _web = v),
|
||||
),
|
||||
if (_web)
|
||||
TextField(
|
||||
controller: _openUrl,
|
||||
keyboardType: TextInputType.url,
|
||||
decoration: const InputDecoration(labelText: 'URL du jeu', hintText: 'https://…'),
|
||||
)
|
||||
else ...[
|
||||
TextField(
|
||||
controller: _connect,
|
||||
decoration: const InputDecoration(labelText: 'Adresse de connexion', hintText: 'ex: jeu.nfteam.ovh'),
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
TextField(
|
||||
controller: _minecraft,
|
||||
decoration: const InputDecoration(
|
||||
labelText: 'Minecraft host:port (MOTD, optionnel)',
|
||||
hintText: 'ex: 192.168.1.136:25565',
|
||||
),
|
||||
),
|
||||
],
|
||||
SwitchListTile(
|
||||
contentPadding: EdgeInsets.zero,
|
||||
title: const Text('Serveur à la demande'),
|
||||
value: _onDemand,
|
||||
onChanged: (v) => setState(() => _onDemand = v),
|
||||
),
|
||||
const Divider(height: 28),
|
||||
Text('Conteneur(s) lié(s) *', style: Theme.of(context).textTheme.titleMedium),
|
||||
const SizedBox(height: 8),
|
||||
_containerPicker(),
|
||||
],
|
||||
),
|
||||
floatingActionButton: FloatingActionButton.extended(
|
||||
onPressed: _saving ? null : _save,
|
||||
icon: _saving
|
||||
? const SizedBox(width: 18, height: 18, child: CircularProgressIndicator(strokeWidth: 2))
|
||||
: const Icon(Icons.check),
|
||||
label: const Text('Créer'),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _envSelector() {
|
||||
return SegmentedButton<String>(
|
||||
segments: const [
|
||||
ButtonSegment(value: 'prod', label: Text('Production'), icon: Icon(Icons.public)),
|
||||
ButtonSegment(value: 'preprod', label: Text('Preprod'), icon: Icon(Icons.science_outlined)),
|
||||
],
|
||||
selected: {_env},
|
||||
onSelectionChanged: (s) => setState(() => _env = s.first),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _containerPicker() {
|
||||
if (_error != null) {
|
||||
return Text('Impossible de charger les conteneurs.\n$_error');
|
||||
}
|
||||
if (_containers == null) {
|
||||
return const Padding(padding: EdgeInsets.all(20), child: Center(child: CircularProgressIndicator()));
|
||||
}
|
||||
final q = _search.text.toLowerCase();
|
||||
final list = _containers!
|
||||
.where((c) => q.isEmpty || c.name.toLowerCase().contains(q) || c.image.toLowerCase().contains(q))
|
||||
.toList();
|
||||
return Column(
|
||||
children: [
|
||||
TextField(
|
||||
controller: _search,
|
||||
decoration: const InputDecoration(
|
||||
prefixIcon: Icon(Icons.search),
|
||||
hintText: 'Filtrer les conteneurs…',
|
||||
isDense: true,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
if (_selected.isNotEmpty)
|
||||
Align(
|
||||
alignment: Alignment.centerLeft,
|
||||
child: Text('${_selected.length} sélectionné(s)',
|
||||
style: Theme.of(context).textTheme.labelMedium),
|
||||
),
|
||||
Card(
|
||||
child: Column(
|
||||
children: [
|
||||
for (final c in list)
|
||||
CheckboxListTile(
|
||||
dense: true,
|
||||
value: _selected.contains(c.name),
|
||||
onChanged: (v) => setState(() {
|
||||
v == true ? _selected.add(c.name) : _selected.remove(c.name);
|
||||
}),
|
||||
title: Text(c.name, style: const TextStyle(fontWeight: FontWeight.w600)),
|
||||
subtitle: Text(c.prettyImage,
|
||||
maxLines: 1, overflow: TextOverflow.ellipsis,
|
||||
style: const TextStyle(fontFamily: 'monospace', fontSize: 11)),
|
||||
secondary: Container(
|
||||
width: 10, height: 10,
|
||||
decoration: BoxDecoration(
|
||||
shape: BoxShape.circle,
|
||||
color: c.running ? const Color(0xFF34C759) : const Color(0xFF8E8E93),
|
||||
),
|
||||
),
|
||||
),
|
||||
if (list.isEmpty)
|
||||
const Padding(padding: EdgeInsets.all(16), child: Text('Aucun conteneur.')),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -6,6 +6,8 @@ import 'package:url_launcher/url_launcher.dart';
|
||||
|
||||
import '../models.dart';
|
||||
import '../services/api_service.dart';
|
||||
import '../widgets/connect_card.dart';
|
||||
import '../widgets/server_map_card.dart';
|
||||
|
||||
/// Détail d'un serveur : bannière (image importée ou thème), statut, connexion,
|
||||
/// stats d'utilisation (CPU/RAM/réseau) et gestion de l'image (import/suppression).
|
||||
@@ -24,6 +26,8 @@ class _ServerDetailScreenState extends State<ServerDetailScreen> {
|
||||
|
||||
Map<String, dynamic>? _stats;
|
||||
Uint8List? _image;
|
||||
ConnectInfo? _connect;
|
||||
bool _connectLoading = true;
|
||||
bool _busy = false;
|
||||
bool _imgBusy = false;
|
||||
|
||||
@@ -38,12 +42,15 @@ class _ServerDetailScreenState extends State<ServerDetailScreen> {
|
||||
widget.api.stats(s.id).catchError((_) => <String, dynamic>{'running': false}),
|
||||
widget.api.imageBytes(s.id).catchError((_) => null),
|
||||
widget.api.server(s.id).catchError((_) => _server),
|
||||
widget.api.connectInfo(s.id).then<ConnectInfo?>((c) => c).catchError((_) => null),
|
||||
]);
|
||||
if (!mounted) return;
|
||||
setState(() {
|
||||
_stats = results[0] as Map<String, dynamic>;
|
||||
_image = results[1] as Uint8List?;
|
||||
_server = results[2] as GameServer;
|
||||
_connect = results[3] as ConnectInfo?;
|
||||
_connectLoading = false;
|
||||
});
|
||||
}
|
||||
|
||||
@@ -87,6 +94,27 @@ class _ServerDetailScreenState extends State<ServerDetailScreen> {
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _confirmDelete() async {
|
||||
final ok = await showDialog<bool>(
|
||||
context: context,
|
||||
builder: (ctx) => AlertDialog(
|
||||
title: const Text('Supprimer ce serveur ?'),
|
||||
content: Text('« ${s.name} » sera retiré de l\'app (le conteneur Docker n\'est pas touché).'),
|
||||
actions: [
|
||||
TextButton(onPressed: () => Navigator.pop(ctx, false), child: const Text('Annuler')),
|
||||
FilledButton(onPressed: () => Navigator.pop(ctx, true), child: const Text('Supprimer')),
|
||||
],
|
||||
),
|
||||
);
|
||||
if (ok != true) return;
|
||||
try {
|
||||
await widget.api.deleteServer(s.id);
|
||||
if (mounted) Navigator.pop(context);
|
||||
} catch (e) {
|
||||
_snack('$e');
|
||||
}
|
||||
}
|
||||
|
||||
void _snack(String m) {
|
||||
if (mounted) ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(m)));
|
||||
}
|
||||
@@ -96,7 +124,17 @@ class _ServerDetailScreenState extends State<ServerDetailScreen> {
|
||||
final t = s.theme;
|
||||
final badge = s.statusBadge;
|
||||
return Scaffold(
|
||||
appBar: AppBar(title: Text(s.name)),
|
||||
appBar: AppBar(
|
||||
title: Text(s.name),
|
||||
actions: [
|
||||
if (s.custom)
|
||||
IconButton(
|
||||
tooltip: 'Supprimer',
|
||||
icon: const Icon(Icons.delete_outline),
|
||||
onPressed: _confirmDelete,
|
||||
),
|
||||
],
|
||||
),
|
||||
body: RefreshIndicator(
|
||||
onRefresh: _load,
|
||||
child: ListView(
|
||||
@@ -126,10 +164,15 @@ class _ServerDetailScreenState extends State<ServerDetailScreen> {
|
||||
const SizedBox(height: 16),
|
||||
_toggleButton(),
|
||||
const SizedBox(height: 20),
|
||||
if (s.connect != null) _info(Icons.link, 'Connexion', s.connect!),
|
||||
if (s.status == 'online')
|
||||
_info(Icons.people, 'Joueurs', '${s.players ?? 0} / ${s.maxPlayers ?? 0}'),
|
||||
if (s.motd != null) _info(Icons.chat_bubble_outline, 'MOTD', s.motd!),
|
||||
if (s.hasMap) ...[
|
||||
const SizedBox(height: 8),
|
||||
ServerMapCard(url: s.bluemapUrl!, serverUp: s.isUp),
|
||||
const SizedBox(height: 16),
|
||||
],
|
||||
ConnectCard(info: _connect, loading: _connectLoading),
|
||||
const SizedBox(height: 20),
|
||||
_statsCard(),
|
||||
const SizedBox(height: 20),
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
import 'dart:typed_data';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import '../models.dart';
|
||||
@@ -5,6 +7,7 @@ import '../services/api_service.dart';
|
||||
import '../services/auth_service.dart';
|
||||
import '../services/update_service.dart';
|
||||
import '../widgets/server_card.dart';
|
||||
import 'add_server_screen.dart';
|
||||
import 'server_detail_screen.dart';
|
||||
import 'settings_screen.dart';
|
||||
|
||||
@@ -27,6 +30,15 @@ class _ServersScreenState extends State<ServersScreen> {
|
||||
List<GameServer>? _servers;
|
||||
String? _error;
|
||||
final _busy = <String>{};
|
||||
final _imgCache = <String, Uint8List?>{};
|
||||
|
||||
Future<Uint8List?> _image(GameServer s) async {
|
||||
if (!s.hasImage) return null;
|
||||
if (_imgCache.containsKey(s.id)) return _imgCache[s.id];
|
||||
final b = await widget.api.imageBytes(s.id).catchError((_) => null);
|
||||
_imgCache[s.id] = b;
|
||||
return b;
|
||||
}
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
@@ -41,6 +53,7 @@ class _ServersScreenState extends State<ServersScreen> {
|
||||
if (mounted) setState(() {
|
||||
_servers = servers;
|
||||
_error = null;
|
||||
_imgCache.clear(); // recharge les images (elles ont pu changer)
|
||||
});
|
||||
} on UnauthorizedException {
|
||||
await widget.auth.logout();
|
||||
@@ -147,10 +160,21 @@ class _ServersScreenState extends State<ServersScreen> {
|
||||
),
|
||||
),
|
||||
body: _buildBody(),
|
||||
floatingActionButton: FloatingActionButton.extended(
|
||||
onPressed: _openAdd,
|
||||
icon: const Icon(Icons.add),
|
||||
label: const Text('Ajouter'),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> _openAdd() async {
|
||||
final added = await Navigator.push<bool>(context,
|
||||
MaterialPageRoute(builder: (_) => AddServerScreen(api: widget.api)));
|
||||
if (added == true) _refresh();
|
||||
}
|
||||
|
||||
Widget _buildBody() {
|
||||
if (_error != null && _servers == null) {
|
||||
return ListView(children: [
|
||||
@@ -191,11 +215,12 @@ class _ServersScreenState extends State<ServersScreen> {
|
||||
|
||||
Widget _card(GameServer s) => Padding(
|
||||
padding: const EdgeInsets.only(bottom: 14),
|
||||
child: FutureBuilder<String>(
|
||||
future: widget.api.iconUrl(s.id),
|
||||
child: FutureBuilder<Uint8List?>(
|
||||
future: _image(s),
|
||||
builder: (_, snap) => ServerCard(
|
||||
server: s,
|
||||
iconUrl: snap.data ?? '',
|
||||
iconUrl: '',
|
||||
imageBytes: snap.data,
|
||||
busy: _busy.contains(s.id),
|
||||
onToggle: () => _toggle(s),
|
||||
onTap: () => _openDetail(s),
|
||||
|
||||
@@ -45,6 +45,56 @@ class ApiService {
|
||||
return GameServer.fromJson(jsonDecode(res.body) as Map<String, dynamic>);
|
||||
}
|
||||
|
||||
/// Bloc « Se connecter » (adresse, version, vocal, carte, lien modpack).
|
||||
Future<ConnectInfo> connectInfo(String id) async {
|
||||
final base = await baseUrl;
|
||||
final res = await http.get(Uri.parse('$base/api/servers/$id/connect'), headers: await _headers());
|
||||
if (res.statusCode == 401) throw UnauthorizedException();
|
||||
if (res.statusCode != 200) throw ApiException('Erreur ${res.statusCode}');
|
||||
return ConnectInfo.fromJson(jsonDecode(res.body) as Map<String, dynamic>, base);
|
||||
}
|
||||
|
||||
Future<List<DockerContainer>> containers() async {
|
||||
final base = await baseUrl;
|
||||
final res = await http.get(Uri.parse('$base/api/containers'), headers: await _headers());
|
||||
if (res.statusCode == 401) throw UnauthorizedException();
|
||||
if (res.statusCode != 200) throw ApiException('Erreur ${res.statusCode}');
|
||||
return (jsonDecode(res.body) as List)
|
||||
.map((e) => DockerContainer.fromJson(e as Map<String, dynamic>))
|
||||
.toList();
|
||||
}
|
||||
|
||||
Future<GameServer> createServer(Map<String, dynamic> payload) async {
|
||||
final base = await baseUrl;
|
||||
final res = await http.post(
|
||||
Uri.parse('$base/api/servers'),
|
||||
headers: {...await _headers(), 'Content-Type': 'application/json'},
|
||||
body: jsonEncode(payload),
|
||||
);
|
||||
if (res.statusCode == 401) throw UnauthorizedException();
|
||||
if (res.statusCode >= 400) {
|
||||
throw ApiException(_msg(res.body) ?? 'Création refusée (${res.statusCode})');
|
||||
}
|
||||
return GameServer.fromJson(jsonDecode(res.body) as Map<String, dynamic>);
|
||||
}
|
||||
|
||||
Future<void> deleteServer(String id) async {
|
||||
final base = await baseUrl;
|
||||
final res = await http.delete(Uri.parse('$base/api/servers/$id'), headers: await _headers());
|
||||
if (res.statusCode == 401) throw UnauthorizedException();
|
||||
if (res.statusCode >= 400) {
|
||||
throw ApiException(_msg(res.body) ?? 'Suppression refusée (${res.statusCode})');
|
||||
}
|
||||
}
|
||||
|
||||
String? _msg(String body) {
|
||||
try {
|
||||
return (jsonDecode(body) as Map<String, dynamic>)['detail'] as String?;
|
||||
} catch (_) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> start(String id) => _action(id, 'start');
|
||||
Future<void> stop(String id) => _action(id, 'stop');
|
||||
|
||||
|
||||
+97
-11
@@ -1,42 +1,128 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
/// Thèmes Material 3 (clair + sombre) avec un accent unifié.
|
||||
/// Thème « flamme / chaud sombre » — anthracite + accents orange→rouge.
|
||||
/// Remplace la palette Material par défaut (violet/teal).
|
||||
class AppTheme {
|
||||
static const _seed = Color(0xFF5E5CE6);
|
||||
// Palette
|
||||
static const bg = Color(0xFF14110F); // fond anthracite
|
||||
static const surface1 = Color(0xFF1F1B18); // cartes / champs
|
||||
static const surface2 = Color(0xFF262119); // éléments surélevés
|
||||
static const flame = Color(0xFFFF7A18); // orange accent
|
||||
static const ember = Color(0xFFFF3D00); // rouge braise
|
||||
static const ink = Color(0xFFF5EFE9); // texte principal
|
||||
static const inkMuted = Color(0xFFA89F97); // texte secondaire
|
||||
|
||||
static ThemeData light() => _base(Brightness.light);
|
||||
static ThemeData dark() => _base(Brightness.dark);
|
||||
static ThemeData light() => dark(); // app pensée sombre → même thème
|
||||
static ThemeData dark() {
|
||||
const scheme = ColorScheme(
|
||||
brightness: Brightness.dark,
|
||||
primary: flame,
|
||||
onPrimary: Color(0xFF230F00),
|
||||
primaryContainer: Color(0xFF3A2410),
|
||||
onPrimaryContainer: Color(0xFFFFD9B8),
|
||||
secondary: ember,
|
||||
onSecondary: Colors.white,
|
||||
secondaryContainer: Color(0xFF4A1A0A),
|
||||
onSecondaryContainer: Color(0xFFFFD5C8),
|
||||
tertiary: Color(0xFFFFB74D),
|
||||
onTertiary: Color(0xFF241400),
|
||||
error: Color(0xFFFF6B5E),
|
||||
onError: Color(0xFF3A0A05),
|
||||
surface: bg,
|
||||
onSurface: ink,
|
||||
surfaceContainerLowest: Color(0xFF0F0D0B),
|
||||
surfaceContainerLow: surface1,
|
||||
surfaceContainer: surface1,
|
||||
surfaceContainerHigh: surface2,
|
||||
surfaceContainerHighest: Color(0xFF2E2820),
|
||||
onSurfaceVariant: inkMuted,
|
||||
outline: Color(0xFF4A433D),
|
||||
outlineVariant: Color(0xFF332E29),
|
||||
inverseSurface: ink,
|
||||
onInverseSurface: bg,
|
||||
shadow: Colors.black,
|
||||
scrim: Colors.black,
|
||||
);
|
||||
|
||||
static ThemeData _base(Brightness brightness) {
|
||||
final scheme = ColorScheme.fromSeed(seedColor: _seed, brightness: brightness);
|
||||
return ThemeData(
|
||||
useMaterial3: true,
|
||||
colorScheme: scheme,
|
||||
scaffoldBackgroundColor: scheme.surface,
|
||||
appBarTheme: AppBarTheme(
|
||||
backgroundColor: scheme.surface,
|
||||
foregroundColor: scheme.onSurface,
|
||||
scaffoldBackgroundColor: bg,
|
||||
canvasColor: bg,
|
||||
appBarTheme: const AppBarTheme(
|
||||
backgroundColor: bg,
|
||||
foregroundColor: ink,
|
||||
centerTitle: false,
|
||||
elevation: 0,
|
||||
scrolledUnderElevation: 0,
|
||||
titleTextStyle: TextStyle(
|
||||
color: scheme.onSurface,
|
||||
color: ink,
|
||||
fontSize: 24,
|
||||
fontWeight: FontWeight.w800,
|
||||
letterSpacing: -0.5,
|
||||
),
|
||||
),
|
||||
cardTheme: CardTheme(
|
||||
color: surface1,
|
||||
clipBehavior: Clip.antiAlias,
|
||||
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(22)),
|
||||
elevation: 0,
|
||||
),
|
||||
tabBarTheme: const TabBarTheme(
|
||||
labelColor: flame,
|
||||
unselectedLabelColor: inkMuted,
|
||||
indicatorColor: flame,
|
||||
dividerColor: Colors.transparent,
|
||||
labelStyle: TextStyle(fontWeight: FontWeight.w700),
|
||||
),
|
||||
filledButtonTheme: FilledButtonThemeData(
|
||||
style: FilledButton.styleFrom(
|
||||
backgroundColor: flame,
|
||||
foregroundColor: const Color(0xFF230F00),
|
||||
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
|
||||
padding: const EdgeInsets.symmetric(horizontal: 22, vertical: 14),
|
||||
textStyle: const TextStyle(fontWeight: FontWeight.w700, fontSize: 15),
|
||||
),
|
||||
),
|
||||
outlinedButtonTheme: OutlinedButtonThemeData(
|
||||
style: OutlinedButton.styleFrom(
|
||||
foregroundColor: ink,
|
||||
side: const BorderSide(color: Color(0xFF4A433D)),
|
||||
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
|
||||
),
|
||||
),
|
||||
floatingActionButtonTheme: const FloatingActionButtonThemeData(
|
||||
backgroundColor: flame,
|
||||
foregroundColor: Color(0xFF230F00),
|
||||
),
|
||||
inputDecorationTheme: InputDecorationTheme(
|
||||
filled: true,
|
||||
fillColor: surface1,
|
||||
border: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(14),
|
||||
borderSide: BorderSide.none,
|
||||
),
|
||||
enabledBorder: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(14),
|
||||
borderSide: const BorderSide(color: Color(0xFF332E29)),
|
||||
),
|
||||
focusedBorder: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(14),
|
||||
borderSide: const BorderSide(color: flame, width: 2),
|
||||
),
|
||||
labelStyle: const TextStyle(color: inkMuted),
|
||||
),
|
||||
progressIndicatorTheme: const ProgressIndicatorThemeData(
|
||||
color: flame,
|
||||
linearTrackColor: Color(0xFF332E29),
|
||||
),
|
||||
dividerTheme: const DividerThemeData(color: Color(0xFF332E29)),
|
||||
snackBarTheme: const SnackBarThemeData(
|
||||
backgroundColor: surface2,
|
||||
contentTextStyle: TextStyle(color: ink),
|
||||
),
|
||||
dialogTheme: const DialogTheme(backgroundColor: surface1),
|
||||
chipTheme: const ChipThemeData(backgroundColor: surface2),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,135 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:url_launcher/url_launcher.dart';
|
||||
|
||||
import '../models.dart';
|
||||
|
||||
/// Carte « Se connecter » : adresse, version/loader, chat vocal, et lien du
|
||||
/// modpack (.mrpack) pour les joueurs PC.
|
||||
class ConnectCard extends StatelessWidget {
|
||||
const ConnectCard({super.key, required this.info, required this.loading});
|
||||
|
||||
final ConnectInfo? info;
|
||||
final bool loading;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final i = info;
|
||||
return Card(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(16),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Row(
|
||||
children: [
|
||||
Icon(Icons.sports_esports_outlined, size: 20,
|
||||
color: Theme.of(context).colorScheme.primary),
|
||||
const SizedBox(width: 8),
|
||||
Text('Se connecter', style: Theme.of(context).textTheme.titleMedium),
|
||||
],
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
if (loading && i == null)
|
||||
const Center(child: Padding(padding: EdgeInsets.all(8), child: CircularProgressIndicator()))
|
||||
else if (i == null)
|
||||
const Text('Infos de connexion indisponibles.')
|
||||
else ...[
|
||||
if ((i.address ?? '').isNotEmpty)
|
||||
_Row(
|
||||
icon: Icons.dns_outlined,
|
||||
label: 'Adresse',
|
||||
value: i.address!,
|
||||
onCopy: () => _copy(context, i.address!, 'Adresse copiée'),
|
||||
),
|
||||
if ((i.mcVersion ?? '').isNotEmpty)
|
||||
_Row(
|
||||
icon: Icons.layers_outlined,
|
||||
label: 'Version',
|
||||
value: '${i.mcVersion}${(i.loader ?? '').isNotEmpty ? ' · ${i.loader}' : ''}',
|
||||
),
|
||||
if (i.voiceChatPort != null)
|
||||
_Row(
|
||||
icon: Icons.mic_outlined,
|
||||
label: 'Chat vocal',
|
||||
value: 'Simple Voice Chat (UDP ${i.voiceChatPort})',
|
||||
),
|
||||
if (i.hasPack) ...[
|
||||
const SizedBox(height: 4),
|
||||
Row(
|
||||
children: [
|
||||
Expanded(
|
||||
child: FilledButton.tonalIcon(
|
||||
onPressed: () => launchUrl(Uri.parse(i.mrpackUrl!),
|
||||
mode: LaunchMode.externalApplication),
|
||||
icon: const Icon(Icons.download, size: 18),
|
||||
label: const Text('Modpack (.mrpack)'),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
OutlinedButton.icon(
|
||||
onPressed: () => _copy(context, i.mrpackUrl!, 'Lien du modpack copié'),
|
||||
icon: const Icon(Icons.copy, size: 18),
|
||||
label: const Text('Copier'),
|
||||
),
|
||||
],
|
||||
),
|
||||
if (i.instructions != null && i.instructions!.isNotEmpty) ...[
|
||||
const SizedBox(height: 10),
|
||||
for (final step in i.instructions!)
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(bottom: 4),
|
||||
child: Text('• $step', style: Theme.of(context).textTheme.bodySmall),
|
||||
),
|
||||
],
|
||||
],
|
||||
],
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
void _copy(BuildContext context, String text, String msg) {
|
||||
Clipboard.setData(ClipboardData(text: text));
|
||||
ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(msg)));
|
||||
}
|
||||
}
|
||||
|
||||
class _Row extends StatelessWidget {
|
||||
const _Row({required this.icon, required this.label, required this.value, this.onCopy});
|
||||
|
||||
final IconData icon;
|
||||
final String label;
|
||||
final String value;
|
||||
final VoidCallback? onCopy;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Padding(
|
||||
padding: const EdgeInsets.only(bottom: 12),
|
||||
child: Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Icon(icon, size: 20, color: Theme.of(context).colorScheme.primary),
|
||||
const SizedBox(width: 12),
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(label, style: Theme.of(context).textTheme.labelMedium),
|
||||
Text(value, style: Theme.of(context).textTheme.bodyLarge),
|
||||
],
|
||||
),
|
||||
),
|
||||
if (onCopy != null)
|
||||
IconButton(
|
||||
tooltip: 'Copier',
|
||||
icon: const Icon(Icons.copy, size: 18),
|
||||
onPressed: onCopy,
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -1,3 +1,5 @@
|
||||
import 'dart:typed_data';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:url_launcher/url_launcher.dart';
|
||||
|
||||
@@ -11,6 +13,7 @@ class ServerCard extends StatelessWidget {
|
||||
required this.busy,
|
||||
required this.onToggle,
|
||||
this.onTap,
|
||||
this.imageBytes,
|
||||
});
|
||||
|
||||
final GameServer server;
|
||||
@@ -18,31 +21,49 @@ class ServerCard extends StatelessWidget {
|
||||
final bool busy;
|
||||
final VoidCallback onToggle;
|
||||
final VoidCallback? onTap;
|
||||
final Uint8List? imageBytes;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final t = server.theme;
|
||||
final badge = server.statusBadge;
|
||||
final hasImg = imageBytes != null;
|
||||
return Card(
|
||||
clipBehavior: Clip.antiAlias,
|
||||
child: InkWell(
|
||||
onTap: onTap,
|
||||
child: Ink(
|
||||
decoration: hasImg
|
||||
? BoxDecoration(
|
||||
image: DecorationImage(image: MemoryImage(imageBytes!), fit: BoxFit.cover),
|
||||
)
|
||||
: BoxDecoration(
|
||||
gradient: LinearGradient(
|
||||
begin: Alignment.topLeft,
|
||||
end: Alignment.bottomRight,
|
||||
colors: [t.start, t.end],
|
||||
),
|
||||
),
|
||||
child: Container(
|
||||
decoration: BoxDecoration(
|
||||
gradient: LinearGradient(
|
||||
begin: Alignment.topLeft,
|
||||
end: Alignment.bottomRight,
|
||||
colors: [t.start, t.end],
|
||||
),
|
||||
),
|
||||
decoration: hasImg
|
||||
? const BoxDecoration(
|
||||
gradient: LinearGradient(
|
||||
begin: Alignment.topCenter,
|
||||
end: Alignment.bottomCenter,
|
||||
colors: [Color(0x66000000), Color(0xCC000000)],
|
||||
),
|
||||
)
|
||||
: null,
|
||||
padding: const EdgeInsets.all(18),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Row(
|
||||
children: [
|
||||
_Icon(server: server, iconUrl: iconUrl, fallback: t.icon),
|
||||
const SizedBox(width: 14),
|
||||
if (!hasImg) ...[
|
||||
_Icon(server: server, iconUrl: iconUrl, fallback: t.icon),
|
||||
const SizedBox(width: 14),
|
||||
],
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
@@ -107,6 +128,7 @@ class ServerCard extends StatelessWidget {
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -124,7 +146,7 @@ class _Icon extends StatelessWidget {
|
||||
child: SizedBox(
|
||||
width: 52,
|
||||
height: 52,
|
||||
child: (server.hasIcon)
|
||||
child: (server.hasIcon && iconUrl.isNotEmpty)
|
||||
? Image.network(iconUrl,
|
||||
fit: BoxFit.cover,
|
||||
errorBuilder: (_, __, ___) => _fallbackBox())
|
||||
|
||||
@@ -0,0 +1,97 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:url_launcher/url_launcher.dart';
|
||||
import 'package:webview_flutter/webview_flutter.dart';
|
||||
|
||||
/// Carte BlueMap (vue web du monde) intégrée dans le détail d'un serveur.
|
||||
/// Ne charge la WebView que si le serveur tourne : BlueMap n'est servi
|
||||
/// que conteneur allumé.
|
||||
class ServerMapCard extends StatefulWidget {
|
||||
const ServerMapCard({super.key, required this.url, required this.serverUp});
|
||||
|
||||
final String url;
|
||||
final bool serverUp;
|
||||
|
||||
@override
|
||||
State<ServerMapCard> createState() => _ServerMapCardState();
|
||||
}
|
||||
|
||||
class _ServerMapCardState extends State<ServerMapCard> {
|
||||
WebViewController? _controller;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
if (widget.serverUp) _initController();
|
||||
}
|
||||
|
||||
@override
|
||||
void didUpdateWidget(ServerMapCard old) {
|
||||
super.didUpdateWidget(old);
|
||||
if (widget.serverUp && _controller == null) _initController();
|
||||
}
|
||||
|
||||
void _initController() {
|
||||
_controller = WebViewController()
|
||||
..setJavaScriptMode(JavaScriptMode.unrestricted)
|
||||
..setBackgroundColor(const Color(0xFF14151B))
|
||||
..loadRequest(Uri.parse(widget.url));
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Card(
|
||||
clipBehavior: Clip.antiAlias,
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Padding(
|
||||
padding: const EdgeInsets.fromLTRB(16, 16, 8, 8),
|
||||
child: Row(
|
||||
children: [
|
||||
Icon(Icons.map_outlined, size: 20, color: Theme.of(context).colorScheme.primary),
|
||||
const SizedBox(width: 8),
|
||||
Text('Carte', style: Theme.of(context).textTheme.titleMedium),
|
||||
const Spacer(),
|
||||
IconButton(
|
||||
tooltip: 'Ouvrir en plein écran',
|
||||
icon: const Icon(Icons.open_in_new, size: 20),
|
||||
onPressed: () =>
|
||||
launchUrl(Uri.parse(widget.url), mode: LaunchMode.externalApplication),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
SizedBox(height: 300, child: _body()),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _body() {
|
||||
if (!widget.serverUp || _controller == null) {
|
||||
return const _MapEmpty();
|
||||
}
|
||||
return WebViewWidget(controller: _controller!);
|
||||
}
|
||||
}
|
||||
|
||||
class _MapEmpty extends StatelessWidget {
|
||||
const _MapEmpty();
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Container(
|
||||
color: const Color(0xFF14151B),
|
||||
alignment: Alignment.center,
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
const Icon(Icons.map_outlined, size: 44, color: Colors.white24),
|
||||
const SizedBox(height: 10),
|
||||
Text('Serveur éteint — démarre-le pour voir la carte',
|
||||
style: Theme.of(context).textTheme.bodyMedium?.copyWith(color: Colors.white54)),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -16,6 +16,7 @@ dependencies:
|
||||
shared_preferences: ^2.3.2
|
||||
package_info_plus: ^8.1.1
|
||||
url_launcher: ^6.3.1
|
||||
webview_flutter: ^4.10.0
|
||||
path_provider: ^2.1.4
|
||||
open_filex: ^4.5.0
|
||||
image_picker: ^1.1.2
|
||||
@@ -23,6 +24,17 @@ dependencies:
|
||||
|
||||
dev_dependencies:
|
||||
flutter_lints: ^5.0.0
|
||||
flutter_launcher_icons: ^0.14.1
|
||||
|
||||
# Icône de lanceur (générée en CI par flutter_launcher_icons après `flutter create`).
|
||||
# Manette blanche sur fond indigo ; adaptatif Android 8+ + PNG legacy.
|
||||
flutter_launcher_icons:
|
||||
android: true
|
||||
ios: false
|
||||
image_path: "assets/brand/gm-legacy.png"
|
||||
adaptive_icon_background: "#4F46E5"
|
||||
adaptive_icon_foreground: "assets/brand/gm-foreground.png"
|
||||
min_sdk_android: 21
|
||||
|
||||
flutter:
|
||||
uses-material-design: true
|
||||
|
||||
Reference in New Issue
Block a user