diff --git a/app/views/dashboard/index.html.erb b/app/views/dashboard/index.html.erb index c74bf2b9..ffdf43d1 100644 --- a/app/views/dashboard/index.html.erb +++ b/app/views/dashboard/index.html.erb @@ -26,7 +26,7 @@ <%= react_component("ButtonTout", { title: 'Join our campaigns', text: 'Learn more about our campaigns, take action right away to cancel student debt, and much more! ', - link: 'http://stage.debtcollective.org/actions' + link: 'https://actionnetwork.org/petitions/bidenjubilee100' }, {class: 'button-tout'}) %> <%= react_component("ButtonTout", { title: 'Our call calendar', diff --git a/app/views/user_mailer/welcome_email.html.inky b/app/views/user_mailer/welcome_email.html.inky index fc6087e3..d7a1c8b0 100644 --- a/app/views/user_mailer/welcome_email.html.inky +++ b/app/views/user_mailer/welcome_email.html.inky @@ -20,15 +20,15 @@ - -

The Debt Collective is a member-driven organization, which means we are run by and for our members. As a new member, you are encouraged to get involved in the campaigns, actions and direction of your organization. We are building this union together, and we enthusiastically welcome any thoughts, feedback and new ideas. We believe that no one should be forced into debt for an education, housing, medical care, or any of our basic needs. Together, we’ll change it!

+
<%= image_tag ("cancel_student_debt.jpg")%>
+

Here’s some guides and resources to help you out as a new member! @@ -59,9 +59,11 @@


+
<%= image_tag ("you_are_not_a_loan.png")%>
+

In solidarity,
diff --git a/app/views/user_profiles/_form.html.erb b/app/views/user_profiles/_form.html.erb index 0345b493..bb54d5d4 100644 --- a/app/views/user_profiles/_form.html.erb +++ b/app/views/user_profiles/_form.html.erb @@ -1,115 +1,80 @@ <%= form_with(model: user_profile, url: user_profile_path, builder: ApplicationFormBuilder, local: true, class: "space-y-8") do |f| %> - -<% if user_profile.errors.any? %> -

-
-
- - -
-
-

- There were <%= pluralize(user_profile.errors.count, "error") %> with your submission -

-
-
    - <% user_profile.errors.full_messages.each do |message| %> -
  • <%= message %>
    • - <% end %> -
+ + <% if user_profile.errors.any? %> +
+
+
+ + +
+
+

+ There were <%= pluralize(user_profile.errors.count, "error") %> with your submission +

+
+
    + <% user_profile.errors.full_messages.each do |message| %> +
  • <%= message %>
    • + <% end %> +
+
+
-
-
-<% end %> + <% end %> -
-
- <% -=begin%> -
- <%= render(SelectComponent.new(name: :title, options: UserProfile::TITLES, include_blank: true, form: f)) %> -
- <% -=end%> +
+
+
+ <%= render(SelectComponent.new(name: :title, options: UserProfile::TITLES, include_blank: true, form: f)) %> +
-
- <%= render(TextFieldComponent.new(name: :first_name, form: f)) %> -
+
+ <%= render(TextFieldComponent.new(name: :first_name, form: f)) %> +
-
- <%= render(TextFieldComponent.new(name: :last_name, form: f)) %> -
+
+ <%= render(TextFieldComponent.new(name: :last_name, form: f)) %> +
- <% -=begin%> -
- <%= render(TextFieldComponent.new(name: :username, form: f)) %> - http://debtcollective.org/profile/username-hashed -
- <% -=end%> -
-
+
+ <%= render(PhoneNumberFieldComponent.new(name: :phone_number, form: f)) %> +
+ +
<%= f.label :birthday, class: "block text-sm font-medium text-gray-700" %>
<%= f.date_picker :birthday %>
-
- <%= render(TextFieldComponent.new(name: :email, form: f)) %> +
+ <%= render(AddressFieldComponent.new(form: f)) %>
-
- -
- <%= render(PhoneNumberFieldComponent.new(name: :phone_number, form: f)) %> -
- -
- <%= f.label(:about_me, "About me", class: "block text-sm font-medium text-gray-700") %> - <%= f.text_area(:about_me, :size => "24x6", class: "w-full") %> -
- -
- <%= f.label(:why_joined, "Tell us why you joined", class: "block text-sm font-medium text-gray-700") %> - <%= f.text_area(:why_joined, :size => "24x6", class: "w-full") %> -
- -
- <%= render(AddressFieldComponent.new(form: f)) %> -
- -
-
-
- <%= render(TextFieldComponent.new(name: :website, form: f)) %> -
+
+ <%= render(TextFieldComponent.new(name: :facebook, form: f)) %> +
-
- <%= render(TextFieldComponent.new(name: :facebook, form: f)) %> -
+
+ <%= render(TextFieldComponent.new(name: :twitter, form: f)) %>
-
-
- <%= render(TextFieldComponent.new(name: :twitter, form: f)) %> -
+
+ <%= render(TextFieldComponent.new(name: :instagram, form: f)) %> +
-
- <%= render(TextFieldComponent.new(name: :instagram, form: f)) %> -
+
+ <%= render(TextFieldComponent.new(name: :website, form: f)) %>
-
-
-
- <%= f.submit 'Save', class: "ml-3 inline-flex justify-center py-2 px-4 border border-transparent shadow-sm text-sm font-bold text-base text-white focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500" %> +
+
+ <%= f.submit 'Save', class: "ml-3 inline-flex justify-center py-2 px-4 border border-transparent shadow-sm text-sm font-medium rounded-md text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500" %> +
-
<% end %>