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

Djello #31

Open
wants to merge 95 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
fa3cb67
Rails setup
yxlau Oct 22, 2017
a039873
Set up User back end
yxlau Oct 22, 2017
8811b7a
Set up React
yxlau Oct 22, 2017
9b700b9
Set up login component
yxlau Oct 22, 2017
099a8d6
Enable CORS
yxlau Oct 22, 2017
a3926b7
Set up authentication (WIP)
yxlau Oct 22, 2017
b0758ca
Add login error message
yxlau Oct 22, 2017
51e01df
Set up user requests
yxlau Oct 23, 2017
977bf4e
Set up navbar
yxlau Oct 24, 2017
00d51a2
Set up logout
yxlau Oct 24, 2017
1ab3404
Set up logout
yxlau Oct 24, 2017
8fb7f65
Set up board, membership, list and card models
yxlau Oct 24, 2017
d172399
Set up user and main controllers
yxlau Oct 25, 2017
ed914ce
Set up board show and update on back end
yxlau Oct 26, 2017
f9fa841
Set up board update and show on front end
yxlau Oct 26, 2017
0504d06
Set up board destroy and update on back end
yxlau Oct 26, 2017
827179a
Set up board destroy and update on front end
yxlau Oct 26, 2017
758ea9c
Update seeds file
yxlau Oct 29, 2017
bae2019
Fix main controller request
yxlau Oct 29, 2017
04ed251
Set up board selection
yxlau Oct 29, 2017
897678c
Fix main controller data lookup
yxlau Oct 29, 2017
d49d9d7
Set up board creation
yxlau Oct 29, 2017
23cfb58
Fix incoming data for board GET requests
yxlau Oct 30, 2017
5df7d02
Set up list updates
yxlau Oct 30, 2017
4956ec7
Set up list creation
yxlau Oct 31, 2017
56600aa
Update list style
yxlau Nov 1, 2017
418daef
Fix Board request specs
yxlau Nov 1, 2017
05ac676
Add PropTypes to Confirmation component
yxlau Nov 1, 2017
c494941
Set up list deletion
yxlau Nov 1, 2017
17a108f
Update style for delete list button
yxlau Nov 1, 2017
b9fda82
Set up ListCard view
yxlau Nov 1, 2017
45e6a3b
Set up card creation on back end
yxlau Nov 1, 2017
3b42b37
Merge branch 'board'
yxlau Nov 1, 2017
f1ac571
Merge branch 'board/card'
yxlau Nov 1, 2017
f131abd
Set up card creation
yxlau Nov 1, 2017
705f248
Start setting up card details view
yxlau Nov 1, 2017
becb954
Set up updates for cards
yxlau Nov 7, 2017
feff1ff
Fix up card details view
yxlau Nov 7, 2017
f427ead
Set up "mark done" for cards
yxlau Nov 8, 2017
7ece239
Ensure no duplicate card memberships
yxlau Nov 8, 2017
b77dd9a
Set up membership revocation
yxlau Nov 8, 2017
b3178a9
Set up member creation on back end
yxlau Nov 8, 2017
896fa29
Redesign board memberships on back end
yxlau Nov 8, 2017
e24898d
Improve user model spec
yxlau Nov 8, 2017
8c7498e
Fix context wording
yxlau Nov 8, 2017
93ceb7e
Set up card member addition
yxlau Nov 8, 2017
28ba73a
Make sure potential card member pool is updated when user changes boards
yxlau Nov 8, 2017
f361c4b
Fix invalid prop type
yxlau Nov 8, 2017
5922f24
Merge cards into master
yxlau Nov 9, 2017
9d6fbf3
Fix card creation spec
yxlau Nov 9, 2017
6eae000
Remove unused model
yxlau Nov 9, 2017
293baf5
Set up board accessibility for card members
yxlau Nov 9, 2017
010ab34
Update card specs to check for update authorization
yxlau Nov 9, 2017
0f66b1b
Ensure that card gets deleted when marked as done
yxlau Nov 9, 2017
7e58ecf
Remove "done" status from cards since "done" cards are destroyed
yxlau Nov 9, 2017
90fa6e9
Fix button style
yxlau Nov 9, 2017
bb87eb7
Set up activity model
yxlau Nov 10, 2017
a2545c4
Remove max-width from board container
yxlau Nov 10, 2017
3a6053b
Allow user to assign cards to a different list
yxlau Nov 10, 2017
2486ae8
Set up activity tracking on back end
yxlau Nov 11, 2017
f221706
Fix card creation bug
yxlau Nov 11, 2017
9f900be
Fix card reducer
yxlau Nov 11, 2017
6225e23
Fix card creation bug
yxlau Nov 12, 2017
937506e
Use object instead of array to store board members
yxlau Nov 12, 2017
6254027
Set up activities on front end
yxlau Nov 12, 2017
b7384a8
Display member names on card
yxlau Nov 13, 2017
f3eccb7
Set up card drag and drop sorting
yxlau Nov 14, 2017
7ce4d25
Set up 'esc' key for exiting edit mode
yxlau Nov 15, 2017
db63137
Add esc key function for board creator
yxlau Nov 16, 2017
11984bc
normalize data
yxlau Nov 18, 2017
4ca1124
Set up loading indicator
yxlau Nov 18, 2017
3aa766c
Fix modal cancel button size
yxlau Nov 18, 2017
1213dc0
Fix bug when adding card member
yxlau Nov 18, 2017
a684c1b
Ensure all boards for a user are returned
yxlau Nov 18, 2017
53f1831
Start working on errors
yxlau Nov 18, 2017
618dcb6
Fix login error handling
yxlau Nov 21, 2017
2f7289c
Give /client its own repository
yxlau Nov 21, 2017
74b3fd8
Update CORS origin
yxlau Nov 21, 2017
bb39b10
-
yxlau Nov 21, 2017
01906e8
Set up cors in config/initializers/cors.rb
yxlau Nov 21, 2017
5e3b832
Switch origin
yxlau Nov 21, 2017
62502b1
Add /client back to repo
yxlau Nov 22, 2017
f41a220
Set up user registration on back end
yxlau Nov 22, 2017
fb81cbf
Use strong params for user creation
yxlau Nov 22, 2017
e59bb16
Fix back end for user sign ups
yxlau Nov 22, 2017
9841670
Set up user sign up on front end
yxlau Nov 22, 2017
7091439
Use ENV vars for CORS origin
yxlau Nov 22, 2017
b8e4d1d
Update baseURL
yxlau Nov 22, 2017
39ae331
Update README
yxlau Nov 22, 2017
a04a952
Fix card activities on membership creation and deletion
yxlau Nov 23, 2017
b5c9095
Fix user creation bugs
yxlau Nov 23, 2017
f2f8eeb
Fix activity bug
yxlau Nov 23, 2017
e3c6e80
Specify ruby version
yxlau Mar 15, 2024
e1f4a78
Revert "Fix activity bug"
yxlau Mar 15, 2024
6880262
Merge branch 'master' of https://github.com/yxlau/project_djello
yxlau Mar 15, 2024
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
28 changes: 28 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# See https://help.github.com/articles/ignoring-files for more about ignoring files.
#
# If you find yourself ignoring temporary files generated by your text editor
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile '~/.gitignore_global'

# Ignore DS_STORE
.DS_Store

# Ignore bundler config.
/.bundle

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

# Ignore Byebug command history file.
.byebug_history

# Logs
client/logs
client/*.log
client/npm-debug.log*

# Dependency directories
client/node_modules/
2 changes: 2 additions & 0 deletions .rspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
--color
--require spec_helper
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.4.10
53 changes: 53 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
source 'https://rubygems.org'

git_source(:github) do |repo_name|
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
"https://github.com/#{repo_name}.git"
end

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.0.2'
# Use postgresql as the database for Active Record
gem 'pg', '~> 0.18'
# Use Puma as the app server
gem 'puma', '~> 3.0'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.5'
# Use Redis adapter to run Action Cable in production
# gem 'redis', '~> 3.0'
# Use ActiveModel has_secure_password
gem 'bcrypt', '~> 3.1.7'
gem 'knock', '~> 2.1.1'
gem 'jwt'
gem 'responders'
gem 'loofah', '~>2.19.1'

# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development

# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible
gem 'rack-cors'

gem 'faker'



group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug', platform: :mri
gem 'jazz_fingers'
gem 'rspec-rails', '3.5.2'
gem 'factory_bot_rails', '4.8.2'
end

group :development do
gem 'listen', '~> 3.0.5'
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
gem 'spring-watcher-listen', '~> 2.0.0'
gem 'guard-rspec', require: false
gem 'bullet'
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
233 changes: 233 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,233 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (5.0.7.2)
actionpack (= 5.0.7.2)
nio4r (>= 1.2, < 3.0)
websocket-driver (~> 0.6.1)
actionmailer (5.0.7.2)
actionpack (= 5.0.7.2)
actionview (= 5.0.7.2)
activejob (= 5.0.7.2)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.0.7.2)
actionview (= 5.0.7.2)
activesupport (= 5.0.7.2)
rack (~> 2.0)
rack-test (~> 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.0.7.2)
activesupport (= 5.0.7.2)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.0.7.2)
activesupport (= 5.0.7.2)
globalid (>= 0.3.6)
activemodel (5.0.7.2)
activesupport (= 5.0.7.2)
activerecord (5.0.7.2)
activemodel (= 5.0.7.2)
activesupport (= 5.0.7.2)
arel (~> 7.0)
activesupport (5.0.7.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
arel (7.1.4)
awesome_print (1.9.2)
bcrypt (3.1.20)
builder (3.2.4)
bullet (7.1.6)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.11)
byebug (11.1.3)
coderay (1.1.3)
concurrent-ruby (1.2.3)
coolline (0.5.0)
unicode_utils (~> 1.4)
crass (1.0.6)
diff-lcs (1.5.1)
erubis (2.7.0)
factory_bot (4.8.2)
activesupport (>= 3.0.0)
factory_bot_rails (4.8.2)
factory_bot (~> 4.8.2)
railties (>= 3.0.0)
faker (2.12.0)
i18n (>= 1.6, < 2)
ffi (1.15.5)
formatador (1.1.0)
globalid (0.4.2)
activesupport (>= 4.2.0)
guard (2.18.1)
formatador (>= 0.2.4)
listen (>= 2.7, < 4.0)
lumberjack (>= 1.0.12, < 2.0)
nenv (~> 0.1)
notiffany (~> 0.0)
pry (>= 0.13.0)
shellany (~> 0.0)
thor (>= 0.18.1)
guard-compat (1.2.1)
guard-rspec (4.7.3)
guard (~> 2.1)
guard-compat (~> 1.1)
rspec (>= 2.99.0, < 4.0)
i18n (1.14.4)
concurrent-ruby (~> 1.0)
jazz_fingers (5.2.2)
awesome_print (~> 1.6)
pry (~> 0.10)
pry-byebug (~> 3.4)
pry-coolline (~> 0.2)
jbuilder (2.11.5)
actionview (>= 5.0.0)
activesupport (>= 5.0.0)
jwt (1.5.6)
knock (2.1.1)
bcrypt (~> 3.1)
jwt (~> 1.5)
rails (>= 4.2)
listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
loofah (2.19.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
lumberjack (1.2.10)
mail (2.7.1)
mini_mime (>= 0.1.1)
method_source (1.0.0)
mini_mime (1.1.2)
mini_portile2 (2.4.0)
minitest (5.15.0)
nenv (0.3.0)
nio4r (2.7.0)
nokogiri (1.10.10)
mini_portile2 (~> 2.4.0)
notiffany (0.1.3)
nenv (~> 0.1)
shellany (~> 0.0)
pg (0.21.0)
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
pry-byebug (3.8.0)
byebug (~> 11.0)
pry (~> 0.10)
pry-coolline (0.2.6)
coolline (~> 0.5)
pry (~> 0.13)
puma (3.12.6)
rack (2.2.8.1)
rack-cors (2.0.2)
rack (>= 2.0.0)
rack-test (0.6.3)
rack (>= 1.0)
rails (5.0.7.2)
actioncable (= 5.0.7.2)
actionmailer (= 5.0.7.2)
actionpack (= 5.0.7.2)
actionview (= 5.0.7.2)
activejob (= 5.0.7.2)
activemodel (= 5.0.7.2)
activerecord (= 5.0.7.2)
activesupport (= 5.0.7.2)
bundler (>= 1.3.0)
railties (= 5.0.7.2)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.1.1)
activesupport (>= 5.0.0)
minitest
nokogiri (>= 1.6)
rails-html-sanitizer (1.5.0)
loofah (~> 2.19, >= 2.19.1)
railties (5.0.7.2)
actionpack (= 5.0.7.2)
activesupport (= 5.0.7.2)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (13.1.0)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
responders (3.0.1)
actionpack (>= 5.0)
railties (>= 5.0)
rspec (3.5.0)
rspec-core (~> 3.5.0)
rspec-expectations (~> 3.5.0)
rspec-mocks (~> 3.5.0)
rspec-core (3.5.4)
rspec-support (~> 3.5.0)
rspec-expectations (3.5.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.5.0)
rspec-mocks (3.5.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.5.0)
rspec-rails (3.5.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 3.5.0)
rspec-expectations (~> 3.5.0)
rspec-mocks (~> 3.5.0)
rspec-support (~> 3.5.0)
rspec-support (3.5.0)
shellany (0.0.1)
spring (2.1.1)
spring-watcher-listen (2.0.1)
listen (>= 2.7, < 4.0)
spring (>= 1.2, < 3.0)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.2)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
thor (1.2.2)
thread_safe (0.3.6)
tzinfo (1.2.11)
thread_safe (~> 0.1)
unicode_utils (1.4.0)
uniform_notifier (1.16.0)
websocket-driver (0.6.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)

PLATFORMS
ruby

DEPENDENCIES
bcrypt (~> 3.1.7)
bullet
byebug
factory_bot_rails (= 4.8.2)
faker
guard-rspec
jazz_fingers
jbuilder (~> 2.5)
jwt
knock (~> 2.1.1)
listen (~> 3.0.5)
loofah (~> 2.19.1)
pg (~> 0.18)
puma (~> 3.0)
rack-cors
rails (~> 5.0.2)
responders
rspec-rails (= 3.5.2)
spring
spring-watcher-listen (~> 2.0.0)
tzinfo-data

BUNDLED WITH
1.17.3
70 changes: 70 additions & 0 deletions Guardfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
# A sample Guardfile
# More info at https://github.com/guard/guard#readme

## Uncomment and set this to only include directories you want to watch
# directories %w(app lib config test spec features) \
# .select{|d| Dir.exists?(d) ? d : UI.warning("Directory #{d} does not exist")}

## Note: if you are using the `directories` clause above and you are not
## watching the project directory ('.'), then you will want to move
## the Guardfile to a watched dir and symlink it back, e.g.
#
# $ mkdir config
# $ mv Guardfile config/
# $ ln -s config/Guardfile .
#
# and, you'll have to watch "config/Guardfile" instead of "Guardfile"

# Note: The cmd option is now required due to the increasing number of ways
# rspec may be run, below are examples of the most common uses.
# * bundler: 'bundle exec rspec'
# * bundler binstubs: 'bin/rspec'
# * spring: 'bin/rspec' (This will use spring if running and you have
# installed the spring binstubs per the docs)
# * zeus: 'zeus rspec' (requires the server to be started separately)
# * 'just' rspec: 'rspec'

guard :rspec, cmd: "bundle exec rspec" do
require "guard/rspec/dsl"
dsl = Guard::RSpec::Dsl.new(self)

# Feel free to open issues for suggestions and improvements

# RSpec files
rspec = dsl.rspec
watch(rspec.spec_helper) { rspec.spec_dir }
watch(rspec.spec_support) { rspec.spec_dir }
watch(rspec.spec_files)

# Ruby files
ruby = dsl.ruby
dsl.watch_spec_files_for(ruby.lib_files)

# Rails files
rails = dsl.rails(view_extensions: %w(erb haml slim))
dsl.watch_spec_files_for(rails.app_files)
dsl.watch_spec_files_for(rails.views)

watch(rails.controllers) do |m|
[
rspec.spec.call("routing/#{m[1]}_routing"),
rspec.spec.call("controllers/#{m[1]}_controller"),
rspec.spec.call("acceptance/#{m[1]}")
]
end

# Rails config changes
watch(rails.spec_helper) { rspec.spec_dir }
watch(rails.routes) { "#{rspec.spec_dir}/routing" }
watch(rails.app_controller) { "#{rspec.spec_dir}/controllers" }

# Capybara features specs
watch(rails.view_dirs) { |m| rspec.spec.call("features/#{m[1]}") }
watch(rails.layouts) { |m| rspec.spec.call("features/#{m[1]}") }

# Turnip features and steps
watch(%r{^spec/acceptance/(.+)\.feature$})
watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$}) do |m|
Dir[File.join("**/#{m[1]}.feature")][0] || "spec/acceptance"
end
end
Loading