diff --git a/app/javascript/application.scss b/app/javascript/application.scss index c125349d..63ea5369 100644 --- a/app/javascript/application.scss +++ b/app/javascript/application.scss @@ -50,3 +50,7 @@ button[disabled] .enabled { .base-checkbox { @apply checkbox rounded bg-white checkbox-sm no-animation; } + +.base-radio { + @apply radio bg-white radio-sm; +} diff --git a/app/views/email_settings/index.html.erb b/app/views/email_settings/index.html.erb index e6448859..e0cd1fcc 100644 --- a/app/views/email_settings/index.html.erb +++ b/app/views/email_settings/index.html.erb @@ -1,9 +1,12 @@
-
+
<%= render 'shared/settings_nav' %>
-

Email Settings

+

Email SMTP

+

+ Configure your to send emails (TODO) +

<% value = @encrypted_config.value || {} %> <%= form_for @encrypted_config, url: settings_email_index_path, method: :post, html: { autocomplete: 'off', class: 'space-y-4' } do |f| %> <%= f.fields_for :value do |ff| %> @@ -32,14 +35,14 @@ <%= ff.email_field :from_email, value: value['from_email'], required: true, class: 'base-input' %>
<% end %> -
-
+
+
<%= f.button button_title, class: 'base-button' %>
<% end %>
-
+
diff --git a/app/views/esign_settings/index.html.erb b/app/views/esign_settings/index.html.erb index aa0cf1fc..8f8d1e5c 100644 --- a/app/views/esign_settings/index.html.erb +++ b/app/views/esign_settings/index.html.erb @@ -5,7 +5,7 @@ <%= form_for '', url: settings_esign_index_path, method: :post do |f| %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 122d6e50..7c6cd5cc 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -15,12 +15,14 @@ <%= render 'shared/navbar' %> <% if flash.present? %> -
-
-
- - <%= flash[:notice] || flash[:alert] %> - × +
+
+
+
+ + <%= flash[:notice] || flash[:alert] %> + × +
diff --git a/app/views/shared/_navbar.html.erb b/app/views/shared/_navbar.html.erb index d36dbdf7..c695e2c9 100644 --- a/app/views/shared/_navbar.html.erb +++ b/app/views/shared/_navbar.html.erb @@ -1,4 +1,4 @@ -
+
DocuSeal @@ -7,7 +7,7 @@ <%= link_to 'Settings', settings_storage_index_path, class: 'font-medium text-lg' %>
  • diff --git a/app/views/shared/_settings_nav.html.erb b/app/views/shared/_settings_nav.html.erb index d62de923..dc15437a 100644 --- a/app/views/shared/_settings_nav.html.erb +++ b/app/views/shared/_settings_nav.html.erb @@ -1,6 +1,6 @@ - +
    -
      +
      • Settings
      • diff --git a/app/views/storage_settings/index.html.erb b/app/views/storage_settings/index.html.erb index eec00247..135d5172 100644 --- a/app/views/storage_settings/index.html.erb +++ b/app/views/storage_settings/index.html.erb @@ -1,74 +1,93 @@
        -
        +
        <%= render 'shared/settings_nav' %> -
        - Storage settings - <% value = @encrypted_config.value || { 'service' => 'disk' } %> - <% configs = value['configs'] || {} %> - <%= form_for @encrypted_config, url: settings_storage_index_path, method: :post, html: { autocomplete: 'off' } do |f| %> - <% options = [['Disk', 'disk'], ['AWS S3', 'aws_s3'], ['Google Cloud', 'google']] %> - - <% [['Disk', 'disk'], ['AWS S3', 'aws_s3'], ['Google Cloud', 'google']].each do |(label, val)| %> - <%= f.radio_button :selected, val, checked: value['service'] == val, data: { action: 'change:toggle-visible#trigger' } %> - <%= f.label :selected, label, value: val %> - <% end %> - - - <%= f.fields_for :value do |ff| %> - <%= ff.hidden_field :service, value: 'disk' %> - <% end %> -
        - Disk storage - no configs needed but make sure you have a persistant disk (heroku doesnt not have one) -
        -         - - <%= f.fields_for :value do |ff| %> - <%= ff.hidden_field :service, value: 'aws_s3' %> - <%= ff.fields_for :configs, configs do |fff| %> -
        - <%= fff.label :access_key_id, 'Access key ID' %> - <%= fff.text_field :access_key_id, value: configs['access_key_id'], required: true %> -
        -
        - <%= fff.label :secret_access_key %> - <%= fff.password_field :secret_access_key, value: configs['secret_access_key'], required: true %> -
        -
        - <%= fff.label :region %> - <%= fff.text_field :region, value: configs['region'], required: true %> -
        -
        - <%= fff.label :bucket %> - <%= fff.text_field :bucket, value: value['service'] == 'aws_s3' ? configs['bucket'] : '', required: true %> -
        -
        - <%= fff.label :endpoint %> - <%= fff.text_field :endpoint, value: configs['endpoint'], type: :url %> -
        +
        +
        +

        Storage

        +

        + Select files torage option (TODO) +

        + <% value = @encrypted_config.value || { 'service' => 'disk' } %> + <% configs = value['configs'] || {} %> + <%= form_for @encrypted_config, url: settings_storage_index_path, method: :post, html: { autocomplete: 'off', class: 'w-full' } do |f| %> + <% options = [['Disk', 'disk'], ['AWS S3', 'aws_s3'], ['Google Cloud', 'google']] %> + +
        + <% [['Disk', 'disk'], ['AWS S3', 'aws_s3'], ['Google Cloud', 'google']].each do |(label, val)| %> + <%= f.label :selected, value: val, class: 'w-full flex flex-1 items-center space-x-2 btn btn-outline rounded-xl' do %> + <%= f.radio_button :selected, val, checked: value['service'] == val, data: { action: 'change:toggle-visible#trigger' }, class: 'base-radio' %> + <%= label %> + <% end %> + <% end %> +
        +         + + <%= f.fields_for :value do |ff| %> + <%= ff.hidden_field :service, value: 'disk' %> + <% end %> +
        + Store all files on disk +
        + No configs are needed but make sure your disk is persistent +
        + (not suitable for Heroku and other PaaS) +
        +         + + <%= f.fields_for :value do |ff| %> + <%= ff.hidden_field :service, value: 'aws_s3' %> + <%= ff.fields_for :configs, configs do |fff| %> +
        + <%= fff.label :access_key_id, 'Access key ID' %> + <%= fff.text_field :access_key_id, value: configs['access_key_id'], required: true %> +
        +
        + <%= fff.label :secret_access_key %> + <%= fff.password_field :secret_access_key, value: configs['secret_access_key'], required: true %> +
        +
        + <%= fff.label :region %> + <%= fff.text_field :region, value: configs['region'], required: true %> +
        +
        + <%= fff.label :bucket %> + <%= fff.text_field :bucket, value: value['service'] == 'aws_s3' ? configs['bucket'] : '', required: true %> +
        +
        + <%= fff.label :endpoint %> + <%= fff.text_field :endpoint, value: configs['endpoint'], type: :url %> + + For AWS S3 compantiable APIs like Minio. + +
        + <% end %> <% end %> - <% end %> -         - - <%= f.fields_for :value do |ff| %> - <%= ff.hidden_field :service, value: 'google' %> - <%= ff.fields_for :configs, configs do |fff| %> -
        - <%= fff.label :project, 'Project' %> - <%= fff.text_field :project, value: configs['project'], required: true %> -
        -
        - <%= fff.label :bucket %> - <%= fff.text_field :bucket, value: value['service'] == 'google' ? configs['bucket'] : '', required: true %> -
        -
        - <%= fff.label :credentials, 'Credentials (JSON key content)' %> - <%= fff.text_area :credentials, value: configs['credentials'], required: true %> -
        +         + + <%= f.fields_for :value do |ff| %> + <%= ff.hidden_field :service, value: 'google' %> + <%= ff.fields_for :configs, configs do |fff| %> +
        + <%= fff.label :project, 'Project' %> + <%= fff.text_field :project, value: configs['project'], required: true %> +
        +
        + <%= fff.label :bucket %> + <%= fff.text_field :bucket, value: value['service'] == 'google' ? configs['bucket'] : '', required: true %> +
        +
        + <%= fff.label :credentials, 'Credentials (JSON key content)' %> + <%= fff.text_area :credentials, value: configs['credentials'], required: true %> +
        + <% end %> <% end %> - <% end %> -         - <%= f.button button_title %> - <% end %> + +
        + <%= f.button button_title('OK'), class: 'base-button' %> +
        + <% end %> +
        +
        diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 8791c43e..a7479d77 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -1,9 +1,9 @@
        -
        +
        <%= render 'shared/settings_nav' %>
        -
        -

        Users

        +
        +

        Users

        <%= link_to new_user_path, class: 'btn btn-primary btn-md gap-2', data: { turbo_frame: 'modal' } do %> - Action