diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml index dd31bda0b..e79709f3a 100644 --- a/.github/workflows/quality.yml +++ b/.github/workflows/quality.yml @@ -1,8 +1,7 @@ name: Quality # triggers on -on: [workflow_dispatch] # Disable workflow for now (manual trigger) -# on: [push, pull_request] +on: [push, pull_request] jobs: quality: diff --git a/app/controllers/partners/vaccination_centers_controller.rb b/app/controllers/partners/vaccination_centers_controller.rb index 3d196a100..8fc79a476 100644 --- a/app/controllers/partners/vaccination_centers_controller.rb +++ b/app/controllers/partners/vaccination_centers_controller.rb @@ -31,8 +31,7 @@ def create @same_existing_vaccination_centers = check_if_already_exists(@vaccination_center, :address, :phone_number, :finess) unless @same_existing_vaccination_centers && @vaccination_center.confirmation_creation.to_i.zero? @vaccination_center.save - @partner_vaccination_center = PartnerVaccinationCenter.new(partner: current_partner, - vaccination_center: @vaccination_center) + @partner_vaccination_center = PartnerVaccinationCenter.new(partner: current_partner, vaccination_center: @vaccination_center) @partner_vaccination_center.save prepare_phone_number end diff --git a/app/javascript/components/partners/campaign_creator/fields/CampaignCreatorExtraInfo.jsx b/app/javascript/components/partners/campaign_creator/fields/CampaignCreatorExtraInfo.jsx index 7d2606b26..bbd5afae3 100644 --- a/app/javascript/components/partners/campaign_creator/fields/CampaignCreatorExtraInfo.jsx +++ b/app/javascript/components/partners/campaign_creator/fields/CampaignCreatorExtraInfo.jsx @@ -24,7 +24,8 @@ export const CampaignCreatorExtraInfo = () => { }; const dateInExtraInfoWarning = (info) => { - const dateRegex = /(lundi|mardi|mercredi|jeudi|vendredi|janvier|f[eé]vrier|mars|avril|mai|juin|juillet|ao[uû]t|septembre|octobre|novembre|d[eé]cembre|demain)/i; + const dateRegex = + /(lundi|mardi|mercredi|jeudi|vendredi|janvier|f[eé]vrier|mars|avril|mai|juin|juillet|ao[uû]t|septembre|octobre|novembre|d[eé]cembre|demain)/i; if (info.match(dateRegex)) { return ( <> diff --git a/app/javascript/components/shared/RootWrapper.jsx b/app/javascript/components/shared/RootWrapper.jsx index c54953036..beaa708d1 100644 --- a/app/javascript/components/shared/RootWrapper.jsx +++ b/app/javascript/components/shared/RootWrapper.jsx @@ -4,8 +4,9 @@ import { camelCaseDeep } from "components/shared/casing"; const queryClient = new QueryClient(); -export const RootWrapper = (RootComponent) => (propsFromRails) => ( - - - -); +export const RootWrapper = (RootComponent) => (propsFromRails) => + ( + + + + ); diff --git a/app/javascript/plugins/fuzzy_search.js b/app/javascript/plugins/fuzzy_search.js index 881c57dd3..8624587d8 100644 --- a/app/javascript/plugins/fuzzy_search.js +++ b/app/javascript/plugins/fuzzy_search.js @@ -71,9 +71,8 @@ if (engine) { matchesTitles.indexOf(domItemTitle) >= 0 ) { domItems[i].classList.remove("d-none"); - domItems[i].style.order = matchesTitles.indexOf( - domItemTitle - ); + domItems[i].style.order = + matchesTitles.indexOf(domItemTitle); } else { domItems[i].classList.add("d-none"); domItems[i].style.order = "inherit"; diff --git a/app/javascript/plugins/leaflet_map.js b/app/javascript/plugins/leaflet_map.js index ac7b3d0b8..b873eac8e 100644 --- a/app/javascript/plugins/leaflet_map.js +++ b/app/javascript/plugins/leaflet_map.js @@ -57,9 +57,8 @@ const leafletMap = () => { lmap.panTo([lat, lon]); } - let leafletMarkers = leafletMapContainer.getElementsByClassName( - "leaflet-marker" - ); + let leafletMarkers = + leafletMapContainer.getElementsByClassName("leaflet-marker"); if (leafletMarkers) { let leafletMarkersCluster = L.markerClusterGroup(); for (let i = 0; i < leafletMarkers.length; ++i) { @@ -86,9 +85,8 @@ const leafletMap = () => { lmap.addLayer(leafletMarkersCluster); } - let leafletGeojsons = leafletMapContainer.getElementsByClassName( - "leaflet-geojson" - ); + let leafletGeojsons = + leafletMapContainer.getElementsByClassName("leaflet-geojson"); if (leafletGeojsons) { let geojsonCodes = {}; for (let i = 0; i < leafletGeojsons.length; ++i) { @@ -156,9 +154,8 @@ const leafletMap = () => { L.control.layers({}, geojsonCodes, { collapsed: false }).addTo(lmap); } - let leafletFlyBtns = leafletMapContainer.getElementsByClassName( - "leaflet_fly_btn" - ); + let leafletFlyBtns = + leafletMapContainer.getElementsByClassName("leaflet_fly_btn"); for (let i = 0; i < leafletFlyBtns.length; ++i) { let leafletFlyBtn = leafletFlyBtns[i]; let elemLat = leafletFlyBtn.getAttribute("data-lat"); diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb index 912465f14..bee07b18a 100644 --- a/app/mailers/application_mailer.rb +++ b/app/mailers/application_mailer.rb @@ -1,6 +1,5 @@ class ApplicationMailer < ActionMailer::Base - default :from => "Covidliste ", - "X-Auto-Response-Suppress" => "OOF" + default :from => "Covidliste ", "X-Auto-Response-Suppress" => "OOF" layout "mailer" def mail(headers) diff --git a/app/mailers/devise_mailer.rb b/app/mailers/devise_mailer.rb index c29794191..0a1aba4db 100644 --- a/app/mailers/devise_mailer.rb +++ b/app/mailers/devise_mailer.rb @@ -1,5 +1,4 @@ class DeviseMailer < Devise::Mailer - default :from => "Covidliste ", - "X-Auto-Response-Suppress" => "OOF" + default :from => "Covidliste ", "X-Auto-Response-Suppress" => "OOF" layout "mailer" end diff --git a/app/mailers/match_mailer.rb b/app/mailers/match_mailer.rb index a73b05b39..3c66f5df5 100644 --- a/app/mailers/match_mailer.rb +++ b/app/mailers/match_mailer.rb @@ -1,6 +1,5 @@ class MatchMailer < ApplicationMailer - default :from => "Covidliste ", - "X-Auto-Response-Suppress" => "OOF" + default :from => "Covidliste ", "X-Auto-Response-Suppress" => "OOF" def match_confirmation_instructions @match = params[:match] diff --git a/app/mailers/slot_alert_mailer.rb b/app/mailers/slot_alert_mailer.rb index cbb299b18..a1877b1c4 100644 --- a/app/mailers/slot_alert_mailer.rb +++ b/app/mailers/slot_alert_mailer.rb @@ -1,6 +1,5 @@ class SlotAlertMailer < ApplicationMailer - default :from => "Covidliste ", - "X-Auto-Response-Suppress" => "OOF" + default :from => "Covidliste ", "X-Auto-Response-Suppress" => "OOF" include ApplicationHelper helper ApplicationHelper diff --git a/app/mailers/vaccination_center_mailer.rb b/app/mailers/vaccination_center_mailer.rb index f13a11b98..66f24640e 100644 --- a/app/mailers/vaccination_center_mailer.rb +++ b/app/mailers/vaccination_center_mailer.rb @@ -1,6 +1,5 @@ class VaccinationCenterMailer < ApplicationMailer - default :from => "Covidliste ", - "X-Auto-Response-Suppress" => "OOF" + default :from => "Covidliste ", "X-Auto-Response-Suppress" => "OOF" def confirmed_vaccination_center_onboarding @tutorial_url = "https://docs.google.com/document/d/10IqYk739dJImngTIsQ7IJbf7RXJRG7drD4dZM_Z4xmI/edit?usp=sharing" diff --git a/package.json b/package.json index a6e16efa1..64c75a998 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "version": "0.1.0", "devDependencies": { "pdfkit": "^0.12.1", - "prettier": "2.2.1", + "prettier": "^2.3.2", "puppeteer": "^9.1.1", "webpack-dev-server": "^3.11.2" } diff --git a/yarn.lock b/yarn.lock index cb5ff4105..3c713d7e8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6907,10 +6907,10 @@ prepend-http@^1.0.0: resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw= -prettier@2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5" - integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q== +prettier@^2.3.2: + version "2.5.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.5.1.tgz#fff75fa9d519c54cf0fce328c1017d94546bc56a" + integrity sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg== process-nextick-args@~2.0.0: version "2.0.1"