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.

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

Bootstrap #1322

Open
wants to merge 50 commits into
base: main
Choose a base branch
from
Open
Changes from 2 commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
e19ecb5
Set up complete
Beckyrose200 Nov 22, 2021
84b6fff
Test for likes
Beckyrose200 Nov 24, 2021
a569b20
devise login
NenehB Nov 24, 2021
e068843
added signout function and change database
NenehB Nov 24, 2021
df4c849
Merge pull request #1 from NenehB/user_sign_in
Beckyrose200 Nov 24, 2021
86801ef
sign function added
NenehB Nov 24, 2021
c1a1857
24.11.21 changes made by Marc
mbrosch3-ford Nov 24, 2021
9d937c8
login details set as home root
NenehB Nov 24, 2021
eb4341a
Trying to get button to work
Beckyrose200 Nov 25, 2021
c34d8a9
Like Button Working
Beckyrose200 Nov 25, 2021
ef8a5f5
Merge branch 'master' into creating_likes
RJ21BL Nov 25, 2021
76c953a
Merge pull request #2 from NenehB/creating_likes
RJ21BL Nov 25, 2021
2420020
User login complete
NenehB Nov 25, 2021
81eeb39
Merge branch 'master' into users
RJ21BL Nov 26, 2021
ee65c38
Merge pull request #3 from NenehB/users
RJ21BL Nov 26, 2021
f67dc0a
Posts in descending order
mbrosch3-ford Nov 26, 2021
31f2cfe
User can like a post - Test implemented
mbrosch3-ford Nov 26, 2021
4cbc9b6
Solved testing for post to be in desc order
mbrosch3-ford Nov 26, 2021
b055066
Changed db migration to remove a duplicate column
Beckyrose200 Nov 26, 2021
141070a
New table for comments
Beckyrose200 Nov 26, 2021
645f68b
User log in feature test
RJ21BL Nov 26, 2021
213f580
Adding styling
Beckyrose200 Nov 26, 2021
eb0a6c5
WIP comments featrue
mbrosch3-ford Nov 29, 2021
bb71beb
wip user can submit a comment
mbrosch3-ford Nov 29, 2021
34b6a88
Added comments onto main timeline
Beckyrose200 Nov 29, 2021
87147eb
Comments working
Beckyrose200 Nov 29, 2021
7e3cbca
Added some CSS for the comments
Beckyrose200 Nov 29, 2021
a186061
Merge pull request #4 from NenehB/user_feature_test
RJ21BL Nov 30, 2021
3a78772
personal details incomplete
NenehB Nov 30, 2021
09d5de0
removed p
Beckyrose200 Nov 30, 2021
f2e69f1
Posts/comments tests passing
mbrosch3-ford Nov 30, 2021
1ffb740
Post/comments test passing
mbrosch3-ford Nov 30, 2021
a0c308f
Merge branch 'master' into adding_comments
Beckyrose200 Nov 30, 2021
9f2b5f9
Merge pull request #5 from NenehB/adding_comments
Beckyrose200 Nov 30, 2021
1deb20a
Dates displaying
Beckyrose200 Nov 30, 2021
509bcf2
Merge branch 'master' into personal_details
NenehB Nov 30, 2021
e65ac58
Merge pull request #6 from NenehB/personal_details
NenehB Nov 30, 2021
fc3fbe7
name of user who made comment
NenehB Nov 30, 2021
5ec52f2
Removed P
Beckyrose200 Nov 30, 2021
968a894
Search function working
Beckyrose200 Nov 30, 2021
27e8587
Comments show the proper username
mbrosch3-ford Dec 1, 2021
13f2c0e
Styling added for more then 1 user
Beckyrose200 Dec 1, 2021
6251bc7
Sorted out case sensitivity for the search results
Beckyrose200 Dec 1, 2021
bee634a
Added styling to the search bar and removed redundant search bar
Beckyrose200 Dec 1, 2021
fdd2190
All bugs fixed
Beckyrose200 Dec 1, 2021
f156994
All features working
Beckyrose200 Dec 1, 2021
9c303d2
All tests passing for search function
Beckyrose200 Dec 1, 2021
f9df0ce
Merge pull request #7 from NenehB/search_bar
mbrosch3-ford Dec 1, 2021
e0bbbb9
Bootstrap
NenehB Dec 1, 2021
d0d2781
Merge branch 'master' into bootstrap
Beckyrose200 Dec 1, 2021
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
14 changes: 8 additions & 6 deletions app/models/user_sign_in.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
class UserSignIn < ApplicationRecord
# Include default devise modules. Others available are:
# :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
devise :database_authenticatable, :registerable,
:recoverable, :rememberable, :validatable
end
# class UserSignIn < ApplicationRecord
# # Include default devise modules. Others available are:
# # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
# devise :database_authenticatable, :registerable,
# :recoverable, :rememberable, :validatable
# end

#file not in use
10 changes: 9 additions & 1 deletion db/schema.rb
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.

ActiveRecord::Schema.define(version: 2021_11_25_123227) do
ActiveRecord::Schema.define(version: 2021_11_25_153348) do

# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -22,6 +22,14 @@
t.integer "likes"
end

create_table "user_log_ins", force: :cascade do |t|
t.string "email", null: false
t.string "password_digest"
t.datetime "created_at", precision: 6, null: false
t.datetime "updated_at", precision: 6, null: false
t.string "name"
end

create_table "user_sign_ins", force: :cascade do |t|
t.string "email", default: "", null: false
t.string "encrypted_password", default: "", null: false
2 changes: 1 addition & 1 deletion spec/features/user_can_submit_posts_spec.rb
Original file line number Diff line number Diff line change
@@ -16,5 +16,5 @@
click_button "Submit"
click_button ("Hello, world!")
expect(page).to have_content("1 Like")
end
end
end
10 changes: 10 additions & 0 deletions spec/features/user_log_in_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
require 'rails_helper'
RSpec.feature 'Login', type: :feature do
scenario "A user can log in" do
visit '/login'
click_link 'Log In'
fill_in 'Email', with: ''
click_link 'Sign Up'
expect(page).to have_content'Log In'
end
end
6 changes: 0 additions & 6 deletions spec/features/user_login_spec.rb

This file was deleted.

2 changes: 2 additions & 0 deletions spec/rails_helper.rb
Original file line number Diff line number Diff line change
@@ -55,3 +55,5 @@
# arbitrary gems may also be filtered via:
# config.filter_gems_from_backtrace("gem name")
end