Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
142 commits
Select commit Hold shift + click to select a range
9259e50
create models, migrations and db seed
IliyanGanev Apr 24, 2017
9016c69
refactor
IliyanGanev May 5, 2017
3a8e25e
Add some forms
IliyanGanev May 6, 2017
15ee022
Merge pull request #2 from IliyanGanev/solo-iliyan
IliyanGanev May 6, 2017
1c08cd4
Update models and migrations
IliyanGanev May 23, 2017
b0f58ef
update routes
IliyanGanev May 23, 2017
c26d909
Merge pull request #3 from IliyanGanev/solo-il
IliyanGanev May 23, 2017
958389f
some form css
IliyanGanev May 26, 2017
55157d3
Merge pull request #4 from IliyanGanev/solo-il
IliyanGanev May 26, 2017
4f3f283
cstyle the forms
IliyanGanev May 26, 2017
f029e19
put key
IliyanGanev May 27, 2017
88ef692
Merge pull request #5 from IliyanGanev/solo-il
IliyanGanev May 27, 2017
ce90402
Get both APIs working
IliyanGanev May 29, 2017
7fde9ef
comment out
IliyanGanev May 29, 2017
e0ad7fc
add background image
IliyanGanev May 29, 2017
ba80677
remove key
IliyanGanev May 29, 2017
56a0469
Set env variables
IliyanGanev Jun 1, 2017
c1ec71c
finished
IliyanGanev Jun 1, 2017
ecf544e
sdf
IliyanGanev Jun 27, 2017
0192d2e
asdf
IliyanGanev Jun 27, 2017
de73fc1
Save changes before branching
IliyanGanev Jul 7, 2017
e97b33e
fix some css
IliyanGanev Jul 8, 2017
5146024
Merge pull request #6 from IliyanGanev/refactor
IliyanGanev Jul 8, 2017
1648cb1
Add humidity
IliyanGanev Jul 11, 2017
b022330
Add JS date and time
IliyanGanev Jul 12, 2017
a7eed03
Working before refactor
IliyanGanev Jul 18, 2017
9fec02d
Fix the api calls and css
IliyanGanev Jul 19, 2017
e6b28b6
Merge pull request #7 from IliyanGanev/refactor
IliyanGanev Jul 19, 2017
ba9f43e
Add forecast queries for next 5 days
IliyanGanev Jul 20, 2017
65d8ab5
Five day forecast almost done
IliyanGanev Jul 20, 2017
bbcdb8d
Merge pull request #8 from IliyanGanev/refactor
IliyanGanev Jul 20, 2017
17f609b
Improve styling and controller actions
IliyanGanev Jul 22, 2017
6848bff
Add css and 10 day forecast hard code
IliyanGanev Jul 22, 2017
95315ce
Merge pull request #9 from IliyanGanev/refactor
IliyanGanev Jul 22, 2017
9f5f925
More styling
IliyanGanev Jul 25, 2017
76ae885
Add transperant glass simulating container
IliyanGanev Jul 25, 2017
96d713b
Merge branch 'master' of https://github.com/IliyanGanev/passion-proje…
IliyanGanev Jul 25, 2017
b8d3e98
Merge pull request #10 from IliyanGanev/refactor
IliyanGanev Jul 25, 2017
d81d412
Refactor the controllers and views. Get rid of the hard coded stuff
IliyanGanev Jul 25, 2017
ce0ba10
Small fixez
IliyanGanev Jul 26, 2017
6d89dcd
Merge branch 'master' of https://github.com/IliyanGanev/passion-proje…
IliyanGanev Jul 26, 2017
0a36821
Merge pull request #11 from IliyanGanev/refactor
IliyanGanev Jul 26, 2017
73663e3
Fix bugs
IliyanGanev Jul 26, 2017
5704ba4
Merge pull request #12 from IliyanGanev/refactor
IliyanGanev Jul 26, 2017
0fb11ac
Add hourly forecast for 34 hour periods
IliyanGanev Jul 28, 2017
9e0843b
Add 10 day hourly forecast and delete refactored commented out hard c…
IliyanGanev Jul 28, 2017
3e4e900
Merge branch 'master' of https://github.com/IliyanGanev/passion-proje…
IliyanGanev Jul 28, 2017
d1bfa53
Add button for new forecast search
IliyanGanev Jul 28, 2017
c7ab508
Some insignificant changes
IliyanGanev Jul 29, 2017
4405fce
Refactor to reduce API calls for hourly forecast
IliyanGanev Aug 1, 2017
f3a2d34
Able to send and receive sms with twilio
IliyanGanev Aug 2, 2017
946452b
Add twilio helper and get sms response with 5 day weather forecast
IliyanGanev Aug 3, 2017
9925f3d
improve twilio controller and add style
IliyanGanev Aug 3, 2017
ad68de8
Fix sign up and login pages
IliyanGanev Aug 3, 2017
769f347
Update phone number validations
IliyanGanev Aug 4, 2017
1ed8b33
Fix datetime position
IliyanGanev Aug 4, 2017
2fb7852
Improve styling
IliyanGanev Aug 8, 2017
0750539
Work on logo style and right menu style
IliyanGanev Aug 9, 2017
d78670e
Adddd style
IliyanGanev Aug 9, 2017
b3be004
Get footer at the bottom of each page to work
IliyanGanev Aug 9, 2017
fa7289c
Finally got the footer to display properly
IliyanGanev Aug 10, 2017
766036a
Do take me to the top circle button
IliyanGanev Aug 10, 2017
63d1098
Fix forms
IliyanGanev Aug 11, 2017
2ecd932
Fix position of forms
IliyanGanev Aug 11, 2017
a53190e
Some styling
IliyanGanev Aug 12, 2017
b8431c2
Get forecast history for registered users. Improve about page
IliyanGanev Aug 14, 2017
9c5bfbe
Get the forecast history page working and crispy styled
IliyanGanev Aug 15, 2017
8098d19
Small CSS update
IliyanGanev Aug 15, 2017
59cd524
Make small improvements. Still in process
IliyanGanev Aug 15, 2017
c355098
Add history feature and get it to work. Start making the thing respon…
IliyanGanev Aug 18, 2017
026a8e2
Make it responsive.Looks good on pads and phones.
IliyanGanev Aug 18, 2017
2b39b45
Done with responsive design
IliyanGanev Aug 18, 2017
27dc020
Make sure Twilio works receiving and sending text to registered users.
IliyanGanev Aug 18, 2017
fa32816
Make menu partial to make code Dryer
IliyanGanev Aug 23, 2017
b16747f
Active menu link working without js
IliyanGanev Aug 24, 2017
4a95b3a
Add background color on datetime
IliyanGanev Aug 24, 2017
edac812
Work on readme.Add screenshots
IliyanGanev Aug 25, 2017
40733df
Add image to redme
IliyanGanev Aug 25, 2017
dd352e5
Test some changes
IliyanGanev Aug 29, 2017
316e27b
Delete file
IliyanGanev Aug 30, 2017
1ab51d8
Add small formatting
IliyanGanev Aug 30, 2017
4080df2
Merge branch 'refactor'
IliyanGanev Aug 30, 2017
f5b3dce
Add address to readme
IliyanGanev Aug 30, 2017
58a7883
Update readme
IliyanGanev Aug 30, 2017
a3b5c9f
Change css link to https
IliyanGanev Aug 30, 2017
534e539
Merge branch 'refactor'
IliyanGanev Aug 30, 2017
fafa448
Fix readme file
IliyanGanev Sep 8, 2017
2917305
Add confirm JS message when deleting user profile
IliyanGanev Sep 8, 2017
ee5d689
Add yesterdays history button
IliyanGanev Sep 8, 2017
54bf588
Add temp in celsius for SMS feature
IliyanGanev Sep 12, 2017
a0b4c33
Merge branch 'refactor'
IliyanGanev Sep 12, 2017
ea0be94
Unhide form to test yesterdays feature
IliyanGanev Sep 12, 2017
7fdecfc
Merge branch 'refactor'
IliyanGanev Sep 12, 2017
70f192e
Test form
IliyanGanev Sep 12, 2017
e975db1
Merge branch 'refactor'
IliyanGanev Sep 12, 2017
96fefcb
Test hostory form one
IliyanGanev Sep 12, 2017
dcb0376
Merge branch 'refactor'
IliyanGanev Sep 12, 2017
2043b96
Change id to test datepicker
IliyanGanev Sep 12, 2017
d7a249e
Merge branch 'refactor'
IliyanGanev Sep 12, 2017
995ddaa
Yet another try
IliyanGanev Sep 12, 2017
dbac5af
Merge branch 'refactor'
IliyanGanev Sep 12, 2017
fcf5dba
test
IliyanGanev Sep 12, 2017
ac5ac82
Merge branch 'refactor'
IliyanGanev Sep 12, 2017
82c030f
test
IliyanGanev Sep 12, 2017
539e046
Merge branch 'refactor'
IliyanGanev Sep 12, 2017
c9b781e
test
IliyanGanev Sep 12, 2017
c54dc83
Merge branch 'refactor'
IliyanGanev Sep 12, 2017
562afc2
test
IliyanGanev Sep 12, 2017
10b2a7c
Merge branch 'refactor'
IliyanGanev Sep 12, 2017
df6354c
test
IliyanGanev Sep 12, 2017
a95f208
Merge branch 'refactor'
IliyanGanev Sep 12, 2017
e586d37
test datepicker again
IliyanGanev Sep 12, 2017
969e45d
Merge branch 'refactor'
IliyanGanev Sep 12, 2017
66ee9ff
test
IliyanGanev Sep 12, 2017
5c7829b
Merge branch 'refactor'
IliyanGanev Sep 12, 2017
9720f20
test
IliyanGanev Sep 12, 2017
deee0e4
Merge branch 'refactor'
IliyanGanev Sep 12, 2017
01a4455
test
IliyanGanev Sep 12, 2017
e15a892
Merge branch 'refactor'
IliyanGanev Sep 12, 2017
f1da23a
Comment out yesterdays history form
IliyanGanev Sep 13, 2017
20a1a83
Change readme
IliyanGanev Sep 13, 2017
48d580b
Add emphasis on readme
IliyanGanev Sep 13, 2017
e107c64
Merge branch 'refactor'
IliyanGanev Sep 13, 2017
e6fff72
Debug JS file
IliyanGanev Sep 13, 2017
1f22026
Merge branch 'refactor'
IliyanGanev Sep 13, 2017
f1db619
test
IliyanGanev Sep 13, 2017
87eef4a
Merge branch 'refactor'
IliyanGanev Sep 13, 2017
9265e03
test
IliyanGanev Sep 13, 2017
dac6d1a
Merge branch 'refactor'
IliyanGanev Sep 13, 2017
3880984
test
IliyanGanev Sep 13, 2017
c0c065a
Merge branch 'refactor'
IliyanGanev Sep 13, 2017
803457f
test
IliyanGanev Sep 13, 2017
704ce43
Merge branch 'refactor'
IliyanGanev Sep 13, 2017
054bd0d
Get yesterday history working and deploy on heroku
IliyanGanev Sep 13, 2017
02f9e6d
Merge branch 'refactor'
IliyanGanev Sep 13, 2017
691aa58
fix typo
IliyanGanev Sep 14, 2017
3d11682
Merge branch 'refactor'
IliyanGanev Sep 14, 2017
bb02280
Fix minor css issue
IliyanGanev Sep 14, 2017
5d5cb14
Merge branch 'refactor'
IliyanGanev Sep 14, 2017
8c09c92
Compress background image and remove unnecessary files
IliyanGanev Sep 14, 2017
b902953
Merge branch 'refactor'
IliyanGanev Sep 14, 2017
2143294
Add email validations
IliyanGanev Sep 19, 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
5 changes: 4 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ gem 'sinatra-contrib'

