Skip to content

Commit

Permalink
Merge pull request #22 from tjerk-git/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
NordyVlasman authored Oct 25, 2021
2 parents 381af3d + dc9550d commit 03b1fd5
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 44 deletions.
84 changes: 42 additions & 42 deletions app/views/devise/registrations/new.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,47 @@
</label>
</div>

<div class="grid grid-cols-12 gap-6 mt-6">

<div class="col-span-12 sm:col-span-12">
<label class="">What creative fields are you interested in?</label>

<div class="relative inline-block w-full mt-2 text-left" x-data="{open: false}">
<button @click="open = !open" type="button" class="block w-full py-2 pl-3 pr-10 text-left bg-white border border-gray-300 rounded-md shadow-sm cursor-default focus:outline-none focus:ring-1 focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm" aria-haspopup="listbox" aria-expanded="true" aria-labelledby="listbox-label">
<span class="block truncate">
Creative Fields
</span>
<span class="absolute inset-y-0 right-0 flex items-center pr-2 pointer-events-none">
<svg class="w-5 h-5 text-gray-400" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
<path fill-rule="evenodd" d="M10 3a1 1 0 01.707.293l3 3a1 1 0 01-1.414 1.414L10 5.414 7.707 7.707a1 1 0 01-1.414-1.414l3-3A1 1 0 0110 3zm-3.707 9.293a1 1 0 011.414 0L10 14.586l2.293-2.293a1 1 0 011.414 1.414l-3 3a1 1 0 01-1.414 0l-3-3a1 1 0 010-1.414z" clip-rule="evenodd" />
</svg>
</span>
</button>
<div
x-show="open"
x-transition:enter=""
x-transition:enter-start=""
x-transition:enter-end=""
x-transition:leave="transition ease-in duration-100"
x-transition:leave-start="opacity-100"
x-transition:leave-end="opacity-0"
x-on:click.away="open = false"
>
<div class="absolute left-0 z-20 w-56 py-1 mt-2 ml-2 space-x-2 space-y-2 overflow-auto origin-top-left bg-white rounded-md shadow-2xl max-h-36 ring-1 ring-black ring-opacity-5 focus:outline-none" role="menu" aria-orientation="vertical" aria-labelledby="mobile-menu-button" tabindex="-1">
<%= f.collection_check_boxes :tag_ids, Tag.all, :id, :name do |b| %>
<div class="flex items-center">
<%= b.check_box class: 'h-4 w-4 text-gray-600 focus:ring-gray-500 border-gray-300 rounded' %>
<label for="filter-category-0" class="pr-6 ml-3 text-sm font-medium text-gray-900 whitespace-nowrap">
<%= b.label %>
</label>
</div>
<% end %>
</div>
</div>
</div>
</div>
</div>

<div class="space-y-1">
<%= f.label :password %>
<% if @minimum_password_length %>
Expand All @@ -48,49 +89,8 @@
<%= f.text_field :invitation_code, class: 'appearance-none block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm placeholder-gray-400 focus:outline-none focus:ring-gray-500 focus:border-gray-500 sm:text-sm' %>
</div>

<div class="grid grid-cols-12 gap-6 mt-6">

<div class="col-span-12 sm:col-span-6">
What creative fields are you intrested in?

<div class="relative inline-block w-full mt-2 text-left" x-data="{open: false}">
<button @click="open = !open" type="button" class="block w-full py-2 pl-3 pr-10 text-left bg-white border border-gray-300 rounded-md shadow-sm cursor-default focus:outline-none focus:ring-1 focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm" aria-haspopup="listbox" aria-expanded="true" aria-labelledby="listbox-label">
<span class="block truncate">
Creative Fields
</span>
<span class="absolute inset-y-0 right-0 flex items-center pr-2 pointer-events-none">
<svg class="w-5 h-5 text-gray-400" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
<path fill-rule="evenodd" d="M10 3a1 1 0 01.707.293l3 3a1 1 0 01-1.414 1.414L10 5.414 7.707 7.707a1 1 0 01-1.414-1.414l3-3A1 1 0 0110 3zm-3.707 9.293a1 1 0 011.414 0L10 14.586l2.293-2.293a1 1 0 011.414 1.414l-3 3a1 1 0 01-1.414 0l-3-3a1 1 0 010-1.414z" clip-rule="evenodd" />
</svg>
</span>
</button>
<div
x-show="open"
x-transition:enter=""
x-transition:enter-start=""
x-transition:enter-end=""
x-transition:leave="transition ease-in duration-100"
x-transition:leave-start="opacity-100"
x-transition:leave-end="opacity-0"
x-on:click.away="open = false"
>
<div class="absolute left-0 z-20 w-56 py-1 mt-2 ml-2 space-x-2 space-y-2 overflow-auto origin-top-left bg-white rounded-md shadow-2xl max-h-36 ring-1 ring-black ring-opacity-5 focus:outline-none" role="menu" aria-orientation="vertical" aria-labelledby="mobile-menu-button" tabindex="-1">
<%= f.collection_check_boxes :tag_ids, Tag.all, :id, :name do |b| %>
<div class="flex items-center">
<%= b.check_box class: 'h-4 w-4 text-gray-600 focus:ring-gray-500 border-gray-300 rounded' %>
<label for="filter-category-0" class="pr-6 ml-3 text-sm font-medium text-gray-900 whitespace-nowrap">
<%= b.label %>
</label>
</div>
<% end %>
</div>
</div>
</div>
</div>
</div>

<div class="mt-4">
<%= f.submit "Sign up", class: 'w-full cursor-pointer flex justify-center py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-gray-600 hover:bg-gray-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-gray-500' %>
<%= f.submit "Sign up", class: 'w-full cursor-pointer flex justify-center py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-gray-900 hover:bg-gray-800 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-gray-500' %>
</div>
</div>
<% end %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/devise/sessions/new.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<% end %>

<div class="mt-2 mb-4 actions">
<%= f.submit "Log in", class: 'w-full cursor-pointer flex justify-center py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-gray-600 hover:bg-gray-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-gray-500' %>
<%= f.submit "Log in", class: 'w-full cursor-pointer flex justify-center py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-gray-900 hover:bg-gray-800 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-gray-500' %>
</div>
</div>
<% end %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/layouts/auth.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<%# TODO: = Change the cover image to CMD style %>
<img
class="absolute inset-0 object-cover w-full h-full"
src="https://source.unsplash.com/user/erondu/1600x900"
src="https://images.unsplash.com/photo-1614730321146-b6fa6a46bcb4?ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&ixlib=rb-1.2.1&auto=format&fit=crop&w=1074&q=80"
alt=""
/>
</div>
Expand Down

0 comments on commit 03b1fd5

Please sign in to comment.