feat(social): port guilds

HabitRPG · Aug 17, 2014 · 06a4a64 · 06a4a64
1 parent 506ab8b
commit 06a4a64
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 63 deletions.
diff --git a/scripts/app.js b/scripts/app.js
@@ -256,65 +256,25 @@ var habitrpg = angular.module('habitrpg', ['ionic', 'userServices', 'authService
       controller: 'ChatCtrl'
     })
 
-    .state('app.chat', {
-      url:'/chat',
-      abstract: true,
-      views: {
-        menuContent: {
-          templateUrl:'views/app.chat.html',
-          controller: 'ChatCtrl'
-        }
-      }
-    })
-    .state('app.chat.tavern', {
-      url: '/tavern',
-      templateUrl: 'views/app.chat.list.html',
-      data: {gid: 'habitrpg'},
-      controller: ['$scope', function($scope){
-        $scope.query();
-      }]
+    .state('app.social.guilds', {
+      url: '/guilds',
+      templateUrl: 'views/app.social.guilds.html',
+      data: {sync: true},
+      controller: 'GuildCtrl'
     })
-    .state('app.chat.party', {
-      url: '/party',
+
+    .state('app.social.guild-chat', {
+      url: '/guild-chat/:gid',
+      data: {sync: false},
       templateUrl: 'views/app.chat.list.html',
-      data: {gid: 'party'},
-      controller: ['$scope', function($scope){
-        $scope.query();
-      }]
+      data: {gid: null},
+      controller: 'ChatCtrl'
     })
 
-    .state('app.guilds', {
-      url:'/guilds',
-      abstract: true,
-      views: {
-        menuContent: {
-          templateUrl:'views/app.guilds.html',
-          controller: 'GuildCtrl'
-        }
-      }
-    })
-    .state('app.guilds.list', {
-      url: '/list',
-      data: {sync: true},
-      templateUrl: 'views/app.guilds.list.html',
-      controller: ['$scope', function($scope){
-        $scope.syncGuilds();
-      }]
-    })
-    .state('app.guilds.public', {
+    .state('app.social.public-guilds', {
       url: '/public',
       data: {sync: true},
       templateUrl: 'views/app.guilds.public.html',
       controller: 'GuildPublicCtrl'
-    })
-    .state('app.chat.guild', {
-      url: '/guild/:gid',
-      data: {sync: false},
-      templateUrl: 'views/app.chat.list.html',
-      data: {gid: null},
-      controller: ['$scope', function($scope){
-        $scope.query();
-      }]
-    })
-
+    })    
 }])
diff --git a/scripts/controllers/guildCtrl.js b/scripts/controllers/guildCtrl.js
@@ -22,8 +22,10 @@ habitrpg.controller('GuildCtrl',
       };
 
       $scope.viewGuild = function(guild, e) {
-        $state.go('app.chat.guild', {gid:guild._id});
+        $state.go('app.social.guild-chat', {gid:guild._id});
       }
+
+      $scope.syncGuilds();
     }
   ]);
 

diff --git a/views/app/social.jade b/views/app/social.jade
@@ -6,14 +6,6 @@ script(id='views/app.social.html',type='text/ng-template')
     a.tab-item(ng-class='{"tab-item-active": $state.is("app.social.party")}', ui-sref='app.social.party') Party
     a.tab-item(ng-class='{"tab-item-active": $state.is("app.social.guilds")}', ui-sref='app.social.guilds') Guilds
 
-script(id='views/app.social.html',type='text/ng-template')
-  +ionContentView('Social', true)
-    div(ui-view='')
-  .tabs
-    a.tab-item(ng-class='{"tab-item-active": $state.is("app.social.tavern")}', ui-sref='app.social.tavern') Tavern
-    a.tab-item(ng-class='{"tab-item-active": $state.is("app.social.party")}', ui-sref='app.social.party') Party
-    a.tab-item(ng-class='{"tab-item-active": $state.is("app.social.guilds")}', ui-sref='app.social.guilds') Guilds
-
 script(id='views/app.social.party.html',type='text/ng-template')
   .list(ng-if='party._id')
     .item.item-divider {{group.name}}
@@ -25,4 +17,17 @@ script(id='views/app.social.party.html',type='text/ng-template')
       i.icon.ion-chevron-right
     +boss(false, true)
   .padding(ng-if='!group._id')
-    |Start a party (on habitrpg.com)
+    |Start a party (on habitrpg.com)
+
+script(id='views/app.social.guilds.html',type='text/ng-template')
+  ion-list#guildCtrl-list
+    ion-item.item-divider Your guilds
+    ion-item.item-icon-right.item-text-wrap(ng-repeat='guild in guilds' ng-click='viewGuild(guild)')
+      h2 {{guild.name}}
+      p {{guild.description}}
+      i.icon.ion-chevron-right
+    ion-item.item-divider Other guilds
+    ion-item.item-icon-right.item-text-wrap(ui-sref='app.social.public-guilds')
+      h2 Public guilds
+      i.icon.ion-chevron-right
+