diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index fed0a02..105c015 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -42,4 +42,4 @@ //= require flash.js - +//= require js/maps/gdp-data.js \ No newline at end of file diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 4d1cd19..e7cb87e 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -13,7 +13,6 @@ * - */ @import "bootstrap-sprockets"; diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index d83690e..d5081c5 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,5 +1,5 @@ class ApplicationController < ActionController::Base # Prevent CSRF attacks by raising an exception. # For APIs, you may want to use :null_session instead. - protect_from_forgery with: :exception + # protect_from_forgery with: :exception end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 01728d9..647a6b2 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -3,8 +3,8 @@ <%= content_for?(:title) ? yield(:title) : "GentelellaOnRails" %> - <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %> - <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %> + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => false %> + <%= javascript_include_tag 'application', 'data-turbolinks-track' => false %> <%= csrf_meta_tags %> @@ -25,7 +25,7 @@ <%= yield %> <%= render "partials/footer" %> - <%= javascript_include_tag 'footermanifest', 'data-turbolinks-track' => true %> + <%= javascript_include_tag 'footermanifest', 'data-turbolinks-track' => false %> diff --git a/app/views/partials/_sidenav.html.erb b/app/views/partials/_sidenav.html.erb index 22ae9ab..ec369ce 100644 --- a/app/views/partials/_sidenav.html.erb +++ b/app/views/partials/_sidenav.html.erb @@ -34,9 +34,9 @@ diff --git a/app/views/plainpage/dashboard.html b/app/views/plainpage/dashboard.html index 7408675..bb3f8c5 100755 --- a/app/views/plainpage/dashboard.html +++ b/app/views/plainpage/dashboard.html @@ -10,19 +10,6 @@ - - - - - - - - - - - - - @@ -765,26 +752,26 @@
- + - - + - + - + - + - - - + --> + + - + - + - + - + + + + + + + + + + + + + + + diff --git a/app/views/plainpage/dashboard2.html b/app/views/plainpage/dashboard2.html new file mode 100755 index 0000000..1a009c5 --- /dev/null +++ b/app/views/plainpage/dashboard2.html @@ -0,0 +1,870 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+
+
+
+
+
179
+ +

New Sign ups

+

Lorem ipsum psdea itgum rixt.

+
+
+
+
+
+
+
179
+ +

New Sign ups

+

Lorem ipsum psdea itgum rixt.

+
+
+
+
+
+
+
179
+ +

New Sign ups

+

Lorem ipsum psdea itgum rixt.

+
+
+
+
+
+
+
179
+ +

New Sign ups

+

Lorem ipsum psdea itgum rixt.

+
+
+
+ +
+
+
+
+

Transaction Summary Weekly progress

+
+
+ + December 30, 2014 - January 28, 2015 +
+
+
+
+
+
+
+
+
+
+
+ Total Sessions +

231,809

+ + + +
+
+ Total Revenue +

$231,809

+ + + +
+
+ Total Sessions +

231,809

+ + + +
+
+ +
+ +
+
+
+

Top Profiles

+ +
+
+ +
+
+ +
+
+
+
+ + + +
+
+
+
+

Weekly Summary Activity shares

+ +
+
+
+ +
+
+ + + +

Weekly sales progress

+
+ +
+
+
+ +

Bounce Rates

+
+
+ +

New Traffic

+
+
+ +

Device Share

+
+
+
+
+
+
+
+
+ + + +
+
+
+
+

Top Profiles Sessions

+ +
+
+
+ + + + + +
+
+
+ +
+
+
+

Top Profiles Sessions

+ +
+
+
+ + + + + +
+
+
+ +
+
+
+

Top Profiles Sessions

+ +
+
+
+ + + + + +
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/views/plainpage/dashboard3.html b/app/views/plainpage/dashboard3.html new file mode 100755 index 0000000..8d54df5 --- /dev/null +++ b/app/views/plainpage/dashboard3.html @@ -0,0 +1,1241 @@ + + + + + + + + + + + Gentallela Alela! | + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+ +
+
+ +
+ Gentellela Alela! +
+
+ + + +
+
+ ... +
+
+ Welcome, +

