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

Main Merge Feb 16 00:25 #116

Merged
merged 245 commits into from
Feb 15, 2021
Merged

Main Merge Feb 16 00:25 #116

merged 245 commits into from
Feb 15, 2021

Conversation

dauntlessnomad
Copy link
Member

Main Merge

ajil-paul and others added 30 commits January 29, 2021 19:46
- Remove default styles in `App.css`
- Make navbar
- Add navbar to public router
- Change active tab color
added prettier code formatter
docs: Issue templates and PR templates for the Projects.
lespaceman and others added 24 commits February 15, 2021 02:49
Links Explore page Destination Cards with json
- Correct dummy JSON data structure
- Add icons caret left and route
- Add icons alarm, available, rupee and up-right
- Add reviews, flaura and fauna and challenges
- Add review modal
- Update Star component to take input
- Add icon avatar and edit
- Common components are fom destination page and activities page
- Add the like function in higher component
- Add a sample link from Destination Card
- Remove cursor in static rating components
- Add scroll to top initially in Destination Page
- Add colors to bannner
- Change sample icon to original icons
- Apply prettier to previous commits
- The functions can be imported from
- NotFound component is used to show errors in URL
- Add link from destination card to destination page
Change dummy data to data from JSON in destination page
* link ksrtc json with ksrtc page

* refactor code for availble days indicator in KSRTC card

* remove hour 12
* Add activity page

- Add additional booking button in Heading
- Add seperate modal component
- Add booking modal
- Add hotel user and outside link icons

* Add sample link from todo card to activity

* Add data from JSON

- Add extra method to get all data of activity
- Optionally print values in bokking modal
- Chnage icon style in booking modal
@dauntlessnomad dauntlessnomad requested a review from a team as a code owner February 15, 2021 18:55
@lespaceman lespaceman self-requested a review February 15, 2021 19:15
@dauntlessnomad dauntlessnomad merged commit 11d6a47 into main Feb 15, 2021
@riginoommen
Copy link
Member

Commit history looks polluted can you please close this pr and share the correct commits

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.