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

Restaurant page design #1690

Merged
merged 55 commits into from
Mar 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
22427d2
Reformatting
Pierre-LHOSTE Jan 19, 2024
3a09b05
Back to default header colors
Pierre-LHOSTE Jan 19, 2024
cff9103
Remove typescript types
Pierre-LHOSTE Jan 19, 2024
cb71a7b
Change header color depending on theme
Pierre-LHOSTE Jan 26, 2024
70c3abc
Refactor HeaderButton component
Pierre-LHOSTE Jan 26, 2024
c1ea5f5
Refactor HeaderButton component to use functional component & Change …
Pierre-LHOSTE Jan 26, 2024
3a947cd
Update RestaurantCard component styling
Pierre-LHOSTE Jan 26, 2024
bca8fe2
Add RestaurantMenu and RestaurantMenuItem components
Pierre-LHOSTE Jan 26, 2024
20c0562
Making RestaurantMenuHeader fixed on top when scrolling
Pierre-LHOSTE Jan 30, 2024
8014cb7
Refactor
Pierre-LHOSTE Feb 1, 2024
1f06f63
Update title in CheckoutNavigator.js
Pierre-LHOSTE Feb 1, 2024
5fe5d68
Add menu content and auto scrolling from header
Pierre-LHOSTE Feb 2, 2024
40158a7
Add viewability tracking to RestaurantMenu and RestaurantMenuHeader c…
Pierre-LHOSTE Feb 12, 2024
7f7c916
Fix onPress item and some design improvements
Pierre-LHOSTE Feb 14, 2024
c518a42
Refactor code for DangerAlert and some fixes
Pierre-LHOSTE Feb 16, 2024
518e8f8
Change DangerAlert component styles
Pierre-LHOSTE Feb 16, 2024
4441dc3
Update RestaurantMenuItem.js to limit title text to one line
Pierre-LHOSTE Feb 16, 2024
6fae984
Add restaurant image
Pierre-LHOSTE Feb 16, 2024
8434a57
Improvement of RestaurantMenuHeader
Pierre-LHOSTE Feb 19, 2024
a3851d6
Fix scroll issue in RestaurantMenuHeader.js
Pierre-LHOSTE Feb 19, 2024
8de9acb
Add i18next and button to RestaurantProfile
Pierre-LHOSTE Feb 20, 2024
101354f
Refactor ProductImage and ProductInfo components
Pierre-LHOSTE Feb 20, 2024
685f67c
Update ProductImage component to handle different image ratios
Pierre-LHOSTE Feb 20, 2024
687f338
Update ProductInfo and ProductDetails styles
Pierre-LHOSTE Feb 20, 2024
666d874
Add shadow to highlight white logos
Pierre-LHOSTE Feb 20, 2024
8242040
Update component styles for dark theme
Pierre-LHOSTE Feb 21, 2024
a10e41d
Update inactiveBorderBottomColor in RestaurantMenuHeader.js
Pierre-LHOSTE Feb 21, 2024
58c0793
Refactor RestaurantMenuHeader component styling
Pierre-LHOSTE Feb 21, 2024
a952ef2
Add marginTop to menuItemTitle and remove product image if it doesn't…
Pierre-LHOSTE Feb 21, 2024
1e180e2
Delete RestaurantMenu component
Pierre-LHOSTE Feb 22, 2024
cdab93e
Remove whiteSpace property from menuItemDescription style
Pierre-LHOSTE Feb 22, 2024
57ae3f0
Add loading skeleton for menu header and menu item
Pierre-LHOSTE Feb 22, 2024
c07c5fc
Update RestaurantMenuHeader styling
Pierre-LHOSTE Feb 22, 2024
aac8026
Changer header background color for dark theme
Pierre-LHOSTE Feb 22, 2024
00caa98
Update stackNavigatorScreenOptions function name
Pierre-LHOSTE Feb 23, 2024
8904f50
Merge branch 'origin/master' into restaurant-page-design
Pierre-LHOSTE Mar 11, 2024
e840cfa
Add style for disabled item and update prettier
Pierre-LHOSTE Mar 11, 2024
9720261
Refactor DangerAlert component
Pierre-LHOSTE Mar 11, 2024
562fa71
Update badgesWrapper overflow styles
Pierre-LHOSTE Mar 11, 2024
9266104
Fix badgesWrapper scrolling
Pierre-LHOSTE Mar 11, 2024
77a7768
Add backgroundColor to menu item
Pierre-LHOSTE Mar 11, 2024
204290c
Fix conditional rendering in RestaurantProfile.js
Pierre-LHOSTE Mar 11, 2024
69dd124
Fix banner image if it doesn't exist
Pierre-LHOSTE Mar 11, 2024
adea0d8
Add RestaurantProductBadge
Pierre-LHOSTE Mar 12, 2024
51fe7ed
Add flex and minHeight to RestaurantMenuItem styles
Pierre-LHOSTE Mar 12, 2024
a8e080e
Improves display badges on product cards
Pierre-LHOSTE Mar 13, 2024
1de2ad4
Fix badges display
Pierre-LHOSTE Mar 13, 2024
49096c2
Refactor RestaurantSearch component
Pierre-LHOSTE Mar 14, 2024
57bd668
Remove unused styles
Pierre-LHOSTE Mar 15, 2024
7814cf6
Fix CartFooter
Pierre-LHOSTE Mar 18, 2024
132eb03
Update Restaurant address background
Pierre-LHOSTE Mar 19, 2024
240a0ac
Add icon and input styles
Pierre-LHOSTE Mar 19, 2024
a3c04a2
Update paddingTop in RestaurantsPage
Pierre-LHOSTE Mar 19, 2024
41e632a
Little align fix for product card badges
Pierre-LHOSTE Mar 22, 2024
5b452c8
Merge pull request #1717 from coopcycle/restaurant-address-header-red…
alexsegura Mar 26, 2024
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
2 changes: 1 addition & 1 deletion .prettierrc.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module.exports = {
arrowParens: 'avoid',
bracketSameLine: true,
bracketSpacing: false,
bracketSpacing: true,
singleQuote: true,
trailingComma: 'all',
};
310 changes: 310 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,310 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.7)
base64
nkf
rexml
activesupport (6.1.7.7)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
artifactory (3.0.17)
atomos (0.1.3)
aws-eventstream (1.3.0)
aws-partitions (1.896.0)
aws-sdk-core (3.191.3)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.8)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.77.0)
aws-sdk-core (~> 3, >= 3.191.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.143.0)
aws-sdk-core (~> 3, >= 3.191.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.8)
aws-sigv4 (1.8.0)
aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.4)
base64 (0.2.0)
claide (1.1.0)
cocoapods (1.14.3)
addressable (~> 2.8)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.14.3)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 2.1, < 3.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.6.0, < 2.0)
cocoapods-try (>= 1.1.0, < 2.0)
colored2 (~> 3.1)
escape (~> 0.0.4)
fourflusher (>= 2.3.0, < 3.0)
gh_inspector (~> 1.0)
molinillo (~> 0.8.0)
nap (~> 1.0)
ruby-macho (>= 2.3.0, < 3.0)
xcodeproj (>= 1.23.0, < 2.0)
cocoapods-core (1.14.3)
activesupport (>= 5.0, < 8)
addressable (~> 2.8)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
netrc (~> 0.11)
public_suffix (~> 4.0)
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.5)
cocoapods-downloader (2.1)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.1)
cocoapods-trunk (1.6.0)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
cocoapods-try (1.2.0)
cocoapods-user-defined-build-types (0.0.7)
cocoapods (>= 1.5.0, < 2.0)
colored (1.2)
colored2 (3.1.2)
commander (4.6.0)
highline (~> 2.0.0)
concurrent-ruby (1.2.3)
declarative (0.0.20)
digest-crc (0.6.5)
rake (>= 12.0.0, < 14.0.0)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
dotenv (2.8.1)
emoji_regex (3.2.3)
escape (0.0.4)
ethon (0.16.0)
ffi (>= 1.15.0)
excon (0.109.0)
faraday (1.10.3)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
faraday-httpclient (~> 1.0)
faraday-multipart (~> 1.0)
faraday-net_http (~> 1.0)
faraday-net_http_persistent (~> 1.0)
faraday-patron (~> 1.0)
faraday-rack (~> 1.0)
faraday-retry (~> 1.0)
ruby2_keywords (>= 0.0.4)
faraday-cookie_jar (0.0.7)
faraday (>= 0.8.0)
http-cookie (~> 1.0.0)
faraday-em_http (1.0.0)
faraday-em_synchrony (1.0.0)
faraday-excon (1.1.0)
faraday-httpclient (1.0.1)
faraday-multipart (1.0.4)
multipart-post (~> 2)
faraday-net_http (1.0.1)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
faraday-rack (1.0.0)
faraday-retry (1.0.3)
faraday_middleware (1.2.0)
faraday (~> 1.0)
fastimage (2.3.0)
fastlane (2.219.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
aws-sdk-s3 (~> 1.0)
babosa (>= 1.0.3, < 2.0.0)
bundler (>= 1.12.0, < 3.0.0)
colored
commander (~> 4.6)
dotenv (>= 2.1.1, < 3.0.0)
emoji_regex (>= 0.1, < 4.0)
excon (>= 0.71.0, < 1.0.0)
faraday (~> 1.0)
faraday-cookie_jar (~> 0.0.6)
faraday_middleware (~> 1.0)
fastimage (>= 2.1.0, < 3.0.0)
gh_inspector (>= 1.1.2, < 2.0.0)
google-apis-androidpublisher_v3 (~> 0.3)
google-apis-playcustomapp_v1 (~> 0.1)
google-cloud-env (>= 1.6.0, < 2.0.0)
google-cloud-storage (~> 1.31)
highline (~> 2.0)
http-cookie (~> 1.0.5)
json (< 3.0.0)
jwt (>= 2.1.0, < 3)
mini_magick (>= 4.9.4, < 5.0.0)
multipart-post (>= 2.0.0, < 3.0.0)
naturally (~> 2.2)
optparse (>= 0.1.1)
plist (>= 3.1.0, < 4.0.0)
rubyzip (>= 2.0.0, < 3.0.0)
security (= 0.1.3)
simctl (~> 1.6.3)
terminal-notifier (>= 2.0.0, < 3.0.0)
terminal-table (~> 3)
tty-screen (>= 0.6.3, < 1.0.0)
tty-spinner (>= 0.8.0, < 1.0.0)
word_wrap (~> 1.0.0)
xcodeproj (>= 1.13.0, < 2.0.0)
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3)
fastlane-plugin-android_change_string_app_name (0.1.1)
nokogiri
fastlane-plugin-appicon (0.16.0)
json
mini_magick (>= 4.9.4, < 5.0.0)
fastlane-plugin-bundletool (1.0.9)
fastlane-plugin-increment_version_code (0.4.3)
ffi (1.16.3)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
google-apis-androidpublisher_v3 (0.54.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-core (0.11.3)
addressable (~> 2.5, >= 2.5.1)
googleauth (>= 0.16.2, < 2.a)
httpclient (>= 2.8.1, < 3.a)
mini_mime (~> 1.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.a)
rexml
google-apis-iamcredentials_v1 (0.17.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-playcustomapp_v1 (0.13.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-storage_v1 (0.29.0)
google-apis-core (>= 0.11.0, < 2.a)
google-cloud-core (1.6.1)
google-cloud-env (>= 1.0, < 3.a)
google-cloud-errors (~> 1.0)
google-cloud-env (1.6.0)
faraday (>= 0.17.3, < 3.0)
google-cloud-errors (1.3.1)
google-cloud-storage (1.45.0)
addressable (~> 2.8)
digest-crc (~> 0.4)
google-apis-iamcredentials_v1 (~> 0.1)
google-apis-storage_v1 (~> 0.29.0)
google-cloud-core (~> 1.6)
googleauth (>= 0.16.2, < 2.a)
mini_mime (~> 1.0)
googleauth (1.8.1)
faraday (>= 0.17.3, < 3.a)
jwt (>= 1.4, < 3.0)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
signet (>= 0.16, < 2.a)
highline (2.0.3)
http-cookie (1.0.5)
domain_name (~> 0.5)
httpclient (2.8.3)
i18n (1.14.4)
concurrent-ruby (~> 1.0)
jmespath (1.6.2)
json (2.7.1)
jwt (2.8.1)
base64
mini_magick (4.12.0)
mini_mime (1.1.5)
mini_portile2 (2.8.5)
minitest (5.22.2)
molinillo (0.8.0)
multi_json (1.15.0)
multipart-post (2.4.0)
nanaimo (0.3.0)
nap (1.1.0)
naturally (2.2.1)
netrc (0.11.0)
nkf (0.2.0)
nokogiri (1.13.10)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
optparse (0.4.0)
os (1.1.4)
plist (3.7.1)
public_suffix (4.0.7)
racc (1.7.3)
rake (13.1.0)
representable (3.2.0)
declarative (< 0.1.0)
trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 0.2.0)
retriable (3.1.2)
rexml (3.2.6)
rouge (2.0.7)
ruby-macho (2.5.1)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
security (0.1.3)
signet (0.18.0)
addressable (~> 2.8)
faraday (>= 0.17.5, < 3.a)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
simctl (1.6.10)
CFPropertyList
naturally
terminal-notifier (2.0.0)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
trailblazer-option (0.1.2)
tty-cursor (0.7.1)
tty-screen (0.8.2)
tty-spinner (0.9.3)
tty-cursor (~> 0.7)
typhoeus (1.4.1)
ethon (>= 0.9.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
uber (0.1.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.9.1)
unicode-display_width (2.5.0)
word_wrap (1.0.0)
xcodeproj (1.24.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
rexml (~> 3.2.4)
xcpretty (0.3.0)
rouge (~> 2.0.7)
xcpretty-travis-formatter (1.0.1)
xcpretty (~> 0.2, >= 0.0.7)
zeitwerk (2.6.13)

PLATFORMS
ruby

DEPENDENCIES
activesupport (>= 6.1.7.5, < 7.1.0)
cocoapods (>= 1.13, < 1.15)
cocoapods-user-defined-build-types
fastlane
fastlane-plugin-android_change_string_app_name
fastlane-plugin-appicon
fastlane-plugin-bundletool
fastlane-plugin-increment_version_code

RUBY VERSION
ruby 2.6.10p210

BUNDLED WITH
1.17.2
4 changes: 2 additions & 2 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1752,7 +1752,7 @@ SPEC CHECKSUMS:
FirebaseInstallations: 763814908793c0da14c18b3dcffdec71e29ed55e
FirebaseSessions: cd97fb07674f3906619c871eefbd260a1546c9d3
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
glog: 035f1e36e53b355cf70f6434d161b36e7d21fecd
glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2
GoogleAppMeasurement: bb3c564c3efb933136af0e94899e0a46167466a8
GoogleDataTransport: bed3a36c04c8552479fbb9b76326e0fc69bddcb2
GoogleSignIn: fd381840dbe7c1137aa6dc30849a5c3e070c034a
Expand Down Expand Up @@ -1852,7 +1852,7 @@ SPEC CHECKSUMS:
StripePaymentSheet: a25d920bb3bb5e2580696476482dc7df9cb5e4e2
StripePaymentsUI: 66088abec88754bbdd522ef227dfdbb2265a653e
StripeUICore: b193c7d35e9cd1b04bc9ed4a6fb8c548fcee83fa
Yoga: a716eea57d0d3430219c0a5a233e1e93ee931eb7
Yoga: 9e6a04eacbd94f97d94577017e9f23b3ab41cf6c
ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5

PODFILE CHECKSUM: d949c9fd9c4ce5f3ec67d52ca1f4a1ca13072560
Expand Down
Loading
Loading