-
Notifications
You must be signed in to change notification settings - Fork 40
Event link #49
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
Open
Lili00ani
wants to merge
86
commits into
rocketacademy:main
Choose a base branch
from
Lili00ani:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Event link #49
Changes from all commits
Commits
Show all changes
86 commits
Select commit
Hold shift + click to select a range
c37aee9
added pages with router and navbar
Lili00ani cf64b1d
Merge pull request #1 from Lili00ani/l1
kendigm bc71b92
linked homepage and eventdetail page with backend
Lili00ani c795151
test file
Lili00ani 57b377e
removed console log
Lili00ani 3fa1c3c
Merge branch 'l2' of https://github.com/Lili00ani/project3-frontend-b…
Lili00ani f6f44d2
added dialog link for booking
Lili00ani f273114
added payment checkout
Lili00ani fc17407
fixed stripe get session status
Lili00ani b765cff
combined stripe with booking controller
Lili00ani fbdc51f
added condition logic free events routing without stripe checkout
Lili00ani b20c744
Merge pull request #2 from Lili00ani/l2
kendigm 0088e31
Authentication SignIn Page Design.
kendigm 4291c02
Authentication Sign up Screen Design.
kendigm f09cb06
Authentication Reset Password Screen Design.
kendigm 0d20dfd
Authentication Sidebar Profile Screen Design.
kendigm 6a5ec69
added search bar
Lili00ani a384dfa
Merge branch 'main' into l2
Lili00ani 22e405a
Merge pull request #3 from Lili00ani/k1
Lili00ani c2fac2d
Merge branch 'main' into l2
Lili00ani 3dbf8a0
added auth0 loginwithredirect
Lili00ani d907c8e
added checkbox filter
Lili00ani 1baa6e3
Authentication Api integration Redux Register Login Logout
kendigm 05277d3
Merge pull request #4 from Lili00ani/k1
Lili00ani bb774f2
updated event booking page layout
Lili00ani 9318de6
updated comments
Lili00ani 11b20bf
added upcoming events
Lili00ani 78a33f8
updated db
Lili00ani 1a2fcdf
updated user migration, model and seeders file
Lili00ani 7f810e4
Merge pull request #5 from Lili00ani/l2
kendigm 1d7b5cd
updated search and added map
Lili00ani cb893ec
updated
Lili00ani f59c422
updated
Lili00ani d111afc
fixed search filter category bug by clearing events
Lili00ani b3f7c2d
amended
Lili00ani cf1bda8
Auth0 Login Signup Forgetpassword signin with google email verfication
kendigm 07f073e
added maps in search and scroll function, added maps in booking
Lili00ani cf7e244
updated checkout page ui
Lili00ani bdbcc1d
removed comments and simplify libraries import
Lili00ani 774ee70
Merge pull request #6 from Lili00ani/l2
kendigm 92694a8
Auth0 api
kendigm 79c4747
Auth0 tokens send to api
kendigm cf5ac4d
Admin Event Page
kendigm 5775d66
Admin Event Page
kendigm 366cffc
deleted shoes file
Lili00ani 8d6a58a
Merge pull request #10 from Lili00ani/l2
kendigm f4c9f73
main conflicts resolved
kendigm 89fbf9b
compiled
Lili00ani f98a1e7
updated bookings with auth0
Lili00ani 17a156f
removed navbar for admin routes
Lili00ani f621f8e
edited return page
Lili00ani b755cb2
merged
Lili00ani 462a064
fixed free events
Lili00ani c47fe1d
removed navbar in admin
Lili00ani f9310d0
updated navbar only on specific pages
Lili00ani a89787d
fixed bug of booking preview
Lili00ani 5b2531e
added empty state for myBooking
Lili00ani 96a54bb
removed zone identifier
Lili00ani d10a7d8
added key in eventPreviewList
Lili00ani a729d5f
fixed process env
Lili00ani 34195be
updated event detail page and contactuspage
Lili00ani f5715b8
updated redirect url
Lili00ani 1455956
saved auth0 cache to prevent logout after refresh
Lili00ani 64e16bc
updated return page
Lili00ani 110d8d3
updated myprofile page contact us button and refactoring code
Lili00ani ce4d031
removed zone identifier
Lili00ani f6d1826
removed console log and comments
Lili00ani 3a41403
removed unused pages
Lili00ani 44e7a61
fixed import
Lili00ani 565ab42
Merge pull request #12 from Lili00ani/l2
kendigm 62ca82c
base
Lili00ani ad5100d
added admin
Lili00ani 7666eb4
updated event images
Lili00ani 9e9ac8d
added admin can see who book their events
Lili00ani 7b5156d
Merge pull request #14 from Lili00ani/l3
kendigm bb91386
updated ui and fixed routing bug
Lili00ani 715c60d
updated admin event booking list
Lili00ani d0ed619
updated
Lili00ani af357ba
updated return page to add event information
Lili00ani a7f68a6
Merge pull request #15 from Lili00ani/l3
kendigm 8b0c083
upddated readme
Lili00ani 60cc480
cleaned up admin
Lili00ani c579b3a
updated users tokens
Lili00ani 205a4cd
updated
Lili00ani eb64c7c
added frontend url
Lili00ani 3e4ca1b
Merge pull request #16 from Lili00ani/l3
Lili00ani File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,3 +21,5 @@ | |
| npm-debug.log* | ||
| yarn-debug.log* | ||
| yarn-error.log* | ||
|
|
||
| .env | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am missing here how to setup the environment variables to successfully run the project