raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-13 04:00:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,845 Commits 16 Branches 456 Tags
57504f42d89f092a46b52346bd63e6a7104329ac
Commit Graph

4156 Commits

Author SHA1 Message Date
Matt-Yorkley
c0282b57b6 Fix some linting warnings 2020-06-18 22:21:55 +02:00
Matt-Yorkley
bd97939062 Move homepage "register here" CTA to bottom of screen. 
The CTA breaks the layout when the new cart sidebar is open. I can't see a nice way to keep it at the top without making a mess.
 2020-06-18 22:21:55 +02:00
Matt-Yorkley
387a5ec950 Implement "Take me shopping" button 2020-06-18 22:21:55 +02:00
Matt-Yorkley
10b8470e29 Set a fixed width for cart sidebar on tablet up 2020-06-18 22:21:55 +02:00
Matt-Yorkley
4acb08e52b Update hamburger menu icon 2020-06-18 22:21:55 +02:00
Matt-Yorkley
2f2ef28351 Use links instead of buttons and fix up styles 2020-06-18 22:21:55 +02:00
Matt-Yorkley
b74b9fbd1d Shift sidebar down vertically (below navigation) and bring navigation up (z-index) 2020-06-18 22:21:55 +02:00
Matt-Yorkley
4a0f43a831 Ensure cart item count is visible in header cart button (for screens smaller than desktop) 2020-06-18 22:21:55 +02:00
Matt-Yorkley
439674ad9c Make cart view fullwidth on mobile 2020-06-18 22:21:55 +02:00
Matt-Yorkley
8ca0119f5d Add empty cart feedback 2020-06-18 22:21:55 +02:00
Matt-Yorkley
4362b8b25b Improve line spacing on cart product list 2020-06-18 22:21:54 +02:00
Matt-Yorkley
be8c0f3600 Remove old cart dropdown view and directive 2020-06-18 22:21:54 +02:00
Matt-Yorkley
33a2dd100e Add new layout for cart sidebar 2020-06-18 22:21:54 +02:00
Matt-Yorkley
400fce8ef9 Separate cart page and cart dropdown styles 2020-06-18 22:21:54 +02:00
Matt-Yorkley
b4e5542e5f Extract re-usable sidebar styes 2020-06-18 22:21:54 +02:00
Matt-Yorkley
b1ce7f2c15 Simplify product naming in cart 2020-06-18 22:21:54 +02:00
Matt-Yorkley
85abfd2056 Create Cart sidebar and controller 2020-06-18 22:21:54 +02:00
Luis Ramos
208623bb0a Merge pull request #5635 from Matt-Yorkley/map-icons 
Ensure map icon URLs are correctly generated with fingerprints
 2020-06-18 18:02:47 +01:00
Pau Pérez Fabregat
63f8830eba Merge pull request #5530 from cillian/remove-spinjs 
Remove spinjs-rails dependency and use spinning-circles.svg instead.
 2020-06-18 16:47:09 +02:00
Matt-Yorkley
75e57e5c2c Call #image_path on map cluster icon 2020-06-18 14:14:41 +02:00
Matt-Yorkley
9a39cbbbc5 Convert MapConfiguration service to .js.erb.coffee 2020-06-18 14:14:41 +02:00
Matt-Yorkley
7cc47d652c Merge pull request #5624 from Matt-Yorkley/rails4-image-precompile 
v3 image precompile
 2020-06-18 12:01:23 +02:00
Matt-Yorkley
c07476e22c Use new Rails 4 #image-url SCSS helper 
Paths should be relative. For example an image under `/app/assets/images/home/banner.jpg` should be: `image-url("home/banner.jpg")`
 2020-06-16 18:25:12 +02:00
Pau Pérez Fabregat
6a31c56601 Merge pull request #5598 from luisramos0/checkout_error 
Make checkout js error handling a bit more defensive
 2020-06-16 16:18:49 +02:00
Luis Ramos
ed262a19a9 Make checkout js error handling a bit more defensive 2020-06-12 20:33:22 +01:00
Luis Ramos
7245a80f94 Merge branch 'master' into 3-0-stable-jun-2 2020-06-12 09:22:47 +01:00
Luis Ramos
898d525201 Merge pull request #5552 from coopdevs/remove-forgotten-photos 
Remove unused stock photo
 2020-06-11 20:41:01 +01:00
Luis Ramos
983bed3c4e Merge branch 'master' into 3-0-stable-jun-2 2020-06-11 19:50:56 +01:00
Pau Pérez Fabregat
2052756169 Merge pull request #5556 from Matt-Yorkley/geocoding-service 
Rename Angular Geo service
 2020-06-11 15:19:08 +02:00
Pau Pérez Fabregat
ab743c3af9 Merge pull request #5407 from luisramos0/oc_sweep 
Order Cycle design sweep
 2020-06-11 12:49:04 +02:00
