diff --git a/Gruntfile.js b/Gruntfile.js
index 939abb961..6878b6524 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -34,7 +34,7 @@ module.exports = function(grunt) {
style: 'expanded'
},
files: {
- 'vendor/assets/stylesheets/app.css': 'app/assets/stylesheets/frontend.css.scss'
+ 'vendor/assets/stylesheets/app.css': 'app/assets/stylesheets/main.css.scss'
}
}
},
@@ -59,7 +59,7 @@ module.exports = function(grunt) {
src: ['**/*.html'],
dest: 'vendor/assets/javascripts/templates.js',
options: {
- module: 'app.frontend'
+ module: 'app'
}
}
},
@@ -70,12 +70,13 @@ module.exports = function(grunt) {
},
app: {
src: [
- 'app/assets/javascripts/app/services/encryption/*.js',
+ 'app/assets/javascripts/app/services/encryption/*.js', // this should come first
'app/assets/javascripts/app/*.js',
- 'app/assets/javascripts/app/frontend/*.js',
- 'app/assets/javascripts/app/frontend/controllers/*.js',
- 'app/assets/javascripts/app/frontend/models/**/*.js',
- 'app/assets/javascripts/app/services/**/*.js'
+ 'app/assets/javascripts/app/controllers/**/*.js',
+ 'app/assets/javascripts/app/models/**/*.js',
+ 'app/assets/javascripts/app/services/**/*.js',
+ 'app/assets/javascripts/app/filters/**/*.js',
+ 'app/assets/javascripts/app/directives/**/*.js',
],
dest: 'vendor/assets/javascripts/app.js',
},
diff --git a/app/assets/images/.keep b/app/assets/images/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/app/assets/images/archive.png b/app/assets/images/archive.png
deleted file mode 100644
index d6e8a2049..000000000
Binary files a/app/assets/images/archive.png and /dev/null differ
diff --git a/app/assets/images/encryption.png b/app/assets/images/encryption.png
deleted file mode 100644
index 7f80b67dd..000000000
Binary files a/app/assets/images/encryption.png and /dev/null differ
diff --git a/app/assets/images/filter.png b/app/assets/images/filter.png
deleted file mode 100644
index b707c70b5..000000000
Binary files a/app/assets/images/filter.png and /dev/null differ
diff --git a/app/assets/images/logo.png b/app/assets/images/logo.png
deleted file mode 100644
index 9b0c179d2..000000000
Binary files a/app/assets/images/logo.png and /dev/null differ
diff --git a/app/assets/javascripts/app/app.frontend.js b/app/assets/javascripts/app/app.js
similarity index 97%
rename from app/assets/javascripts/app/app.frontend.js
rename to app/assets/javascripts/app/app.js
index 0bdfe017b..d75836ddc 100644
--- a/app/assets/javascripts/app/app.frontend.js
+++ b/app/assets/javascripts/app/app.js
@@ -13,7 +13,7 @@ if(!IEOrEdge && (window.crypto && window.crypto.subtle)) {
Neeto.crypto = new SNCryptoJS();
}
-angular.module('app.frontend', [])
+angular.module('app', [])
function getParameterByName(name, url) {
name = name.replace(/[\[\]]/g, "\\$&");
diff --git a/app/assets/javascripts/app/frontend/controllers/editor.js b/app/assets/javascripts/app/controllers/editor.js
similarity index 99%
rename from app/assets/javascripts/app/frontend/controllers/editor.js
rename to app/assets/javascripts/app/controllers/editor.js
index ddc6e83ef..3913fc8e5 100644
--- a/app/assets/javascripts/app/frontend/controllers/editor.js
+++ b/app/assets/javascripts/app/controllers/editor.js
@@ -1,4 +1,4 @@
-angular.module('app.frontend')
+angular.module('app')
.directive("editorSection", function($timeout, $sce){
return {
restrict: 'E',
@@ -8,7 +8,7 @@ angular.module('app.frontend')
note: "=",
updateTags: "&"
},
- templateUrl: 'frontend/editor.html',
+ templateUrl: 'editor.html',
replace: true,
controller: 'EditorCtrl',
controllerAs: 'ctrl',
diff --git a/app/assets/javascripts/app/frontend/controllers/footer.js b/app/assets/javascripts/app/controllers/footer.js
similarity index 98%
rename from app/assets/javascripts/app/frontend/controllers/footer.js
rename to app/assets/javascripts/app/controllers/footer.js
index b1e38b60d..945aaa9c9 100644
--- a/app/assets/javascripts/app/frontend/controllers/footer.js
+++ b/app/assets/javascripts/app/controllers/footer.js
@@ -1,9 +1,9 @@
-angular.module('app.frontend')
+angular.module('app')
.directive("footer", function(authManager){
return {
restrict: 'E',
scope: {},
- templateUrl: 'frontend/footer.html',
+ templateUrl: 'footer.html',
replace: true,
controller: 'FooterCtrl',
controllerAs: 'ctrl',
diff --git a/app/assets/javascripts/app/frontend/controllers/home.js b/app/assets/javascripts/app/controllers/home.js
similarity index 99%
rename from app/assets/javascripts/app/frontend/controllers/home.js
rename to app/assets/javascripts/app/controllers/home.js
index 97216078a..ab2f2e20d 100644
--- a/app/assets/javascripts/app/frontend/controllers/home.js
+++ b/app/assets/javascripts/app/controllers/home.js
@@ -1,4 +1,4 @@
-angular.module('app.frontend')
+angular.module('app')
.controller('HomeCtrl', function ($scope, $location, $rootScope, $timeout, modelManager,
dbManager, syncManager, authManager, themeManager, passcodeManager, storageManager, migrationManager) {
diff --git a/app/assets/javascripts/app/frontend/controllers/lockScreen.js b/app/assets/javascripts/app/controllers/lockScreen.js
similarity index 78%
rename from app/assets/javascripts/app/frontend/controllers/lockScreen.js
rename to app/assets/javascripts/app/controllers/lockScreen.js
index 409344fb6..b04c77c21 100644
--- a/app/assets/javascripts/app/frontend/controllers/lockScreen.js
+++ b/app/assets/javascripts/app/controllers/lockScreen.js
@@ -2,7 +2,7 @@ class LockScreen {
constructor() {
this.restrict = "E";
- this.templateUrl = "frontend/lock-screen.html";
+ this.templateUrl = "lock-screen.html";
this.scope = {
onSuccess: "&",
};
@@ -27,4 +27,4 @@ class LockScreen {
}
-angular.module('app.frontend').directive('lockScreen', () => new LockScreen);
+angular.module('app').directive('lockScreen', () => new LockScreen);
diff --git a/app/assets/javascripts/app/frontend/controllers/notes.js b/app/assets/javascripts/app/controllers/notes.js
similarity index 98%
rename from app/assets/javascripts/app/frontend/controllers/notes.js
rename to app/assets/javascripts/app/controllers/notes.js
index c5660f93d..4b7376f8c 100644
--- a/app/assets/javascripts/app/frontend/controllers/notes.js
+++ b/app/assets/javascripts/app/controllers/notes.js
@@ -1,4 +1,4 @@
-angular.module('app.frontend')
+angular.module('app')
.directive("notesSection", function(){
return {
scope: {
@@ -7,7 +7,7 @@ angular.module('app.frontend')
tag: "="
},
- templateUrl: 'frontend/notes.html',
+ templateUrl: 'notes.html',
replace: true,
controller: 'NotesCtrl',
controllerAs: 'ctrl',
diff --git a/app/assets/javascripts/app/frontend/controllers/tags.js b/app/assets/javascripts/app/controllers/tags.js
similarity index 98%
rename from app/assets/javascripts/app/frontend/controllers/tags.js
rename to app/assets/javascripts/app/controllers/tags.js
index e053b5b4e..76f11ddf2 100644
--- a/app/assets/javascripts/app/frontend/controllers/tags.js
+++ b/app/assets/javascripts/app/controllers/tags.js
@@ -1,4 +1,4 @@
-angular.module('app.frontend')
+angular.module('app')
.directive("tagsSection", function(){
return {
restrict: 'E',
@@ -13,7 +13,7 @@ angular.module('app.frontend')
updateNoteTag: "&",
removeTag: "&"
},
- templateUrl: 'frontend/tags.html',
+ templateUrl: 'tags.html',
replace: true,
controller: 'TagsCtrl',
controllerAs: 'ctrl',
diff --git a/app/assets/javascripts/app/services/directives/functional/autofocus.js b/app/assets/javascripts/app/directives/functional/autofocus.js
similarity index 92%
rename from app/assets/javascripts/app/services/directives/functional/autofocus.js
rename to app/assets/javascripts/app/directives/functional/autofocus.js
index cbc093a5f..8bcf6c1d1 100644
--- a/app/assets/javascripts/app/services/directives/functional/autofocus.js
+++ b/app/assets/javascripts/app/directives/functional/autofocus.js
@@ -1,5 +1,5 @@
angular
- .module('app.frontend')
+ .module('app')
.directive('snAutofocus', ['$timeout', function($timeout) {
return {
restrict: 'A',
diff --git a/app/assets/javascripts/app/services/directives/functional/click-outside.js b/app/assets/javascripts/app/directives/functional/click-outside.js
similarity index 95%
rename from app/assets/javascripts/app/services/directives/functional/click-outside.js
rename to app/assets/javascripts/app/directives/functional/click-outside.js
index 10e40e1da..dd8296470 100644
--- a/app/assets/javascripts/app/services/directives/functional/click-outside.js
+++ b/app/assets/javascripts/app/directives/functional/click-outside.js
@@ -1,5 +1,5 @@
angular
- .module('app.frontend')
+ .module('app')
.directive('clickOutside', ['$document', function($document) {
return {
restrict: 'A',
diff --git a/app/assets/javascripts/app/services/directives/functional/delay-hide.js b/app/assets/javascripts/app/directives/functional/delay-hide.js
similarity index 97%
rename from app/assets/javascripts/app/services/directives/functional/delay-hide.js
rename to app/assets/javascripts/app/directives/functional/delay-hide.js
index 6e381ed3f..fd52d70fb 100644
--- a/app/assets/javascripts/app/services/directives/functional/delay-hide.js
+++ b/app/assets/javascripts/app/directives/functional/delay-hide.js
@@ -1,5 +1,5 @@
angular
- .module('app.frontend')
+ .module('app')
.directive('delayHide', function($timeout) {
return {
restrict: 'A',
diff --git a/app/assets/javascripts/app/services/directives/functional/file-change.js b/app/assets/javascripts/app/directives/functional/file-change.js
similarity index 92%
rename from app/assets/javascripts/app/services/directives/functional/file-change.js
rename to app/assets/javascripts/app/directives/functional/file-change.js
index afec10954..c133c0852 100644
--- a/app/assets/javascripts/app/services/directives/functional/file-change.js
+++ b/app/assets/javascripts/app/directives/functional/file-change.js
@@ -1,5 +1,5 @@
angular
- .module('app.frontend')
+ .module('app')
.directive('fileChange', function() {
return {
restrict: 'A',
diff --git a/app/assets/javascripts/app/services/directives/functional/infiniteScroll.js b/app/assets/javascripts/app/directives/functional/infiniteScroll.js
similarity index 89%
rename from app/assets/javascripts/app/services/directives/functional/infiniteScroll.js
rename to app/assets/javascripts/app/directives/functional/infiniteScroll.js
index 372f0bf7b..3e1e633ef 100644
--- a/app/assets/javascripts/app/services/directives/functional/infiniteScroll.js
+++ b/app/assets/javascripts/app/directives/functional/infiniteScroll.js
@@ -1,4 +1,4 @@
-angular.module('app.frontend').directive('infiniteScroll', [
+angular.module('app').directive('infiniteScroll', [
'$rootScope', '$window', '$timeout', function($rootScope, $window, $timeout) {
return {
link: function(scope, elem, attrs) {
diff --git a/app/assets/javascripts/app/services/directives/functional/lowercase.js b/app/assets/javascripts/app/directives/functional/lowercase.js
similarity index 95%
rename from app/assets/javascripts/app/services/directives/functional/lowercase.js
rename to app/assets/javascripts/app/directives/functional/lowercase.js
index 1899a251b..40ce7421c 100644
--- a/app/assets/javascripts/app/services/directives/functional/lowercase.js
+++ b/app/assets/javascripts/app/directives/functional/lowercase.js
@@ -1,5 +1,5 @@
angular
- .module('app.frontend')
+ .module('app')
.directive('lowercase', function() {
return {
require: 'ngModel',
diff --git a/app/assets/javascripts/app/services/directives/functional/selectOnClick.js b/app/assets/javascripts/app/directives/functional/selectOnClick.js
similarity index 94%
rename from app/assets/javascripts/app/services/directives/functional/selectOnClick.js
rename to app/assets/javascripts/app/directives/functional/selectOnClick.js
index a8ad86cb1..598e45086 100644
--- a/app/assets/javascripts/app/services/directives/functional/selectOnClick.js
+++ b/app/assets/javascripts/app/directives/functional/selectOnClick.js
@@ -1,5 +1,5 @@
angular
- .module('app.frontend')
+ .module('app')
.directive('selectOnClick', ['$window', function ($window) {
return {
restrict: 'A',
diff --git a/app/assets/javascripts/app/services/directives/views/accountMenu.js b/app/assets/javascripts/app/directives/views/accountMenu.js
similarity index 99%
rename from app/assets/javascripts/app/services/directives/views/accountMenu.js
rename to app/assets/javascripts/app/directives/views/accountMenu.js
index 39028041d..2efe01744 100644
--- a/app/assets/javascripts/app/services/directives/views/accountMenu.js
+++ b/app/assets/javascripts/app/directives/views/accountMenu.js
@@ -2,7 +2,7 @@ class AccountMenu {
constructor() {
this.restrict = "E";
- this.templateUrl = "frontend/directives/account-menu.html";
+ this.templateUrl = "directives/account-menu.html";
this.scope = {
"onSuccessfulAuth" : "&",
"closeFunction" : "&"
@@ -584,4 +584,4 @@ class AccountMenu {
}
}
-angular.module('app.frontend').directive('accountMenu', () => new AccountMenu);
+angular.module('app').directive('accountMenu', () => new AccountMenu);
diff --git a/app/assets/javascripts/app/services/directives/views/actionsMenu.js b/app/assets/javascripts/app/directives/views/actionsMenu.js
similarity index 94%
rename from app/assets/javascripts/app/services/directives/views/actionsMenu.js
rename to app/assets/javascripts/app/directives/views/actionsMenu.js
index f4ef1a4ae..f7842fc05 100644
--- a/app/assets/javascripts/app/services/directives/views/actionsMenu.js
+++ b/app/assets/javascripts/app/directives/views/actionsMenu.js
@@ -2,7 +2,7 @@ class ActionsMenu {
constructor() {
this.restrict = "E";
- this.templateUrl = "frontend/directives/actions-menu.html";
+ this.templateUrl = "directives/actions-menu.html";
this.scope = {
item: "="
};
@@ -83,4 +83,4 @@ class ActionsMenu {
}
-angular.module('app.frontend').directive('actionsMenu', () => new ActionsMenu);
+angular.module('app').directive('actionsMenu', () => new ActionsMenu);
diff --git a/app/assets/javascripts/app/services/directives/views/componentModal.js b/app/assets/javascripts/app/directives/views/componentModal.js
similarity index 85%
rename from app/assets/javascripts/app/services/directives/views/componentModal.js
rename to app/assets/javascripts/app/directives/views/componentModal.js
index a02cb1f00..9d73df8ad 100644
--- a/app/assets/javascripts/app/services/directives/views/componentModal.js
+++ b/app/assets/javascripts/app/directives/views/componentModal.js
@@ -2,7 +2,7 @@ class ComponentModal {
constructor() {
this.restrict = "E";
- this.templateUrl = "frontend/directives/component-modal.html";
+ this.templateUrl = "directives/component-modal.html";
this.scope = {
show: "=",
component: "=",
@@ -39,4 +39,4 @@ class ComponentModal {
}
-angular.module('app.frontend').directive('componentModal', () => new ComponentModal);
+angular.module('app').directive('componentModal', () => new ComponentModal);
diff --git a/app/assets/javascripts/app/services/directives/views/componentView.js b/app/assets/javascripts/app/directives/views/componentView.js
similarity index 91%
rename from app/assets/javascripts/app/services/directives/views/componentView.js
rename to app/assets/javascripts/app/directives/views/componentView.js
index 2cbd6e586..2ebc2b24a 100644
--- a/app/assets/javascripts/app/services/directives/views/componentView.js
+++ b/app/assets/javascripts/app/directives/views/componentView.js
@@ -2,7 +2,7 @@ class ComponentView {
constructor(componentManager, $timeout) {
this.restrict = "E";
- this.templateUrl = "frontend/directives/component-view.html";
+ this.templateUrl = "directives/component-view.html";
this.scope = {
component: "="
};
@@ -71,4 +71,4 @@ class ComponentView {
}
-angular.module('app.frontend').directive('componentView', (componentManager, $timeout) => new ComponentView(componentManager, $timeout));
+angular.module('app').directive('componentView', (componentManager, $timeout) => new ComponentView(componentManager, $timeout));
diff --git a/app/assets/javascripts/app/services/directives/views/editorMenu.js b/app/assets/javascripts/app/directives/views/editorMenu.js
similarity index 92%
rename from app/assets/javascripts/app/services/directives/views/editorMenu.js
rename to app/assets/javascripts/app/directives/views/editorMenu.js
index 2daea9aea..51d301fb0 100644
--- a/app/assets/javascripts/app/services/directives/views/editorMenu.js
+++ b/app/assets/javascripts/app/directives/views/editorMenu.js
@@ -2,7 +2,7 @@ class EditorMenu {
constructor() {
this.restrict = "E";
- this.templateUrl = "frontend/directives/editor-menu.html";
+ this.templateUrl = "directives/editor-menu.html";
this.scope = {
callback: "&",
selectedEditor: "="
@@ -68,4 +68,4 @@ class EditorMenu {
}
-angular.module('app.frontend').directive('editorMenu', () => new EditorMenu);
+angular.module('app').directive('editorMenu', () => new EditorMenu);
diff --git a/app/assets/javascripts/app/services/directives/views/globalExtensionsMenu.js b/app/assets/javascripts/app/directives/views/globalExtensionsMenu.js
similarity index 97%
rename from app/assets/javascripts/app/services/directives/views/globalExtensionsMenu.js
rename to app/assets/javascripts/app/directives/views/globalExtensionsMenu.js
index f2dc67cef..649c4c2fb 100644
--- a/app/assets/javascripts/app/services/directives/views/globalExtensionsMenu.js
+++ b/app/assets/javascripts/app/directives/views/globalExtensionsMenu.js
@@ -2,7 +2,7 @@ class GlobalExtensionsMenu {
constructor() {
this.restrict = "E";
- this.templateUrl = "frontend/directives/global-extensions-menu.html";
+ this.templateUrl = "directives/global-extensions-menu.html";
this.scope = {
};
}
@@ -212,4 +212,4 @@ class GlobalExtensionsMenu {
}
-angular.module('app.frontend').directive('globalExtensionsMenu', () => new GlobalExtensionsMenu);
+angular.module('app').directive('globalExtensionsMenu', () => new GlobalExtensionsMenu);
diff --git a/app/assets/javascripts/app/services/directives/views/menuRow.js b/app/assets/javascripts/app/directives/views/menuRow.js
similarity index 78%
rename from app/assets/javascripts/app/services/directives/views/menuRow.js
rename to app/assets/javascripts/app/directives/views/menuRow.js
index 1809a2505..20fc1653c 100644
--- a/app/assets/javascripts/app/services/directives/views/menuRow.js
+++ b/app/assets/javascripts/app/directives/views/menuRow.js
@@ -3,7 +3,7 @@ class MenuRow {
constructor() {
this.restrict = "E";
this.transclude = true;
- this.templateUrl = "frontend/directives/menu-row.html";
+ this.templateUrl = "directives/menu-row.html";
this.scope = {
circle: "=",
title: "=",
@@ -28,4 +28,4 @@ class MenuRow {
}
}
-angular.module('app.frontend').directive('menuRow', () => new MenuRow);
+angular.module('app').directive('menuRow', () => new MenuRow);
diff --git a/app/assets/javascripts/app/services/directives/views/panelResizer.js b/app/assets/javascripts/app/directives/views/panelResizer.js
similarity index 96%
rename from app/assets/javascripts/app/services/directives/views/panelResizer.js
rename to app/assets/javascripts/app/directives/views/panelResizer.js
index 62226c107..917ab06bf 100644
--- a/app/assets/javascripts/app/services/directives/views/panelResizer.js
+++ b/app/assets/javascripts/app/directives/views/panelResizer.js
@@ -2,7 +2,7 @@ class PanelResizer {
constructor() {
this.restrict = "E";
- this.templateUrl = "frontend/directives/panel-resizer.html";
+ this.templateUrl = "directives/panel-resizer.html";
this.scope = {
index: "=",
panelId: "=",
@@ -198,4 +198,4 @@ class PanelResizer {
}
-angular.module('app.frontend').directive('panelResizer', () => new PanelResizer);
+angular.module('app').directive('panelResizer', () => new PanelResizer);
diff --git a/app/assets/javascripts/app/services/directives/views/permissionsModal.js b/app/assets/javascripts/app/directives/views/permissionsModal.js
similarity index 91%
rename from app/assets/javascripts/app/services/directives/views/permissionsModal.js
rename to app/assets/javascripts/app/directives/views/permissionsModal.js
index 5988bae86..fb7609d55 100644
--- a/app/assets/javascripts/app/services/directives/views/permissionsModal.js
+++ b/app/assets/javascripts/app/directives/views/permissionsModal.js
@@ -2,7 +2,7 @@ class PermissionsModal {
constructor() {
this.restrict = "E";
- this.templateUrl = "frontend/directives/permissions-modal.html";
+ this.templateUrl = "directives/permissions-modal.html";
this.scope = {
show: "=",
component: "=",
@@ -74,4 +74,4 @@ class PermissionsModal {
}
-angular.module('app.frontend').directive('permissionsModal', () => new PermissionsModal);
+angular.module('app').directive('permissionsModal', () => new PermissionsModal);
diff --git a/app/assets/javascripts/app/services/filters/appDate.js b/app/assets/javascripts/app/filters/appDate.js
similarity index 91%
rename from app/assets/javascripts/app/services/filters/appDate.js
rename to app/assets/javascripts/app/filters/appDate.js
index 381c3ed54..9a84a796e 100644
--- a/app/assets/javascripts/app/services/filters/appDate.js
+++ b/app/assets/javascripts/app/filters/appDate.js
@@ -1,4 +1,4 @@
-angular.module('app.frontend')
+angular.module('app')
.filter('appDate', function ($filter) {
return function (input) {
return input ? $filter('date')(new Date(input), 'MM/dd/yyyy', 'UTC') : '';
diff --git a/app/assets/javascripts/app/services/filters/sortBy.js b/app/assets/javascripts/app/filters/sortBy.js
similarity index 97%
rename from app/assets/javascripts/app/services/filters/sortBy.js
rename to app/assets/javascripts/app/filters/sortBy.js
index c3902604b..2f19d3769 100644
--- a/app/assets/javascripts/app/services/filters/sortBy.js
+++ b/app/assets/javascripts/app/filters/sortBy.js
@@ -1,4 +1,4 @@
-angular.module('app.frontend')
+angular.module('app')
.filter('sortBy', function ($filter) {
return function(items, sortBy) {
let sortValueFn = (a, b, pinCheck = false) => {
diff --git a/app/assets/javascripts/app/services/filters/startFrom.js b/app/assets/javascripts/app/filters/startFrom.js
similarity index 56%
rename from app/assets/javascripts/app/services/filters/startFrom.js
rename to app/assets/javascripts/app/filters/startFrom.js
index 3cf824c4c..7b64038f6 100644
--- a/app/assets/javascripts/app/services/filters/startFrom.js
+++ b/app/assets/javascripts/app/filters/startFrom.js
@@ -1,4 +1,4 @@
-angular.module('app.frontend').filter('startFrom', function() {
+angular.module('app').filter('startFrom', function() {
return function(input, start) {
return input.slice(start);
};
diff --git a/app/assets/javascripts/app/services/filters/trusted.js b/app/assets/javascripts/app/filters/trusted.js
similarity index 52%
rename from app/assets/javascripts/app/services/filters/trusted.js
rename to app/assets/javascripts/app/filters/trusted.js
index 7bb57b301..f2a41a3c0 100644
--- a/app/assets/javascripts/app/services/filters/trusted.js
+++ b/app/assets/javascripts/app/filters/trusted.js
@@ -1,4 +1,4 @@
-angular.module('app.frontend').filter('trusted', ['$sce', function ($sce) {
+angular.module('app').filter('trusted', ['$sce', function ($sce) {
return function(url) {
return $sce.trustAsResourceUrl(url);
};
diff --git a/app/assets/javascripts/app/frontend/models/api/item.js b/app/assets/javascripts/app/models/api/item.js
similarity index 100%
rename from app/assets/javascripts/app/frontend/models/api/item.js
rename to app/assets/javascripts/app/models/api/item.js
diff --git a/app/assets/javascripts/app/frontend/models/api/mfa.js b/app/assets/javascripts/app/models/api/mfa.js
similarity index 100%
rename from app/assets/javascripts/app/frontend/models/api/mfa.js
rename to app/assets/javascripts/app/models/api/mfa.js
diff --git a/app/assets/javascripts/app/frontend/models/api/syncAdapter.js b/app/assets/javascripts/app/models/api/syncAdapter.js
similarity index 100%
rename from app/assets/javascripts/app/frontend/models/api/syncAdapter.js
rename to app/assets/javascripts/app/models/api/syncAdapter.js
diff --git a/app/assets/javascripts/app/frontend/models/app/component.js b/app/assets/javascripts/app/models/app/component.js
similarity index 100%
rename from app/assets/javascripts/app/frontend/models/app/component.js
rename to app/assets/javascripts/app/models/app/component.js
diff --git a/app/assets/javascripts/app/frontend/models/app/editor.js b/app/assets/javascripts/app/models/app/editor.js
similarity index 100%
rename from app/assets/javascripts/app/frontend/models/app/editor.js
rename to app/assets/javascripts/app/models/app/editor.js
diff --git a/app/assets/javascripts/app/frontend/models/app/extension.js b/app/assets/javascripts/app/models/app/extension.js
similarity index 100%
rename from app/assets/javascripts/app/frontend/models/app/extension.js
rename to app/assets/javascripts/app/models/app/extension.js
diff --git a/app/assets/javascripts/app/frontend/models/app/note.js b/app/assets/javascripts/app/models/app/note.js
similarity index 100%
rename from app/assets/javascripts/app/frontend/models/app/note.js
rename to app/assets/javascripts/app/models/app/note.js
diff --git a/app/assets/javascripts/app/frontend/models/app/tag.js b/app/assets/javascripts/app/models/app/tag.js
similarity index 100%
rename from app/assets/javascripts/app/frontend/models/app/tag.js
rename to app/assets/javascripts/app/models/app/tag.js
diff --git a/app/assets/javascripts/app/frontend/models/app/theme.js b/app/assets/javascripts/app/models/app/theme.js
similarity index 100%
rename from app/assets/javascripts/app/frontend/models/app/theme.js
rename to app/assets/javascripts/app/models/app/theme.js
diff --git a/app/assets/javascripts/app/frontend/models/local/encryptedStorage.js b/app/assets/javascripts/app/models/local/encryptedStorage.js
similarity index 100%
rename from app/assets/javascripts/app/frontend/models/local/encryptedStorage.js
rename to app/assets/javascripts/app/models/local/encryptedStorage.js
diff --git a/app/assets/javascripts/app/frontend/models/local/itemParams.js b/app/assets/javascripts/app/models/local/itemParams.js
similarity index 100%
rename from app/assets/javascripts/app/frontend/models/local/itemParams.js
rename to app/assets/javascripts/app/models/local/itemParams.js
diff --git a/app/assets/javascripts/app/frontend/routes.js b/app/assets/javascripts/app/routes.js
similarity index 90%
rename from app/assets/javascripts/app/frontend/routes.js
rename to app/assets/javascripts/app/routes.js
index 5409347db..fe6dac476 100644
--- a/app/assets/javascripts/app/frontend/routes.js
+++ b/app/assets/javascripts/app/routes.js
@@ -1,4 +1,4 @@
-angular.module('app.frontend')
+angular.module('app')
.config(function ($locationProvider) {
if(!isDesktopApplication()) {
@@ -11,5 +11,4 @@ angular.module('app.frontend')
} else {
$locationProvider.html5Mode(false);
}
-
});
diff --git a/app/assets/javascripts/app/services/actionsManager.js b/app/assets/javascripts/app/services/actionsManager.js
index f2926b139..9a5b9d1cc 100644
--- a/app/assets/javascripts/app/services/actionsManager.js
+++ b/app/assets/javascripts/app/services/actionsManager.js
@@ -241,4 +241,4 @@ class ActionsManager {
}
-angular.module('app.frontend').service('actionsManager', ActionsManager);
+angular.module('app').service('actionsManager', ActionsManager);
diff --git a/app/assets/javascripts/app/services/authManager.js b/app/assets/javascripts/app/services/authManager.js
index 46cff40fc..af3f39d9c 100644
--- a/app/assets/javascripts/app/services/authManager.js
+++ b/app/assets/javascripts/app/services/authManager.js
@@ -1,4 +1,4 @@
-angular.module('app.frontend')
+angular.module('app')
.provider('authManager', function () {
function domainName() {
diff --git a/app/assets/javascripts/app/services/componentManager.js b/app/assets/javascripts/app/services/componentManager.js
index a18670b10..1329c3cb2 100644
--- a/app/assets/javascripts/app/services/componentManager.js
+++ b/app/assets/javascripts/app/services/componentManager.js
@@ -749,4 +749,4 @@ class ComponentManager {
}
-angular.module('app.frontend').service('componentManager', ComponentManager);
+angular.module('app').service('componentManager', ComponentManager);
diff --git a/app/assets/javascripts/app/services/dbManager.js b/app/assets/javascripts/app/services/dbManager.js
index 4c5d0341e..521fe2a1e 100644
--- a/app/assets/javascripts/app/services/dbManager.js
+++ b/app/assets/javascripts/app/services/dbManager.js
@@ -158,4 +158,4 @@ class DBManager {
}
}
-angular.module('app.frontend').service('dbManager', DBManager);
+angular.module('app').service('dbManager', DBManager);
diff --git a/app/assets/javascripts/app/services/desktopManager.js b/app/assets/javascripts/app/services/desktopManager.js
index ebe16d93c..c63bc4e4c 100644
--- a/app/assets/javascripts/app/services/desktopManager.js
+++ b/app/assets/javascripts/app/services/desktopManager.js
@@ -108,4 +108,4 @@ class DesktopManager {
}
-angular.module('app.frontend').service('desktopManager', DesktopManager);
+angular.module('app').service('desktopManager', DesktopManager);
diff --git a/app/assets/javascripts/app/services/httpManager.js b/app/assets/javascripts/app/services/httpManager.js
index a5d157d57..71692f478 100644
--- a/app/assets/javascripts/app/services/httpManager.js
+++ b/app/assets/javascripts/app/services/httpManager.js
@@ -77,4 +77,4 @@ class HttpManager {
}
-angular.module('app.frontend').service('httpManager', HttpManager);
+angular.module('app').service('httpManager', HttpManager);
diff --git a/app/assets/javascripts/app/services/migrationManager.js b/app/assets/javascripts/app/services/migrationManager.js
index bb139860c..59eb9a2e1 100644
--- a/app/assets/javascripts/app/services/migrationManager.js
+++ b/app/assets/javascripts/app/services/migrationManager.js
@@ -58,4 +58,4 @@ class MigrationManager {
}
-angular.module('app.frontend').service('migrationManager', MigrationManager);
+angular.module('app').service('migrationManager', MigrationManager);
diff --git a/app/assets/javascripts/app/services/modelManager.js b/app/assets/javascripts/app/services/modelManager.js
index 879ffede9..7c96f338d 100644
--- a/app/assets/javascripts/app/services/modelManager.js
+++ b/app/assets/javascripts/app/services/modelManager.js
@@ -437,4 +437,4 @@ class ModelManager {
}
-angular.module('app.frontend').service('modelManager', ModelManager);
+angular.module('app').service('modelManager', ModelManager);
diff --git a/app/assets/javascripts/app/services/packageManager.js b/app/assets/javascripts/app/services/packageManager.js
index 4ff78561c..7c61b2bac 100644
--- a/app/assets/javascripts/app/services/packageManager.js
+++ b/app/assets/javascripts/app/services/packageManager.js
@@ -38,4 +38,4 @@ class PackageManager {
}
-angular.module('app.frontend').service('packageManager', PackageManager);
+angular.module('app').service('packageManager', PackageManager);
diff --git a/app/assets/javascripts/app/services/passcodeManager.js b/app/assets/javascripts/app/services/passcodeManager.js
index e4862fbe6..28202fdcc 100644
--- a/app/assets/javascripts/app/services/passcodeManager.js
+++ b/app/assets/javascripts/app/services/passcodeManager.js
@@ -1,4 +1,4 @@
-angular.module('app.frontend')
+angular.module('app')
.provider('passcodeManager', function () {
this.$get = function($rootScope, $timeout, modelManager, dbManager, authManager, storageManager) {
diff --git a/app/assets/javascripts/app/services/singletonManager.js b/app/assets/javascripts/app/services/singletonManager.js
index dc8c6583f..489527239 100644
--- a/app/assets/javascripts/app/services/singletonManager.js
+++ b/app/assets/javascripts/app/services/singletonManager.js
@@ -147,4 +147,4 @@ class SingletonManager {
}
-angular.module('app.frontend').service('singletonManager', SingletonManager);
+angular.module('app').service('singletonManager', SingletonManager);
diff --git a/app/assets/javascripts/app/services/storageManager.js b/app/assets/javascripts/app/services/storageManager.js
index cc8a3fa9b..0d2f02164 100644
--- a/app/assets/javascripts/app/services/storageManager.js
+++ b/app/assets/javascripts/app/services/storageManager.js
@@ -228,4 +228,4 @@ StorageManager.FixedEncrypted = "FixedEncrypted"; // encrypted memoryStorage + l
StorageManager.Ephemeral = "Ephemeral"; // memoryStorage
StorageManager.Fixed = "Fixed"; // localStorage
-angular.module('app.frontend').service('storageManager', StorageManager);
+angular.module('app').service('storageManager', StorageManager);
diff --git a/app/assets/javascripts/app/services/syncManager.js b/app/assets/javascripts/app/services/syncManager.js
index a47cbbb27..67a93ee77 100644
--- a/app/assets/javascripts/app/services/syncManager.js
+++ b/app/assets/javascripts/app/services/syncManager.js
@@ -448,4 +448,4 @@ class SyncManager {
}
}
-angular.module('app.frontend').service('syncManager', SyncManager);
+angular.module('app').service('syncManager', SyncManager);
diff --git a/app/assets/javascripts/app/services/sysExtManager.js b/app/assets/javascripts/app/services/sysExtManager.js
index 876506ace..b08738055 100644
--- a/app/assets/javascripts/app/services/sysExtManager.js
+++ b/app/assets/javascripts/app/services/sysExtManager.js
@@ -80,4 +80,4 @@ class SysExtManager {
}
-angular.module('app.frontend').service('sysExtManager', SysExtManager);
+angular.module('app').service('sysExtManager', SysExtManager);
diff --git a/app/assets/javascripts/app/services/themeManager.js b/app/assets/javascripts/app/services/themeManager.js
index 2a475ac62..5f7d745c8 100644
--- a/app/assets/javascripts/app/services/themeManager.js
+++ b/app/assets/javascripts/app/services/themeManager.js
@@ -103,4 +103,4 @@ class ThemeManager {
}
-angular.module('app.frontend').service('themeManager', ThemeManager);
+angular.module('app').service('themeManager', ThemeManager);
diff --git a/app/assets/javascripts/frontend.js b/app/assets/javascripts/frontend.js
deleted file mode 100644
index 7e4f399dd..000000000
--- a/app/assets/javascripts/frontend.js
+++ /dev/null
@@ -1,5 +0,0 @@
-//= require app/app.frontend.js
-//= require_tree ./app/services
-
-//= require app/app.frontend.js
-//= require_tree ./app/frontend
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
new file mode 100644
index 000000000..d7ba63e74
--- /dev/null
+++ b/app/assets/javascripts/main.js
@@ -0,0 +1 @@
+//= require_tree ./app
diff --git a/app/assets/stylesheets/_ionicons.scss b/app/assets/stylesheets/app/_ionicons.scss
similarity index 100%
rename from app/assets/stylesheets/_ionicons.scss
rename to app/assets/stylesheets/app/_ionicons.scss
diff --git a/app/assets/stylesheets/frontend.css.scss b/app/assets/stylesheets/main.css.scss
similarity index 90%
rename from app/assets/stylesheets/frontend.css.scss
rename to app/assets/stylesheets/main.css.scss
index f33649227..9e28dc002 100644
--- a/app/assets/stylesheets/frontend.css.scss
+++ b/app/assets/stylesheets/main.css.scss
@@ -8,5 +8,4 @@
@import "app/modals";
@import "app/lock-screen";
@import "app/stylekit-sub";
-
-@import "ionicons";
+@import "app/ionicons";
diff --git a/app/assets/templates/frontend/directives/account-menu.html.haml b/app/assets/templates/directives/account-menu.html.haml
similarity index 100%
rename from app/assets/templates/frontend/directives/account-menu.html.haml
rename to app/assets/templates/directives/account-menu.html.haml
diff --git a/app/assets/templates/frontend/directives/actions-menu.html.haml b/app/assets/templates/directives/actions-menu.html.haml
similarity index 100%
rename from app/assets/templates/frontend/directives/actions-menu.html.haml
rename to app/assets/templates/directives/actions-menu.html.haml
diff --git a/app/assets/templates/frontend/directives/component-modal.html.haml b/app/assets/templates/directives/component-modal.html.haml
similarity index 100%
rename from app/assets/templates/frontend/directives/component-modal.html.haml
rename to app/assets/templates/directives/component-modal.html.haml
diff --git a/app/assets/templates/frontend/directives/component-view.html.haml b/app/assets/templates/directives/component-view.html.haml
similarity index 100%
rename from app/assets/templates/frontend/directives/component-view.html.haml
rename to app/assets/templates/directives/component-view.html.haml
diff --git a/app/assets/templates/frontend/directives/editor-menu.html.haml b/app/assets/templates/directives/editor-menu.html.haml
similarity index 100%
rename from app/assets/templates/frontend/directives/editor-menu.html.haml
rename to app/assets/templates/directives/editor-menu.html.haml
diff --git a/app/assets/templates/frontend/directives/global-extensions-menu.html.haml b/app/assets/templates/directives/global-extensions-menu.html.haml
similarity index 100%
rename from app/assets/templates/frontend/directives/global-extensions-menu.html.haml
rename to app/assets/templates/directives/global-extensions-menu.html.haml
diff --git a/app/assets/templates/frontend/directives/menu-row.html.haml b/app/assets/templates/directives/menu-row.html.haml
similarity index 100%
rename from app/assets/templates/frontend/directives/menu-row.html.haml
rename to app/assets/templates/directives/menu-row.html.haml
diff --git a/app/assets/templates/frontend/directives/panel-resizer.html.haml b/app/assets/templates/directives/panel-resizer.html.haml
similarity index 100%
rename from app/assets/templates/frontend/directives/panel-resizer.html.haml
rename to app/assets/templates/directives/panel-resizer.html.haml
diff --git a/app/assets/templates/frontend/directives/permissions-modal.html.haml b/app/assets/templates/directives/permissions-modal.html.haml
similarity index 100%
rename from app/assets/templates/frontend/directives/permissions-modal.html.haml
rename to app/assets/templates/directives/permissions-modal.html.haml
diff --git a/app/assets/templates/frontend/editor.html.haml b/app/assets/templates/editor.html.haml
similarity index 100%
rename from app/assets/templates/frontend/editor.html.haml
rename to app/assets/templates/editor.html.haml
diff --git a/app/assets/templates/frontend/footer.html.haml b/app/assets/templates/footer.html.haml
similarity index 100%
rename from app/assets/templates/frontend/footer.html.haml
rename to app/assets/templates/footer.html.haml
diff --git a/app/assets/templates/frontend/home.html.haml b/app/assets/templates/home.html.haml
similarity index 100%
rename from app/assets/templates/frontend/home.html.haml
rename to app/assets/templates/home.html.haml
diff --git a/app/assets/templates/frontend/lock-screen.html.haml b/app/assets/templates/lock-screen.html.haml
similarity index 100%
rename from app/assets/templates/frontend/lock-screen.html.haml
rename to app/assets/templates/lock-screen.html.haml
diff --git a/app/assets/templates/frontend/notes.html.haml b/app/assets/templates/notes.html.haml
similarity index 100%
rename from app/assets/templates/frontend/notes.html.haml
rename to app/assets/templates/notes.html.haml
diff --git a/app/assets/templates/frontend/tags.html.haml b/app/assets/templates/tags.html.haml
similarity index 100%
rename from app/assets/templates/frontend/tags.html.haml
rename to app/assets/templates/tags.html.haml
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 76def86a7..e3aa18d09 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -7,7 +7,7 @@ class ApplicationController < ActionController::Base
layout :false
- def frontend
+ def app
end
diff --git a/app/views/application/frontend.html.erb b/app/views/application/app.html.erb
similarity index 95%
rename from app/views/application/frontend.html.erb
rename to app/views/application/app.html.erb
index 192df1a16..d05065dc1 100644
--- a/app/views/application/frontend.html.erb
+++ b/app/views/application/app.html.erb
@@ -1,5 +1,5 @@
-
+
@@ -43,7 +43,7 @@
-
+
diff --git a/config/cable.yml b/config/cable.yml
deleted file mode 100644
index 73739d638..000000000
--- a/config/cable.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-development:
- adapter: redis
- url: redis://localhost:6379
-
-test:
- adapter: async
-
-production:
- adapter: redis
- url: redis://localhost:6379/1
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index 4a7e35fa7..cb2eb3fc6 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -12,8 +12,7 @@ Rails.application.config.assets.precompile << /\.(?:svg|eot|woff|ttf)\z/
# 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( search.js )
-Rails.application.config.assets.precompile += %w( stylekit.css app.css compiled.min.js compiled.js )
+Rails.application.config.assets.precompile += %w( app.css compiled.min.js compiled.js )
# zip library
Rails.application.config.assets.precompile += %w( zip/zip.js zip/z-worker.js zip/inflate.js zip/deflate.js )
diff --git a/config/routes.rb b/config/routes.rb
index 3bd46ba1b..1697cb1b1 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,3 +1,3 @@
Rails.application.routes.draw do
- root 'application#frontend'
+ root 'application#app'
end
diff --git a/test/javascripts/controllers/HomeCtrl_spec.js b/test/javascripts/controllers/HomeCtrl_spec.js
index 0ae1e1650..d93065c78 100644
--- a/test/javascripts/controllers/HomeCtrl_spec.js
+++ b/test/javascripts/controllers/HomeCtrl_spec.js
@@ -1,6 +1,6 @@
-describe("app.frontend", function() {
+describe("app", function() {
- beforeEach(module('app.frontend'));
+ beforeEach(module('app'));
describe('Home Controller', function() {
diff --git a/test/javascripts/filters/DateFilter_spec.js b/test/javascripts/filters/DateFilter_spec.js
index b79c1dce9..cdfa55a55 100644
--- a/test/javascripts/filters/DateFilter_spec.js
+++ b/test/javascripts/filters/DateFilter_spec.js
@@ -1,5 +1,5 @@
describe("date filter", function() {
- beforeEach(module('app.frontend'));
+ beforeEach(module('app'));
var $filter;
beforeEach(inject(function(_$filter_){