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.

Sign up for GitHub

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

Jump to bottom

Final big merge from Develop into Production (master) #152

Merged
merged 38 commits into from
Apr 30, 2022
Merged

Final big merge from Develop into Production (master) #152

merged 38 commits into from
Apr 30, 2022

Conversation

lumialfe
Copy link
Contributor

No description provided.

lumialfe and others added 30 commits April 4, 2022 22:53
@lumialfe
Merge remote-tracking branch 'origin/develop' into mainProducts
c01eb3c
@sebaslh01
Modifying borders of productcard
b5a249b
@sebaslh01
ReviewsView with scroll in smaller devices
b6e1240
@sebaslh01
Img to the left
a789fe6
@sebaslh01
Modification of layout. Now items in order is scrollable.
cb5c792
@sebaslh01
Moving img to left in cartitem
3901c7a
@sebaslh01
Now items in cart are scrollable
89c13f5
@sebaslh01
Changing review layout to adapt to multiple devices
07209d7
@sebaslh01
Ratings adaptable
bf3bd99
@sebaslh01
Merge branch 'develop' into mainProducts
53932a5
@sebaslh01
Fix main products layout with filtering
99cbd13
@sebaslh01
Fix width in filter by brand combobox
3388771
@sebaslh01
Changing width size to adapt reviews
6668834
@sebaslh01
Changing icon in reviews to emoji
3f3c6e7
@sebaslh01
Adding scroll to orders in adminView
0e2ef45
@sebaslh01
Adapting Checkout to mobilephones
0ad4ec6
@sebaslh01
Styling navbar to be properly adaptable for mobilephones
b13b61b
@sebaslh01
Checkout adaptable to small screens
10a638e
@sebaslh01
Adapting Shipping view to mobile devices
1e633a2
@sebaslh01
Adapting some things in UserProfile to mobile devices
0d766c8
@sebaslh01
Getting rid of bug 'unexpected 'box-shadow'
821a5a8 
It was duplicated and sonarcloud complained!
@sebaslh01
Refactoring directory of css file
2795660
@sebaslh01
CheckOut view is ready for merge
17ba088
@sebaslh01
Shopping cart adaptable to mobile devices
5c77808
@sebaslh01
Deleting emojis
1989adf
@lumialfe
Merge branch 'mainProducts' of https://github.com/Arquisoft/dede_en1b …
34f5ba9 
…into mainProducts
@lumialfe
Updated Some Graphic Elements
3c0bc52
@sebaslh01
Fixing bug detected by sonarCloud repeate 'margin' property
cd25d9e 
It failed the checking and said it was critical to have it duplicated
@sebaslh01
Buttons in cartItem centered.
083fff4
@sebaslh01
Removing unused imports
b2872eb
sebaslh01 and others added 8 commits April 30, 2022 11:57
@sebaslh01
Adapting message when not logged in to mobile devices
71e58f4
@sebaslh01
Adding PageNotFound
5555112 
When the user types in a route that we do not handle, we will show them an error message to redirect them to the HomePage.
@lumialfe
Added Warning to Address Form
a1a4afd
@lumialfe
Fixed OrderCard Width
37a37a7
@lumialfe
Fixed Image Size on Order Details Item
a5b56ef
@lumialfe
Added separator to product details view
2371596
@sebaslh01
Updated style of reviews in product
b7bf98f
@sebaslh01
Merge pull request #149 from Arquisoft/mainProducts
ffe3afa 
Changing display of checkout,cart, reviews, main products, general view is adaptable to mobile devices!
@lumialfe lumialfe added the enhancement New feature or request label Apr 30, 2022
@lumialfe lumialfe added this to the DeDe V3.0 milestone Apr 30, 2022
@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

sebaslh01
sebaslh01 approved these changes Apr 30, 2022
View reviewed changes
Copy link
Contributor

@sebaslh01 sebaslh01 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks everything good to me 🥇

jesugmend
jesugmend approved these changes Apr 30, 2022
View reviewed changes
Copy link
Contributor

@jesugmend jesugmend left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Everything seems to be working. Great work!

danieladov
danieladov approved these changes Apr 30, 2022
View reviewed changes
Copy link
Contributor

@danieladov danieladov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great work!

@lumialfe lumialfe merged commit f29abc5 into master Apr 30, 2022
@sebaslh01 sebaslh01 mentioned this pull request May 2, 2022
Open
@jesugmend jesugmend mentioned this pull request May 3, 2022
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sebaslh01 sebaslh01 sebaslh01 approved these changes

@jesugmend jesugmend jesugmend approved these changes

@danieladov danieladov danieladov approved these changes

Assignees
No one assigned
Labels
enhancement New feature or request
Projects
None yet
Milestone
DeDe V3.0
Development

Successfully merging this pull request may close these issues.
4 participants
@lumialfe @danieladov @jesugmend @sebaslh01