Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
130 commits
Select commit Hold shift + click to select a range
8617aa3
initializing hatchpodz rails
nicoalee Aug 29, 2017
5fdc1bd
merging and pushing to remote
nicoalee Aug 29, 2017
c27fb9b
initialized hatchpods WE ARE GO
nicoalee Aug 29, 2017
7961af7
adding rolify
nicoalee Aug 31, 2017
60c9390
changing things on testing
nicoalee Aug 31, 2017
ae87d03
added name field to register
nicoalee Aug 31, 2017
592b065
allowed user to view all other users
nicoalee Aug 31, 2017
780904f
user can now add user, added admin to user model
nicoalee Aug 31, 2017
4a8c692
admin only allowed to add members, basic routing, can view members
nicoalee Aug 31, 2017
f4df057
config bookrooms and meetingrooms routes
ddanielnp Sep 1, 2017
88f30b9
init react-rails
ddanielnp Sep 1, 2017
972edd0
fixed error messages when logging in and out
nicoalee Sep 1, 2017
45ef04b
fixing merge conflicts
nicoalee Sep 1, 2017
a448c2f
merged
nicoalee Sep 1, 2017
40067fc
Merge branch 'ddanielnp-master'
nicoalee Sep 1, 2017
8f97440
merged daniel and nick
nicoalee Sep 1, 2017
f178865
events routes
merejarvis Sep 1, 2017
7b8ae3e
merged, events routes set up
merejarvis Sep 1, 2017
74d5cf9
to change to events
merejarvis Sep 2, 2017
f385e6f
changed to events
merejarvis Sep 2, 2017
6d1e1ce
bootstrap date time picker
ddanielnp Sep 2, 2017
b9e9394
to merge
merejarvis Sep 2, 2017
700459c
to rectify date/mth reverse
merejarvis Sep 3, 2017
6af994c
before work on slots
ddanielnp Sep 3, 2017
b228937
working on validation for meetingroom slots
ddanielnp Sep 3, 2017
c4e0176
backend validation for time end after time start and time start after…
merejarvis Sep 3, 2017
a7a0c9a
added marketplace
nicoalee Sep 4, 2017
3fcefc7
working on slots filter
ddanielnp Sep 4, 2017
df9fb68
to merge
merejarvis Sep 4, 2017
e8f1ab1
merged conflicts
ddanielnp Sep 4, 2017
62c7f02
Merge branch 'master' into master
nicoalee Sep 4, 2017
1a13e48
Merge pull request #2 from merejarvis/master
nicoalee Sep 4, 2017
c7975cd
Merge branch 'master' into master
ddanielnp Sep 4, 2017
9b7d033
Merge pull request #4 from ddanielnp/master
nicoalee Sep 4, 2017
de5a5b7
merging
merejarvis Sep 4, 2017
833e13c
booking functions working
merejarvis Sep 4, 2017
01c7a7e
adding assets
nicoalee Sep 5, 2017
e808b2c
finished assets
nicoalee Sep 5, 2017
e6a5b35
added bootstrap navbar, view profile
ddanielnp Sep 5, 2017
15a924d
fixed merge conflicts
ddanielnp Sep 5, 2017
f7afc6c
Merge pull request #5 from ddanielnp/master
nicoalee Sep 5, 2017
04433ef
edited some nav bar settings
nicoalee Sep 5, 2017
9618975
edits
ddanielnp Sep 5, 2017
c6c9e70
fix conflicts
ddanielnp Sep 5, 2017
d776455
Merge pull request #6 from ddanielnp/master
nicoalee Sep 5, 2017
391c9a5
edit
ddanielnp Sep 5, 2017
30be660
removed github arrows
nicoalee Sep 5, 2017
eadce0c
cloudinary up, to merge
merejarvis Sep 5, 2017
8c54ef8
cloudinary up, to merge
merejarvis Sep 5, 2017
c5c09cf
Merge pull request #7 from merejarvis/master
nicoalee Sep 5, 2017
2cdf1a2
created meetingrooms
nicoalee Sep 5, 2017
ce17110
test user feature
merejarvis Sep 5, 2017
9524619
edit to htmls
ddanielnp Sep 5, 2017
407c8a6
finished bookrooms controller
nicoalee Sep 5, 2017
bff2974
changes to validation for bookroom
ddanielnp Sep 5, 2017
00ecd10
Merge branch 'master' into master
ddanielnp Sep 5, 2017
5a011c5
Merge pull request #8 from ddanielnp/master
ddanielnp Sep 5, 2017
e7bd774
edit
ddanielnp Sep 5, 2017
5d6dca3
Merge pull request #9 from ddanielnp/master
ddanielnp Sep 5, 2017
8a5e215
edit
ddanielnp Sep 5, 2017
6ad21e9
save
merejarvis Sep 5, 2017
0224cc6
fixed bookrooms controller bugs
nicoalee Sep 5, 2017
9bdaf1d
Merge remote-tracking branch 'origin/master'
nicoalee Sep 5, 2017
8fd184c
edited validation bugs
nicoalee Sep 5, 2017
d5ee315
readme changes
nicoalee Sep 5, 2017
7d35d5b
Update README.md
nicoalee Sep 5, 2017
03c49bd
Update README.md
nicoalee Sep 5, 2017
22d8140
Update README.md
nicoalee Sep 5, 2017
54e8682
Update README.md
nicoalee Sep 5, 2017
51be0d1
added images for readme
nicoalee Sep 5, 2017
b978bcd
Merge remote-tracking branch 'origin/master'
nicoalee Sep 5, 2017
0a89d1b
editing readme
nicoalee Sep 5, 2017
20cc52e
editing readme
nicoalee Sep 5, 2017
44ae25a
Update README.md
nicoalee Sep 5, 2017
8c48d98
editing readme
nicoalee Sep 5, 2017
2c967ee
editing readme
nicoalee Sep 5, 2017
8897184
editing readme
nicoalee Sep 5, 2017
c3360c7
editing readme
nicoalee Sep 5, 2017
8198796
edited readme
nicoalee Sep 5, 2017
18b77bc
edited readme
nicoalee Sep 5, 2017
70befb6
edited readme
nicoalee Sep 5, 2017
cdb447e
navbar customised user, admin
merejarvis Sep 5, 2017
28e4743
edits to controllers and views
ddanielnp Sep 6, 2017
b42dc0f
bookroom forms update and save to db
ddanielnp Sep 6, 2017
344c621
amended words
merejarvis Sep 6, 2017
d9d079c
Merge branch 'master' into master
ddanielnp Sep 6, 2017
100d431
Merge pull request #10 from merejarvis/master
ddanielnp Sep 6, 2017
0468098
Merge remote-tracking branch 'upstream/master' into test
merejarvis Sep 6, 2017
b42e4d5
Merge branch 'master' into master
ddanielnp Sep 6, 2017
70ab11b
Merge pull request #11 from ddanielnp/master
ddanielnp Sep 6, 2017
e60d1a6
update navbar links
ddanielnp Sep 6, 2017
78c3f54
mergin
merejarvis Sep 6, 2017
0f1c673
navbar fix
ddanielnp Sep 6, 2017
5c0afeb
remove models/role.rb
ddanielnp Sep 6, 2017
e383a21
modified navbar and add transactions
ddanielnp Sep 6, 2017
3fa3c6f
to test, user, asset
merejarvis Sep 6, 2017
5f2c457
ok
merejarvis Sep 6, 2017
546d86f
grouped items in user profile page
ddanielnp Sep 6, 2017
54da124
ok
merejarvis Sep 6, 2017
c4e219e
merged upstream, for pull request
merejarvis Sep 6, 2017
7f44b55
Merge pull request #1 from merejarvis/master
ddanielnp Sep 6, 2017
1bb80d7
updates to html and layouts
ddanielnp Sep 6, 2017
d446d02
resolved meetingroom interface
merejarvis Sep 6, 2017
1c13913
update seeds
ddanielnp Sep 7, 2017
83395d2
conflicts
merejarvis Sep 7, 2017
b66cdf8
resolved pricing and room booking
merejarvis Sep 7, 2017
d3beacf
edit
ddanielnp Sep 7, 2017
b576c78
ok
merejarvis Sep 7, 2017
625e537
added pax formatting, amended seed data
merejarvis Sep 7, 2017
63a162b
add some seed
ddanielnp Sep 7, 2017
a360ea2
Merge pull request #3 from merejarvis/master
ddanielnp Sep 7, 2017
08cd529
stuck with assets
merejarvis Sep 7, 2017
059cded
Merge pull request #4 from merejarvis/master
ddanielnp Sep 7, 2017
d772361
done
merejarvis Sep 7, 2017
2646344
Merge pull request #5 from merejarvis/master
ddanielnp Sep 7, 2017
e30589c
edit
ddanielnp Sep 7, 2017
e4daae0
change spaces/new.html
ddanielnp Sep 7, 2017
c51ed0a
edit to events/index.html
ddanielnp Sep 7, 2017
5113726
update htmls
ddanielnp Sep 7, 2017
a8d308c
updated promos
merejarvis Sep 7, 2017
d075a03
Merge remote-tracking branch 'upstream/master'
merejarvis Sep 7, 2017
1eb8f2e
Merge pull request #6 from merejarvis/master
ddanielnp Sep 7, 2017
7d1df3d
edited first login
merejarvis Sep 7, 2017
32068ce
edits to layouts
ddanielnp Sep 7, 2017
b5de7ca
Merge remote-tracking branch 'upstream/master'
merejarvis Sep 7, 2017
07bb473
add promo edit feature
ddanielnp Sep 7, 2017
f7ab45e
Merge pull request #7 from merejarvis/master
ddanielnp Sep 7, 2017
2f376c4
edit landing page
ddanielnp Sep 7, 2017
e344441
update bg-img
ddanielnp Sep 8, 2017
a004f3a
update heroku link
ddanielnp Sep 16, 2017
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
19 changes: 19 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# 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 bundler config.
/.bundle

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

/node_modules
/yarn-error.log

.byebug_history
63 changes: 63 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
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

gem 'cloudinary'
gem 'pry'
gem 'devise'
gem 'jquery-rails'
gem 'react-rails'
gem 'bootstrap-sass', '~> 3.2.0'
gem 'momentjs-rails', '>= 2.9.0'
gem 'bootstrap3-datetimepicker-rails', '~> 4.17.47'
gem 'bootstrap', '~> 4.0.0.alpha6'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.1.3'
# Use postgresql as the database for Active Record
gem 'pg', '~> 0.18'
# Use Puma as the app server
gem 'puma', '~> 3.7'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
# See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby

# Use CoffeeScript for .coffee assets and views
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'
# Use Redis adapter to run Action Cable in production
# gem 'redis', '~> 3.0'
# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'

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

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
# Adds support for Capybara system testing and selenium driver
gem 'capybara', '~> 2.13'
gem 'selenium-webdriver'
end

group :development do
# Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
gem 'web-console', '>= 3.3.0'
gem 'listen', '>= 3.0.5', '< 3.2'
# 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'
end

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