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

Move all Docker Parts into docker-rails-dev project #137

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
137 commits
Select commit Hold shift + click to select a range
67331d9
add postgres to docker-compose
chaoticbear Sep 29, 2017
cfa775c
ignore posgres db directory
chaoticbear Sep 29, 2017
c7e1ba2
build path comment for dev of rails image
chaoticbear Sep 29, 2017
6ecacc0
Bump byebug from 9.1.0 to 10.0.0
dependabot-support Jan 29, 2018
1683592
docker-compose WIP
chaoticbear Feb 2, 2018
590e418
moved env variables to .env.local
chaoticbear Feb 2, 2018
123030f
Merge branch 'master' of github.com:renocollective/member-portal into…
chaoticbear Feb 2, 2018
c2cc171
fix from previous conflict merge
chaoticbear Feb 2, 2018
623b206
fixes to docker-compose setup, env file formatting, latest postgres, …
chaoticbear Feb 2, 2018
13b15e9
Moved all docker related stuff to the member-portal-docker project
chaoticbear Feb 2, 2018
85612c5
docker readme updates
chaoticbear Feb 2, 2018
2411dd9
Merge pull request #133 from renocollective/dependabot/bundler/byebug…
colinloretz Feb 4, 2018
9dac55c
Bump uglifier from 3.2.0 to 4.1.5
dependabot-support Feb 4, 2018
f53bce6
Merge pull request #132 from renocollective/dependabot/bundler/uglifi…
colinloretz Feb 4, 2018
89d9c87
Bump puma from 3.11.0 to 3.11.2
dependabot-support Feb 4, 2018
ec9895e
Merge pull request #130 from renocollective/dependabot/bundler/puma-3…
colinloretz Feb 4, 2018
540b989
Bump license_finder from 4.0.2 to 5.0.0
dependabot-support Feb 4, 2018
b8125cb
Merge pull request #128 from renocollective/dependabot/bundler/licens…
colinloretz Feb 4, 2018
2f1af32
Bump turbolinks from 5.0.1 to 5.1.0
dependabot-support Feb 4, 2018
68ab55e
Merge pull request #126 from renocollective/dependabot/bundler/turbol…
colinloretz Feb 4, 2018
651cb25
Bump capybara from 2.16.1 to 2.17.0
dependabot-support Feb 4, 2018
8374afd
Merge pull request #124 from renocollective/dependabot/bundler/capyba…
colinloretz Feb 4, 2018
55e9bc5
Bump carrierwave from 1.2.1 to 1.2.2
dependabot-support Feb 4, 2018
ff4fd8a
Merge pull request #123 from renocollective/dependabot/bundler/carrie…
colinloretz Feb 4, 2018
433fc37
Bump rubocop from 0.51.0 to 0.52.1
dependabot-support Feb 4, 2018
43ef89d
Merge pull request #119 from renocollective/dependabot/bundler/ruboco…
colinloretz Feb 4, 2018
b16c753
Bump faker from 1.8.4 to 1.8.7
dependabot-support Feb 4, 2018
3d29d44
Merge pull request #118 from renocollective/dependabot/bundler/faker-…
colinloretz Feb 4, 2018
4acbf5f
chore(dependencies): Bump selenium-webdriver from 3.7.0 to 3.8.0
dependabot-support Feb 4, 2018
4e2c824
Merge pull request #111 from renocollective/dependabot/bundler/seleni…
colinloretz Feb 4, 2018
8aef1de
Added devise
BrendaPenn Sep 25, 2017
904b985
Edited validates on new member fields
BrendaPenn Sep 29, 2017
15daa33
Reconcile change from #98
phlipper Dec 6, 2017
5d0c759
Added devise
BrendaPenn Sep 25, 2017
0a8e8ff
Modified member controller tests
Oct 13, 2017
ed1e8fb
Rubocop changes
BrendaPenn Nov 10, 2017
ccc0871
Reconcile Phil's rebase
BrendaPenn Dec 6, 2017
01c9df5
Add logout link to member page
BrendaPenn Jan 24, 2018
048a3d2
Add confirmable to devise
BrendaPenn Jan 29, 2018
89d2ab0
Modify mailer and tests for confirmation
BrendaPenn Jan 29, 2018
06b3a3f
Change after confirmation path
BrendaPenn Jan 29, 2018
ff69656
Allow unconfirmed access for new user
BrendaPenn Jan 31, 2018
fde24f3
Gemfile.lock
BrendaPenn Feb 5, 2018
70cc49b
Merge pull request #98 from BrendaPenn/DeviseLogin
BrendaPenn Feb 5, 2018
dda4d71
Add bootstrap gem
BrendaPenn Feb 5, 2018
d3e464e
Add jquery-rails gem
BrendaPenn Feb 5, 2018
67bf1ff
devise_invitable fix migration version issue
chaoticbear Feb 6, 2018
95540a5
Merge pull request #139 from BrendaPenn/add_bootstrap
Feb 6, 2018
dc04941
Bump devise from 4.3.0 to 4.4.1
dependabot-support Feb 6, 2018
a7e3bc9
Merge branch 'master' of github.com:renocollective/member-portal
chaoticbear Feb 6, 2018
5b15dcd
setup of bootstrap header nav.
chaoticbear Feb 7, 2018
2547214
removed unrelated migration.
chaoticbear Feb 7, 2018
0c1a98d
Add fields to member model, Add fields to edit member form, Add field…
chaoticbear Feb 7, 2018
5ebc5f2
made logic less complex for current member check
chaoticbear Feb 7, 2018
39b72ef
made logic for current member check less complex.
chaoticbear Feb 7, 2018
07db782
Shortened lines to pass travis CI
chaoticbear Feb 7, 2018
86edf01
Merge pull request #143 from renocollective/dependabot/bundler/devise…
colinloretz Feb 7, 2018
1c79dd4
Bump selenium-webdriver from 3.8.0 to 3.9.0
dependabot-support Feb 7, 2018
a4c70ed
Merge pull request #142 from renocollective/dependabot/bundler/seleni…
colinloretz Feb 7, 2018
ae5df84
Bump license_finder from 5.0.0 to 5.0.2
dependabot-support Feb 7, 2018
03c56e7
Merge pull request #146 from renocollective/dependabot/bundler/licens…
colinloretz Feb 7, 2018
d859121
Add setup and installation instructions to readme file
BrendaPenn Feb 7, 2018
5fa5f39
Merge branch 'master' into edit_readme
BrendaPenn Feb 7, 2018
25a69a2
Merge pull request #147 from BrendaPenn/edit_readme
BrendaPenn Feb 7, 2018
c475379
Add and edit documentation on contributing
BrendaPenn Feb 7, 2018
7ae02a8
Merge pull request #148 from BrendaPenn/add_contributing_doc
BrendaPenn Feb 7, 2018
e0342b8
Add pull request and issue template
BrendaPenn Feb 7, 2018
2dae644
Merge branch 'master' into add_pr_template
BrendaPenn Feb 7, 2018
ef9f8f2
Added log level config options for testing.
chaoticbear Feb 7, 2018
4a71ad8
Changed update member test to check for response success not redirect.
chaoticbear Feb 7, 2018
6f2bad0
Merge branch 'master' into jfleming/member-profile-fields
Feb 7, 2018
6aab535
switched strings to single quotes for Rubocop.
chaoticbear Feb 7, 2018
d77d224
Merge branch 'jfleming/member-profile-fields' of github.com:revoltmed…
chaoticbear Feb 7, 2018
5911299
Merge branch 'jfleming/member-profile-fields' of github.com:revoltmed…
chaoticbear Feb 7, 2018
ccaa375
Add mocha gem for test stubbing
veronicacannon Dec 29, 2017
5a7c140
Merge pull request #121 from renocollective/add_mocha
veronicacannon Feb 8, 2018
724a4e9
Merge branch 'master' into jfleming/member-profile-fields
Feb 8, 2018
71947c5
Merge branch 'master' into jfleming/bootstrap-nav
Feb 8, 2018
2e04871
Merge pull request #145 from revoltmedia/jfleming/member-profile-fields
Feb 8, 2018
a31a3c1
Merge branch 'master' into jfleming/bootstrap-nav
Feb 8, 2018
934f807
Merge pull request #144 from revoltmedia/jfleming/bootstrap-nav
Feb 8, 2018
3c114b1
Merge branch 'master' into add_pr_template
Feb 8, 2018
386eaab
Merge pull request #149 from BrendaPenn/add_pr_template
Feb 8, 2018
3070f1a
Bump uglifier from 4.1.5 to 4.1.6
dependabot-support Feb 9, 2018
28347d1
Merge pull request #152 from renocollective/dependabot/bundler/uglifi…
colinloretz Feb 9, 2018
48d6435
Set BlockLength to 50 in Rubocop
Feb 5, 2018
248d78f
Merge pull request #153 from colinloretz/rubocop-exceptions
BrendaPenn Feb 12, 2018
fd1489e
Revert "Set BlockLength to 50 in Rubocop"
colinloretz Feb 12, 2018
3f05335
Merge pull request #155 from renocollective/revert-153-rubocop-except…
colinloretz Feb 14, 2018
dc29bd3
Added SMTP settings and documentation for ActionMailer for issue #138
Feb 5, 2018
66afb29
Reconfigured mailer to use Mailcatcher in local dev mode
Feb 5, 2018
7fcb6f8
Disable Metrics/BlockLength in config/environments to support more co…
Feb 12, 2018
98e6ad4
Merge pull request #140 from colinloretz/add-actionmailer-138
colinloretz Feb 14, 2018
193cde0
Added devise_invitable
Feb 13, 2018
1111640
Installed Devise Invitable as per docs and run migration
Feb 13, 2018
411b198
Make invitations expire after 2 weeks
Feb 13, 2018
82f4b06
Add device invitation views
Feb 13, 2018
33da2e6
Merge pull request #159 from colinloretz/add-user-invitations
colinloretz Feb 14, 2018
365980e
Add admin attribute to member model
BrendaPenn Feb 12, 2018
c17ea70
Rebase with mailer and devise invitations
BrendaPenn Feb 14, 2018
fae98bf
remove readme from db
BrendaPenn Feb 14, 2018
b07afbc
Fix schema indentation
BrendaPenn Feb 14, 2018
cea475e
Merge pull request #154 from BrendaPenn/add_admin_role
BrendaPenn Feb 14, 2018
bf07b9a
Add reconfirmable to devise
BrendaPenn Feb 14, 2018
73a10b0
Merge pull request #161 from BrendaPenn/add_reconfirmable_email
colinloretz Feb 14, 2018
490598c
Bump capybara from 2.17.0 to 2.18.0
dependabot-support Feb 14, 2018
10c45ef
Merge pull request #157 from renocollective/dependabot/bundler/capyba…
colinloretz Feb 15, 2018
c281b18
Bump license_finder from 5.0.2 to 5.0.3
dependabot-support Feb 15, 2018
9bcef75
Edit development setup instructions in README
BrendaPenn Feb 15, 2018
9f910a4
Merge pull request #158 from renocollective/dependabot/bundler/licens…
colinloretz Feb 15, 2018
d59d607
Merge branch 'master' into edit_readme
BrendaPenn Feb 15, 2018
cb3d990
Bump rails from 5.1.4 to 5.1.5
dependabot-support Feb 15, 2018
99d8849
Merge pull request #163 from renocollective/dependabot/bundler/rails-…
colinloretz Feb 15, 2018
f6d93cc
Bump pg from 0.21.0 to 1.0.0
dependabot-support Feb 15, 2018
a028b30
Merge pull request #127 from renocollective/dependabot/bundler/pg-1.0.0
colinloretz Feb 15, 2018
955b5fe
Merge branch 'master' into edit_readme
BrendaPenn Feb 15, 2018
ba80cac
Merge pull request #162 from BrendaPenn/edit_readme
BrendaPenn Feb 15, 2018
f8094b6
Add Codeclimate code coverage script to .travis.yml
Feb 14, 2018
48acc57
Merge pull request #160 from colinloretz/add-test-coverage-check
colinloretz Feb 21, 2018
31b2006
Add administrate gem for admin dashboard
BrendaPenn Feb 21, 2018
6074377
Authenticate admin when accessing admin dashboard and modify dashboar…
BrendaPenn Feb 21, 2018
e71c39d
Modify to pass rubocop
BrendaPenn Feb 21, 2018
605e772
Approve dependencies with license_finder
BrendaPenn Feb 21, 2018
e37795d
create admin controller test
BrendaPenn Feb 26, 2018
1556b20
Merge pull request #164 from BrendaPenn/add_administrate_gem
BrendaPenn Feb 26, 2018
2c29ac8
Allow only admin to invite members
BrendaPenn Feb 26, 2018
8b7a806
remove unnecessary helper function
BrendaPenn Feb 28, 2018
3c65192
Merge pull request #167 from BrendaPenn/admin_invite_only
colinloretz Mar 1, 2018
e2a3998
add postgres to docker-compose
chaoticbear Sep 29, 2017
b7a3abc
ignore posgres db directory
chaoticbear Sep 29, 2017
4b3a052
build path comment for dev of rails image
chaoticbear Sep 29, 2017
de2a1c4
docker-compose WIP
chaoticbear Feb 2, 2018
e482007
moved env variables to .env.local
chaoticbear Feb 2, 2018
bde4c35
fixes to docker-compose setup, env file formatting, latest postgres, …
chaoticbear Feb 2, 2018
005996b
Moved all docker related stuff to the member-portal-docker project
chaoticbear Feb 2, 2018
6ca3360
docker readme updates
chaoticbear Feb 2, 2018
dc59850
Merge branch 'jfleming/docker-compose-setup' of github.com:revoltmedi…
chaoticbear Mar 1, 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
25 changes: 25 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -1,2 +1,27 @@
# dotenv .env file for environment variables
#
# each developer should make their own .env.local file using this .env file
# as a guide
#
# .env.local files are not checked into the remote repo
#
# reference these attributes in code like this:
# config.fog_directory = ENV['S3_BUCKET']

SECRET_KEY_BASE=insecure-secret_key_base
DATABASE_URL=postgresql://insecure-database_url
ALGOLIA_API_KEY=insecure-algolia_api_key
ALGOLIA_APPLICATION_ID=insecure-algolia_application_id
SMTP_ADDRESS=smtp.address.com
SMTP_DOMAIN=yourdomain.com
[email protected]
SMTP_PASSWORD=a-secure-password
SMTP_PORT=587

S3_BUCKET=bogus-key-for-example

POSTGRES_HOST=db
POSTGRES_DB: member_portal
POSTGRES_USER: member_portal
POSTGRES_PASSWORD: xxxxxxxxxxx
SECRET_KEY_BASE=insecure-secret_key_base
7 changes: 6 additions & 1 deletion .env.test
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
SECRET_KEY_BASE=insecure-secret_key_base
DATABASE_URL=postgresql://localhost/member_portal_test
ALGOLIA_API_KEY=insecure-algolia_api_key
ALGOLIA_APPLICATION_ID=insecure-algolia_application_id
ALGOLIA_APPLICATION_ID=insecure-algolia_application_id
SMTP_ADDRESS=smtp.address.com
SMTP_DOMAIN=yourdomain.com
[email protected]
SMTP_PASSWORD=a-secure-password
SMTP_PORT=587
32 changes: 32 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,39 @@
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile '~/.gitignore_global'

