raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-05 22:26:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,725 Commits 18 Branches 452 Tags
d0f48687e28e7094de4580e6e04691cb2a0799ec
Commit Graph

34725 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Bellet
705ec5e5f8 Change color of tagging component in admin/customers page 2023-09-15 10:47:43 +02:00
Jean-Baptiste Bellet
2fd5390374 Design background color of dropdown component 2023-09-15 10:47:43 +02:00
Jean-Baptiste Bellet
102f20ad9e Add enterprise_index_panels into admin_v3 context 2023-09-15 10:47:43 +02:00
Jean-Baptiste Bellet
3cfd4cdc9b No need to have light in v3 2023-09-15 10:47:43 +02:00
Jean-Baptiste Bellet
0d410d27ae No more green but $red (which is almost orange btw) for navigation 2023-09-15 10:47:43 +02:00
Jean-Baptiste Bellet
e434f7112a Add sidebar to admin_v3 context 2023-09-15 10:47:43 +02:00
Jean-Baptiste Bellet
8b0fc875da Use the same arrow 2023-09-15 10:47:43 +02:00
Jean-Baptiste Bellet
b355d8beb3 Change colors for dropdown components 
It's a bit annoying: we do have several "selector" components.
 - built-in select
 - dropdown directive
 - select2 component
 - tom-select component

Each has its own design, and having common design a loooong time job ;)
 2023-09-15 10:47:43 +02:00
Jean-Baptiste Bellet
db4d6c8010 Don't need to change background color hovering 2023-09-15 10:47:43 +02:00
Jean-Baptiste Bellet
b0e6062bec Create a arrowDown mixin in order to display arrow for select compoentns 2023-09-15 10:47:43 +02:00
Jean-Baptiste Bellet
aacdeac1e5 Move dropdown into admin_v3 context 2023-09-15 10:47:43 +02:00
Jean-Baptiste Bellet
99d0b3f092 Prefer to use color-btn-hover-bg var instead of color-10 
The variable name is easier to understand.
 2023-09-15 10:47:43 +02:00
Jean-Baptiste Bellet
549e9259d9 Fix comment 2023-09-15 10:47:43 +02:00
Jean-Baptiste Bellet
6ee48a04fc Remove file admin/plugins/select2 for adminV3 and copy content into 
already used file: `components/select2`
 2023-09-15 10:47:43 +02:00
Jean-Baptiste Bellet
ccc59926f1 Update button background color when hovering on dashboard 2023-09-15 10:47:43 +02:00
Jean-Baptiste Bellet
5df211137e Tweak stimulus pagination (used on orders) to be up to date 2023-09-15 10:47:43 +02:00
Jean-Baptiste Bellet
f2941f9275 form legend are red 2023-09-15 10:47:43 +02:00
Jean-Baptiste Bellet
1b9a7aa81e Adjust height, border and background colors for inputs 2023-09-15 10:47:43 +02:00
Jean-Baptiste Bellet
98f9303c99 Tweak colors, size, ... for select2 to looks like tom-select 
One day, we'll remplace select2 by tom-select
 2023-09-15 10:47:43 +02:00
Jean-Baptiste Bellet
e5086ce057 Adjust colors for select2 and remove useless ones 2023-09-15 10:47:43 +02:00
Jean-Baptiste Bellet
3a67f5c9d7 Integrate select2 to admin_v3 2023-09-15 10:47:43 +02:00
Jean-Baptiste Bellet
b8406be4b9 Add trix editor to admin_v3 css 
That was an omission when installing trix
 2023-09-15 10:47:43 +02:00
Jean-Baptiste Bellet
03d5f8acc4 No need to specify padding when having a line height 2023-09-15 10:47:43 +02:00
Jean-Baptiste Bellet
48f1c65a91 Include dashboard_item into admin_v3 2023-09-15 10:47:43 +02:00
David Cook
e075d40525 Prevent accidentally leaving the page 2023-09-15 16:00:41 +10:00
David Cook
99ac48a258 Discarding changes reloads from DB 
But it also clears any search filters. To confirm exactly what behaviour is desired before fixing...
 2023-09-15 15:46:02 +10:00
David Cook
8ff67aca41 Disable filters and sorting when form is modified 
Stimulus controllers aren't supposed to reach outside their own element (so we can't do this with targets). Perhaps the controller should be bigger to encompass more, but I wanted to see if I could avoid making a mega component that does everything. For now it seems appropriate just to pass a selector in.
Another option is to publish events on other controllers using Outlets, but I don't know if we need to go there just yet.
 2023-09-15 15:45:48 +10:00
