Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: Keyword searching #4453

Draft
wants to merge 76 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
bf66f54
WIP: Pre-filtering with Location suggestions and search
dcyoung-dev Aug 15, 2024
3e8635e
Fix results page
Nitemaeric Nov 11, 2024
cdf3e83
Fix search result component
Nitemaeric Nov 11, 2024
d2b5247
Fix typo
Nitemaeric Nov 11, 2024
2afa3e9
Remove extraneous greater than in HTML
Nitemaeric Nov 11, 2024
c0122f2
Remove unused set_search_params
Nitemaeric Nov 11, 2024
6b840e5
Hide chosen subjects in results
kelliedesigner Nov 14, 2024
7365b27
Add schema
kelliedesigner Nov 14, 2024
445abec
Add link to GiT from bottom expander
kelliedesigner Nov 14, 2024
1dad8ce
Update bursaries figures
kelliedesigner Nov 14, 2024
9101689
Update no results subjects content
kelliedesigner Nov 14, 2024
fc200cf
Add nudge to science specialisms on results page
kelliedesigner Nov 14, 2024
1503742
Safely navigate study_site_distance ceil
Nitemaeric Nov 14, 2024
fb565ae
Add comments
kelliedesigner Nov 14, 2024
5a1d2f4
Show nudge after 5th course in results
Nitemaeric Nov 14, 2024
b6e94c9
Add selected filter remove x's
kelliedesigner Nov 14, 2024
04315e7
Add new selected filters
kelliedesigner Nov 14, 2024
226f740
Remove logic hiding age group for primary
kelliedesigner Nov 14, 2024
64e811c
Update formating of age group on results and course pages
kelliedesigner Nov 14, 2024
daecbd2
Update format of age group filter inputs
kelliedesigner Nov 14, 2024
0886596
Update age range title to age group
kelliedesigner Nov 14, 2024
8df859a
Titleize course age range levels
Nitemaeric Nov 14, 2024
6fd5cf2
Remove singular logic on employing and placement school results labels
kelliedesigner Nov 15, 2024
c164661
Update where you will train intro text for fee-based
kelliedesigner Nov 15, 2024
fc1849f
Fix spacing on search results course fee row
kelliedesigner Nov 15, 2024
19105ef
Fix splacing on where you will train
kelliedesigner Nov 15, 2024
0d12f98
Remove study sites and accredited provider from search results
kelliedesigner Nov 15, 2024
d39b3c6
Add new filters
kelliedesigner Nov 15, 2024
3d1e0c9
Update keyword to plural on home and results pages
kelliedesigner Nov 15, 2024
d8c1088
Default to 10 miles search radius
Nitemaeric Nov 15, 2024
8635c45
remove code form provider search
kelliedesigner Nov 15, 2024
9cd5a0a
Add example of non-salaried subject-specific content
Nitemaeric Nov 19, 2024
970a546
Update fee callout content with new branch for physics
kelliedesigner Nov 19, 2024
e94ae56
Remove selected tags
kelliedesigner Nov 28, 2024
ed35ecc
Update filter and sort buttons on mobile
kelliedesigner Nov 28, 2024
3d84d84
Update keywords to subject
kelliedesigner Nov 28, 2024
3692be7
Fix filters
kelliedesigner Nov 28, 2024
b998059
Move visa question and update advanced filters
kelliedesigner Nov 28, 2024
da60611
Update homepage to emphases primary and secondary from other stages
kelliedesigner Dec 2, 2024
672fcc4
Remove FE and non QTS filters
kelliedesigner Dec 2, 2024
7d7d855
Update home to remove 'all' on quick links and add extra send links
kelliedesigner Dec 2, 2024
6df346a
Update secondary page title
kelliedesigner Dec 2, 2024
f51c389
!wip primary sepcialisms page
kelliedesigner Dec 2, 2024
a5907de
Add primary specialisms page
kelliedesigner Dec 3, 2024
de0a6e4
Add salaried GiT link
kelliedesigner Dec 3, 2024
d42f918
Update primary, secondary, and degree filters
kelliedesigner Dec 3, 2024
39f96c6
update label all primary/secondary courses
kelliedesigner Dec 3, 2024
932a51d
Fix apply button at bottom
kelliedesigner Dec 3, 2024
72a1bbe
Update content on start date filter
kelliedesigner Dec 3, 2024
26a4498
Update SEND links
kelliedesigner Dec 3, 2024
a5c232d
Update primary secondary primary links
kelliedesigner Dec 3, 2024
f33e158
Fix FE link
kelliedesigner Dec 3, 2024
e9f9441
Fix primary and secondary buttons to search only for their age group
kelliedesigner Dec 3, 2024
f452eb9
Add FE filter
kelliedesigner Dec 3, 2024
c70be83
Fix spacing
kelliedesigner Dec 3, 2024
6fe1343
Add GiT links to accordion on home
kelliedesigner Dec 3, 2024
637220d
Fix degre require filter on advanced search
kelliedesigner Dec 5, 2024
a84da1f
Fix degree required filter on advanced search
kelliedesigner Dec 5, 2024
5647670
Fix homepage links
kelliedesigner Dec 5, 2024
8016d4b
Update primary_courses_path destination
Nitemaeric Dec 6, 2024
ed2440f
Update qual filter label
kelliedesigner Dec 9, 2024
5059bdc
Update age group filter content
kelliedesigner Dec 10, 2024
db46396
Update fee and salary content
kelliedesigner Dec 10, 2024
9184b61
Update qualification label
kelliedesigner Dec 11, 2024
7480227
Update school placements content
kelliedesigner Dec 16, 2024
414678e
Update primary, secondary, and FE filter content
kelliedesigner Dec 20, 2024
b845d66
Update degree required filter
kelliedesigner Dec 20, 2024
4da6789
Update SEND content
kelliedesigner Dec 23, 2024
a962534
remove bespoke margin styling
kelliedesigner Jan 10, 2025
956b962
Add comment
kelliedesigner Jan 10, 2025
55c85ab
Add provider performance
kelliedesigner Jan 10, 2025
014c9be
Remove provider rows from course summary
kelliedesigner Jan 10, 2025
85d2710
Fix dynamic provider rows
kelliedesigner Jan 10, 2025
1fc273d
Fix x_provider_url and x_accrediting_provider_url
Nitemaeric Jan 10, 2025
310336e
Add PoC for landing page replica
Nitemaeric Jan 14, 2025
2282182
Update course page with provider data
kelliedesigner Jan 14, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -242,3 +242,8 @@ group :test do
gem 'capybara', '>= 2.15'
gem 'launchy'
end

