make carousel more stable

add logo to login page
add refresh token support
2026-01-23 18:24:34 +00:00 · 2026-01-23 18:04:40 +00:00 · 2026-01-23 17:55:55 +00:00
9 changed files with 453 additions and 168 deletions
--- a/assets/logos/pg_logo_v2.svg
+++ b/assets/logos/pg_logo_v2.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="120"
+   height="120"
+   viewBox="0 0 120 120"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <g
+     id="layer1">
+    <path
+       style="fill:#00b7fd;stroke-width:4.40315"
+       d="M 42.563242,0 H 92.5 A 27.5,27.5 45 0 1 120,27.5 27.5,27.5 135 0 1 92.5,55 h -50 A 2.5,2.5 45 0 1 40,52.5 v -10 A 2.5,2.5 135 0 1 42.5,40 h 50 A 12.5,12.5 135 0 0 105,27.5 12.5,12.5 45 0 0 92.5,15 l -50,0 A 27.5,27.5 135 0 0 15,42.5 v 50 A 2.5,2.5 135 0 1 12.5,95 H 2.5 A 2.5,2.5 45 0 1 0,92.5 V 42.563242 A 42.563242,42.563242 135 0 1 42.563242,0 Z"
+       id="path1"
+       transform="translate(0,12.5)" />
+    <path
+       style="fill:#999999;stroke-width:4.40315"
+       d="m 42.5,60 h 60 A 17.5,17.5 45 0 1 120,77.5 17.5,17.5 135 0 1 102.5,95 h -60 A 22.5,22.5 45 0 1 20,72.5 v -30 A 22.5,22.5 135 0 1 42.5,20 h 50 a 7.5,7.5 45 0 1 7.5,7.5 7.5,7.5 135 0 1 -7.5,7.5 h -50 A 7.5,7.5 135 0 0 35,42.5 v 30 a 7.5,7.5 45 0 0 7.5,7.5 h 60 A 2.5,2.5 135 0 0 105,77.5 2.5,2.5 45 0 0 102.5,75 h -60 A 2.5,2.5 45 0 1 40,72.5 v -10 A 2.5,2.5 135 0 1 42.5,60 Z"
+       id="path2"
+       transform="translate(0,12.5)" />
+  </g>
+</svg>
--- a/lib/components/login/login.dart
+++ b/lib/components/login/login.dart
@@ -1,4 +1,6 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_svg/flutter_svg.dart';
 import 'package:go_router/go_router.dart';
 import 'package:mileograph_flutter/services/authservice.dart';
 import 'package:mileograph_flutter/components/pages/settings.dart';