John Doe

+
+
+ + +
+ + + + + + +
+ + + + + + + + + + + + +
+ +
+
+ + +
+ +
+ +
+ +
+ + + + +
+
+ +
+
+ Total Sessions +

231,809

+ + + +
+
+ Total Revenue +

$ 231,809

+ + + +
+
+ Total Sessions +

231,809

+ + + +
+
+ Total Sessions +

231,809

+ + + +
+
+
+ + +
+
+
+
+
+

Network Activities Graph title sub-title

+
+
+
+ + December 30, 2014 - January 28, 2015 +
+
+
+
+
+
+
+
+
+
+
+ + +
+
+
+
+

App Devices Sessions

+ +
+
+
+

App Versions

+
+
+ 1.5.2 +
+
+
+
+ 60% Complete +
+
+
+
+ 123k +
+
+
+ +
+
+ 1.5.3 +
+
+
+
+ 60% Complete +
+
+
+
+ 53k +
+
+
+
+
+ 1.5.4 +
+
+
+
+ 60% Complete +
+
+
+
+ 23k +
+
+
+
+
+ 1.5.5 +
+
+
+
+ 60% Complete +
+
+
+
+ 3k +
+
+
+
+
+ 0.1.5.6 +
+
+
+
+ 60% Complete +
+
+
+
+ 1k +
+
+
+ +
+
+
+ +
+
+
+

Daily users Sessions

+ +
+
+
+ + + + + + + + + +
+

Top 5

+ 		+
+

Device

+
+
+

Progress

+
+
+ + + + + + + + + + + + + + + + + + + + + + + +
+

IOS

+ 		30%
+

Android

+ 		10%
+

Blackberry

+ 		20%
+

Symbian

+ 		15%
+

Others

+ 		30%
+
+
+
+
+ +
+
+
+

Profile Settings Sessions

+ +
+
+
+
+ + +
+

Profile Completion

+ +
+ 0 + % + 100% +
+
+
+
+
+
+ +
+
+
+

User Uptake

+ +
+
+
+ +
+ +
+ +
+
+ Escudor Wireless 1.0 + This sis +
+
+ +
+ SSD +
+
+
+
+
+
+
+ 89% +
+
+
+
+ Mobile Access + Smart Phone +
+
+ +
+ App +
+
+
+
+
+
+
+ 79% +
+
+
+
+ WAN access users + Total 69% +
+
+ +
+ Usr +
+
+
+
+
+
+
+ 69% +
+
+ +
+
+
+
+ + +
+
+
+

Today's Weather Sessions

+ +
+
+
+
+
+
Monday, 07:30 AM + F + C + +
+
+
+
+
+
+ + + + +
+
+
+
+

Texas +
Partly Cloudy Day +

+
+
+
+
+
+

23

+
+
+
+ + +
+
+
+

Mon

+

25

+ + + + + +
15 + km/h +
+
+
+
+
+

Tue

+

25

+ +
12 + km/h +
+
+
+
+
+

Wed

+

27

+ +
14 + km/h +
+
+
+
+
+

Thu

+

28

+ +
15 + km/h +
+
+
+
+
+

Fri

+

28

+ +
11 + km/h +
+
+
+
+
+

Sat

+

26

+ +
10 + km/h +
+
+
+
+
+
+
+ +
+ + +
+
+
+

Incomes Sessions

+ +
+
+
+
+ + +
+

Goal

+ +
+ $ + 3,200 + $5,000 +
+
+
+
+
+
+
+
+
+ + + +
+
+ Gentelella - Bootstrap Admin Template by Colorlib +
+
+
+ +
+
+ +
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/routes.rb b/config/routes.rb index 0981f6c..f0a0016 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -7,6 +7,7 @@ Rails.application.routes.draw do root 'plainpage#index' get 'index' => 'plainpage#index' get 'dashboard' => 'plainpage#dashboard' + get 'dashboard2' => 'plainpage#dashboard2' # Example of regular route: # get 'products/:id' => 'catalog#view'