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

Milestone 1 #390

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
70f38b0
Update ruby version
DanSam5K Jun 20, 2021
f068075
Add docs file containining ERD db img design
DanSam5K Jun 21, 2021
64dbfd9
Install gems dependencies, boostrap, devise, pg
DanSam5K Jun 24, 2021
d980d52
Configure app with the appropriate gem
DanSam5K Jun 24, 2021
6ed7b0a
Create and migrate db schema
DanSam5K Jun 24, 2021
89f8bc1
Generate friendship model and migrate to db
DanSam5K Jun 24, 2021
1c4d8a3
Create has_many in user belong-to in friendship record
DanSam5K Jun 24, 2021
710cf35
Create a friends method in User model
DanSam5K Jun 25, 2021
cf1c2a9
Add pending freind request and friend request methods
DanSam5K Jun 25, 2021
5ea654b
Create friend confirmation methods
DanSam5K Jun 25, 2021
af8bb13
Update rubocop gem and Fix linters errors
DanSam5K Jun 25, 2021
e0bbe8e
Fix linter issues
DanSam5K Jun 25, 2021
43794de
Add github workflow folder
DanSam5K Jun 25, 2021
70492d9
Implement action allow User invite freind request
DanSam5K Jul 1, 2021
538242a
Implement action allow User accept Freind request
DanSam5K Jul 1, 2021
2c2939a
Implement action allow User declined or reject Friend request
DanSam5K Jul 1, 2021
dee5bc4
Modify active record between user and friendship
DanSam5K Jul 1, 2021
8ca70da
Modify postview & Add button for friendship action for userview
DanSam5K Jul 1, 2021
4f10d01
Set-up gem and install RSpec and Capybara
DanSam5K Jul 1, 2021
94566c5
Add users unit and integration tests with minor fixes
DanSam5K Jul 1, 2021
b162375
Add unit & integration test for friendship
DanSam5K Jul 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
6 changes: 3 additions & 3 deletions .github/workflows/linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-ruby@v1
with:
ruby-version: 2.6.x
ruby-version: 3.0.x
- name: Setup Rubocop
run: |
gem install --no-document rubocop:'~>0.81.0' # https://docs.rubocop.org/en/stable/installation/
gem install --no-document rubocop -v '>= 1.0, < 2.0' # https://docs.rubocop.org/en/stable/installation/
[ -f .rubocop.yml ] || wget https://raw.githubusercontent.com/microverseinc/linters-config/master/ror/.rubocop.yml
- name: Rubocop Report
run: rubocop --color
Expand All @@ -30,7 +30,7 @@ jobs:
node-version: "12.x"
- name: Setup Stylelint
run: |
npm install --save-dev stylelint@13.3.x stylelint-scss@3.17.x stylelint-config-standard@20.0.x stylelint-csstree-validator
npm install --save-dev [email protected] [email protected] stylelint-config-standard@21.x stylelint-csstree-validator@1.x
[ -f .stylelintrc.json ] || wget https://raw.githubusercontent.com/microverseinc/linters-config/master/ror/.stylelintrc.json
- name: Stylelint Report
run: npx stylelint "**/*.{css,scss}"
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,11 @@

/node_modules
/yarn-error.log
/Gemfile.lock

/public/assets
.byebug_history

# Ignore master key for decrypting credentials and more.
/config/master.key

5 changes: 3 additions & 2 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
AllCops:
NewCops: enable
Exclude:
- "db/**/*"
- "bin/*"
- "bin/*"
- "config/**/*"
- "Guardfile"
- "Rakefile"
Expand All @@ -24,7 +25,7 @@ Metrics/AbcSize:
Metrics/ClassLength:
Max: 150
Metrics/BlockLength:
ExcludedMethods: ["describe"]
IgnoredMethods: ['describe']
Max: 30

Style/Documentation:
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.0
3.0.1
8 changes: 1 addition & 7 deletions .stylelintrc.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,10 @@

{
"extends": ["stylelint-config-standard"],
"plugins": ["stylelint-scss", "stylelint-csstree-validator"],
"rules": {
"at-rule-no-unknown": null,
"scss/at-rule-no-unknown": true,
"csstree/validator":
{
"properties": {
"width": "| fit-content"
}
}
"csstree/validator": true
},
"ignoreFiles": ["build/**", "dist/**", "**/reset*.css", "**/bootstrap*.css"]
}
32 changes: 26 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,25 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.7.0'
# ruby '2.7.0'
ruby '3.0.1'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.2.4'
gem 'rails', '~> 6.1.3', '>= 6.1.3.2'
# Use postgresql as the database for Active Record
gem 'pg', '>= 0.18', '< 2.0'
group :development, :test do
gem 'sqlite3'
end

group :production do
gem 'pg'
end

# Use Puma as the app server
gem 'puma', '~> 3.12'
gem 'puma', '~> 5.0'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
gem 'bootstrap', '~> 4.0'
gem 'sass-rails', '>= 6'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
# See https://github.com/rails/execjs#readme for more supported runtimes
Expand All @@ -21,7 +30,7 @@ gem 'coffee-rails', '~> 4.2'
# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
gem 'turbolinks', '~> 5'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.5'
gem 'jbuilder', '~> 2.7'
# Use Redis adapter to run Action Cable in production
# gem 'redis', '~> 4.0'
# Use ActiveModel has_secure_password
Expand All @@ -48,6 +57,17 @@ group :test do
gem 'rspec'
end

group :development, :test do
# The RSpec testing framework
gem 'rspec-rails'
# Capybara, the library that allows us to interact with the browser using Ruby
gem 'capybara'
# The following gems aids with the nuts and bolts
# of interacting with the browser.
gem 'webdrivers'
end


group :development do
# Access an interactive console on exception pages or by calling 'console' anywhere in the code.
gem 'listen', '>= 3.0.5', '< 3.2'
Expand Down
Loading