Skip to content

Friendships v1 #441

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

Open
wants to merge 35 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
246c8d9
add linter file and modify readme
verissimohenry May 25, 2021
7237b24
add linters
verissimohenry May 25, 2021
3e30e04
ADD ERD FILE
verissimohenry May 26, 2021
12e1cc6
add gemfile and erd file
verissimohenry May 26, 2021
3cd7419
add linter file
verissimohenry May 26, 2021
d71528a
add linter file
verissimohenry May 26, 2021
a4183be
modify linters and genfile
verissimohenry May 26, 2021
9a04826
add gem file
verissimohenry May 26, 2021
3b41113
add gem files
verissimohenry May 26, 2021
dcfcb24
create migration file and friendship.rb v1
verissimohenry May 27, 2021
739f885
add new erd link and screenshort
verissimohenry May 27, 2021
6251690
fix linter error
verissimohenry May 27, 2021
6e584a6
Merge pull request #1 from verissimohenry/Milestone-1
verissimohenry May 28, 2021
77476e2
modify user model
verissimohenry May 28, 2021
c9ac256
modify user model
verissimohenry May 28, 2021
aaa27eb
Merge branch 'development' into Friendships-v1
verissimohenry May 28, 2021
83e67c0
modify friendship.rb model
verissimohenry May 28, 2021
1685ebf
Merge branch 'Friendships-v1' of github.com:verissimohenry/Stay-in-To…
verissimohenry May 28, 2021
9f609b4
modify user id model and add foreign key
verissimohenry May 28, 2021
a45a304
add rails helper spec
verissimohenry May 31, 2021
9856141
add gem file,and generate spec friendship
verissimohenry May 31, 2021
9371d71
add frinshipcontroller, modify index html erb and route file
verissimohenry May 31, 2021
6cd0aa8
add frinships.coffee file
verissimohenry May 31, 2021
6c71e87
modify friendship rb file
verissimohenry May 31, 2021
caf2f7b
add rspec for friendship and user modfy files
verissimohenry May 31, 2021
d391a17
add style files
verissimohenry Jun 1, 2021
60f8efe
modify contriller file
verissimohenry Jun 1, 2021
972927a
modify helper file
verissimohenry Jun 1, 2021
6aca35f
modify view folder
verissimohenry Jun 1, 2021
d2a53b6
modify routes file
verissimohenry Jun 1, 2021
2f65463
modify controller folder
verissimohenry Jun 1, 2021
0a5352e
fix linter errors
verissimohenry Jun 1, 2021
4ecc05f
fix linter error
verissimohenry Jun 1, 2021
d81baba
modify app
verissimohenry Aug 11, 2023
a760627
modify app
verissimohenry Aug 11, 2023
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
4 changes: 2 additions & 2 deletions .github/workflows/linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: "12.x"
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
[ -f .stylelintrc.json ] || wget https://raw.githubusercontent.com/microverseinc/linters-config/master/ror/.stylelintrc.json
- name: Stylelint Report
run: npx stylelint "**/*.{css,scss}"
run: npx stylelint "**/*.{css,scss}"
24 changes: 12 additions & 12 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
AllCops:
Exclude:
- "db/**/*"
- "bin/*"
- "config/**/*"
- "Guardfile"
- "Rakefile"
- "node_modules/**/*"
- 'db/**/*'
- 'bin/*'
- 'config/**/*'
- 'Guardfile'
- 'Rakefile'
- 'node_modules/**/*'

DisplayCopNames: true

Layout/LineLength:
Max: 120
Metrics/MethodLength:
Include:
- "app/controllers/*"
- "app/models/*"
- 'app/controllers/*'
- 'app/models/*'
Max: 20
Metrics/AbcSize:
Include:
- "app/controllers/*"
- "app/models/*"
- 'app/controllers/*'
- 'app/models/*'
Max: 50
Metrics/ClassLength:
Max: 150
Metrics/BlockLength:
ExcludedMethods: ["describe"]
ExcludedMethods: ['describe']
Max: 30

Style/Documentation:
Expand Down Expand Up @@ -56,4 +56,4 @@ Style/HashEachMethods:
Style/HashTransformKeys:
Enabled: false
Style/HashTransformValues:
Enabled: false
Enabled: false
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.0
3.2.1
8 changes: 4 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.7.0'
ruby '3.2.1'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.2.4'
gem 'rails', '~> 5.2.5'
# Use postgresql as the database for Active Record
gem 'pg', '>= 0.18', '< 2.0'
gem 'pg', '~> 1.5', '>= 1.5.3'
# Use Puma as the app server
gem 'puma', '~> 3.12'
# Use SCSS for stylesheets
Expand Down Expand Up @@ -45,7 +45,7 @@ group :development, :test do
end

group :test do
gem 'rspec'
gem 'rspec-rails'
end

group :development do
Expand Down
Loading