Merge remote-tracking branch 'origin/feature/dashboard' into feature/dashboard

src/dashboard/.dart_tool/chrome-device/Default/AutofillStrikeDatabase/LOG

-2021/03/11-17:11:28.608 327c Reusing MANIFEST C:\Users\Luca\AppData\Local\Temp\flutter_tools.6b130dbd\flutter_tools_chrome_device.2edc2a21\Default\AutofillStrikeDatabase/MANIFEST-000001
-2021/03/11-17:11:28.608 327c Recovering log #3
-2021/03/11-17:11:28.608 327c Reusing old log C:\Users\Luca\AppData\Local\Temp\flutter_tools.6b130dbd\flutter_tools_chrome_device.2edc2a21\Default\AutofillStrikeDatabase/000003.log 
+2021/03/15-11:05:30.990 e04 Reusing MANIFEST C:\Users\Luca\AppData\Local\Temp\flutter_tools.cba95e9d\flutter_tools_chrome_device.e3043b12\Default\AutofillStrikeDatabase/MANIFEST-000001
+2021/03/15-11:05:30.991 e04 Recovering log #3
+2021/03/15-11:05:30.991 e04 Reusing old log C:\Users\Luca\AppData\Local\Temp\flutter_tools.cba95e9d\flutter_tools_chrome_device.e3043b12\Default\AutofillStrikeDatabase/000003.log 

src/dashboard/.dart_tool/chrome-device/Default/BudgetDatabase/LOG

-2021/03/11-17:11:28.602 327c Reusing MANIFEST C:\Users\Luca\AppData\Local\Temp\flutter_tools.6b130dbd\flutter_tools_chrome_device.2edc2a21\Default\BudgetDatabase/MANIFEST-000001
-2021/03/11-17:11:28.603 327c Recovering log #3
-2021/03/11-17:11:28.603 327c Reusing old log C:\Users\Luca\AppData\Local\Temp\flutter_tools.6b130dbd\flutter_tools_chrome_device.2edc2a21\Default\BudgetDatabase/000003.log 
+2021/03/15-11:05:30.987 e04 Reusing MANIFEST C:\Users\Luca\AppData\Local\Temp\flutter_tools.cba95e9d\flutter_tools_chrome_device.e3043b12\Default\BudgetDatabase/MANIFEST-000001
+2021/03/15-11:05:30.988 e04 Recovering log #3
+2021/03/15-11:05:30.988 e04 Reusing old log C:\Users\Luca\AppData\Local\Temp\flutter_tools.cba95e9d\flutter_tools_chrome_device.e3043b12\Default\BudgetDatabase/000003.log 

src/dashboard/.dart_tool/chrome-device/Default/Cache/f_000003

@@ -19,15 +19,15 @@ define("main_module.bootstrap", ["web_entrypoint.dart", "dart_sdk"], function(ap
          main();
       });
     }
-    window.$dartAppId = "iR2waEL35ujatr3c2NFllQ==";
+    window.$dartAppId = "RFEJ7ZyCmf8+6PBJOgewBA==";
 window.$dartReloadConfiguration = "ReloadConfiguration.none";
 window.$dartModuleStrategy = "require-js";
 window.$loadModuleConfig = require;
 window.$dwdsVersion = "7.1.1";
-window.$dwdsDevHandlerPath = "http://localhost:57712/$dwdsSseHandler";
+window.$dwdsDevHandlerPath = "http://localhost:55299/$dwdsSseHandler";
 window.$dartEntrypointPath = "main_module.bootstrap.js";
 window.$requireLoader.forceLoadModule("dwds/src/injected/client");
-window.$dartExtensionUri = "ws://127.0.0.1:57714/$debug";
+window.$dartExtensionUri = "ws://127.0.0.1:55301/$debug";
 
   } else {
     if(window.$dartMainExecuted){

src/dashboard/.dart_tool/package_config.json

@@ -338,7 +338,7 @@
       "languageVersion": "2.7"
     }
   ],
-  "generated": "2021-03-11T14:18:45.095478Z",
+  "generated": "2021-03-15T10:04:26.892758Z",
   "generator": "pub",
   "generatorVersion": "2.12.0"
 }

src/dashboard/.flutter-plugins-dependencies

