diff --git a/routes/__pycache__/main.cpython-313.pyc b/routes/__pycache__/main.cpython-313.pyc index 4e8d6e6..26e8381 100644 Binary files a/routes/__pycache__/main.cpython-313.pyc and b/routes/__pycache__/main.cpython-313.pyc differ diff --git a/routes/main.py b/routes/main.py index e568619..6f84a29 100644 --- a/routes/main.py +++ b/routes/main.py @@ -1671,4 +1671,14 @@ def init_routes(main_bp): return jsonify({'error': f'Connection failed: {response.json().get("message", "Unknown error")}'}), 400 except Exception as e: - return jsonify({'error': f'Connection failed: {str(e)}'}), 400 \ No newline at end of file + return jsonify({'error': f'Connection failed: {str(e)}'}), 400 + + @main_bp.route('/instances/launch-progress') + @login_required + @require_password_change + def launch_progress(): + if not os.environ.get('MASTER', 'false').lower() == 'true': + flash('This page is only available in master instances.', 'error') + return redirect(url_for('main.dashboard')) + + return render_template('main/launch_progress.html') \ No newline at end of file diff --git a/templates/main/instances.html b/templates/main/instances.html index e5c8afc..9cc2a95 100644 --- a/templates/main/instances.html +++ b/templates/main/instances.html @@ -315,9 +315,25 @@
Port Configuration
- + -
Ports below 1024 are reserved for system use. Suggested port: 3000
+
Ports below 1024 are reserved for system use. Ports are automatically assigned by the system but you can change it if you want.
+
+
+ +
+
+ https:// + + +
+
+ +
Enter the domain names where your instance will be accessible
@@ -367,12 +383,36 @@
-

Launch

-

Ready to launch your instance!

+
+ +

Ready to Launch!

+

Review your instance configuration before launching

+ +
+
+
Instance Configuration
+
+
+

Repository:

+

Branch:

+

Company:

+
+
+

Port:

+

Web Addresses:

+
+
+
+
+ + +
-
+
@@ -470,6 +510,16 @@ font-size: 0.875rem; margin-top: 0.5rem; } + +.modal-footer { + display: flex; + justify-content: flex-end !important; + gap: 0.5rem; +} + +.modal-footer button { + margin-left: 0.5rem; +} @@ -1290,13 +1340,25 @@ function updateStepDisplay() { item.classList.toggle('completed', step < currentStep); }); - // Update buttons - const prevButton = document.querySelector('.modal-footer .btn-secondary'); - const nextButton = document.querySelector('.modal-footer .btn-primary'); + // Get the modal footer + const modalFooter = document.getElementById('launchStepsFooter'); + const prevButton = modalFooter.querySelector('.btn-secondary'); + const nextButton = modalFooter.querySelector('.btn-primary'); + // Always show the footer + modalFooter.style.display = 'block'; + + // Show/hide Previous button based on step prevButton.style.display = currentStep === 1 ? 'none' : 'inline-block'; - nextButton.innerHTML = currentStep === totalSteps ? 'Launch Instance' : 'Next '; + // Show/hide Next button based on step + if (currentStep === totalSteps) { + nextButton.style.display = 'none'; + } else { + nextButton.style.display = 'inline-block'; + nextButton.innerHTML = 'Next '; + } + // If we're on step 4, get the next available port if (currentStep === 4) { getNextAvailablePort(); @@ -1310,13 +1372,18 @@ function nextStep() { if (currentStep === 3 && !validateStep3()) { return; } + if (currentStep === 4 && !validateStep4()) { + return; + } if (currentStep < totalSteps) { currentStep++; updateStepDisplay(); - } else { - // Handle final step (launch instance) - launchInstance(); + + // Update review section if we're moving to the final step + if (currentStep === totalSteps) { + updateReviewSection(); + } } } @@ -1620,5 +1687,142 @@ function validateStep3() { return true; } + +// Function to validate step 4 +function validateStep4() { + const port = document.getElementById('port').value; + const webAddresses = document.querySelectorAll('.web-address'); + + // Validate port + if (!port || port < 1024 || port > 65535) { + alert('Please enter a valid port number between 1024 and 65535'); + return false; + } + + // Validate web addresses + if (webAddresses.length === 0) { + alert('Please add at least one web address'); + return false; + } + + // Basic domain validation for each address + const domainRegex = /^[a-zA-Z0-9][a-zA-Z0-9-]{0,61}[a-zA-Z0-9](?:\.[a-zA-Z0-9][a-zA-Z0-9-]{0,61}[a-zA-Z0-9])*\.[a-zA-Z]{2,}$/; + for (const address of webAddresses) { + if (!address.value) { + alert('Please fill in all web addresses'); + return false; + } + if (!domainRegex.test(address.value)) { + alert(`Please enter a valid domain name for: ${address.value}`); + return false; + } + } + + // Check for duplicate addresses + const addresses = Array.from(webAddresses).map(addr => addr.value.toLowerCase()); + const uniqueAddresses = new Set(addresses); + if (addresses.length !== uniqueAddresses.size) { + alert('Please remove duplicate web addresses'); + return false; + } + + return true; +} + +// Function to add a new web address input +function addWebAddress() { + const container = document.getElementById('webAddressesContainer'); + const newAddress = document.createElement('div'); + newAddress.className = 'input-group mb-2'; + newAddress.innerHTML = ` + https:// + + + `; + container.appendChild(newAddress); + + // Show remove buttons if there's more than one address + updateRemoveButtons(); +} + +// Function to remove a web address input +function removeWebAddress(button) { + button.closest('.input-group').remove(); + updateRemoveButtons(); +} + +// Function to update remove buttons visibility +function updateRemoveButtons() { + const addresses = document.querySelectorAll('.web-address'); + const removeButtons = document.querySelectorAll('.remove-address'); + + // Show remove buttons only if there's more than one address + removeButtons.forEach(button => { + button.style.display = addresses.length > 1 ? 'block' : 'none'; + }); +} + +// Function to get all web addresses +function getAllWebAddresses() { + return Array.from(document.querySelectorAll('.web-address')).map(input => input.value); +} + +// Function to update the review section +function updateReviewSection() { + // Get all the values + const repo = document.getElementById('giteaRepoSelect').value; + const branch = document.getElementById('giteaBranchSelect').value; + const company = document.getElementById('companyName').value; + const port = document.getElementById('port').value; + const webAddresses = Array.from(document.querySelectorAll('.web-address')) + .map(input => input.value) + .join(', '); + + // Update the review section + document.getElementById('reviewRepo').textContent = repo; + document.getElementById('reviewBranch').textContent = branch; + document.getElementById('reviewCompany').textContent = company; + document.getElementById('reviewPort').textContent = port; + document.getElementById('reviewWebAddresses').textContent = webAddresses; +} + +// Function to launch the instance +function launchInstance() { + // Collect all the data + const instanceData = { + repository: document.getElementById('giteaRepoSelect').value, + branch: document.getElementById('giteaBranchSelect').value, + company: { + name: document.getElementById('companyName').value, + industry: document.getElementById('industry').value, + streetAddress: document.getElementById('streetAddress').value, + city: document.getElementById('city').value, + state: document.getElementById('state').value, + zipCode: document.getElementById('zipCode').value, + country: document.getElementById('country').value, + website: document.getElementById('website').value, + email: document.getElementById('email').value, + phone: document.getElementById('phone').value, + description: document.getElementById('companyDescription').value + }, + port: document.getElementById('port').value, + webAddresses: Array.from(document.querySelectorAll('.web-address')).map(input => input.value), + colors: { + primary: document.getElementById('primaryColor').value, + secondary: document.getElementById('secondaryColor').value + } + }; + + // Store the data in sessionStorage + sessionStorage.setItem('instanceLaunchData', JSON.stringify(instanceData)); + + // Close the modal + launchStepsModal.hide(); + + // Redirect to the launch progress page + window.location.href = '/instances/launch-progress'; +} {% endblock %} \ No newline at end of file diff --git a/templates/main/launch_progress.html b/templates/main/launch_progress.html new file mode 100644 index 0000000..86942be --- /dev/null +++ b/templates/main/launch_progress.html @@ -0,0 +1,344 @@ +{% extends "common/base.html" %} +{% from "components/header.html" import header %} + +{% block title %}Launching Instance - DocuPulse{% endblock %} + +{% block content %} +{{ header( + title="Launching Instance", + description="Setting up your new DocuPulse instance", + icon="fa-rocket" +) }} + +
+
+
+
+
+
+ +

Initializing...

+

Preparing to launch your instance

+
+ +
+
0%
+
+ +
+
+
+
+
Cloning Repository
+

Waiting...

+
+
+ +
+
+
+
Creating Container
+

Waiting...

+
+
+ +
+
+
+
Configuring Network
+

Waiting...

+
+
+ +
+
+
+
Setting Up Database
+

Waiting...

+
+
+ +
+
+
+
Applying Customization
+

Waiting...

+
+
+ +
+
+
+
Finalizing Setup
+

Waiting...

+
+
+
+ +
+ +
+
+
+
+
+
+ + + +{% endblock %} + +{% block extra_js %} + +{% endblock %} \ No newline at end of file