-
Notifications
You must be signed in to change notification settings - Fork 2.1k
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
Pablo Joyce chitter challenge #2174
Open
pablisch
wants to merge
80
commits into
makersacademy:main
Choose a base branch
from
pablisch:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+1,939
−53
Open
Changes from 1 commit
Commits
Show all changes
80 commits
Select commit
Hold shift + click to select a range
5ccef5b
chitter plan setup
pablisch 9956e10
limited project setup
pablisch 04ddf5e
Project files setup. Rackup error.
pablisch e4c30e0
app.rb not seeing peep methods. RSpec tests ok
pablisch a9307db
all tests pass. peep & user #s not seen by app.rb
pablisch fb90cd7
setup pages. peep/user #s working. tests pass
pablisch f9417d0
create peep part coded. Test passing
pablisch 6a3a0e4
Added hidden input to add_peep.erb for user_id val
pablisch 60390cf
Working again after anomalous errors
pablisch 5821da3
basic register process working and tested
pablisch 5f73b84
Part way through vaildation. tests passing.
pablisch 3ff7f2b
964a449
Valdiation complete except unique
pablisch 8eda5ca
unique email and username validation and tests
pablisch cca3382
installed bcrypt
pablisch 4d53c3e
Added bcrypt code that has broken tests
pablisch 1144a1a
Edited PWs in seeds tables to hashes. Tests good
pablisch 2897786
reverse bcrypt. some css.
pablisch 5f5a03e
Some small css and index.erb changes
pablisch 0a2a574
Fixed issue of wrong db being used
pablisch fa32980
seeds edit and about to start bcrypt again
pablisch 45dd4d3
bcrypt implemented and working
pablisch 44653c7
Merge pull request #1 from pablisch/bcrypt
pablisch 11fb2be
mostly css changes and erb page layout
pablisch 7e3e7f6
Playing around with time format
pablisch 8f77719
css almost done. tests passing
pablisch 378b67a
updated tables
pablisch 87684c9
setup for deploy
pablisch 9ea5c6f
updated database_connect for Render
pablisch 28e1758
commented out all uses of logged var
pablisch 0047743
deploy unsuccessful. changes reversed.
pablisch c8da0b6
images moved
pablisch dd80942
shortened route paths. Tests all working
pablisch 98178ce
edit logged to session user_id
pablisch 195030b
commented out all instances of settings.logged
pablisch ad1e613
Database connection set to deploy
pablisch dbf2c85
remove p test from peep repo rb
pablisch 6e16997
Removed all logged mentions from app.rb
pablisch 316a1f1
Removed logged from add peep erb
pablisch cc3669b
Removed last 'logged' from index erb
pablisch 54e41ec
indent changes in index.erb
pablisch 0fd6fe2
conditional correction in index.rb
pablisch a45ff71
Removed settings.logged from register & login erb
pablisch 77e969b
replaced Sinatra validation var for session var
pablisch 251ad3d
Edit database connection for deploy
pablisch 0cb10f7
Disposed of settings.message. The last Sinatra var
pablisch b64a3e9
css styling for buttons and input fields
pablisch 4d5e967
Added padding to below error messages
pablisch 2f4c3ce
extra padding for header elements
pablisch 94a3411
15px padding below panel p
pablisch b9954d3
panel p margin 10px
pablisch 53625b8
text box margins
pablisch da5e800
extra margin bottom for text boxes
pablisch 8d7e703
margin left for text boxes
pablisch e2337b2
correct margin for new peep page
pablisch c69b125
adjustment to new peep page margins
pablisch ec5acbe
Added hover colour for nav links
pablisch 4b4646f
button hover colour change
pablisch 4a4c1be
nav h1 hover white
pablisch a58df1d
DB connection set for local view
pablisch 5f57bdf
small css edits to nav
pablisch 3586557
db connect to deploy
pablisch 94a0c34
text input field alignment
pablisch 853d26f
Comment out render deploy database connect code
pablisch 73f3ef2
Fixed test and edits to README
pablisch cbe4f45
More README and chitter_plan updates
pablisch 53e9a3f
Final, for now, README edit
pablisch 3f71018
main README edit
pablisch b0e66c1
Merge branch 'main' into local-server
pablisch 975a2d7
Merge pull request #2 from pablisch/local-server
pablisch 6fde111
Added links and two images to readme
pablisch d054c50
Added images for test and coverage
pablisch 8bad1fb
Format test
pablisch 66ce8d4
Format test
pablisch b93f21f
Format test
pablisch 948055e
Format test
pablisch 755b40a
Format test
pablisch 55f9ca9
Added tech symbols
pablisch 212c657
Changed user emails and passwords
pablisch eb65387
Updated tables and seeds
pablisch File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Added bcrypt code that has broken tests
commit 4d53c3ea9406fc3ffe93047ef8beb93ac18a8413
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Clean and readable CRUD methods