-{"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":[]},{"name":"path_provider","path":"C:\\\\Users\\\\Luca\\\\Documents\\\\flutter\\\\flutter_windows_1.22.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider-1.6.27\\\\","dependencies":[]}],"android":[{"name":"integration_test","path":"C:\\\\Users\\\\Luca\\\\Documents\\\\flutter\\\\flutter_windows_1.22.5-stable\\\\flutter\\\\packages\\\\integration_test\\\\","dependencies":[]},{"name":"path_provider","path":"C:\\\\Users\\\\Luca\\\\Documents\\\\flutter\\\\flutter_windows_1.22.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider-1.6.27\\\\","dependencies":[]}],"macos":[{"name":"path_provider_macos","path":"C:\\\\Users\\\\Luca\\\\Documents\\\\flutter\\\\flutter_windows_1.22.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_macos-0.0.4+8\\\\","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\Users\\\\Luca\\\\Documents\\\\flutter\\\\flutter_windows_1.22.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_linux-0.0.1+2\\\\","dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"C:\\\\Users\\\\Luca\\\\Documents\\\\flutter\\\\flutter_windows_1.22.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_windows-0.0.5\\\\","dependencies":[]}],"web":[]},"dependencyGraph":[{"name":"integration_test","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_macos","path_provider_linux","path_provider_windows"]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_macos","dependencies":[]},{"name":"path_provider_windows","dependencies":[]}],"date_created":"2021-03-11 17:10:45.273697","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":[]},{"name":"path_provider","path":"C:\\\\Users\\\\Luca\\\\Documents\\\\flutter\\\\flutter_windows_1.22.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider-1.6.27\\\\","dependencies":[]}],"android":[{"name":"integration_test","path":"C:\\\\Users\\\\Luca\\\\Documents\\\\flutter\\\\flutter_windows_1.22.5-stable\\\\flutter\\\\packages\\\\integration_test\\\\","dependencies":[]},{"name":"path_provider","path":"C:\\\\Users\\\\Luca\\\\Documents\\\\flutter\\\\flutter_windows_1.22.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider-1.6.27\\\\","dependencies":[]}],"macos":[{"name":"path_provider_macos","path":"C:\\\\Users\\\\Luca\\\\Documents\\\\flutter\\\\flutter_windows_1.22.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_macos-0.0.4+8\\\\","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\Users\\\\Luca\\\\Documents\\\\flutter\\\\flutter_windows_1.22.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_linux-0.0.1+2\\\\","dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"C:\\\\Users\\\\Luca\\\\Documents\\\\flutter\\\\flutter_windows_1.22.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_windows-0.0.5\\\\","dependencies":[]}],"web":[]},"dependencyGraph":[{"name":"integration_test","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_macos","path_provider_linux","path_provider_windows"]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_macos","dependencies":[]},{"name":"path_provider_windows","dependencies":[]}],"date_created":"2021-03-15 11:39:35.547471","version":"2.0.1"}
\ No newline at end of file

src/dashboard/.packages

@@ -3,65 +3,7 @@
 # 
 # For more info see: https://dart.dev/go/dot-packages-deprecation
 # 
