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

Test pull #6

Open
wants to merge 264 commits into
base: main
Choose a base branch
from
Open

Test pull #6

wants to merge 264 commits into from

Conversation

WILLCHRIS10
Copy link

test pull

VeroS-pdf and others added 29 commits August 13, 2024 12:34
@VeroS-pdf
Delete Getaway Guru.sql
366c37c 
Deleted an incorrect sql file that was accidentally addedd
@VeroS-pdf
Merge branch 'main' of https://github.com/catherinemckinley/getaway_guru
2183f81
@WILLCHRIS10
Merge branch 'main' of https://github.com/catherinemckinley/getaway_guru
f4ee3c2
@VeroS-pdf
testing get command on the page
12104f6
@VeroS-pdf
Creation of flight route + trip page
ec02c8c
@Laurennc33
Created a hotel route
7c96186
@Laurennc33
Merge branch 'main' of https://github.com/catherinemckinley/getaway_guru
5cc17b9
@catherinemckinley
made few changes with the name of db to get my ui to work
cf49e47
@VeroS-pdf
Updating rest_entry.py
d6d1f3a
@layzarodri
Create employee_routes.py
34fbaa1 
creates employee_route
@catherinemckinley
Merge branch 'main' of github.com:catherinemckinley/getaway_guru
359d35b
@WILLCHRIS10
Merge branch 'main' of https://github.com/catherinemckinley/getaway_guru
27ced3a
@VeroS-pdf
Creation of attraction, location, trip, users
2dbc776
@catherinemckinley
Added trip_routes
039a819
@catherinemckinley
Added trip_routes
d08054e
@layzarodri
Create ads_routes.py
75d8c0f 
Updates employee
@layzarodri
Merge branch 'main' of https://github.com/catherinemckinley/getaway_guru
1376aab
@WILLCHRIS10
Merge branch 'main' of https://github.com/catherinemckinley/getaway_guru
1665f27
@layzarodri
Update employee_routes.py
19f8e87 
employee post method
@layzarodri
Update ads_routes.py
36c7149 
ads get method
@WILLCHRIS10
Added restaurant clicks, pending updates
8bf4164
@VeroS-pdf
minor changes to home and nav
be04bfe
@VeroS-pdf
Merge branch 'main' of https://github.com/catherinemckinley/getaway_guru
26807ff
@WILLCHRIS10
Merge branch 'main' of https://github.com/catherinemckinley/getaway_guru
6c82aea
@VeroS-pdf
Update flight_routes.py
85cc120
@WILLCHRIS10
name updates to restaurant clicks
a634f4a
@WILLCHRIS10
final change for get
381c906
@catherinemckinley
Added city and restaurant. Still editing but got core ideas down
f6e6d82
@WILLCHRIS10
change
563ab7f
VeroS-pdf and others added 30 commits August 15, 2024 16:53
@VeroS-pdf
Making the forms work
18582dd
@VeroS-pdf
Updating hotel_routes
b7323c3
@VeroS-pdf
getting rid of incorrect imports
6c8956a
@Laurennc33
removed example code from hotel routes
b86faa7
@Laurennc33
Merge branch 'main' of https://github.com/catherinemckinley/getaway_guru
17513c5
@VeroS-pdf
changes to marketing_campaign form
9eb1739
@VeroS-pdf
Merge branch 'main' of https://github.com/catherinemckinley/getaway_guru
419e9e7
@VeroS-pdf
got marketing_campaign_form to work
0044f68
@WILLCHRIS10
final dataset change
b13d78a
@WILLCHRIS10
Merge branch 'main' of https://github.com/catherinemckinley/getaway_guru
5b07a2f
@catherinemckinley
updated readme.md
66b4a45
@VeroS-pdf
trying to do delete and update
23a9ce6
@VeroS-pdf
Merge branch 'main' of https://github.com/catherinemckinley/getaway_guru
bd3ee4d
@Laurennc33
remove curly brackets from trip delete
38c7e6b
@catherinemckinley
x
457dc7e
@VeroS-pdf
trying to update user_account
86d42b6
@catherinemckinley
x
718fff7
@VeroS-pdf
Merge branch 'main' of https://github.com/catherinemckinley/getaway_guru
b947ab1
@VeroS-pdf
deleting minor things in user_route
d9781be
@catherinemckinley
trying to add to users.py to help delete trip
b2d69b8
@catherinemckinley
trying to add for delete
2b9691d
@VeroS-pdf
making delete work, update work, and the sql file work
f67b817
@catherinemckinley
changed all route names to not have verbs in the call (per Dr. F). Wi…
8321cc3 
…ll go over tomorrow on final call
@VeroS-pdf
updating resource names/ calls
83a4da1
@VeroS-pdf
fixed restaurant_route
aaa6b5d
@VeroS-pdf
added in getting attraction and hotel from rating
569e656
@VeroS-pdf
making delete_trip more UI friendly
3655e2a
@VeroS-pdf
creating a new page to choose restaurant by cuisine
b7b81d2
@VeroS-pdf
fixing sidebar names
6871efd
@VeroS-pdf
Update README.md
16a59ba
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@WILLCHRIS10 @VeroS-pdf @Laurennc33 @catherinemckinley @layzarodri