API/API.csproj

@@ -10,10 +10,6 @@
     <DockerfileContext>.</DockerfileContext>
   </PropertyGroup>
 
-  <ItemGroup>
-    <_ContentIncludedByDefault Remove="appsettings.json" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="AWSSDK.S3" Version="3.7.402.4" />
     <PackageReference Include="BCrypt.Net-Next" Version="4.0.3" />

Mobile/.env

@@ -1 +0,0 @@
-OPENAI_API_KEY=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

Mobile/.gitignore

@@ -43,4 +43,5 @@ app.*.map.json
 /android/app/release
 
 environment.json
-node_modules
+node_modules
+.env

Mobile/lib/base/sidemenu.dart

@@ -106,7 +106,7 @@ class _SideMenuState extends State<SideMenu> {
             ),
             ListTile(
               title: const Text('GuideBook'),
-              leading: const Icon(Icons.menu_book_sharp),
+              leading: const Icon(Icons.person),
               selected: _selectedIndex == 5,
               onTap: () {
                 Navigator.pushReplacementNamed(context, '/tourist-guide-book');
@@ -126,19 +126,6 @@ class _SideMenuState extends State<SideMenu> {
                   ),
                 ]
               : [
-                ListTile(
-                  title: const Text('GuideBook'),
-                  leading: const Icon(Icons.menu_book_sharp),
-                  selected: _selectedIndex == 5,
-                  onTap: () {
-                    Navigator.pushReplacementNamed(context, '/tourist-guide-book');
-                  },
-                ),
-                const Divider(
-                  color: Colors.grey,
-                  thickness: 2,
-                  indent: 40,
-                ),
                   ListTile(
                     title: const Text('Register'),
                     leading: const Icon(Icons.add_box_outlined),

Mobile/lib/main.dart

@@ -15,12 +15,11 @@ import 'base/sidemenu.dart';
 import 'profile.dart';
 import 'models.dart';
 import 'package:geolocator/geolocator.dart';
-import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'services/api.dart' as api;
 import 'package:http/http.dart' as http;
 
 void main() async {
-  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")});

Mobile/lib/services/openaiservice.dart

@@ -3,7 +3,7 @@ import 'dart:convert';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
 
 class OpenAIService {
-  static Future<String> getGuideBook(String country) async {
+  static Future<Map<String, dynamic>> getGuideBook(String country) async {
     final apiKey = dotenv.env['OPENAI_API_KEY'];
     final uri = Uri.parse('https://api.openai.com/v1/chat/completions');
 
@@ -16,10 +16,9 @@ class OpenAIService {
         },
         {
           "role": "user",
-          "content": "Make a tourist guide book over $country. The topics should be: A little introduction to how the people of the country is like and what to expect from the environment, famous tourist attractions in the country(amusement park always included), Basic words that would be nice to learn in the country's language(should always be from English to the country's language) and transportation. These topics should be in a Json-Object format in this form: {Country: {introduction: {people: , environment: }, tourist_attractions: {famous_sites: [{name: , description: }]}, basic_words: {}, transportation: {overview: , public_transport: {buses: , trains: , taxis: }}}}"
+          "content": "Make a tourist guide book over $country. The topics should be: A little introduction to how the people of the country is like and what to expect from the environment, famous tourist attractions in the country(amusement park always included), Basic words that would be nice to learn in the country's language(should always be from English to the country's language) and transportation. These topics should be in a Json-Object format."
         }
       ],
-       "max_tokens": 1500
     });
 
     final response = await http.post(
@@ -31,25 +30,20 @@ class OpenAIService {
       body: requestBody,
     );
 
-   if (response.statusCode == 200) {
-      final decodedBody = utf8.decode(response.bodyBytes);
-      final data = jsonDecode(decodedBody);
-      var content = data['choices'][0]['message']['content'];
+    if (response.statusCode == 200) {
 
-      content = content.replaceAll('```json', '').replaceAll('```', '').trim();
-
-      return _extractDescription(content);
+      try {
+        return jsonDecode(response.body);
+      } catch (e) {
+        return {
+          'navn': 'Fejl',
+          'art': 'Ukendt',
+          'type': 'Fejl',
+          'description': 'Fejl ved JSON parsing: $e'
+        };
+      }
     } else {
-      throw Exception('Fejl ved billedanalyse: ${response.statusCode}');
+      throw Exception('Fejl ved hentning af data: ${response.statusCode}');
     }
   }
-
-  static String _extractDescription(String content) {
-    final lines = content.split('\n');
-    final startIndex = lines.indexWhere((line) => line.startsWith('**Beskrivelse:**'));
-
-    if (startIndex == -1) return content;
-
-    return lines.skip(startIndex).join('\n').trim();
-  }
 }

Mobile/lib/touristguidebook.dart

@@ -1,8 +1,12 @@
-import 'dart:convert';
 import 'package:dropdown_search/dropdown_search.dart';
 import 'package:flutter/material.dart';
 import 'package:mobile/base/sidemenu.dart';
+import 'package:mobile/models.dart' as models;
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:google_fonts/google_fonts.dart';
+import 'dart:convert';
 import 'services/openaiservice.dart' as api;
+import 'base/variables.dart';
 
 class TouristGuideBookPage extends StatefulWidget {
   const TouristGuideBookPage({super.key});
@@ -13,66 +17,15 @@ class TouristGuideBookPage extends StatefulWidget {
 
 class _TouristGuideBookPageState extends State<TouristGuideBookPage> {
   String? _selectedCountry;
-  bool _isLoading = false;
-  Map<String, dynamic> _touristbook = {};
-    final List<String> countries = [
-    "Afghanistan", "Albania", "Algeria", "Andorra", "Angola", "Argentina",
-    "Armenia", "Australia", "Austria", "Azerbaijan", "Bahamas", "Bahrain",
-    "Bangladesh", "Barbados", "Belarus", "Belgium", "Belize", "Benin",
-    "Bhutan", "Bolivia", "Bosnia and Herzegovina", "Botswana", "Brazil",
-    "Brunei", "Bulgaria", "Burkina Faso", "Burundi", "Cabo Verde", "Cambodia",
-    "Cameroon", "Canada", "Central African Republic", "Chad", "Chile", "China",
-    "Colombia", "Comoros", "Congo (Congo-Brazzaville)", "Congo (Democratic Republic)",
-    "Costa Rica", "Croatia", "Cuba", "Cyprus", "Czech Republic", "Denmark",
-    "Djibouti", "Dominica", "Dominican Republic", "Ecuador", "Egypt", "El Salvador",
-    "Equatorial Guinea", "Eritrea", "Estonia", "Eswatini", "Ethiopia", "Fiji",
-    "Finland", "France", "Gabon", "Gambia", "Georgia", "Germany", "Ghana",
-    "Greece", "Grenada", "Guatemala", "Guinea", "Guinea-Bissau", "Guyana",
-    "Haiti", "Honduras", "Hungary", "Iceland", "India", "Indonesia", "Iran",
-    "Iraq", "Ireland", "Israel", "Italy", "Jamaica", "Japan", "Jordan", "Kazakhstan",
-    "Kenya", "Kiribati", "Kuwait", "Kyrgyzstan", "Laos", "Latvia", "Lebanon",
-    "Lesotho", "Liberia", "Libya", "Liechtenstein", "Lithuania", "Luxembourg",
-    "Madagascar", "Malawi", "Malaysia", "Maldives", "Mali", "Malta", "Marshall Islands",
-    "Mauritania", "Mauritius", "Mexico", "Micronesia", "Moldova", "Monaco",
-    "Mongolia", "Montenegro", "Morocco", "Mozambique", "Myanmar", "Namibia",
-    "Nauru", "Nepal", "Netherlands", "New Zealand", "Nicaragua", "Niger",
-    "Nigeria", "North Korea", "North Macedonia", "Norway", "Oman", "Pakistan",
-    "Palau", "Panama", "Papua New Guinea", "Paraguay", "Peru", "Philippines",
-    "Poland", "Portugal", "Qatar", "Romania", "Russia", "Rwanda", "Saint Kitts and Nevis",
-    "Saint Lucia", "Saint Vincent and the Grenadines", "Samoa", "San Marino",
-    "Sao Tome and Principe", "Saudi Arabia", "Senegal", "Serbia", "Seychelles",
-    "Sierra Leone", "Singapore", "Slovakia", "Slovenia", "Solomon Islands",
-    "Somalia", "South Africa", "South Korea", "South Sudan", "Spain", "Sri Lanka",
-    "Sudan", "Suriname", "Sweden", "Switzerland", "Syria", "Taiwan", "Tajikistan",
-    "Tanzania", "Thailand", "Timor-Leste", "Togo", "Tonga", "Trinidad and Tobago",
-    "Tunisia", "Turkey", "Turkmenistan", "Tuvalu", "Uganda", "Ukraine",
-    "United Arab Emirates", "United Kingdom", "United States", "Uruguay", "Uzbekistan",
-    "Vanuatu", "Vatican City", "Venezuela", "Vietnam", "Yemen", "Zambia", "Zimbabwe"
-];
+  final List<String> countries = [
+    "Afghanistan", "Albania", "Algeria", "Andorra", "Angola", "Argentina", 
+    // Add more countries
+  ];
 
   Future<void> getBook() async {
     if (_selectedCountry != null) {
-      setState(() {
-        _isLoading = true;
-      });
-
-      try {
-        final response = await api.OpenAIService.getGuideBook(_selectedCountry!);
-        print(response);
-        final jsonData = jsonDecode(response);
-        setState(() {
-          _touristbook = jsonData[_selectedCountry!];
-        });
-      } catch (e) {
-        print('Error fetching guidebook: $e');
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(content: Text('Failed to load guidebook')),
-        );
-      } finally {
-        setState(() {
-          _isLoading = false;
-        });
-      }
+      final response = await api.OpenAIService.getGuideBook(_selectedCountry!);
+      print(response);  // For debugging to check the response
     } else {
       ScaffoldMessenger.of(context).showSnackBar(
         const SnackBar(content: Text('Choose a country')),
@@ -80,102 +33,54 @@ class _TouristGuideBookPageState extends State<TouristGuideBookPage> {
     }
   }
 
-  Widget _buildTouristBookSection(String title, String content) {
-    return Padding(
-      padding: const EdgeInsets.symmetric(vertical: 8.0),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Text(title, style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold)),
-          SizedBox(height: 5),
-          Text(content, style: TextStyle(fontSize: 16)),
-        ],
-      ),
-    );
-  }
-
- @override
-Widget build(BuildContext context) {
-  return SideMenu(
-    selectedIndex: 5,
-    body: Scaffold(
-      appBar: AppBar(
-        title: Text('Select Country'),
-      ),
-      body: _isLoading
-          ? Center(child: CircularProgressIndicator())
-          : SingleChildScrollView( // Added SingleChildScrollView here
-              padding: const EdgeInsets.all(16.0),
-              child: Column(
-                children: [
-                  DropdownSearch<String>(
-                    items: countries,
-                    popupProps: const PopupProps.menu(
-                      showSearchBox: true,
-                      searchFieldProps: TextFieldProps(
-                        decoration: InputDecoration(
-                          labelText: "Search a country",
-                          border: OutlineInputBorder(),
-                        ),
-                      ),
-                    ),
-                    dropdownDecoratorProps: const DropDownDecoratorProps(
-                      dropdownSearchDecoration: InputDecoration(
-                        labelText: "Select a country",
-                        hintText: "Search a country",
+  @override
+  Widget build(BuildContext context) {
+    return SideMenu(
+      selectedIndex: 5,
+      body: Scaffold(
+        appBar: AppBar(
+          title: Text('Select Country'),
+        ),
+        body: Center(
+          child: Padding(
+            padding: const EdgeInsets.all(16.0),
+            child: Column(
+              children: [
+                DropdownSearch<String>(
+                  items: countries,
+                  popupProps: const PopupProps.menu(
+                    showSearchBox: true,
+                    searchFieldProps: TextFieldProps(
+                      decoration: InputDecoration(
+                        labelText: "Search a country",
                         border: OutlineInputBorder(),
                       ),
                     ),
-                    onChanged: (String? country) {
-                      setState(() {
-                        _selectedCountry = country;
-                      });
-                    },
-                    selectedItem: "Select a country you want a touristbook for",
                   ),
-                  SizedBox(height: 20),
-                  ElevatedButton(
-                    onPressed: getBook,
-                    child: Text('Get Guidebook'),
+                  dropdownDecoratorProps: const DropDownDecoratorProps(
+                    dropdownSearchDecoration: InputDecoration(
+                      labelText: "Select a country",
+                      hintText: "Search a country",
+                      border: OutlineInputBorder(),
+                    ),
                   ),
-                  if (_touristbook.isNotEmpty) ...[
-                    _buildTouristBookSection(
-                      "Introduction - People",
-                      _touristbook['introduction']?['people'] ?? 'No data',
-                    ),
-                    _buildTouristBookSection(
-                      "Introduction - Environment",
-                      _touristbook['introduction']?['environment'] ?? 'No data',
-                    ),
-                    _buildTouristBookSection(
-                      "Famous Sites",
-                      _touristbook['tourist_attractions']?['famous_sites']?.map((site) => site['name'] + ':\n' + site['description']).join('\n') ?? 'No data',
-                    ),
-                    _buildTouristBookSection(
-                      "Basic Language - Greetings",
-                      _touristbook['basic_words']?.entries.map((e) => '${e.key}: ${e.value}').join('\n') ?? 'No data',
-                    ),
-                    _buildTouristBookSection(
-                      "Transportation Overview",
-                      _touristbook['transportation']?['overview'] ?? 'No data',
-                    ),
-                    _buildTouristBookSection(
-                      "Public Transport - Buses",
-                      _touristbook['transportation']?['public_transport']?['buses'] ?? 'No data',
-                    ),
-                    _buildTouristBookSection(
-                      "Public Transport - Trains",
-                      _touristbook['transportation']?['public_transport']?['trains'] ?? 'No data',
-                    ),
-                    _buildTouristBookSection(
-                      "Public Transport - Taxis",
-                      _touristbook['transportation']?['public_transport']?['taxis'] ?? 'No data',
-                    ),
-                  ],
-                ],
-              ),
+                  onChanged: (String? country) {
+                    setState(() {
+                      _selectedCountry = country;
+                    });
+                  },
+                  selectedItem: "Select a country you want a touristbook for",
+                ),
+                ElevatedButton(
+                  onPressed: getBook,
+                  child: Text('Get Guidebook'),
+                ),
+              ],
             ),
-    ),
-  );
-}
+          ),
+        ),
+      ),
+    );
+  }
 }
+

Mobile/pubspec.yaml

@@ -64,7 +64,6 @@ dev_dependencies:
 flutter:
   assets:
     - assets/
-    - .env
   uses-material-design: true
 
   # To add assets to your application, add an assets section, like this: