diff --git a/app/javascript/elements/file_dropzone.js b/app/javascript/elements/file_dropzone.js index b4c4128a..8da82e77 100644 --- a/app/javascript/elements/file_dropzone.js +++ b/app/javascript/elements/file_dropzone.js @@ -31,7 +31,6 @@ export default actionable(targetable(class extends HTMLElement { } async uploadFiles (files) { - console.log( files ) const blobs = await Promise.all( Array.from(files).map(async (file) => { const upload = new DirectUpload( diff --git a/app/models/user.rb b/app/models/user.rb index 00427dab..0aaf3d97 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -56,6 +56,10 @@ class User < ApplicationRecord !deleted_at? end + def initials + [first_name.first, last_name.first].join.upcase + end + def full_name [first_name, last_name].join(' ') end diff --git a/app/views/flows/new.html.erb b/app/views/flows/new.html.erb index e47d9dd9..43df994a 100644 --- a/app/views/flows/new.html.erb +++ b/app/views/flows/new.html.erb @@ -1,8 +1,7 @@ <%= render 'shared/turbo_modal', title: 'New Flow' do %> <%= form_for @flow, data: { turbo_frame: :_top } do |f| %> -
- <%= f.label :name, 'Flow name', class: 'label' %> - <%= f.text_field :name, required: true, class: 'base-input' %> +
+ <%= f.text_field :name, required: true, placeholder: 'Flow Name', class: 'base-input' %>
<%= f.button button_title('Create'), class: 'base-button' %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index fc0999b1..d4da94e3 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,5 +1,5 @@ - + Docuseal @@ -11,7 +11,7 @@ <%= stylesheet_pack_tag 'application', media: 'all' %> <%= yield :head %> </head> - <body> + <body class="h-full"> <turbo-frame id="modal"></turbo-frame> <%= render 'shared/navbar' %> <% if flash.present? %> diff --git a/app/views/shared/_navbar.html.erb b/app/views/shared/_navbar.html.erb index 2656e781..d36dbdf7 100644 --- a/app/views/shared/_navbar.html.erb +++ b/app/views/shared/_navbar.html.erb @@ -1,12 +1,23 @@ -<div class="max-w-6xl mx-auto px-2 py-2"> +<div class="max-w-6xl mx-auto px-2 py-2 flex items-center justify-between"> <a href="<%= root_path %>" class="text-2xl font-bold"> <span>DocuSeal</span> </a> <% if signed_in? %> - <div> - <%= link_to 'Home', root_path, class: 'bg-red-500' %> - <%= link_to 'Sign out', destroy_user_session_path, data: { turbo_method: :delete } %> - <%= current_user.email %> + <div class="space-x-6"> + <%= link_to 'Settings', settings_storage_index_path, class: 'font-medium text-lg' %> + <div class="dropdown dropdown-end"> + <label tabindex="0" class="cursor-pointer bg-neutral-focus text-neutral-content rounded-full w-8 p-2"> + <span class="text-sm"><%= current_user.initials %></span> + </label> + <ul tabindex="0" class="dropdown-content p-2 mt-2 shadow-2xl menu bg-white rounded-box whitespace-nowrap"> + <li class> + <%= link_to 'Profile', '', class: 'text-right' %> + </li> + <li class> + <%= link_to 'Sign out', destroy_user_session_path, data: { turbo_method: :delete } %> + </li> + </ul> + </div> </div> <% end %> </div>