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

Upgrade to Bootstrap 4 with mobile-first approach #24

Closed
wants to merge 52 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
5380b29
Merge pull request #6 from betacraft/development
rtdp Aug 7, 2019
eefbfcc
Merge branch 'update'
rtdp Aug 7, 2019
db279eb
Merge with remote/master
anew-bhav Aug 7, 2019
614d80e
#8 - Add configuration for sentry
anew-bhav Aug 7, 2019
12507a8
Merge pull request #8 from betacraft/8-add_sentry_for_error_logging
rtdp Aug 8, 2019
cdd980b
Add validation to check the presence of description when creating or …
anew-bhav Aug 8, 2019
94c36c3
Merge pull request #7 from betacraft/#7-add_presence_of_description_v…
rtdp Aug 8, 2019
3552b6e
#8 - Add configuration for sentry
anew-bhav Aug 7, 2019
b0399d0
Add validation to check the presence of description when creating or …
anew-bhav Aug 8, 2019
529d067
Merge branch 'master' into #9_Make_letters_editable_deletable
anew-bhav Aug 9, 2019
81f2236
Merge pull request #9 from betacraft/#9_Make_letters_editable_deletable
anew-bhav Aug 9, 2019
bb4439d
Make Https compulsary in Production #10
anew-bhav Aug 9, 2019
028d7ae
Merge pull request #10 from betacraft/10_make_https_compulsary
anew-bhav Aug 9, 2019
d15562a
Add rake task to change URL scheme from http to https #14
anew-bhav Aug 9, 2019
f033c43
Merge pull request #14 from betacraft/14_resolve_issue_with_image_links
rtdp Aug 9, 2019
4e08b4d
#15 update sentry config
anew-bhav Aug 9, 2019
549ec2c
Merge pull request #15 from betacraft/15-update_sentry_config
rtdp Aug 9, 2019
7f03822
Fix for broken images on production #12
anew-bhav Aug 9, 2019
74d41d6
Merge pull request #12 from betacraft/12_fix_images_for_production
rtdp Aug 9, 2019
476131a
style fixes
rtdp Aug 9, 2019
5a89fad
#15 update sentry config
anew-bhav Aug 9, 2019
9c484e5
Fix for broken images on production #12
anew-bhav Aug 9, 2019
d6015e5
Minor Fixes
anew-bhav Aug 9, 2019
93ed7d1
Minor Fixes
anew-bhav Aug 9, 2019
aa37162
Merge branch '13-minor-fixes' of github.com:betacraft/whyloveruby int…
anew-bhav Aug 9, 2019
e9b832d
Merge pull request #13 from betacraft/13-minor-fixes
rtdp Aug 9, 2019
e749110
FIx twitter share text #19
anew-bhav Aug 10, 2019
c9d4c39
Merge pull request #19 from betacraft/19-update-text-for-tweet-button
anew-bhav Aug 10, 2019
8eb47d3
Update README with latest website URL.
anew-bhav Aug 28, 2019
729aeaf
Merge pull request #20 from betacraft/update-README
anew-bhav Aug 28, 2019
1260076
Add updated schema and sample database config file
mariogmz Oct 3, 2019
f2f6bd8
Add official bootstrap gem and sprockets
mariogmz Oct 3, 2019
dfd6da5
Add jquery-rails gem
mariogmz Oct 3, 2019
16259fe
Move to pure SASS pipeline using official bootstrap gem
mariogmz Oct 3, 2019
401de91
Refactor header and navigation bar
mariogmz Oct 3, 2019
df165b5
Ignore assets folder inside public
mariogmz Oct 3, 2019
3401076
Add styling for alerts
mariogmz Oct 3, 2019
0b18bdb
Add editorconfig file
mariogmz Oct 3, 2019
dcbf00c
Remove unused alert markup
mariogmz Oct 3, 2019
59fd3e4
Extract homepage layout with partials
mariogmz Oct 3, 2019
d841b1a
Extract footer into partial
mariogmz Oct 3, 2019
06f859f
Fix grid
mariogmz Oct 3, 2019
b66007f
Refactor letter text area
mariogmz Oct 3, 2019
135322d
Pimp what is about component
mariogmz Oct 3, 2019
26559df
Delete precompiled assets
mariogmz Oct 3, 2019
c6b8288
Merge branch 'master' of github.com:mariogmz/whyloveruby
mariogmz Oct 3, 2019
29f9d7c
Merge branch 'master' into responsive-ui
mariogmz Oct 3, 2019
a62271b
Update deprecated pulls for floats
mariogmz Oct 4, 2019
f59c75d
Refactor letter list
mariogmz Oct 4, 2019
1ae4ff7
Improve show more link behavior
mariogmz Oct 4, 2019
0077558
Fix show view and view more link
mariogmz Oct 4, 2019
7fd02c3
Refactor recently submitted
mariogmz Oct 4, 2019
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
33 changes: 33 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
root = true

