diff --git a/app/views/console/account/index.phtml b/app/views/console/account/index.phtml index 64cdf92ea9..e8f83a9b2d 100644 --- a/app/views/console/account/index.phtml +++ b/app/views/console/account/index.phtml @@ -29,7 +29,7 @@ data-event="submit" data-success="trigger,alert" data-success-param-alert-text="Your name was updated successfully" - data-success-param-trigger-events="account.update,modal-close" + data-success-param-trigger-events="account.update" data-failure="alert" data-failure-param-alert-text="Failed to update your name" data-failure-param-alert-classname="error"> @@ -58,7 +58,7 @@ data-event="submit" data-success="trigger,alert" data-success-param-alert-text="Email address updated successfully" - data-success-param-trigger-events="account-update,modal-close" + data-success-param-trigger-events="account-update" data-failure="alert" data-failure-param-alert-text="Failed updating email address" data-failure-param-alert-classname="error"> @@ -91,8 +91,8 @@ data-service="account.updatePassword" data-scope="console" data-event="submit" - data-success="trigger,alert" - data-success-param-trigger-events="account-update,modal-close" + data-success="trigger,alert,reset" + data-success-param-trigger-events="account-update" data-success-param-alert-text="Password updated successfully" data-failure="alert" data-failure-param-alert-text="Failed updating password" diff --git a/app/views/console/database/collection.phtml b/app/views/console/database/collection.phtml index 8ae84aab70..8a904fe74a 100644 --- a/app/views/console/database/collection.phtml +++ b/app/views/console/database/collection.phtml @@ -29,7 +29,7 @@ $collection = $this->getParam('collection', []); data-scope="sdk" data-success="alert,trigger,reset" data-success-param-alert-text="Created document successfully" - data-success-param-trigger-events="database.createCollection,modal-close" + data-success-param-trigger-events="database.createCollection" data-failure="alert" data-failure-param-alert-text="Failed to create document" data-failure-param-alert-classname="error"> diff --git a/app/views/console/home/index.phtml b/app/views/console/home/index.phtml index fc2e4f1c1d..3ed9692cb0 100644 --- a/app/views/console/home/index.phtml +++ b/app/views/console/home/index.phtml @@ -167,7 +167,7 @@ $graph = $this->getParam('graph', false); data-event="submit" data-success="alert,trigger,reset" data-success-param-alert-text="Created new platform successfully" - data-success-param-trigger-events="projects.createPlatform,modal-close" + data-success-param-trigger-events="projects.createPlatform" data-failure="alert" data-failure-param-alert-text="Failed to create platform" data-failure-param-alert-classname="error"> @@ -205,7 +205,7 @@ $graph = $this->getParam('graph', false); data-event="submit" data-success="alert,trigger" data-success-param-alert-text="Updated platform successfully" - data-success-param-trigger-events="projects.updatePlatform,modal-close" + data-success-param-trigger-events="projects.updatePlatform" data-failure="alert" data-failure-param-alert-text="Failed to update platform" data-failure-param-alert-classname="error"> diff --git a/app/views/console/keys/index.phtml b/app/views/console/keys/index.phtml index 01360b10e0..736fae471e 100644 --- a/app/views/console/keys/index.phtml +++ b/app/views/console/keys/index.phtml @@ -38,7 +38,7 @@ $scopes = $this->getParam('scopes', []); data-event="submit" data-success="alert,trigger" data-success-param-alert-text="Updated API key successfully" - data-success-param-trigger-events="projects.updateKey,modal-close" + data-success-param-trigger-events="projects.updateKey" data-failure="alert" data-failure-param-alert-text="Failed to update API key" data-failure-param-alert-classname="error"> @@ -125,7 +125,7 @@ $scopes = $this->getParam('scopes', []); data-event="submit" data-success="alert,trigger,reset" data-success-param-alert-text="Created API key successfully" - data-success-param-trigger-events="projects.createKey,modal-close" + data-success-param-trigger-events="projects.createKey" data-failure="alert" data-failure-param-alert-text="Failed to create API key" data-failure-param-alert-classname="error"> diff --git a/app/views/console/settings/index.phtml b/app/views/console/settings/index.phtml index a26f24e496..80c6fbe30a 100644 --- a/app/views/console/settings/index.phtml +++ b/app/views/console/settings/index.phtml @@ -1,6 +1,7 @@ getParam('customDomains', false); +$customDomainsEnabled = $this->getParam('customDomainsEnabled', false); +$customDomainsTarget = $this->getParam('customDomainsTarget', false); ?>
@@ -133,7 +134,7 @@ $customDomains = $this->getParam('customDomains', false); -->
  • - +

    Custom Domains

    @@ -146,13 +147,13 @@ $customDomains = $this->getParam('customDomains', false);
    - +

    Custom Domains

    getParam('customDomains', false); - + @@ -178,36 +179,88 @@ $customDomains = $this->getParam('customDomains', false);
    Domain Name TLS
    - Verified    + Unverified  + Verified  - + Pending  Enabled  - DNS Settings + + + +
    + + +

    DNS Settings

    +

    Verify Domain

    + +
    + + + + +

    Add the following DNS records to your DNS provider settings to setup and verify your new custom domain.

    + +
      +
    1. +

      Add a new CNAME record in your DNS providers settings to point your new subdomain to your server with the following value:

      + +
      + 
      print($customDomainsTarget, 'escape'); ?>
      +
      + +

      For example:

      + +
      + 
      .myapp.com   CNAME   print($customDomainsTarget, 'escape'); ?>
      +
      +
      2. + +
    2. Confirm and verify your CNAME record values: + + +
      3. + +
    3. After verification completes, will automatically generate your new domain a secure SSL certificate. This process may take a few seconds.
      4. +
    +
    +
    - +
    @@ -226,47 +279,21 @@ $customDomains = $this->getParam('customDomains', false);
    - - -
    -
    Setup & Verify your Domain
    -

    Add the following DNS records to your DNS provider settings to setup and verify your new custom domain.

    - -
      -
    1. -

      Add a CNAME record to point your subdomain to with the following value:

      - -
      - 
      custom.appwrite.io
      -
      - -

      For example:

      - -
      - 
      appwrite.myapp.com   CNAME   custom.appwrite.io
      -
      -
      2. - -
    2. Add a CNAME record to point your subdomain to API - -
      3. -
    -
    - +  
    @@ -374,7 +401,7 @@ $customDomains = $this->getParam('customDomains', false); data-loading="Sending invitation, please wait..." data-success="alert,trigger,reset" data-success-param-alert-text="Invitation Sent Successfully" - data-success-param-trigger-events="teams.createMembership,modal-close" + data-success-param-trigger-events="teams.createMembership" data-failure="alert" data-failure-param-alert-text="Failed to Send Invite" data-failure-param-alert-classname="error"> diff --git a/app/views/console/storage/index.phtml b/app/views/console/storage/index.phtml index 9ba71e3700..e61a56c73c 100644 --- a/app/views/console/storage/index.phtml +++ b/app/views/console/storage/index.phtml @@ -25,7 +25,7 @@ $fileLimitHuman = $this->getParam('fileLimitHuman', 0); data-loading="Uploading File..." data-success="alert,trigger,reset" data-success-param-alert-text="File uploaded successfully" - data-success-param-trigger-events="storage.createFile,modal-close" + data-success-param-trigger-events="storage.createFile" data-failure="alert" data-failure-param-alert-text="Failed to upload file" data-failure-param-alert-classname="error"> @@ -119,7 +119,7 @@ $fileLimitHuman = $this->getParam('fileLimitHuman', 0); data-scope="sdk" data-success="alert,trigger" data-success-param-alert-text="File updated successfully" - data-success-param-trigger-events="storage.updateFile,modal-close" + data-success-param-trigger-events="storage.updateFile" data-failure="alert" data-failure-param-alert-text="Failed to update file" data-failure-param-alert-classname="error"> diff --git a/app/views/console/tasks/index.phtml b/app/views/console/tasks/index.phtml index 2b557dd22b..aec805f7bc 100644 --- a/app/views/console/tasks/index.phtml +++ b/app/views/console/tasks/index.phtml @@ -83,7 +83,7 @@ data-event="submit" data-success="alert,trigger" data-success-param-alert-text="Updated task successfully" - data-success-param-trigger-events="projects.updateTask,modal-close" + data-success-param-trigger-events="projects.updateTask" data-failure="alert" data-failure-param-alert-text="Failed to update task" data-failure-param-alert-classname="error"> @@ -204,7 +204,7 @@ data-confirm="Are you sure you want to delete this task?" data-success="alert,trigger" data-success-param-alert-text="Deleted task successfully" - data-success-param-trigger-events="projects.deleteTask,modal-close" + data-success-param-trigger-events="projects.deleteTask" data-failure="alert" data-failure-param-alert-text="Failed to delete task" data-failure-param-alert-classname="error"> @@ -236,7 +236,7 @@ data-event="submit" data-success="alert,trigger,reset" data-success-param-alert-text="Created task successfully" - data-success-param-trigger-events="projects.createTask,modal-close" + data-success-param-trigger-events="projects.createTask" data-failure="alert" data-failure-param-alert-text="Failed to create task" data-failure-param-alert-classname="error"> diff --git a/app/views/console/users/index.phtml b/app/views/console/users/index.phtml index 5fef80c53c..8b938859fb 100644 --- a/app/views/console/users/index.phtml +++ b/app/views/console/users/index.phtml @@ -27,7 +27,7 @@ $providers = $this->getParam('providers', []); data-event="submit" data-success="alert,trigger,reset" data-success-param-alert-text="Created user successfully" - data-success-param-trigger-events="users.create,modal-close" + data-success-param-trigger-events="users.create" data-failure="alert" data-failure-param-alert-text="Failed to create user" data-failure-param-alert-classname="error"> @@ -180,7 +180,7 @@ $providers = $this->getParam('providers', []); data-event="submit" data-success="alert,trigger,reset" data-success-param-alert-text="Created team successfully" - data-success-param-trigger-events="filter-teams-changed,teams.create,modal-close" + data-success-param-trigger-events="filter-teams-changed,teams.create" data-failure="alert" data-failure-param-alert-text="Failed to create team" data-failure-param-alert-classname="error"> @@ -260,7 +260,7 @@ $providers = $this->getParam('providers', []); data-event="submit" data-success="alert,trigger" data-success-param-alert-text="Updated team successfully" - data-success-param-trigger-events="teams.update,modal-close" + data-success-param-trigger-events="teams.update" data-failure="alert" data-failure-param-alert-text="Failed to update team" data-failure-param-alert-classname="error"> @@ -347,7 +347,7 @@ $providers = $this->getParam('providers', []); data-param-project-id="{{router.params.project}}" data-success="alert,trigger" data-success-param-alert-text="Updated project OAuth2 settings successfully" - data-success-param-trigger-events="projects.update,modal-close" + data-success-param-trigger-events="projects.update" data-failure="alert" data-failure-param-alert-text="Failed to update project OAuth2 settings" data-failure-param-alert-classname="error"> diff --git a/app/views/console/webhooks/index.phtml b/app/views/console/webhooks/index.phtml index fc74b06436..7e674441c5 100644 --- a/app/views/console/webhooks/index.phtml +++ b/app/views/console/webhooks/index.phtml @@ -62,7 +62,7 @@ $events = [ data-event="submit" data-success="alert,trigger,reset" data-success-param-alert-text="Updated webhook successfully" - data-success-param-trigger-events="projects.updateWebhook,modal-close" + data-success-param-trigger-events="projects.updateWebhook" data-failure="alert" data-failure-param-alert-text="Failed to update webhook" data-failure-param-alert-classname="error"> @@ -175,7 +175,7 @@ $events = [ data-event="submit" data-success="alert,trigger,reset" data-success-param-alert-text="Created webhook successfully" - data-success-param-trigger-events="projects.createWebhook,modal-close" + data-success-param-trigger-events="projects.createWebhook" data-failure="alert" data-failure-param-alert-text="Failed to create webhook" data-failure-param-alert-classname="error"> diff --git a/app/views/layouts/default.phtml b/app/views/layouts/default.phtml index 6c7608780c..9214e7a15b 100644 --- a/app/views/layouts/default.phtml +++ b/app/views/layouts/default.phtml @@ -37,7 +37,7 @@ if(!empty($platforms)) { <?php echo $this->getParam('title', ''); ?> - + @@ -90,7 +90,7 @@ if(!empty($platforms)) { script.type = 'text/javascript'; script.async = true; - script.src = '/dist/scripts/app-all.js?v='; + script.src = '/dist/scripts/app-all.js?v=1.'; script.onload = function() { window.ls.run(window); };