Merge pull request #1849 from get10101/chore/access-rust-api-from-webapp

feat: Add version endpoint

webapp/Cargo.toml

@@ -9,6 +9,8 @@ anyhow = "1"
 axum = { version = "0.7", features = ["tracing"] }
 mime_guess = "2.0.4"
 rust-embed = "8.2.0"
+serde = "1.0.147"
+serde_json = "1"
 tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
 tower = { version = "0.4", features = ["util"] }
 tower-http = { version = "0.5", features = ["fs", "trace"] }

webapp/frontend/lib/common/scaffold_with_nav.dart

@@ -1,5 +1,8 @@
 import 'package:flutter/material.dart';
+import 'package:get_10101/common/version_service.dart';
+
 import 'package:go_router/go_router.dart';
+import 'package:provider/provider.dart';
 
 class NavigationDestinations {
   const NavigationDestinations(this.label, this.icon, this.selectedIcon);
@@ -32,6 +35,8 @@ class _ScaffoldWithNestedNavigation extends State<ScaffoldWithNestedNavigation>
   late bool showNavigationDrawer;
   late bool showAsDrawer;
 
+  String version = "unknown";
+
   void _goBranch(int index) {
     widget.navigationShell.goBranch(
       index,
@@ -46,15 +51,23 @@ class _ScaffoldWithNestedNavigation extends State<ScaffoldWithNestedNavigation>
     showAsDrawer = MediaQuery.of(context).size.width >= 1024;
   }
 
+  @override
+  void initState() {
+    super.initState();
+    context.read<VersionService>().fetchVersion().then((v) => setState(() => version = v));
+  }
+
   @override
   Widget build(BuildContext context) {
     final navigationShell = widget.navigationShell;
+
     if (showNavigationDrawer) {
       return ScaffoldWithNavigationRail(
         body: navigationShell,
         selectedIndex: navigationShell.currentIndex,
         onDestinationSelected: _goBranch,
         showAsDrawer: showAsDrawer,
+        version: version,
       );
     } else {
       return ScaffoldWithNavigationBar(
@@ -102,12 +115,14 @@ class ScaffoldWithNavigationRail extends StatelessWidget {
     required this.selectedIndex,
     required this.onDestinationSelected,
     required this.showAsDrawer,
+    required this.version,
   });
 
   final Widget body;
   final int selectedIndex;
   final ValueChanged<int> onDestinationSelected;
   final bool showAsDrawer;
+  final String version;
 
   @override
   Widget build(BuildContext context) {
@@ -118,6 +133,12 @@ class ScaffoldWithNavigationRail extends StatelessWidget {
             extended: showAsDrawer,
             selectedIndex: selectedIndex,
             onDestinationSelected: onDestinationSelected,
+            trailing: Expanded(
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.end,
+                children: [Text("v$version"), const SizedBox(height: 50)],
+              ),
+            ),
             leading: showAsDrawer
                 ? Image.asset("assets/10101_flat_logo.png", width: 200, height: 50)
                 : Image.asset("assets/10101_logo_icon.png", width: 50, height: 50),

webapp/frontend/lib/common/version_service.dart

@@ -0,0 +1,36 @@
+import 'package:http/http.dart' as http;
+import 'dart:convert';
+
+class Version {
+  final String version;
+
+  const Version({required this.version});
+
+  factory Version.fromJson(Map<String, dynamic> json) {
+    return switch (json) {
+      {
+        'version': String version,
+      } =>
+        Version(version: version),
+      _ => throw const FormatException('Failed to load version.'),
+    };
+  }
+}
+
+class VersionService {
+  const VersionService();
+
+  Future<String> fetchVersion() async {
+    // TODO(holzeis): this should come from the config
+    const port = "3001";
+    const host = "localhost";
+
+    final response = await http.get(Uri.http('$host:$port', '/api/version'));
+
+    if (response.statusCode == 200) {
+      return Version.fromJson(jsonDecode(response.body) as Map<String, dynamic>).version;
+    } else {
+      return 'unknown';
+    }
+  }
+}

webapp/frontend/lib/main.dart

@@ -1,12 +1,16 @@
 import 'package:flutter/material.dart';
-import 'package:go_router/go_router.dart';
+import 'package:get_10101/common/version_service.dart';
 import 'package:get_10101/routes.dart';
+import 'package:provider/provider.dart';
 
 import 'common/color.dart';
 import 'common/theme.dart';
 
 void main() {
-  runApp(const TenTenOneApp());
+  var providers = [
+    Provider(create: (context) => const VersionService()),
+  ];
+  runApp(MultiProvider(providers: providers, child: const TenTenOneApp()));
 }
 
 class TenTenOneApp extends StatefulWidget {

webapp/frontend/lib/routes.dart

@@ -23,7 +23,6 @@ final goRouter = GoRouter(
                 pageBuilder: (context, state) => const NoTransitionPage(
                   child: TradeScreen(),
                 ),
-                routes: [],
               ),
             ],
           ),
@@ -35,7 +34,6 @@ final goRouter = GoRouter(
                 pageBuilder: (context, state) => const NoTransitionPage(
                   child: WalletScreen(),
                 ),
-                routes: [],
               ),
             ],
           ),
@@ -47,7 +45,6 @@ final goRouter = GoRouter(
                 pageBuilder: (context, state) => const NoTransitionPage(
                   child: SettingsScreen(),
                 ),
-                routes: [],
               ),
             ],
           )

webapp/frontend/pubspec.yaml

@@ -36,6 +36,8 @@ dependencies:
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.2
   go_router: ^9.0.0
+  provider: ^6.0.5
+  http: ^1.1.0
 
 dev_dependencies:
   flutter_test:

webapp/src/api.rs

@@ -0,0 +1,13 @@
+use axum::Json;
+use serde::Serialize;
+
+#[derive(Serialize)]
+pub struct Version {
+    version: String,
+}
+
+pub async fn version() -> Json<Version> {
+    Json(Version {
+        version: env!("CARGO_PKG_VERSION").to_string(),
+    })
+}

webapp/src/main.rs

@@ -1,3 +1,6 @@
+mod api;
+
+use crate::api::version;
 use anyhow::Result;
 use axum::http::header;
 use axum::http::Request;
@@ -36,6 +39,7 @@ async fn main() -> Result<()> {
 fn using_serve_dir() -> Router {
     Router::new()
         .route("/", get(index_handler))
+        .route("/api/version", get(version))
         .route("/main.dart.js", get(main_dart_handler))
         .route("/flutter.js", get(flutter_js))
         .route("/index.html", get(index_handler))