@@ -41,71 +43,99 @@ class _LoginScreenState extends State<LoginScreen> {
      resizeToAvoidBottomInset: true,
      body: Container(
        color: Theme.of(context).scaffoldBackgroundColor,
-        child: Center(
+        child: SafeArea(
          child: Column(
-            mainAxisAlignment: MainAxisAlignment.center,
            children: [
-              Text.rich(
-                TextSpan(
-                  children: [
-                    TextSpan(
-                      text: "Mile",
-                      style: TextStyle(
-                        color: Theme.of(context).textTheme.bodyLarge?.color,
+              Expanded(
+                child: Center(
+                  child: Column(
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    children: [
+                      LayoutBuilder(
+                        builder: (context, constraints) {
+                          return SizedBox(
+                            width: constraints.maxWidth,
+                            child: FittedBox(
+                              fit: BoxFit.scaleDown,
+                              child: Text.rich(
+                                TextSpan(
+                                  children: [
+                                    TextSpan(
+                                      text: "Mile",
+                                      style: TextStyle(
+                                        color: Theme.of(
+                                          context,
+                                        ).textTheme.bodyLarge?.color,
+                                      ),
+                                    ),
+                                    const TextSpan(
+                                      text: "O",
+                                      style: TextStyle(color: Colors.red),
+                                    ),
+                                    TextSpan(
+                                      text: "graph",
+                                      style: TextStyle(
+                                        color: Theme.of(
+                                          context,
+                                        ).textTheme.bodyLarge?.color,
+                                      ),
+                                    ),
+                                  ],
+                                  style: const TextStyle(
+                                    decoration: TextDecoration.none,
+                                    color: Colors.white,
+                                    fontFamily: "Tomatoes",
+                                    fontSize: 50,
+                                  ),
+                                ),
+                                softWrap: false,
+                                overflow: TextOverflow.visible,
+                              ),
+                            ),
+                          );
+                        },
                      ),
-                    ),
-                    const TextSpan(
-                      text: "O",
-                      style: TextStyle(color: Colors.red),
-                    ),
-                    TextSpan(
-                      text: "graph",
-                      style: TextStyle(
-                        color: Theme.of(context).textTheme.bodyLarge?.color,
+                      const SizedBox(height: 50),
+                      const LoginPanel(),
+                      const SizedBox(height: 16),
+                      IconButton(
+                        icon: const Icon(Icons.settings, color: Colors.grey),
+                        tooltip: 'Settings',
+                        onPressed: () {
+                          Navigator.of(context).push(
+                            MaterialPageRoute(
+                              fullscreenDialog: true,
+                              builder: (_) => const SettingsPage(),
+                            ),
+                          );
+                        },
                      ),
-                    ),
-                  ],
-                  style: const TextStyle(
-                    decoration: TextDecoration.none,
-                    color: Colors.white,
-                    fontFamily: "Tomatoes",
-                    fontSize: 50,
+                      if (_checkingSession) ...[
+                        const SizedBox(height: 12),
+                        Row(
+                          mainAxisAlignment: MainAxisAlignment.center,
+                          children: [
+                            const SizedBox(
+                              height: 24,
+                              width: 24,
+                              child: CircularProgressIndicator(strokeWidth: 2),
+                            ),
+                            const SizedBox(width: 8),
+                            Text(
+                              'Trying to log in',
+                              style: Theme.of(context).textTheme.bodyMedium,
+                            ),
+                          ],
+                        ),
+                      ],
+                    ],
                  ),
                ),
              ),
-              const SizedBox(height: 50),
-              const LoginPanel(),
-              const SizedBox(height: 16),
-              IconButton(
-                icon: const Icon(Icons.settings, color: Colors.grey),
-                tooltip: 'Settings',
-                onPressed: () {
-                  Navigator.of(context).push(
-                    MaterialPageRoute(
-                      fullscreenDialog: true,
-                      builder: (_) => const SettingsPage(),
-                    ),
-                  );
-                },
+              const Padding(
+                padding: EdgeInsets.only(bottom: 12),
+                child: _LoginLogo(),
              ),
-              if (_checkingSession) ...[
-                const SizedBox(height: 12),
-                Row(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: [
-                    const SizedBox(
-                      height: 24,
-                      width: 24,
-                      child: CircularProgressIndicator(strokeWidth: 2),
-                    ),
-                    const SizedBox(width: 8),
-                    Text(
-                      'Trying to log in',
-                      style: Theme.of(context).textTheme.bodyMedium,
-                    ),
-                  ],
-                ),
-              ],
            ],
          ),
        ),
@@ -114,6 +144,57 @@ class _LoginScreenState extends State<LoginScreen> {
  }
 }

+class _LoginLogo extends StatefulWidget {
+  const _LoginLogo();
+
+  @override
+  State<_LoginLogo> createState() => _LoginLogoState();
+}
+
+class _LoginLogoState extends State<_LoginLogo> {
+  late final Future<String> _svgFuture;
+
+  @override
+  void initState() {
+    super.initState();
+    _svgFuture = rootBundle.loadString('assets/logos/pg_logo_v2.svg');
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final accent = Theme.of(context).colorScheme.primary;
+    final grey = const Color(0xFF999999);
+    return SizedBox(
+      height: 42,
+      child: Opacity(
+        opacity: 0.75,
+        child: FutureBuilder<String>(
+          future: _svgFuture,
+          builder: (context, snapshot) {
+            final svg = snapshot.data;
+            if (svg == null) {
+              return const SizedBox.shrink();
+            }
+            final tinted = svg
+                .replaceAll('#00b7fd', _colorToHex(accent))
+                .replaceAll('#999999', _colorToHex(grey));
+            return SvgPicture.string(
+              tinted,
+              fit: BoxFit.contain,
+              semanticsLabel: 'Mileograph logo',
+            );
+          },
+        ),
+      ),
+    );
+  }
+
+  String _colorToHex(Color color) {
+    final hex = color.value.toRadixString(16).padLeft(8, '0');
+    return '#${hex.substring(2)}';
+  }
+}
+
 class LoginPanel extends StatefulWidget {
  const LoginPanel({super.key});

--- a/lib/services/api_service.dart
+++ b/lib/services/api_service.dart
@@ -2,7 +2,7 @@ import 'dart:convert';
 import 'package:http/http.dart' as http;

 typedef TokenProvider = String? Function();
-typedef UnauthorizedHandler = Future<void> Function();
+typedef UnauthorizedHandler = Future<bool> Function();

 class ApiService {
  String _baseUrl;
@@ -36,35 +36,47 @@ class ApiService {
    _client.close();
  }

-  Map<String, String> _buildHeaders(Map<String, String>? extra) {
+  Map<String, String> _buildHeaders(
+    Map<String, String>? extra, {
+    bool includeAuth = true,
+  }) {
    final token = _getToken?.call();
    final headers = {'accept': 'application/json', ...?extra};
-    if (token != null && token.isNotEmpty) {
+    if (includeAuth && token != null && token.isNotEmpty) {
      headers['Authorization'] = 'Bearer $token';
    }
    return headers;
  }

-  Future<dynamic> get(String endpoint, {Map<String, String>? headers}) async {
-    final response = await _client
-        .get(
-          Uri.parse('$baseUrl$endpoint'),
-          headers: _buildHeaders(headers),
-        )
-        .timeout(timeout);
+  Future<dynamic> get(
+    String endpoint, {
+    Map<String, String>? headers,
+    bool includeAuth = true,
+    bool allowRetry = true,
+  }) async {
+    final response = await _sendWithRetry(
+      () => _client.get(
+        Uri.parse('$baseUrl$endpoint'),
+        headers: _buildHeaders(headers, includeAuth: includeAuth),
+      ),
+      allowRetry: allowRetry,
+    );
    return _processResponse(response);
  }

  Future<ApiBinaryResponse> getBytes(
    String endpoint, {
    Map<String, String>? headers,
+    bool includeAuth = true,
+    bool allowRetry = true,
  }) async {
-    final response = await _client
-        .get(
-          Uri.parse('$baseUrl$endpoint'),
-          headers: _buildHeaders(headers),
-        )
-        .timeout(timeout);
+    final response = await _sendWithRetry(
+      () => _client.get(
+        Uri.parse('$baseUrl$endpoint'),
+        headers: _buildHeaders(headers, includeAuth: includeAuth),
+      ),
+      allowRetry: allowRetry,
+    );

    if (response.statusCode >= 200 && response.statusCode < 300) {
      final contentDisposition = response.headers['content-disposition'];
@@ -76,10 +88,6 @@ class ApiService {
      );
    }

-    if (response.statusCode == 401 && _onUnauthorized != null) {
-      await _onUnauthorized!();
-    }
-
    final body = _decodeBody(response);
    final message = _extractErrorMessage(body);
    throw ApiException(
@@ -93,15 +101,21 @@ class ApiService {
    String endpoint,
    dynamic data, {
    Map<String, String>? headers,
+    bool includeAuth = true,
+    bool allowRetry = true,
  }) async {
    final hasBody = data != null;
-    final response = await _client
-        .post(
-          Uri.parse('$baseUrl$endpoint'),
-          headers: _buildHeaders(hasBody ? _jsonHeaders(headers) : headers),
-          body: hasBody ? jsonEncode(data) : null,
-        )
-        .timeout(timeout);
+    final response = await _sendWithRetry(
+      () => _client.post(
+        Uri.parse('$baseUrl$endpoint'),
+        headers: _buildHeaders(
+          hasBody ? _jsonHeaders(headers) : headers,
+          includeAuth: includeAuth,
+        ),
+        body: hasBody ? jsonEncode(data) : null,
+      ),
+      allowRetry: allowRetry,
+    );
    return _processResponse(response);
  }

@@ -112,38 +126,53 @@ class ApiService {
    String fieldName = 'file',
    Map<String, String>? fields,
    Map<String, String>? headers,
+    bool includeAuth = true,
+    bool allowRetry = true,
  }) async {
-    final request = http.MultipartRequest(
-      'POST',
-      Uri.parse('$baseUrl$endpoint'),
-    );
-    request.headers.addAll(_buildHeaders(headers));
-    if (fields != null && fields.isNotEmpty) {
-      request.fields.addAll(fields);
+    Future<http.Response> send() async {
+      final request = http.MultipartRequest(
+        'POST',
+        Uri.parse('$baseUrl$endpoint'),
+      );
+      request.headers.addAll(_buildHeaders(headers, includeAuth: includeAuth));
+      if (fields != null && fields.isNotEmpty) {
+        request.fields.addAll(fields);
+      }
+      request.files.add(
+        http.MultipartFile.fromBytes(
+          fieldName,
+          bytes,
+          filename: filename,
+        ),
+      );
+      final streamed = await _client.send(request);
+      return http.Response.fromStream(streamed);
    }
-    request.files.add(
-      http.MultipartFile.fromBytes(
-        fieldName,
-        bytes,
-        filename: filename,
-      ),
-    );
-    final streamed = await _client.send(request).timeout(timeout);
-    final response = await http.Response.fromStream(streamed);
+
+    final response = await _sendWithRetry(send, allowRetry: allowRetry);
    return _processResponse(response);
  }

-  Future<dynamic> postForm(String endpoint, Map<String, String> data) async {
-    final response = await _client
-        .post(
-          Uri.parse('$baseUrl$endpoint'),
-          headers: _buildHeaders({
+  Future<dynamic> postForm(
+    String endpoint,
+    Map<String, String> data, {
+    bool includeAuth = true,
+    bool allowRetry = true,
+  }) async {
+    final response = await _sendWithRetry(
+      () => _client.post(
+        Uri.parse('$baseUrl$endpoint'),
+        headers: _buildHeaders(
+          {
            'Content-Type': 'application/x-www-form-urlencoded',
            'accept': 'application/json',
-          }),
-          body: data, // http package handles form-encoding for Map<String, String>
-        )
-        .timeout(timeout);
+          },
+          includeAuth: includeAuth,
+        ),
+        body: data, // http package handles form-encoding for Map<String, String>
+      ),
+      allowRetry: allowRetry,
+    );
    return _processResponse(response);
  }

@@ -151,28 +180,37 @@ class ApiService {
    String endpoint,
    dynamic data, {
    Map<String, String>? headers,
+    bool includeAuth = true,
+    bool allowRetry = true,
  }) async {
    final hasBody = data != null;
-    final response = await _client
-        .put(
-          Uri.parse('$baseUrl$endpoint'),
-          headers: _buildHeaders(hasBody ? _jsonHeaders(headers) : headers),
-          body: hasBody ? jsonEncode(data) : null,
-        )
-        .timeout(timeout);
+    final response = await _sendWithRetry(
+      () => _client.put(
+        Uri.parse('$baseUrl$endpoint'),
+        headers: _buildHeaders(
+          hasBody ? _jsonHeaders(headers) : headers,
+          includeAuth: includeAuth,
+        ),
+        body: hasBody ? jsonEncode(data) : null,
+      ),
+      allowRetry: allowRetry,
+    );
    return _processResponse(response);
  }

  Future<dynamic> delete(
    String endpoint, {
    Map<String, String>? headers,
+    bool includeAuth = true,
+    bool allowRetry = true,
  }) async {
-    final response = await _client
-        .delete(
-          Uri.parse('$baseUrl$endpoint'),
-          headers: _buildHeaders(headers),
-        )
-        .timeout(timeout);
+    final response = await _sendWithRetry(
+      () => _client.delete(
+        Uri.parse('$baseUrl$endpoint'),
+        headers: _buildHeaders(headers, includeAuth: includeAuth),
+      ),
+      allowRetry: allowRetry,
+    );
    return _processResponse(response);
  }

@@ -186,10 +224,6 @@ class ApiService {
      return body;
    }

-    if (res.statusCode == 401 && _onUnauthorized != null) {
-      await _onUnauthorized!();
-    }
-
    final message = _extractErrorMessage(body);
    throw ApiException(
      statusCode: res.statusCode,
@@ -239,6 +273,20 @@ class ApiService {
    return body.toString();
  }

+  Future<http.Response> _sendWithRetry(
+    Future<http.Response> Function() send, {
+    required bool allowRetry,
+  }) async {
+    var response = await send().timeout(timeout);
+    if (response.statusCode == 401 && allowRetry && _onUnauthorized != null) {
+      final refreshed = await _onUnauthorized!();
+      if (refreshed) {
+        response = await send().timeout(timeout);
+      }
+    }
+    return response;
+  }
+
  String? _extractFilename(String? contentDisposition) {
    if (contentDisposition == null || contentDisposition.isEmpty) return null;
    final utf8Match =
--- a/lib/services/authservice.dart
+++ b/lib/services/authservice.dart
@@ -6,18 +6,20 @@ import 'package:mileograph_flutter/services/token_storage_service.dart';
 class AuthService extends ChangeNotifier {
  final ApiService api;
  bool _restoring = false;
+  String? _accessToken;
+  Future<bool>? _refreshFuture;

  final TokenStorageService _tokenStorage = TokenStorageService();

  AuthService({required this.api}) {
    api.setTokenProvider(() => token);
-    api.setUnauthorizedHandler(handleTokenExpired);
+    api.setUnauthorizedHandler(_handleUnauthorized);
  }

  AuthenticatedUserData? _user;

  bool get isLoggedIn => _user != null;
-  String? get token => _user?.accessToken;
+  String? get token => _accessToken;
  String? get userId => _user?.userId;
  String? get username => _user?.username;
  String? get fullName => _user?.fullName;
@@ -33,11 +35,13 @@ class AuthService extends ChangeNotifier {
    required String fullName,
    required String accessToken,
    required String email,
+    String? refreshToken,
    String entriesVisibility = 'private',
    String mileageVisibility = 'private',
    bool isElevated = false,
    bool isDisabled = false,
  }) {
+    _accessToken = accessToken;
    _user = AuthenticatedUserData(
      userId: userId,
      username: username,
@@ -49,7 +53,7 @@ class AuthService extends ChangeNotifier {
      isElevated: isElevated,
      disabled: isDisabled,
    );
-    _persistToken(accessToken);
+    _persistTokens(accessToken, refreshToken);
    notifyListeners();
  }

@@ -64,8 +68,9 @@ class AuthService extends ChangeNotifier {
    };

    // 1. Get token
-    final tokenResponse = await api.postForm('/token', formData);
+    final tokenResponse = await api.postForm('/token', formData, includeAuth: false);
    final accessToken = tokenResponse['access_token'];
+    final refreshToken = tokenResponse['refresh_token'];

    // 2. Get user details
    final userResponse = await api.get(
@@ -83,6 +88,7 @@ class AuthService extends ChangeNotifier {
      fullName: userResponse['full_name'],
      accessToken: accessToken,
      email: userResponse['email'],
+      refreshToken: refreshToken,
      entriesVisibility: _parseVisibility(
        userResponse['user_entries_visibility'] ?? userResponse['entries_visibility'],
        'private',
@@ -103,33 +109,31 @@ class AuthService extends ChangeNotifier {
      // read token from secure storage (with fallback)
      final token = await _tokenStorage.getToken();
      if (token == null || token.isEmpty) return;
+      _accessToken = token;

      final userResponse = await api.get(
        '/users/me',
-        headers: {
-          'Authorization': 'Bearer $token',
-          'accept': 'application/json',
-        },
      );

-    setLoginData(
-      userId: userResponse['user_id'],
-      username: userResponse['username'],
-      fullName: userResponse['full_name'],
-      accessToken: token,
-      email: userResponse['email'],
-      entriesVisibility: _parseVisibility(
-        userResponse['user_entries_visibility'] ?? userResponse['entries_visibility'],
-        'private',
-      ),
-      mileageVisibility: _parseVisibility(
-        userResponse['user_mileage_visibility'] ?? userResponse['mileage_visibility'],
-        'private',
-      ),
-      isElevated: _parseIsElevated(userResponse),
-      isDisabled: _parseIsDisabled(userResponse),
-    );
-  } catch (_) {
+      final restoredAccessToken = _accessToken ?? token;
+      setLoginData(
+        userId: userResponse['user_id'],
+        username: userResponse['username'],
+        fullName: userResponse['full_name'],
+        accessToken: restoredAccessToken,
+        email: userResponse['email'],
+        entriesVisibility: _parseVisibility(
+          userResponse['user_entries_visibility'] ?? userResponse['entries_visibility'],
+          'private',
+        ),
+        mileageVisibility: _parseVisibility(
+          userResponse['user_mileage_visibility'] ?? userResponse['mileage_visibility'],
+          'private',
+        ),
+        isElevated: _parseIsElevated(userResponse),
+        isDisabled: _parseIsDisabled(userResponse),
+      );
+    } catch (_) {
      await _clearToken();
    } finally {
      _restoring = false;
@@ -140,12 +144,9 @@ class AuthService extends ChangeNotifier {
    final token = await _tokenStorage.getToken();
    if (token == null || token.isEmpty) return false;
    try {
+      _accessToken = token;
      await api.get(
        '/validate',
-        headers: {
-          'Authorization': 'Bearer $token',
-          'accept': 'application/json',
-        },
      );
      return true;
    } catch (_) {
@@ -154,11 +155,15 @@ class AuthService extends ChangeNotifier {
    }
  }

-  Future<void> _persistToken(String token) async {
-    await _tokenStorage.setToken(token);
+  Future<void> _persistTokens(String accessToken, String? refreshToken) async {
+    await _tokenStorage.setToken(accessToken);
+    if (refreshToken != null && refreshToken.isNotEmpty) {
+      await _tokenStorage.setRefreshToken(refreshToken);
+    }
  }

  Future<void> _clearToken() async {
+    _accessToken = null;
    await _tokenStorage.clearToken();
  }

@@ -181,6 +186,61 @@ class AuthService extends ChangeNotifier {
    await api.postForm('/register', formData);
  }

+  Future<bool> _handleUnauthorized() async {
+    if (_refreshFuture != null) {
+      return _refreshFuture!;
+    }
+    _refreshFuture = _refreshTokens();
+    final refreshed = await _refreshFuture!;
+    _refreshFuture = null;
+    return refreshed;
+  }
+
+  Future<bool> _refreshTokens() async {
+    final refreshToken = await _tokenStorage.getRefreshToken();
+    if (refreshToken == null || refreshToken.isEmpty) {
+      await handleTokenExpired();
+      return false;
+    }
+    try {
+      final response = await api.post(
+        '/token/refresh',
+        {'refresh_token': refreshToken},
+        includeAuth: false,
+        allowRetry: false,
+      );
+      final accessToken = response['access_token'];
+      final newRefreshToken = response['refresh_token'];
+      if (accessToken is! String ||
+          accessToken.isEmpty ||
+          newRefreshToken is! String ||
+          newRefreshToken.isEmpty) {
+        await handleTokenExpired();
+        return false;
+      }
+      _accessToken = accessToken;
+      await _persistTokens(accessToken, newRefreshToken);
+      if (_user != null) {
+        _user = AuthenticatedUserData(
+          userId: _user!.userId,
+          username: _user!.username,
+          fullName: _user!.fullName,
+          accessToken: accessToken,
+          email: _user!.email,
+          entriesVisibility: _user!.entriesVisibility,
+          mileageVisibility: _user!.mileageVisibility,
+          isElevated: _user!.isElevated,
+          isDisabled: _user!.disabled,
+        );
+      }
+      notifyListeners();
+      return true;
+    } catch (_) {
+      await handleTokenExpired();
+      return false;
+    }
+  }
+
  Future<void> handleTokenExpired() async {
    _user = null;
    await _clearToken();
--- a/lib/services/data_service/data_service_badges.dart
+++ b/lib/services/data_service/data_service_badges.dart
@@ -55,7 +55,6 @@ extension DataServiceBadges on DataService {
    bool onlyIncomplete = false,
  }) async {
    _isClassClearanceProgressLoading = true;
-    if (!append) _classClearanceProgress = [];
    try {
      final onlyIncompleteParam =
          onlyIncomplete ? '&only_incomplete=true' : '';
@@ -84,7 +83,6 @@ extension DataServiceBadges on DataService {
      _classClearanceHasMore = items.length >= limit;
    } catch (e) {
      debugPrint('Failed to fetch class clearance progress: $e');
-      if (!append) _classClearanceProgress = [];
      _classClearanceHasMore = false;
    } finally {
      _isClassClearanceProgressLoading = false;
--- a/lib/services/token_storage_service.dart
+++ b/lib/services/token_storage_service.dart
@@ -10,7 +10,8 @@ class TokenStorageService {

  factory TokenStorageService() => _instance;

-  static const _tokenKey = 'auth_token';
+  static const _accessTokenKey = 'auth_token';
+  static const _refreshTokenKey = 'refresh_token';
  final FlutterSecureStorage _secureStorage = const FlutterSecureStorage();

  Future<SharedPreferences> get _prefs async =>
@@ -18,17 +19,17 @@ class TokenStorageService {

  Future<void> setToken(String token) async {
    try {
-      await _secureStorage.write(key: _tokenKey, value: token);
+      await _secureStorage.write(key: _accessTokenKey, value: token);
    } catch (_) {
      // ignore secure storage failures in debug/unsupported environments
    }
    final prefs = await _prefs;
-    await prefs.setString(_tokenKey, token);
+    await prefs.setString(_accessTokenKey, token);
  }

  Future<String?> getToken() async {
    try {
-      final secured = await _secureStorage.read(key: _tokenKey);
+      final secured = await _secureStorage.read(key: _accessTokenKey);
      if (secured != null && secured.isNotEmpty) {
        return secured;
      }
@@ -36,22 +37,48 @@ class TokenStorageService {
      // ignore and fall back
    }
    final prefs = await _prefs;
-    final token = prefs.getString(_tokenKey);
+    final token = prefs.getString(_accessTokenKey);
    return (token == null || token.isEmpty) ? null : token;
  }

  Future<void> clearToken() async {
    try {
-      await _secureStorage.delete(key: _tokenKey);
+      await _secureStorage.delete(key: _accessTokenKey);
+      await _secureStorage.delete(key: _refreshTokenKey);
    } catch (_) {
      // ignore
    }
    final prefs = await _prefs;
-    await prefs.remove(_tokenKey);
+    await prefs.remove(_accessTokenKey);
+    await prefs.remove(_refreshTokenKey);
  }

  Future<bool> hasToken() async {
    final token = await getToken();
    return token != null && token.isNotEmpty;
  }
+
+  Future<void> setRefreshToken(String token) async {
+    try {
+      await _secureStorage.write(key: _refreshTokenKey, value: token);
+    } catch (_) {
+      // ignore secure storage failures in debug/unsupported environments
+    }
+    final prefs = await _prefs;
+    await prefs.setString(_refreshTokenKey, token);
+  }
+
+  Future<String?> getRefreshToken() async {
+    try {
+      final secured = await _secureStorage.read(key: _refreshTokenKey);
+      if (secured != null && secured.isNotEmpty) {
+        return secured;
+      }
+    } catch (_) {
+      // ignore and fall back
+    }
+    final prefs = await _prefs;
+    final token = prefs.getString(_refreshTokenKey);
+    return (token == null || token.isEmpty) ? null : token;
+  }
 }
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -262,6 +262,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "4.1.0"
+  flutter_svg:
+    dependency: "direct main"
+    description:
+      name: flutter_svg
+      sha256: "87fbd7c534435b6c5d9d98b01e1fd527812b82e68ddd8bd35fc45ed0fa8f0a95"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.3"
  flutter_test:
    dependency: "direct dev"
    description: flutter
@@ -400,6 +408,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.9.1"
+  path_parsing:
+    dependency: transitive
+    description:
+      name: path_parsing
+      sha256: "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
  path_provider:
    dependency: transitive
    description:
@@ -605,6 +621,30 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.4.0"
+  vector_graphics:
+    dependency: transitive
+    description:
+      name: vector_graphics
+      sha256: a4f059dc26fc8295b5921376600a194c4ec7d55e72f2fe4c7d2831e103d461e6
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.19"
+  vector_graphics_codec:
+    dependency: transitive
+    description:
+      name: vector_graphics_codec
+      sha256: "99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.13"
+  vector_graphics_compiler:
+    dependency: transitive
+    description:
+      name: vector_graphics_compiler
+      sha256: d354a7ec6931e6047785f4db12a1f61ec3d43b207fc0790f863818543f8ff0dc
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.19"
  vector_math:
    dependency: transitive
    description:
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 0.7.6+14
+version: 0.7.7+15

 environment:
  sdk: ^3.8.1
@@ -42,6 +42,7 @@ dependencies:
  file_selector_macos: ^0.9.4
  file_selector_windows: ^0.9.3
  file_selector_web: ^0.9.4
+  flutter_svg: ^2.0.10

  # The following adds the Cupertino Icons font to your application.
  # Use with the CupertinoIcons class for iOS style icons.
@@ -73,6 +74,8 @@ flutter:
    - family: Tomatoes
      fonts:
        - asset: lib/assets/fonts/Tomatoes-O8L8.ttf
+  assets:
+    - assets/logos/pg_logo_v2.svg
  # To add assets to your application, add an assets section, like this:
  # assets:
  #   - images/a_dot_burr.jpeg
--- a/test/pages/dashboard_page_test.dart
+++ b/test/pages/dashboard_page_test.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:go_router/go_router.dart';
 import 'package:shared_preferences/shared_preferences.dart';
Author	SHA1	Message	Date
petegregoryy	8340501f37	make carousel more stable All checks were successful Release / meta (push) Successful in 4s Details Release / linux-build (push) Successful in 1m14s Details Release / web-build (push) Successful in 1m30s Details Release / android-build (push) Successful in 5m52s Details Release / release-dev (push) Successful in 7s Details Release / release-master (push) Successful in 4s Details	2026-01-23 18:24:34 +00:00
petegregoryy	a527ecdb17	add logo to login page	2026-01-23 18:04:40 +00:00
petegregoryy	f3fcf07b05	add refresh token support	2026-01-23 17:55:55 +00:00