rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

updated dependencies

Browse Source
This commit is contained in:
Mo Bitar
2017-01-07 00:32:46 -06:00
parent 73edae57a2
commit ad678a5d21
13 changed files with 8 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile
View File

@@ -9,16 +9,12 @@ gem "non-stupid-digest-assets"
gem 'uglifier'
gem 'activemodel-serializers-xml'
gem 'rack-cors', :require => 'rack/cors'
gem 'dotenv-rails', '~> 2.1.1'
gem 'bower-rails', '~> 0.10.0'
gem 'devise_token_auth', '~> 0.1.39'
# bundle exec rake doc:rails generates the API under doc/api.
gem 'sdoc', '~> 0.4.0', group: :doc

20
Gemfile.lock
View File

@@ -29,11 +29,6 @@ GEM
globalid (>= 0.3.6)
activemodel (5.0.0.1)
activesupport (= 5.0.0.1)
activemodel-serializers-xml (1.0.1)
activemodel (> 5.x)
activerecord (> 5.x)
activesupport (> 5.x)
builder (~> 3.1)
activerecord (5.0.0.1)
activemodel (= 5.0.0.1)
activesupport (= 5.0.0.1)
@@ -46,7 +41,6 @@ GEM
airbrussh (1.1.1)
sshkit (>= 1.6.1, != 1.7.0)
arel (7.1.4)
bcrypt (3.1.11)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
bower-rails (0.10.0)
@@ -78,15 +72,6 @@ GEM
concurrent-ruby (1.0.2)
connection_pool (2.2.1)
debug_inspector (0.0.2)
devise (4.2.0)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0, < 5.1)
responders
warden (~> 1.2.3)
devise_token_auth (0.1.39)
devise (> 3.5.2, <= 4.2)
rails (< 6)
dotenv (2.1.1)
dotenv-rails (2.1.1)
dotenv (= 2.1.1)
@@ -115,7 +100,6 @@ GEM
mini_portile2 (~> 2.1.0)
non-stupid-digest-assets (1.0.9)
sprockets (>= 2.0)
orm_adapter (0.5.0)
puma (3.6.2)
rack (2.0.1)
rack-cors (0.4.0)
@@ -178,8 +162,6 @@ GEM
thread_safe (~> 0.1)
uglifier (3.0.3)
execjs (>= 0.3.0, < 3)
warden (1.2.6)
rack (>= 1.0)
web-console (2.3.0)
activemodel (>= 4.0)
binding_of_caller (>= 0.7.2)
@@ -193,7 +175,6 @@ PLATFORMS
ruby
DEPENDENCIES
activemodel-serializers-xml
bower-rails (~> 0.10.0)
byebug
capistrano
@@ -203,7 +184,6 @@ DEPENDENCIES
capistrano-rails
capistrano-rvm
capistrano-sidekiq
devise_token_auth (~> 0.1.39)
dotenv-rails (~> 2.1.1)
non-stupid-digest-assets
puma

6
Gruntfile.js
View File

@@ -76,7 +76,6 @@ module.exports = function(grunt) {
'app/assets/javascripts/app/frontend/controllers/*.js',
'app/assets/javascripts/app/frontend/models/**/*.js',
'app/assets/javascripts/app/services/**/*.js',
// 'app/assets/javascripts/app/services/directives/*.js',
],
dest: 'vendor/assets/javascripts/app.js',
},
@@ -85,13 +84,9 @@ module.exports = function(grunt) {
src: [
'vendor/assets/bower_components/angular/angular.js',
'vendor/assets/bower_components/angular-ui-router/release/angular-ui-router.js',
'vendor/assets/bower_components/ng-token-auth/dist/ng-token-auth.js',
'vendor/assets/bower_components/angular-cookie/angular-cookie.js',
'vendor/assets/bower_components/lodash/dist/lodash.min.js',
'vendor/assets/bower_components/restangular/dist/restangular.js',
'vendor/assets/bower_components/marked/lib/marked.js',
'vendor/assets/bower_components/oclazyload/dist/ocLazyLoad.js',
'vendor/assets/bower_components/angular-lazy-img/release/angular-lazy-img.js',
'vendor/assets/bower_components/ng-dialog/js/ngDialog.min.js',
'vendor/assets/javascripts/crypto/*.js'
],
@@ -108,7 +103,6 @@ module.exports = function(grunt) {
'vendor/assets/stylesheets/app.css',
'vendor/assets/bower_components/ng-dialog/css/ngDialog.css',
'vendor/assets/bower_components/ng-dialog/css/ngDialog-theme-default.css',
'vendor/assets/bower_components/angular-typewrite/dist/angular-typewrite.css',
],
dest: 'vendor/assets/stylesheets/app.css'
}

2
app/assets/javascripts/app/app.frontend.js
View File

@@ -11,8 +11,6 @@ if(window.crypto.subtle) {
angular.module('app.frontend', [
'ui.router',
'restangular',
'oc.lazyLoad',
'angularLazyImg',
'ngDialog'
])

16
app/assets/templates/frontend/auth/forgot.html.haml
View File

@@ -1,16 +0,0 @@
.panel.panel-default
.panel-heading
%h3.panel-title Forgot Your Password?
.panel-body
%p We'll send reset instructions to your email.
%form{'ng-submit' => 'requestPasswordReset(forgotData)', 'ng-init' => 'forgotData = {}'}
.form-tag.has-feedback
%input.form-control{:autofocus => 'autofocus', :name => 'email', :placeholder => 'Email', :required => true, :type => 'email', 'ng-model' => 'forgotData.email'}/
%span.glyphicon.glyphicon-envelope.form-control-feedback
.row
.col-sm-8.hidden-xs
%a.btn.btn-link{'ui-sref' => 'auth.login'} Go back to the login page
.col-sm-4
%button.btn.btn-main.btn-block.btn-flat{:type => 'submit'} Reset Password
.col-xs-12.visible-xs
%a.btn.btn-link.btn-block{'ui-sref' => 'auth.login'} Go back to the login page

18
app/assets/templates/frontend/auth/login.html.haml
View File

@@ -1,18 +0,0 @@
.panel.panel-default
.panel-heading
%h3.panel-title Sign in to start your session
.panel-body
%form{'ng-submit' => 'submitLogin(loginData)', 'ng-init' => 'loginData = {}'}
.form-tag.has-feedback
%input.form-control{:autofocus => 'autofocus', :name => 'email', :placeholder => 'Username', :required => true, :type => 'email', 'ng-model' => 'loginData.email'}/
%span.glyphicon.glyphicon-user.form-control-feedback
.form-tag.has-feedback
%input.form-control{:placeholder => 'Password', :name => 'password', :required => true, :type => 'password', 'ng-model' => 'loginData.password'}/
%span.glyphicon.glyphicon-lock.form-control-feedback
.row
.col-sm-8.hidden-xs
%a.btn.btn-link{'ui-sref' => 'auth.forgot'} I forgot my password
.col-sm-4
%button.btn.btn-main.btn-block.btn-flat{:type => 'submit'} Sign in
.col-xs-12.visible-xs
%a.btn.btn-link.btn-block{'ui-sref' => 'auth.forgot'} I forgot my password

15
app/assets/templates/frontend/auth/reset.html.haml
View File

@@ -1,15 +0,0 @@
.panel.panel-default.panel-centered
.panel-heading
%h3.panel-title Reset Password
.panel-body
%p Type your new password.
%form{'ng-submit' => 'resetPasswordSubmit()'}
.form-tag.has-feedback
%input.form-control{:placeholder => 'New password', :name => 'password', :required => true, :type => 'password', 'ng-model' => 'resetData.password'}/
%span.glyphicon.glyphicon-lock.form-control-feedback
.form-tag.has-feedback
%input.form-control{:placeholder => 'Password confirmation', :name => 'password_confirmation', :required => true, :type => 'password', 'ng-model' => 'resetData.password_confirmation'}/
%span.glyphicon.glyphicon-lock.form-control-feedback
.row
.col-sm-4.col-sm-offset-8
%button.btn.btn-main.btn-block.btn-flat{:type => 'submit'} Update Password

6
app/assets/templates/frontend/auth/wrapper.html.haml
View File

@@ -1,6 +0,0 @@
.login-box.margin-auto{"style" => "margin-top: 150px;"}
%uib-alert{:type => '{{data.authAlert.type}}', :close => 'data.authAlert = null', 'ng-if' => 'data.authAlert'}
{{data.authAlert.msg}}
%ui-view

1
app/controllers/application_controller.rb
View File

@@ -1,5 +1,4 @@
class ApplicationController < ActionController::Base
include DeviseTokenAuth::Concerns::SetUserByToken
# Prevent CSRF attacks by raising an exception.
# For APIs, you may want to use :null_session instead.

15
bower.json
View File

@@ -7,17 +7,14 @@
"vendor": {
"name": "bower-rails generated vendor assets",
"dependencies": {
"angular": "1.6.0",
"angular-ui-router": "^0.2.18",
"restangular": "^1.5.2",
"oclazyload": "^1.0.9",
"font-awesome": "^4.6.2",
"marked": "0.3.4",
"angular-lazy-img": "1.1.0",
"ng-dialog" : "0.6.4"
"angular": "1.6.1",
"angular-ui-router": "^0.3.2",
"restangular": "^1.6.1",
"marked": "0.3.6",
"ng-dialog" : "0.6.6"
},
"resolutions": {
"angular": "1.6.0"
"angular": "1.6.1"
}
}
}

