diff --git a/app/controllers/profile_controller.rb b/app/controllers/profile_controller.rb new file mode 100644 index 00000000..b7f73c50 --- /dev/null +++ b/app/controllers/profile_controller.rb @@ -0,0 +1,23 @@ +# frozen_string_literal: true + +class ProfileController < ApplicationController + def index + @user = current_user + end + + def update + @user = current_user + + if @user.update(user_params) + redirect_to settings_profile_path, notice: 'Profile updated' + else + render :index + end + end + + private + + def user_params + params.require(:user).permit(:first_name, :last_name) + end +end diff --git a/app/views/email_settings/index.html.erb b/app/views/email_settings/index.html.erb index e0cd1fcc..3ac81552 100644 --- a/app/views/email_settings/index.html.erb +++ b/app/views/email_settings/index.html.erb @@ -1,48 +1,43 @@ -
-
- <%= render 'shared/settings_nav' %> -
-
-

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| %> -
-
- <%= ff.label :host, class: 'label' %> - <%= ff.text_field :host, value: value['host'], required: true, class: 'base-input' %> -
-
- <%= ff.label :port, class: 'label' %> - <%= ff.text_field :port, value: value['port'], required: true, class: 'base-input' %> -
-
-
-
- <%= ff.label :username, class: 'label' %> - <%= ff.text_field :username, value: value['username'], required: true, class: 'base-input' %> -
-
- <%= ff.label :password, class: 'label' %> - <%= ff.password_field :password, value: value['password'], required: true, class: 'base-input' %> -
-
-
- <%= ff.label :from_email, 'Send from', class: 'label' %> - <%= ff.email_field :from_email, value: value['from_email'], required: true, class: 'base-input' %> -
- <% end %> -
-
- <%= f.button button_title, class: 'base-button' %> -
+
+ <%= render 'shared/settings_nav' %> +
+

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| %> +
+
+ <%= ff.label :host, class: 'label' %> + <%= ff.text_field :host, value: value['host'], required: true, class: 'base-input' %>
- <% end %> +
+ <%= ff.label :port, class: 'label' %> + <%= ff.text_field :port, value: value['port'], required: true, class: 'base-input' %> +
+
+
+
+ <%= ff.label :username, class: 'label' %> + <%= ff.text_field :username, value: value['username'], required: true, class: 'base-input' %> +
+
+ <%= ff.label :password, class: 'label' %> + <%= ff.password_field :password, value: value['password'], required: true, class: 'base-input' %> +
+
+
+ <%= ff.label :from_email, 'Send from', class: 'label' %> + <%= 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/layouts/application.html.erb b/app/views/layouts/application.html.erb index 7c6cd5cc..a1854407 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -27,6 +27,8 @@
<% end %> - <%= yield %> +
+ <%= yield %> +
diff --git a/app/views/profile/index.html.erb b/app/views/profile/index.html.erb new file mode 100644 index 00000000..36c11b0b --- /dev/null +++ b/app/views/profile/index.html.erb @@ -0,0 +1,21 @@ +
+ <%= render 'shared/settings_nav' %> +
+

Profile

+ <%= form_for @user, html: { autocomplete: 'off', class: 'space-y-4' } do |f| %> +
+
+ <%= f.label :first_name, class: 'label' %> + <%= f.text_field :first_name, required: true, class: 'base-input' %> +
+
+ <%= f.label :last_name, class: 'label' %> + <%= f.text_field :last_name, required: true, class: 'base-input' %> +
+
+
+ <%= f.button button_title, class: 'base-button' %> +
+ <% end %> +
+
diff --git a/app/views/shared/_navbar.html.erb b/app/views/shared/_navbar.html.erb index c695e2c9..e4ad9727 100644 --- a/app/views/shared/_navbar.html.erb +++ b/app/views/shared/_navbar.html.erb @@ -1,4 +1,4 @@ -
+
DocuSeal diff --git a/app/views/shared/_settings_nav.html.erb b/app/views/shared/_settings_nav.html.erb index dc15437a..657b16fd 100644 --- a/app/views/shared/_settings_nav.html.erb +++ b/app/views/shared/_settings_nav.html.erb @@ -1,5 +1,5 @@ - -
+ +
  • Settings
  • diff --git a/app/views/storage_settings/_aws_form.html.erb b/app/views/storage_settings/_aws_form.html.erb new file mode 100644 index 00000000..00728f13 --- /dev/null +++ b/app/views/storage_settings/_aws_form.html.erb @@ -0,0 +1,28 @@ + <%= 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 %> diff --git a/app/views/storage_settings/_disk_form.html.erb b/app/views/storage_settings/_disk_form.html.erb new file mode 100644 index 00000000..8adabde8 --- /dev/null +++ b/app/views/storage_settings/_disk_form.html.erb @@ -0,0 +1,10 @@ +<%= 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) +
    diff --git a/app/views/storage_settings/_google_cloud.html.erb b/app/views/storage_settings/_google_cloud.html.erb new file mode 100644 index 00000000..7e70eae6 --- /dev/null +++ b/app/views/storage_settings/_google_cloud.html.erb @@ -0,0 +1,17 @@ + <%= 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 %> diff --git a/app/views/storage_settings/index.html.erb b/app/views/storage_settings/index.html.erb index 135d5172..4341b50a 100644 --- a/app/views/storage_settings/index.html.erb +++ b/app/views/storage_settings/index.html.erb @@ -1,8 +1,6 @@ -
    -
    - <%= render 'shared/settings_nav' %> -
    -
    +
    + <%= render 'shared/settings_nav' %> +

    Storage

    Select files torage option (TODO) @@ -22,72 +20,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) -
    + <%= render "disk_form", f: f %>     - <%= 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 %> + <%= render "aws_form", f: f, configs: configs, value: value %>     - <%= 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 %> + <%= 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 a7479d77..9222de46 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -1,9 +1,8 @@ -
    -
    +
    <%= render 'shared/settings_nav' %> -
    +
    -

    Users

    +

    Team

    <%= link_to new_user_path, class: 'btn btn-primary btn-md gap-2', data: { turbo_frame: 'modal' } do %>
    -
    diff --git a/config/routes.rb b/config/routes.rb index d9058e86..d7d71738 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -55,7 +55,7 @@ Rails.application.routes.draw do resources :storage, only: %i[index create], controller: 'storage_settings' resources :email, only: %i[index create], controller: 'email_settings' resources :esign, only: %i[index create], controller: 'esign_settings' - resources :profile, only: %i[index create] + resources :profile, only: %i[index update] resources :users, only: %i[index] end end