Merge pull request #249 from CLOSER-Cohorts/removing_home_graphics

Turning off code that generates Archivist's graphics. Rearranging Arc…
CLOSER-Cohorts · Aug 20, 2018 · 814476f · 814476f
2 parents 531b7c0 + 661471c
commit 814476f
Show file tree

Hide file tree

Showing 6 changed files with 108 additions and 95 deletions.
diff --git a/app/assets/javascripts/application.coffee b/app/assets/javascripts/application.coffee
@@ -67,7 +67,7 @@ archivist.config([ '$routeProvider', '$locationProvider', '$rootScopeProvider',
         controller: 'HomeController'
       )
     $locationProvider.html5Mode true
-    $rootScopeProvider.digestTtl(14);
+    $rootScopeProvider.digestTtl(14)
 ])
 
 archivist.controller('RootController',
@@ -104,94 +104,95 @@ archivist.controller('HomeController',
     '$scope',
     'DataManager'
     ($scope, DataManager)->
-      $scope.chart_one = {}
-      $scope.chart_two = {}
-      $scope.chart_three = {}
-      $scope.chart_four = {}
-      $scope.chart_one.type = $scope.chart_three.type = $scope.chart_four.type =  "ColumnChart"
-      $scope.chart_two.type = "Histogram"
-      $scope.instruments = DataManager.getInstruments {}, (res)->
-        $scope.chart_one.data = {
-          cols: [
-            {
-              id: "s",
-              label: "Study",
-              type: "string"
-            },
-            {
-              id: "i",
-              label: "Instruments",
-              type: "number"
-            }
-          ]
-        }
-        $scope.chart_two.data = [
-          [
-            'Instrument',
-            'Control Constructs'
-          ]
-        ]
-        $scope.chart_three.data = {
-          cols: [
-            {
-              id: "s",
-              label: "Study",
-              type: "string"
-            },
-            {
-              id: "s",
-              label: "Avg. Constructs Per Instrument",
-              type: "number"
-            }
-          ]
-        }
-        $scope.chart_one.data['rows'] = []
-        $scope.chart_three.data['rows'] = []
-        data = {}
-        for i in res
-          if i.study of data
-            data[i.study]['instruments'] += 1
-            data[i.study]['ccs'] += i.ccs
-          else
-            data[i.study] =
-              'instruments' : 1
-              'ccs'         : i.ccs
-
-          $scope.chart_two.data.push [
-            i.title,
-            i.ccs
-          ]
-        Object.sort(data)
-        for s of data
-          $scope.chart_one.data['rows'].push {
-            c: [
-              {v: s}, {v: data[s]['instruments']}
-            ]
-          }
-          $scope.chart_three.data['rows'].push {
-            c: [
-              {v: s}, {v: data[s]['ccs'] / data[s]['instruments']}
-            ]
-          }
-        $scope.studies = Object.keys data
-      $scope.datasets = DataManager.getDatasets()
-      console.log $scope
-
-      $scope.chart_one.options =
-        'title': 'Instruments'
-        'legend':
-          'position': 'none'
-        'colors': ['#652C90']
-      $scope.chart_two.options =
-        'title': 'Control Construct Distribution'
-        'legend':
-          'position': 'none'
-        'colors': ['#FBAF3F']
-      $scope.chart_three.options =
-        'title': 'Avg. Constructs per Instrument'
-        'legend':
-          'position': 'none'
-        'colors': ['#00ADEF']
+      console.log 'HomeController loading...'
+      # $scope.chart_one = {}
+      # $scope.chart_two = {}
+      # $scope.chart_three = {}
+      # $scope.chart_four = {}
+      # $scope.chart_one.type = $scope.chart_three.type = $scope.chart_four.type =  "ColumnChart"
+      # $scope.chart_two.type = "Histogram"
+      # $scope.instruments = DataManager.getInstruments {}, (res)->
+      #   $scope.chart_one.data = {
+      #     cols: [
+      #       {
+      #         id: "s",
+      #         label: "Study",
+      #         type: "string"
+      #       },
+      #       {
+      #         id: "i",
+      #         label: "Instruments",
+      #         type: "number"
+      #       }
+      #     ]
+      #   }
+      #   $scope.chart_two.data = [
+      #     [
+      #       'Instrument',
+      #       'Control Constructs'
+      #     ]
+      #   ]
+      #   $scope.chart_three.data = {
+      #     cols: [
+      #       {
+      #         id: "s",
+      #         label: "Study",
+      #         type: "string"
+      #       },
+      #       {
+      #         id: "s",
+      #         label: "Avg. Constructs Per Instrument",
+      #         type: "number"
+      #       }
+      #     ]
+      #   }
+      #   $scope.chart_one.data['rows'] = []
+      #   $scope.chart_three.data['rows'] = []
+      #   data = {}
+      #   for i in res
+      #     if i.study of data
+      #       data[i.study]['instruments'] += 1
+      #       data[i.study]['ccs'] += i.ccs
+      #     else
+      #       data[i.study] =
+      #         'instruments' : 1
+      #         'ccs'         : i.ccs
+      #
+      #     $scope.chart_two.data.push [
+      #       i.title,
+      #       i.ccs
+      #     ]
+      #   Object.sort(data)
+      #   for s of data
+      #     $scope.chart_one.data['rows'].push {
+      #       c: [
+      #         {v: s}, {v: data[s]['instruments']}
+      #       ]
+      #     }
+      #     $scope.chart_three.data['rows'].push {
+      #       c: [
+      #         {v: s}, {v: data[s]['ccs'] / data[s]['instruments']}
+      #       ]
+      #     }
+      #   $scope.studies = Object.keys data
+      # $scope.datasets = DataManager.getDatasets()
+      # console.log $scope
+      #
+      # $scope.chart_one.options =
+      #   'title': 'Instruments'
+      #   'legend':
+      #     'position': 'none'
+      #   'colors': ['#652C90']
+      # $scope.chart_two.options =
+      #   'title': 'Control Construct Distribution'
+      #   'legend':
+      #     'position': 'none'
+      #   'colors': ['#FBAF3F']
+      # $scope.chart_three.options =
+      #   'title': 'Avg. Constructs per Instrument'
+      #   'legend':
+      #     'position': 'none'
+      #   'colors': ['#00ADEF']
   ]
 )
 

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -1,5 +1,5 @@
+# Application Controller
 class ApplicationController < ActionController::Base
