Commit 3a0e8452 authored by Luca Braun's avatar Luca Braun

Bugfixes

parent ada25cad
2021/03/10-16:08:21.507 968 Reusing MANIFEST C:\Users\Luca\AppData\Local\Temp\flutter_tools.b6d5c3cf\flutter_tools_chrome_device.f8891a83\Default\AutofillStrikeDatabase/MANIFEST-000001
2021/03/10-16:08:21.423 347c Reusing MANIFEST C:\Users\Luca\AppData\Local\Temp\flutter_tools.b6d5c3cf\flutter_tools_chrome_device.f8891a83\Default\BudgetDatabase/MANIFEST-000001
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
2.0.1
\ No newline at end of file
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"integration_test","path":"C:\\\\Libs\\\\flutter\\\\packages\\\\integration_test\\\\","dependencies":[]}],"android":[{"name":"integration_test","path":"C:\\\\Libs\\\\flutter\\\\packages\\\\integration_test\\\\","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"integration_test","dependencies":[]}],"date_created":"2021-03-09 22:08:04.726748","version":"2.0.1"} <<<<<<< Updated upstream
\ No newline at end of file {"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"integration_test","path":"C:\\\\Libs\\\\flutter\\\\packages\\\\integration_test\\\\","dependencies":[]}],"android":[{"name":"integration_test","path":"C:\\\\Libs\\\\flutter\\\\packages\\\\integration_test\\\\","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"integration_test","dependencies":[]}],"date_created":"2021-03-09 22:08:04.726748","version":"2.0.1"}
=======
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"integration_test","path":"C:\\\\Users\\\\Luca\\\\Documents\\\\flutter\\\\flutter_windows_1.22.5-stable\\\\flutter\\\\packages\\\\integration_test\\\\","dependencies":[]}],"android":[{"name":"integration_test","path":"C:\\\\Users\\\\Luca\\\\Documents\\\\flutter\\\\flutter_windows_1.22.5-stable\\\\flutter\\\\packages\\\\integration_test\\\\","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"integration_test","dependencies":[]}],"date_created":"2021-03-10 16:07:42.326854","version":"2.0.1"}
>>>>>>> Stashed changes
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
# #
# For more info see: https://dart.dev/go/dot-packages-deprecation # For more info see: https://dart.dev/go/dot-packages-deprecation
# #
<<<<<<< Updated upstream
# Generated by pub on 2021-03-09 22:03:23.618434. # Generated by pub on 2021-03-09 22:03:23.618434.
apex_flutter_sdk:file:///C:/Libs/flutter/.pub-cache/hosted/pub.dartlang.org/apex_flutter_sdk-1.1.1+1/lib/ apex_flutter_sdk:file:///C:/Libs/flutter/.pub-cache/hosted/pub.dartlang.org/apex_flutter_sdk-1.1.1+1/lib/
archive:file:///C:/Libs/flutter/.pub-cache/hosted/pub.dartlang.org/archive-2.0.13/lib/ archive:file:///C:/Libs/flutter/.pub-cache/hosted/pub.dartlang.org/archive-2.0.13/lib/
...@@ -48,4 +49,51 @@ typed_data:file:///C:/Libs/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data ...@@ -48,4 +49,51 @@ typed_data:file:///C:/Libs/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data
vector_math:file:///C:/Libs/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0/lib/ vector_math:file:///C:/Libs/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0/lib/
vm_service:file:///C:/Libs/flutter/.pub-cache/hosted/pub.dartlang.org/vm_service-5.5.0/lib/ vm_service:file:///C:/Libs/flutter/.pub-cache/hosted/pub.dartlang.org/vm_service-5.5.0/lib/
webdriver:file:///C:/Libs/flutter/.pub-cache/hosted/pub.dartlang.org/webdriver-2.1.2/lib/ webdriver:file:///C:/Libs/flutter/.pub-cache/hosted/pub.dartlang.org/webdriver-2.1.2/lib/
=======
# Generated by pub on 2021-03-10 15:27:38.676415.
apex_flutter_sdk:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/apex_flutter_sdk-1.1.1+1/lib/
archive:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/archive-2.0.13/lib/
args:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/args-1.6.0/lib/
async:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0/lib/
boolean_selector:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib/
characters:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0/lib/
charcode:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0/lib/
circlegraph:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/circlegraph-0.0.5/lib/
clock:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0/lib/
collection:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0/lib/
convert:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/convert-2.1.1/lib/
crypto:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/crypto-2.1.5/lib/
cupertino_icons:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-1.0.2/lib/
enhanced_future_builder:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/enhanced_future_builder-1.0.3/lib/
fake_async:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0/lib/
file:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/file-6.0.0/lib/
flutter:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/packages/flutter/lib/
flutter_driver:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/packages/flutter_driver/lib/
flutter_test:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/packages/flutter_test/lib/
fuchsia_remote_debug_protocol:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/packages/fuchsia_remote_debug_protocol/lib/
graphview:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/graphview-0.6.6/lib/
http:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/http-0.12.2/lib/
http_parser:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.4/lib/
integration_test:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/packages/integration_test/lib/
logger:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/logger-0.9.4/lib/
matcher:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10/lib/
meta:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0/lib/
path:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0/lib/
pedantic:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/pedantic-1.10.0/lib/
platform:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/platform-3.0.0/lib/
process:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/process-4.0.0/lib/
shamsi_date:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/shamsi_date-0.8.1/lib/
sky_engine:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/bin/cache/pkg/sky_engine/lib/
source_span:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0/lib/
stack_trace:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/lib/
stream_channel:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib/
string_scanner:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0/lib/
sync_http:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/sync_http-0.2.0/lib/
term_glyph:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/lib/
test_api:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19/lib/
typed_data:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/lib/
vector_math:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0/lib/
vm_service:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/vm_service-5.5.0/lib/
webdriver:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/webdriver-2.1.2/lib/
>>>>>>> Stashed changes
dashboard:lib/ dashboard:lib/
import 'package:apex_flutter_sdk/apex_flutter_sdk.dart';
import 'package:dashboard/main.dart';
import 'package:dashboard/graphing/usergraph.dart'; import 'package:dashboard/graphing/usergraph.dart';
import 'package:dashboard/data/post.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../data/post.dart';
import 'trustcolorcalculator.dart'; import 'trustcolorcalculator.dart';
import 'communitygraph.dart'; import 'communitygraph.dart';
import '../data/post.dart';
class PostNode extends StatelessWidget { class PostNode extends StatelessWidget {
final Post post; final Post post;
......
import 'package:dashboard/graphing/communitygraph.dart'; import 'package:dashboard/graphing/communitygraph.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'graphing/usergraph.dart';
import 'graphing/communitygraph.dart';
import 'graphing/communitymetagraph.dart';
void main() { void main() {
runApp(MyApp()); runApp(MyApp());
...@@ -8,6 +11,6 @@ void main() { ...@@ -8,6 +11,6 @@ void main() {
class MyApp extends StatelessWidget { class MyApp extends StatelessWidget {
@override @override
Widget build(BuildContext context) => MaterialApp( Widget build(BuildContext context) => MaterialApp(
home: CommunityGraphViewPage("worldnews"), home: CommunityGraphViewPage("COVID19"),
); );
} }
class ClusterGetter { class ClusterGetter {
Future<Map<String, dynamic>> getClusters(String layerName) async { Future<Map<String, dynamic>> getClusters(String layerName) async {
String url = String url =
"https://articonf1.itec.aau.at:30401/api//use-cases/reddit/tables/reddit/layers/" + "https://articonf1.itec.aau.at:30401/api/use-cases/reddit/tables/reddit/layers/" +
layerName + layerName +
"/clusters"; "/clusters";
......
...@@ -4,9 +4,9 @@ import 'dart:io'; ...@@ -4,9 +4,9 @@ import 'dart:io';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'package:logger/logger.dart'; import 'package:logger/logger.dart';
import 'package:dashboard/data/community.dart'; import '../data/community.dart';
import 'package:dashboard/data/post.dart'; import '../data/post.dart';
import 'package:dashboard/data/user.dart'; import '../data/user.dart';
class DataGetter { class DataGetter {
static Future<Map<String, dynamic>> getJson(String url, static Future<Map<String, dynamic>> getJson(String url,
...@@ -31,19 +31,25 @@ class DataGetter { ...@@ -31,19 +31,25 @@ class DataGetter {
{Map<String, dynamic> headers}) async { {Map<String, dynamic> headers}) async {
http.Response response; http.Response response;
print(url + "\n" + body); Logger().i("$url\n$headers\n$body");
if (headers == null) { if (headers == null) {
response = await http.post(url, body: body); response = await http.post(url, body: body);
} else { } else {
response = await http.post(url, body: body, headers: headers); response = await http.post(url, body: body, headers: headers);
} }
Logger().i("pls");
if (response.statusCode != 200) { if (response.statusCode != 200) {
throw HttpException( throw HttpException(
"Status code is not 200 but " + response.statusCode.toString()); "Status code is not 200 but " + response.statusCode.toString());
} }
return jsonDecode(response.body) as Map<String, dynamic>; Map<String, dynamic> jsonMap =
jsonDecode(response.body) as Map<String, dynamic>;
Logger().i(jsonMap.toString());
return jsonMap;
} }
static Future<User> getUser(String username) async { static Future<User> getUser(String username) async {
...@@ -107,11 +113,19 @@ class DataGetter { ...@@ -107,11 +113,19 @@ class DataGetter {
Logger().i(communities.toString()); Logger().i(communities.toString());
List<Community> communityList = []; List<Community> communityList = [];
communities.forEach((community, value) async {
Community results = await getCommunity(community); for (var entry in communities.entries) {
Community results = await getCommunity(entry.key);
Logger().i(results.toString()); Logger().i(results.toString());
communityList.add(results); communityList.add(results);
}); }
//await communities.forEach((community, value) async {
// Community results = await getCommunity(community);
// Logger().i(results.toString());
// communityList.add(results);
//});
Logger().i(communityList.toString()); Logger().i(communityList.toString());
return communityList; return communityList;
} }
......
class Credentials { class Credentials {
String token; String token =
"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VybmFtZSI6InJlZ3VsYXJAaXRlYy5hYXUuYXQiLCJjcmVhdGVkX2F0IjoiMjAyMS0wMy0xMCAxMjoxODo1MS4zMzU5OTgiLCJ2YWxpZF91bnRpbCI6IjIwMjEtMDMtMTEgMTI6MTg6NTEuMzM1OTk4In0.TcbyuApqdPqneqd2Bvx3k6iMTlfF6oC_q4zRcKOaRY0";
} }
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment