">
-
<%= org_membership.user.name %>
-
- <% if org_membership.user == @user && org_membership.type_of_user == "admin" %>
-
you (admin)
- <% elsif org_membership.user != @user && org_membership.type_of_user == "admin" %>
-
admin
- <%= form_tag "/users/remove_org_admin", onsubmit: "return confirm('Are you sure you want to take away admin status from #{org_membership.user.name}?');" do %>
- <%= hidden_field_tag "user_id", org_membership.user_id %>
- <%= hidden_field_tag "organization_id", @organization.id %>
-
revoke admin status
+
+ <% @org_organization_memberships.each do |org_membership| %>
+
+
+ <%= org_membership.user.name %>
+ <% if org_membership.user == @user %>
+ You
<% end %>
- <% else %>
- org member
- <%= form_tag "/users/add_org_admin", onsubmit: "return confirm('Are you sure you want to give #{org_membership.user.name} admin status?');" do %>
- <%= hidden_field_tag "user_id", org_membership.user_id %>
- <%= hidden_field_tag "organization_id", @organization.id %>
- make admin
+
+ <% if org_membership.type_of_user == "admin" %>
+ Admin
<% end %>
- <%= form_tag "/users/remove_from_org", onsubmit: "return confirm('Are you sure you want remove #{org_membership.user.name} from the organization?');" do %>
- <%= hidden_field_tag "user_id", org_membership.user_id %>
- <%= hidden_field_tag "organization_id", @organization.id %>
- remove from org
+
+
+
+ <% if org_membership.user == @user && org_membership.type_of_user == "admin" %>
+
+ <% elsif org_membership.user != @user && org_membership.type_of_user == "admin" %>
+ <%= form_tag "/users/remove_org_admin", onsubmit: "return confirm('Are you sure you want to take away admin status from #{org_membership.user.name}?');" do %>
+ <%= hidden_field_tag "user_id", org_membership.user_id %>
+ <%= hidden_field_tag "organization_id", @organization.id %>
+ Revoke admin status
+ <% end %>
+ <% else %>
+ <%= form_tag "/users/add_org_admin", onsubmit: "return confirm('Are you sure you want to give #{org_membership.user.name} admin status?');" do %>
+ <%= hidden_field_tag "user_id", org_membership.user_id %>
+ <%= hidden_field_tag "organization_id", @organization.id %>
+ Make admin
+ <% end %>
+ <%= form_tag "/users/remove_from_org", onsubmit: "return confirm('Are you sure you want remove #{org_membership.user.name} from the organization?');" do %>
+ <%= hidden_field_tag "user_id", org_membership.user_id %>
+ <%= hidden_field_tag "organization_id", @organization.id %>
+ Remove from org
+ <% end %>
<% end %>
- <% end %>
+
+
+ <% end %>
+
+
+
+
+
+
+
+ <%= form_tag "/organizations/generate_new_secret", onsubmit: "return confirm('Are you sure you want to generate a new secret? All outstanding secrets will be invalid.');" do %>
+ <%= hidden_field_tag "organization[id]", @organization.id %>
+
Generate new secret
+ <% end %>
+
You should rotate this regularly!
+
+
+
+
+
Organization details
+
+ <%= form_for @organization, html: { class: "grid gap-6" } do |f| %>
+ <%= f.hidden_field :id %>
+
+ <%= f.label :name, class: "crayons-field__label" %>
+ <%= f.text_field :name, maxlength: 50, class: "crayons-textfield", placeholder: "Acme Inc." %>
+
+
+ <%= f.label :slug, "Username", class: "crayons-field__label" %>
+ <%= f.text_field :slug, maxlength: 18, minlength: 2, class: "crayons-textfield", placeholder: "acmeinc" %>
+
Your organization's URL is: <%= app_url(@organization.slug) %>
+
+
+
+ <%= f.label :profile_image, "Profile image *", class: "crayons-field__label" %>
+
+
+ <% if @organization.profile_image_url.present? %>
+
+ <%= f.file_field :profile_image, accept: "image/*", class: "crayons-card crayons-card--secondary p-3 flex items-center flex-1" %>
- <% end %>
-
Grow the team
-
Invite teammates by sending them the secret and the following instructions:
-
- Sign up at
- ">https://<%= ApplicationConfig["APP_DOMAIN"] %>
- Navigate to
- /settings/organization">https://<%= ApplicationConfig["APP_DOMAIN"] %>/settings/organization
-
- Paste the secret code below and click Join Organization
-
-
Your secret: (You should rotate this regularly)
-
-
-
- Copied to clipboard!
-
- <%= form_tag "/organizations/generate_new_secret", onsubmit: "return confirm('Are you sure you want to generate a new secret? All outstanding secrets will be invalid.');" do %>
- <%= hidden_field_tag "organization[id]", @organization.id %>
-
Generate New Secret
+
+
+ <%= f.label :nav_image, "Logo for light themes", class: "crayons-field__label" %>
+
+ <% if @organization.nav_image_url.present? %>
+
+ <% end %>
+ <%= f.file_field :nav_image, accept: "image/*", class: "crayons-card crayons-card--secondary p-3 flex items-center flex-1" %>
+
+
+
+
+ <%= f.label :dark_nav_image, "Logo for dark themes", class: "crayons-field__label" %>
+
+ <% if @organization.dark_nav_image_url.present? %>
+
+ <% end %>
+ <%= f.file_field :dark_nav_image, accept: "image/*", class: "crayons-card crayons-card--secondary p-3 flex items-center flex-1" %>
+
+
+
+
+ <%= f.label :twitter_username, "Twitter username", class: "crayons-field__label" %>
+ <%= f.text_field :twitter_username, class: "crayons-textfield" %>
+
+
+ <%= f.label :github_username, "GitHub username", class: "crayons-field__label" %>
+ <%= f.text_field :github_username, class: "crayons-textfield" %>
+
+
+ <%= f.label :url, "Website url", class: "crayons-field__label" %>
+ <%= f.url_field :url, maxlength: 128, placeholder: "https://yoursite.com", class: "crayons-textfield" %>
+
+
+ <%= f.label :tag_line, class: "crayons-field__label" %>
+ <%= f.text_field :tag_line, maxlength: 60, class: "crayons-textfield" %>
+
Limit of 60 characters
+
+
+ <%= f.label :summary, class: "crayons-field__label" %>
+ <%= f.text_area :summary, maxlength: 250, class: "crayons-textfield" %>
+
Limit of 250 characters
+
+
+ <%= render partial: "shared/logo_design", locals: { f: f, account: @organization_membership.organization } %>
+
+
+ <%= f.label :location, class: "crayons-field__label" %>
+ <%= f.text_field :location, maxlength: 64, class: "crayons-textfield", placeholder: "Halifax, Nova Scotia" %>
+
Limit of 64 characters
+
+
+ <%= f.label :email, "Support email", class: "crayons-field__label" %>
+ <%= f.text_field :email, maxlength: 64, placeholder: "mail@example.com", class: "crayons-textfield" %>
+
Limit of 64 characters
+
+
+ <%= f.label :company_size, "Organization size", class: "crayons-field__label" %>
+ <%= f.text_field :company_size, maxlength: 7, placeholder: "...", class: "crayons-textfield" %>
+
Enter a number
+
+
+ <%= f.label :story, "Our story", class: "crayons-field__label" %>
+ <%= f.text_area :story, maxlength: 640, placeholder: "...", class: "crayons-textfield" %>
+
Limit of 640 characters
+
+
+ <%= f.label :tech_stack, "Our stack", class: "crayons-field__label" %>
+ <%= f.text_area :tech_stack, maxlength: 640, placeholder: "...", class: "crayons-textfield" %>
+
Limit of 640 characters
+
+
+
+ <%= f.label :cta_body_markdown, "Body text", class: "crayons-field__label" %>
+ <%= f.text_area :cta_body_markdown, maxlength: 256, class: "crayons-textfield", placeholder: "..." %>
+
Limited markdown: _italic_ and **bold** is okay. Links, and headers etc. will not show up. 256 character limit.
+
+
+ <%= f.label :cta_button_text, "Link text", class: "crayons-field__label" %>
+ <%= f.text_field :cta_button_text, maxlength: 20, placeholder: "Visit Acme Site", class: "crayons-textfield" %>
+
Limit of 20 characters
+
+
+ <%= f.label :cta_button_url, "Link url", class: "crayons-field__label" %>
+ <%= f.text_field :cta_button_url, maxlength: 150, placeholder: "https://example.com", class: "crayons-textfield" %>
+
+
+
Save
<% end %>
-
Organization Details
-<%= form_for(@organization) do |f| %>
-<%= f.hidden_field :id %>
-
- <%= f.label :name %>
- <%= f.text_field :name, maxlength: 50 %>
-
-
- <%= f.label :slug, "Username" %>
- <%= f.text_field :slug, maxlength: 18, minlength: 2 %>
- Your organization's URL is: <%= app_url(@organization.slug) %>
-
- <%= f.label :profile_image %>
-
- <% if @organization.profile_image_url.present? %>
-
-
- <% else %>
- <%= f.file_field :profile_image %>
- <% end %>
-
- <%= f.label :nav_image, "Image for the light theme" %>
-
- <% if @organization.nav_image_url.present? %>
-
-
- <% else %>
- <%= f.file_field :nav_image %>
- <% end %>
-
- <%= f.label :dark_nav_image, "Image for the dark theme" %>
-
- <% if @organization.dark_nav_image_url.present? %>
-
-
- <% else %>
- <%= f.file_field :dark_nav_image %>
- <% end %>
-
-
- <%= f.label :twitter_username, "Twitter Username" %>
- <%= f.text_field :twitter_username %>
-
-
- <%= f.label :github_username, "Github Username" %>
- <%= f.text_field :github_username %>
-
-
- <%= f.label :url, "Site url" %>
- <%= f.url_field :url, maxlength: 128, placeholder: "https://yoursite.com" %>
-
-
- <%= f.label :tag_line %>
- <%= f.text_field :tag_line, maxlength: 60, placeholder: "Limit of 60 characters" %>
-
-
- <%= f.label :summary %>
- <%= f.text_area :summary, maxlength: 250, placeholder: "Limit of 250 characters" %>
-
- <%= render partial: "shared/logo_design", locals: { f: f, account: @organization_membership.organization } %>
-
- <%= f.label :location %>
- <%= f.text_field :location, maxlength: 64, placeholder: "Limit of 64 characters" %>
-
-
- <%= f.label :email, "Support Email" %>
- <%= f.text_field :email, maxlength: 64, placeholder: "Limit of 64 characters" %>
-
-
- <%= f.label :company_size, "Organization Size" %>
- <%= f.text_field :company_size, maxlength: 7, placeholder: "Enter a number" %>
-
-
- <%= f.label :story, "Our Story" %>
- <%= f.text_area :story, maxlength: 640, placeholder: "Limit of 640 characters" %>
-
-
- <%= f.label :tech_stack, "Our Stack" %>
- <%= f.text_area :tech_stack, maxlength: 640, placeholder: "Limit of 640 characters" %>
-
-
Call-to-action box
-
Customizable text that appears to the right of every post for your organization
-
-
- <%= f.label :cta_body_markdown, "Body text (Limited markdown — bold/italic/etc)" %>
- <%= f.text_area :cta_body_markdown, maxlength: 256, placeholder: "**This is an example**
-
-_italic_ and **bold** is okay. Links, and headers etc. will not show up.
-
-256 character limit." %>
-
-
- <%= f.label :cta_button_text, "Link Text" %>
- <%= f.text_field :cta_button_text, maxlength: 20, placeholder: "Limit of 20 characters" %>
-
-
- <%= f.label :cta_button_url, "Link url" %>
- <%= f.text_field :cta_button_url, maxlength: 150, placeholder: "https://example.com" %>
-
-
-
-<% end %>
diff --git a/app/views/users/_org_member.html.erb b/app/views/users/_org_member.html.erb
index 2ba781b24..f8d28a82b 100644
--- a/app/views/users/_org_member.html.erb
+++ b/app/views/users/_org_member.html.erb
@@ -1,10 +1,12 @@
-
+
<%= @organization.name %>
- <% @organization.users.each do |user| %>
-
- <% end %>
+
+ <% @organization.users.each do |user| %>
+
+ <% end %>
+
Danger zone
<%= form_tag users_leave_org_path(@organization), onsubmit: "return confirm('Are you sure you want to leave this organization?');" do %>
diff --git a/app/views/users/_org_non_member.html.erb b/app/views/users/_org_non_member.html.erb
index 41054f9f5..eddfb2de8 100644
--- a/app/views/users/_org_non_member.html.erb
+++ b/app/views/users/_org_non_member.html.erb
@@ -1,72 +1,71 @@
-<%= javascript_packs_with_chunks_tag "colorPicker", "validateFileInputs", defer: true %>
+<%= javascript_packs_with_chunks_tag "colorPreview", "validateFileInputs", defer: true %>
-
Join An Organization
-
Do you have the secret code?
-
-<%= form_tag "/users/join_org" do %>
-
- <%= label_tag :org_secret, "Secret" %>
- <%= text_field_tag :org_secret, nil, placeholder: "Provided to you by an org admin" %>
-
-
- <%= submit_tag "Join Organization" %>
-
-<% end %>
-
-
-
Or Create An Organization
-
Starred fields are required
-
-<%= form_for @organization do |f| %>
-
- <%= f.label :name, "Name *" %>
- <%= f.text_field :name %>
-
-
- <%= f.label :slug, "Username *" %>
- <%= f.text_field :slug %>
- Your organization URL will be <%= app_url %>/{username}
-
- <%= f.label :profile_image, "Profile Image *" %>
- <%= f.file_field :profile_image, accept: "image/*" %>
-
-
- <%= f.label :twitter_username, "Twitter Username" %>
- <%= f.text_field :twitter_username %>
-
-
- <%= f.label :github_username, "Github Username" %>
- <%= f.text_field :github_username %>
-
-
- <%= f.label :text_color_hex, "Text color (hex)" %>
- <%= text_field_tag "organization[text_color_hex]", "#000000", placeholder: "Click for color picker", class: "color-picker" %>
-
-
-
- <%= f.label :bg_color_hex, "Background color (hex)" %>
- <%= text_field_tag "organization[bg_color_hex]", "#FFFFFF", placeholder: "Click for color picker", class: "color-picker" %>
-
-
-
- <%= f.label :url, "Website url *" %>
- <%= f.url_field :url, placeholder: "https://yoursite.com" %>
-
-
-
- <%= f.label :summary, "Summary *" %>
- <%= f.text_area :summary %>
-
-
- <%= f.label :proof, "Proof *" %>
- <%= f.text_area :proof, placeholder: "This is just a quick blurb indicating or link that shows that you clearly are associated with this organization." %>
-
- You must have your organization's permission to submit this form. Dishonesty may result in a permanent suspension.
+
+
Join An Organization
+ <%= form_tag "/users/join_org" do %>
+
+ <%= label_tag :org_secret, "Secret code", class: "crayons-field__label" %>
+
Provided to you by an org admin
+ <%= text_field_tag :org_secret, nil, placeholder: "...", class: "crayons-textfield" %>
-
-
-
-<% end %>
+
+
Join Organization
+ <% end %>
+
+
+
OR
+
+
+
+
+ <%= form_for @organization, html: { class: "grid gap-6" } do |f| %>
+
+ <%= f.label :name, "Name *", class: "crayons-field__label" %>
+ <%= f.text_field :name, class: "crayons-textfield", placeholder: "Acme Inc." %>
+
+
+ <%= f.label :slug, "Username *", class: "crayons-field__label" %>
+ <%= f.text_field :slug, class: "crayons-textfield", placeholder: "acmeinc" %>
+
Your organization URL will be <%= app_url %>/{username}
+
+
+
+ <%= f.label :profile_image, "Profile image *", class: "crayons-field__label" %>
+ <%= f.file_field :profile_image, accept: "image/*" %>
+
+
+
+ <%= f.label :twitter_username, "Twitter username", class: "crayons-field__label" %>
+ <%= f.text_field :twitter_username, class: "crayons-textfield" %>
+
+
+
+ <%= f.label :github_username, "GitHub username", class: "crayons-field__label" %>
+ <%= f.text_field :github_username, class: "crayons-textfield" %>
+
+
+ <%= render partial: "shared/logo_design", locals: { f: f, account: @user } %>
+
+
+ <%= f.label :url, "Website url *", class: "crayons-field__label" %>
+ <%= f.url_field :url, placeholder: "https://yoursite.com", class: "crayons-textfield" %>
+
+
+
+ <%= f.label :summary, "Summary *", class: "crayons-field__label" %>
+ <%= f.text_area :summary, class: "crayons-textfield", rows: 3, placeholder: "..." %>
+
+
+
+ <%= f.label :proof, "Proof *", class: "crayons-field__label" %>
+
This is just a quick blurb indicating or link that shows that you clearly are associated with this organization.
+ <%= f.text_area :proof, placeholder: "...", class: "crayons-textfield" %>
+
You must have your organization's permission to submit this form. Dishonesty may result in a permanent suspension.
+
+
+
Create Organization
+ <% end %>
+
diff --git a/app/views/users/_profile.html.erb b/app/views/users/_profile.html.erb
index 8bca50af6..2a19b5dc5 100644
--- a/app/views/users/_profile.html.erb
+++ b/app/views/users/_profile.html.erb
@@ -2,143 +2,186 @@
<%= render "users/additional_authentication" %>
-
-<%= form_for(@user) do |f| %>
-
- <%= f.label :email %>
- <%= f.text_field :email %>
+
+
-
- <%= f.label :email_public, "Display email on profile" %>
- <%= f.check_box :email_public %>
-
-
- <%= f.label :username %>
- <%= f.text_field :username, maxlength: 30 %>
-
-
- <%= f.label :name %>
- <%= f.text_field :name, maxlength: 100 %>
-
- <%= f.label :profile_image %>
-
- <% if @user.profile_image_url.present? %>
-
-
- <% end %>
+
+
+<%= form_for @user do |f| %>
+
+
+ <%= f.label :email, class: "crayons-field__label" %>
+ <%= f.text_field :email, class: "crayons-textfield", placeholder: "john.doe@example.com" %>
+
+
+
+ <%= f.check_box :email_public, class: "crayons-checkbox" %>
+ <%= f.label :email_public, "Display email on profile", class: "crayons-field__label" %>
+
+
+
+ <%= f.label :username, class: "crayons-field__label" %>
+ <%= f.text_field :username, maxlength: 30, class: "crayons-textfield", placeholder: "johndoe" %>
+
+
+
+ <%= f.label :name, class: "crayons-field__label" %>
+ <%= f.text_field :name, maxlength: 100, class: "crayons-textfield", placeholder: "John Doe" %>
+
+
+
+ <%= f.label :profile_image, class: "crayons-field__label" %>
+
+
+ <% if @user.profile_image_url.present? %>
+
+ <%= f.file_field :profile_image, accept: "image/*", class: "crayons-card crayons-card--secondary p-3 flex items-center flex-1" %>
+ <% end %>
+
+
+
+
+ <%= f.label :website_url, class: "crayons-field__label" %>
+ <%= f.text_field :website_url, maxlength: 100, class: "crayons-textfield", placeholder: "https://yoursite.com" %>
+
+
+
+ <%= f.label :summary, class: "crayons-field__label" %>
+ <%= f.text_area :summary, maxlength: 200, class: "crayons-textfield", placeholder: "A short bio...", rows: 3 %>
+
+
+
+ <%= f.label :location, class: "crayons-field__label" %>
+ <%= f.text_field :location, maxlength: 100, class: "crayons-textfield", placeholder: "Halifax, Nova Scotia" %>
+
+
+
+ <%= f.label :education, class: "crayons-field__label" %>
+ <%= f.text_field :education, maxlength: 100, class: "crayons-textfield" %>
+
+
+
+ <%= f.label :employer_name, class: "crayons-field__label" %>
+ <%= f.text_field :employer_name, maxlength: 100, class: "crayons-textfield", placeholder: "Acme Inc." %>
+
+
+
+ <%= f.label :employer_url, class: "crayons-field__label" %>
+ <%= f.text_field :employer_url, maxlength: 100, class: "crayons-textfield", placeholder: "https://dev.com" %>
+
+
+
+ <%= f.label :employment_title, class: "crayons-field__label" %>
+ <%= f.text_field :employment_title, maxlength: 100, class: "crayons-textfield", placeholder: "Junior Frontend Engineer" %>
+
+
+
+ <%= f.label :mostly_work_with, "Skills/Languages", class: "crayons-field__label" %>
+ <%= f.text_area :mostly_work_with, maxlength: 500, class: "crayons-textfield", rows: 5 %>
+
What tools and languages are you most experienced with? Are you specialized or more of a generalist?
+
+
+
+ <%= f.label :currently_learning, "I'm getting into", class: "crayons-field__label" %>
+ <%= f.text_area :currently_learning, maxlength: 500, class: "crayons-textfield", rows: 5 %>
+
What are you learning right now? What are the new tools and languages you're picking up in <%= Time.zone.now.year %>?
+
+
+
+ <%= f.label :currently_hacking_on, "My projects and hacks", class: "crayons-field__label" %>
+ <%= f.text_area :currently_hacking_on, maxlength: 500, class: "crayons-textfield", rows: 5 %>
+
What projects are currently occupying most of your time?
+
+
+
+ <%= f.label :available_for, class: "crayons-field__label" %>
+ <%= f.text_area :available_for, maxlength: 500, class: "crayons-textfield", rows: 5 %>
+
What kinds of collaborations or discussions are you available for? What's a good reason to say Hey! to you these days?
+
-
- <%= f.label :looking_for_work %>
- <%= f.check_box :looking_for_work %>
+
+
Branding
+ <%= render partial: "shared/logo_design", locals: { f: f, account: @user } %>
-
- <%= f.label :looking_for_work_publicly, "Display \"looking for work\" on profile" %>
- <%= f.check_box :looking_for_work_publicly %>
+
+
+
Work opportunities settings
+
+ <%= f.check_box :looking_for_work, class: "crayons-checkbox" %>
+ <%= f.label :looking_for_work, class: "crayons-field__label" %>
+
+
+
+ <%= f.check_box :looking_for_work_publicly, class: "crayons-checkbox" %>
+ <%= f.label :looking_for_work_publicly, "Display \"looking for work\" on profile", class: "crayons-field__label" %>
+
+
+
+ <%= f.check_box :contact_consent, class: "crayons-checkbox" %>
+ <%= f.label :contact_consent, "Recruiters can contact me about job opportunities", class: "crayons-field__label" %>
+
-
- <%= f.label :contact_consent, "Recruiters can contact me about job opportunities" %>
- <%= f.check_box :contact_consent %>
-
-
- <%= f.label :website_url %>
- <%= f.url_field :website_url, maxlength: 100, placeholder: "https://yoursite.com" %>
-
-
- <%= f.label :summary %>
- <%= f.text_area :summary, placeholder: "a short bio.", maxlength: 200 %>
-
- <%= render partial: "shared/logo_design", locals: { f: f, account: @user } %>
-
- <%= f.label :location %>
- <%= f.text_field :location, maxlength: 100 %>
-
-
- <%= f.label :education %>
- <%= f.text_field :education, maxlength: 100 %>
-
-
- <%= f.label :employer_name %>
- <%= f.text_field :employer_name, maxlength: 100 %>
-
-
- <%= f.label :employer_url, "Employer URL" %>
- <%= f.text_field :employer_url, maxlength: 100 %>
-
-
- <%= f.label :employment_title %>
- <%= f.text_field :employment_title, maxlength: 100 %>
-
-
- <%= f.label :mostly_work_with, "Skills/Languages" %>
- <%= f.text_area :mostly_work_with, placeholder: "What tools and languages are you most experienced with? Are you specialized or more of a generalist?", maxlength: 500 %>
-
-
- <%= f.label :currently_learning, "I'm getting into" %>
- <%= f.text_area :currently_learning, placeholder: "What are you learning right now? What are the new tools and languages you're picking up in #{Time.zone.now.year}?", maxlength: 500 %>
-
-
- <%= f.label :currently_hacking_on, "My projects and hacks" %>
- <%= f.text_area :currently_hacking_on, placeholder: "What projects are currently occupying most of your time?", maxlength: 500 %>
-
-
- <%= f.label :available_for %>
- <%= f.text_area :available_for, placeholder: "What kinds of collaborations or discussions are you available for? What's a good reason to say hey to you these days?", maxlength: 500 %>
-
-
Links
-
- <%= f.label :facebook_url, "Facebook URL" %>
- <%= f.text_field :facebook_url %>
-
-
- <%= f.label :stackoverflow_url, "Stack Overflow URL" %>
- <%= f.url_field :stackoverflow_url %>
-
-
- <%= f.label :linkedin_url, "LinkedIn URL" %>
- <%= f.url_field :linkedin_url %>
-
-
- <%= f.label :behance_url, "Behance URL" %>
- <%= f.url_field :behance_url %>
-
-
- <%= f.label :dribbble_url, "Dribbble URL" %>
- <%= f.url_field :dribbble_url %>
-
-
- <%= f.label :medium_url, "Medium URL" %>
- <%= f.url_field :medium_url %>
-
-
- <%= f.label :gitlab_url, "GitLab URL" %>
- <%= f.url_field :gitlab_url %>
-
-
- <%= f.label :instagram_url, "Instagram URL" %>
- <%= f.url_field :instagram_url %>
-
-
- <%= f.label :mastodon_url, "Mastodon URL" %>
- <%= f.url_field :mastodon_url %>
-
-
- <%= f.label :twitch_url, "Twitch URL" %>
- <%= f.url_field :twitch_url %>
-
-
-
- <%= f.hidden_field :tab, value: @tab %>
- <%= f.submit "SUBMIT", class: "cta" %>
+
+
+
Links
+
+
+ <%= f.label :facebook_url, "Facebook profile URL", class: "crayons-field__label" %>
+ <%= f.url_field :facebook_url, class: "crayons-textfield", placeholder: "https://facebook.com/..." %>
+
+
+
+ <%= f.label :stackoverflow_url, "Stack Overflow profile URL", class: "crayons-field__label" %>
+ <%= f.url_field :stackoverflow_url, class: "crayons-textfield", placeholder: "https://stackoverflow.com/users/..." %>
+
+
+
+ <%= f.label :linkedin_url, "LinkedIn profile URL", class: "crayons-field__label" %>
+ <%= f.url_field :linkedin_url, class: "crayons-textfield", placeholder: "https://..." %>
+
+
+
+ <%= f.label :behance_url, "Behance profile URL", class: "crayons-field__label" %>
+ <%= f.url_field :behance_url, class: "crayons-textfield", placeholder: "https://..." %>
+
+
+
+ <%= f.label :dribbble_url, "Dribbble profile URL", class: "crayons-field__label" %>
+ <%= f.url_field :dribbble_url, class: "crayons-textfield", placeholder: "https://dribbble.com/..." %>
+
+
+
+ <%= f.label :medium_url, "Medium profile URL", class: "crayons-field__label" %>
+ <%= f.url_field :medium_url, class: "crayons-textfield", placeholder: "https://..." %>
+
+
+
+ <%= f.label :gitlab_url, "GitLab profile URL", class: "crayons-field__label" %>
+ <%= f.url_field :gitlab_url, class: "crayons-textfield", placeholder: "https://..." %>
+
+
+
+ <%= f.label :instagram_url, "Instagram profile URL", class: "crayons-field__label" %>
+ <%= f.url_field :instagram_url, class: "crayons-textfield", placeholder: "https://..." %>
+
+
+
+ <%= f.label :mastodon_url, "Mastodon profile URL", class: "crayons-field__label" %>
+ <%= f.url_field :mastodon_url, class: "crayons-textfield", placeholder: "https://..." %>
+
+
+
+ <%= f.label :twitch_url, "Twitch profile URL", class: "crayons-field__label" %>
+ <%= f.url_field :twitch_url, class: "crayons-textfield", placeholder: "https://..." %>
+
+
+ <%= f.hidden_field :tab, value: @tab %>
+
+
Save
<% end %>
diff --git a/app/views/users/_publishing_from_rss.html.erb b/app/views/users/_publishing_from_rss.html.erb
index bc9146373..c5bf0efae 100644
--- a/app/views/users/_publishing_from_rss.html.erb
+++ b/app/views/users/_publishing_from_rss.html.erb
@@ -1,65 +1,52 @@
-
Publishing to <%= community_name %> from RSS
-<% if @user.feed_url.present? %>
- <%= form_for(@user) do |f| %>
-
-
- <%= f.hidden_field :feed_url, value: @user.feed_url %>
- <%= f.hidden_field :tab, value: @tab %>
- <%= f.submit "Fetch Feed Now", class: "cta" %>
-
- Last Fetched:
-
-
- <% end %>
-<% end %>
-
- Posts will land in your dashboard
- as drafts
-
- Formatting will typically look good, but you may have to make manual fixes. In the case of Medium, you may have to manually fix embeds.
-
-
- To find out more about how drafts are created from your feed, read this
- guide .
-
-
- Your feed will be fetched every time you submit this form and updates will be automatically fetched periodically thereafter. Contact
- <%= SiteConfig.default_site_email %> if you encounter issues.
-
-
- FYI: Medium RSS feed URLs are https://medium.com/feed/@your_username
-
-
- By submitting your RSS Feed URL, you agree that you own and/or have permission to syndicate the associated content.
-
-<%= form_for(@user) do |f| %>
-
-
<%= f.label :feed_url, "RSS Feed URL" %>
- <%= f.url_field :feed_url, placeholder: "https://www.your-site-here.com/feed/" %>
+
+
+
Publishing to <%= community_name %> from RSS
+ <% if @user.feed_url.present? %>
+ <%= form_for(@user) do |f| %>
+ <%= f.hidden_field :feed_url, value: @user.feed_url %>
+ <%= f.hidden_field :tab, value: @tab %>
+
+
Fetch feed now
+
Last Fetched:
+
+ <% end %>
+ <% end %>
+
+ Posts will land in your dashboard
+ as drafts , and then you can publish from there (or give <%= community_name %> admins permission to do so).
+
+
Formatting will typically look good, but you may have to make manual fixes. In the case of Medium, you may have to manually fix embeds.
+
+ To find out more about how drafts are created from your feed, read this
+ guide .
+
+
+ Your feed will be fetched every time you submit this form and updates will be automatically fetched periodically thereafter. Contact
+ <%= SiteConfig.default_site_email %> if you encounter issues.
+
+
FYI: Medium RSS feed URLs are https://medium.com/feed/@your_username
+
By submitting your RSS Feed URL, you agree that you own and/or have permission to syndicate the associated content.
-
-
- <%= f.check_box :feed_mark_canonical %>
- <%= f.label :feed_mark_canonical, "Mark the RSS source as canonical URL by default" %>
-
- If you check this box, the post will automatically mark the feed source as the canonical URL.
-
+
+ <%= form_for @user, html: { class: "grid gap-6" } do |f| %>
+
+ <%= f.label :feed_url, "RSS Feed URL", class: "crayons-field__label" %>
+ <%= f.url_field :feed_url, placeholder: "https://yoursite.com/feed/", class: "crayons-textfield" %>
-
- <%= f.check_box :feed_referential_link %>
- <%= f.label :feed_referential_link, "Replace self-referential links with #{community_name}-specific links" %>
-
- If you check this box, the post will automatically change any URLs included in the post to refer to the version of that article on <%= community_name %> if available. This is primarily meant for folks migrating their entire blog onto <%= community_name %>.
-
+
+ <%= f.check_box :feed_mark_canonical, class: "crayons-checkbox" %>
+ <%= f.label :feed_mark_canonical, "Mark the RSS source as canonical URL by default
If you check this box, the post will automatically mark the feed source as the canonical URL.
".html_safe, class: "crayons-field__label" %>
-
-
-
+
+
+ <%= f.check_box :feed_referential_link, class: "crayons-checkbox" %>
+ <%= f.label :feed_referential_link, "Replace self-referential links with #{community_name}-specific links
If you check this box, the post will automatically change any URLs included in the post to refer to the version of that article on #{community_name} if available. This is primarily meant for folks migrating their entire blog onto #{community_name}.
".html_safe, class: "crayons-field__label" %>
+
+
<%= f.hidden_field :tab, value: @tab %>
- <% button_text = @user.feed_url.present? ? "UPDATE" : "SUBMIT" %>
- <%= f.submit button_text, class: "cta" %>
-
-<% end %>
+ <% button_text = @user.feed_url.present? ? "Save" : "Submit" %>
+
<%= button_text %>
+ <% end %>
+
+
diff --git a/app/views/users/_response_templates.html.erb b/app/views/users/_response_templates.html.erb
index ec4ba2543..67d380de5 100644
--- a/app/views/users/_response_templates.html.erb
+++ b/app/views/users/_response_templates.html.erb
@@ -1,39 +1,57 @@
Personal Response Templates
-
Response templates are snippets that you can re-use for quick and accurate comments.
+
Response templates are snippets that you can re-use for quick and accurate comments.
<% if @response_templates.present? %>
-
Your templates
-
-
- <% @response_templates.each do |response_template| %>
-
">
-
- <%= response_template.title %>
- <%= form_with url: response_template_path(response_template.id), method: :delete, local: true, html: { onsubmit: "return confirm('Are you sure you want to delete: #{response_template.title}?');" } do %>
-
DELETE
- <% end %>
-
EDIT
+
+
Your templates
+
+
+
+ <% @response_templates.each do |response_template| %>
+
">
+
+
+ <%= response_template.title %>
+
+
+ <%= form_with url: response_template_path(response_template.id), method: :delete, local: true, html: { onsubmit: "return confirm('Are you sure you want to delete: #{response_template.title}?');" } do %>
+
Remove
+ <% end %>
+
Edit
+
+
+ <% end %>
- <% end %>
<% end %>
-
-<% if @response_template.persisted? %>
- <% title = params[:previous_title] || @response_template.title %>
- <% content = params[:previous_content] || @response_template.content %>
-
Editing a response template
-
Create a new response template
-<% else %>
- <% title = params[:previous_title] %>
- <% content = params[:previous_content] %>
-
Add a new response template
-<% end %>
+
<%= form_with model: @response_template do |f| %>
- <%= f.label :title %>
- <%= f.text_field :title, placeholder: "Memorable cue for template", value: title %>
- <%= f.label :content, "Comment body (Markdown)" %>
- <%= f.text_area :content, value: content %>
- <%= f.submit "Submit", class: "cta" %>
+
+
+ <% if @response_template.persisted? %>
+ <% title = params[:previous_title] || @response_template.title %>
+ <% content = params[:previous_content] || @response_template.content %>
+ Editing a response template
+ Create a new response template
+ <% else %>
+ <% title = params[:previous_title] %>
+ <% content = params[:previous_content] %>
+ Add a new response template
+ <% end %>
+
+
+
+ <%= f.label :title, class: "crayons-field__label" %>
+ <%= f.text_field :title, placeholder: "...", value: title, class: "crayons-textfield" %>
+
Memorable cue for template
+
+
+ <%= f.label :content, "Comment body (Markdown)", class: "crayons-field__label" %>
+ <%= f.text_area :content, value: content, class: "crayons-textfield" %>
+
+
+
Save template
+
<% end %>
diff --git a/app/views/users/_theme_selector.html.erb b/app/views/users/_theme_selector.html.erb
index a7ac9e10a..3fe94ad3c 100644
--- a/app/views/users/_theme_selector.html.erb
+++ b/app/views/users/_theme_selector.html.erb
@@ -1,21 +1,20 @@
-
"
- title="<%= theme.titlecase %>">
- <%= f.radio_button :config_theme,
- theme,
- checked: @user.config_theme.tr("_", " ") == theme,
- class: "rich-selector__radio" %>
-
-
-
-
-
-
- ~ ~ ~ ~ ~
-
+
" title="<%= theme.titlecase %>">
+ <%= f.radio_button :config_theme, theme, checked: @user.config_theme.tr("_", " ") == theme, class: "crayons-radio" %>
+
+ <%= theme.titlecase %>
+
+
-
diff --git a/app/views/users/_ux.html.erb b/app/views/users/_ux.html.erb
index 46cf866ad..482df6004 100644
--- a/app/views/users/_ux.html.erb
+++ b/app/views/users/_ux.html.erb
@@ -1,56 +1,60 @@
-<%= form_for(@user, html: { id: "ux-customization-form" }) do |f| %>
-
Style Customization
-
- <%= f.label :config_theme, "Site Theme" %>
-
- <% ["default", "night theme", "minimal light theme", "pink theme", "ten x hacker theme"].each do |theme| %>
- <%= render partial: "theme_selector", locals: { f: f, theme: theme } %>
- <% end %>
-
-
-
- <%= f.label :config_font, "Base Reading Font" %>
-
- <% ["default", "sans serif", "monospace", "comic sans", "open dyslexic"].each do |font| %>
- <%= render partial: "font_selector", locals: { f: f, font: font } %>
- <% end %>
-
-
-
- <%= f.label :config_navbar, "Site Navbar" %>
-
- <% ["default", "static"].each do |navbar| %>
- <%= render partial: "navbar_selector", locals: { f: f, navbar: navbar } %>
- <% end %>
-
-
+<%= form_for @user, html: { id: "ux-customization-form", class: "grid gap-6" } do |f| %>
+
+
Style Customization
-
Writing
-
- <%= f.label :editor_version, "Editor Version" %>
-
- <% ["v1", "v2"].each do |version| %>
- <%= render partial: "editor_selector", locals: { f: f, version: version } %>
- <% end %>
+
+ <%= f.label :config_theme, "Site Theme", class: "crayons-field__label" %>
+
+ <% ["default", "night theme", "minimal light theme", "pink theme", "ten x hacker theme"].each do |theme| %>
+ <%= render partial: "theme_selector", locals: { f: f, theme: theme } %>
+ <% end %>
+
-
-
Content Customization
-
- <%= f.label :experience_level, "What is your approximate coding experience level (1-5)?" %>
-
- <% ["1", "3", "5", "8", "10"].each_with_index do |exp, i| %>
- <%= render partial: "experience_selector", locals: { f: f, exp: exp, i: i } %>
- <% end %>
-
-
This will not be displayed on your profile or anywhere publicly. It helps gently determine what content you are shown along with tags you follow etc.
+
+ <%= f.label :config_font, "Base Reading Font", class: "crayons-field__label" %>
+
+ <% ["default", "sans serif", "monospace", "comic sans", "open dyslexic"].each do |font| %>
+ <%= render partial: "font_selector", locals: { f: f, font: font } %>
+ <% end %>
+
+
+
+
+ <%= f.label :config_navbar, "Site Navbar", class: "crayons-field__label" %>
+
+ <% ["default", "static"].each do |navbar| %>
+ <%= render partial: "navbar_selector", locals: { f: f, navbar: navbar } %>
+ <% end %>
-
-
- <%= f.hidden_field :tab, value: @tab, id: nil %>
- <%= f.submit "SUBMIT", class: "cta" %>
+
+
Writing
+
+ <%= f.label :editor_version, "Editor Version", class: "crayons-field__label" %>
+
+ <% ["v1", "v2"].each do |version| %>
+ <%= render partial: "editor_selector", locals: { f: f, version: version } %>
+ <% end %>
+
+
-<% end %>
\ No newline at end of file
+
+
+
Content Customization
+
+ <%= f.label :experience_level, "What is your approximate coding experience level (1-5)?", class: "crayons-field__label" %>
+
+ <% ["1", "3", "5", "8", "10"].each_with_index do |exp, i| %>
+ <%= render partial: "experience_selector", locals: { f: f, exp: exp, i: i } %>
+ <% end %>
+
+
This will not be displayed on your profile or anywhere publicly. It helps gently determine what content you are shown along with tags you follow etc.
+
+
+
+ <%= f.hidden_field :tab, value: @tab, id: nil %>
+
Submit
+<% end %>
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index 28077e0e0..634b7ac86 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -1,106 +1,102 @@
<% title "Settings" %>
<% if flash[:settings_notice] %>
-
+
<%= flash[:settings_notice] %>
<% end %>
<% if flash[:error].present? %>
-
+
<%= flash[:error] %>
<% end %>
<% if params[:state] == "previous-registration" %>
-
+
<% end %>
-
- <% if @tab == "organization" && @organizations.present? %>
-
Settings for
-
-
- <% options = @organizations.pluck(:slug, :id).each do |arr| %>
- <% arr[0] = "@#{arr[0]}" %>
- <% arr[1] = "/settings/organization/#{arr[1]}" %>
- <% end.to_h.merge("New Organization" => "/settings/organization/new") %>
- <%= options_for_select(options, "/settings/organization/#{params[:org_id]}") %>
- <%# For example: %>
- <%# New Organization %>
-
-
-
- <% else %>
-
- <% end %>
- <% if current_user.email.blank? %>
-
- Confirm your email to complete your profile
-
- while you're at it, go ahead and fill everything out.
-
- <% end %>
-
- <% if @user.unconfirmed_email.present? %>
-
- <% end %>
-
- <% if @user.errors.any? %>
-
-
<%= pluralize(@user.errors.count, "error") %> prohibited your profile from being saved:
-
-
- <% @user.errors.full_messages.each do |message| %>
- <%= message %>
- <% end %>
-
-
- <% end %>
-
- <% if @organization && @organization.errors.any? %>
-
-
<%= pluralize(@organization.errors.count, "error") %> prohibited your org profile from being saved:
-
-
- <% @organization.errors.full_messages.each do |message| %>
- <%= message %>
- <% end %>
-
-
- <% end %>
-
-
- <% @tab_list.each do |possible_tab| %>
- <% if @tab == possible_tab.downcase.tr(" ", "-") %>
-
- <%= possible_tab %>
-
- <% else %>
-
">
+
+
-
+
diff --git a/spec/requests/user/user_destroy_spec.rb b/spec/requests/user/user_destroy_spec.rb
index ea291fdf5..539e688b9 100644
--- a/spec/requests/user/user_destroy_spec.rb
+++ b/spec/requests/user/user_destroy_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe "UserDestroy", type: :request do
it "offers to delete account when user has an email" do
sign_in user
get "/settings/account"
- expect(response.body).to include("DELETE ACCOUNT").and include("Deleting your account will")
+ expect(response.body).to include("Delete Account").and include("Deleting your account will")
end
it "offers to set an email when user doesn't have an email" do
diff --git a/spec/requests/user/user_settings_spec.rb b/spec/requests/user/user_settings_spec.rb
index c21543ee2..68c5cb23e 100644
--- a/spec/requests/user/user_settings_spec.rb
+++ b/spec/requests/user/user_settings_spec.rb
@@ -65,7 +65,7 @@ RSpec.describe "UserSettings", type: :request do
it "renders CONNECT_WITH_TWITTER and user with only github identity" do
user.identities.where(provider: "twitter").delete_all
get "/settings"
- expect(response.body).to include "CONNECT TWITTER ACCOUNT"
+ expect(response.body).to include "Connect Twitter Account"
end
it "renders does not render CONNECT_WITH_TWITTER if SiteConfig does not include Twitter auth" do
@@ -74,7 +74,7 @@ RSpec.describe "UserSettings", type: :request do
SiteConfig.authentication_providers = ["github"]
SiteConfig.clear_cache
get "/settings"
- expect(response.body).not_to include "CONNECT TWITTER ACCOUNT"
+ expect(response.body).not_to include "Connect Twitter Account"
SiteConfig.authentication_providers = current_auth_value # restore prior value
end
diff --git a/spec/system/organization/user_updates_org_settings_spec.rb b/spec/system/organization/user_updates_org_settings_spec.rb
index a2cbe5f95..c304d08ea 100644
--- a/spec/system/organization/user_updates_org_settings_spec.rb
+++ b/spec/system/organization/user_updates_org_settings_spec.rb
@@ -9,9 +9,10 @@ RSpec.describe "Organization setting page(/settings/organization)", type: :syste
end
it "user creates an organization" do
- visit "settings/organization"
+ visit "/settings/organization"
fill_in_org_form
- click_button "SUBMIT"
+ click_button "Create Organization"
+
expect(page).to have_text("Your organization was successfully created and you are an admin.")
end
@@ -20,7 +21,7 @@ RSpec.describe "Organization setting page(/settings/organization)", type: :syste
user2 = create(:user, username: "newuser")
create(:organization_membership, user_id: user2.id, organization_id: organization.id)
visit "settings/organization"
- click_button("make admin")
+ click_button("Make admin")
page.driver.browser.switch_to.alert.accept
expect(page).to have_text("#{user2.name} is now an admin.")
end
@@ -30,7 +31,7 @@ RSpec.describe "Organization setting page(/settings/organization)", type: :syste
user2 = create(:user, username: "newuser")
create(:organization_membership, user_id: user2.id, organization_id: organization.id, type_of_user: "admin")
visit "settings/organization"
- click_button("revoke admin status")
+ click_button("Revoke admin status")
page.driver.browser.switch_to.alert.accept
expect(page).to have_text("#{user2.name} is no longer an admin.")
end
@@ -52,8 +53,8 @@ RSpec.describe "Organization setting page(/settings/organization)", type: :syste
"organization_profile_image",
Rails.root.join("app/assets/images/android-icon-36x36.png"),
)
- fill_in "Text color (hex)", with: "#ffffff"
- fill_in "Background color (hex)", with: "#000000"
+ fill_in "organization[bg_color_hex]", with: "#000000"
+ fill_in "organization[text_color_hex]", with: "#ffffff"
fill_in "organization[url]", with: "http://company.com"
fill_in "organization[summary]", with: "Summary"
fill_in "organization[proof]", with: "Proof"
diff --git a/spec/system/user/user_self_destroy_spec.rb b/spec/system/user/user_self_destroy_spec.rb
index 49d671ca2..3d17d1bbf 100644
--- a/spec/system/user/user_self_destroy_spec.rb
+++ b/spec/system/user/user_self_destroy_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe "User destroys their profile", type: :system, js: true do
it "requests self-destroy" do
visit "/settings/account"
allow(Users::RequestDestroy).to receive(:call).and_call_original
- click_button "DELETE ACCOUNT"
+ click_button "Delete Account"
expect(Users::RequestDestroy).to have_received(:call).with(user)
end
diff --git a/spec/system/user/user_settings_response_templates_spec.rb b/spec/system/user/user_settings_response_templates_spec.rb
index 9b692cf54..196a761a6 100644
--- a/spec/system/user/user_settings_response_templates_spec.rb
+++ b/spec/system/user/user_settings_response_templates_spec.rb
@@ -13,13 +13,13 @@ RSpec.describe "User uses response templates settings", type: :system do
context "when user has a response template already" do
it "can go to the edit page of the response template" do
visit "/settings/response-templates"
- click_link "EDIT"
+ click_link "Edit"
expect(page).to have_current_path "/settings/response-templates/#{response_template.id}", ignore_query: true
end
it "shows the proper message when deleting a reponse template", js: true do
visit "/settings/response-templates"
- accept_confirm { click_button "DELETE" }
+ accept_confirm { click_button "Remove" }
expect(page).to have_text "was deleted."
end
end
diff --git a/spec/system/user_selects_looking_for_work_spec.rb b/spec/system/user_selects_looking_for_work_spec.rb
index 0121098fb..87f214788 100644
--- a/spec/system/user_selects_looking_for_work_spec.rb
+++ b/spec/system/user_selects_looking_for_work_spec.rb
@@ -13,7 +13,7 @@ RSpec.describe "Looking For Work", type: :system do
visit "/settings"
page.check "Looking for work"
sidekiq_perform_enqueued_jobs do
- click_button("SUBMIT")
+ click_button("Save")
end
expect(page).to have_text("Your profile was successfully updated")
expect(user.follows.count).to eq(1)
diff --git a/spec/views/users/edit.html.erb_spec.rb b/spec/views/users/edit.html.erb_spec.rb
index 2dc3d4b13..f6acb9e44 100644
--- a/spec/views/users/edit.html.erb_spec.rb
+++ b/spec/views/users/edit.html.erb_spec.rb
@@ -15,16 +15,16 @@ RSpec.describe "users/edit", type: :view do
create(:identity, user: user, provider: "twitter")
render
- expect(rendered).to match(/CONNECT GITHUB ACCOUNT/)
- expect(rendered).not_to match(/CONNECT TWITTER ACCOUNT/)
+ expect(rendered).to match(/Connect GitHub Account/)
+ expect(rendered).not_to match(/Connect Twitter Account/)
end
it "asks user to connect with twitter if it's missing" do
create(:identity, user: user, provider: "github")
render
- expect(rendered).to match(/CONNECT TWITTER ACCOUNT/)
- expect(rendered).not_to match(/CONNECT GITHUB ACCOUNT/)
+ expect(rendered).to match(/Connect Twitter Account/)
+ expect(rendered).not_to match(/Connect GitHub Account/)
end
end
end
.get(width: 90) %>)
<%= active_membership.user.name %>
- <% if @membership.role == "mod" && active_membership.role != "mod" %>
- <%= form_tag "/chat_channel_memberships/remove_membership", class: "inline-button-form-hidden" do %>
- <%= hidden_field_tag(:chat_channel_id, @channel.id) %>
- <%= hidden_field_tag(:membership_id, active_membership.id) %>
- <%= submit_tag "×" %>
+
+.get(width: 90) %>)
<%= pending_membership.user.name %>
- <%= form_tag "/chat_channel_memberships/remove_membership", class: "inline-button-form" do %>
+