diff --git a/Gemfile.lock b/Gemfile.lock index 7a2a2d7..03cd91a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -107,7 +107,7 @@ GEM coderay (1.1.3) concurrent-ruby (1.1.10) crass (1.0.6) - date (3.3.2) + date (3.3.3) debug (1.7.0) irb (>= 1.5.0) reline (>= 0.3.1) @@ -117,9 +117,6 @@ GEM railties (>= 4.1.0) responders warden (~> 1.2.3) - devise-tailwindcssed (0.1.5) - rails (>= 5.2.3.4, < 7.1) - railties (> 4.0, < 7.1) diff-lcs (1.5.0) erubi (1.11.0) erubis (2.7.0) @@ -333,7 +330,6 @@ DEPENDENCIES capybara debug devise - devise-tailwindcssed guard-rspec haml-rails html2haml diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index de6be79..55d404b 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,2 +1,5 @@ module ApplicationHelper + def main_app + Rails.application.routes.url_helpers + end end diff --git a/app/views/layouts/_header.haml b/app/views/layouts/_header.haml index c69b4ab..b05baf6 100644 --- a/app/views/layouts/_header.haml +++ b/app/views/layouts/_header.haml @@ -11,8 +11,12 @@ = link_to "https://www.facebook.com/hubfeenix" , :target => "_blank" do = image_tag("fb" , class: "h-10 rounded-md") %li - %a.inline-flex.items-center.justify-center.h-12.px-6.font-medium.tracking-wide.text-white.transition.duration-200.rounded-lg.shadow-md.bg-green-800.hover:bg-blue-800.focus:shadow-outline.focus:outline-none{"aria-label" => "Sign up", :href => "/", :title => "Log in or Sign up"} - Login + - if member_signed_in? + .inline-flex.items-center.justify-center.h-12.px-6.font-medium.tracking-wide.text-white.transition.duration-200.rounded-lg.shadow-md.bg-green-800.hover:bg-blue-800.focus:shadow-outline.focus:outline-none + =link_to current_member.email , main_app.member_path(current_member) + - else + %a.inline-flex.items-center.justify-center.h-12.px-6.font-medium.tracking-wide.text-white.transition.duration-200.rounded-lg.shadow-md.bg-green-800.hover:bg-blue-800.focus:shadow-outline.focus:outline-none{"aria-label" => "Sign up", :href => member_session_url, :title => "Log in or Sign up"} + Login .lg:hidden.flex.items-center.justify-between .mr-20 = link_to "https://www.facebook.com/hubfeenix" , :target => "_blank" do diff --git a/config/routes.rb b/config/routes.rb index 580625d..afa79cc 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,8 @@ Rails.application.routes.draw do + + resources :members + devise_for :members - resources :members mount Merged::Engine => "/merged" diff --git a/merged/sections.yml b/merged/sections.yml index e56311c..2e57265 100644 --- a/merged/sections.yml +++ b/merged/sections.yml @@ -182,7 +182,7 @@ :updated_at: &2 2022-12-09 17:50:02.733622073 +02:00 :page_id: 2 :index: 1 - :image_id: '44' + :image_id: 38 - :template: section_cards :header: Sizes and kinds :text: We offer different sizes and different types of studios for artists. There