User update stuff.

diff --git a/app/components/user/user-service.js b/app/components/user/user-service.js
index f4dda5d..1c1d57c 100644 (file)
--- a/app/components/user/user-service.js
+++ b/app/components/user/user-service.js
@@ -52,15 +52,58 @@ factory("UserService", ['$rootScope', 'rockEndpoint', '$http', '$q', 'HelloServi
             }
             
             return HelloService.getFacebookId().then(function(fbId)
-                {
-                    //cant use this here bc scope or something
-                    UserService.facebookId = fbId;
-                    return UserService.getUser(fbId);
-                });
+            {
+                //cant use this here bc scope or something
+                UserService.facebookId = fbId;
+                return UserService.getUser(fbId);
+            });
         } else {
             return this.getUser(this.facebookId);
         }
     };
+    
+    UserService.updateUser = function(facebookId, userObj)
+    {
+        var deferred = $q.defer();
+        var token = HelloService.getAccessToken();
+
+        $http({
+            url: rockEndpoint + "user/" + facebookId,
+            method: "POST",
+            data: userObj,
+            params: {token: token}
+        }).
+        success(function (data)
+        {
+            deferred.resolve(data);
+        }).
+        error(function(data, status)
+        {
+            $rootScope.$broadcast('message.error', 'Uh oh, something went really wrong. Try refreshing the page.'); 
+        });
+
+        return deferred.promise;
+    };
+    
+    UserService.updateCurrentUser = function(userObj)
+    {
+        if (!this.facebookId)
+        {
+            if(!HelloService.getFacebookId())
+            {
+                return null;
+            }
+            
+            return HelloService.getFacebookId().then(function(fbId)
+            {
+                //cant use this here bc scope or something
+                UserService.facebookId = fbId;
+                return UserService.updateUser(fbId, userObj);
+            });
+        } else {
+            return this.updateUser(this.facebookId, userObj);
+        }
+    };
          
     UserService.updateCache = function()
     {

diff --git a/app/components/userMenu/userMenu-directive.js b/app/components/userMenu/userMenu-directive.js
index b213b58..138c1fc 100644 (file)
--- a/app/components/userMenu/userMenu-directive.js
+++ b/app/components/userMenu/userMenu-directive.js
@@ -48,6 +48,14 @@ directive('userMenu', ['HelloService', 'UserService', '$modal', function(HelloSe
                     controller: 'AccountController',
                 });
             };
+            
+            scope.openPublicProfile = function()
+            {
+                $modal.open({
+                    templateUrl: 'pages/profile/profile.html',
+                    controller: 'ProfileController',
+                });
+            };
         }
     };
 }]);

diff --git a/app/components/userMenu/userMenu.html b/app/components/userMenu/userMenu.html
index 5fa535e..1f63957 100644 (file)
--- a/app/components/userMenu/userMenu.html
+++ b/app/components/userMenu/userMenu.html
@@ -16,7 +16,7 @@
     <div ng-if="loggedIn">
         <h1>My Arrows</h1>
         <ul>
-            <!--<li><a href="#/profile">Public Profile</a></li>-->
+            <li><a class="de-link" ng-click="openPublicProfile()">Public Profile</a></li>
             <li><a class="de-link" ng-click='openAccountSettings()'>Account Settings</a></li>
         </ul>
         <!--<ul>

diff --git a/app/divinelegy.js b/app/divinelegy.js
index c928879..697bf46 100644 (file)
--- a/app/divinelegy.js
+++ b/app/divinelegy.js
@@ -12,6 +12,7 @@ angular.module('DivinElegy', [
   'DivinElegy.pages.index',
   'DivinElegy.pages.upload',
   'DivinElegy.pages.account',
+  'DivinElegy.pages.profile',
   'DivinElegy.pages.simfiles',
   'DivinElegy.pages.packs'
 ]).

diff --git a/app/index.html b/app/index.html
index 37f45c6..34c62dc 100644 (file)
--- a/app/index.html
+++ b/app/index.html
@@ -46,6 +46,7 @@
         <script src="pages/index/index.js"></script>
         <script src="pages/upload/upload.js"></script>
         <script src="pages/account/account.js"></script>
