Skip to content
This repository has been archived by the owner on Sep 8, 2021. It is now read-only.

Register middle ware #124

Open
wants to merge 203 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
203 commits
Select commit Hold shift + click to select a range
43f6de4
amended API_ROOT to disable https on the back-end
Oct 4, 2018
9184f79
added logout button to header
Oct 4, 2018
a1a11ed
removed tags tab from index
Oct 4, 2018
b77dbc6
replaced placedholder text with labels on Settings page
Oct 5, 2018
b14685e
Merge pull request #3 from wesdollar/master-no-https
Oct 5, 2018
c643c75
remove-profile-images
Oct 5, 2018
984ef10
Merge branch 'master' into placeholder-text
Oct 5, 2018
5b8dc7a
added id attributes to input fields and for attributes to correspondi…
Oct 5, 2018
e43ca0f
Merge pull request #4 from wesdollar/placeholder-text
Oct 5, 2018
339c8a3
Merge branch 'remove-profile-images' of https://github.com/wesdollar/…
Oct 5, 2018
51461a1
resolve conflict with remove-profile-images
Oct 5, 2018
df9a895
resolve conflict with remove-profile-images
Oct 5, 2018
029fca3
add auth service
Oct 5, 2018
ed30598
add auth service
Oct 5, 2018
9024a8d
created simple custom login service
Oct 6, 2018
a26afaf
pulled in error reporting
Oct 8, 2018
fc84df0
tmp commit
Oct 8, 2018
77ca930
added htmlFor to labels
Oct 8, 2018
72470b9
Merge pull request #5 from wesdollar/remove-profile-images
Oct 8, 2018
781def4
Merge pull request #2 from wesdollar/remove-popular-tags
Oct 8, 2018
58523dd
Merge pull request #1 from wesdollar/sticky-logout-button
Oct 8, 2018
bf98aac
added first and last name fields
Oct 8, 2018
cfc7a8d
updated RegEx to only allow alphabetical characters
Oct 8, 2018
0e50a00
Merge pull request #6 from wesdollar/placeholder-text
Oct 8, 2018
1f58377
refined RegEx to exclude space
Oct 8, 2018
c363f4d
resolved merge conflicts
Oct 8, 2018
448bbe1
converted regular expression to split for efficiency
Oct 8, 2018
5e292ef
clean after merge
Oct 8, 2018
2afc74a
fixed formatting
Oct 8, 2018
a6e505d
Merge pull request #8 from wesdollar/gut-login-service
Oct 8, 2018
52cc47f
converted Editor to use state
Oct 8, 2018
0f14d26
converted to shorthand
Oct 8, 2018
7ed52ea
Merge branch 'master' of https://github.com/wesdollar/react-redux-rea…
Oct 8, 2018
b2d8b04
Corrected names and destructured state variables
Oct 9, 2018
a9a9278
tmp commit
Oct 9, 2018
47378c4
converted filter method to splice
Oct 9, 2018
3a3c902
adding untracked files
Oct 9, 2018
0e0a3d4
remove bad key
Oct 9, 2018
91c5689
removed unused props and connect
Oct 9, 2018
c8ee8da
added unique key
Oct 9, 2018
236bbb4
Rigged Editor.js to submit article through SubmitArticle.js to custom…
Oct 9, 2018
b78f4e1
cleaned up Editor
Oct 10, 2018
f32ac36
added dropdown for article types, functionality and design for snippets
Oct 10, 2018
ed54e2b
added tracking for stylesheet
Oct 10, 2018
25fd207
simple addition of snippets
Oct 10, 2018
c8a6b83
staging latest changes
Oct 11, 2018
5cb615d
switching branches
Oct 12, 2018
7911550
installed immutability-helper
Oct 12, 2018
fcf3da9
completed validation on Register
Oct 12, 2018
2436949
installed immutability-helper
Oct 12, 2018
479b4f9
properly added enzyme
charliew-rsi Oct 15, 2018
c405979
blah
charliew-rsi Oct 15, 2018
4dc402a
resolved conflict in package-lock with immutability-helper
charliew-rsi Oct 15, 2018
91903cc
implemented Jest commands
charliew-rsi Oct 15, 2018
ee56d3b
corrected package installation locally
Oct 15, 2018
9218006
corrected regular expressions
Oct 15, 2018
2062fa9
finished unit tests
Oct 15, 2018
6a9ab3a
reomved extraneous statement
Oct 15, 2018
58be096
initializes view count to zero when article is created
Oct 15, 2018
6f3cd68
resolved merge conflict with submit-post-error-handling
Oct 15, 2018
67f7906
added skeleton service functions for fetchArticles and getArticleCount
Oct 15, 2018
3d20366
tmp commit
Oct 16, 2018
419f04a
added html, css and agent stub for view counter
Oct 16, 2018
c72abc3
corrected issue with incorrect email/password crashes
Oct 16, 2018
afc7023
Merge branch 'gut-login-service' of https://github.com/wesdollar/reac…
Oct 16, 2018
761c180
Merge branch 'submit-article-middle-ware' of https://github.com/wesdo…
Oct 16, 2018
63da383
merged article-options-dropdown
Oct 16, 2018
39933e2
removed console.log()
Oct 16, 2018
8085b9b
removed unused click function, added blank line to file
Oct 16, 2018
3851fef
tmp commit
Oct 17, 2018
3d4eade
wrote new pseudo-code in article.js to describe new tasks
Oct 17, 2018
0411424
tmp commit
Oct 17, 2018
2e86f16
added functionality article service
Oct 17, 2018
f78fe79
add functionality to article service
Oct 17, 2018
876b528
tmp commit
Oct 17, 2018
74ed78a
Merge pull request #14 from wesdollar/install-immutability-helper
Oct 17, 2018
edbbdc6
added additional logic to article service
Oct 17, 2018
4cf18c7
re-installed prettier to handle package-lock conflicts
Oct 17, 2018
e12f9b4
resolved merge conflicts
Oct 17, 2018
cd89464
Merge pull request #7 from wesdollar/split-name-input
Oct 17, 2018
fb6b100
moved article service to corect folder
Oct 17, 2018
4d4f456
added new lines
Oct 17, 2018
b32b5f3
tracking moved file
Oct 17, 2018
c24000b
css shorthand, optimized isDisabled
Oct 17, 2018
78e3ee4
Merge branch 'master' of https://github.com/wesdollar/react-redux-rea…
Oct 18, 2018
e1c1c2b
Merge pull request #21 from wesdollar/install-prettier
Oct 18, 2018
053dead
fixed indent
Oct 18, 2018
7f52399
Merge pull request #18 from wesdollar/gut-login-service
Oct 18, 2018
ddc045c
Merge pull request #17 from wesdollar/view-counter
Oct 18, 2018
fa99d9b
re-installed enzyme
Oct 18, 2018
4e307b7
installed eslint
Oct 18, 2018
532968b
Merge pull request #22 from wesdollar/install-eslint
Oct 18, 2018
7bf7f32
prettier formatting
Oct 18, 2018
02868f1
pulled package and package-lock from master
Oct 18, 2018
6236627
caught up with master
Oct 18, 2018
d1040c2
resolved conflicts with master
Oct 18, 2018
411bd90
Merge branch 'master' of https://github.com/wesdollar/react-redux-rea…
Oct 18, 2018
48ed17d
merged article-options-dropdown, master
Oct 18, 2018
205777e
tmp commit
Oct 18, 2018
c864d8e
added dynamic functions
Oct 18, 2018
bccd5dd
Merge branch 'create-article-form' of https://github.com/wesdollar/re…
Oct 19, 2018
fda2418
cleaned up register
Oct 19, 2018
7bb9030
converted patterns to helper
Oct 19, 2018
99be044
re-installed unit testing packages
Oct 19, 2018
8771971
refactored unit test to match new state schema
Oct 19, 2018
a9eb651
added some html and css, started middle-ware
Oct 19, 2018
39c1ec6
tmp commit
Oct 19, 2018
388381a
tmp commit
Oct 19, 2018
3399c78
added explicit event argument to onClick events
Oct 19, 2018
9f92a53
changed red value to hex value
Oct 19, 2018
d004279
modified some unit tests
Oct 19, 2018
b9775d2
pulled from somewhere
charliew-rsi Oct 20, 2018
44b182c
resolved merge conflicts
charliew-rsi Oct 20, 2018
49a502a
added coverage, resolved pr comments, switching machines to test in b…
charliew-rsi Oct 21, 2018
94683b9
Merge pull request #23 from wesdollar/register-submit-article
Oct 22, 2018
5c8b748
resolved merge conflicts
Oct 22, 2018
802184d
added functionality for toggling filter state
Oct 22, 2018
2dc43c1
added middle-ware, began displaying individual article
Oct 22, 2018
55f5a73
tmp commit
Oct 23, 2018
7bc6dde
Added style, removed redundant code
Oct 23, 2018
38ff7c4
added untracked file
Oct 23, 2018
1b1add4
displayed the article itself
Oct 23, 2018
9674abb
added SearchBar component and middle-ware
Oct 24, 2018
a0f8987
converted wrapper to React.Fragment
Oct 24, 2018
40fdb8d
Merge pull request #24 from wesdollar/filter-by-tag
Oct 24, 2018
0a63a9f
resolved PR comments
Oct 24, 2018
8ccb4db
resolved merge conflicts
Oct 24, 2018
818db54
resolved merge conflicts
Oct 24, 2018
b515b30
tmp commit
Oct 24, 2018
d2aae30
resolved PR comments
Oct 24, 2018
15f5489
Merge pull request #25 from wesdollar/fetch-articles-middle-ware
Oct 24, 2018
fb6e85f
added validation
Oct 24, 2018
0d9f4bf
applied styling to searchbar
Oct 25, 2018
d120483
resolved merge conflicts
Oct 25, 2018
38493e3
tmp commit
Oct 25, 2018
25a1d4f
resolved merge conflicts
Oct 25, 2018
bcec297
updated styling
Oct 25, 2018
a4c68b7
rigged articles load custom back-end to store
Oct 25, 2018
92e467e
corrected quotes logic
Oct 25, 2018
9987124
removed console.log's and other code smells
Oct 25, 2018
e1531d8
removed redundant action
Oct 25, 2018
97af8c0
switching to new branch for unit testing
Oct 25, 2018
ee9253e
initial commit
Oct 25, 2018
0b266f2
code smell
Oct 25, 2018
0f1f624
converted input to button
Oct 25, 2018
f0f0646
corrected issue with button'
Oct 25, 2018
1124a86
fixed error on no tags
Oct 26, 2018
d9bd2cc
improved styling on ArticleList
Oct 26, 2018
48bf5f9
moved tags to store
Oct 26, 2018
d55f46b
tmp commit
Oct 26, 2018
36fd3d2
added untracked file
Oct 26, 2018
280fe82
resolved PR comments
charliew-rsi Oct 27, 2018
e079f68
tmp commit
Oct 29, 2018
d7312c5
changed color of header on Article Preview
Oct 29, 2018
5e00032
fixed broken header after login
Oct 29, 2018
8ae2cee
corrected style fixes
Oct 29, 2018
e53f70f
text overflow on snippets
Oct 29, 2018
28ce9e3
added styling for filter buttons, props
Oct 29, 2018
c2fe056
added styling for filter buttons, props
Oct 29, 2018
ee0fc28
enabled filtering functionality
Oct 29, 2018
1679523
added article type to article preview
Oct 29, 2018
7733edf
corrected checkTag action, MainView filter
Oct 29, 2018
b73ed59
resolved merge conflicts
Oct 29, 2018
cf31e5a
added service that increments views
charliew-rsi Oct 29, 2018
a2bb979
tmp commit
charliew-rsi Oct 29, 2018
3621245
saving index
Oct 30, 2018
76f8f82
re-factored pagination to work with new back-end, changed range to 5 …
Oct 30, 2018
4d07a03
Merge pull request #27 from wesdollar/article-list-styling
Oct 30, 2018
ffebf3b
removed code smells
Oct 30, 2018
62998ad
resoled merge conflicts
Oct 30, 2018
67facba
Merge branch 'view-counter-middle-ware' of https://github.com/wesdoll…
Oct 30, 2018
845c360
resolved code smells
Oct 30, 2018
1ee9539
saved new changes
Oct 30, 2018
c4fab5b
resolved merge conflicts
Oct 30, 2018
703269b
resolved merge conflicts
Oct 30, 2018
6f0087a
resolved merge conflicts
Oct 30, 2018
0565eed
Merge pull request #28 from wesdollar/style-fixes
charliew-rsi Oct 30, 2018
faffa84
Merge pull request #29 from wesdollar/type-filter-pill
charliew-rsi Oct 30, 2018
65097ed
resolved merge conflicts
Oct 30, 2018
0a7bf06
resolved PR comments
Oct 30, 2018
d98ede6
converted to react.fragment
Oct 30, 2018
71ffbc0
Merge pull request #30 from wesdollar/filter-by-tag-2
charliew-rsi Oct 30, 2018
a53fc51
resolved merge conflicts
Oct 30, 2018
8fe72df
destructured props
Oct 30, 2018
452bec9
tmp commit
Oct 30, 2018
5036a77
corrected code smell
Oct 30, 2018
39966fc
Merge pull request #31 from wesdollar/view-counter-middle-ware
charliew-rsi Oct 30, 2018
4601c1a
tmp commit
Oct 30, 2018
b30ef9a
resolved merge bug
Oct 30, 2018
7e45524
Merge pull request #32 from wesdollar/pagination
charliew-rsi Oct 30, 2018
2cf0c01
resolved issue with crash on no server connection
Oct 30, 2018
8aa64c6
Merge branch 'register-middle-ware' of https://github.com/wesdollar/r…
Oct 30, 2018
74a71dd
added missing type, set default 0 views
Oct 30, 2018
970af19
finished rigging front-end
Oct 30, 2018
a4cc4d7
Merge branch 'type-hotfix' of https://github.com/wesdollar/react-redu…
Oct 31, 2018
03aef17
Merge branch 'articles-hotfix' of https://github.com/wesdollar/react-…
Oct 31, 2018
598935a
tmp commit
Oct 31, 2018
d42ac22
Merge pull request #33 from wesdollar/articles-hotfix
Oct 31, 2018
1ddd53d
Merge pull request #34 from wesdollar/type-hotfix
Oct 31, 2018
7bb97a0
Merge branch 'master' of https://github.com/wesdollar/react-redux-rea…
Oct 31, 2018
02ddec3
tmp commit
Oct 31, 2018
d4da119
tmp commit
Oct 31, 2018
4b266f5
rigged register to work with back-end
Oct 31, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"presets": ["es2015", "react"]
}
3 changes: 3 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module.exports = {
extends: "airbnb"
};
Loading