Skip to content

Commit

Permalink
Merge branch 'main' into 5015-draft-support-nov
Browse files Browse the repository at this point in the history
  • Loading branch information
Sam Williams committed Jan 6, 2024
2 parents a904924 + 0bc5b9f commit 3d4bee4
Show file tree
Hide file tree
Showing 78 changed files with 1,226 additions and 602 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ password for all users: 12345678

### Questions? Join Slack!

We highly recommend that you join us in [slack](http://bit.ly/3Quxc1Q) #casa channel to ask questions quickly. And [discord](https://discord.gg/qJcw2RZH8Q) for office hours (currently Tuesday 5-7pm Pacific), stakeholder news, and upcoming new issues.
We highly recommend that you join us in [slack](https://join.slack.com/t/rubyforgood/shared_invite/zt-21pyz2ab8-H6JgQfGGI0Ab6MfNOZRIQA) #casa channel to ask questions quickly. And [discord](https://discord.gg/qJcw2RZH8Q) for office hours (currently Tuesday 5-7pm Pacific), stakeholder news, and upcoming new issues.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/chore.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@

### Questions? Join Slack!

We highly recommend that you join us in [slack](http://bit.ly/3Quxc1Q) #casa channel to ask questions quickly and hear about office hours (currently Tuesday 5-7pm Pacific), stakeholder news, and upcoming new issues.
We highly recommend that you join us in [slack](https://join.slack.com/t/rubyforgood/shared_invite/zt-21pyz2ab8-H6JgQfGGI0Ab6MfNOZRIQA) #casa channel to ask questions quickly and hear about office hours (currently Tuesday 5-7pm Pacific), stakeholder news, and upcoming new issues.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/documentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@

### Questions? Join Slack!

We highly recommend that you join us in [slack](http://bit.ly/3Quxc1Q) #casa channel to ask questions quickly and hear about office hours (currently Tuesday 5-7pm Pacific), stakeholder news, and upcoming new issues.
We highly recommend that you join us in [slack](https://join.slack.com/t/rubyforgood/shared_invite/zt-21pyz2ab8-H6JgQfGGI0Ab6MfNOZRIQA) #casa channel to ask questions quickly and hear about office hours (currently Tuesday 5-7pm Pacific), stakeholder news, and upcoming new issues.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ password for all users: 12345678

### Questions? Join Slack!

We highly recommend that you join us in [slack](http://bit.ly/3Quxc1Q) #casa channel to ask questions quickly. And [discord](https://discord.gg/qJcw2RZH8Q) for office hours (currently Tuesday 5-7pm Pacific), stakeholder news, and upcoming new issues.
We highly recommend that you join us in [slack](https://join.slack.com/t/rubyforgood/shared_invite/zt-21pyz2ab8-H6JgQfGGI0Ab6MfNOZRIQA) #casa channel to ask questions quickly. And [discord](https://discord.gg/qJcw2RZH8Q) for office hours (currently Tuesday 5-7pm Pacific), stakeholder news, and upcoming new issues.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/flaky_test.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ rspec or rspec in docker?

### Questions? Join Slack!

We highly recommend that you join us in [slack](http://bit.ly/3Quxc1Q) #casa channel to ask questions quickly and hear about office hours (currently Tuesday 5-7pm Pacific), stakeholder news, and upcoming new issues.
We highly recommend that you join us in [slack](https://join.slack.com/t/rubyforgood/shared_invite/zt-21pyz2ab8-H6JgQfGGI0Ab6MfNOZRIQA) #casa channel to ask questions quickly and hear about office hours (currently Tuesday 5-7pm Pacific), stakeholder news, and upcoming new issues.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/problem_validation.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ Please use this template to document problems mentioned by CASA stakeholders so

### Questions? Join Slack!

We highly recommend that you join us in [slack](http://bit.ly/3Quxc1Q) #casa channel to ask questions quickly and hear about office hours (currently Tuesday 5-7pm Pacific), stakeholder news, and upcoming new issues.
We highly recommend that you join us in [slack](https://join.slack.com/t/rubyforgood/shared_invite/zt-21pyz2ab8-H6JgQfGGI0Ab6MfNOZRIQA) #casa channel to ask questions quickly and hear about office hours (currently Tuesday 5-7pm Pacific), stakeholder news, and upcoming new issues.
20 changes: 10 additions & 10 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@
# properly added.

ruby:
- "**/*.rb"
- changed-files:
- any-glob-to-any-file: "**/*.rb"

erb:
- "**/*.erb"
- changed-files:
- any-glob-to-any-file: "**/*.erb"

javascript:
- "**/*.js"
- "package*.json"
- "yarn.lock"
- changed-files:
- any-glob-to-any-file: ["**/*.js", "package*.json", "yarn.lock"]

Tests! 🎉💖👏:
- "app/javascript/__tests__/**.test.js"
- "spec/**/*_spec.rb"
- changed-files:
- any-glob-to-any-file: ["app/javascript/__tests__/**.test.js", "spec/**/*_spec.rb"]

dependencies:
- "Gemfile*"
- "package*.json"
- "yarn.lock"
- changed-files:
- any-glob-to-any-file: ["Gemfile*", "package*.json", "yarn.lock"]
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -58,7 +58,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -72,4 +72,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:

- name: Archive selenium screenshots
if: ${{ failure() }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: selenium-screenshots
path: ${{ github.workspace }}/tmp/capybara/*.png
2 changes: 1 addition & 1 deletion .github/workflows/label.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ jobs:
label:
runs-on: ubuntu-latest
steps:
- uses: actions/labeler@v4
- uses: actions/labeler@v5
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
5 changes: 1 addition & 4 deletions .github/workflows/rspec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ on:
pull_request:
branches:
- main
paths-ignore:
- "doc/**"
- "**/*.md"

jobs:
rspec:
Expand Down Expand Up @@ -78,7 +75,7 @@ jobs:
- name: Archive selenium screenshots
if: ${{ failure() }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: selenium-screenshots
path: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/stale@v8
- uses: actions/stale@v9
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: "This issue has been open without changes for a long time! What's up?"
Expand Down
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ gem "rswag-api"
gem "rswag-ui"
gem "blueprinter" # for JSON serialization
gem "oj" # faster JSON parsing 🍊
gem "groupdate" # Group Data

group :development, :test do
gem "bullet" # Detect and fix N+1 queries
Expand Down
61 changes: 34 additions & 27 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,11 @@ GEM
erubi (~> 1.4)
parser (>= 2.4)
smart_properties
bigdecimal (3.1.5)
bindex (0.8.1)
blueprinter (0.30.0)
brakeman (6.0.1)
brakeman (6.1.1)
racc
bugsnag (6.26.0)
concurrent-ruby (~> 1.0)
builder (3.2.4)
Expand Down Expand Up @@ -142,9 +144,9 @@ GEM
database_cleaner-core (~> 2.0.0)
database_cleaner-core (2.0.1)
date (3.3.4)
delayed_job (4.1.10)
delayed_job (4.1.11)
activesupport (>= 3.0, < 8.0)
delayed_job_active_record (4.1.7)
delayed_job_active_record (4.1.8)
activerecord (>= 3.0, < 8.0)
delayed_job (>= 3.0, < 5)
devise (4.9.3)
Expand Down Expand Up @@ -186,12 +188,12 @@ GEM
rubocop
smart_properties
erubi (1.12.0)
factory_bot (6.2.1)
factory_bot (6.4.5)
activesupport (>= 5.0.0)
factory_bot_rails (6.2.0)
factory_bot (~> 6.2.0)
factory_bot_rails (6.4.3)
factory_bot (~> 6.4)
railties (>= 5.0.0)
faker (3.2.1)
faker (3.2.2)
i18n (>= 1.8.11, < 2)
faraday (1.10.3)
faraday-em_http (~> 1.0)
Expand Down Expand Up @@ -227,6 +229,8 @@ GEM
activerecord (>= 4.0.0)
globalid (1.2.1)
activesupport (>= 6.1)
groupdate (6.4.0)
activesupport (>= 6.1)
hashdiff (1.0.1)
htmlentities (4.3.4)
http (5.1.1)
Expand All @@ -251,7 +255,7 @@ GEM
jsbundling-rails (1.2.1)
railties (>= 6.0.0)
json (2.6.3)
json-schema (3.0.0)
json-schema (4.1.1)
addressable (>= 2.8)
jwt (2.7.1)
language_server-protocol (3.17.0.3)
Expand All @@ -263,7 +267,7 @@ GEM
llhttp-ffi (0.4.0)
ffi-compiler (~> 1.0)
rake (~> 13.0)
lograge (0.13.0)
lograge (0.14.0)
actionpack (>= 4)
activesupport (>= 4)
railties (>= 4)
Expand All @@ -287,7 +291,7 @@ GEM
multipart-post (2.3.0)
net-http-persistent (4.0.1)
connection_pool (~> 2.2)
net-imap (0.4.5)
net-imap (0.4.9)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -297,19 +301,20 @@ GEM
net-smtp (0.4.0)
net-protocol
nio4r (2.5.9)
nokogiri (1.15.5)
nokogiri (1.16.0)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.15.5-arm64-darwin)
nokogiri (1.16.0-arm64-darwin)
racc (~> 1.4)
nokogiri (1.15.5-x86_64-darwin)
nokogiri (1.16.0-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.15.5-x86_64-linux)
nokogiri (1.16.0-x86_64-linux)
racc (~> 1.4)
noticed (1.6.3)
http (>= 4.0.0)
rails (>= 5.2.0)
oj (3.16.1)
oj (3.16.3)
bigdecimal (>= 3.0)
orm_adapter (0.5.0)
parallel (1.23.0)
paranoia (2.6.3)
Expand All @@ -330,7 +335,7 @@ GEM
pry-byebug (3.10.1)
byebug (~> 11.0)
pry (>= 0.13, < 0.15)
public_suffix (5.0.3)
public_suffix (5.0.4)
puma (6.4.0)
nio4r (~> 2.0)
pundit (2.3.1)
Expand Down Expand Up @@ -389,10 +394,10 @@ GEM
rspec-expectations (3.12.3)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-mocks (3.12.5)
rspec-mocks (3.12.6)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-rails (6.0.3)
rspec-rails (6.1.0)
actionpack (>= 6.1)
activesupport (>= 6.1)
railties (>= 6.1)
Expand All @@ -401,14 +406,15 @@ GEM
rspec-mocks (~> 3.12)
rspec-support (~> 3.12)
rspec-support (3.12.1)
rswag-api (2.11.0)
rswag-api (2.13.0)
activesupport (>= 3.1, < 7.2)
railties (>= 3.1, < 7.2)
rswag-specs (2.11.0)
rswag-specs (2.13.0)
activesupport (>= 3.1, < 7.2)
json-schema (>= 2.2, < 4.0)
json-schema (>= 2.2, < 5.0)
railties (>= 3.1, < 7.2)
rspec-core (>= 2.14)
rswag-ui (2.11.0)
rswag-ui (2.13.0)
actionpack (>= 3.1, < 7.2)
railties (>= 3.1, < 7.2)
rubocop (1.56.4)
Expand Down Expand Up @@ -439,11 +445,11 @@ GEM
safe_shell (1.1.0)
scout_apm (5.3.5)
parser
selenium-webdriver (4.15.0)
selenium-webdriver (4.16.0)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
shoulda-matchers (5.3.0)
shoulda-matchers (6.0.0)
activesupport (>= 5.2.0)
simplecov (0.22.0)
docile (~> 1.1)
Expand All @@ -452,7 +458,7 @@ GEM
simplecov-html (0.12.3)
simplecov_json_formatter (0.1.4)
smart_properties (1.17.0)
spring (4.1.2)
spring (4.1.3)
spring-commands-rspec (1.0.4)
spring (>= 0.9.1)
sprockets (4.1.1)
Expand Down Expand Up @@ -482,7 +488,7 @@ GEM
timeout (0.4.1)
traceroute (0.8.1)
rails (>= 3.0.0)
twilio-ruby (6.8.0)
twilio-ruby (6.9.0)
faraday (>= 0.9, < 3.0)
jwt (>= 1.5, < 3.0)
nokogiri (>= 1.6, < 2.0)
Expand All @@ -493,7 +499,7 @@ GEM
unf_ext (0.0.8.2)
unicode-display_width (2.4.2)
uniform_notifier (1.16.0)
view_component (3.7.0)
view_component (3.8.0)
activesupport (>= 5.2.0, < 8.0)
concurrent-ruby (~> 1.0)
method_source (~> 1.0)
Expand Down Expand Up @@ -559,6 +565,7 @@ DEPENDENCIES
faker
filterrific
friendly_id (~> 5.5.1)
groupdate
httparty
image_processing (~> 1.12)
jbuilder
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ A CASA (Court Appointed Special Advocate) is a role where a volunteer advocates

We are very happy to have you! CASA and Ruby for Good are committed to welcoming new contributors of all skill levels.

We highly recommend that you join us in [slack](http://bit.ly/3Quxc1Q) #casa channel to ask questions quickly and hear about office hours (currently Tuesday 5-7pm Pacific), stakeholder news, and upcoming new issues.
We highly recommend that you join us in [slack](https://join.slack.com/t/rubyforgood/shared_invite/zt-21pyz2ab8-H6JgQfGGI0Ab6MfNOZRIQA) #casa channel to ask questions quickly and hear about office hours (currently Tuesday 5-7pm Pacific), stakeholder news, and upcoming new issues.

Issues on the issue board https://github.com/rubyforgood/casa/projects/1 in the TODO column are fair game. An issue can be claimed by commenting on it.

Expand Down Expand Up @@ -222,7 +222,7 @@ Thank you to [Scout](https://ter.li/h8k29r) for letting us use their dashboard f

# Communication and Collaboration

Most conversation happens in the #casa channel of the Ruby For Good slack. Get access here: http://bit.ly/3Quxc1Q
Most conversation happens in the #casa channel of the Ruby For Good slack. Get access [here](https://join.slack.com/t/rubyforgood/shared_invite/zt-21pyz2ab8-H6JgQfGGI0Ab6MfNOZRIQA).

You can also open an issue or comment on an issue on GitHub and a maintainer will reply to you.

Expand Down
3 changes: 3 additions & 0 deletions app/components/badge_component.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<span class='badge <%= style %> text-uppercase display-1'>
<%= text %>
</span>
18 changes: 18 additions & 0 deletions app/components/badge_component.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
class BadgeComponent < ViewComponent::Base
DARK_TEXT_TYPES = [:warning, :light]

attr_reader :text

def initialize(text:, type:, rounded: false, margin: true)
@text = text
@type = type.to_sym
@rounded = rounded ? "rounded-pill" : nil
@margin = margin ? "my-1" : nil
end

def style
badge_style = ["bg-#{@type}", @rounded, @margin]
badge_style.push("text-dark") if DARK_TEXT_TYPES.include?(@type)
badge_style.compact.join(" ")
end
end
Loading

0 comments on commit 3d4bee4

Please sign in to comment.