More Updates for beta 15

SychO9 · Dec 15, 2020 · 0e1ba71 · 0e1ba71
1 parent 36e399f
commit 0e1ba71
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 218 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# GitHub Milestone
+# GitHub Milestone Activity
 [![latest version](https://img.shields.io/packagist/v/sycho/flarum-github-milestone.svg?style=flat-square)](https://packagist.org/packages/sycho/flarum-github-milestone)
 ![flarum version](https://img.shields.io/badge/flarum-%5E0.1.0--beta.14-%23e7742e?style=flat-square)
 ![mit license](https://img.shields.io/badge/license-MIT-green.svg?style=flat-square&color=green)

diff --git a/composer.json b/composer.json
@@ -23,8 +23,7 @@
     }
   ],
   "require": {
-    "flarum/core": "^0.1.0-beta.14",
-    "fof/extend": ">=0.2.0",
+    "flarum/core": "^0.1.0-beta.15",
     "sycho/flarum-uikit": "^0.1.0"
   },
   "autoload": {

diff --git a/extend.php b/extend.php
@@ -22,7 +22,8 @@
 
     new Extend\Locales(__DIR__.'/locale'),
 
-    (new FoF\Extend\Extend\ExtensionSettings())
-        ->setPrefix('sycho-github-milestone.')
-        ->addKeys(['repository', 'milestone_id', 'default_filter']),
+    (new Extend\Settings)
+        ->serializeToForum('sycho-github-milestone.repository', 'sycho-github-milestone.repository')
+        ->serializeToForum('sycho-github-milestone.milestone_id', 'sycho-github-milestone.milestone_id')
+        ->serializeToForum('sycho-github-milestone.default_filter', 'sycho-github-milestone.default_filter'),
 ];
diff --git a/js/dist/admin.js b/js/dist/admin.js
diff --git a/js/dist/admin.js.map b/js/dist/admin.js.map
diff --git a/js/dist/forum.js b/js/dist/forum.js
diff --git a/js/dist/forum.js.map b/js/dist/forum.js.map
diff --git a/js/src/admin/index.js b/js/src/admin/index.js
@@ -1,5 +1,3 @@
-import GithubMilestoneSettingsModal from './modals/GithubMilestoneSettingsModal';
-
 app.initializers.add('sycho-github-milestone', (app) => {
   app.extensionData
     .for('sycho-github-milestone')

diff --git a/js/src/admin/modals/GithubMilestoneSettingsModal.js b/js/src/admin/modals/GithubMilestoneSettingsModal.js
diff --git a/js/src/forum/components/IssueList.js b/js/src/forum/components/IssueList.js
@@ -16,7 +16,7 @@ export default class IssueList extends Component {
     this.allMergedPrs = false;
     this.filters = {
       state: {
-        value: app.data['sycho-github-milestone.default_filter'] || 'all',
+        value: app.forum.attribute('sycho-github-milestone.default_filter') || 'all',
         options: ['all', 'closed', 'open'],
       },
     };

diff --git a/js/src/forum/components/MilestonePage.js b/js/src/forum/components/MilestonePage.js
@@ -19,10 +19,10 @@ export default class MilestonePage extends Page {
     this.octokit = new Octokit();
     this.settings = {
       repository: {
-        owner: app.data['sycho-github-milestone.repository'].split('/')[0],
-        name: app.data['sycho-github-milestone.repository'].split('/')[1],
+        owner: app.forum.attribute('sycho-github-milestone.repository').split('/')[0],
+        name: app.forum.attribute('sycho-github-milestone.repository').split('/')[1],
       },
-      milestone: app.data['sycho-github-milestone.milestone_id'],
+      milestone: app.forum.attribute('sycho-github-milestone.milestone_id'),
     };
     this.milestone = {};
     this.progress = 0;

diff --git a/js/src/forum/index.js b/js/src/forum/index.js
@@ -5,7 +5,10 @@ import LinkButton from 'flarum/components/LinkButton';
 import MilestonePage from './components/MilestonePage';
 
 app.initializers.add('sycho-github-milestone', (app) => {
-  if (!app.data['sycho-github-milestone.repository'] || !app.data['sycho-github-milestone.milestone_id']) return;
+  const repository = app.data.resources[0].attributes['sycho-github-milestone.repository'];
+  const milestone_id = app.data.resources[0].attributes['sycho-github-milestone.milestone_id'];
+
+  if (!repository || !milestone_id) return;
 
   app.routes.githubMilestone = {
     path: '/milestone',