Changeset 274 for Dev/branches/rest-dojo-ui/client/rft

Timestamp:

02/20/12 16:27:19 (13 years ago)

Author:

hendrikvanantwerpen

Message:

• [Client] Moved pages in subtree of rft/, allowing controllers next to them.
• [Client] Created questions page, gives overview and allows adding.
• [Client] Page controllers inherit from _Page, because the previous mechanism w

asn't working.

• [Client] Added new user registration.
• [Server] Changed user passwords to passwordHash/passwordSalt combination.
• [Server] Added simple object marshalling and unmarshalling to preserve types.
• [Server] Added ResearchToolObjectInterface? with static create() method. Implemented for all model classes.

Location:

Dev/branches/rest-dojo-ui/client/rft

Files:

• api.js (modified) (1 diff)
• auth.js (modified) (2 diffs)
• content.js (modified) (3 diffs)
• css/main.css (modified) (1 diff)
• pages (added)
• pages/index.html (copied) (copied from Dev/branches/rest-dojo-ui/client/pages/index.html)
• pages/questions.html (added)
• pages/questions.js (added)
• pages/session.html (copied) (copied from Dev/branches/rest-dojo-ui/client/pages/session.html)
• pages/sessions.html (copied) (copied from Dev/branches/rest-dojo-ui/client/pages/sessions.html)
• run.js (modified) (3 diffs)
• ui/LoginDialog.html (modified) (1 diff)
• ui/LoginDialog.js (modified) (3 diffs)
• ui/MenuLink.js (copied) (copied from Dev/branches/rest-dojo-ui/client/rft/ui/MenuBarLink.js) (1 diff)
• ui/QuestionWidget.html (added)
• ui/QuestionWidget.js (added)
• ui/TestPageController.js (deleted)
• ui/_Page.js (modified) (1 diff)
• ui/_PageController.js (deleted)

Dev/branches/rest-dojo-ui/client/rft/api.js

@@ -10 +10 @@
                 rawBody: json.toJson(args)
             });
-        },
-        createObject: function(type, args) {
-            var d = new Deferred();
-            this.post("createObject",
-            {
-                type: type,
-                values: args
-            })
-            .then(function(data) {
-                d.resolve(data.uid);
-            },function(){
-                d.reject(); 
-            });
-            return d.promise;
-        },
-        getObject: function(type, uid) {
-            var d = new Deferred();
-            this.post("getObject",
-            {
-                type: type,
-                uid: uid
-            })
-            .then(function(data) {
-                d.resolve(data.object);
-            },function(){
-                d.reject(); 
-            });
-            return d.promise;
-        },
-        getObjects: function(type, predicates) {
-            var d = new Deferred();
-            this.post("getObjects",
-            {
-                type: type,
-                predicates: predicates
-            })
-            .then(function(data) {
-                d.resolve(data.objects);
-            },function(){
-                d.reject(); 
-            });
-            return d.promise;
-        },
-        deleteObject: function(type, uid) {
-            var d = new Deferred();
-            d.reject();
-            return d.promise;
         }
-    }
+    };
 });

Dev/branches/rest-dojo-ui/client/rft/auth.js

@@ -20 +20 @@
                 post("/login",
                 {
-                    username:username,
+                    email:username,
                     password:password
                 })
@@ -49 +49 @@
                 post("/register",
                 {
-                    username:username,
+                    email:username,
                     password:password
                 })

Dev/branches/rest-dojo-ui/client/rft/content.js

@@ -92 +92 @@
                         return dfd.promise;
                     }
+                    currentPage = null;
                 }
                 
@@ -99 +100 @@
                 
                 // load html
