Fix api

lib/api.dart

@@ -17,15 +17,16 @@ class ApiClient {
 
   Future<void> login(String username, String password) async {
     log.info("Logging in...");
-    final url = '$baseUrl/login';
+    final url = '$baseUrl/auth/login';
     final response = await http.post(
       Uri.parse(url),
       headers: {'Content-Type': 'application/json'},
-      body: jsonEncode({'email': username, 'password': password}),
+      body: jsonEncode({'username': username, 'password': password}),
     );
 
     if (response.statusCode == 200) {
-      token = jsonDecode(response.body);
+      final responseData = jsonDecode(response.body);
+      token = responseData['token'];
       log.info('Login successful');
     } else {
       throw Exception(
@@ -55,6 +56,9 @@ class ApiClient {
     if (!throwExceptionIfStatusCodeNot200 || response.statusCode == 200) {
       return response;
     } else {
+      log.warning(
+        "Failed get request to '$url'! StatusCode: ${response.statusCode}\nResponseBody: ${response.body}",
+      );
       throw Exception(
         'GET request failed: ${response.statusCode} ${response.body}',
       );
@@ -120,19 +124,19 @@ class ApiClient {
 
   Future<List<Sheet>> fetchSheets() async {
     final response = await get(
-      "/list/sheets",
+      "/api/sheets/list",
       throwExceptionIfStatusCodeNot200: true,
     );
 
     final data = jsonDecode(response.body);
-    return (data as List<dynamic>)
+    return (data['sheets'] as List<dynamic>)
         .map((sheet) => Sheet.fromJson(sheet as Map<String, dynamic>))
         .toList();
   }
 
   Future<Uint8List> fetchPdfFileData(String sheetUuid) async {
     final response = await get(
-      '/sheet/pdf/$sheetUuid',
+      '/api/sheets/get/$sheetUuid',
       isBinary: true,
       throwExceptionIfStatusCodeNot200: true,
     );

lib/home_page.dart

@@ -58,37 +58,36 @@ class _MyHomePageState extends State<MyHomePage> with FullScreenListener {
   Future<List<Sheet>> acquireSheets() async {
     final url = await _storageHelper.readSecure(SecureStorageKey.url);
     final jwt = await _storageHelper.readSecure(SecureStorageKey.jwt);
-    apiClient = ApiClient(baseUrl: "${url!}/api", token: jwt);
+    apiClient = ApiClient(baseUrl: url!, token: jwt);
     // TODO: check if really logged in
     final sheets = await apiClient!.fetchSheets();
     log.info("${sheets.length} sheets fetched");
-    final sheetsSorted = await sortSheetsByAccessTime(sheets);
+    final sheetsSorted = await sortSheetsByRecency(sheets);
     log.info("${sheetsSorted.length} sheets sorted");
 
-    final changeQueue = await _storageHelper.readChangeQueue();
+    // TODO: make work
-    changeQueue.applyToSheets(sheetsSorted);
+    // final changeQueue = await _storageHelper.readChangeQueue();
-    log.info("${changeQueue.length()} changes applied");
+    // changeQueue.applyToSheets(sheetsSorted);
+    // log.info("${changeQueue.length()} changes applied");
 
     return sheetsSorted;
   }
 
-  Future<List<Sheet>> sortSheetsByAccessTime(List<Sheet> sheets) async {
+  Future<List<Sheet>> sortSheetsByRecency(List<Sheet> sheets) async {
     final accessTimes = await _storageHelper.readSheetAccessTimes();
 
     sheets.sort((a, b) {
-      final dateA = accessTimes[a.uuid];
+      var dateA = accessTimes[a.uuid];
-      final dateB = accessTimes[b.uuid];
+      var dateB = accessTimes[b.uuid];
 
-      if (dateB == null) {
+      if (dateA == null || a.updatedAt.isAfter(dateA)) {
-        // b has no date, sort below a
+        dateA = a.updatedAt;
-        return -1;
-      } else if (dateA == null) {
-        // a has no date, sort below b
-        return 1;
-      } else {
-        // compare both and sort by date
-        return dateB.compareTo(dateA);
       }
+      if (dateB == null || b.updatedAt.isAfter(dateB)) {
+        dateB = b.updatedAt;
+      }
+
+      return dateB.compareTo(dateA);
     });
 
     return sheets;
@@ -109,7 +108,7 @@ class _MyHomePageState extends State<MyHomePage> with FullScreenListener {
     if (newState) {
       (await sheets).shuffle();
     } else {
-      sheets = sortSheetsByAccessTime(await sheets);
+      sheets = sortSheetsByRecency(await sheets);
     }
 
     setState(() {

lib/login_page.dart

@@ -18,7 +18,7 @@ class _LoginPageState extends State<LoginPage> {
   final TextEditingController _urlController = TextEditingController(
     text: "https://sheetable.julian-mutter.de",
   );
-  final TextEditingController _emailController = TextEditingController();
+  final TextEditingController _usernameController = TextEditingController();
   final TextEditingController _passwordController = TextEditingController();
 
   final _formKey = GlobalKey<FormState>();
@@ -40,12 +40,12 @@ class _LoginPageState extends State<LoginPage> {
       return;
     }
     final url = await _storageHelper.readSecure(SecureStorageKey.url);
-    final email = await _storageHelper.readSecure(SecureStorageKey.email);
+    final username = await _storageHelper.readSecure(SecureStorageKey.email);
     if (url != null) {
       _urlController.text = url;
     }
-    if (email != null) {
+    if (username != null) {
-      _emailController.text = email;
+      _usernameController.text = username;
     }
   }
 
@@ -58,17 +58,18 @@ class _LoginPageState extends State<LoginPage> {
     }
   }
 
-  Future<void> _login(String serverUrl, String email, String password) async {
+  Future<void> _login(
+      String serverUrl, String username, String password) async {
     setState(() {
       _error = null;
     });
-    final apiClient = ApiClient(baseUrl: "$serverUrl/api");
+    final apiClient = ApiClient(baseUrl: serverUrl);
     try {
-      await apiClient.login(email, password);
+      await apiClient.login(username, password);
 
       await _storageHelper.writeSecure(SecureStorageKey.url, serverUrl);
       await _storageHelper.writeSecure(SecureStorageKey.jwt, apiClient.token!);
-      await _storageHelper.writeSecure(SecureStorageKey.email, email);
+      await _storageHelper.writeSecure(SecureStorageKey.email, username);
       await _navigateToMainPage();
     } catch (e) {
       setState(() {
@@ -98,7 +99,7 @@ class _LoginPageState extends State<LoginPage> {
     if (_formKey.currentState!.validate()) {
       await _login(
         _urlController.text,
-        _emailController.text,
+        _usernameController.text,
         _passwordController.text,
       );
     }
@@ -123,9 +124,9 @@ class _LoginPageState extends State<LoginPage> {
                 textInputAction: TextInputAction.next,
               ),
               TextFormField(
-                controller: _emailController,
+                controller: _usernameController,
                 validator: validateNotEmpty,
-                decoration: InputDecoration(labelText: 'Email'),
+                decoration: InputDecoration(labelText: 'Username'),
                 textInputAction: TextInputAction.next,
               ),
               TextFormField(

lib/sheet.dart

@@ -1,6 +1,5 @@
 import 'dart:async';
 import 'dart:ui';
-
 import 'package:flutter/material.dart';
 import 'package:sheetless/edit_bottom_sheet.dart';
 import 'package:sheetless/storage_helper.dart';
@@ -11,21 +10,25 @@ class Sheet {
   String name;
   String composerUuid;
   String composerName;
+  DateTime updatedAt;
 
   Sheet({
     required this.uuid,
     required this.name,
     required this.composerUuid,
     required this.composerName,
+    required this.updatedAt,
   });
 
   // Factory constructor for creating a Sheet from JSON
   factory Sheet.fromJson(Map<String, dynamic> json) {
+    final composer = json['composer'] as Map<String, dynamic>?;
     return Sheet(
-      uuid: json['uuid'],
+      uuid: json['uuid'].toString(),
-      name: json['sheet_name'],
+      name: json['title'],
-      composerUuid: json['composer_uuid'],
+      composerUuid: json['composer_uuid']?.toString() ?? '',
-      composerName: json['composer_name'],
+      composerName: composer?['name'] ?? 'Unknown',
+      updatedAt: DateTime.parse(json['updated_at']),
     );
   }
 }