diff --git a/web/gallery/assets/preview.png b/web/gallery/assets/preview.png new file mode 100644 index 000000000..a70b50cf9 Binary files /dev/null and b/web/gallery/assets/preview.png differ diff --git a/web/github_dataviz/web/github_data/comments.tsv b/web/github_dataviz/github_data/comments.tsv similarity index 100% rename from web/github_dataviz/web/github_data/comments.tsv rename to web/github_dataviz/github_data/comments.tsv diff --git a/web/github_dataviz/web/github_data/commits.tsv b/web/github_dataviz/github_data/commits.tsv similarity index 100% rename from web/github_dataviz/web/github_data/commits.tsv rename to web/github_dataviz/github_data/commits.tsv diff --git a/web/github_dataviz/web/github_data/contributors.json b/web/github_dataviz/github_data/contributors.json similarity index 100% rename from web/github_dataviz/web/github_data/contributors.json rename to web/github_dataviz/github_data/contributors.json diff --git a/web/github_dataviz/web/github_data/forks.tsv b/web/github_dataviz/github_data/forks.tsv similarity index 100% rename from web/github_dataviz/web/github_data/forks.tsv rename to web/github_dataviz/github_data/forks.tsv diff --git a/web/github_dataviz/web/github_data/pull_requests.tsv b/web/github_dataviz/github_data/pull_requests.tsv similarity index 100% rename from web/github_dataviz/web/github_data/pull_requests.tsv rename to web/github_dataviz/github_data/pull_requests.tsv diff --git a/web/github_dataviz/web/github_data/stars.tsv b/web/github_dataviz/github_data/stars.tsv similarity index 100% rename from web/github_dataviz/web/github_data/stars.tsv rename to web/github_dataviz/github_data/stars.tsv diff --git a/web/github_dataviz/lib/main.dart b/web/github_dataviz/lib/main.dart index 806b635e7..ecb099713 100644 --- a/web/github_dataviz/lib/main.dart +++ b/web/github_dataviz/lib/main.dart @@ -182,7 +182,7 @@ class _MainLayoutState extends State with TickerProviderStateMixin { Future loadGitHubData() async { String contributorsJsonStr = - (await http.get("github_data/contributors.json")).body; + (await http.get("assets/github_data/contributors.json")).body; List jsonObjs = jsonDecode(contributorsJsonStr) as List; List contributionList = jsonObjs.map((e) => UserContribution.fromJson(e)).toList(); @@ -191,25 +191,25 @@ class _MainLayoutState extends State with TickerProviderStateMixin { int numWeeksTotal = contributionList[0].contributions.length; - String starsByWeekStr = (await http.get("github_data/stars.tsv")).body; + String starsByWeekStr = (await http.get("assets/github_data/stars.tsv")).body; List starsByWeekLoaded = summarizeWeeksFromTSV(starsByWeekStr, numWeeksTotal); - String forksByWeekStr = (await http.get("github_data/forks.tsv")).body; + String forksByWeekStr = (await http.get("assets/github_data/forks.tsv")).body; List forksByWeekLoaded = summarizeWeeksFromTSV(forksByWeekStr, numWeeksTotal); - String commitsByWeekStr = (await http.get("github_data/commits.tsv")).body; + String commitsByWeekStr = (await http.get("assets/github_data/commits.tsv")).body; List commitsByWeekLoaded = summarizeWeeksFromTSV(commitsByWeekStr, numWeeksTotal); String commentsByWeekStr = - (await http.get("github_data/comments.tsv")).body; + (await http.get("assets/github_data/comments.tsv")).body; List commentsByWeekLoaded = summarizeWeeksFromTSV(commentsByWeekStr, numWeeksTotal); String pullRequestActivityByWeekStr = - (await http.get("github_data/pull_requests.tsv")).body; + (await http.get("assets/github_data/pull_requests.tsv")).body; List pullRequestActivityByWeekLoaded = summarizeWeeksFromTSV(pullRequestActivityByWeekStr, numWeeksTotal); diff --git a/web/github_dataviz/pubspec.yaml b/web/github_dataviz/pubspec.yaml index 79d42da50..c57ca6e89 100644 --- a/web/github_dataviz/pubspec.yaml +++ b/web/github_dataviz/pubspec.yaml @@ -11,3 +11,4 @@ dependencies: flutter: assets: - preview.png + - github_data/ diff --git a/web/peanut.yaml b/web/peanut.yaml index 770416cb9..327fc821c 100644 --- a/web/peanut.yaml +++ b/web/peanut.yaml @@ -2,11 +2,10 @@ directories: - charts/web -# package:http doesn't work yet: https://github.com/flutter/flutter/issues/34858 -#- dad_jokes/web -#- filipino_cuisine/web +- dad_jokes/web +- filipino_cuisine/web - gallery/web -#- github_dataviz/web +- github_dataviz/web - particle_background/web - slide_puzzle/web - spinning_square/web diff --git a/web/slide_puzzle/pubspec.lock b/web/slide_puzzle/pubspec.lock index dfd4d9ffd..904743100 100644 --- a/web/slide_puzzle/pubspec.lock +++ b/web/slide_puzzle/pubspec.lock @@ -63,7 +63,7 @@ packages: name: crypto url: "https://pub.dartlang.org" source: hosted - version: "2.1.2" + version: "2.1.3" csslib: dependency: transitive description: