mirror of
https://github.com/timokz/flutter-vienna-hackathon-25.git
synced 2025-11-08 19:04:20 +01:00
Compare commits
3 commits
aa20d32c27
...
c36081eddf
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c36081eddf | ||
|
|
b427b44e4c | ||
|
|
707dfbd76c |
22 changed files with 226 additions and 36 deletions
|
|
@ -42,6 +42,21 @@ 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',
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ plugins {
|
|||
}
|
||||
|
||||
android {
|
||||
namespace = "com.example.wien_talks_flutter"
|
||||
namespace = "com.wien_talks"
|
||||
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.example.wien_talks_flutter"
|
||||
applicationId = "com.wien_talks"
|
||||
// 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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package com.example.wien_talks_flutter
|
||||
package com.wien_talks
|
||||
|
||||
import io.flutter.embedding.android.FlutterActivity
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ class CreateEventScreen extends StatelessWidget {
|
|||
return ScreenWidget(
|
||||
child: Column(
|
||||
children: [
|
||||
NewsInputForm(onSubmit: (newsEventModel) {}),
|
||||
NewsInputForm(),
|
||||
StreamBuilder(stream: LocationMgr().stream, builder: (BuildContext context, AsyncSnapshot<LocationData> snapshot) => Text(snapshot.data.toString())),
|
||||
Expanded(
|
||||
child: GetLocationWidget(
|
||||
|
|
|
|||
|
|
@ -93,6 +93,7 @@ class LocationMgr {
|
|||
iconMarker = null;
|
||||
viewModel?.dispose();
|
||||
viewModel = null;
|
||||
_lastLocationData = null;
|
||||
}
|
||||
|
||||
Stream<LocationData> get stream => _subject.stream;
|
||||
|
|
|
|||
|
|
@ -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/go_router.dart';
|
||||
import 'package:wien_talks_flutter/helper/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,9 +21,13 @@ 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 = serverUrlFromEnv.isEmpty ? 'http://$localhost:8080/' : serverUrlFromEnv;
|
||||
final serverUrl =
|
||||
serverUrlFromEnv.isEmpty ? 'http://$localhost:8080/' : serverUrlFromEnv;
|
||||
|
||||
client = Client(serverUrl)..connectivityMonitor = FlutterConnectivityMonitor();
|
||||
client = Client(serverUrl)
|
||||
..connectivityMonitor = FlutterConnectivityMonitor();
|
||||
|
||||
client.openStreamingConnection();
|
||||
|
||||
runApp(const MyApp());
|
||||
}
|
||||
|
|
@ -34,7 +38,7 @@ class MyApp extends StatelessWidget {
|
|||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return MaterialApp.router(
|
||||
title: 'Serverpod Demo',
|
||||
title: 'Wien Talks',
|
||||
theme: ThemeData(primarySwatch: Colors.blue),
|
||||
routerConfig: router,
|
||||
//home: NewsScreen(),
|
||||
|
|
|
|||
|
|
@ -1,10 +1,13 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:wien_talks_flutter/models/news_event_model.dart';
|
||||
import 'package:loader_overlay/loader_overlay.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 {
|
||||
final Function(NewsEventModel) onSubmit;
|
||||
|
||||
const NewsInputForm({Key? key, required this.onSubmit}) : super(key: key);
|
||||
const NewsInputForm({super.key});
|
||||
|
||||
@override
|
||||
_NewsInputFormState createState() => _NewsInputFormState();
|
||||
|
|
@ -20,16 +23,29 @@ class _NewsInputFormState extends State<NewsInputForm> {
|
|||
super.dispose();
|
||||
}
|
||||
|
||||
void _submitForm() {
|
||||
void _submitForm() async {
|
||||
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()) {
|
||||
final newsData = NewsEventModel(
|
||||
content: _newsController.text.trim(),
|
||||
timestamp: DateTime.now(),
|
||||
latitude: 0.0,
|
||||
longitude: 0.0,
|
||||
var handler = context.loaderOverlay..show();
|
||||
try {
|
||||
final newsData = CreateQuoteRequest(
|
||||
text: _newsController.text.trim(),
|
||||
lat: LocationMgr().lastLocation!.latitude!,
|
||||
lng: LocationMgr().lastLocation!.longitude!,
|
||||
);
|
||||
widget.onSubmit(newsData);
|
||||
await client.quote.createQuote(newsData);
|
||||
_newsController.clear();
|
||||
} catch (error) {
|
||||
if (mounted) {
|
||||
ErrorSnackbar().show(context, error.toString());
|
||||
}
|
||||
} finally {
|
||||
handler.hide();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
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';
|
||||
|
||||
|
|
@ -10,9 +11,7 @@ class NewsScreen extends StatelessWidget {
|
|||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return ScreenWidget(
|
||||
child: SingleChildScrollView(
|
||||
child: Column(
|
||||
var column = Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
HeadingText(text: "Latest news"),
|
||||
|
|
@ -26,6 +25,23 @@ class NewsScreen extends StatelessWidget {
|
|||
},
|
||||
child: Text("Submit your own event")),
|
||||
],
|
||||
);
|
||||
return ScreenWidget(
|
||||
child: SingleChildScrollView(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
HeadingText(text: "Latest news"),
|
||||
ShowLatestNewsWidget(),
|
||||
SizedBox(
|
||||
height: 30,
|
||||
),
|
||||
ElevatedButton(
|
||||
onPressed: () {
|
||||
context.pushNamed("create_event");
|
||||
},
|
||||
child: Text("Submit your own event")),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,19 @@
|
|||
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();
|
||||
});
|
||||
}
|
||||
}
|
||||
17
wien_talks/wien_talks_flutter/lib/widgets/add-quote-fab.dart
Normal file
17
wien_talks/wien_talks_flutter/lib/widgets/add-quote-fab.dart
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
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));
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
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,
|
||||
));
|
||||
}
|
||||
}
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:loader_overlay/loader_overlay.dart';
|
||||
|
||||
class ScreenWidget extends StatelessWidget {
|
||||
final Widget child;
|
||||
|
|
@ -11,10 +12,11 @@ class ScreenWidget extends StatelessWidget {
|
|||
appBar: AppBar(
|
||||
title: const Text('News'),
|
||||
),
|
||||
// floatingActionButton: AddQuoteFab(),
|
||||
body: SafeArea(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(8.0),
|
||||
child: child,
|
||||
child: LoaderOverlay(child: child),
|
||||
)),
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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.example.wien_talks_flutter")
|
||||
set(APPLICATION_ID "com.wien_talks")
|
||||
|
||||
# Explicitly opt in to modern CMake behaviors to avoid warnings with recent
|
||||
# versions of CMake.
|
||||
|
|
|
|||
|
|
@ -10,11 +10,8 @@ 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"))
|
||||
|
|
@ -22,9 +19,6 @@ 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
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,6 +27,8 @@ dependencies:
|
|||
|
||||
go_router: ^16.1.0
|
||||
|
||||
loader_overlay: ^5.0.0
|
||||
|
||||
location: ^8.0.1
|
||||
|
||||
mapsforge_flutter: ^3.0.2
|
||||
|
|
|
|||
1
wien_talks/wien_talks_server/.gitignore
vendored
1
wien_talks/wien_talks_server/.gitignore
vendored
|
|
@ -16,3 +16,4 @@ config/firebase_service_account_key.json
|
|||
|
||||
.env
|
||||
*.env
|
||||
config/
|
||||
|
|
@ -12,9 +12,10 @@
|
|||
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 _i4;
|
||||
import 'package:serverpod_auth_server/serverpod_auth_server.dart' as _i5;
|
||||
as _i5;
|
||||
import 'package:serverpod_auth_server/serverpod_auth_server.dart' as _i6;
|
||||
|
||||
class Endpoints extends _i1.EndpointDispatch {
|
||||
@override
|
||||
|
|
@ -61,12 +62,30 @@ 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<_i4.CreateQuoteRequest>(),
|
||||
type: _i1.getType<_i5.CreateQuoteRequest>(),
|
||||
nullable: false,
|
||||
)
|
||||
},
|
||||
|
|
@ -106,8 +125,20 @@ 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'] = _i5.Endpoints()..initializeEndpoints(server);
|
||||
modules['serverpod_auth'] = _i6.Endpoints()..initializeEndpoints(server);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
greeting:
|
||||
- hello:
|
||||
quote:
|
||||
- updateQuote:
|
||||
- quoteUpdates:
|
||||
- createQuote:
|
||||
- getQuoteById:
|
||||
- getAllQuotes:
|
||||
|
|
|
|||
|
|
@ -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_controller.dart';
|
||||
import 'package:wien_talks_server/src/quotes/quote_util.dart';
|
||||
|
||||
class QuoteEndpoint extends Endpoint {
|
||||
static const _channelQuoteUpdates = 'quote-updates';
|
||||
|
|
|
|||
|
|
@ -177,6 +177,64 @@ 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,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue