wien_talks/wien_talks_client/lib/src/protocol/client.dart

@@ -42,21 +42,6 @@ class EndpointQuote extends _i1.EndpointRef {
   @override
   String get name => 'quote';
 
-  _i2.Future<void> updateQuote(_i4.Quote quote) =>
-      caller.callServerEndpoint<void>(
-        'quote',
-        'updateQuote',
-        {'quote': quote},
-      );
-
-  _i2.Stream<_i4.Quote> quoteUpdates() =>
-      caller.callStreamingServerEndpoint<_i2.Stream<_i4.Quote>, _i4.Quote>(
-        'quote',
-        'quoteUpdates',
-        {},
-        {},
-      );
-
   _i2.Future<_i4.Quote> createQuote(_i5.CreateQuoteRequest req) =>
       caller.callServerEndpoint<_i4.Quote>(
         'quote',

wien_talks/wien_talks_flutter/android/app/build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 }
 
 android {
-    namespace = "com.wien_talks"
+    namespace = "com.example.wien_talks_flutter"
     compileSdk = flutter.compileSdkVersion
     ndkVersion = flutter.ndkVersion
 
@@ -21,7 +21,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId = "com.wien_talks"
+        applicationId = "com.example.wien_talks_flutter"
         // You can update the following values to match your application needs.
         // For more information, see: https://flutter.dev/to/review-gradle-config.
         minSdk = flutter.minSdkVersion

wien_talks/wien_talks_flutter/android/app/src/main/kotlin/com/example/wien_talks_flutter/MainActivity.kt

@@ -1,4 +1,4 @@
-package com.wien_talks
+package com.example.wien_talks_flutter
 
 import io.flutter.embedding.android.FlutterActivity
 

wien_talks/wien_talks_flutter/lib/create_event_screen.dart

@@ -15,7 +15,7 @@ class CreateEventScreen extends StatelessWidget {
     return ScreenWidget(
         child: Column(
       children: [
-        NewsInputForm(),
+        NewsInputForm(onSubmit: (newsEventModel) {}),
         StreamBuilder(stream: LocationMgr().stream, builder: (BuildContext context, AsyncSnapshot<LocationData> snapshot) => Text(snapshot.data.toString())),
         Expanded(
           child: GetLocationWidget(

wien_talks/wien_talks_flutter/lib/location_mgr.dart

@@ -93,7 +93,6 @@ class LocationMgr {
     iconMarker = null;
     viewModel?.dispose();
     viewModel = null;
-    _lastLocationData = null;
   }
 
   Stream<LocationData> get stream => _subject.stream;

wien_talks/wien_talks_flutter/lib/main.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:serverpod_flutter/serverpod_flutter.dart';
 import 'package:wien_talks_client/wien_talks_client.dart';
-import 'package:wien_talks_flutter/helper/go_router.dart';
+import 'package:wien_talks_flutter/go_router.dart';
 
 /// Sets up a global client object that can be used to talk to the server from
 /// anywhere in our app. The client is generated from your server code
@@ -21,13 +21,9 @@ void main() {
   // You can set the variable when running or building your app like this:
   // E.g. `flutter run --dart-define=SERVER_URL=https://api.example.com/`
   const serverUrlFromEnv = String.fromEnvironment('SERVER_URL');
-  final serverUrl =
+  final serverUrl = serverUrlFromEnv.isEmpty ? 'http://$localhost:8080/' : serverUrlFromEnv;
-      serverUrlFromEnv.isEmpty ? 'http://$localhost:8080/' : serverUrlFromEnv;
 
-  client = Client(serverUrl)
+  client = Client(serverUrl)..connectivityMonitor = FlutterConnectivityMonitor();
-    ..connectivityMonitor = FlutterConnectivityMonitor();
-
-  client.openStreamingConnection();
 
   runApp(const MyApp());
 }
@@ -38,7 +34,7 @@ class MyApp extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return MaterialApp.router(
-      title: 'Wien Talks',
+      title: 'Serverpod Demo',
       theme: ThemeData(primarySwatch: Colors.blue),
       routerConfig: router,
       //home: NewsScreen(),

wien_talks/wien_talks_flutter/lib/news_input_form.dart

@@ -1,13 +1,10 @@
 import 'package:flutter/material.dart';
-import 'package:loader_overlay/loader_overlay.dart';
+import 'package:wien_talks_flutter/models/news_event_model.dart';
-import 'package:location/location.dart';
-import 'package:wien_talks_client/wien_talks_client.dart';
-import 'package:wien_talks_flutter/location_mgr.dart';
-import 'package:wien_talks_flutter/main.dart';
-import 'package:wien_talks_flutter/widgets/error_snackbar.dart';
 
 class NewsInputForm extends StatefulWidget {
-  const NewsInputForm({super.key});
+  final Function(NewsEventModel) onSubmit;
+
+  const NewsInputForm({Key? key, required this.onSubmit}) : super(key: key);
 
   @override
   _NewsInputFormState createState() => _NewsInputFormState();
@@ -23,29 +20,16 @@ class _NewsInputFormState extends State<NewsInputForm> {
     super.dispose();
   }
 
-  void _submitForm() async {
+  void _submitForm() {
-    LocationData? locationData = LocationMgr().lastLocation;
-    if (locationData == null || locationData.latitude == null || locationData.longitude == null) {
-      ErrorSnackbar().show(context, "No location available, please retry later");
-      return;
-    }
     if (_formKey.currentState!.validate()) {
-      var handler = context.loaderOverlay..show();
+      final newsData = NewsEventModel(
-      try {
+        content: _newsController.text.trim(),
-        final newsData = CreateQuoteRequest(
+        timestamp: DateTime.now(),
-          text: _newsController.text.trim(),
+        latitude: 0.0,
-          lat: LocationMgr().lastLocation!.latitude!,
+        longitude: 0.0,
-          lng: LocationMgr().lastLocation!.longitude!,
+      );
-        );
+      widget.onSubmit(newsData);
-        await client.quote.createQuote(newsData);
+      _newsController.clear();
-        _newsController.clear();
-      } catch (error) {
-        if (mounted) {
-          ErrorSnackbar().show(context, error.toString());
-        }
-      } finally {
-        handler.hide();
-      }
     }
   }
 

wien_talks/wien_talks_flutter/lib/news_screen.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
-import 'package:wien_talks_flutter/show_latest_news_widget.dart';
 import 'package:wien_talks_flutter/widgets/heading_text.dart';
 import 'package:wien_talks_flutter/widgets/screen_widget.dart';
 
@@ -11,32 +10,17 @@ class NewsScreen extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    var column = Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        HeadingText(text: "Latest news"),
-        ...[Text("News 1"), Text("News 2")],
-        SizedBox(
-          height: 30,
-        ),
-        OutlinedButton(
-            onPressed: () {
-              context.pushNamed("create_event");
-            },
-            child: Text("Submit your own event")),
-      ],
-    );
     return ScreenWidget(
       child: SingleChildScrollView(
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
             HeadingText(text: "Latest news"),
-            ShowLatestNewsWidget(),
+            ...[Text("News 1"), Text("News 2")],
             SizedBox(
               height: 30,
             ),
-            ElevatedButton(
+            OutlinedButton(
                 onPressed: () {
                   context.pushNamed("create_event");
                 },

wien_talks/wien_talks_flutter/lib/show_latest_news_widget.dart

@@ -1,19 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:wien_talks_flutter/main.dart';
-
-class ShowLatestNewsWidget extends StatelessWidget {
-  const ShowLatestNewsWidget({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return StreamBuilder(
-        stream: client.quote.stream,
-        builder: (BuildContext context, AsyncSnapshot snapshot) {
-          if (snapshot.hasError) {
-            return Text('Error: ${snapshot.error}');
-          }
-          return Text(snapshot.data ?? "Be the first to submit amazing news!", style: TextStyle(fontSize: 20, color: Theme.of(context).colorScheme.error));
-          return Placeholder();
-        });
-  }
-}

wien_talks/wien_talks_flutter/lib/widgets/add-quote-fab.dart

@@ -1,17 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:wien_talks_client/wien_talks_client.dart';
-import 'package:wien_talks_flutter/main.dart';
-
-class AddQuoteFab extends StatelessWidget {
-  const AddQuoteFab({
-    super.key,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return FloatingActionButton(onPressed: () {
-      client.quote.createQuote(
-          CreateQuoteRequest(text: 'Quote Text', lat: 22, lng: 140));
-    });
-  }
-}

wien_talks/wien_talks_flutter/lib/widgets/error_snackbar.dart

@@ -1,12 +0,0 @@
-import 'package:flutter/material.dart';
-
-class ErrorSnackbar {
-  void show(BuildContext context, String message) {
-    ScaffoldMessenger.of(context).showSnackBar(SnackBar(
-      content: Text(message, style: TextStyle(color: Theme.of(context).colorScheme.onError)),
-      showCloseIcon: true,
-      duration: Duration(seconds: 30),
-      backgroundColor: Theme.of(context).colorScheme.error,
-    ));
-  }
-}

wien_talks/wien_talks_flutter/lib/widgets/screen_widget.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:loader_overlay/loader_overlay.dart';
 
 class ScreenWidget extends StatelessWidget {
   final Widget child;
@@ -12,11 +11,10 @@ class ScreenWidget extends StatelessWidget {
       appBar: AppBar(
         title: const Text('News'),
       ),
-//      floatingActionButton: AddQuoteFab(),
       body: SafeArea(
           child: Padding(
         padding: const EdgeInsets.all(8.0),
-        child: LoaderOverlay(child: child),
+        child: child,
       )),
     );
   }

wien_talks/wien_talks_flutter/linux/CMakeLists.txt

@@ -7,7 +7,7 @@ project(runner LANGUAGES CXX)
 set(BINARY_NAME "wien_talks_flutter")
 # The unique GTK application identifier for this application. See:
 # https://wiki.gnome.org/HowDoI/ChooseApplicationID
-set(APPLICATION_ID "com.wien_talks")
+set(APPLICATION_ID "com.example.wien_talks_flutter")
 
 # Explicitly opt in to modern CMake behaviors to avoid warnings with recent
 # versions of CMake.

wien_talks/wien_talks_flutter/macos/Flutter/GeneratedPluginRegistrant.swift

@@ -10,8 +10,11 @@ import file_picker
 import file_selector_macos
 import location
 import path_provider_foundation
+<<<<<<< Updated upstream
 import shared_preferences_foundation
 import sqflite_darwin
+=======
+>>>>>>> Stashed changes
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   ConnectivityPlusPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlusPlugin"))
@@ -19,6 +22,9 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
   LocationPlugin.register(with: registry.registrar(forPlugin: "LocationPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
+<<<<<<< Updated upstream
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
   SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))
+=======
+>>>>>>> Stashed changes
 }

wien_talks/wien_talks_flutter/pubspec.yaml

@@ -27,8 +27,6 @@ dependencies:
 
   go_router: ^16.1.0
 
-  loader_overlay: ^5.0.0
-
   location: ^8.0.1
 
   mapsforge_flutter: ^3.0.2

wien_talks/wien_talks_server/.gitignore

@@ -16,4 +16,3 @@ config/firebase_service_account_key.json
 
 .env
 *.env
-config/

wien_talks/wien_talks_server/lib/src/generated/endpoints.dart

@@ -12,10 +12,9 @@
 import 'package:serverpod/serverpod.dart' as _i1;
 import '../greeting_endpoint.dart' as _i2;
 import '../quotes/quotes_endpoint.dart' as _i3;
-import 'package:wien_talks_server/src/generated/quotes/quote.dart' as _i4;
 import 'package:wien_talks_server/src/generated/quotes/create_quote.dart'
-    as _i5;
+    as _i4;
-import 'package:serverpod_auth_server/serverpod_auth_server.dart' as _i6;
+import 'package:serverpod_auth_server/serverpod_auth_server.dart' as _i5;
 
 class Endpoints extends _i1.EndpointDispatch {
   @override
@@ -62,30 +61,12 @@ class Endpoints extends _i1.EndpointDispatch {
       name: 'quote',
       endpoint: endpoints['quote']!,
       methodConnectors: {
-        'updateQuote': _i1.MethodConnector(
-          name: 'updateQuote',
-          params: {
-            'quote': _i1.ParameterDescription(
-              name: 'quote',
-              type: _i1.getType<_i4.Quote>(),
-              nullable: false,
-            )
-          },
-          call: (
-            _i1.Session session,
-            Map<String, dynamic> params,
-          ) async =>
-              (endpoints['quote'] as _i3.QuoteEndpoint).updateQuote(
-            session,
-            params['quote'],
-          ),
-        ),
         'createQuote': _i1.MethodConnector(
           name: 'createQuote',
           params: {
             'req': _i1.ParameterDescription(
               name: 'req',
-              type: _i1.getType<_i5.CreateQuoteRequest>(),
+              type: _i1.getType<_i4.CreateQuoteRequest>(),
               nullable: false,
             )
           },
@@ -125,20 +106,8 @@ class Endpoints extends _i1.EndpointDispatch {
           ) async =>
               (endpoints['quote'] as _i3.QuoteEndpoint).getAllQuotes(session),
         ),
-        'quoteUpdates': _i1.MethodStreamConnector(
-          name: 'quoteUpdates',
-          params: {},
-          streamParams: {},
-          returnType: _i1.MethodStreamReturnType.streamType,
-          call: (
-            _i1.Session session,
-            Map<String, dynamic> params,
-            Map<String, Stream> streamParams,
-          ) =>
-              (endpoints['quote'] as _i3.QuoteEndpoint).quoteUpdates(session),
-        ),
       },
     );
-    modules['serverpod_auth'] = _i6.Endpoints()..initializeEndpoints(server);
+    modules['serverpod_auth'] = _i5.Endpoints()..initializeEndpoints(server);
   }
 }

wien_talks/wien_talks_server/lib/src/generated/protocol.yaml

@@ -1,8 +1,6 @@
 greeting:
   - hello:
 quote:
-  - updateQuote:
-  - quoteUpdates:
   - createQuote:
   - getQuoteById:
   - getAllQuotes:

wien_talks/wien_talks_server/lib/src/quotes/quotes_endpoint.dart

@@ -1,6 +1,6 @@
 import 'package:serverpod/serverpod.dart';
 import 'package:wien_talks_server/src/generated/protocol.dart';
-import 'package:wien_talks_server/src/quotes/quote_util.dart';
+import 'package:wien_talks_server/src/quotes/quote_controller.dart';
 
 class QuoteEndpoint extends Endpoint {
   static const _channelQuoteUpdates = 'quote-updates';

wien_talks/wien_talks_server/test/integration/test_tools/serverpod_test_tools.dart

@@ -177,64 +177,6 @@ class _QuoteEndpoint {
 
   final _i2.SerializationManager _serializationManager;
 
-  _i3.Future<void> updateQuote(
-    _i1.TestSessionBuilder sessionBuilder,
-    _i5.Quote quote,
-  ) async {
-    return _i1.callAwaitableFunctionAndHandleExceptions(() async {
-      var _localUniqueSession =
-          (sessionBuilder as _i1.InternalTestSessionBuilder).internalBuild(
-        endpoint: 'quote',
-        method: 'updateQuote',
-      );
-      try {
-        var _localCallContext = await _endpointDispatch.getMethodCallContext(
-          createSessionCallback: (_) => _localUniqueSession,
-          endpointPath: 'quote',
-          methodName: 'updateQuote',
-          parameters: _i1.testObjectToJson({'quote': quote}),
-          serializationManager: _serializationManager,
-        );
-        var _localReturnValue = await (_localCallContext.method.call(
-          _localUniqueSession,
-          _localCallContext.arguments,
-        ) as _i3.Future<void>);
-        return _localReturnValue;
-      } finally {
-        await _localUniqueSession.close();
-      }
-    });
-  }
-
-  _i3.Stream<_i5.Quote> quoteUpdates(_i1.TestSessionBuilder sessionBuilder) {
-    var _localTestStreamManager = _i1.TestStreamManager<_i5.Quote>();
-    _i1.callStreamFunctionAndHandleExceptions(
-      () async {
-        var _localUniqueSession =
-            (sessionBuilder as _i1.InternalTestSessionBuilder).internalBuild(
-          endpoint: 'quote',
-          method: 'quoteUpdates',
-        );
-        var _localCallContext =
-            await _endpointDispatch.getMethodStreamCallContext(
-          createSessionCallback: (_) => _localUniqueSession,
-          endpointPath: 'quote',
-          methodName: 'quoteUpdates',
-          arguments: {},
-          requestedInputStreams: [],
-          serializationManager: _serializationManager,
-        );
-        await _localTestStreamManager.callStreamMethod(
-          _localCallContext,
-          _localUniqueSession,
-          {},
-        );
-      },
-      _localTestStreamManager.outputStreamController,
-    );
-    return _localTestStreamManager.outputStreamController.stream;
-  }
-
   _i3.Future<_i5.Quote> createQuote(
     _i1.TestSessionBuilder sessionBuilder,
     _i6.CreateQuoteRequest req,