-<<<<<<< Updated upstream
-# Generated by pub on 2021-03-11 15:18:45.075478.
-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/
-args:file:///C:/_libs/flutter/.pub-cache/hosted/pub.dartlang.org/args-1.6.0/lib/
-async:file:///C:/_libs/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0/lib/
-boolean_selector:file:///C:/_libs/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib/
-characters:file:///C:/_libs/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0/lib/
-charcode:file:///C:/_libs/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0/lib/
-circlegraph:file:///C:/_libs/flutter/.pub-cache/hosted/pub.dartlang.org/circlegraph-0.0.6/lib/
-clock:file:///C:/_libs/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0/lib/
-collection:file:///C:/_libs/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0/lib/
-convert:file:///C:/_libs/flutter/.pub-cache/hosted/pub.dartlang.org/convert-2.1.1/lib/
-crypto:file:///C:/_libs/flutter/.pub-cache/hosted/pub.dartlang.org/crypto-2.1.5/lib/
-cupertino_icons:file:///C:/_libs/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-1.0.2/lib/
-enhanced_future_builder:file:///C:/_libs/flutter/.pub-cache/hosted/pub.dartlang.org/enhanced_future_builder-1.0.3/lib/
-fake_async:file:///C:/_libs/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0/lib/
-ffi:file:///C:/_libs/flutter/.pub-cache/hosted/pub.dartlang.org/ffi-1.0.0/lib/
-file:file:///C:/_libs/flutter/.pub-cache/hosted/pub.dartlang.org/file-6.0.0/lib/
-flutter:file:///C:/_libs/flutter/packages/flutter/lib/
-flutter_driver:file:///C:/_libs/flutter/packages/flutter_driver/lib/
-flutter_spinkit:file:///C:/_libs/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_spinkit-5.0.0/lib/
-flutter_test:file:///C:/_libs/flutter/packages/flutter_test/lib/
-fuchsia_remote_debug_protocol:file:///C:/_libs/flutter/packages/fuchsia_remote_debug_protocol/lib/
-graphview:file:///C:/_libs/flutter/.pub-cache/hosted/pub.dartlang.org/graphview-0.6.7/lib/
-http:file:///C:/_libs/flutter/.pub-cache/hosted/pub.dartlang.org/http-0.12.2/lib/
-http_parser:file:///C:/_libs/flutter/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.4/lib/
-integration_test:file:///C:/_libs/flutter/packages/integration_test/lib/
-localstorage:file:///C:/_libs/flutter/.pub-cache/hosted/pub.dartlang.org/localstorage-3.0.6+9/lib/
-logger:file:///C:/_libs/flutter/.pub-cache/hosted/pub.dartlang.org/logger-0.9.4/lib/
-matcher:file:///C:/_libs/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10/lib/
-meta:file:///C:/_libs/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0/lib/
-path:file:///C:/_libs/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0/lib/
-path_provider:file:///C:/_libs/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.27/lib/
-path_provider_linux:file:///C:/_libs/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_linux-0.0.1+2/lib/
-path_provider_macos:file:///C:/_libs/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_macos-0.0.4+8/lib/
-path_provider_platform_interface:file:///C:/_libs/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_platform_interface-1.0.4/lib/
-path_provider_windows:file:///C:/_libs/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_windows-0.0.5/lib/
-pedantic:file:///C:/_libs/flutter/.pub-cache/hosted/pub.dartlang.org/pedantic-1.11.0/lib/
-platform:file:///C:/_libs/flutter/.pub-cache/hosted/pub.dartlang.org/platform-3.0.0/lib/
-plugin_platform_interface:file:///C:/_libs/flutter/.pub-cache/hosted/pub.dartlang.org/plugin_platform_interface-1.0.3/lib/
-process:file:///C:/_libs/flutter/.pub-cache/hosted/pub.dartlang.org/process-4.0.0/lib/
-shamsi_date:file:///C:/_libs/flutter/.pub-cache/hosted/pub.dartlang.org/shamsi_date-0.8.1/lib/
-sky_engine:file:///C:/_libs/flutter/bin/cache/pkg/sky_engine/lib/
-source_span:file:///C:/_libs/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0/lib/
-stack_trace:file:///C:/_libs/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/lib/
-stream_channel:file:///C:/_libs/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib/
-string_scanner:file:///C:/_libs/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0/lib/
-sync_http:file:///C:/_libs/flutter/.pub-cache/hosted/pub.dartlang.org/sync_http-0.2.0/lib/
-term_glyph:file:///C:/_libs/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/lib/
-test_api:file:///C:/_libs/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19/lib/
-typed_data:file:///C:/_libs/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.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/
-webdriver:file:///C:/_libs/flutter/.pub-cache/hosted/pub.dartlang.org/webdriver-2.1.2/lib/
-win32:file:///C:/_libs/flutter/.pub-cache/hosted/pub.dartlang.org/win32-2.0.0/lib/
-xdg_directories:file:///C:/_libs/flutter/.pub-cache/hosted/pub.dartlang.org/xdg_directories-0.1.2/lib/
-=======
-# Generated by pub on 2021-03-11 15:20:06.940766.
+# Generated by pub on 2021-03-15 11:04:26.861778.
 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/
@@ -117,5 +59,4 @@ vm_service:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable
 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/
 win32:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/win32-2.0.0/lib/
 xdg_directories:file:///C:/Users/Luca/Documents/flutter/flutter_windows_1.22.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/xdg_directories-0.1.2/lib/
->>>>>>> Stashed changes
 dashboard:lib/

src/dashboard/lib/graphing/communitymetagraph.dart

+import 'dart:math';
+
 import 'package:circlegraph/circlegraph.dart';
 import 'package:dashboard/data/communityGraphNodeData.dart';
 import 'package:dashboard/querying/datagetter.dart';
 import 'package:dashboard/graphing/postnode.dart';
+import 'package:dashboard/ui/graphs/community/index.dart';
+import 'package:dashboard/ui/theme/color_holder.dart';
+import 'package:dashboard/ui/util/logged_in_appbar.dart';
 import 'package:flutter/material.dart';
 import 'package:logger/logger.dart';
 import '../data/community.dart';