[*]
trim_trailing_whitespace = true
insert_final_newline = true
end_of_line = lf
charset = utf-8
tab_width = 2

[*.md]
indent_style = space
max_line_length = 80

[**.js]
indent_style = space
indent_size = 2

# 2 spaces in scss
[**.scss]
indent_style = space
indent_size = 2

[**.css]
indent_style = space
indent_size = 2

[**.php]
indent_style = space
indent_size = 4

[**.html]
indent_style = space
indent_size = 2
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,5 @@ config/database.yml
.env
.generators
.byebug_history

public/assets/**/*
49 changes: 26 additions & 23 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
# frozen_string_literal: true

source 'https://rubygems.org'
ruby "2.4.0"
ruby '2.4.0'

gem 'rails', '5.2.3'

gem 'dotenv-rails', '~> 2.7', '>= 2.7.4'
gem 'pg'#, group: 'production'
#gem 'mysql2', group: 'development'
gem 'pg' # , group: 'production'
# gem 'mysql2', group: 'development'
gem 'bootsnap', '~> 1.4', '>= 1.4.4'
gem 'listen', '~> 3.1', '>= 3.1.5'

Expand All @@ -14,31 +16,32 @@ gem 'listen', '~> 3.1', '>= 3.1.5'

# Gems used only for assets and not required
# in production environments by default.
#group :assets do
#gem 'sass-rails', '~> 3.2.3'
#gem 'coffee-rails', '~> 3.2.1'
# group :assets do
# gem 'sass-rails', '~> 3.2.3'
# gem 'coffee-rails', '~> 3.2.1'

# See https://github.com/sstephenson/execjs#readme for more supported runtimes
# gem 'therubyracer'
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
# gem 'therubyracer'

gem 'uglifier', '>= 1.0.3'
#end
# end

