Merge pull request #124 from DislikesSchool/build-newapi

Build newapi
DislikesSchool · Oct 31, 2023 · c5cecbf · c5cecbf
2 parents 5dc16cc + 407018c
commit c5cecbf
Show file tree

Hide file tree

Showing 15 changed files with 983 additions and 587 deletions.
diff --git a/lib/home.dart b/lib/home.dart
diff --git a/lib/homework.dart b/lib/homework.dart
@@ -34,7 +34,8 @@ class HomeworkPageState extends State<HomeworkPage> {
       loading = true; //make loading true to show progressindicator
     });
 
-    apidataMsg = await widget.sessionManager.get('messages');
+    Map<String, dynamic> msgs = await widget.sessionManager.get('homework');
+    apidataMsg = msgs.values.toList();
     messages = getMessages(apidataMsg);
 
     loading = false;
@@ -61,7 +62,8 @@ class HomeworkPageState extends State<HomeworkPage> {
       loading = true; //make loading true to show progressindicator
     });
 
-    apidataMsg = await widget.sessionManager.get('messages');
+    Map<String, dynamic> msgs = await widget.sessionManager.get('homework');
+    apidataMsg = msgs.values.toList();
     messages = getMessages(apidataMsg);
 
     loading = false;
@@ -77,18 +79,14 @@ class HomeworkPageState extends State<HomeworkPage> {
         "text": "Nebude to trvat dlouho",
       }
     ];
