From b0eea0d49364d1dc75edcd8f1ad5893aad2dd67f Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Wed, 18 Dec 2019 01:02:19 -0500
Subject: [PATCH] name cannot be changed. add admin menu strings

---
 .../src/main/java/bubble/model/account/Account.java  |  6 +++---
 .../bubble/resources/account/AccountsResource.java   |  5 -----
 .../en_US/post_auth/ResourceMessages.properties      | 12 +++++++++++-
 bubble-web                                           |  2 +-
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/bubble-server/src/main/java/bubble/model/account/Account.java b/bubble-server/src/main/java/bubble/model/account/Account.java
index 650ed02c..4dcd5f24 100644
--- a/bubble-server/src/main/java/bubble/model/account/Account.java
+++ b/bubble-server/src/main/java/bubble/model/account/Account.java
@@ -76,7 +76,7 @@ public class Account extends IdentifiableBase implements TokenPrincipal {
     public static String accountField(String table) { return table.equalsIgnoreCase("account") ? "uuid" : "account"; }
 
     @HasValue(message="err.name.required")
-    @ECIndex(unique=true) @Column(length=100, nullable=false)
+    @ECIndex(unique=true) @Column(nullable=false, updatable=false, length=100)
     @Getter @Setter private String name;
 
     private static final List<String> RESERVED_NAMES = Arrays.asList(
@@ -96,8 +96,8 @@ public class Account extends IdentifiableBase implements TokenPrincipal {
     @Type(type=ENCRYPTED_STRING) @Column(columnDefinition="varchar("+(1024+ENC_PAD)+")")
     @Getter @Setter private String url;
 
-    @Size(max=1000, message="err.description.length")
-    @Type(type=ENCRYPTED_STRING) @Column(columnDefinition="varchar("+(1000+ENC_PAD)+")")
+    @Size(max=10000, message="err.description.length")
+    @Type(type=ENCRYPTED_STRING) @Column(columnDefinition="varchar("+(10000+ENC_PAD)+")")
     @Getter @Setter private String description;
 
     @Getter @Setter private Boolean admin = false;
diff --git a/bubble-server/src/main/java/bubble/resources/account/AccountsResource.java b/bubble-server/src/main/java/bubble/resources/account/AccountsResource.java
index 0d6a1d35..161a273b 100644
--- a/bubble-server/src/main/java/bubble/resources/account/AccountsResource.java
+++ b/bubble-server/src/main/java/bubble/resources/account/AccountsResource.java
@@ -113,11 +113,6 @@ public class AccountsResource {
         } else {
             c.account.update(request);
         }
-        // check name collision
-        final Account byName = accountDAO.findByName(c.account.getName());
-        if (byName != null && !byName.getUuid().equals(c.account.getUuid())) {
-            return invalid("err.name.registered");
-        }
         return ok(accountDAO.update(c.account));
     }
 
diff --git a/bubble-server/src/main/resources/message_templates/server/en_US/post_auth/ResourceMessages.properties b/bubble-server/src/main/resources/message_templates/server/en_US/post_auth/ResourceMessages.properties
index 9cb19e14..954a6462 100644
--- a/bubble-server/src/main/resources/message_templates/server/en_US/post_auth/ResourceMessages.properties
+++ b/bubble-server/src/main/resources/message_templates/server/en_US/post_auth/ResourceMessages.properties
@@ -5,6 +5,14 @@ label_homepage_hello=Hello, {{account.user.name}}
 # Sidebar menu
 label_menu_dashboard=Dashboard
 label_menu_dashboard_icon=fa fa-home
+label_menu_admin=Admin
+label_menu_admin_icon=fa fa-cog
+label_menu_admin_users=Users
+label_menu_admin_users_icon=fa fa-user-cog
+label_menu_admin_networks=User Bubbles
+label_menu_admin_networks_icon=fa fa-dot-circle
+label_menu_admin_bills=Bills
+label_menu_admin_bills_icon=fa fa-money-check-alt
 label_menu_account=Account
 label_menu_account_icon=fa fa-user
 label_menu_account_policy=Account Policy
@@ -13,12 +21,14 @@ label_menu_account_contacts=Contact Info
 label_menu_account_contacts_icon=fa fa-address-book
 label_menu_networks=Bubbles
 label_menu_networks_icon=fa fa-cloud
+label_menu_bills=Bills
+label_menu_bills_icon=fa fa-money-bill-wave
 label_menu_logout=Log out
 label_menu_logout_icon=fa fa-sign-out-alt
 
 # Profile fields
 field_label_url=URL
-field_label_bio=Bio
+field_label_description=Description
 field_label_administrator=Administrator
 field_label_suspended=Suspended
 field_label_auto_update_policy=Auto-Update Policy
diff --git a/bubble-web b/bubble-web
index a47aad65..551dd9a7 160000
--- a/bubble-web
+++ b/bubble-web
@@ -1 +1 @@
-Subproject commit a47aad65e5b5649f84ce0f3e40c165c4ae7dd243
+Subproject commit 551dd9a718c13ff789814f03586d4d037c06c1f5