From 7234915818e0b7e75429731e15f302f21994bcb9 Mon Sep 17 00:00:00 2001 From: Alex Turchyn Date: Thu, 1 Jun 2023 01:13:12 +0300 Subject: [PATCH] update storage config template --- app/views/dashboard/index.html.erb | 16 +++-- app/views/esign_settings/index.html.erb | 32 +++++----- app/views/layouts/application.html.erb | 4 +- app/views/shared/_navbar.html.erb | 4 +- app/views/shared/_settings_nav.html.erb | 22 ++----- app/views/storage_settings/_aws_form.html.erb | 46 +++++++------- .../storage_settings/_disk_form.html.erb | 19 ++++-- .../storage_settings/_google_cloud.html.erb | 22 ++++--- app/views/storage_settings/index.html.erb | 62 +++++++++---------- app/views/users/index.html.erb | 2 +- 10 files changed, 116 insertions(+), 113 deletions(-) diff --git a/app/views/dashboard/index.html.erb b/app/views/dashboard/index.html.erb index b275fa30..69476855 100644 --- a/app/views/dashboard/index.html.erb +++ b/app/views/dashboard/index.html.erb @@ -1,10 +1,8 @@ -
<%= link_to 'Create Template', new_template_path, data: { turbo_frame: :modal } %> - <% @templates.each do |template| %> -
- <%= template.name %> | - edit | - submissions | -
- <% end %> -
+<% @templates.each do |template| %> +
+ <%= template.name %> | + edit | + submissions | +
+<% end %> diff --git a/app/views/esign_settings/index.html.erb b/app/views/esign_settings/index.html.erb index 8f8d1e5c..11b386cc 100644 --- a/app/views/esign_settings/index.html.erb +++ b/app/views/esign_settings/index.html.erb @@ -1,17 +1,19 @@ -
-
- <%= render 'shared/settings_nav' %> -
- <%= form_for '', url: settings_esign_index_path, method: :post do |f| %> - - - - <%= f.button button_title %> - <% end %> -
+
+ <%= render 'shared/settings_nav' %> +
+

eSign

+

+ Upload your electronic signature +

