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

Marco2 #139

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

Marco2 #139

wants to merge 41 commits into from

Conversation

marco-aguirre
Copy link

No description provided.

RyanKHawkins and others added 30 commits August 30, 2022 21:50
@RyanKHawkins
fix: Changed "folx" to "folks" :D
7442639
@bomboloni
added .env to .gitignore
0a9c77d
@bomboloni
updated .env with db access string
37e201f
@bomboloni
Delete .env
038e160
@matt-conn
add entry schema
6938287
@matt-conn
Merge pull request #1 from bomboloni/schema
65ed987 
add entry schema
@RyanKHawkins
initial push after the group meeting
c017428
@RyanKHawkins
Merge pull request #1 from bomboloni/main
192a8c1 
Pulled
@RyanKHawkins
fix: file name
70f469d
@RyanKHawkins
Merge pull request #2 from RyanKHawkins/main
bce773a 
Merge pull request #1 from bomboloni/main
@bomboloni
added const entryItem, line 3
0289881
@bomboloni
got rid of more todo stuff
b19590c
@RyanKHawkins
update: converted controller todo references to entry/entries/entryItems
5fceef5
@RyanKHawkins
Merge branch 'bomboloni:main' into dev-Ryan
df1553b
@RyanKHawkins
Merge pull request #3 from RyanKHawkins/dev-Ryan
7bcb27b
@bomboloni
added a description key to the entry model
9e41034
@bomboloni
fixed bug in todos.ejs
322f6e3
@bomboloni
attempting to resolve merge conflict of schema into main
25ba758
@bomboloni
added replit files to .gitignore
11bde43
@bomboloni
removed replit files
b0322aa
@bomboloni
added title
a5856d1
@bomboloni
logging in now goes to /entries
2a57cca
@bomboloni
wip - can now add expense items (entries)
de6bd5b
@bomboloni
made entry model naming consistent
02cc02a
@bomboloni
added back delete functionality
cdbd442
@marco-aguirre
Added form, got it to post into an Entry doc, started new Budget schema
f53483c
@preeformance
merged branches and resolved discrepancies
66a4c6f
@marco-aguirre
changed entries controller to accept form input
aa93c3a
@preeformance
html5up template files addition and adjusted index.ejs to match template
542fc60
@preeformance
fixed buttons to route back to root sintead of error
665968b
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
@marco-aguirre @RyanKHawkins @bomboloni @matt-conn @preeformance