# Ignore bundler config.
/.bundle

# Ignore the default SQLite database.
/db/*.sqlite3
/db/*.sqlite3-journal

# Ignore all logfiles and tempfiles.
/log/*
/tmp/*
!/log/.keep
!/tmp/.keep

/node_modules
/yarn-error.log

.bundle
# Ignore bundler config.
/.bundle

# Ignore the default SQLite database.
/db/*.sqlite3
/db/*.sqlite3-journal

# Ignore all logfiles and tempfiles.
/log/*
/tmp/*
!/log/.keep
!/tmp/.keep

/node_modules
/yarn-error.log

.byebug_history
.env.local
.env.test.local
Expand Down
12 changes: 10 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
env:
global:
- CC_TEST_REPORTER_ID=00a50e18e14874b0d86236c35828be7c01d9ff917215608666b4ffd8cfa1b573
addons:
postgresql: 9.6
before_script:
- bundle exec rails db:setup
bundler_args: --jobs 4 --retry 3
cache: bundler
language: ruby
Expand All @@ -10,9 +11,16 @@ notifications:
rvm:
- 2.3.5
- 2.4.2
before_script:
- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
- chmod +x ./cc-test-reporter
- ./cc-test-reporter before-build
- bundle exec rails db:setup
script:
- bundle exec rails bundle:audit
- bundle exec license_finder --quiet
- bundle exec rubocop
- bundle exec rails test
after_script:
- ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
sudo: false
27 changes: 27 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Contributing to the Member Portal

The member portal is an open source project and we would love to see contributions and pull requests from everyone interested. By participating in this project, you are agreeing to abide to our [Code of Conduct](https://github.com/renocollective/member-portal/blob/master/Code_of_Conduct.md).

There are many ways you can contribute to this project:
* Writing code (if there is a specific issue you would like to work on, just let us know by commenting on the issue)
* Suggesting features you would like to see implemented
* Writing or editing documentation
* Reporting bugs
* Fixing bugs

To submit a pull request:
For information on setting up the project dependencies, please go to the [README.md](https://github.com/renocollective/member-portal/blob/master/README.md)

1. [Fork](https://help.github.com/articles/fork-a-repo/) the [project](https://github.com/renocollective/member-portal).
2. Create a branch on your local machine.
``` shell
git checkout -b your-branch-name
```
3. Implement your feature or bug fix.
4. Add, commit, and push your changes to your branch.
```shell
git push origin your-branch-name
```
5. Submit a pull request for review.

Click to [here](https://github.com/renocollective/member-portal/graphs/contributors) the list of contributors who participated in this project.
73 changes: 73 additions & 0 deletions Code_of_Conduct.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
# Contributor Covenant Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, gender identity and expression, level of experience,
education, socio-economic status, nationality, personal appearance, race,
religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment
include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or
advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic
address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in
response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or
reject comments, commits, code, wiki edits, issues, and other contributions
that are not aligned to this Code of Conduct, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community. Examples of
representing a project or community include using an official project e-mail
address, posting via an official social media account, or acting as an appointed
representative at an online or offline event. Representation of a project may be
further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at [INSERT EMAIL ADDRESS]. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good
faith may face temporary or permanent repercussions as determined by other
members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html

[homepage]: https://www.contributor-covenant.org
30 changes: 18 additions & 12 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,22 @@

source 'https://rubygems.org'

gem 'carrierwave', '~> 1.2.1'
gem 'administrate', '~> 0.9.0'
gem 'bootstrap', '~> 4.0.0'
gem 'carrierwave', '~> 1.2.2'
gem 'coffee-rails', '~> 4.2.0'
gem 'devise', '~> 4.4.1'
gem 'devise_invitable', '~> 1.7.0'
gem 'dotenv-rails', '~> 2.2.1'
gem 'jbuilder', '~> 2.7.0'
gem 'jquery-rails', '~> 4.3.1'
gem 'mini_magick', '~> 4.8.0'
gem 'pg', '~> 0.21.0'
gem 'puma', '~> 3.11.0'
gem 'rails', '~> 5.1.4'
gem 'pg', '~> 1.0.0'
gem 'puma', '~> 3.11.2'
gem 'rails', '~> 5.1.5'
gem 'sass-rails', '~> 5.0.7'
gem 'turbolinks', '~> 5.0.1'
gem 'uglifier', '~> 3.2.0'
gem 'turbolinks', '~> 5.1.0'
gem 'uglifier', '~> 4.1.6'

group :development do
gem 'listen', '~> 3.1.5'
Expand All @@ -22,14 +27,15 @@ end

group :development, :test do
gem 'bundler-audit', '~> 0.6.0'
gem 'byebug', '~> 9.1.0', platforms: %i[mri mingw x64_mingw]
gem 'capybara', '~> 2.16'
gem 'byebug', '~> 10.0.0', platforms: %i[mri mingw x64_mingw]
gem 'capybara', '~> 2.18'
gem 'factory_bot_rails', '~> 4.8.2'
gem 'faker', '~> 1.8.4'
gem 'faker', '~> 1.8.7'
gem 'guard-minitest', '~> 2.4.6'
gem 'guard-rubocop', '~> 1.3.0'
gem 'license_finder', '~> 4.0.2'
gem 'rubocop', '~> 0.51.0', require: false
gem 'selenium-webdriver', '~> 3.7.0'
gem 'license_finder', '~> 5.0.3'
gem 'mocha', '~> 1.3.0'
gem 'rubocop', '~> 0.52.1', require: false
gem 'selenium-webdriver', '~> 3.9.0'
gem 'simplecov', '~> 0.15.1', require: false
end
Loading