Update Docs/SCRUM Logbog.md

Frontend display currently not working

Co-authored-by: Reimar <mail@reim.ar>

.gitignore

@@ -3,4 +3,3 @@ API/bin
 API/obj
 .idea
 
-/rust-backend/.env.example

API/Application/Users/Queries/QueryUsersByIds.cs

@@ -0,0 +1,32 @@
+using API.Models;
+using API.Persistence.Repositories;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.VisualStudio.Web.CodeGenerators.Mvc.Templates.BlazorIdentity.Pages.Manage;
+using Newtonsoft.Json.Linq;
+
+namespace API.Application.Users.Queries
+{
+    public class QueryUsersByIds
+    {
+        private readonly IUserRepository _repository;
+
+        public QueryUsersByIds(IUserRepository repository)
+        {
+            _repository = repository;
+        }
+
+        public async Task<ActionResult<List<UserDTO>>> Handle(List<string> ids)
+        {
+            List<User> users = await _repository.QueryUsersByIdsAsync(ids);
+
+            if (users == null)
+            {
+                return new ConflictObjectResult(new { message = "No user on given Id" });
+            }
+
+            return new OkObjectResult(users.Select(user => new { id = user.Id, email = user.Email, username = user.Username, profilePicture = user.ProfilePicture, createdAt = user.CreatedAt }));
+
+        }
+
+    }
+}

API/Controllers/UsersController.cs

@@ -22,36 +22,35 @@ namespace API.Controllers
     {
         private readonly QueryAllUsers _queryAllUsers;
         private readonly QueryUserById _queryUserById;
+        private readonly QueryUsersByIds _queryUsersByIds;
         private readonly CreateUser _createUser;
         private readonly UpdateUser _updateUser;
         private readonly DeleteUser _deleteUser;
         private readonly LoginUser _loginUser;
         private readonly TokenHelper _tokenHelper;
-
-        
         private readonly IUserRepository _repository;
 
         public UsersController(
             QueryAllUsers queryAllUsers,
             QueryUserById queryUserById,
+            QueryUsersByIds queryUsersByIds,
             CreateUser createUser,
             UpdateUser updateUser,
             DeleteUser deleteUser,
             LoginUser loginUser,
             TokenHelper tokenHelper,
             IUserRepository repository
-            )
+        )   
         {
             _queryAllUsers = queryAllUsers;
             _queryUserById = queryUserById;
+            _queryUsersByIds = queryUsersByIds;
             _createUser = createUser;
             _updateUser = updateUser;
             _deleteUser = deleteUser;
             _loginUser = loginUser;
             _tokenHelper = tokenHelper;
             _repository = repository;
-
-            
         }
 
         [HttpPost("login")]
@@ -73,9 +72,16 @@ namespace API.Controllers
             return await _queryUserById.Handle(id);
         }
 
+        [HttpGet("UsersByIds")]
+        public async Task<ActionResult<List<UserDTO>>> GetUsersByIds(string userIds) 
+        {
+            List<string> ids = userIds.Split(",").ToList();
+            return await _queryUsersByIds.Handle(ids);
+        }
+
         [Authorize]
         [HttpPut]
-        public async Task<IActionResult> PutUser([FromForm ]UpdateUserDTO UpdateUserDTO)
+        public async Task<IActionResult> PutUser([FromForm] UpdateUserDTO UpdateUserDTO)
         {
             return await _updateUser.Handle(UpdateUserDTO);
         }

API/Persistence/Repositories/IUserRepository.cs

@@ -8,6 +8,7 @@ namespace API.Persistence.Repositories
         Task<bool> DeleteUserAsync(string id);
         Task<List<User>> QueryAllUsersAsync();
         Task<User> QueryUserByIdAsync(string id);
+        Task<List<User>> QueryUsersByIdsAsync(List<string> ids);
         Task<User> QueryUserByEmailAsync(string email);
         Task<bool> UpdateUserAsync(User user);
         Task<User> QueryUserByRefreshTokenAsync(string refreshToken);

