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

Sprint 1 functionality #46

Merged
merged 39 commits into from
Feb 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
54b8d58
Added initial documentation
lincolnanders5 Jan 25, 2021
ba93adc
Add Devise & User (#26)
lincolnanders5 Jan 28, 2021
1cd42ab
Generated `Request` scaffold
lincolnanders5 Jan 29, 2021
4607f03
Added initial validation and link to form
lincolnanders5 Jan 29, 2021
ccbd638
Changed form copy to show Figma copy
lincolnanders5 Jan 29, 2021
e5ca88c
`type` is a reserved field in Rails
lincolnanders5 Jan 29, 2021
2cae615
Added enum-based fields
lincolnanders5 Jan 29, 2021
a5ea7ff
Added link to home page
lincolnanders5 Jan 29, 2021
3482527
Added link to home page
lincolnanders5 Jan 29, 2021
5accdd8
Fixed merge issue
lincolnanders5 Jan 29, 2021
7937d99
generated user mailer: settings to deliver when request created, draf…
nooreenfarooqui Jan 30, 2021
effa7dd
configured settings for sending email from dev, production, and test …
nooreenfarooqui Jan 30, 2021
71e4664
update readme with current action mailer info
nooreenfarooqui Jan 30, 2021
00dfb23
update readme
nooreenfarooqui Jan 30, 2021
935ebcf
Add Dockerfile (#28)
lincolnanders5 Feb 1, 2021
cb06454
Add Request (#30)
lincolnanders5 Feb 1, 2021
d7b1ee5
fixed hashmapped attribute display issue
nooreenfarooqui Feb 1, 2021
fbcddb6
Fix .env fetching error
lincolnanders5 Feb 1, 2021
284258e
Merge branch 'feature/add-email' of https://github.com/tumbleshack/Ca…
nooreenfarooqui Feb 1, 2021
139362a
Add Windows quirks to ReadMe
tumbleshack Jan 29, 2021
c9f7b19
Update README.md
lincolnanders5 Feb 1, 2021
198beb5
fixed smtp server issues, cleaned up action mailer settings in enviro…
nooreenfarooqui Feb 3, 2021
10b249b
fixed email text and html formatting for more optimal mobile view
nooreenfarooqui Feb 3, 2021
8440f15
update readme with actionmailer info
nooreenfarooqui Feb 3, 2021
42b48ac
update readme with actionmailer info
nooreenfarooqui Feb 3, 2021
61bb1b4
fixed environment variable issue for gmail account settings
nooreenfarooqui Feb 4, 2021
cd10582
fixed pickup location bug in email
nooreenfarooqui Feb 4, 2021
1cc2a8e
Merge branch 'feature/add-email' of https://github.com/tumbleshack/Ca…
nooreenfarooqui Feb 4, 2021
8ccdc68
update readme with new environment variable info
nooreenfarooqui Feb 4, 2021
68c980e
Merge branch 'develop' into feature/add-email
nooreenfarooqui Feb 5, 2021
fcdcd66
Merge pull request #35 from tumbleshack/feature/add-email
juliagrigni Feb 5, 2021
9db791b
Categories and DFCS (#39)
juliagrigni Feb 5, 2021
7ebbf82
Add Availability Text (#41)
lincolnanders5 Feb 5, 2021
9a9d634
Bump Ruby (#42)
lincolnanders5 Feb 5, 2021
fff1a11
update readme with error handling info for action mailer
nooreenfarooqui Feb 5, 2021
0658ac7
Merge pull request #43 from tumbleshack/feature/add-email
nooreenfarooqui Feb 5, 2021
2f0b517
Add Items (String) to Requests (#44)
lincolnanders5 Feb 6, 2021
3816a51
Feature/my requests (#48)
Nicholas714 Feb 8, 2021
1630314
Add Roles (#57)
lincolnanders5 Feb 12, 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
12 changes: 12 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/public/packs
/public/packs-test
/node_modules
/yarn-error.log
yarn-debug.log*
.yarn-integrity


/tmp
/db/data
/.git*
/.idea
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile '~/.gitignore_global'

# ignore local_env file for gmail account info
/config/local_env.yml

#ignore .env
.env

# Ignore bundler config.
/.bundle

Expand Down Expand Up @@ -34,3 +40,6 @@
/yarn-error.log
yarn-debug.log*
.yarn-integrity

.env
/db/data
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-2.7.0
ruby-2.7.2
31 changes: 31 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
FROM ruby:2.7.2

# Unimportant Container configuration
RUN apt-get update -qq
RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
RUN apt-get update && apt-get install -y yarn

# Transfer ownership away from root (bad) to dedicated rails_user (good).
WORKDIR /cc_server
RUN useradd -ms /bin/bash rails_user
RUN chown -R rails_user:rails_user /cc_server
RUN chmod 755 /cc_server
USER rails_user

# Install all dependencies through `gem` and `yarn` package managers.
COPY --chown=rails_user:rails_user Gemfile /cc_server/Gemfile
COPY --chown=rails_user:rails_user Gemfile.lock /cc_server/Gemfile.lock
RUN gem install bundler:2.2.8 && bundle install

COPY --chown=rails_user:rails_user package.json /cc_server/package.json
COPY --chown=rails_user:rails_user yarn.lock /cc_server/yarn.lock
RUN yarn install --check-files

# Expose ports for access either from `dev` (:3000) or `prod` (:80 and :443)
EXPOSE 3000
EXPOSE 443
EXPOSE 80

# Start the main process.
CMD rm -f tmp/pids/server.pid; rails server -b '0.0.0.0'
10 changes: 9 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.7.0'
ruby '2.7.2'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 6.1.1'
# Use mysql as the database for Active Record
gem 'mysql2', '~> 0.5'
gem 'pg'
# Use Puma as the app server
gem 'puma', '~> 5.0'
# Use SCSS for stylesheets
Expand All @@ -21,6 +22,8 @@ gem 'jbuilder', '~> 2.7'
# gem 'redis', '~> 4.0'
# Use Active Model has_secure_password
# gem 'bcrypt', '~> 3.1.7'
# Use Devise for user sessions and management
gem 'devise', '~> 4.7.1'

# Use Active Storage variant
# gem 'image_processing', '~> 1.2'
Expand Down Expand Up @@ -54,3 +57,8 @@ end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

gem "phonelib", "~> 0.6.48"
gem 'semantic-ui-sass'
gem 'purecss'
gem 'faker'
87 changes: 76 additions & 11 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -62,29 +62,42 @@ GEM
zeitwerk (~> 2.3)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
bcrypt (3.1.16)
bcrypt (3.1.16-java)
bindex (0.8.1)
bootsnap (1.5.1)
bootsnap (1.7.0)
msgpack (~> 1.0)
builder (3.2.4)
byebug (11.1.3)
capybara (3.34.0)
capybara (3.35.3)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
rack (>= 1.6.0)
rack-test (>= 0.6.3)
regexp_parser (~> 1.5)
regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2)
childprocess (3.0.0)
concurrent-ruby (1.1.8)
crass (1.0.6)
devise (4.7.3)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0)
responders
warden (~> 1.2.3)
erubi (1.10.0)
faker (2.15.1)
i18n (>= 1.6, < 2)
ffi (1.14.2)
ffi (1.14.2-java)
ffi (1.14.2-x64-mingw32)
ffi (1.14.2-x86-mingw32)
globalid (0.4.2)
activesupport (>= 4.2.0)
i18n (1.8.7)
i18n (1.8.8)
concurrent-ruby (~> 1.0)
jbuilder (2.11.1)
jbuilder (2.11.2)
activesupport (>= 5.0.0)
listen (3.4.1)
rb-fsevent (~> 0.10, >= 0.10.3)
Expand All @@ -99,18 +112,42 @@ GEM
method_source (1.0.0)
mimemagic (0.3.5)
mini_mime (1.0.2)
mini_portile2 (2.5.0)
minitest (5.14.3)
msgpack (1.3.3)
msgpack (1.4.2)
msgpack (1.4.2-java)
mysql2 (0.5.3)
nio4r (2.5.4)
nio4r (2.5.4-java)
nokogiri (1.11.1)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
nokogiri (1.11.1-java)
racc (~> 1.4)
nokogiri (1.11.1-x64-mingw32)
racc (~> 1.4)
nokogiri (1.11.1-x86-mingw32)
racc (~> 1.4)
nokogiri (1.11.1-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.11.1-x86_64-linux)
racc (~> 1.4)
orm_adapter (0.5.0)
pg (1.2.3)
pg (1.2.3-x64-mingw32)
pg (1.2.3-x86-mingw32)
phonelib (0.6.48)
public_suffix (4.0.6)
puma (5.1.1)
puma (5.2.0)
nio4r (~> 2.0)
puma (5.2.0-java)
nio4r (~> 2.0)
purecss (0.5.0.2)
rails (>= 3.1)
racc (1.5.2)
racc (1.5.2-java)
rack (2.2.3)
rack-mini-profiler (2.3.0)
rack-mini-profiler (2.3.1)
rack (>= 1.2.0)
rack-proxy (0.6.5)
rack
Expand Down Expand Up @@ -146,12 +183,22 @@ GEM
rb-fsevent (0.10.4)
rb-inotify (0.10.1)
ffi (~> 1.0)
regexp_parser (1.8.2)
regexp_parser (2.0.3)
responders (3.0.1)
actionpack (>= 5.0)
railties (>= 5.0)
rubyzip (2.3.0)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sass-rails (6.0.0)
sassc-rails (~> 2.1, >= 2.1.1)
sassc (2.4.0)
ffi (~> 1.9)
sassc (2.4.0-x64-mingw32)
ffi (~> 1.9)
sassc-rails (2.1.2)
railties (>= 4.0.0)
sassc (>= 2.0)
Expand All @@ -161,6 +208,8 @@ GEM
selenium-webdriver (3.142.7)
childprocess (>= 0.5, < 4.0)
rubyzip (>= 1.2.2)
semantic-ui-sass (2.4.2.0)
sass (>= 3.2)
semantic_range (2.3.1)
spring (2.1.1)
sprockets (4.0.2)
Expand All @@ -177,6 +226,8 @@ GEM
turbolinks-source (5.2.0)
tzinfo (2.0.4)
concurrent-ruby (~> 1.0)
warden (1.2.9)
rack (>= 2.0.9)
web-console (4.1.0)
actionview (>= 6.0.0)
activemodel (>= 6.0.0)
Expand All @@ -193,26 +244,40 @@ GEM
semantic_range (>= 2.3.0)
websocket-driver (0.7.3)
websocket-extensions (>= 0.1.0)
websocket-driver (0.7.3-java)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.4.2)

PLATFORMS
java
x64-mingw32
x86-mingw32
x86-mswin32
x86_64-darwin-19
x86_64-darwin-20
x86_64-linux

DEPENDENCIES
bootsnap (>= 1.4.4)
byebug
capybara (>= 3.26)
devise (~> 4.7.1)
faker
jbuilder (~> 2.7)
listen (~> 3.3)
mysql2 (~> 0.5)
pg
phonelib (~> 0.6.48)
puma (~> 5.0)
purecss
rack-mini-profiler (~> 2.0)
rails (~> 6.1.1)
sass-rails (>= 6)
selenium-webdriver
semantic-ui-sass
spring
turbolinks (~> 5)
tzinfo-data
Expand All @@ -221,7 +286,7 @@ DEPENDENCIES
webpacker (~> 5.0)

RUBY VERSION
ruby 2.7.0p0
ruby 2.7.2p137

BUNDLED WITH
2.2.1
2.2.8
1 change: 1 addition & 0 deletions Procfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
web: bin/rails db:migrate; bin/rails server -p ${PORT:-5000} -e $RAILS_ENV
Loading