gem 'byebug', '~>11.0.1'
gem 'puma', '~> 4.0.1'
gem 'twitter', '~> 6.2.0'
gem 'sentry-raven', '~> 2.11'
#gem 'jquery-rails'
gem "devise", "~> 4.6.2"
gem "omniauth", "~>1.9.0"
gem "omniauth-twitter", "~> 1.4.0"
gem "haml-rails", "~> 2.0.1"
gem "twitter-bootstrap-rails", "~> 4.0.0"
gem "redcarpet", "~> 1.17.2"
gem "nokogiri", "~> 1.10.3"
gem "pygmentize", "~> 0.0.3"
#gem "exception_notification", "~> 2.5.2"
gem 'twitter', '~> 6.2.0'
gem 'jquery-rails'
gem 'devise', '~> 4.6.2'
gem 'haml-rails', '~> 2.0.1'
gem 'nokogiri', '~> 1.10.3'
gem 'omniauth', '~>1.9.0'
gem 'omniauth-twitter', '~> 1.4.0'
gem 'pygmentize', '~> 0.0.3'
gem 'redcarpet', '~> 1.17.2'
# gem "exception_notification", "~> 2.5.2"
gem 'activeadmin', '~> 2.2.0'
gem 'newrelic_rpm'
gem "activeadmin", "~> 2.2.0"
#gem "meta_search", '>= 1.1.0.pre'
#gem "therubyracer", "~> 0.11.2"
# gem "meta_search", '>= 1.1.0.pre'
# gem "therubyracer", "~> 0.11.2"
gem 'bootstrap', '~> 4.3.1'
gem 'sprockets-rails', require: 'sprockets/railtie'
24 changes: 10 additions & 14 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -59,17 +59,22 @@ GEM
arbre (1.2.1)
activesupport (>= 3.0.0)
arel (9.0.0)
autoprefixer-rails (9.6.1.1)
execjs
babel-source (5.8.35)
babel-transpiler (0.7.0)
babel-source (>= 4.0, < 6)
execjs (~> 2.0)
bcrypt (3.1.13)
bootsnap (1.4.4)
msgpack (~> 1.0)
bootstrap (4.3.1)
autoprefixer-rails (>= 9.1.0)
popper_js (>= 1.14.3, < 2)
sassc-rails (>= 2.0.0)
buftok (0.2.0)
builder (3.2.3)
byebug (11.0.1)
commonjs (0.2.7)
concurrent-ruby (1.1.5)
crass (1.0.4)
devise (4.6.2)
Expand Down Expand Up @@ -146,13 +151,6 @@ GEM
activerecord
kaminari-core (= 1.1.1)
kaminari-core (1.1.1)
less (2.6.0)
commonjs (~> 0.2.7)
less-rails (2.8.0)
actionpack (>= 4.0)
less (~> 2.6.0)
sprockets (> 2, < 4)
tilt
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
Expand Down Expand Up @@ -190,6 +188,7 @@ GEM
rack
orm_adapter (0.5.0)
pg (1.1.4)
popper_js (1.14.5)
public_suffix (3.1.1)
puma (4.0.1)
nio4r (~> 2.0)
Expand Down Expand Up @@ -276,11 +275,6 @@ GEM
multipart-post (~> 2.0)
naught (~> 1.0)
simple_oauth (~> 0.3.0)
twitter-bootstrap-rails (4.0.0)
actionpack (~> 5.0, >= 5.0.1)
execjs (~> 2.7)
less-rails (~> 2.8, >= 2.8.0)
railties (~> 5.0, >= 5.0.1)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.1.20)
Expand All @@ -300,10 +294,12 @@ PLATFORMS
DEPENDENCIES
activeadmin (~> 2.2.0)
bootsnap (~> 1.4, >= 1.4.4)
bootstrap (~> 4.3.1)
byebug (~> 11.0.1)
devise (~> 4.6.2)
dotenv-rails (~> 2.7, >= 2.7.4)
haml-rails (~> 2.0.1)
jquery-rails
listen (~> 3.1, >= 3.1.5)
newrelic_rpm
nokogiri (~> 1.10.3)
Expand All @@ -315,8 +311,8 @@ DEPENDENCIES
rails (= 5.2.3)
redcarpet (~> 1.17.2)
sentry-raven (~> 2.11)
sprockets-rails
twitter (~> 6.2.0)
twitter-bootstrap-rails (~> 4.0.0)
uglifier (>= 1.0.3)

RUBY VERSION
Expand Down
4 changes: 3 additions & 1 deletion app/admin/letter.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
ActiveAdmin.register Letter do

index do
permit_params :description

index do
column :id
column :description do |l|
l.description.truncate(200)
Expand Down
1 change: 1 addition & 0 deletions app/assets/images/like-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
// GO AFTER THE REQUIRES BELOW.
//
//= require jquery
//= require jquery3
//= require jquery_ujs
//= require twitter/bootstrap
//= require popper
//= require bootstrap
//= require_tree .
Loading