gem "turbo-rails", "~> 2.0"

# Use Redis for Action Cable
gem "redis", "~> 4.0"
6 changes: 6 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -706,6 +706,10 @@ GEM
timecop (0.9.10)
timeout (0.4.3)
trailblazer-option (0.1.2)
turbo-rails (2.0.6)
actionpack (>= 6.0.0)
activejob (>= 6.0.0)
railties (>= 6.0.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
uber (0.1.0)
Expand Down Expand Up @@ -817,6 +821,7 @@ DEPENDENCIES
rails_semantic_logger
rb-readline
redcarpet
redis (~> 4.0)
request_store
rspec-its
rspec-rails (= 7.1.0)
Expand All @@ -843,6 +848,7 @@ DEPENDENCIES
table_print
terminal-table
timecop
turbo-rails (~> 2.0)
tzinfo-data
uk_postcode
webmock
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
@include govuk-responsive-padding(4, "top");
margin: 0;
padding-left: 0;
border-top: 1px solid $govuk-border-colour;
}

.app-search-results__item {
Expand Down Expand Up @@ -71,3 +70,7 @@
}
}
}

.govuk-form-group--sort {
margin-bottom:10px;
}
8 changes: 8 additions & 0 deletions app/assets/stylesheets/components/shared/_advice.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@
padding: govuk-spacing(4);
}

.app-advice--non-uk {
@include govuk-responsive-margin(4, "bottom");
background: govuk-colour("light-grey");
border-left: $govuk-border-width solid #4c2c92;
clear: both;
padding: govuk-spacing(4);
}

.app-advice__caption {
@include govuk-font($size: 19);
color: govuk-colour("dark-grey");
Expand Down
Loading