-    apidataMsg = apidataMsg
-        .where((msg) =>
-            msg["type"] == "testpridelenie" || msg["type"] == "homework")
-        .toList();
     for (Map<String, dynamic> msg in apidataMsg) {
       String textAsTitle = "This isn't supposed to happen...";
-      if (msg.keys.contains("text") && msg["text"] != null) {
-        textAsTitle = msg["text"];
+      if (msg.keys.contains("name") && msg["name"] != null) {
+        textAsTitle = msg["name"];
       } else if (msg.keys.contains("assignment") && msg["assignment"] != null) {
         textAsTitle = msg["assignment"]["title"];
       } else {
-        break;
+        continue;
       }
       rows.add(Card(
         child: Padding(
@@ -98,13 +96,11 @@ class HomeworkPageState extends State<HomeworkPage> {
               children: [
                 Row(
                   children: [
-                    Text(msg["owner"]["firstname"] +
-                        " " +
-                        msg["owner"]["lastname"]),
+                    Text(msg["autor_meno"]),
                     const Icon(Icons.arrow_right_rounded),
                     Expanded(
                       child: Text(
-                        msg["title"],
+                        msg["predmet_meno"],
                         overflow: TextOverflow.fade,
                         maxLines: 5,
                         softWrap: false,
@@ -117,7 +113,7 @@ class HomeworkPageState extends State<HomeworkPage> {
                     Expanded(
                       child: Text(
                         textAsTitle,
-                        style: const TextStyle(fontSize: 10),
+                        style: const TextStyle(fontSize: 12),
                         overflow: TextOverflow.fade,
                         maxLines: 5,
                         softWrap: false,

diff --git a/lib/icanteen.dart b/lib/icanteen.dart
@@ -2,6 +2,7 @@ import 'dart:convert';
 
 import 'package:dio/dio.dart';
 import 'package:dio_http_cache/dio_http_cache.dart';
+import 'package:firebase_remote_config/firebase_remote_config.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_session_manager/flutter_session_manager.dart';
 import 'package:shared_preferences/shared_preferences.dart';
@@ -27,7 +28,7 @@ class ICanteenPageState extends State<ICanteenPage> {
 
   Dio dio = Dio();
 
-  String baseUrl = "https://lobster-app-z6jfk.ondigitalocean.app/api";
+  String baseUrl = FirebaseRemoteConfig.instance.getString("testUrl");
   bool loading = true;
 
   List<Widget> lunches = [];
@@ -53,24 +54,19 @@ class ICanteenPageState extends State<ICanteenPage> {
       loading = true; //make loading true to show progressindicator
     });
 
-    String token = sharedPreferences.getString("token")!;
-
     Response response = await dio
-        .get(
-      "$baseUrl/lunches",
-      options: buildCacheOptions(
-        const Duration(days: 0),
-        forceRefresh: true,
-        options: Options(
-          headers: {
-            "Authorization": "Bearer $token",
-          },
-        ),
-      ),
+        .post(
+      "$baseUrl/icanteen",
+      data: {
+        "username": sharedPreferences.getString("ic_email"),
+        "password": sharedPreferences.getString("ic_password"),
+        "server": sharedPreferences.getString("ic_server"),
+      },
+      options: Options(contentType: Headers.formUrlEncodedContentType),
     )
         .catchError((obj) {
       return Response(
-        requestOptions: RequestOptions(path: "$baseUrl/lunches"),
+        requestOptions: RequestOptions(path: "$baseUrl/icanteen"),
         statusCode: 500,
       );
     });

diff --git a/lib/icanteen_setup.dart b/lib/icanteen_setup.dart
@@ -23,7 +23,7 @@ class ICanteenSetupScreenState extends State<ICanteenSetupScreen> {
 
   Dio dio = Dio();
 
-  String baseUrl = FirebaseRemoteConfig.instance.getString("baseUrl");
+  String baseUrl = FirebaseRemoteConfig.instance.getString("testUrl");
 
   AppLocalizations? local;
 
@@ -36,20 +36,9 @@ class ICanteenSetupScreenState extends State<ICanteenSetupScreen> {
     setState(() {
       hasLogin = true;
     });
-    String? token = sharedPreferences.getString("token");
-    await dio.post(
-      "$baseUrl/set_icanteen",
-      data: {
-        'email': email,
-        'password': password,
-        'server': server,
-      },
-      options: Options(
-        headers: {
-          "Authorization": "Bearer $token",
-        },
-      ),
-    );
+    sharedPreferences.setString("ic_server", server);
+    sharedPreferences.setString("ic_email", email);
+    sharedPreferences.setString("ic_password", password);
     sharedPreferences.setBool("ice", true);
   }
 

diff --git a/lib/l10n/app_cs.arb b/lib/l10n/app_cs.arb
@@ -90,10 +90,13 @@
   "@loginPassword": {
     "description": "User's password"
   },
+  "loginServer": "Server (např. skola.edupage.org)",
   "loginLogin": "Přihlásit se",
   "@loginLogin": {
     "description": "Login button"
   },
+  "loginCustomEndpointCheckbox": "Použít valstní endpoint",
+  "loginCustomEndpoint": "URL vlastního endpointu",
   "today": "Dnes",
   "tomorrow": "Zítra",
   "loadCredentials": "Načítání přihlašovacích údajů",
@@ -111,5 +114,14 @@
   "iCanteenSetupServer": "Adresa URL",
   "iCanteenSetupEmail": "Přihlašovací jméno",
   "iCanteenSetupPassword": "Heslo",
-  "messagesLoadingAttachment": "Načítání pdf souboru..."
+  "messagesLoadingAttachment": "Načítání pdf souboru...",
+  "messagesAttachments": "{count, plural, =1{1 Přípona} few{{count} Přípony} other{{count} Přípon}}",
+  "@messagesAttachments": {
+    "placeholders": {
+      "count": {
+        "type": "num",
+        "format": "compact"
+      }
+    }
+  }
 }
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
@@ -25,7 +25,10 @@
   "loginUseExistingCredentials": "Use your existing EduPage credentials",
   "loginUsername": "Username",
   "loginPassword": "Password",
+  "loginServer": "Server (e.g., school.edupage.org)",
   "loginLogin": "Login",
+  "loginCustomEndpointCheckbox": "Use custom endpoint",
+  "loginCustomEndpoint": "Enter custom endpoint URL",
   "today": "Today",
   "tomorrow": "Tomorrow",
   "loadCredentials": "Loading credentials...",
@@ -43,5 +46,14 @@
   "iCanteenSetupServer": "Server address",
   "iCanteenSetupEmail": "Username",
   "iCanteenSetupPassword": "Password",
-  "messagesLoadingAttachment": "Loading pdf..."
+  "messagesLoadingAttachment": "Loading pdf...",
+  "messagesAttachments": "{count, plural, =1{1 Attachment} other{{count} Attachments}}",
+  "@messagesAttachments": {
+    "placeholders": {
+      "count": {
+        "type": "num",
+        "format": "compact"
+      }
+    }
+  }
 }