@@ -25,26 +30,12 @@ class _CommunityMetaGraphState extends State<CommunityMetaGraph> {
 
   Widget build(BuildContext context) {
     Logger().i(communities.toString());
-    return Container(
-      width: 2000,
-      height: 1000,
-      //constraints: BoxConstraints.expand(),
-      child: InteractiveViewer(
-        constrained: true,
-        boundaryMargin: EdgeInsets.all(100),
-        minScale: 0.01,
-        maxScale: 5.6,
-        child: BubbleGraph(
-          [
-            for (Community community in communities)
-              CircleGraph(
-                root: _getCommunityNode(community),
-                children: [
-                  for (Post post in community.posts) _getPostNode(post)
-                ],
-              )
-          ],
-        ),
+    return SingleChildScrollView(
+      child: Wrap(
+        children: [
+          for (Community community in communities)
+            getCommunityNodeWidget(community)
+        ],
       ),
     );
   }
@@ -72,31 +63,50 @@ class _CommunityMetaGraphState extends State<CommunityMetaGraph> {
 
   Widget getCommunityNodeWidget(Community community) {
     return GestureDetector(
-        child: Row(
-      children: [
-        Expanded(
-          child: Text(
-            community.name,
-            overflow: TextOverflow.ellipsis,
-            style: TextStyle(fontWeight: FontWeight.bold, color: Colors.black),
+        onTap: () => Navigator.push(
+            context,
+            MaterialPageRoute(
+              builder: (context) => CommunityGraphViewPage(community.name),
+            )),
+        child: Container(
+          width: 250,
+          height: 50,
+          decoration:
+              BoxDecoration(color: Colors.blue, shape: BoxShape.rectangle),
+          margin: EdgeInsets.all(7),
+          padding: EdgeInsets.all(5),
+          child: Row(
+            children: [
+              Expanded(
+                child: Text(
+                  community.name,
+                  overflow: TextOverflow.ellipsis,
+                  style: TextStyle(
+                      fontWeight: FontWeight.bold, color: Colors.black),
+                ),
+              ),
+              Text(
+                (community.trust * 100 - Random().nextInt(20))
+                        .roundToDouble()
+                        .toString() +
+                    "%",
+                style: TextStyle(
+                    fontWeight: FontWeight.bold,
+                    color: TrustColorCalculator.calculateTrustColor(
+                        community.trust)),
+              ),
+            ],
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
           ),
-        ),
-        Text(
-          (community.trust * 100).toString() + "%",
-          style: TextStyle(
-              fontWeight: FontWeight.bold,
-              color: TrustColorCalculator.calculateTrustColor(community.trust)),
-        ),
-      ],
-      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-    ));
+        ));
   }
 }
 
 class CommunityMetaGraphViewPage extends StatelessWidget {
   Widget build(BuildContext context) {
     return Scaffold(
-        backgroundColor: Colors.white,
+        appBar: LoggedInAppBar("Communities"),
+        backgroundColor: ColorHolder.color3,
         //floatingActionButton: FloatingActionButton(
         //  onPressed: () => print("hoe"),
         //  child: Icon(Icons.zoom_in),

src/dashboard/lib/graphing/postnode.dart

@@ -25,7 +25,7 @@ class PostNode extends StatelessWidget {
             ),
           ),
           Text(
-            (post.trust * 100).toString() + "%",
+            (post.trust * 100).roundToDouble().toString() + "%",
             style: TextStyle(fontWeight: FontWeight.bold, color: trustColor),
           ),
         ],

src/dashboard/lib/ui/graphs/community/communitygraph.dart

@@ -38,7 +38,7 @@ class _CommunityGraphState extends State<CommunityGraph> {
     }
 
     nodes.add(
-      Post("...", "", "", community.name, community.trust, 69),
+      Post("...", "", "", community.name, community.trust, 70),
     );
 
     return Container(

src/dashboard/lib/ui/graphs/community/node_community.dart

@@ -21,7 +21,6 @@ class TrustScoreNode extends StatelessWidget {
               color: textColor,
             ),
           if (icon != null) SizedBox(width: 4),
-          
           Expanded(
             child: Text(
               label,
@@ -33,7 +32,7 @@ class TrustScoreNode extends StatelessWidget {
             ),
           ),
           Text(
-            (trustValue * 100).toString() + "%",
+            (trustValue * 100).roundToDouble().toString() + "%",
             style: TextStyle(
               fontWeight: FontWeight.bold,
               color: Colors.green,