-                var pageUrl = 'pages'+hri.path()+'.html';
+                var pageUrl = 'rft/pages'+hri.path()+'.html';
                 xhr.get({
                     url: pageUrl,
@@ -107 +108 @@
                 // initialize page or create error message
                 .then(function(html){
-                    currentPage = new _Page({
-                        templateString: html,
-                        pageQuery: hri.args()
-                    });
-                    contentPane.set('content',currentPage);
+                    contentPane.set('content',html);
+                    var rootNode = contentPane.containerNode.firstChild;
+                    currentPage = dijit.byNode(rootNode);
+                    if ( !currentPage ) {
+                        currentPage = new _Page({},rootNode);
+                    }
                     dfd.resolve();
                 },function(){
-                    currentPage = new _Page({
-                        templateString: "<div>Page "+hri.path()+" not found.</div>"
-                    });
-                    contentPane.set('content',currentPage);
+                    contentPane.set('content',"<div>Page "+hri.path()+" not found.</div>");
                     dfd.reject();
                 });

Dev/branches/rest-dojo-ui/client/rft/css/main.css

@@ -5 +5 @@
 }
 
-.mainTitle {
-    display: block;
-    float: left;
-    border-right: 1px solid;
-    padding-right: 5px;
-    margin-right: 5px;
-}
-
 .mainMenu {
-    display: block;
-    float: left;
-}
-
-.mainUserInfo {
-    display: block;
-    float: right;
-    border-left: 1px solid;
-    padding-left: 5px;
-    margin-left: 5px;
+    width: 100%;
 }
 

Dev/branches/rest-dojo-ui/client/rft/run.js

@@ -1 +1 @@
 require([
     'dijit/form/Form',
+    'dijit/form/TextBox',
+    'dijit/form/Button',
+    'dijit/form/Textarea',
     'dojo/store/JsonRest',
     'dojo/data/ObjectStore',
@@ -6 +9 @@
     'dijit/layout/ContentPane',
     'dijit/layout/TabContainer',
+    'dijit/layout/AccordionContainer',
     'dijit/MenuBar',
     'dijit/MenuBarItem',
+    'dijit/PopupMenuBarItem',
+    'dijit/DropDownMenu',
     'rft/ui/MenuBarLink',
+    'rft/ui/MenuLink',
+    'rft/ui/QuestionWidget',
+    'rft/pages/questions' // could this be done dynamically?
 ]);
 
 require(['dojo/_base/window','dojo/parser', 'rft/ui/LoginDialog', 
     'dojo/dom', 'dojo/_base/connect', 'rft/auth', 'rft/content',
-    'dojo/domReady!', ],
+    'dojo/domReady!' ],
     function(win,parser,LoginDialog,dom,connect,auth,content) {
         parser.parse();
@@ -27 +36 @@
         });
 
-        connect.connect(dom.byId('userinfo'),'click',function(){
+        connect.connect(dom.byId('loginMenu'),'click',function(){
             login.show();
         });
+
     });

Dev/branches/rest-dojo-ui/client/rft/ui/LoginDialog.html

@@ -9 +9 @@
         <form data-dojo-type="dijit.form.Form" data-dojo-attach-point="loginForm">
             <fieldset>
-                <label for="username" class="loginLabel">Email</label>
-                <input data-dojo-type="dijit.form.TextBox" name="username" type="text" class="loginInput" />
+                <label for="email" class="loginLabel">Email</label>
+                <input data-dojo-type="dijit.form.TextBox" name="email" type="text" class="loginInput" />
                 <label for="password" class="loginLabel">Password</label>
                 <input data-dojo-type="dijit.form.TextBox" name="password" type="password" class="loginInput" />
             </fieldset>
-            <button type="submit" data-dojo-type="dijit.form.Button" data-dojo-attach-event="onClick:onLogin">Login</button>
-            <button type="button" data-dojo-type="dijit.form.Button" data-dojo-attach-event="onClick:onCancel">Cancel</button>
+            <div style="float: right;">
+                <button type="button" data-dojo-type="dijit.form.Button" data-dojo-attach-event="onClick:onRegister">Register</button>
+                <button type="submit" data-dojo-type="dijit.form.Button" data-dojo-attach-event="onClick:onLogin">Login</button>
+            </div>
         </form>
-        <div data-dojo-attach-point="loginErrors"></div>
+        <div data-dojo-attach-point="loginErrors" style="clear: both; color: red;"></div>
     </div>
 </div>

Dev/branches/rest-dojo-ui/client/rft/ui/LoginDialog.js

@@ -6 +6 @@
             templateString: template,
             widgetsInTemplate: true,
