Merge branch 'develop'

tobihagemann · tobihagemann · commit d702eeb7fbf4 · 2025-07-19T17:16:12.000+02:00
diff --git a/assets/js/hubmanaged.js b/assets/js/hubmanaged.js
@@ -27,14 +27,21 @@ class HubManaged {
       data: {
         email: this._submitData.email
       }
-    }).done(_ => {
+    }).done(response => {
+      // Auto-populate subdomain only if it's a company email
+      if (response.isCompanyEmail) {
+        this._submitData.subdomain = emailToSubdomain(this._submitData.email);
+      } else {
+        // Clear subdomain for non-company emails (freemail, etc.)
+        this._submitData.subdomain = '';
+      }
       this.onValidationSucceeded();
     }).fail(xhr => {
       this.onValidationFailed(xhr.responseJSON?.message || 'Validating email failed.');
     });
   }
 
-  validateTeamAndSubdomain() {
+  validateSubdomain() {
     if (!$(this._form)[0].checkValidity()) {
       $(this._form).find(':input').addClass('show-invalid');
       this._feedbackData.errorMessage = 'Please fill in all required fields.';
@@ -47,13 +54,12 @@ class HubManaged {
       url: VALIDATE_HUB_MANAGED_REQUEST_URL,
       type: 'GET',
       data: {
-        team: this._submitData.team,
         subdomain: this._submitData.subdomain
       }
     }).done(_ => {
       this.onValidationSucceeded();
     }).fail(xhr => {
-      this.onValidationFailed(xhr.responseJSON?.message || 'Validating team and subdomain failed.');
+      this.onValidationFailed(xhr.responseJSON?.message || 'Validating subdomain failed.');
     });
   }
 
@@ -153,6 +159,73 @@ function teamToSubdomain(team) {
   return subdomain;
 }
 
+function emailToSubdomain(email) {
+  if (!email || !email.includes('@')) {
+    return '';
+  }
+  
+  // Extract domain from email
+  const domain = email.split('@')[1].toLowerCase();
+  
+  // Extract subdomain from email domain
+  const domainParts = domain.split('.');
+  
+  // For domains with multiple levels, try to find the most meaningful part
+  let subdomain = '';
+  
+  if (domainParts.length >= 2) {
+    // Common TLDs and country codes to ignore
+    const tlds = ['com', 'org', 'net', 'edu', 'gov', 'mil', 'co', 'io', 'me', 'info', 'biz'];
+    const countryCodes = ['de', 'uk', 'fr', 'es', 'it', 'nl', 'at', 'ch', 'us', 'ca', 'au', 'jp', 'cn', 'in', 'br'];
+    
+    // For academic domains (containing .edu, .ac, .edu.*, .ac.*)
+    if (domain.includes('.edu') || domain.includes('.ac.')) {
+      // Try to find the institution name (usually right before .edu/.ac)
+      for (let i = domainParts.length - 3; i >= 0; i--) {
+        if (!tlds.includes(domainParts[i]) && !countryCodes.includes(domainParts[i])) {
+          subdomain = domainParts[i];
+          break;
+        }
+      }
+    }
+    
+    // If no academic pattern or no match found, use heuristics
+    if (!subdomain) {
+      // Skip the last part (TLD) and country code if present
+      let skipParts = 1;
+      if (domainParts.length > 2 && countryCodes.includes(domainParts[domainParts.length - 1])) {
+        skipParts = 2;
+      }
+      
+      // Look for the most meaningful part (skip common subdomains)
+      const commonSubdomains = ['www', 'mail', 'email', 'smtp', 'pop', 'imap', 'webmail', 'smail'];
+      for (let i = domainParts.length - skipParts - 1; i >= 0; i--) {
+        if (!commonSubdomains.includes(domainParts[i])) {
+          subdomain = domainParts[i];
+          break;
+        }
+      }
+      
+      // If all parts are common subdomains, just use the first part
+      if (!subdomain && domainParts.length > skipParts) {
+        subdomain = domainParts[0];
+      }
+    }
+    
+    // Clean up the subdomain to match the allowed pattern
+    subdomain = subdomain.replace(/[^a-z0-9-]/g, '-');
+    subdomain = subdomain.replace(/-+/g, '-');
+    subdomain = subdomain.replace(/^-+|-+$/g, '');
+    
+    // Ensure it's not empty and within length limits
+    if (subdomain && subdomain.length <= 63) {
+      return subdomain;
+    }
+  }
+  
+  return '';
+}
+
 function subdomainToURL(subdomain) {
   return `https://${subdomain}.cryptomator.cloud`;
 }
diff --git a/i18n/de.yaml b/i18n/de.yaml
@@ -662,15 +662,13 @@
   translation: "E-Mail-Adresse"
 
 - id: hub_managed_step_2_nav_title
-  translation: "Team-Name"
+  translation: "Subdomain"
 - id: hub_managed_step_2_title
-  translation: "Wie heißt dein Team?"
-- id: hub_managed_step_2_team_placeholder
-  translation: "Name deines Teams, Unternehmens oder deiner Organisation"
+  translation: "Welche Subdomain möchtest du?"
 - id: hub_managed_step_2_subdomain_description
-  translation: "Dies ist die URL deiner Hub-Instanz."
+  translation: "Dies wird die URL deiner Hub-Instanz sein."
 - id: hub_managed_step_2_subdomain_placeholder
-  translation: "Subdomain deiner Hub-Instanz"
+  translation: "deine-subdomain"
 
 - id: hub_managed_step_3_nav_title
   translation: "Erwartete Nutzer"
@@ -687,8 +685,6 @@
   translation: "Zusammenfassung"
 - id: hub_managed_step_4_email
   translation: "E-Mail"
-- id: hub_managed_step_4_team
-  translation: "Team-Name"
 - id: hub_managed_step_4_url
   translation: "URL"
 - id: hub_managed_step_4_quantity
diff --git a/i18n/en.yaml b/i18n/en.yaml
@@ -662,15 +662,13 @@
   translation: "Email address"
 
 - id: hub_managed_step_2_nav_title
-  translation: "Team Name"
+  translation: "Subdomain"
 - id: hub_managed_step_2_title
-  translation: "What's your team's name?"
-- id: hub_managed_step_2_team_placeholder
-  translation: "Name of your team, company, or organization"
+  translation: "What subdomain would you like?"
 - id: hub_managed_step_2_subdomain_description
-  translation: "This is the URL of your Hub instance."
+  translation: "This will be the URL of your Hub instance."
 - id: hub_managed_step_2_subdomain_placeholder
-  translation: "Subdomain of your Hub instance"
+  translation: "your-subdomain"
 
 - id: hub_managed_step_3_nav_title
   translation: "Expected Users"
@@ -687,8 +685,6 @@
   translation: "Summary"
 - id: hub_managed_step_4_email
   translation: "Email"
-- id: hub_managed_step_4_team
-  translation: "Team Name"
 - id: hub_managed_step_4_url
   translation: "URL"
 - id: hub_managed_step_4_quantity
diff --git a/layouts/become-a-partner/single.html b/layouts/become-a-partner/single.html
@@ -18,15 +18,15 @@ <h1 class="font-h1 mb-8">{{ .Title }}</h1>
                   <label for="firstName" class="block text-sm font-medium text-gray-700 mb-2">
                     {{ i18n "partner_first_name" }} <span class="text-red-500" aria-label="required">*</span>
                   </label>
-                  <input type="text" id="firstName" name="firstName" x-model="submitData.firstName" class="block input-box w-full" required aria-required="true" @blur="$el.classList.add('show-invalid')">
+                  <input type="text" id="firstName" name="firstName" x-model="submitData.firstName" class="block input-box w-full" maxlength="100" required aria-required="true" @blur="$el.classList.add('show-invalid')">
                 </div>
 
                 <!-- Last Name -->
                 <div>
                   <label for="lastName" class="block text-sm font-medium text-gray-700 mb-2">
                     {{ i18n "partner_last_name" }} <span class="text-red-500" aria-label="required">*</span>
                   </label>
-                  <input type="text" id="lastName" name="lastName" x-model="submitData.lastName" class="block input-box w-full" required aria-required="true" @blur="$el.classList.add('show-invalid')">
+                  <input type="text" id="lastName" name="lastName" x-model="submitData.lastName" class="block input-box w-full" maxlength="100" required aria-required="true" @blur="$el.classList.add('show-invalid')">
                 </div>
               </div>
 
@@ -43,15 +43,15 @@ <h1 class="font-h1 mb-8">{{ .Title }}</h1>
                 <label for="company" class="block text-sm font-medium text-gray-700 mb-2">
                   {{ i18n "partner_company" }} <span class="text-red-500" aria-label="required">*</span>
                 </label>
-                <input type="text" id="company" name="company" x-model="submitData.company" class="block input-box w-full" required aria-required="true" @blur="$el.classList.add('show-invalid')">
+                <input type="text" id="company" name="company" x-model="submitData.company" class="block input-box w-full" maxlength="200" required aria-required="true" @blur="$el.classList.add('show-invalid')">
               </div>
 
               <!-- Company Website -->
               <div class="mb-6">
                 <label for="website" class="block text-sm font-medium text-gray-700 mb-2">
                   {{ i18n "partner_website" }}
                 </label>
-                <input type="url" id="website" name="website" x-model="submitData.website" class="block input-box w-full" placeholder="https://">
+                <input type="url" id="website" name="website" x-model="submitData.website" class="block input-box w-full" maxlength="200" placeholder="https://">
               </div>
 
               <!-- Partnership Type -->
@@ -74,7 +74,7 @@ <h1 class="font-h1 mb-8">{{ .Title }}</h1>
                 <label for="message" class="block text-sm font-medium text-gray-700 mb-2">
                   {{ i18n "partner_message" }}
                 </label>
-                <textarea id="message" name="message" x-model="submitData.message" rows="4" class="block input-box w-full" placeholder="{{ i18n "partner_message_placeholder" }}"></textarea>
+                <textarea id="message" name="message" x-model="submitData.message" rows="4" class="block input-box w-full" maxlength="2000" placeholder="{{ i18n "partner_message_placeholder" }}"></textarea>
               </div>
 
               <!-- Terms & Privacy Acceptance -->
diff --git a/layouts/book-a-demo/single.html b/layouts/book-a-demo/single.html
@@ -18,15 +18,15 @@ <h1 class="font-h1 mb-8">{{ .Title }}</h1>
                   <label for="firstName" class="block text-sm font-medium text-gray-700 mb-2">
                     {{ i18n "book_demo_first_name" }} <span class="text-red-500" aria-label="required">*</span>
                   </label>
-                  <input type="text" id="firstName" name="firstName" x-model="submitData.firstName" class="block input-box w-full" required aria-required="true" @blur="$el.classList.add('show-invalid')">
+                  <input type="text" id="firstName" name="firstName" x-model="submitData.firstName" class="block input-box w-full" maxlength="100" required aria-required="true" @blur="$el.classList.add('show-invalid')">
                 </div>
 
                 <!-- Last Name -->
                 <div>
                   <label for="lastName" class="block text-sm font-medium text-gray-700 mb-2">
                     {{ i18n "book_demo_last_name" }} <span class="text-red-500" aria-label="required">*</span>
                   </label>
-                  <input type="text" id="lastName" name="lastName" x-model="submitData.lastName" class="block input-box w-full" required aria-required="true" @blur="$el.classList.add('show-invalid')">
+                  <input type="text" id="lastName" name="lastName" x-model="submitData.lastName" class="block input-box w-full" maxlength="100" required aria-required="true" @blur="$el.classList.add('show-invalid')">
                 </div>
               </div>
 
@@ -43,7 +43,7 @@ <h1 class="font-h1 mb-8">{{ .Title }}</h1>
                 <label for="company" class="block text-sm font-medium text-gray-700 mb-2">
                   {{ i18n "book_demo_company" }}
                 </label>
-                <input type="text" id="company" name="company" x-model="submitData.company" class="block input-box w-full">
+                <input type="text" id="company" name="company" x-model="submitData.company" class="block input-box w-full" maxlength="200">
               </div>
 
               <!-- What do you want to learn? -->
@@ -113,7 +113,7 @@ <h1 class="font-h1 mb-8">{{ .Title }}</h1>
                 <label for="message" class="block text-sm font-medium text-gray-700 mb-2">
                   {{ i18n "book_demo_message" }}
                 </label>
-                <textarea id="message" name="message" x-model="submitData.message" rows="4" class="block input-box w-full" placeholder="{{ i18n "book_demo_message_placeholder" }}"></textarea>
+                <textarea id="message" name="message" x-model="submitData.message" rows="4" class="block input-box w-full" maxlength="2000" placeholder="{{ i18n "book_demo_message_placeholder" }}"></textarea>
               </div>
 
               <!-- Terms & Privacy Acceptance -->
diff --git a/layouts/contact-sales/single.html b/layouts/contact-sales/single.html
@@ -18,15 +18,15 @@ <h1 class="font-h1 mb-8">{{ .Title }}</h1>
                   <label for="firstName" class="block text-sm font-medium text-gray-700 mb-2">
                     {{ i18n "contact_sales_first_name" }} <span class="text-red-500" aria-label="required">*</span>
                   </label>
-                  <input type="text" id="firstName" name="firstName" x-model="submitData.firstName" class="block input-box w-full" required aria-required="true" @blur="$el.classList.add('show-invalid')">
+                  <input type="text" id="firstName" name="firstName" x-model="submitData.firstName" class="block input-box w-full" maxlength="100" required aria-required="true" @blur="$el.classList.add('show-invalid')">
                 </div>
 
                 <!-- Last Name -->
                 <div>
                   <label for="lastName" class="block text-sm font-medium text-gray-700 mb-2">
                     {{ i18n "contact_sales_last_name" }} <span class="text-red-500" aria-label="required">*</span>
                   </label>
-                  <input type="text" id="lastName" name="lastName" x-model="submitData.lastName" class="block input-box w-full" required aria-required="true" @blur="$el.classList.add('show-invalid')">
+                  <input type="text" id="lastName" name="lastName" x-model="submitData.lastName" class="block input-box w-full" maxlength="100" required aria-required="true" @blur="$el.classList.add('show-invalid')">
                 </div>
               </div>
 
@@ -43,7 +43,7 @@ <h1 class="font-h1 mb-8">{{ .Title }}</h1>
                 <label for="website" class="block text-sm font-medium text-gray-700 mb-2">
                   {{ i18n "contact_sales_website" }}
                 </label>
-                <input type="url" id="website" name="website" x-model="submitData.website" class="block input-box w-full" placeholder="https://">
+                <input type="url" id="website" name="website" x-model="submitData.website" class="block input-box w-full" maxlength="200" placeholder="https://">
               </div>
 
               <!-- Topic Dropdown -->
@@ -65,7 +65,7 @@ <h1 class="font-h1 mb-8">{{ .Title }}</h1>
                 <label for="message" class="block text-sm font-medium text-gray-700 mb-2">
                   {{ i18n "contact_sales_message" }}
                 </label>
-                <textarea id="message" name="message" x-model="submitData.message" rows="4" class="block input-box w-full" placeholder="{{ i18n "contact_sales_message_placeholder" }}"></textarea>
+                <textarea id="message" name="message" x-model="submitData.message" rows="4" class="block input-box w-full" maxlength="2000" placeholder="{{ i18n "contact_sales_message_placeholder" }}"></textarea>
               </div>
 
               <!-- Terms & Privacy Acceptance -->
diff --git a/layouts/hub-managed/single.html b/layouts/hub-managed/single.html