API/Persistence/Repositories/UserRepository.cs

@@ -1,5 +1,6 @@
 using API.Models;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Internal;
 using Microsoft.VisualStudio.Web.CodeGenerators.Mvc.Templates.BlazorIdentity.Pages;
 
 namespace API.Persistence.Repositories
@@ -25,6 +26,18 @@ namespace API.Persistence.Repositories
             }
         }
 
+        public async Task<List<User>> QueryUsersByIdsAsync(List<string> ids) 
+        {
+            try
+            {
+                return _context.Users.Where(user => ids.Contains(user.Id)).ToList();
+            }
+            catch (Exception) 
+            {
+                return [];
+            }
+        }
+
         public async Task<string> CreateUserAsync(User user)
         {
             try

API/Program.cs

@@ -43,7 +43,7 @@ namespace API
             builder.Services.AddScoped<DeleteUser>();
             builder.Services.AddScoped<LoginUser>();
             builder.Services.AddScoped<IUserRepository, UserRepository>();
-
+            builder.Services.AddScoped<QueryUsersByIds>();
 
             IConfiguration Configuration = builder.Configuration;
 

API/skantravels.service

@@ -8,6 +8,7 @@ Environment=PATH=$PATH:/home/reimar/.dotnet
 Environment=DEFAULT_CONNECTION="Data Source=/home/reimar/skantravels/database.sqlite3"
 ExecStartPre=/home/reimar/skantravels/efbundle
 ExecStart=/home/reimar/skantravels/API --urls=http://0.0.0.0:5001
+WorkingDirectory=/home/reimar/skantravels
 Type=simple
 
 [Install]

Docs/SCRUM Logbog.md

@@ -151,7 +151,7 @@ KC - Kundechef
 
 ## Torsdag
 
-**SM(Alexander):**
+**SM(Alexander):** Samarbejdede med Reimar omkring Refresh-tokens, mest med ide-fasen
 
 **PO(Reimar):** Begyndt på implementering af refresh tokens, fikset en fejl med en openssl dependency til vores release-flow
 
@@ -159,7 +159,7 @@ KC - Kundechef
 
 ## Fredag
 
-**SM(Alexander):**
+**SM(Alexander):** Holdt kundemøder
 
 **PO(Reimar):** Holdt kundemøder
 
@@ -177,7 +177,7 @@ KC - Kundechef
 
 ## Tirsdag
 
-**PO(Alexander):**
+**PO(Alexander):** Pair-programmede med Reimar om nedenstående features
 
 **KC(Reimar):** Implementeret reviews i rust backenden, fået vist dem som location pins på kortet
 
@@ -185,7 +185,7 @@ KC - Kundechef
 
 ## Onsdag
 
-**PO(Alexander):**
+**PO(Alexander):** Pair-programmede med Reimar om nedenstående features
 
 **KC(Reimar):** Implementeret review-liste når man klikker ind på én
 
@@ -193,7 +193,7 @@ KC - Kundechef
 
 ## Torsdag
 
-**PO(Alexander):**
+**PO(Alexander):** Pair-programmede med Reimar om nedenstående features
 
 **KC(Reimar):** Lavet create review-side, tilføjet stjerner til review-liste
 
@@ -201,7 +201,7 @@ KC - Kundechef
 
 ## Fredag
 
-**PO(Alexander):**
+**PO(Alexander):** Hjalp med kundemøder 
 
 **KC(Reimar):** Holdt kundemøder
 
@@ -211,49 +211,59 @@ KC - Kundechef
 
 ## Mandag
 
-**KC(Alexander):**
+**KC(Alexander):** Aftalte udviklermøde
 
-**SM(Reimar):**
+**SM(Reimar):** Påbegyndt implementation af AWS image upload i Rust
 
-**PO(Philip):**
+**PO(Philip):** Fik billede upload til at virke efter reimar sagde at jeg skulle sende fra flutter som en form i stedet for JSON
 
 ## Tirsdag
 
 **KC(Alexander):**
 
-**SM(Reimar):**
+**SM(Reimar):** Færdiggjort image uploads i Rust
 
-**PO(Philip):**
+**PO(Philip):** intet med kundegruppen. Fik billede til at vise icon hvis der ikke var billede. og det nye billede blev vist efter man havde savet
 
 ## Onsdag
 
-**KC(Alexander):**
+**KC(Alexander):** Afholdte udviklermøde
 
-**SM(Reimar):**
+**SM(Reimar):** Tilføjet billeder til reviews, lavet backend til at vise bruger-information på review-liste
 
-**PO(Philip):**
+**PO(Philip):** Kiggede på openai. planlage møde med kundegruppe
 
 ## Torsdag
 
 **KC(Alexander):**
 
-**SM(Reimar):**
+**SM(Reimar):** Holdt møde, fikset min cykel
 
-**PO(Philip):**
+**PO(Philip):** fik overblik over hvad vi hver især skulle vise til kundegruppe mødet. openai blev ikke færdig
 
 ## Fredag
 
 **KC(Alexander):**
 
-**SM(Reimar):**
+**SM(Reimar):** Lavet frontend til at vise bruger-info på review-liste, implementeret sletning af reviews, fikset nogle fejl ved image upload
 
-**PO(Philip):**
+**PO(Philip):** Møde med kundegruppen hvor vi viste alt funktionallitet, dog ikke at det virkede fuldendt
 
-## Fredag
+# Uge 38
 
-**KC(Alexander):**
+## Mandag
 
-**SM(Reimar):**
+**SM(Alexander):** 
 
-**PO(Philip):**
+**PO(Reimar):** 
+
+**KC(Philip):** openai blev færdiglavet med guidebook
+
+## Tirsdag
+
+**SM(Alexander):** 
+
+**PO(Reimar):** 
+
+**KC(Philip):** for overblik over hvad vi skal sige til eksamen
 

Docs/case.md

@@ -1,3 +1,3 @@
 # Case beskrivelse
 
-Som kunde skal I beskrive det product som I ønsker! For eksempler se her - [Notion](https://mercantec.notion.site/Casebeskrivelse-og-Kravspec-60eb806216074896ae1b3c7f14d9b2b6?pvs=4)
+PDF[Case](https://edumercantec.sharepoint.com/:b:/s/24Q3H4-AppprogrammeringServerogmetodik/EbZ4bfQ_4xhJlUp6dVJMmbEBq7saaqfJJ8RuHLuPnVe6hw?e=yQoxXO)

Docs/setup.md

@@ -0,0 +1,22 @@
+## Setting up
+
+### C# backend
+
+In the `API` folder, copy `appsettings.example.json` to `appsettings.json` and fill out the values. `AccessKey` and `SecretKey` are for the Cloudflare R2 service.
+
+Run `dotnet ef database update` and then `dotnet run`.
+
+### Rust backend
+
+In the `rust-backend` folder, copy `.env.example` to `.env` and fill out the values. Make sure the JWT secret is the same on both backends.
+
+Rust can be installed from <https://rustup.rs>. After installation, run `rustup default stable` in the terminal.
+
+To start the backend, run `cargo run`.
+
+### Flutter
+
+In the `Mobile` folder, copy `environment.example.json` to `environment.json` and fill out the values. Also do this with `.env.example`, copying it into `.env`.
+
+Run `flutter run --dart-define-from-file environment.json`.
+

Mobile/android/app/src/main/AndroidManifest.xml

@@ -3,7 +3,7 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <application
-        android:label="mobile"
+        android:label="SkanTravels"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
         <activity

Mobile/build-apk.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+java -version
+flutter build apk --split-per-abi --no-shrink --dart-define-from-file environment.prod.json
+

Mobile/environment.prod.json

@@ -0,0 +1,4 @@
+{
+  "AUTH_SERVICE_HOST": "https://skantravels.reim.ar",
+  "APP_SERVICE_HOST": "https://skantravels.reim.ar"
+}

Mobile/lib/main.dart

@@ -20,7 +20,11 @@ import 'services/api.dart' as api;
 import 'package:http/http.dart' as http;
 
 void main() async {
+  WidgetsFlutterBinding.ensureInitialized();
+
   await dotenv.load(fileName: ".env");
+
+  // Refresh JWT on startup
   final prefs = await SharedPreferences.getInstance();
   if (prefs.getString("token") != null && prefs.getString("refresh-token") != null) {
     final token = await api.request(null, api.ApiService.auth, "POST", "/RefreshToken", {'refreshToken': prefs.getString("refresh-token")});
@@ -250,38 +254,47 @@ class _MyHomePageState extends State<MyHomePage> {
     });
   }
 
- Future<void> _onSearch() async {
-  final http.Response response = await http.get(
-    Uri.parse('https://nominatim.openstreetmap.org/search.php?q=${searchBarInput.text}&format=jsonv2'),
-    headers: {'User-Agent': 'SkanTravels/1.0'}
-  );
+  Future<void> _onSearch() async {
+    final http.Response response = await http.get(
+      Uri.parse('https://nominatim.openstreetmap.org/search.php?q=${searchBarInput.text}&format=jsonv2'),
+      headers: {'User-Agent': 'SkanTravels/1.0'}
+    );
 
-  final dynamic location = jsonDecode(response.body);
+    final dynamic location = jsonDecode(response.body);
 
-  // Move the map to the center of the first search result
-  _mapController.move(
-    LatLng(double.parse(location[0]['lat']), double.parse(location[0]['lon'])), 
-    8
-  );
+    // Move the map to the center of the first search result
+    _mapController.move(
+      LatLng(double.parse(location[0]['lat']), double.parse(location[0]['lon'])),
+      8
+    );
 
-  // Extract the bounding box and convert to LatLng
-  final List<dynamic> boundingBox = location[0]['boundingbox'];
+    // Extract the bounding box and convert to LatLng
+    final List<dynamic> boundingBox = location[0]['boundingbox'];
 
-  _getOpenStreetMapData(LatLng(double.parse(boundingBox[0]), double.parse(boundingBox[2])), LatLng(double.parse(boundingBox[1]), double.parse(boundingBox[3])));
-}
+    _getOpenStreetMapData(LatLng(double.parse(boundingBox[0]), double.parse(boundingBox[2])), LatLng(double.parse(boundingBox[1]), double.parse(boundingBox[3])));
+  }
 
- Future<void> _getCurrentLocation() async {
-    LocationPermission permission = await Geolocator.checkPermission();
-    if(permission != LocationPermission.always || permission != LocationPermission.whileInUse){
+  Future<void> _getCurrentLocation() async {
+    LocationPermission? permission;
+    try {
+      permission = await Geolocator.requestPermission();
+    } catch (e) {
+      ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('Error retrieving location: $e')));
+      return;
     }
-    else{
-      await Geolocator.requestPermission();
+
+    if (permission != LocationPermission.always && permission != LocationPermission.whileInUse) {
+      ScaffoldMessenger.of(context).showSnackBar(const SnackBar(content: Text('Location permission denied')));
+      return;
     }
+
     Position position = await Geolocator.getCurrentPosition(desiredAccuracy: LocationAccuracy.high);
     _mapController.move(LatLng(position.latitude, position.longitude), 10);
+
     setState(() {
       _userPosition = LatLng(position.latitude, position.longitude);
     });
+
     LatLngBounds bounds = _mapController.camera.visibleBounds;
 
     _getOpenStreetMapData(LatLng(bounds.southWest.latitude, bounds.southWest.longitude),LatLng(bounds.northEast.latitude, bounds.northEast.longitude));

Mobile/lib/reviewlist.dart

@@ -1,6 +1,9 @@
+import 'dart:convert';
+
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:mobile/base/sidemenu.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 import 'models.dart' as models;
 import 'services/api.dart' as api;
 
@@ -12,64 +15,147 @@ class ReviewListPage extends StatefulWidget {
 }
 
 class _ReviewListState extends State<ReviewListPage> {
+  List<models.User> _users = [];
+  List<models.Review> _reviews = [];
+  String? _currentUserId;
+
+  models.User? _getReviewUser(models.Review review) {
+    try {
+      return _users.firstWhere((user) => user.id == review.userId);
+    } catch(e) {
+      return null;
+    }
+  }
+
+  void _confirmDeleteReview(models.Review review) {
+    showDialog(context: context, builder: (BuildContext context) =>
+      AlertDialog(
+        title: const Text('Delete review'),
+        content: const Text('Are you sure you want to delete this review?'),
+        actions: [
+          TextButton(child: const Text('Cancel'), onPressed: () => Navigator.pop(context)),
+          TextButton(child: const Text('Delete', style: TextStyle(color: Colors.red)), onPressed: () => _deleteReview(review)),
+        ]
+      )
+    );
+  }
+
+  void _deleteReview(models.Review review) async {
+    Navigator.pop(context);
+
+    final response = await api.request(context, api.ApiService.app, 'DELETE', '/reviews/${review.id}', null);
+    if (response == null) return;
+
+    setState(() {
+      _reviews = _reviews.where((r) => r.id != review.id).toList();
+    });
+
+    ScaffoldMessenger.of(context).showSnackBar(const SnackBar(content: Text('Review deleted successfully')));
+  }
+
+  @override
+  void didChangeDependencies() async {
+    super.didChangeDependencies();
+
+    final prefs = await SharedPreferences.getInstance();
+    _currentUserId = prefs.getString('id');
+
+    final arg = ModalRoute.of(context)!.settings.arguments as models.ReviewList;
+    _reviews = arg.reviews;
+
+    if (_reviews.isEmpty || !mounted) {
+      return;
+    }
+
+    final userIds = _reviews.map((review) => review.userId).toSet().toList();
+
+    final response = await api.request(context, api.ApiService.auth, 'GET', '/api/Users/UsersByIds?userIds=' + userIds.join(','), null);
+    if (response == null) return;
+
+    setState(() {
+      _users = (jsonDecode(response) as List<dynamic>).map((user) => models.User.fromJson(user)).toList();
+    });
+  }
+
   @override
   Widget build(BuildContext context) {
     final arg = ModalRoute.of(context)!.settings.arguments as models.ReviewList;
-    final reviews = arg.reviews;
     final place = arg.place;
 
     return SideMenu(
       selectedIndex: -1,
       body: Scaffold(
         backgroundColor: const Color(0xFFF9F9F9),
-        body: SingleChildScrollView(child: Container(
-          decoration: const BoxDecoration(color: Color(0xFFF9F9F9)),
-          width: MediaQuery.of(context).size.width,
-          padding: const EdgeInsets.all(20.0),
-          child: Column(children:
-            reviews.map((review) => Container(
-              width: double.infinity,
-              padding: const EdgeInsets.all(20),
-              margin: const EdgeInsets.only(bottom: 10),
-              decoration: const BoxDecoration(
-                boxShadow: [
-                  BoxShadow(
-                    color: Color(0x20000000),
-                    offset: Offset(0,1),
-                    blurRadius: 4,
+        body: _reviews.isEmpty
+          ? const Center(child: Text('No reviews yet. Be the first to review this place'))
+          : SingleChildScrollView(child: Container(
+            decoration: const BoxDecoration(color: Color(0xFFF9F9F9)),
+            width: MediaQuery.of(context).size.width,
+            padding: const EdgeInsets.all(20.0),
+            child: Column(children: [
+              for (final review in _reviews)
+                Container(
+                  width: double.infinity,
+                  padding: const EdgeInsets.all(20),
+                  margin: const EdgeInsets.only(bottom: 10),
+                  decoration: const BoxDecoration(
+                    boxShadow: [
+                      BoxShadow(
+                        color: Color(0x20000000),
+                        offset: Offset(0,1),
+                        blurRadius: 4,
+                      ),
+                    ],
+                    color: Colors.white,
                   ),
-                ],
-                color: Colors.white,
-              ),
-              child: Row(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  const Padding(
-                    padding: EdgeInsets.only(top: 3),
-                    child: Icon(Icons.rate_review, color: Colors.purple, size: 36),
+                  child: Row(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Padding(
+                        padding: const EdgeInsets.only(top: 3),
+                        child:
+                          _getReviewUser(review)?.profilePicture.isNotEmpty == true
+                          ? ClipOval(
+                              child: Image(
+                                image: NetworkImage(_getReviewUser(review)!.profilePicture),
+                                height: 36,
+                                width: 36,
+                                fit: BoxFit.cover,
+                              ),
+                            )
+                          : const Icon(
+                              Icons.account_circle,
+                              size: 36,
+                              color: Colors.grey,
+                            )
+                      ),
+                      const SizedBox(width: 20),
+                      Expanded(
+                        child: Column(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: [
+                            Row(children: [
+                              Expanded(child: Text(review.title, style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 24))),
+                              if (review.userId == _currentUserId) IconButton(onPressed: () => _confirmDeleteReview(review), icon: const Icon(Icons.delete, color: Colors.grey)),
+                            ]),
+                            Text(review.content),
+                            const SizedBox(height: 10),
+                            if (review.image != null) Image.network(review.image!.imageUrl, height: 200),
+                            if (review.image != null) const SizedBox(height: 15),
+                            Row(children: [
+                              for (var i = 0; i < review.rating; i++) const Icon(Icons.star, color: Colors.yellow),
+                              for (var i = review.rating; i < 5; i++) const Icon(Icons.star_border),
+                            ]),
+                            const SizedBox(height: 10),
+                            Text('Submitted by ' + (_getReviewUser(review)?.username ?? ''), style: const TextStyle(color: Colors.grey, fontSize: 12)),
+                          ],
+                        ),
+                      ),
+                    ],
                   ),
-                  const SizedBox(width: 20),
-                  Expanded(
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        Text(review.title, style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 24)),
-                        Text(review.content),
-                        const SizedBox(height: 10),
-                        if (review.image != null) Image.network(review.image!.imageUrl, height: 200,),
-                        if (review.image != null) const SizedBox(height: 15),
-                        Row(children: [
-                          for (var i = 0; i < review.rating; i++) const Icon(Icons.star, color: Colors.yellow),
-                          for (var i = review.rating; i < 5; i++) const Icon(Icons.star_border),
-                        ]),
-                      ],
-                    ),
-                  ),
-                ],
-              ),
-            )).toList(),
-          ),
-        )),
+                ),
+            ]),
+          )),
         floatingActionButton: FloatingActionButton(
           onPressed: () async {
             if (!await api.isLoggedIn(context)) {
@@ -78,7 +164,7 @@ class _ReviewListState extends State<ReviewListPage> {
             }
 
             final review = await Navigator.pushNamed(context, '/create-review', arguments: place) as models.Review?;
-            if (review != null) reviews.add(review);
+            if (review != null) _reviews.add(review);
           },
           backgroundColor: Colors.blue,
           focusColor: Colors.blueGrey,

Mobile/lib/services/api.dart

@@ -13,6 +13,8 @@ enum ApiService {
 }
 
 Future<String?> request(BuildContext? context, ApiService service, String method, String path, dynamic body) async {
+  var debug = '$method $path\n    $body\n';
+
   final messenger = context != null ? ScaffoldMessenger.of(context) : null;
   final prefs = await SharedPreferences.getInstance();
 
@@ -47,18 +49,22 @@ Future<String?> request(BuildContext? context, ApiService service, String method
       );
     }
   } catch (e) {
-    debugPrint(e.toString());
     messenger?.showSnackBar(const SnackBar(content: Text('Unable to connect to server')));
+
+    debug += 'FAILED\n    $e';
+    debugPrint(debug);
+
     return null;
   }
 
+  debug += 'HTTP ${response.statusCode}\n    ${response.body}';
+  debugPrint(debug);
+
   if (response.statusCode < 200 || response.statusCode >= 300) {
     try {
       final json = jsonDecode(response.body);
       messenger?.showSnackBar(SnackBar(content: Text(json['message'] ?? json['title'])));
-      debugPrint('API error: ' + json['message']);
     } catch (e) {
-      debugPrint(e.toString());
       messenger?.showSnackBar(SnackBar(content: Text('Something went wrong (HTTP ${response.statusCode})')));
     }
     return null;

Mobile/pubspec.lock

@@ -210,10 +210,10 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: "9e8c3858111da373efc5aa341de011d9bd23e2c5c5e0c62bccf32438e192d7b1"
+      sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "4.0.0"
   flutter_map:
     dependency: "direct main"
     description:
@@ -428,10 +428,10 @@ packages:
     dependency: transitive
     description:
       name: lints
-      sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290
+      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.0"
+    version: "4.0.0"
   lists:
     dependency: transitive
     description:

Mobile/pubspec.yaml

@@ -55,7 +55,7 @@ dev_dependencies:
   # activated in the `analysis_options.yaml` file located at the root of your
   # package. See that file for information about deactivating specific lint
   # rules and activating additional ones.
-  flutter_lints: ^3.0.0
+  flutter_lints: ^4.0.0
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec

README.md

@@ -6,3 +6,8 @@ Vi vil udvikle en TuristApp for SkanTravles, som gør brug af telefonens sensore
 [Kravspecifikation](Docs/kravspec.md)
 
 [Logbog](Docs/SCRUM%20Logbog.md)
+
+[Setup guide](Docs/setup.md)
+
+[Figma design](https://www.figma.com/design/r5EkReHw6NVC3gd9DeIc0P/Gruppe-6---SkanTravels?node-id=0-1&t=FxBQswcVrzRnhR2T-1)
+

rust-backend/.env.example

@@ -0,0 +1,8 @@
+JWT_SECRET=DenHerMåAldrigVæreOffentligKunIDetteDemoProjekt
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=
+AWS_ENDPOINT_URL=
+AWS_REGION=
+R2_BUCKET_NAME=
+R2_BUCKET_URL=
+

rust-backend/skantravels-rust.service

@@ -6,6 +6,7 @@ After=network.target
 Environment=RUST_BACKEND_PORT=5002
 Environment=RUST_BACKEND_DB=/home/reimar/skantravels/database-rust.sqlite3
 ExecStart=/home/reimar/skantravels/skantravels
+WorkingDirectory=/home/reimar/skantravels
 Type=simple
 
 [Install]

rust-backend/src/main.rs

@@ -219,7 +219,9 @@ async fn create_review(auth: AuthorizedUser, data: web::Data<AppData>, input: we
             content: input.content.clone(),
             rating: input.rating.clone(),
             image_id: input.image_id,
-            image: None,
+            image: input.image_id.and_then(|image_id| {
+                db.query_row("SELECT * FROM images WHERE id = :id LIMIT 1", &[(":id", &image_id.to_string())], |row| Image::from_row(row)).ok()
+            }),
         }),
         Err(_) => HttpResponse::InternalServerError().finish(),
     }
@@ -328,7 +330,7 @@ async fn main() -> std::io::Result<()> {
             .app_data(web::Data::new(AppData {
                 database: conn.clone(),
             }))
-            .app_data(web::PayloadConfig::new(8_388_608))
+            .app_data(web::PayloadConfig::new(30 * 1024 * 1024))
             .service(healthcheck)
             .service(authorized)
             .service(favorites)