Major Fixes Working

dav-is · Oct 23, 2016 · f7fe8ca · f7fe8ca
1 parent e5b4d7b
commit f7fe8ca
Show file tree

Hide file tree

Showing 36 changed files with 1,177 additions and 965 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -1,18 +1,36 @@
 {
-	"extends": "eslint-config-airbnb",
-	"rules": {
-		"import/no-unresolved": "off",
-		"import/no-extraneous-dependencies": "off",
-		"react/jsx-filename-extension": ["error", { "extensions": [".js", ".jsx"] }],
-		"react/react-in-jsx-scope": "off",
-		"react/prop-types": "off",
-		"import/extensions": ["error", "never"]
-	},
-	"env": {
-        	"jquery": true
-    	},
-	"globals": {
-        	"app": false,
-        	"m": false
-    	}
-}
+    "extends": "eslint-config-airbnb",
+    "rules": {
+      "class-methods-use-this": "off",
+      "func-names": "off",
+      "no-param-reassign": "off",
+      "import/no-unresolved": "off",
+      "import/no-extraneous-dependencies": "off",
+      "import/extensions": ["error", "never"],
+      "react/jsx-filename-extension": ["error", { "extensions": [".js"] }],
+      "react/react-in-jsx-scope": "off",
+      "react/prop-types": "off",
+      "react/sort-comp": ["error", {
+        "order": [
+          "/^constructor$/",
+          "/^init$/",
+          "/^initProps$/",
+          "static-methods",
+          "/^content$/",
+          "/^view$/",
+          "/^config$/",
+          "everything-else",
+          "/^onsubmit$/",
+          "/^onerror$/"
+        ]
+      }]
+    },
+    "env": {
+      "jquery": true,
+      "browser": true
+    },
+    "globals": {
+        "app": false,
+        "m": false
+    }
+}
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,7 @@
+/vendor
+composer.phar
+.DS_Store
+Thumbs.db
+bower_components
+node_modules
+*.js.old
diff --git a/bootstrap.php b/bootstrap.php
@@ -15,5 +15,6 @@
 return function (Dispatcher $events) {
     $events->subscribe(Listeners\AddClientAssets::class);
     $events->subscribe(Listeners\LoadSettingsFromDatabase::class);
-    $events->subscribe(Listeners\AddApiAttributes::class);
+    $events->subscribe(Listeners\AddUserProfileAttributes::class);
+    $events->subscribe(Listeners\UpdateProfileInDatabase::class);
 };