48
config/initializers/devise_token_auth.rb
View File

@@ -1,48 +0,0 @@
DeviseTokenAuth.setup do |config|
# By default the authorization headers will change after each request. The
# client is responsible for keeping track of the changing tokens. Change
# this to false to prevent the Authorization header from changing after
# each request.
# config.change_headers_on_each_request = true
# By default, users will need to re-authenticate after 2 weeks. This setting
# determines how long tokens will remain valid after they are issued.
# config.token_lifespan = 2.weeks
# Sets the max number of concurrent devices per user, which is 10 by default.
# After this limit is reached, the oldest tokens will be removed.
# config.max_number_of_devices = 10
# Sometimes it's necessary to make several requests to the API at the same
# time. In this case, each request in the batch will need to share the same
# auth token. This setting determines how far apart the requests can be while
# still using the same auth token.
# config.batch_request_buffer_throttle = 5.seconds
# This route will be the prefix for all oauth2 redirect callbacks. For
# example, using the default '/omniauth', the github oauth2 provider will
# redirect successful authentications to '/omniauth/github/callback'
# config.omniauth_prefix = "/omniauth"
# By default sending current password is not needed for the password update.
# Uncomment to enforce current_password param to be checked before all
# attribute updates. Set it to :password if you want it to be checked only if
# password is updated.
config.check_current_password_before_update = :password
# By default we will use callbacks for single omniauth.
# It depends on fields like email, provider and uid.
# config.default_callbacks = true
# Makes it possible to change the headers names
# config.headers_names = {:'access-token' => 'access-token',
# :'client' => 'client',
# :'expiry' => 'expiry',
# :'uid' => 'uid',
# :'token-type' => 'token-type' }
# By default, only Bearer Token authentication is implemented out of the box.
# If, however, you wish to integrate with legacy Devise authentication, you can
# do so by enabling this flag. NOTE: This feature is highly experimental!
# config.enable_standard_devise_support = false
end

2
vendor/assets/javascripts/transpiled.js vendored
View File

@@ -380,7 +380,7 @@ if (window.crypto.subtle) {
Neeto.crypto = new SNCryptoJS();
}
angular.module('app.frontend', ['ui.router', 'restangular', 'oc.lazyLoad', 'angularLazyImg', 'ngDialog']).config(function (RestangularProvider, apiControllerProvider) {
angular.module('app.frontend', ['ui.router', 'restangular', 'ngDialog']).config(function (RestangularProvider, apiControllerProvider) {
RestangularProvider.setDefaultHeaders({ "Content-Type": "application/json" });
var url = apiControllerProvider.defaultServerURL();

2
vendor/assets/javascripts/transpiled.js.map vendored
View File

File diff suppressed because one or more lines are too long