-            title: "Login",
+            title: "Login/Register",
             baseClass: "rftLoginDialog",
             startup: function() {
@@ -20 +20 @@
                 this.loginErrors.innerHTML = '';
                 var data = this.loginForm.get('value');
-                auth.login(data.username,data.password)
+                auth.login(data.email,data.password)
                 .then(lang.hitch(this,function() {
                     this.hide();
@@ -29 +29 @@
                 event.stop(evt);
                 return false;
+            },
+            onRegister: function() {
+                this.loginErrors.innerHTML = '';
+                var data = this.loginForm.get('value');
+                auth.register(data.email,data.password)
+                .then(lang.hitch(this,function() {
+                    this.hide();
+                    content.initial();
+                }),lang.hitch(this,function() {
+                    this.loginErrors.innerHTML = 'Register failed.';
+                }));
             }
         });

Dev/branches/rest-dojo-ui/client/rft/ui/MenuLink.js

@@ -1 @@
-define(['dojo/_base/declare','dijit/MenuBarItem','../content'],
-function(declare,MenuBarItem,content){
-    return declare('rft.ui.MenuBarLink',[MenuBarItem],{
+define(['dojo/_base/declare','dijit/MenuItem','../content'],
+function(declare,MenuItem,content){
+    return declare('rft.ui.MenuLink',[MenuItem],{
         options:{
             pageId: null

Dev/branches/rest-dojo-ui/client/rft/ui/_Page.js

@@ -1 @@
-define(['dojo/_base/declare','dojo/_base/lang','dojo/_base/array','dojo/parser','dojo/query','dojo/_base/Deferred',
-    'dijit/_WidgetBase','dijit/_TemplatedMixin','dijit/_WidgetsInTemplateMixin','rft/ui/_PageController'],
-    function(declare,lang,array,parser,query,Deferred,_WidgetBase,_TemplatedMixin,_WidgetsInTemplateMixin,_PageController){
-        return declare('rft.ui._Page',[_WidgetBase,_TemplatedMixin,_WidgetsInTemplateMixin,_PageController],{
-            _controllerLoaded: false,
-            _hasStarted: false,
-            _triggeredOnVisit: false,
-            pageController: null, /* class derived from rft.ui._PageController, mixed in at creation */
-            buildRendering: function() {
+define(['dojo/_base/declare','dojo/_base/lang','dojo/_base/array','dojo/parser','dojo/query','dojo/dom-attr','dojo/_base/connect','dijit','dijit/_WidgetBase','dijit/_Container','dijit/_Contained'],
+    function(declare,lang,array,parser,query,attr,connect,dijit,_WidgetBase,_Container,_Contained){
+        return declare('rft.ui._Page',[_WidgetBase],{
+            startup: function() {
                 this.inherited(arguments);
-                var dfd = new Deferred();
-                var mixinType = this.domNode.getAttribute("data-rft-mixin");
-                if ( mixinType ) {
-                    require([mixinType],lang.hitch(this,function(SomePageController){
-                        declare.safeMixin(this,new SomePageController());
-                        dfd.resolve();
-                    }));
-                } else {
-                    dfd.resolve();
-                }
-                dfd.then(lang.hitch(this,function(){
-                    var methods = query('> script[type^="rft/method"]',this.domNode).orphan();
-                    array.forEach(methods,lang.hitch(this,function(s){
-                        var method = s.getAttribute("data-rft-method");
-                        var func = parser._functionFromScript(s);
-                        this[method] = func;
-                    }));
-                    this._controllerLoaded = true;
-                    this._triggerOnVisit();
+                this._attachPointsAndEvents();
+                this.onVisit();
+            },
+            _attachPointsAndEvents: function() {
+                query('*[data-rft-attach-point]'/*, this.domNode*/).forEach(lang.hitch(this,function(node){
+                    var point = attr.get(node,'data-rft-attach-point');
+                    var widget = dijit.byId(attr.get(node,'id'));
+                    this[point] = widget || node;
+                }));
+                query('*[data-rft-attach-event]'/*, this.domNode*/).forEach(lang.hitch(this,function(node){
+                    var event = attr.get(node,'data-rft-attach-event').split(':');
+                    var eventName = event[0];
+                    var eventHandler = event[1];
+                    var widget = dijit.byId(attr.get(node,'id'));
+                    if ( widget ) {
+                        this.connect(widget,eventName,lang.hitch(this,eventHandler));
+                    } else {
+                        this.connect(node,eventName,lang.hitch(this,eventHandler));
+                    }
+                }));
+                query('> script[type^="rft/method"]',this.domNode)
+                .orphan().forEach(lang.hitch(this,function(s){
+                    var methodName = s.getAttribute("data-rft-method");
+                    var func = parser._functionFromScript(s);
+                    this[methodName] = func;
                 }));
             },
-            startup: function() {
-                this.inherited(arguments);
-                this._hasStarted = true;
-                this._triggerOnVisit();
-            },
-            _triggerOnVisit: function() {
-                if ( this._controllerLoaded && this._hasStarted && !this._triggeredOnVisit ) {
-                    this._triggeredOnVisit = false;
-                    this.onVisit();
-                }
-            }
+            /** Event fired after startup of all widgets is complete */
+            onVisit: function(){},
+            /** Event fired before leaving the page. Return false to prevent */
+            onLeave: function(){}
         });
     });