Pau Pérez Fabregat
75d24c19fc Merge pull request #5206 from chrishil1/clear_filters 
Clear filters on admin/products page
 2020-06-11 10:37:17 +02:00
Luis Ramos
1e248c1848 Merge pull request #5354 from jeduardo824/enhancement/5277-be-able-to-filter-orders-according-to-shipping-method 
Enhancement/5277 be able to filter orders according to shipping method
 2020-06-10 20:50:06 +01:00
Luis Ramos
88896b7730 Merge branch 'master' into 3-0-stable-jun-2 2020-06-08 19:17:11 +01:00
jeffrey s hill md
c4e910a7c8 Make clear filters fetch products automatically without filters 
The spec change is needed: fetchProducts() makes cleared filters values undefined in removeClearedValues.
 2020-06-08 18:27:10 +01:00
Pau Perez
a287f370b5 Remove unused home photos 2020-06-05 18:05:58 +02:00
Matt-Yorkley
78fc6b7138 Rename "Geo" service to "GmapsGeo" for clarity. 
This service directly calls methods in the google maps javascript included in the darkswarm layout. If we're moving away from it, we should clarify where it's used.
 2020-06-05 08:35:15 +02:00
Luis Ramos
3a20de1465 Merge pull request #5398 from cillian/open-street-map 
Add support for using Open Street Map on the Map and Group pages.
 2020-06-04 17:01:25 +01:00
Pau Perez
7900cf9438 Style spinner SVG by inlining it 
This way we can tweak the `fill` property of the SVG and style it with
CSS as the documented in the author's repo
(https://github.com/SamHerbert/SVG-Loaders)

> An icon's color can be manipulated by changing the fill attribute in
the SVG file.
 2020-06-03 11:13:03 +02:00
Pau Pérez Fabregat
d9cf22fed5 Merge pull request #5528 from luisramos0/checkout_js 
Make checkout JS code send bugsnag alert even if there's an error processing an error
 2020-06-03 09:13:40 +02:00
Pau Pérez Fabregat
fb339d6a99 Merge pull request #5263 from luisramos0/pdp 
[Mobile] Restyle product modal
 2020-06-03 08:55:20 +02:00
Luis Ramos
c9a7a6e897 Merge branch 'master' into 3-0-stable-jun-2 2020-06-02 16:00:45 +01:00
Luis Ramos
89c461662f Merge pull request #5502 from Matt-Yorkley/dropshadow-regression 
[mobile ux] Fix missing drop-shadow
 2020-06-02 12:07:37 +01:00
Cillian O'Ruanaidh
94b85fb9e3 Fix up Code Climate issues with Open Street Map code. 2020-05-31 18:42:55 +02:00
Cillian O'Ruanaidh
deafe32354 Add support for using Open Street Map on the Map and Group pages. 
The map is displayed using https://leafletjs.com/

To enable Open Street Map go to the Admin -> Configuration -> Content section and click 'Open Street Map Enabled'.

The 'Open Street Map Provider Name' setting can be used to configure different tile providers thanks to the Leaflet-providers extension (https://github.com/leaflet-extras/leaflet-providers)

Some tile providers require an API key, this can provided in JSON format e.g. '{ apiKey: 123 }' in the 'Open Street Map Provider Options' setting.

Each tile provider has their own usage policy so this should be checked before enabling Open Street Map.

The search field for the Open Street Map works differently than searching on Google Maps. It matches producers by their name or address because it was easier to implement instead of matching place names all over the world.
 2020-05-31 18:42:55 +02:00
Cillian O'Ruanaidh
e6fa296d03 Remove spinjs-rails dependency and use spinning-circles.svg instead. 
For https://github.com/openfoodfoundation/openfoodnetwork/issues/3491

The spinjs-rails gem provides a CSS3 a spinning activity indicator. This commit removes the gem so we don't have to keep the gem up-to-date and uses the spinning-circles.svg which is used already in other places.

The spinjs spinner can be seen when viewing or editing taxonomies in /admin/taxonomies. It is loaded from the .ajaxStart call in app/assets/javascripts/admin/spree/progress.coffee

To test or restyle this spinner you can change the display property of the #progress element in app/assets/stylesheets/admin/components/progress.scss to 'block'.
 2020-05-29 18:04:49 +01:00
Luis Ramos
6e842212ea Always throw back error even if there is an error loading the flash for example translating the error message 2020-05-29 14:45:22 +01:00
Luis Ramos
3e0839de73 Increase warning sign line height so that it renders correctly on smaller screens 2020-05-29 12:56:22 +01:00
Luis Ramos
2c55bef544 Remove unnecessary padding 
This is looking broken in ipad mini 3
 2020-05-29 12:56:22 +01:00
Luis Ramos
a376a17f64 Group related properties together 2020-05-29 12:56:20 +01:00
Matt-Yorkley
c73defa8a1 Merge pull request #5494 from Matt-Yorkley/group-maps-fix 
Fix group maps
 2020-05-29 12:05:55 +02:00