self merge conflicts are fun

app/controllers/id_card/setup_controller.rb

@@ -1,7 +1,7 @@
 class IdCard::SetupController < ApplicationController
 
   def new
-    @employer = Employer.find_by(slug: params[:id])
+    @employer = Employer.find_by(slug: params[:employer])
     @setup = @employer.id_card_setup.new
     render :new
   end

app/javascript/controllers/logo_upload_controller.js

@@ -4,7 +4,7 @@ export default class extends Controller {
   static values = {
         logoType: String,
         employerName: String
-    }
+  }
   static targets = ["preview", "previewContainer", "logoSelect", "logofield", "initialLogoFile"];
 
   async connect() {
@@ -39,12 +39,10 @@ export default class extends Controller {
       newFileName = this.determineEmployerFilename(file)
       file.name = newFileName
     }
-    
+
     this.previewFile(file);
     this.uploadLogoToServer(file);
-    
-    
-    
+
     this.logofieldTarget.value = newFileName;
   }
 
@@ -122,4 +120,3 @@ export default class extends Controller {
     });
   }  
 }
-

app/views/employers/show.html.erb

@@ -54,9 +54,11 @@
         </div>
         <div class="flex flex-col space-y-6 w-1/3">
             <div class="w-full flex items-center">
-                <h3 class="font-bold text-2xl text-bluemana">Actions</h3>
+                <h3 class="font-bold text-2xl text-bluemana">ID Card Actions</h3>
                 <div class="h-[1px] w-2/3 mt-2 bg-bluemana"></div>
             </div>
+            <%= link_to "Setup", new_id_card_setup_path(employer: @employer.slug), data: { turbo: false }, class: "flex justify-center items-center w-2/3 cursor-pointer bg-atmosphere hover:bg-deepcove border-2 border-atmosphere text-platinum font-bold px-3 rounded-lg h-10 transition duration-100" %>
+
             <%= link_to 'Generate Sample Cards', generate_sample_id_card_print_data_path(employer_slug: @employer.slug ), data: { turbo: false }, class: "flex justify-center items-center w-2/3 cursor-pointer bg-atmosphere hover:bg-deepcove border-2 border-atmosphere text-platinum font-bold px-3 rounded-lg h-10 transition duration-100" %>
             <%= link_to 'Generate Group Cards (for print)', generate_print_id_card_print_data_path(employer_slug: @employer.slug ),data: { turbo: false }, class: "flex justify-center items-center w-2/3 #{@employer.active ? "" : "pointer-events-none opacity-50 cursor-not-allowed"} bg-atmosphere hover:bg-deepcove border-2 border-atmosphere text-platinum font-bold px-3 rounded-lg h-10 transition duration-100" %>
             <%= link_to 'Generate Group Cards (for display)', generate_mobile_display_id_card_print_data_path(employer_slug: @employer.slug ), data: { turbo: false }, class: "flex justify-center items-center w-2/3 #{@employer.active ? "" : "pointer-events-none opacity-50 cursor-not-allowed"} bg-atmosphere hover:bg-deepcove border-2 border-atmosphere text-platinum font-bold px-3 rounded-lg h-10 transition duration-100" %>

config/routes.rb

@@ -2,7 +2,7 @@
 
 Rails.application.routes.draw do
   namespace :id_card do
-    resources :setup, constraints: { id: /.*/ }
+    resources :setup
     resources :rx_sections
     resources :provider_sections
     resources :employer_logos do