Url fixes (NickM-27#22)

* Update path strategy * Ensure location is always saved correctly * Use conditional path strategy
trevortrevor · May 18, 2022 · 7930ff7 · 7930ff7
1 parent 2b854b7
commit 7930ff7
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 4 deletions.
diff --git a/web/lib/api/api.dart b/web/lib/api/api.dart
@@ -17,7 +17,14 @@ class SwatchApi {
       _swatchHost = "localhost:4500";
     } else {
       final location = (getHref() ?? "").replaceAll("http://", "");
-      _swatchHost = location.substring(0, location.indexOf("/"));
+
+      final pathStart = location.indexOf("/");
+
+      if (pathStart == -1) {
+        _swatchHost = location;
+      } else {
+        _swatchHost = location.substring(0, pathStart);
+      }
     }
 
     return _singleton;

diff --git a/web/lib/ext/url_strategy/extension_url_strategy.dart b/web/lib/ext/url_strategy/extension_url_strategy.dart
@@ -0,0 +1 @@
+export 'extension_url_strategy_noop.dart' if (dart.library.html) 'extension_url_strategy_web.dart';
diff --git a/web/lib/ext/url_strategy/extension_url_strategy_noop.dart b/web/lib/ext/url_strategy/extension_url_strategy_noop.dart
@@ -0,0 +1,3 @@
+void usePathUrlStrategy() {
+  // noop
+}
diff --git a/web/lib/ext/url_strategy/extension_url_strategy_web.dart b/web/lib/ext/url_strategy/extension_url_strategy_web.dart
@@ -0,0 +1,5 @@
+import 'package:flutter_web_plugins/flutter_web_plugins.dart';
+
+void usePathUrlStrategy() {
+  setUrlStrategy(PathUrlStrategy());
+}
diff --git a/web/lib/main.dart b/web/lib/main.dart
@@ -1,11 +1,12 @@
 import 'package:flutter/material.dart';
-import 'package:swatch/ext/extension_navigator.dart';
+import 'package:swatch/ext/url_strategy/extension_url_strategy.dart';
 import 'package:swatch/routes/route_color_playground.dart';
 import 'package:swatch/routes/route_dashboard.dart';
 import 'package:swatch/routes/route_settings.dart';
 import 'package:swatch/theme/theme_helper.dart';
 
 void main() {
+  usePathUrlStrategy();
   runApp(const SwatchApp());
 }
 

diff --git a/web/pubspec.lock b/web/pubspec.lock
@@ -81,6 +81,11 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_web_plugins:
+    dependency: "direct main"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
   http:
     dependency: "direct main"
     description:
@@ -95,6 +100,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "4.0.0"
+  js:
+    dependency: transitive
+    description:
+      name: js
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.6.4"
   lints:
     dependency: transitive
     description:

diff --git a/web/pubspec.yaml b/web/pubspec.yaml
@@ -12,6 +12,9 @@ dependencies:
   flutter:
     sdk: flutter
 
+  flutter_web_plugins:
+    sdk: flutter
+
   # UI
   cupertino_icons: ^1.0.2
   collapsible_sidebar: ^2.0.1+2

diff --git a/web/test/widget_test.dart b/web/test/widget_test.dart
@@ -5,10 +5,8 @@
 // gestures. You can also use WidgetTester to find child widgets in the widget
 // tree, read text, and verify that the values of widget properties are correct.
 
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import 'package:swatch/main.dart';
 import 'package:swatch/models/config.dart';
 
 void main() {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		export 'extension_url_strategy_noop.dart' if (dart.library.html) 'extension_url_strategy_web.dart';