+ <%= form_for '', url: settings_esign_index_path, method: :post do |f| %> + + + + <%= f.button button_title %> + <% end %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index a1854407..4a643585 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -17,7 +17,7 @@ <% if flash.present? %>
-
+
<%= flash[:notice] || flash[:alert] %> @@ -27,7 +27,7 @@
<% end %> -
+
<%= yield %>
diff --git a/app/views/shared/_navbar.html.erb b/app/views/shared/_navbar.html.erb index 6c11cc09..659e8039 100644 --- a/app/views/shared/_navbar.html.erb +++ b/app/views/shared/_navbar.html.erb @@ -1,4 +1,4 @@ -
+
<%= render 'shared/logo' %> DocuSeal @@ -12,7 +12,7 @@
  • - <%= link_to 'Profile', '', class: 'text-right' %> + <%= link_to 'Profile', settings_profile_index_path, class: 'text-right' %>
  • <%= link_to 'Sign out', destroy_user_session_path, data: { turbo_method: :delete } %> diff --git a/app/views/shared/_settings_nav.html.erb b/app/views/shared/_settings_nav.html.erb index e3b15bae..cb4b1653 100644 --- a/app/views/shared/_settings_nav.html.erb +++ b/app/views/shared/_settings_nav.html.erb @@ -1,32 +1,22 @@
    -
      +
      • Settings
      • - - Profile - + <%= link_to 'Profile', settings_profile_index_path, class: "text-base hover:bg-base-300" %>
      • - - Email - + <%= link_to 'Email', settings_email_index_path, class: "text-base hover:bg-base-300" %>
      • - - Storage - + <%= link_to 'Storage', settings_storage_index_path, class: "text-base hover:bg-base-300" %>
      • - - eSign - + <%= link_to 'eSign', settings_esign_index_path, class: "text-base hover:bg-base-300" %>
      • - - Team - + <%= link_to 'Team', settings_users_path, class: "text-base hover:bg-base-300" %>
    diff --git a/app/views/storage_settings/_aws_form.html.erb b/app/views/storage_settings/_aws_form.html.erb index 00728f13..12e752fd 100644 --- a/app/views/storage_settings/_aws_form.html.erb +++ b/app/views/storage_settings/_aws_form.html.erb @@ -1,28 +1,32 @@ <%= 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 :access_key_id, 'Access key ID', class: 'label' %> + <%= fff.text_field :access_key_id, value: configs['access_key_id'], required: true, class: 'base-input' %> +
    +
    + <%= fff.label :secret_access_key, class: 'label' %> + <%= fff.password_field :secret_access_key, value: configs['secret_access_key'], required: true, class: 'base-input' %> +
    +
    +
    +
    + <%= fff.label :region, class: 'label' %> + <%= fff.text_field :region, value: configs['region'], required: true, class: 'base-input' %> +
    +
    + <%= fff.label :bucket, class: 'label' %> + <%= fff.text_field :bucket, value: value['service'] == 'aws_s3' ? configs['bucket'] : '', required: true, class: 'base-input' %> +
    -
    - <%= 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. - +
    + <%= fff.label :endpoint, class: 'label' %> + <%= fff.text_field :endpoint, value: configs['endpoint'], type: :url, class: 'base-input' %> +
    <% end %> <% end %> diff --git a/app/views/storage_settings/_disk_form.html.erb b/app/views/storage_settings/_disk_form.html.erb index 8adabde8..2478a938 100644 --- a/app/views/storage_settings/_disk_form.html.erb +++ b/app/views/storage_settings/_disk_form.html.erb @@ -1,10 +1,17 @@ <%= 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) +
    +
    + +
    +

    Store all files on disk

    +

    + No configs are needed but make sure your disk is persistent +
    + (not suitable for Heroku and other PaaS) +

    + +
    +
    diff --git a/app/views/storage_settings/_google_cloud.html.erb b/app/views/storage_settings/_google_cloud.html.erb index 7e70eae6..1f504bbc 100644 --- a/app/views/storage_settings/_google_cloud.html.erb +++ b/app/views/storage_settings/_google_cloud.html.erb @@ -1,17 +1,19 @@ <%= 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 :project, 'Project', class: 'label' %> + <%= fff.text_field :project, value: configs['project'], required: true, class: 'base-input' %> +
    +
    + <%= fff.label :bucket, class: 'label' %> + <%= fff.text_field :bucket, value: value['service'] == 'google' ? configs['bucket'] : '', required: true , class: 'base-input' %> +
    -
    - <%= 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 %> +
    + <%= fff.label :credentials, 'Credentials (JSON key content)', class: 'label' %> + <%= fff.text_area :credentials, value: configs['credentials'], required: true, class: 'base-input' %>
    <% end %> <% end %> diff --git a/app/views/storage_settings/index.html.erb b/app/views/storage_settings/index.html.erb index 4341b50a..46861143 100644 --- a/app/views/storage_settings/index.html.erb +++ b/app/views/storage_settings/index.html.erb @@ -1,36 +1,36 @@
    <%= render 'shared/settings_nav' %>
    -

    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 %> -
    -     - - <%= render "disk_form", f: f %> - - - <%= render "aws_form", f: f, configs: configs, value: value %> - - - <%= render "google_cloud", f: f, configs: configs, value: value %> - -
    - <%= f.button button_title('OK'), class: 'base-button' %> -
    - <% end %> +

    Storage

    +

    + Select files storage 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 %> +
    +     + + <%= render "disk_form", f: f %> + + + <%= render "aws_form", f: f, configs: configs, value: value %> + + + <%= render "google_cloud", f: f, configs: configs, value: value %> + +
    + <%= 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 9222de46..2cc215c7 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -1,4 +1,4 @@ -
    +
    <%= render 'shared/settings_nav' %>