+        <script src="pages/profile/profile.js"></script>
         <script src="pages/simfiles/simfiles.js"></script>
         <script src="pages/packs/packs.js"></script>
         

diff --git a/app/pages/profile/profile.html b/app/pages/profile/profile.html
new file mode 100644 (file)
index 0000000..16bec5a
--- /dev/null
+++ b/app/pages/profile/profile.html
@@ -0,0 +1,256 @@
+<div class="modal-header">
+    <h1 class="modal-title">Public Profile</h1>
+    <h2 ng-if="status">{{status}}</h2>
+</div>
+<div class="modal-body">
+    <h2>Display name</h2>
+    <input type="text" ng-model="displayName"/>
+    <h2>Country</h2>
+    <select ng-model="country">
+        <option value="United States">United States</option> 
+        <option value="United Kingdom">United Kingdom</option> 
+        <option value="Afghanistan">Afghanistan</option> 
+        <option value="Albania">Albania</option> 
+        <option value="Algeria">Algeria</option> 
+        <option value="American Samoa">American Samoa</option> 
+        <option value="Andorra">Andorra</option> 
+        <option value="Angola">Angola</option> 
+        <option value="Anguilla">Anguilla</option> 
+        <option value="Antarctica">Antarctica</option> 
+        <option value="Antigua and Barbuda">Antigua and Barbuda</option> 
+        <option value="Argentina">Argentina</option> 
+        <option value="Armenia">Armenia</option> 
+        <option value="Aruba">Aruba</option> 
+        <option value="Australia">Australia</option> 
+        <option value="Austria">Austria</option> 
+        <option value="Azerbaijan">Azerbaijan</option> 
+        <option value="Bahamas">Bahamas</option> 
+        <option value="Bahrain">Bahrain</option> 
+        <option value="Bangladesh">Bangladesh</option> 
+        <option value="Barbados">Barbados</option> 
+        <option value="Belarus">Belarus</option> 
+        <option value="Belgium">Belgium</option> 
+        <option value="Belize">Belize</option> 
+        <option value="Benin">Benin</option> 
+        <option value="Bermuda">Bermuda</option> 
+        <option value="Bhutan">Bhutan</option> 
+        <option value="Bolivia">Bolivia</option> 
+        <option value="Bosnia and Herzegovina">Bosnia and Herzegovina</option> 
+        <option value="Botswana">Botswana</option> 
+        <option value="Bouvet Island">Bouvet Island</option> 
+        <option value="Brazil">Brazil</option> 
+        <option value="British Indian Ocean Territory">British Indian Ocean Territory</option> 
+        <option value="Brunei Darussalam">Brunei Darussalam</option> 
+        <option value="Bulgaria">Bulgaria</option> 
+        <option value="Burkina Faso">Burkina Faso</option> 
+        <option value="Burundi">Burundi</option> 
+        <option value="Cambodia">Cambodia</option> 
+        <option value="Cameroon">Cameroon</option> 
+        <option value="Canada">Canada</option> 
+        <option value="Cape Verde">Cape Verde</option> 
+        <option value="Cayman Islands">Cayman Islands</option> 
+        <option value="Central African Republic">Central African Republic</option> 
+        <option value="Chad">Chad</option> 
+        <option value="Chile">Chile</option> 
+        <option value="China">China</option> 
+        <option value="Christmas Island">Christmas Island</option> 
+        <option value="Cocos (Keeling) Islands">Cocos (Keeling) Islands</option> 
+        <option value="Colombia">Colombia</option> 
+        <option value="Comoros">Comoros</option> 
+        <option value="Congo">Congo</option> 
+        <option value="Congo, The Democratic Republic of The">Congo, The Democratic Republic of The</option> 
+        <option value="Cook Islands">Cook Islands</option> 
+        <option value="Costa Rica">Costa Rica</option> 
+        <option value="Cote D'ivoire">Cote D'ivoire</option> 
+        <option value="Croatia">Croatia</option> 
+        <option value="Cuba">Cuba</option> 
+        <option value="Cyprus">Cyprus</option> 
+        <option value="Czech Republic">Czech Republic</option> 
+        <option value="Denmark">Denmark</option> 
+        <option value="Djibouti">Djibouti</option> 
+        <option value="Dominica">Dominica</option> 
+        <option value="Dominican Republic">Dominican Republic</option> 
+        <option value="Ecuador">Ecuador</option> 
+        <option value="Egypt">Egypt</option> 
+        <option value="El Salvador">El Salvador</option> 
+        <option value="Equatorial Guinea">Equatorial Guinea</option> 
+        <option value="Eritrea">Eritrea</option> 
+        <option value="Estonia">Estonia</option> 
+        <option value="Ethiopia">Ethiopia</option> 
+        <option value="Falkland Islands (Malvinas)">Falkland Islands (Malvinas)</option> 
+        <option value="Faroe Islands">Faroe Islands</option> 
+        <option value="Fiji">Fiji</option> 
+        <option value="Finland">Finland</option> 
+        <option value="France">France</option> 
+        <option value="French Guiana">French Guiana</option> 
+        <option value="French Polynesia">French Polynesia</option> 
+        <option value="French Southern Territories">French Southern Territories</option> 
+        <option value="Gabon">Gabon</option> 
+        <option value="Gambia">Gambia</option> 
+        <option value="Georgia">Georgia</option> 
+        <option value="Germany">Germany</option> 
+        <option value="Ghana">Ghana</option> 
+        <option value="Gibraltar">Gibraltar</option> 
+        <option value="Greece">Greece</option> 
+        <option value="Greenland">Greenland</option> 
+        <option value="Grenada">Grenada</option> 
+        <option value="Guadeloupe">Guadeloupe</option> 
+        <option value="Guam">Guam</option> 
+        <option value="Guatemala">Guatemala</option> 
+        <option value="Guinea">Guinea</option> 
+        <option value="Guinea-bissau">Guinea-bissau</option> 
+        <option value="Guyana">Guyana</option> 
+        <option value="Haiti">Haiti</option> 
+        <option value="Heard Island and Mcdonald Islands">Heard Island and Mcdonald Islands</option> 
+        <option value="Holy See (Vatican City State)">Holy See (Vatican City State)</option> 
+        <option value="Honduras">Honduras</option> 
+        <option value="Hong Kong">Hong Kong</option> 
+        <option value="Hungary">Hungary</option> 
+        <option value="Iceland">Iceland</option> 
+        <option value="India">India</option> 
+        <option value="Indonesia">Indonesia</option> 
+        <option value="Iran, Islamic Republic of">Iran, Islamic Republic of</option> 
+        <option value="Iraq">Iraq</option> 
+        <option value="Ireland">Ireland</option> 
+        <option value="Israel">Israel</option> 
+        <option value="Italy">Italy</option> 
+        <option value="Jamaica">Jamaica</option> 
+        <option value="Japan">Japan</option> 
+        <option value="Jordan">Jordan</option> 
+        <option value="Kazakhstan">Kazakhstan</option> 
+        <option value="Kenya">Kenya</option> 
+        <option value="Kiribati">Kiribati</option> 
+        <option value="Korea, Democratic People's Republic of">Korea, Democratic People's Republic of</option> 
+        <option value="Korea, Republic of">Korea, Republic of</option> 
+        <option value="Kuwait">Kuwait</option> 
+        <option value="Kyrgyzstan">Kyrgyzstan</option> 
+        <option value="Lao People's Democratic Republic">Lao People's Democratic Republic</option> 
+        <option value="Latvia">Latvia</option> 
+        <option value="Lebanon">Lebanon</option> 
+        <option value="Lesotho">Lesotho</option> 
+        <option value="Liberia">Liberia</option> 
+        <option value="Libyan Arab Jamahiriya">Libyan Arab Jamahiriya</option> 
+        <option value="Liechtenstein">Liechtenstein</option> 
+        <option value="Lithuania">Lithuania</option> 
+        <option value="Luxembourg">Luxembourg</option> 
+        <option value="Macao">Macao</option> 
+        <option value="Macedonia, The Former Yugoslav Republic of">Macedonia, The Former Yugoslav Republic of</option> 
+        <option value="Madagascar">Madagascar</option> 
+        <option value="Malawi">Malawi</option> 
+        <option value="Malaysia">Malaysia</option> 
+        <option value="Maldives">Maldives</option> 
+        <option value="Mali">Mali</option> 
+        <option value="Malta">Malta</option> 
+        <option value="Marshall Islands">Marshall Islands</option> 
+        <option value="Martinique">Martinique</option> 
+        <option value="Mauritania">Mauritania</option> 
+        <option value="Mauritius">Mauritius</option> 
+        <option value="Mayotte">Mayotte</option> 
+        <option value="Mexico">Mexico</option> 
+        <option value="Micronesia, Federated States of">Micronesia, Federated States of</option> 
+        <option value="Moldova, Republic of">Moldova, Republic of</option> 
+        <option value="Monaco">Monaco</option> 
+        <option value="Mongolia">Mongolia</option> 
+        <option value="Montserrat">Montserrat</option> 
+        <option value="Morocco">Morocco</option> 
+        <option value="Mozambique">Mozambique</option> 
+        <option value="Myanmar">Myanmar</option> 
+        <option value="Namibia">Namibia</option> 
+        <option value="Nauru">Nauru</option> 
+        <option value="Nepal">Nepal</option> 
+        <option value="Netherlands">Netherlands</option> 
+        <option value="Netherlands Antilles">Netherlands Antilles</option> 
+        <option value="New Caledonia">New Caledonia</option> 
+        <option value="New Zealand">New Zealand</option> 
+        <option value="Nicaragua">Nicaragua</option> 
+        <option value="Niger">Niger</option> 
+        <option value="Nigeria">Nigeria</option> 
+        <option value="Niue">Niue</option> 
+        <option value="Norfolk Island">Norfolk Island</option> 
+        <option value="Northern Mariana Islands">Northern Mariana Islands</option> 
+        <option value="Norway">Norway</option> 
+        <option value="Oman">Oman</option> 
+        <option value="Pakistan">Pakistan</option> 
+        <option value="Palau">Palau</option> 
+        <option value="Palestinian Territory, Occupied">Palestinian Territory, Occupied</option> 
+        <option value="Panama">Panama</option> 
+        <option value="Papua New Guinea">Papua New Guinea</option> 
+        <option value="Paraguay">Paraguay</option> 
+        <option value="Peru">Peru</option> 
+        <option value="Philippines">Philippines</option> 
+        <option value="Pitcairn">Pitcairn</option> 
+        <option value="Poland">Poland</option> 
+        <option value="Portugal">Portugal</option> 
+        <option value="Puerto Rico">Puerto Rico</option> 
+        <option value="Qatar">Qatar</option> 
+        <option value="Reunion">Reunion</option> 
+        <option value="Romania">Romania</option> 
+        <option value="Russian Federation">Russian Federation</option> 
+        <option value="Rwanda">Rwanda</option> 
+        <option value="Saint Helena">Saint Helena</option> 
+        <option value="Saint Kitts and Nevis">Saint Kitts and Nevis</option> 
+        <option value="Saint Lucia">Saint Lucia</option> 
+        <option value="Saint Pierre and Miquelon">Saint Pierre and Miquelon</option> 
+        <option value="Saint Vincent and The Grenadines">Saint Vincent and The Grenadines</option> 
+        <option value="Samoa">Samoa</option> 
+        <option value="San Marino">San Marino</option> 
+        <option value="Sao Tome and Principe">Sao Tome and Principe</option> 
+        <option value="Saudi Arabia">Saudi Arabia</option> 
+        <option value="Senegal">Senegal</option> 
+        <option value="Serbia and Montenegro">Serbia and Montenegro</option> 
+        <option value="Seychelles">Seychelles</option> 
+        <option value="Sierra Leone">Sierra Leone</option> 
+        <option value="Singapore">Singapore</option> 
+        <option value="Slovakia">Slovakia</option> 
+        <option value="Slovenia">Slovenia</option> 
+        <option value="Solomon Islands">Solomon Islands</option> 
+        <option value="Somalia">Somalia</option> 
+        <option value="South Africa">South Africa</option> 
+        <option value="South Georgia and The South Sandwich Islands">South Georgia and The South Sandwich Islands</option> 
+        <option value="Spain">Spain</option> 
+        <option value="Sri Lanka">Sri Lanka</option> 
+        <option value="Sudan">Sudan</option> 
+        <option value="Suriname">Suriname</option> 
+        <option value="Svalbard and Jan Mayen">Svalbard and Jan Mayen</option> 
+        <option value="Swaziland">Swaziland</option> 
+        <option value="Sweden">Sweden</option> 
+        <option value="Switzerland">Switzerland</option> 
+        <option value="Syrian Arab Republic">Syrian Arab Republic</option> 
+        <option value="Taiwan, Province of China">Taiwan, Province of China</option> 
+        <option value="Tajikistan">Tajikistan</option> 
+        <option value="Tanzania, United Republic of">Tanzania, United Republic of</option> 
+        <option value="Thailand">Thailand</option> 
+        <option value="Timor-leste">Timor-leste</option> 
+        <option value="Togo">Togo</option> 
+        <option value="Tokelau">Tokelau</option> 
+        <option value="Tonga">Tonga</option> 
+        <option value="Trinidad and Tobago">Trinidad and Tobago</option> 
+        <option value="Tunisia">Tunisia</option> 
+        <option value="Turkey">Turkey</option> 
+        <option value="Turkmenistan">Turkmenistan</option> 
+        <option value="Turks and Caicos Islands">Turks and Caicos Islands</option> 
+        <option value="Tuvalu">Tuvalu</option> 
+        <option value="Uganda">Uganda</option> 
+        <option value="Ukraine">Ukraine</option> 
+        <option value="United Arab Emirates">United Arab Emirates</option> 
+        <option value="United Kingdom">United Kingdom</option> 
+        <option value="United States">United States</option> 
+        <option value="United States Minor Outlying Islands">United States Minor Outlying Islands</option> 
+        <option value="Uruguay">Uruguay</option> 
+        <option value="Uzbekistan">Uzbekistan</option> 
+        <option value="Vanuatu">Vanuatu</option> 
+        <option value="Venezuela">Venezuela</option> 
+        <option value="Viet Nam">Viet Nam</option> 
+        <option value="Virgin Islands, British">Virgin Islands, British</option> 
+        <option value="Virgin Islands, U.S.">Virgin Islands, U.S.</option> 
+        <option value="Wallis and Futuna">Wallis and Futuna</option> 
+        <option value="Western Sahara">Western Sahara</option> 
+        <option value="Yemen">Yemen</option> 
+        <option value="Zambia">Zambia</option> 
+        <option value="Zimbabwe">Zimbabwe</option>
+    </select>
+</div>
+<div class="modal-footer">
+    <button class="btn btn-primary" ng-click="ok()">Save</button>
+    <button class="btn" ng-click="cancel()">Close</button>
+</div>
\ No newline at end of file

diff --git a/app/pages/profile/profile.js b/app/pages/profile/profile.js
new file mode 100644 (file)
index 0000000..0581430
--- /dev/null
+++ b/app/pages/profile/profile.js
@@ -0,0 +1,28 @@
+'use strict';
+
+angular.module("DivinElegy.pages.profile", ['DivinElegy.components.user'])
+
+.controller("ProfileController", ['$scope', '$modalInstance', 'UserService', function($scope, $modalInstance, UserService)
+{
+    UserService.getCurrentUser().then(function(user)
+    {
+        console.log(user);
+        $scope.country = user.country;
+        $scope.email = user.email;
+        $scope.displayName = user.displayName;
+    });
+
+    $scope.ok = function()
+    {
+        var test = {displayName:"tits mcgee"};
+        UserService.updateCurrentUser(test).then(function(result)
+        {
+            console.log(result);
+        });
+    };
+    
+    $scope.cancel = function()
+    {
+        $modalInstance.dismiss('cancel');
+    };
+}]);
\ No newline at end of file