diff --git a/js/admin/dist/extension.js b/js/admin/dist/extension.js
@@ -1,24 +1,26 @@
-System.register('davis/socialprofile/components/SocialProfileSettingsModal', ['flarum/components/SettingsModal'], function (_export) {
-  'use strict';
+'use strict';
 
-  var SettingsModal, AnimatedTagSettingsModal;
+System.register('Davis/SocialProfile/components/SocialProfileSettingsModal', ['flarum/components/SettingsModal'], function (_export, _context) {
+  "use strict";
+
+  var SettingsModal, SocialProfileSettingsModal;
   return {
     setters: [function (_flarumComponentsSettingsModal) {
-      SettingsModal = _flarumComponentsSettingsModal['default'];
+      SettingsModal = _flarumComponentsSettingsModal.default;
     }],
     execute: function () {
-      AnimatedTagSettingsModal = (function (_SettingsModal) {
-        babelHelpers.inherits(AnimatedTagSettingsModal, _SettingsModal);
+      SocialProfileSettingsModal = function (_SettingsModal) {
+        babelHelpers.inherits(SocialProfileSettingsModal, _SettingsModal);
 
-        function AnimatedTagSettingsModal() {
-          babelHelpers.classCallCheck(this, AnimatedTagSettingsModal);
-          babelHelpers.get(Object.getPrototypeOf(AnimatedTagSettingsModal.prototype), 'constructor', this).apply(this, arguments);
+        function SocialProfileSettingsModal() {
+          babelHelpers.classCallCheck(this, SocialProfileSettingsModal);
+          return babelHelpers.possibleConstructorReturn(this, (SocialProfileSettingsModal.__proto__ || Object.getPrototypeOf(SocialProfileSettingsModal)).apply(this, arguments));
         }
 
-        babelHelpers.createClass(AnimatedTagSettingsModal, [{
+        babelHelpers.createClass(SocialProfileSettingsModal, [{
           key: 'className',
           value: function className() {
-            return 'AnimatedTagSettingsModal Modal--small';
+            return 'SocialProfileSettingsModal Modal--small';
           }
         }, {
           key: 'title',
@@ -28,42 +30,38 @@ System.register('davis/socialprofile/components/SocialProfileSettingsModal', ['f
         }, {
           key: 'form',
           value: function form() {
-            return [m(
+            return m(
               'div',
               { className: 'Form-group' },
               m(
                 'label',
-                null,
+                { htmlFor: 'test' },
                 app.translator.trans('davis-socialprofile.admin.test')
               ),
-              m('input', { type: 'text', className: 'FormControl', bidi: this.setting('davis.socialprofile.test') })
-            )];
+              m('input', { name: 'test', type: 'text', className: 'FormControl', bidi: this.setting('davis.socialprofile.test') })
+            );
           }
         }]);
-        return AnimatedTagSettingsModal;
-      })(SettingsModal);
+        return SocialProfileSettingsModal;
+      }(SettingsModal);
 
-      _export('default', AnimatedTagSettingsModal);
+      _export('default', SocialProfileSettingsModal);
     }
   };
 });;
-System.register('davis/socialprofile/main', ['flarum/extend', 'flarum/app', 'davis/socialprofile/components/SocialProfileSettingsModal'], function (_export) {
-  'use strict';
+'use strict';
+
+System.register('Davis/SocialProfile/main', ['flarum/app'], function (_export, _context) {
+  "use strict";
 
-  var extend, app, SocialProfileSettingsModal;
+  var app;
   return {
-    setters: [function (_flarumExtend) {
-      extend = _flarumExtend.extend;
-    }, function (_flarumApp) {
-      app = _flarumApp['default'];
-    }, function (_davisSocialprofileComponentsSocialProfileSettingsModal) {
-      SocialProfileSettingsModal = _davisSocialprofileComponentsSocialProfileSettingsModal['default'];
+    setters: [function (_flarumApp) {
+      app = _flarumApp.default;
     }],
     execute: function () {
 
-      app.initializers.add('davis-socialprofile', function (app) {
-        //app.extensionSettings['davis-socialprofile'] = () => app.modal.show(new SocialProfileSettingsModal());
-      });
+      app.initializers.add('Davis-SocialProfile', function () {});
     }
   };
 });
diff --git a/js/admin/package.json b/js/admin/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "devDependencies": {
-    "gulp": "^3.8.11",
-    "flarum-gulp": "^0.2.0"
+    "gulp": "^3.9.1",
+    "flarum-gulp": "dav-is/flarum-gulp#patch-1"
   }
-}
+}
diff --git a/js/admin/src/components/SocialProfileSettingsModal.js b/js/admin/src/components/SocialProfileSettingsModal.js
@@ -1,20 +1,20 @@
 import SettingsModal from 'flarum/components/SettingsModal';
 
-export default class AnimatedTagSettingsModal extends SettingsModal {
+export default class SocialProfileSettingsModal extends SettingsModal {
   className() {
-    return 'AnimatedTagSettingsModal Modal--small';
+    return 'SocialProfileSettingsModal Modal--small';
   }
 
   title() {
     return app.translator.trans('davis-socialprofile.admin.test');
   }
 
   form() {
-    return [
+    return (
       <div className="Form-group">
-        <label>{app.translator.trans('davis-socialprofile.admin.test')}</label>
-        <input type="text" className="FormControl" bidi={this.setting('davis.socialprofile.test')}></input>
+        <label htmlFor="test">{app.translator.trans('davis-socialprofile.admin.test')}</label>
+        <input name="test" type="text" className="FormControl" bidi={this.setting('davis.socialprofile.test')} />
       </div>
-    ];
+    );
   }
 }
diff --git a/js/admin/src/main.js b/js/admin/src/main.js
@@ -1,7 +1,5 @@
-import { extend } from 'flarum/extend';
 import app from 'flarum/app';
-import SocialProfileSettingsModal from 'Davis/SocialProfile/components/SocialProfileSettingsModal';
 
-app.initializers.add('Davis-SocialProfile', app => {
-  //app.extensionSettings['davis-socialprofile'] = () => app.modal.show(new SocialProfileSettingsModal());
+app.initializers.add('Davis-SocialProfile', () => {
+
 });