David Cook
e047f49998 Make form actions float over sort controls. 2023-09-15 15:45:48 +10:00
David Cook
15f7a8299b Show form actions only when modified 2023-09-15 15:45:48 +10:00
David Cook
daefada5a9 Show summary of modified records 
I found myself trying to write Ruby in Javascript, and it's not nearly as pretty..
Javascript now has more advanced data structures like Map, but it's rather useless because it doesn't have the usual iterator methods (such as filter, map, reduce etc).

Also for the spec I wasn't sure of the best approach, so will gladly recieve feedback.
 2023-09-15 15:45:48 +10:00
David Cook
18e40bebd0 Mark modified fields 2023-09-15 15:45:45 +10:00
Maikel Linke
ab157246df Install the current node version in setup 2023-09-15 15:25:16 +10:00
dependabot[bot]
b1f42c14ee chore(deps): bump stripe from 9.2.0 to 9.3.0 
Bumps [stripe](https://github.com/stripe/stripe-ruby) from 9.2.0 to 9.3.0.
- [Release notes](https://github.com/stripe/stripe-ruby/releases)
- [Changelog](https://github.com/stripe/stripe-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stripe/stripe-ruby/compare/v9.2.0...v9.3.0)

---
updated-dependencies:
- dependency-name: stripe
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-09-15 03:07:27 +00:00
dependabot[bot]
86b5791268 chore(deps): bump view_component from 3.5.0 to 3.6.0 
Bumps [view_component](https://github.com/viewcomponent/view_component) from 3.5.0 to 3.6.0.
- [Release notes](https://github.com/viewcomponent/view_component/releases)
- [Changelog](https://github.com/ViewComponent/view_component/blob/main/docs/CHANGELOG.md)
- [Commits](https://github.com/viewcomponent/view_component/compare/v3.5.0...v3.6.0)

---
updated-dependencies:
- dependency-name: view_component
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-09-15 03:02:49 +00:00
Maikel
aad58f1c8b Merge pull request #11546 from openfoodfoundation/dependabot/bundler/rubocop-rails-2.21.1 
chore(deps-dev): bump rubocop-rails from 2.21.0 to 2.21.1
 2023-09-15 12:59:54 +10:00
Maikel
2994227c35 Merge pull request #11542 from dacook/update-templates 
Update templates
 2023-09-15 11:42:12 +10:00
Maikel
0c87c16847 Merge pull request #11540 from macanudo527/fix_stylehash_3 
Fix Style/HashSyntax 4/13
 2023-09-15 11:32:03 +10:00
dependabot[bot]
f9aab96332 chore(deps-dev): bump rubocop-rails from 2.21.0 to 2.21.1 
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.21.0 to 2.21.1.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.21.0...v2.21.1)

---
updated-dependencies:
- dependency-name: rubocop-rails
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-09-14 09:48:33 +00:00
Gaetan Craig-Riou
0c005ad734 Sales Tax Totals by order included tax, fix tax amount when voucher applied 
Plus specs
 2023-09-14 10:21:50 +02:00
Gaetan Craig-Riou
e7a52e4733 Update app/controllers/admin/enterprises_controller.rb 
Simplify code

Co-authored-by: Maikel <maikel@email.org.au>
 2023-09-14 17:57:31 +10:00
Neal Chambers
0c1cb5282c Update .rubocop_todo.yml 2023-09-14 16:25:49 +09:00
Neal Chambers
bf9db13bb3 Fix Style/HashSyntax 2023-09-14 16:25:49 +09:00
David Cook
814144d77d Remember to mention API changes 
[skip ci]
 2023-09-14 15:04:01 +10:00
David Cook
00b2c70239 Release categories are now automatically generated. 2023-09-14 15:03:56 +10:00
David Cook
b0c822c63b Remember to consider webhook changes as API changes too 2023-09-14 15:03:54 +10:00
David Cook
7ef4df0087 Update all locales with the latest Transifex translations v4.4.11 2023-09-14 13:47:58 +10:00
David Cook
0966864589 Merge pull request #11511 from dacook/fix-update-button-11349 
Fix Update button sizing
 2023-09-14 13:37:19 +10:00
David Cook
2e6e083667 [fixup] Fix Update button sizing 
By disabling line wrap we can consistently predict how it will appear. The longest translation we currently have is 14 characters so this should be fine.
 2023-09-14 09:37:10 +10:00
Maikel
8e226bc473 Merge pull request #11537 from filipefurtad0/fix_flaky_orders_cycle_supplier_totals_report_spec.rb 
Renames product so it always appears first on the report results
 2023-09-14 09:08:16 +10:00
Maikel
758c6e033f Merge pull request #11533 from macanudo527/fix_stylehash_2 
Fix Style/HashSyntax 3/13
 2023-09-14 09:04:03 +10:00