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

Updating master with latest dev #244

Merged
merged 75 commits into from
Feb 12, 2020
Merged

Updating master with latest dev #244

merged 75 commits into from
Feb 12, 2020

Conversation

sellnat77
Copy link
Member

No description provided.

Joshua Marx and others added 30 commits January 21, 2020 20:55
Restructed folder layout and html layout
e539a76
Changed databaseOrm to be a relative import in sqlIngest.py
9162ea4
@adamkendis
Added classnames dependency. Used for dynamic className generation to…
81dc730 
… comply with Bulma style modifiers.
@adamkendis
Generic button component adhering to Bulma styling modifiers.
89ea9ca
@adamkendis
Rephrased comment for greater clarity.
b0c5060
@adamkendis
Added bulma-checkradio and react-id-generator dependencies.
99de5cb
@adamkendis
Unique id generation added to Button component.
171e794
@adamkendis
Bulma-checkradio import.
79ffb1c
@adamkendis
Generic checkbox component adhering to Bulma-checkradio extension sty…
08fd652 
…ling modifiers.
@adamkendis
Added type attribute to Checkbox props.
7e6bc5b
@adamkendis
Added bulma-switch dependency and import.
0cce2f3
@adamkendis
Fixed Checkbox defaultProps.
e3a456d
@adamkendis
Generic toggleswitch component adhering to Bulma-switch extension sty…
a19c901 
…ling modifiers.
@adamkendis
Added leftLabel and rightLabel to ToggleSwitch props.
e832473
@rgao
Merge remote-tracking branch 'upstream/dev' into dev
976ecc4
Wrote /ingest API endpoint to pull data from Sanic into Postgres DB, …
fd76ed3 
…given a comma-separated list of years as the query parameter.
Removed unnecessary line.
8822681
Added more robust error-handling.
a5e5b35
Better error handling.
04a9964
Fixed typo.'
87f1e05
Fixed lint error.
e90fce9
Removed trailing whitespace lint error.
67cf403
Added quickview
46bed62
@adamkendis
Added id field to props and removed react-id-generator.
49e8403
@ryanmswan
Sanic control point for database ingestion
5b69eeb 
Issue #171
Added colors constant file
f676b98
@rgao
changed connection string to mysql
74e8200
@rgao
fixing merging
362b6b7
@rgao
changed connection string to using mysql in example config, added var…
9702b3b 
…char count to string in Orm, changed docstrings to reference mysql instead of postgres
@rgao
actually added connection string changes to commit this time
937ccc6
ryanmswan and others added 22 commits February 4, 2020 20:29
@ryanmswan
Merge pull request #227 from ryanmswan/dev
92ec984 
Cleaner Object Addition
@brodly
Removed react-sidebar. Imported react-burger-menu
6609f09
@brodly
Added style props
72804d6
@brodly
Added id for menu slide
7b45fc8
@brodly
Renamed footer and header elements
e7949ad
@brodly
Sidebar slides in and out with button toggle
ef8af97
@brodly
Moved menu to its own folder. Added tab interactions
bda73f6
@brodly
Merge branch 'dev' of https://github.com/hackforla/311-data into 225_…
a57ca93 
…sidebar
@adamkendis
Merge pull request #233 from hackforla/225_sidebar
763b7a0 
#225 Implement Sliding Menu/Sidebar
@adamkendis
Dropdown component in progress.
e5c7ff1
@adamkendis
Added react-hooks plugin and rules to eslint.
77054f7
@adamkendis
Dropdown closing on outside click implemented.
4d7ea33
@adamkendis
Dropdown and DropdownItem mostly working.
5c39348
@adamkendis
Comments and code cleanup.
50d3a7f
@adamkendis
Moved DropdownItem component into separate file.
eb22a6e
@adamkendis
Dropdown styles and code cleanup.
84736d5
@adamkendis
Changed default width.
09934f5
@adamkendis
Added checked prop to Checkbox.
e1ecbe2
@adamkendis
Added width prop to Dropdown and DropdownItem.
bacaaa8
@brodly
Merge pull request #243 from adamkendis/166_FRONT_dateFilter
c5652fa 
Issue #166 Dropdown
@sellnat77
Fixes #235 Enforced a frontend linting step to protect PRs
7810808 
Actually running linting

Addressed all linting errors

Removed unused test
@sellnat77
Merge pull request #241 from hackforla/235_FE_linting
323d07e 
Fixes #235 Enforced a frontend linting step to protect PRs
@sellnat77 sellnat77 closed this Feb 12, 2020
@sellnat77 sellnat77 reopened this Feb 12, 2020
@ryanmswan
Merge pull request #245 from hackforla/UpdateDev
ecabb53 
Bringing changes from master into dev
@ryanmswan ryanmswan merged commit 1d1d5c1 into master Feb 12, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ryanmswan ryanmswan ryanmswan approved these changes

@brodly brodly Awaiting requested review from brodly

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
@sellnat77 @ryanmswan @adamkendis @rgao @brodly