-  include Pundit
   # Prevent CSRF attacks by raising an exception.
   # For APIs, you may want to use :null_session instead.
   include Pundit
@@ -8,6 +8,15 @@ class ApplicationController < ActionController::Base
 
   after_action :set_csrf_cookie_for_ng
 
+  # around_action :collect_metrics
+
+  # def collect_metrics
+  #   start = Time.now
+  #   yield
+  #   duration = Time.now - start
+  #   Rails.logger.info "#{controller_name}##{action_name}: #{duration}s"
+  # end
+
   def current_user
     super || User.where(api_key: params['api_key']).where('api_key IS NOT NULL').first
   end

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap-glyphicons.css" rel="stylesheet">
+    <link href="https://netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap-glyphicons.css" rel="stylesheet">
     <title data-ng-bind-template="{{page.title}} | Archivist">Archivist</title>
     <%= stylesheet_link_tag    'application', media: 'all'%>
     <%= javascript_include_tag 'application'%>

diff --git a/app/views/main/index.html.erb b/app/views/main/index.html.erb
@@ -11,9 +11,6 @@
 		</div>
 		<div class="navbar-collapse collapse" id="navbar">
 			<ul class="nav navbar-nav" data-ng-show="user.logged_in">
-				<li data-ng-class="{active: isActive('/')}">
-					<a href="/">Home</a>
-				</li>
 				<li data-ng-class="{active: isActive('/instruments')}">
 					<a href="/instruments">Instruments</a>
 				</li>

diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
@@ -8,4 +8,4 @@
 
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-Rails.application.config.assets.precompile += %w( *.png *.gif *.jpg *.jpeg *.eot *.woff *.ttf worker.js basic.js basic.css  )
+Rails.application.config.assets.precompile += %w( *.png *.gif *.jpg *.jpeg *.eot *.woff *.ttf worker.js basic.js *.js *.coffee basic.css  )
diff --git a/config/routes.rb b/config/routes.rb
@@ -4,6 +4,7 @@
   as :user do
     patch '/users/confirmation' => 'users/confirmations#update', :via => :patch, :as => :update_user_confirmation
   end
+
   devise_for :users, controllers: {
       sessions: 'users/sessions',
       confirmations: 'users/confirmations',
@@ -20,6 +21,11 @@
       end
     end
   end
+
+  authenticated :user do
+    root 'main#index', to: 'instruments#index',  as: :authenticated_root
+  end
+
   root 'main#index'
 
   match 'admin/import/instruments', to: 'instruments#import', via: [:post, :put], constraints: {format: ''}