gem 'activesupport'
gem 'activerecord'
gem 'bcrypt-ruby'
gem 'bcrypt'
gem 'httparty'
gem 'twilio-ruby'
gem 'dotenv'

gem 'rake'

Expand Down
123 changes: 70 additions & 53 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,83 +1,94 @@
GEM
remote: https://rubygems.org/
specs:
activemodel (4.2.1)
activesupport (= 4.2.1)
builder (~> 3.1)
activerecord (4.2.1)
activemodel (= 4.2.1)
activesupport (= 4.2.1)
arel (~> 6.0)
activesupport (4.2.1)
activemodel (5.0.2)
activesupport (= 5.0.2)
activerecord (5.0.2)
activemodel (= 5.0.2)
activesupport (= 5.0.2)
arel (~> 7.0)
activesupport (5.0.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
arel (6.0.0)
backports (3.6.4)
bcrypt (3.1.10)
bcrypt-ruby (3.1.5)
bcrypt (>= 3.1.3)
builder (3.2.2)
capybara (2.4.4)
addressable (2.5.1)
public_suffix (~> 2.0, >= 2.0.2)
arel (7.1.4)
backports (3.7.0)
bcrypt (3.1.11)
builder (3.2.3)
capybara (2.13.0)
addressable
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
concurrent-ruby (1.0.5)
database_cleaner (1.4.1)
diff-lcs (1.2.5)
factory_girl (4.5.0)
diff-lcs (1.3)
dotenv (2.2.1)
factory_girl (4.8.0)
activesupport (>= 3.0.0)
faker (1.4.3)
faker (1.7.3)
i18n (~> 0.5)
i18n (0.7.0)
json (1.8.2)
mime-types (2.5)
mini_portile (0.6.2)
minitest (5.6.1)
multi_json (1.11.0)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
pg (0.18.2)
rack (1.6.1)
httparty (0.15.5)
multi_xml (>= 0.5.2)
i18n (0.8.1)
jwt (1.5.6)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_portile2 (2.1.0)
minitest (5.10.1)
multi_json (1.12.1)
multi_xml (0.6.0)
nokogiri (1.7.1)
mini_portile2 (~> 2.1.0)
pg (0.20.0)
public_suffix (2.0.5)
rack (1.6.5)
rack-protection (1.5.3)
rack
rack-test (0.6.3)
rack (>= 1.0)
rake (10.4.2)
rspec (3.2.0)
rspec-core (~> 3.2.0)
rspec-expectations (~> 3.2.0)
rspec-mocks (~> 3.2.0)
rspec-core (3.2.3)
rspec-support (~> 3.2.0)
rspec-expectations (3.2.1)
rake (12.0.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.2.0)
rspec-mocks (3.2.1)
rspec-support (~> 3.5.0)
rspec-mocks (3.5.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.2.0)
rspec-support (3.2.2)
shotgun (0.9.1)
rspec-support (~> 3.5.0)
rspec-support (3.5.0)
shotgun (0.9.2)
rack (>= 1.0)
shoulda-matchers (2.8.0)
activesupport (>= 3.0.0)
sinatra (1.4.6)
rack (~> 1.4)
shoulda-matchers (3.1.1)
activesupport (>= 4.0.0)
sinatra (1.4.8)
rack (~> 1.5)
rack-protection (~> 1.4)
tilt (>= 1.3, < 3)
sinatra-contrib (1.4.2)
sinatra-contrib (1.4.7)
backports (>= 2.0)
multi_json
rack-protection
rack-test
sinatra (~> 1.4.0)
tilt (~> 1.3)
thread_safe (0.3.5)
tilt (1.4.1)
tzinfo (1.2.2)
tilt (>= 1.3, < 3)
thread_safe (0.3.6)
tilt (2.0.7)
twilio-ruby (4.13.0)
builder (>= 2.1.2)
jwt (~> 1.0)
multi_json (>= 1.3.0)
tzinfo (1.2.3)
thread_safe (~> 0.1)
xpath (2.0.0)
nokogiri (~> 1.3)
Expand All @@ -88,11 +99,13 @@ PLATFORMS
DEPENDENCIES
activerecord
activesupport
bcrypt-ruby
bcrypt
capybara
database_cleaner (~> 1.4.1)
dotenv
factory_girl
faker
httparty
pg
rack-test
rake
Expand All @@ -101,3 +114,7 @@ DEPENDENCIES
shoulda-matchers
sinatra
sinatra-contrib
twilio-ruby

BUNDLED WITH
1.14.6
103 changes: 103 additions & 0 deletions Gemfile1.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
GEM
remote: https://rubygems.org/
specs:
activemodel (4.2.1)
activesupport (= 4.2.1)
builder (~> 3.1)
activerecord (4.2.1)
activemodel (= 4.2.1)
activesupport (= 4.2.1)
arel (~> 6.0)
activesupport (4.2.1)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
arel (6.0.0)
backports (3.6.4)
bcrypt (3.1.10)
bcrypt-ruby (3.1.5)
bcrypt (>= 3.1.3)
builder (3.2.2)
capybara (2.4.4)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
database_cleaner (1.4.1)
diff-lcs (1.2.5)
factory_girl (4.5.0)
activesupport (>= 3.0.0)
faker (1.4.3)
i18n (~> 0.5)
i18n (0.7.0)
json (1.8.2)
mime-types (2.5)
mini_portile (0.6.2)
minitest (5.6.1)
multi_json (1.11.0)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
pg (0.18.2)
rack (1.6.1)
rack-protection (1.5.3)
rack
rack-test (0.6.3)
rack (>= 1.0)
rake (10.4.2)
rspec (3.2.0)
rspec-core (~> 3.2.0)
rspec-expectations (~> 3.2.0)
rspec-mocks (~> 3.2.0)
rspec-core (3.2.3)
rspec-support (~> 3.2.0)
rspec-expectations (3.2.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.2.0)
rspec-mocks (3.2.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.2.0)
rspec-support (3.2.2)
shotgun (0.9.1)
rack (>= 1.0)
shoulda-matchers (2.8.0)
activesupport (>= 3.0.0)
sinatra (1.4.6)
rack (~> 1.4)
rack-protection (~> 1.4)
tilt (>= 1.3, < 3)
sinatra-contrib (1.4.2)
backports (>= 2.0)
multi_json
rack-protection
rack-test
sinatra (~> 1.4.0)
tilt (~> 1.3)
thread_safe (0.3.5)
tilt (1.4.1)
tzinfo (1.2.2)
thread_safe (~> 0.1)
xpath (2.0.0)
nokogiri (~> 1.3)

PLATFORMS
ruby

DEPENDENCIES
activerecord
activesupport
bcrypt-ruby
capybara
database_cleaner (~> 1.4.1)
factory_girl
faker
pg
rack-test
rake
rspec
shotgun
shoulda-matchers
sinatra
sinatra-contrib
72 changes: 52 additions & 20 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,30 +1,62 @@
> **Note**: This branch (master) contains a skeleton without any app code, perfect for creating a _new_ application or challenge. If you're looking for an example app built with this skeleton, take a look at the [example](/../..//tree/example) branch which includes basic CRUD and RSpec tests.
Weather
===

### Purpose
The Sinatra Skeleton:
## Deployment

1. Provides a foundation for building challenges or creating a new Sinatra application.
2. Demonstrates a reasonable set of practices around building Sinatra applications.
3. Eases the transition to Rails for Dev Bootcamp students
https://weather--sms.herokuapp.com

### Quickstart
## Description
**Get Weather Forecast via SMS!**

1. `bundle install`
2. `shotgun config.ru`
Weather is a fully responsive forecast application that utilizes Twilio and WU APIs, enabling users(registered with valid US phone number) to check weather using text messaging, when no internet is available or just for convenience.
The forecasts available to all users are: 5 day, 10 day, hourly 5 day and hourly 10 day. In addition forecast history can be traced back up to 60 years for some cities. Registered users have the option to check their search history and edit or delete their accounts.

As needed, create models & migrations with the `rake` tasks:
## Interface

```
rake generate:migration # Create an empty migration in db/migrate, e.g., rake generate:migration NAME=create_tasks
rake generate:model # Create an empty model in app/models, e.g., rake generate:model NAME=User
```
<p align="center">
<img src="/screenshots/index.png">
Upon opening the application users can directly check forecast for any city or register to use the SMS option.
</p>

### Contributing
<p align="center">
<img src="/screenshots/register.png">
Register page with some info.
</p>

We would love for you to help make the skeleton more awesome, There are three ways to contribute:
<p align="center">
<img src="/screenshots/fiveday.png">
Five day forecast.
</p>

1. Ask for a bug fix or enhancement!
2. Submit a pull request for a bug fix or enhancement!
3. Code review an open pull request!
<p align="center">
<img src="/screenshots/midviewoftenday.png">
Mid view of ten day forecast.
</p>

Be prepared to give and receive specific, actionable, and kind feedback!
<p align="center">
<img src="/screenshots/historyform.png">
Form to check history.
</p>

<p align="center">
<img src="/screenshots/historyinfo.png">
History info for the date selected.
</p>

<p align="center">
<img src="/screenshots/mobileregister.png"><br>
Mobile view of the register form.
</p>

<p align="center">
<img src="/screenshots/mobileprofile.png"><br>
Mobile view of the user profile page.
</p>


## Tech Stack
Ruby, JavaScript, Jquery, Sinatra, HTML5, CSS3, WU and Twilio API
### Dependencies for local development:

* Ruby (2.3.1)
* Sinatra (1.4.7)
11 changes: 0 additions & 11 deletions app/controllers/auth.rb

This file was deleted.

Loading