Adapt is licensed under the [GNU General Public License, Version 3](https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE).
\ No newline at end of file
+ Adapt is licensed under the [GNU General Public License, Version 3](https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE).
diff --git a/Vagrantfile b/Vagrantfile
deleted file mode 100644
index 9a6fb5def9..0000000000
--- a/Vagrantfile
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
-VAGRANTFILE_API_VERSION = "2"
-
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
- config.vm.box = "ubuntu/trusty32"
- config.vm.box_download_insecure = true
-
- # Create a forwarded port mapping which allows access to a specific port
- # within the machine from a port on the host machine. In the example below,
- # accessing "localhost:5000" on the host will access port 5000 on the guest machine.
- config.vm.network "forwarded_port", guest: 5000, host: 5000
- config.vm.network "forwarded_port", guest: 5858, host: 5858
- config.vm.network "forwarded_port", guest: 27017, host: 27027
-
- if Vagrant::Util::Platform.windows?
- config.vm.provision "shell", path: "vagrant_setup_win.sh", privileged: true
- config.vm.provision "shell", path: "pm2_start_win.sh", privileged: false, run: "always"
- else
- config.vm.provision "shell", path: "vagrant_setup.sh", privileged: true
- config.vm.provision "shell", path: "pm2_start.sh", privileged: false, run: "always"
- end
-
- config.vm.provision "shell", path: "log_defaults.sh", privileged: true, run: "always"
-
- config.vm.provider "virtualbox" do |vb|
- vb.customize ["setextradata", :id, "VBoxInternal2/SharedFoldersEnableSymlinksCreate/htdocs", "1"]
- ### Change network card to PCnet-FAST III
- # For NAT adapter
- vb.customize ["modifyvm", :id, "--nictype1", "Am79C973"]
- # For host-only adapter
- vb.customize ["modifyvm", :id, "--nictype2", "Am79C973"]
- end
-end
diff --git a/conf/config-sample.json b/conf/config-sample.json
index df59284977..6e69cfbac9 100644
--- a/conf/config-sample.json
+++ b/conf/config-sample.json
@@ -1,14 +1,22 @@
{
+ "root": "",
+ "dataRoot": "data",
+ "rootUrl": "http://localhost:5000/",
+ "sessionSecret": "your-session-secret",
+ "outputPlugin": "adapt",
+ "auth": "local",
+ "isProduction": true,
"serverName": "localhost",
- "serverPort": 3000,
+ "serverPort": 5000,
"dbType": "mongoose",
+ "dbName": "adapt-tenant-master",
"dbHost": "localhost",
- "dbName": "adapt-builder-core",
"dbPort": 27017,
- "dataRoot": "data",
- "tenantPrefix": "adapt-builder-tenant-",
- "sessionSecret": "your-secret-here",
- "auth": "local",
- "useffmpeg" : false,
- "outputPlugin" : "adapt"
-}
+ "useSmtp": false,
+ "smtpService": "",
+ "smtpUsername": "",
+ "smtpPassword": "",
+ "fromAddress": "",
+ "masterTenantName": "adapt-tenant-master",
+ "masterTenantID": ""
+}
\ No newline at end of file
diff --git a/config.js b/config.js
deleted file mode 100644
index c5cabb0667..0000000000
--- a/config.js
+++ /dev/null
@@ -1,72 +0,0 @@
-// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE
-require.config({
- paths: {
- jquery: 'core/libraries/jquery',
- underscore: 'core/libraries/underscore',
- backbone: 'core/libraries/backbone',
- modernizr: 'core/libraries/modernizr',
- handlebars: 'core/libraries/handlebars',
- coreJS: 'core',
- templates: 'templates/templates',
- polyglot: 'core/libraries/polyglot.min',
- jsoneditor: 'core/libraries/jquery.jsoneditor.min',
- 'jquery-ui': 'core/libraries/jquery-ui.min',
- 'jquery-form' : 'core/libraries/jquery.form',
- velocity: 'core/libraries/velocity',
- scrollTo: 'core/libraries/scrollTo',
- 'mediaelement-and-player' : 'core/libraries/mediaelement-and-player',
- editorPage: 'core/editor/page',
- editorMenu: 'core/editor/menu',
- editorCourse: 'core/editor/course',
- editorConfig: 'core/editor/config',
- editorTheme: 'core/editor/theme',
- editorGlobal: 'core/editor/global',
- editorExtensions: 'core/editor/extensions',
- tagsInput: 'core/libraries/jquery.tagsinput.min.js'
- },
- shim: {
- jquery: [
-
- ],
- backbone: {
- deps: [
- 'underscore',
- 'jquery'
- ],
- exports: 'Backbone'
- },
- underscore: {
- exports: '_'
- },
- handlebars: {
- exports: 'Handlebars'
- },
- polyglot: {
- exports: 'Polyglot'
- },
- jsoneditor: {
- deps: ['jquery'],
- exports: 'JsonEditor'
- },
- velocity: {
- deps: ['jquery'],
- exports: 'velocity'
- },
- scrollTo: {
- deps: ['jquery'],
- exports: 'scrollTo'
- },
- 'jquery-ui': {
- deps: ['jquery'],
- exports: "$"
- },
- 'jquery-form': {
- deps: ['jquery'],
- exports: "$"
- },
- 'tagsInput': {
- deps: ['jquery'],
- exports: "$"
- }
- }
-});
\ No newline at end of file
diff --git a/frontend/src/core/actions/actions.js b/frontend/src/core/actions/actions.js
deleted file mode 100644
index 518059a606..0000000000
--- a/frontend/src/core/actions/actions.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE
-define(function(require) {
-
- var Origin = require('coreJS/app/origin');
- var ActionsView = require('coreJS/actions/views/actionsView');
-
- var Actions = {};
-
- Actions.add = function(options, $element) {
-
- // Expects options to contain:
- // _items: list of select options - array of objects containing text, value and applyButtonText as keys
- // placeholderText: first item in the select options
- // buttonText: Action button text
- $element.append(new ActionsView(options).$el);
-
- }
-
- Origin.actions = Actions;
-
-});
\ No newline at end of file
diff --git a/frontend/src/core/app.js b/frontend/src/core/app.js
new file mode 100644
index 0000000000..daea747a51
--- /dev/null
+++ b/frontend/src/core/app.js
@@ -0,0 +1,90 @@
+// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE
+(function() {
+ var origin;
+
+ function loadLibraries(callback) {
+ require([
+ 'ace/ace',
+ 'imageReady',
+ 'inview',
+ 'jqueryForm',
+ 'jqueryTagsInput',
+ 'jqueryUI',
+ 'mediaelement',
+ 'scrollTo',
+ 'sweetalert',
+ 'velocity'
+ ], callback);
+ }
+
+ function loadCore(callback) {
+ require([
+ 'templates/templates',
+ 'core/origin',
+ 'core/router',
+ 'core/helpers',
+ 'core/permissions',
+ 'core/l10n',
+ 'core/constants'
+ ], function(Templates, Origin, Router) {
+ origin = Origin;
+ origin.router = new Router();
+
+ var constantsLoaded = false;
+ var l10nLoaded = false;
+ origin.once('constants:loaded', function() {
+ constantsLoaded = true;
+ if(l10nLoaded) callback();
+ });
+ origin.once('l10n:loaded', function() {
+ l10nLoaded = true;
+ if(constantsLoaded) callback();
+ });
+ });
+ }
+
+ function loadAddOns(callback) {
+ /*
+ * FIXME we want to just be able to require these
+ * (this doesn't work in production mode)
+ */
+ // ['modules/modules','plugins/plugins']
+ require([
+ // modules
+ 'modules/actions/index',
+ 'modules/assetManagement/index',
+ 'modules/contentPane/index',
+ 'modules/contextMenu/index',
+ 'modules/editor/index',
+ 'modules/filters/index',
+ 'modules/globalMenu/index',
+ 'modules/help/index',
+ 'modules/location/index',
+ 'modules/modal/index',
+ 'modules/navigation/index',
+ 'modules/notify/index',
+ 'modules/options/index',
+ 'modules/pluginManagement/index',
+ 'modules/projects/index',
+ 'modules/scaffold/index',
+ 'modules/sidebar/index',
+ 'modules/user/index',
+ 'modules/userManagement/index',
+ ], callback);
+ }
+
+ /**
+ * Start app load
+ */
+ loadLibraries(function() {
+ loadCore(function() {
+ loadAddOns(function() {
+ // start session
+ // FIXME required here to avoid errors
+ require(['modules/user/models/sessionModel'], function(SessionModel) {
+ origin.startSession(new SessionModel());
+ });
+ });
+ });
+ });
+})();
diff --git a/frontend/src/core/app/app.js b/frontend/src/core/app/app.js
deleted file mode 100644
index 8caaf5e1cf..0000000000
--- a/frontend/src/core/app/app.js
+++ /dev/null
@@ -1,105 +0,0 @@
-// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE
-require([
- 'templates',
- 'polyglot',
- 'sweetalert',
- 'coreJS/app/origin',
- 'coreJS/app/router',
- 'coreJS/app/permissions',
- 'coreJS/user/user',
- 'coreJS/project/project',
- 'coreJS/dashboard/dashboard',
- 'coreJS/editor/editor',
- 'coreJS/assetManagement/assetManagement',
- 'coreJS/pluginManagement/pluginManagement',
- 'coreJS/user/models/sessionModel',
- 'coreJS/navigation/views/navigationView',
- 'coreJS/globalMenu/globalMenu',
- 'coreJS/sidebar/sidebar',
- 'coreJS/app/helpers',
- 'coreJS/app/contextMenu',
- 'coreJS/location/location',
- 'plugins/plugins',
- 'coreJS/notify/notify',
- 'coreJS/editingOverlay/editingOverlay',
- 'coreJS/options/options',
- 'coreJS/scaffold/scaffold',
- 'coreJS/modal/modal',
- 'coreJS/filters/filters',
- 'coreJS/actions/actions',
- 'jquery-ui',
- 'jquery-form',
- 'inview',
- 'imageReady',
- 'mediaelement',
- 'velocity',
- 'scrollTo',
- 'ace/ace'
-], function (
- Templates,
- Polyglot,
- SweetAlert,
- Origin,
- Router,
- Permissions,
- User,
- Project,
- Dashboard,
- Editor,
- AssetManagement,
- PluginManagement,
- SessionModel,
- NavigationView,
- GlobalMenu,
- Sidebar,
- Helpers,
- ContextMenu,
- Location,
- Notify,
- EditingOverlay,
- Options,
- Scaffold,
- Modal,
- JQueryUI,
- JQueryForm,
- Inview,
- ImageReady,
- MediaElement
-) {
-
- // Read in the configuration values/constants
- $.getJSON('config/config.json', function(configData) {
- Origin.constants = configData;
-
- var locale = localStorage.getItem('lang') || 'en';
-
- // Get the language file
- $.getJSON('lang/' + locale, function(data) {
- // Instantiate Polyglot with phrases
- window.polyglot = new Polyglot({phrases: data});
-
- Origin.sessionModel = new SessionModel();
-
- Origin.router = new Router();
-
- Origin.sessionModel.fetch({
- success: function(data) {
- // This callback is called from the schemasModel.js in scaffold as the schemas
- // need to load before the app loads
- Origin.trigger('app:userCreated', function() {
-
- $('#app').before(new NavigationView({model: Origin.sessionModel}).$el);
- Origin.trigger('app:dataReady');
- // Defer here is good - give anything tapping in app:dataReady event
- // time to do their thang!
- _.defer(function() {
- Origin.initialize();
- });
- });
-
- }
- });
- });
- });
-
-});
diff --git a/frontend/src/core/app/assets/adapt-learning-logo-outline.png b/frontend/src/core/app/assets/adapt-learning-logo-outline.png
deleted file mode 100644
index 08506921d7..0000000000
Binary files a/frontend/src/core/app/assets/adapt-learning-logo-outline.png and /dev/null differ
diff --git a/frontend/src/core/app/assets/ajax-loader.gif b/frontend/src/core/app/assets/ajax-loader.gif
deleted file mode 100644
index c69e937232..0000000000
Binary files a/frontend/src/core/app/assets/ajax-loader.gif and /dev/null differ
diff --git a/frontend/src/core/app/assets/transparency-light.png b/frontend/src/core/app/assets/transparency-light.png
deleted file mode 100644
index 827a9d3f3e..0000000000
Binary files a/frontend/src/core/app/assets/transparency-light.png and /dev/null differ
diff --git a/frontend/src/core/app/config.js b/frontend/src/core/app/config.js
deleted file mode 100644
index 02ec32d47f..0000000000
--- a/frontend/src/core/app/config.js
+++ /dev/null
@@ -1,119 +0,0 @@
-// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE
-require.config({
- baseUrl: '../../',
- paths: {
- jquery: 'core/libraries/jquery',
- underscore: 'core/libraries/underscore',
- backbone: 'core/libraries/backbone',
- modernizr: 'core/libraries/modernizr',
- handlebars: 'core/libraries/handlebars',
- inview: 'core/libraries/inview',
- imageReady: 'core/libraries/imageReady',
- coreJS: 'core',
- templates: 'templates/templates',
- polyglot: 'core/libraries/polyglot.min',
- sweetalert: 'core/libraries/sweetalert.min',
- backboneForms:'core/libraries/backbone-forms',
- backboneFormsLists:'core/libraries/backbone-forms-lists',
- jsoneditor: 'core/libraries/jquery.jsoneditor.min',
- 'jquery-ui': 'core/libraries/jquery-ui.min',
- 'jquery-form' : 'core/libraries/jquery.form',
- typeahead: 'core/libraries/typeahead',
- velocity: 'core/libraries/velocity',
- scrollTo: 'core/libraries/scrollTo',
- colorPicker: 'core/libraries/colorPicker/js/colorpicker',
- 'mediaelement' : 'core/libraries/mediaelement-and-player',
- editorPage: 'core/editor/page',
- editorMenu: 'core/editor/menu',
- editorCourse: 'core/editor/course',
- editorConfig: 'core/editor/config',
- editorTheme: 'core/editor/theme',
- editorMenuSettings: 'core/editor/menuSettings',
- editorGlobal: 'core/editor/global',
- editorExtensions: 'core/editor/extensions',
- tags: 'core/libraries/jquery.tagsinput.min',
- ace: 'core/libraries/ace',
- pikaday: 'core/libraries/pikaday/js/pikaday',
- moment: 'core/libraries/moment.min'
- },
- shim: {
- jquery: [
-
- ],
- backbone: {
- deps: [
- 'underscore',
- 'jquery'
- ],
- exports: 'Backbone'
- },
- underscore: {
- exports: '_'
- },
- handlebars: {
- exports: 'Handlebars'
- },
- templates: {
- deps:['handlebars']
- },
- polyglot: {
- exports: 'Polyglot'
- },
- sweetalert: {
- deps: ['jquery'],
- exports: 'sweetAlert'
- },
- jsoneditor: {
- deps: ['jquery'],
- exports: 'JsonEditor'
- },
- moment: {
- exports: 'moment'
- },
- 'mediaelement': {
- deps: ['jquery'],
- exports: 'mediaelement'
- },
- velocity: {
- deps: ['jquery'],
- exports: 'velocity'
- },
- scrollTo: {
- deps: ['jquery'],
- exports: 'scrollTo'
- },
- 'jquery-ui': {
- deps: ['jquery'],
- exports: "$"
- },
- 'jquery-form': {
- deps: ['jquery'],
- exports: "$"
- },
- backboneForms: {
- deps: ['backbone']
- },
- backboneFormsLists: {
- deps: ['backboneForms']
- },
- inview: {
- deps: [
- 'jquery'
- ],
- exports: 'inview'
- },
- imageReady: {
- deps: [
- 'jquery'
- ],
- exports: 'imageready'
- },
- ace: {
- exports: 'ace/ace'
- },
- tags: {
- deps: ['jquery'],
- exports: "$"
- }
- }
-});
diff --git a/frontend/src/core/app/contextMenu.js b/frontend/src/core/app/contextMenu.js
deleted file mode 100644
index fa142b47a1..0000000000
--- a/frontend/src/core/app/contextMenu.js
+++ /dev/null
@@ -1,123 +0,0 @@
-// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE
-/*
-* Context Menu
-* License - https://github.com/adaptlearning/adapt_framework/blob/master/LICENSE
-* Maintainers - Kevin Corry
-
\ No newline at end of file
diff --git a/frontend/src/core/dashboard/templates/dashboardSidebar.hbs b/frontend/src/core/dashboard/templates/dashboardSidebar.hbs
deleted file mode 100644
index 1ae122dba6..0000000000
--- a/frontend/src/core/dashboard/templates/dashboardSidebar.hbs
+++ /dev/null
@@ -1,54 +0,0 @@
-
diff --git a/frontend/src/core/dashboard/templates/home.hbs b/frontend/src/core/dashboard/templates/home.hbs
deleted file mode 100644
index bcc7c039ef..0000000000
--- a/frontend/src/core/dashboard/templates/home.hbs
+++ /dev/null
@@ -1,2 +0,0 @@
-
- {{t 'app.noprojectstodisplay'}}
-
- Welcome to Adapt Origin
-Please Login here
\ No newline at end of file diff --git a/frontend/src/core/dashboard/views/dashboardSidebarView.js b/frontend/src/core/dashboard/views/dashboardSidebarView.js deleted file mode 100644 index c4a3f2fd9c..0000000000 --- a/frontend/src/core/dashboard/views/dashboardSidebarView.js +++ /dev/null @@ -1,179 +0,0 @@ -// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -define(function(require) { - - var Origin = require('coreJS/app/origin'); - var SidebarItemView = require('coreJS/sidebar/views/sidebarItemView'); - - var DashboardSidebarView = SidebarItemView.extend({ - settings: { - autoRender: true - }, - - events: { - 'click .dashboard-sidebar-add-course' : 'addCourse', - 'click .dashboard-sidebar-my-courses' : 'gotoMyCourses', - 'click .dashboard-sidebar-shared-courses' : 'gotoSharedCourses', - 'keyup .dashboard-sidebar-filter-search-input':'filterProjectsByTitle', - 'click .sidebar-filter-clear': 'clearFilterInput', - 'click .dashboard-sidebar-tag': 'onFilterButtonClicked', - 'click .dashboard-sidebar-add-tag': 'onAddTagClicked', - 'click .dashboard-sidebar-row-filter': 'onFilterRemovedClicked' - }, - - postRender: function() { - this.listenTo(Origin, 'sidebarFilter:filterByTags', this.filterProjectsByTags); - this.listenTo(Origin, 'sidebarFilter:addTagToSidebar', this.addTagToSidebar); - this.listenTo(Origin, 'sidebar:update:ui', this.updateUI); - this.tags = []; - this.usedTags = []; - }, - - highlightSearchBox: function(){ - this.$('.dashboard-sidebar-filter-search-input').removeClass('search-highlight') - if (this.$('.dashboard-sidebar-filter-search-input').val()) { - this.$('.dashboard-sidebar-filter-search-input').addClass('search-highlight') - } - }, - - updateUI: function(userPreferences) { - if (userPreferences.search) { - this.$('.dashboard-sidebar-filter-search-input').val(userPreferences.search); - } - this.highlightSearchBox(); - if (userPreferences.tags) { - this.tags = userPreferences.tags; - var systemTags = [/*'archive', 'favourites'*/]; - _.each(userPreferences.tags, function(tag) { - // If this tag is part of the systemTags - // select this tag - if (_.contains(systemTags, tag)) { - this.$('.dashboard-sidebar-tag-'+tag.title).addClass('selected'); - } else { - this.addTagToSidebar(tag); - } - }, this); - } - }, - - addCourse: function() { - Origin.router.navigate('#/project/new', {trigger:true}); - }, - - gotoMyCourses: function() { - Origin.router.navigate('#/dashboard', {trigger: true}); - }, - - gotoSharedCourses: function() { - Origin.router.navigate('#/dashboard/shared', {trigger: true}); - }, - - filterProjectsByTitle: function(event, filter) { - if (event) { - event.preventDefault(); - } - var filterText = $(event.currentTarget).val().trim(); - Origin.trigger('dashboard:dashboardSidebarView:filterBySearch', filterText); - - this.highlightSearchBox(); - }, - - clearFilterInput: function(event) { - event.preventDefault(); - var $currentTarget = $(event.currentTarget); - $currentTarget.prev('.dashboard-sidebar-filter-input').val('').trigger('keyup', [true]); - this.highlightSearchBox(); - }, - - onFilterButtonClicked: function(event) { - $currentTarget = $(event.currentTarget); - var filterType = $currentTarget.attr('data-tag'); - - // If this filter is already selected - remove filter - // else add the filter - if ($currentTarget.hasClass('selected')) { - $currentTarget.removeClass('selected'); - Origin.trigger('dashboard:sidebarFilter:remove', filterType); - } else { - $currentTarget.addClass('selected'); - Origin.trigger('dashboard:sidebarFilter:add', filterType); - } - - }, - - onAddTagClicked: function(event) { - event.preventDefault(); - var availableTags = []; - // Go through each tag in the collection and filter out duplicate tags - // to create an array of unique project tags - - this.collection.each(function(tag) { - var availableTagsTitles = _.pluck(availableTags, 'title'); - var usedTagTitles = _.pluck(this.usedTags, 'title'); - if (!_.contains(availableTagsTitles, tag.get('title')) && !_.contains(usedTagTitles, tag.get('title'))) { - availableTags.push(tag.attributes); - } - - }, this); - - Origin.trigger('sidebar:sidebarFilter:add', { - title:'Filter by Tags', - items: availableTags - }); - }, - - onTagClicked: function(event) { - var tag = $(event.currentTarget).toggleClass('selected').attr('data-tag'); - this.filterProjectsByTags(tag); - }, - - filterProjectsByTags: function(tag) { - - // Check if the tag is already being filtered and remove it - if (_.findWhere(this.tags, { id: tag.id } )) { - this.tags = _.reject(this.tags, function(tagItem) { - return tagItem.id === tag.id; - }); - } else { - // Else add it to array - this.tags.push(tag); - } - - Origin.trigger('dashboard:dashboardSidebarView:filterByTags', this.tags); - }, - - addTagToSidebar: function(tag) { - this.usedTags.push(tag); - - var template = Handlebars.templates['sidebarRowFilter']; - var data = { - rowClasses: 'sidebar-row-filter', - buttonClasses:'dashboard-sidebar-row-filter', - tag: tag - }; - - this.$('.dashboard-sidebar-add-tag').parent().after(template(data)); - }, - - onFilterRemovedClicked: function(event) { - var tag = { - title: $(event.currentTarget).attr('data-title'), - id: $(event.currentTarget).attr('data-id') - } - - // Remove this tag from the usedTags - this.usedTags = _.reject(this.usedTags, function(item) { - return item.id === tag.id; - }); - - this.filterProjectsByTags(tag); - - $(event.currentTarget).parent().remove(); - } - - }, { - template: 'dashboardSidebar' - }); - - return DashboardSidebarView; - -}); diff --git a/frontend/src/core/editingOverlay/editingOverlay.js b/frontend/src/core/editingOverlay/editingOverlay.js deleted file mode 100644 index a55155c8a8..0000000000 --- a/frontend/src/core/editingOverlay/editingOverlay.js +++ /dev/null @@ -1,26 +0,0 @@ -// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -define(function(require) { - - var Origin = require('coreJS/app/origin'); - var EditingOverlayView = require('coreJS/editingOverlay/views/editingOverlayView'); - - Origin.editingOverlay = {}; - - Origin.editingOverlay.addView = function(element) { - // Trigger to remove current views - Origin.trigger('editingOverlay:views:remove'); - - // Check if element is a view element - if (_.isElement(element[0]) !== true) { - return console.log("Editing Overlay - Cannot add this object to the editing overlay view. Please make sure it's the views $el"); - } - - Origin.trigger('editingOverlay:views:show', element); - - } - - Origin.on('app:dataReady', function() { - $('.app-inner').append(new EditingOverlayView().$el); - }); - -}); \ No newline at end of file diff --git a/frontend/src/core/editingOverlay/less/editingOverlay.less b/frontend/src/core/editingOverlay/less/editingOverlay.less deleted file mode 100644 index 66fae12483..0000000000 --- a/frontend/src/core/editingOverlay/less/editingOverlay.less +++ /dev/null @@ -1,19 +0,0 @@ -.editing-overlay { - position:absolute; - z-index:10; - top:0px; - left:10%; - opacity:0; - width:100%; - opacity:0; - overflow-y: scroll; -} - -.editing-overlay-panel-content { - input, textarea { - min-width: 50%; - } - ul li { - margin-left:0px; - } -} diff --git a/frontend/src/core/editingOverlay/templates/editingOverlay.hbs b/frontend/src/core/editingOverlay/templates/editingOverlay.hbs deleted file mode 100644 index 644750a385..0000000000 --- a/frontend/src/core/editingOverlay/templates/editingOverlay.hbs +++ /dev/null @@ -1,2 +0,0 @@ - \ No newline at end of file diff --git a/frontend/src/core/editingOverlay/views/editingOverlayView.js b/frontend/src/core/editingOverlay/views/editingOverlayView.js deleted file mode 100644 index 72d084c009..0000000000 --- a/frontend/src/core/editingOverlay/views/editingOverlayView.js +++ /dev/null @@ -1,70 +0,0 @@ -// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -define(function(require) { - - var Origin = require('coreJS/app/origin'); - - var EditingOverlayView = Backbone.View.extend({ - - className: 'editing-overlay display-none', - - initialize: function() { - this.listenTo(Origin, 'editingOverlay:views:show', this.showOverlay); - this.listenTo(Origin, 'editingOverlay:views:hide', this.hideOverlay); - $(window).on("resize", _.bind(this.resizeOverlay, this)); - this.resizeOverlay(); - this.render(); - }, - - render: function() { - var template = Handlebars.templates[this.constructor.template]; - this.$el.html(template()); - _.defer(_.bind(function() { - this.postRender(); - }, this)); - return this; - }, - - postRender: function() { - - }, - - showOverlay: function(element) { - if (this._isVisible) { - return; - } - - this.$('.editing-overlay-inner').html(element); - _.defer(_.bind(function() { - this.$el.removeClass('display-none'); - this.$el.velocity({left: 0, opacity: 1}, 300, _.bind(function() { - this._isVisible = true; - this.resizeOverlay(); - }, this)); - this.listenToOnce(Origin, 'remove:views', this.hideOverlay); - }, this)); - }, - - hideOverlay: function() { - if (!this._isVisible) { - return; - } - - this.$el.velocity({left: '10%', opacity: 0}, 300, _.bind(function() { - this.$el.addClass('display-none'); - this._isVisible = false; - }, this)); - }, - - resizeOverlay: function() { - _.defer(_.bind(function() { - var windowHeight = $(window).height(); - this.$el.height(windowHeight - this.$el.offset().top); - }, this)); - } - }, { - template: 'editingOverlay' - }); - - return EditingOverlayView; - -}); diff --git a/frontend/src/core/editor/config/models/editorConfigModel.js b/frontend/src/core/editor/config/models/editorConfigModel.js deleted file mode 100644 index fecc54321e..0000000000 --- a/frontend/src/core/editor/config/models/editorConfigModel.js +++ /dev/null @@ -1,29 +0,0 @@ -// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -define(function(require) { - var EditorModel = require('editorGlobal/models/editorModel'); - var EditorConfigModel = EditorModel.extend({ - - sync: function(method, model, options) { - options = options || {}; - - switch (method.toLowerCase()) { - case 'read': - options.url = '/api/content/config/' + this.get('_courseId'); - break; - case 'update': - case 'patch': - options.url = '/api/content/config/' + this.get('_id'); - break; - } - - return Backbone.sync.apply(this, arguments); - }, - - _siblings: '', - _children: '', - _parent: 'course', - _type: 'config' - }); - - return EditorConfigModel; -}); \ No newline at end of file diff --git a/frontend/src/core/editor/config/templates/editorConfigEdit.hbs b/frontend/src/core/editor/config/templates/editorConfigEdit.hbs deleted file mode 100644 index a0d6efafc9..0000000000 --- a/frontend/src/core/editor/config/templates/editorConfigEdit.hbs +++ /dev/null @@ -1,2 +0,0 @@ -
-
\ No newline at end of file
diff --git a/frontend/src/core/editor/config/templates/editorConfigEditSidebar.hbs b/frontend/src/core/editor/config/templates/editorConfigEditSidebar.hbs
deleted file mode 100644
index d3efbff59b..0000000000
--- a/frontend/src/core/editor/config/templates/editorConfigEditSidebar.hbs
+++ /dev/null
@@ -1,19 +0,0 @@
-
\ No newline at end of file
diff --git a/frontend/src/core/editor/config/views/editorConfigEditSidebarView.js b/frontend/src/core/editor/config/views/editorConfigEditSidebarView.js
deleted file mode 100644
index 41ae686aed..0000000000
--- a/frontend/src/core/editor/config/views/editorConfigEditSidebarView.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE
-define(function(require) {
-
- var Origin = require('coreJS/app/origin');
- var SidebarItemView = require('coreJS/sidebar/views/sidebarItemView');
- var Backbone = require('backbone');
-
- var EditorConfigEditSidebarView = SidebarItemView.extend({
-
- events: {
- 'click .editor-config-edit-sidebar-save': 'saveEditing',
- 'click .editor-config-edit-sidebar-cancel': 'cancelEditing'
- },
-
- saveEditing: function(event) {
- event.preventDefault();
- this.updateButton('.editor-config-edit-sidebar-save', window.polyglot.t('app.saving'));
- Origin.trigger('editorConfigEditSidebar:views:save');
- },
-
- cancelEditing: function(event) {
- event.preventDefault();
- Backbone.history.history.back();
- Origin.trigger('editingOverlay:views:hide');
- }
-
- }, {
- template: 'editorConfigEditSidebar'
- });
-
- return EditorConfigEditSidebarView;
-
-});
\ No newline at end of file
diff --git a/frontend/src/core/editor/course/models/editorCourseModel.js b/frontend/src/core/editor/course/models/editorCourseModel.js
deleted file mode 100644
index fe7e9c449a..0000000000
--- a/frontend/src/core/editor/course/models/editorCourseModel.js
+++ /dev/null
@@ -1,14 +0,0 @@
-// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE
-define(function(require) {
- var EditorModel = require('editorGlobal/models/editorModel');
- var EditorCourseModel = EditorModel.extend({
-
- urlRoot: '/api/content/course',
-
- _siblings: '',
- _children: 'contentObjects',
- _type: 'course'
- });
-
- return EditorCourseModel;
-});
\ No newline at end of file
diff --git a/frontend/src/core/editor/editor.js b/frontend/src/core/editor/editor.js
deleted file mode 100644
index bc44da21f8..0000000000
--- a/frontend/src/core/editor/editor.js
+++ /dev/null
@@ -1,491 +0,0 @@
-// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE
-define(function(require) {
-
- var Origin = require('coreJS/app/origin');
- var EditorView = require('editorGlobal/views/editorView');
- var EditorModel = require('editorGlobal/models/editorModel');
- var EditorMenuSidebarView = require('editorMenu/views/editorMenuSidebarView');
-
- var EditorPageSidebarView = require('editorPage/views/editorPageSidebarView');
- var EditorContentObjectModel = require('editorMenu/models/editorContentObjectModel');
-
- var EditorPageEditView = require('editorPage/views/editorPageEditView');
- var EditorPageEditSidebarView = require('editorPage/views/editorPageEditSidebarView');
-
- var EditorArticleModel = require('editorPage/models/editorArticleModel');
-
- var EditorArticleEditView = require('editorPage/views/editorArticleEditView');
- var EditorArticleEditSidebarView = require('editorPage/views/editorArticleEditSidebarView');
-
- var EditorBlockModel = require('editorPage/models/editorBlockModel');
-
- var EditorBlockEditView = require('editorPage/views/editorBlockEditView');
- var EditorBlockEditSidebarView = require('editorPage/views/editorBlockEditSidebarView');
-
- var EditorComponentModel = require('editorPage/models/editorComponentModel');
-
- var EditorComponentEditView = require('editorPage/views/editorComponentEditView');
- var EditorComponentEditSidebarView = require('editorPage/views/editorComponentEditSidebarView');
-
- var EditorExtensionsEditView = require('editorExtensions/views/editorExtensionsEditView');
- var EditorExtensionsEditSidebarView = require('editorExtensions/views/editorExtensionsEditSidebarView');
-
- var EditorConfigEditView = require('editorConfig/views/editorConfigEditView');
- var EditorConfigEditSidebarView = require('editorConfig/views/editorConfigEditSidebarView');
- var EditorConfigModel = require('editorConfig/models/editorConfigModel');
- var EditorConfigCollection = require('editorConfig/collections/editorConfigCollection');
-
- var EditorThemeTypeModel = require('editorTheme/models/editorThemeTypeModel');
-
- var EditorThemeCollectionView = require('editorTheme/views/editorThemeCollectionView');
- var EditorThemeCollectionSidebarView = require('editorTheme/views/editorThemeCollectionSidebarView');
-
- var EditorComponentListView = require('editorPage/views/editorComponentListView');
- var EditorComponentListSidebarView = require('editorPage/views/editorComponentListSidebarView');
-
- var EditorConfigModel = require('editorConfig/models/editorConfigModel');
- var EditorCourseModel = require('editorCourse/models/editorCourseModel');
- var EditorCollection = require('editorGlobal/collections/editorCollection');
- var EditorClipboardModel = require('editorGlobal/models/editorClipboardModel');
- var EditorComponentTypeModel = require('editorPage/models/editorComponentTypeModel');
- var ExtensionModel = require('editorExtensions/models/extensionModel');
- var EditorCourseAssetModel = require('editorCourse/models/editorCourseAssetModel');
-
- var EditorMenuSettingsEditView = require('editorMenuSettings/views/editorMenuSettingsEditView');
- var EditorMenuSettingsEditSidebarView = require('editorMenuSettings/views/editorMenuSettingsEditSidebarView');
-
- var ProjectModel = require('coreJS/project/models/projectModel');
- var ProjectDetailView = require('coreJS/project/views/projectDetailView');
- var ProjectDetailEditSidebarView = require('coreJS/project/views/projectDetailEditSidebarView');
-
- var dataIsLoaded = false;
-
- Origin.on('editor:refreshData', function(callback, context) {
- dataIsLoaded = false;
- var loadedData = {
- clipboard: false,
- course: false,
- config: false,
- componentTypes: false,
- extensionTypes: false,
- contentObjects: false,
- articles: false,
- blocks: false,
- components: false,
- courseAssets: false
- };
- Origin.on('editorCollection:dataLoaded editorModel:dataLoaded', function(loadedObject) {
-
- loadedData[loadedObject] = true;
-
- var allDataIsLoaded = _.every(loadedData, function(item) {
- return item === true;
- });
-
- if (allDataIsLoaded) {
-
- Origin.off('editorCollection:dataLoaded editorModel:dataLoaded');
- Origin.trigger('editor:dataLoaded');
- dataIsLoaded = true;
- if (callback) {
- callback.apply(context);
- }
- }
-
- });
-
- // // Not implemented for the time being
- // Origin.editor.data.config.on('change:_enabledExtensions', function() {
- // Origin.socket.emit('project:build', { id: this.currentCourseId });
- // });
-
- _.each(Origin.editor.data, function(object) {
- object.fetch({reset:true,
- error: function(model, response, options) {
- Origin.Notify.alert({
- type: 'error',
- text: window.polyglot.t('app.errorgeneric')
- });
- }
- });
- });
-
- });
-
- Origin.on('router:editor', function(route1, route2, route3, route4) {
- // Check if data has already been loaded for this project
- if (dataIsLoaded && Origin.editor.data.course && Origin.editor.data.course.get('_id') === route1) {
- return routeAfterDataIsLoaded(route1, route2, route3, route4);
- }
-
- var loadedData = {
- clipboard: false,
- course: false,
- config: false,
- componentTypes: false,
- extensionTypes: false,
- contentObjects: false,
- articles: false,
- blocks: false,
- components: false,
- courseAssets: false
- };
-
- Origin.on('editorCollection:dataLoaded editorModel:dataLoaded', function(loadedObject) {
-
- loadedData[loadedObject] = true;
-
- var allDataIsLoaded = _.every(loadedData, function(item) {
- return item === true;
- });
-
- if (allDataIsLoaded) {
-
- Origin.off('editorCollection:dataLoaded editorModel:dataLoaded');
- Origin.trigger('editor:dataLoaded');
- dataIsLoaded = true;
- routeAfterDataIsLoaded(route1, route2, route3, route4);
-
- }
-
- });
-
- setupEditorData(route1, route2, route3, route4);
-
- });
-
- function setupEditorData(route1, route2, route3, route4) {
- Origin.editor.data.course = new EditorCourseModel({_id: route1});
- Origin.editor.data.config = new EditorConfigModel({_courseId: route1});
-
- Origin.editor.data.contentObjects = new EditorCollection(null, {
- model: EditorContentObjectModel,
- url: '/api/content/contentobject?_courseId=' + route1,
- _type: 'contentObjects'
- });
-
- Origin.editor.data.articles = new EditorCollection(null, {
- model: EditorArticleModel,
- url: '/api/content/article?_courseId=' + route1,
- _type: 'articles'
- });
-
- Origin.editor.data.blocks = new EditorCollection(null, {
- model: EditorBlockModel,
- url: '/api/content/block?_courseId=' + route1,
- _type: 'blocks'
- });
-
- Origin.editor.data.components = new EditorCollection(null, {
- model: EditorComponentModel,
- url: '/api/content/component?_courseId=' + route1,
- _type: 'components'
- });
-
- Origin.editor.data.clipboard = new EditorCollection(null, {
- model: EditorClipboardModel,
- url: '/api/content/clipboard?_courseId=' + route1 + '&createdBy=' + Origin.sessionModel.get('id'),
- _type: 'clipboard'
- });
-
- // Store the component types
- Origin.editor.data.componentTypes = new EditorCollection(null, {
- model : EditorComponentTypeModel,
- url: '/api/componenttype',
- _type: 'componentTypes'
- });
-
- Origin.editor.data.componentTypes.comparator = function(model) {
- return model.get('displayName');
- };
-
- // Store the extensions types
- Origin.editor.data.extensionTypes = new EditorCollection(null, {
- model : ExtensionModel,
- url: '/api/extensiontype',
- _type: 'extensionTypes'
- });
-
- // Store the course assets
- Origin.editor.data.courseAssets = new EditorCollection(null, {
- model: EditorCourseAssetModel,
- url: '/api/content/courseasset?_courseId=' + route1,
- _type: 'courseAssets'
- });
- }
-
- function routeAfterDataIsLoaded(route1, route2, route3, route4) {
-
- if (route2 === 'article' && route4 === 'edit') {
- var articleModel = new EditorArticleModel({_id: route3});
- articleModel.fetch({
- success: function() {
- var form = Origin.scaffold.buildForm({
- model: articleModel
- });
- Origin.trigger('location:title:update', {title: 'Editing article - ' + articleModel.get('title')});
- Origin.sidebar.addView(new EditorArticleEditSidebarView({model: articleModel, form: form}).$el);
- Origin.editingOverlay.addView(new EditorArticleEditView({model: articleModel, form: form}).$el);
- }
- });
- return;
- }
-
- if (route2 === 'block' && route4 === 'edit') {
- var blockModel = new EditorBlockModel({_id: route3});
- blockModel.fetch({
- success: function() {
- var form = Origin.scaffold.buildForm({
- model: blockModel
- });
- Origin.trigger('location:title:update', {title: 'Editing block - ' + blockModel.get('title')});
- Origin.sidebar.addView(new EditorBlockEditSidebarView({model: blockModel, form: form}).$el);
- Origin.editingOverlay.addView(new EditorBlockEditView({model: blockModel, form: form}).$el);
- }
- });
- return;
- }
-
- if (route2 === 'block' && route4 === 'add') {
- // If adding a new component
- // Find block so we can get layout options
- var containingBlock = Origin.editor.data.blocks.findWhere({_id: route3});
-
- var layoutOptions = containingBlock.get('layoutOptions');
-
- var componentSelectModel = new Backbone.Model({
- title: window.polyglot.t('app.addcomponent'),
- body: window.polyglot.t('app.pleaseselectcomponent'),
- _parentId: route3,
- componentTypes: Origin.editor.data.componentTypes.toJSON(),
- layoutOptions: layoutOptions
- });
-
- Origin.sidebar.addView(new EditorComponentListSidebarView({
- model: componentSelectModel
- }).$el);
- Origin.editingOverlay.addView(new EditorComponentListView({
- model: componentSelectModel
- }).$el);
-
- return;
- }
-
- if (route2 === 'component') {
- // Display editing a component
- var componentModel = new EditorComponentModel({_id: route3});
- componentModel.fetch({
- success: function() {
- var form = Origin.scaffold.buildForm({
- model: componentModel
- });
-
- var componentType = _.find(Origin.editor.data.componentTypes.models, function(componentTypeModel) {
- return componentTypeModel.get('_id') == componentModel.get('_componentType');
- });
-
- var componentDisplayName = (componentType) ? componentType.get('displayName').toLowerCase() : '';
-
- Origin.trigger('location:title:update', {title: 'Editing ' + componentDisplayName + ' component - ' + componentModel.get('title')});
- Origin.sidebar.addView(new EditorComponentEditSidebarView({model: componentModel, form:form}).$el);
- Origin.editingOverlay.addView(new EditorComponentEditView({model: componentModel, form:form}).$el);
- }
- });
- return;
- }
-
- switch (route2) {
- case 'settings':
- var project = new ProjectModel({_id: route1});
-
- project.fetch({
- success: function() {
- var form = Origin.scaffold.buildForm({
- model: project
- });
-
- Origin.trigger('location:title:update', {title: 'Edit course'});
- Origin.editingOverlay.addView(new ProjectDetailView({model: project, form: form}).$el);
- Origin.sidebar.addView(new ProjectDetailEditSidebarView({form: form}).$el);
- }
- });
- break;
-
- case 'config':
- // route2 is the courseid
- // var collection = new EditorConfigCollection();
- // collection.findWhere({_courseId: location});
-
- var configModel = new EditorConfigModel({_courseId: route1});
-
- configModel.fetch({
- success: function() {
- var form = Origin.scaffold.buildForm({
- model: configModel
- });
-
- Origin.trigger('location:title:update', {title: 'Edit configuration'});
- Origin.sidebar.addView(new EditorConfigEditSidebarView({form: form}).$el);
- Origin.editingOverlay.addView(new EditorConfigEditView({model: configModel, form: form}).$el);
- }
- });
-
- break;
-
- case 'selecttheme':
- var configModel = new EditorConfigModel({_courseId: route1});
-
- var backButtonRoute = "/#/editor/" + route1 + "/menu";
- var backButtonText = "Back to menu";
-
- if (Origin.previousLocation.route2 === "page") {
- backButtonRoute = "/#/editor/" + route1 + "/page/" + Origin.previousLocation.route3;
- backButtonText = "Back to page";
- }
-
- var optionsObject = {
- "backButtonText": backButtonText,
- "backButtonRoute": backButtonRoute
- };
-
- configModel.fetch({
- success: function() {
- Origin.trigger('location:title:update', {title: 'Select theme'});
- Origin.sidebar.addView(new EditorThemeCollectionSidebarView().$el, optionsObject);
- Origin.editingOverlay.addView(new EditorThemeCollectionView({model: configModel}).$el);
- }
- });
-
- break;
-
- case 'extensions':
- Origin.trigger('location:title:update', {title: 'Manage extensions'});
-
- var extensionsModel = new Backbone.Model({_id: route1});
-
- // Setup back button breadcrumb
-
- // Check whether the user came from the page editor or menu editor
- var backButtonRoute = "/#/editor/" + route1 + "/menu";
- var backButtonText = "Back to menu";
-
- if (Origin.previousLocation.route2 === "page") {
- backButtonRoute = "/#/editor/" + route1 + "/page/" + Origin.previousLocation.route3;
- backButtonText = "Back to page";
- }
-
- var optionsObject = {
- "backButtonText": backButtonText,
- "backButtonRoute": backButtonRoute
- };
-
- Origin.sidebar.addView(new EditorExtensionsEditSidebarView().$el, optionsObject);
- Origin.editingOverlay.addView(new EditorExtensionsEditView({model: extensionsModel}).$el);
-
- break;
-
- case 'menusettings':
- var configModel = new EditorConfigModel({_courseId: route1});
-
- configModel.fetch({
- success: function() {
-
- var backButtonRoute = "/#/editor/" + route1 + "/menu";
- var backButtonText = "Back to menu";
-
- if (Origin.previousLocation.route2 === "page") {
- backButtonRoute = "/#/editor/" + route1 + "/page/" + Origin.previousLocation.route3;
- backButtonText = "Back to page";
- }
-
- var optionsObject = {
- "backButtonText": backButtonText,
- "backButtonRoute": backButtonRoute
- };
-
- Origin.trigger('location:title:update', {title: 'Select menu'});
- Origin.sidebar.addView(new EditorMenuSettingsEditSidebarView().$el, optionsObject);
- Origin.editingOverlay.addView(new EditorMenuSettingsEditView({model: configModel}).$el);
- }
- });
- break;
-
- case 'menu':
-
- // Edit the menu item
- if (route4 === "edit") {
- var contentObjectModel = new EditorContentObjectModel({_id: route3});
-
- contentObjectModel.fetch({
- success: function() {
-
- var form = Origin.scaffold.buildForm({
- model: contentObjectModel
- });
-
- Origin.trigger('location:title:update', {title: 'Editing menu - ' + contentObjectModel.get('title')});
- Origin.sidebar.addView(new EditorPageEditSidebarView().$el);
- Origin.editingOverlay.addView(new EditorPageEditView({model: contentObjectModel, form: form}).$el);
- }
- });
- } else {
- // If route3 is an id set it to the currentContentObjectId
- Origin.editor.currentContentObjectId = (route3) ? route3 : undefined;
-
- // Update page title
- Origin.trigger('location:title:update', {title: 'Menu editor'});
-
- Origin.editor.scrollTo = 0;
- // Create Editor menu view
- Origin.router.createView(EditorView, {
- currentCourseId: route1,
- currentView: 'menu',
- currentPageId: (route3 || null)
- });
-
- // update sidebar view
- Origin.sidebar.addView(new EditorMenuSidebarView().$el, {
- "backButtonText": "Back to courses",
- "backButtonRoute": Origin.dashboardRoute || '/#/dashboard'
- });
- }
- break;
-
- case 'page':
-
- // Edit the page item
- if (route4 === "edit") {
- var contentObjectModel = new EditorContentObjectModel({_id: route3});
- contentObjectModel.fetch({
- success: function() {
- var form = Origin.scaffold.buildForm({
- model: contentObjectModel
- });
- Origin.trigger('location:title:update', {title: 'Editing page - ' + contentObjectModel.get('title')});
- Origin.sidebar.addView(new EditorPageEditSidebarView({form: form}).$el);
- Origin.editingOverlay.addView(new EditorPageEditView({model: contentObjectModel, form: form}).$el);
- }
- });
- } else {
- // Update page title
- Origin.trigger('location:title:update', {title: 'Page editor'});
-
- // Create Editor page view
- // Origin.editor.scrollTo = 0;
- Origin.router.createView(EditorView, {
- currentCourseId: route1,
- currentView: 'page',
- currentPageId: (route3 || null)
- });
- // update sidebar view
- Origin.sidebar.addView(new EditorPageSidebarView().$el, {
- "backButtonText": "Back to course structure",
- "backButtonRoute": "/#/editor/" + route1 + "/menu"
- });
- }
- break;
- }
-
- }
-
-});
diff --git a/frontend/src/core/editor/extensions/collections/extensionCollection.js b/frontend/src/core/editor/extensions/collections/extensionCollection.js
deleted file mode 100644
index d47942381d..0000000000
--- a/frontend/src/core/editor/extensions/collections/extensionCollection.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE
-define(function(require) {
-
- var Backbone = require('backbone');
- var ExtensionModel = require('editorExtensions/models/extensionModel');
-
- var ExtensionCollection = Backbone.Collection.extend({
-
- model: ExtensionModel,
-
- url: 'api/extensiontype',
-
- comparator: function(model) {
- return model.get('displayName');
- }
-
- });
-
- return ExtensionCollection;
-
-});
diff --git a/frontend/src/core/editor/extensions/templates/editorExtensionsEdit.hbs b/frontend/src/core/editor/extensions/templates/editorExtensionsEdit.hbs
deleted file mode 100644
index 5e6547fe10..0000000000
--- a/frontend/src/core/editor/extensions/templates/editorExtensionsEdit.hbs
+++ /dev/null
@@ -1,101 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/frontend/src/core/editor/extensions/templates/editorExtensionsEditSidebar.hbs b/frontend/src/core/editor/extensions/templates/editorExtensionsEditSidebar.hbs
deleted file mode 100644
index 8dd7f70ffb..0000000000
--- a/frontend/src/core/editor/extensions/templates/editorExtensionsEditSidebar.hbs
+++ /dev/null
@@ -1,7 +0,0 @@
-
\ No newline at end of file
diff --git a/frontend/src/core/editor/extensions/views/editorExtensionsEditSidebarView.js b/frontend/src/core/editor/extensions/views/editorExtensionsEditSidebarView.js
deleted file mode 100644
index 3c9ac8b073..0000000000
--- a/frontend/src/core/editor/extensions/views/editorExtensionsEditSidebarView.js
+++ /dev/null
@@ -1,14 +0,0 @@
-// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE
-define(function(require) {
-
- var Origin = require('coreJS/app/origin');
- var SidebarItemView = require('coreJS/sidebar/views/sidebarItemView');
- var Backbone = require('backbone');
-
- var EditorExtensionsEditSidebarView = SidebarItemView.extend({}, {
- template: 'editorExtensionsEditSidebar'
- });
-
- return EditorExtensionsEditSidebarView;
-
-});
\ No newline at end of file
diff --git a/frontend/src/core/editor/extensions/views/editorExtensionsEditView.js b/frontend/src/core/editor/extensions/views/editorExtensionsEditView.js
deleted file mode 100644
index bf2f629147..0000000000
--- a/frontend/src/core/editor/extensions/views/editorExtensionsEditView.js
+++ /dev/null
@@ -1,161 +0,0 @@
-// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE
-define(function(require) {
-
- var Backbone = require('backbone');
- var Origin = require('coreJS/app/origin');
- var EditorOriginView = require('editorGlobal/views/editorOriginView');
- var EditorConfigModel = require('editorConfig/models/editorConfigModel');
-
- var EditorExtensionsEditView = EditorOriginView.extend({
-
- tagName: "div",
-
- className: "extension-management",
-
- settings: {
- autoRender: false
- },
-
- events: {
- 'click button.remove-extension' : 'onRemoveExtensionClicked',
- 'click button.add-extension' : 'onAddExtensionClicked'
- },
-
- preRender: function() {
- this.currentSelectedIds = [];
- this.listenTo(Origin, 'editorExtensionsEdit:views:add', this.addExtension);
- this.listenTo(Origin, 'editorExtensionsEdit:views:remove', this.removeExtension);
- this.setupExtensions();
- },
-
- setupExtensions: function() {
-
- // Grab all available extensions
- var availableExtensionsCollection = Origin.editor.data.extensionTypes;
-
- // Get the extensions on the current course
- var enabledExtensions = Origin.editor.data.config.get('_enabledExtensions');
-
- // Pluck on extension name
- var enabledExtensionNames = _.pluck(enabledExtensions, 'name');
-
- var enabledExtensionsCollection = new Backbone.Collection();
- var disabledExtensionsCollection = new Backbone.Collection();
-
- // Go through each collection and see if it's enabled
- // and push to correct collection
- availableExtensionsCollection.each(function(extension) {
- if (_.indexOf(enabledExtensionNames, extension.get('name')) > -1) {
- enabledExtensionsCollection.add(extension);
- } else {
- disabledExtensionsCollection.add(extension);
- }
- });
-
- // Set collections on model render for render
- this.model.set('enabledExtensions', enabledExtensionsCollection.toJSON());
- this.model.set('availableExtensions', disabledExtensionsCollection.toJSON());
-
- this.render();
-
- _.defer(_.bind(this.postRender, this));
-
- },
-
- postRender: function() {
- this.setViewToReady();
- },
-
- onAddExtensionClicked: function(event) {
- this.currentSelectedIds = [$(event.currentTarget).attr('data-id')];
- var extensionName = $(event.currentTarget).attr('data-displayname');
-
- Origin.Notify.confirm({
- title: window.polyglot.t('app.manageextensions'),
- text: window.polyglot.t('app.confirmapplyextension', {extension: extensionName}),
- html: true,
- callback: _.bind(this.onAddExtensionConfirmed, this)
- });
- },
-
- onAddExtensionConfirmed: function(confirmed) {
- if (confirmed) {
- Origin.trigger('editorExtensionsEdit:views:add');
- }
- },
-
- addExtension: function() {
- var self = this;
- $.post('/api/extension/enable/' + this.model.get('_id'), {
- extensions: this.currentSelectedIds
- }, _.bind(function(result) {
- if (result.success) {
- self.refreshData();
- } else {
- Origin.Notify.alert({
- type: 'error',
- text: window.polyglot.t('app.errorgeneric')
- });
- }
- }, this));
- },
-
- onRemoveExtensionClicked: function(event) {
- this.currentSelectedIds = [$(event.currentTarget).attr('data-id')];
-
- Origin.Notify.confirm({
- type: 'warning',
- title: window.polyglot.t('app.deleteextension'),
- text: window.polyglot.t('app.confirmdeleteextension'),
- callback: _.bind(this.onRemoveExtensionConfirmed, this)
- });
-
- },
-
- onRemoveExtensionConfirmed: function(confirmed) {
- if (confirmed) {
- Origin.trigger('editorExtensionsEdit:views:remove');
- }
- },
-
- refreshData: function() {
- var self = this;
-
- var configModel = new EditorConfigModel({_courseId: this.model.get('_id')});
- // Ensure that the latest config model is always up-to-date when entering this screen
- configModel.fetch({
- success: function(model, response, options) {
- Origin.editor.data.config = model;
-
- Origin.trigger('scaffold:updateSchemas', function() {
- self.setupExtensions();
- }, this);
- }
- });
- },
-
- removeExtension: function() {
- var self = this;
-
- $.post('/api/extension/disable/' + this.model.get('_id'), {
- extensions: this.currentSelectedIds
- }, _.bind(function(result) {
- if (result.success) {
- self.refreshData();
- } else {
- Origin.Notify.alert({
- type: 'error',
- text: window.polyglot.t('app.errorgeneric')
- });
- }
- }, this));
- }
-
- },
- {
- template: 'editorExtensionsEdit'
- });
-
- return EditorExtensionsEditView;
-
-});
diff --git a/frontend/src/core/editor/global/collections/editorCollection.js b/frontend/src/core/editor/global/collections/editorCollection.js
deleted file mode 100644
index 59772b6a81..0000000000
--- a/frontend/src/core/editor/global/collections/editorCollection.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE
-define(function(require) {
-
- var Backbone = require('backbone');
- var Origin = require('coreJS/app/origin');
-
- var EditorCollection = Backbone.Collection.extend({
- initialize : function(models, options){
- this.url = options.url;
- this._type = options._type;
- this.on('reset', this.loadedData, this);
- this.fetch({reset:true});
- },
-
- loadedData: function() {
- Origin.trigger('editorCollection:dataLoaded', this._type);
- }
-
- });
-
- return EditorCollection;
-
-});
\ No newline at end of file
diff --git a/frontend/src/core/editor/global/models/editorClipboardModel.js b/frontend/src/core/editor/global/models/editorClipboardModel.js
deleted file mode 100644
index a99ce6c6d0..0000000000
--- a/frontend/src/core/editor/global/models/editorClipboardModel.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE
-define(function(require) {
-
- var EditorModel = require('editorGlobal/models/editorModel');
-
- var EditorClipboardModel = EditorModel.extend({
- urlRoot: '/api/content/clipboard',
- });
-
- return EditorClipboardModel;
-
-});
diff --git a/frontend/src/core/editor/global/models/editorModel.js b/frontend/src/core/editor/global/models/editorModel.js
deleted file mode 100644
index 7684c31956..0000000000
--- a/frontend/src/core/editor/global/models/editorModel.js
+++ /dev/null
@@ -1,141 +0,0 @@
-// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE
-define(function(require) {
- var Backbone = require('backbone');
- var Origin = require('coreJS/app/origin');
-
- var EditorModel = Backbone.Model.extend({
-
- idAttribute: '_id',
- whitelistAttributes: null,
-
- initialize : function(options) {
- this.on('sync', this.loadedData, this);
- this.on('change', this.loadedData, this);
- this.fetch();
- },
-
- loadedData: function() {
- if (this._siblings) {
- this._type = this._siblings;
- }
-
- Origin.trigger('editorModel:dataLoaded', this._type);
- },
-
- getChildren: function() {
- if (Origin.editor.data[this._children]) {
- var children = Origin.editor.data[this._children].where({_parentId:this.get("_id")});
- var childrenCollection = new Backbone.Collection(children);
-
- return childrenCollection;
- } else {
- return null;
- }
- },
-
- getParent: function() {
- var currentType = this.get('_type');
- var parent;
- var currentParentId = this.get('_parentId');
-
- if (currentType === 'menu' || currentType === 'page') {
- if (currentParentId === Origin.editor.data.course.get('_id')) {
- parent = Origin.editor.data.course;
- } else {
- parent = Origin.editor.data.contentObjects.findWhere({_id: currentParentId});
- }
- } else if (currentType != 'course'){
- parent = Origin.editor.data[this._parent].findWhere({_id: currentParentId});
- }
-
- return parent;
-
- },
-
- getSiblings: function(returnMyself) {
-
- if (returnMyself) {
- var siblings = Origin.editor.data[this._siblings].where({_parentId:this.get("_parentId")});
- var siblingsCollection = new Backbone.Collection(siblings);
-
- return siblingsCollection;
- } else {
-
- var siblings = _.reject(Origin.editor.data[this._siblings].where({
- _parentId:this.get("_parentId")
- }), _.bind(function(model){
- return model.get('_id') == this.get('_id');
- }, this));
- var siblingsCollection = new Backbone.Collection(siblings);
-
-
- // returns a collection of siblings
- return siblingsCollection;
- }
- },
-
- setOnChildren: function(key, value, options) {
- var args = arguments;
-
- if(!this._children) return;
-
- this.getChildren().each(function(child){
- child.setOnChildren.apply(child, args);
- });
- },
-
- getPossibleAncestors: function() {
- var map = {
- 'contentObjects': {
- 'ancestorType': 'page'
- },
- 'articles' : {
- 'ancestorType' : 'article'
- },
- 'blocks' : {
- 'ancestorType' : 'block'
- }
- };
- ancestors = Origin.editor.data[this._parent].where({_type: map[this._parent].ancestorType});
-
- var ancestorsCollection = new Backbone.Collection(ancestors);
-
- return ancestorsCollection;
- },
-
- serialize: function() {
- return JSON.stringify(this);
- },
-
- // Remove any attributes which are not on the whitelist
- // Useful to call before a save()
- pruneAttributes: function() {
- var self = this;
- // Ensure that only valid attributes are pushed back on the save
- if (self.whitelistAttributes) {
- _.each(_.keys(self.attributes), function(key) {
- if (!_.contains(self.whitelistAttributes, key)) {
- self.unset(key);
- }
- });
- }
- },
-
- serializeChildren: function() {
- var children = this.getChildren();
- var serializedJson = '';
-
- if (children) {
- _.each(children.models, function(child) {
- serializedJson += child.serialize();
- });
- }
-
- return serializedJson;
- }
-
- });
-
- return EditorModel;
-
-});
diff --git a/frontend/src/core/editor/global/templates/editor.hbs b/frontend/src/core/editor/global/templates/editor.hbs
deleted file mode 100644
index bdb93d1021..0000000000
--- a/frontend/src/core/editor/global/templates/editor.hbs
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
-
- {{ t 'app.enabledextensions'}}
-
-
-
-
-
-
-
- {{t 'app.extension'}}
-
-
-
-
-
- {{t 'app.description'}}
-
- {{!-- Plugins get render in here --}}
- {{#if enabledExtensions}}
- {{#each enabledExtensions}}
-
-
-
-
- {{/each}}
- {{else}}
-
-
-
-
-
-
- {{{displayName}}}
-
-
-
- {{{description}}}
-
-
-
-
-
-
- {{t 'app.noextensionsenabled'}}
- {{/if}}
-
-
-
- {{ t 'app.availableextensions'}}
-
-
-
-
-
-
-
- {{t 'app.extension'}}
-
-
-
-
-
- {{t 'app.description'}}
-
- {{!-- Plugins get render in here --}}
- {{#if availableExtensions}}
- {{#each availableExtensions}}
-
-
-
-
- {{/each}}
- {{else}}
-
-
-
-
-
-
- {{{displayName}}}
-
-
-
- {{{description}}}
-
-
-
-
-
-
- {{t 'app.noextensionsavailable'}}
- {{/if}}
-
-
\ No newline at end of file
diff --git a/frontend/src/core/editor/global/templates/editorPasteZone.hbs b/frontend/src/core/editor/global/templates/editorPasteZone.hbs
deleted file mode 100644
index 39b5ca4abc..0000000000
--- a/frontend/src/core/editor/global/templates/editorPasteZone.hbs
+++ /dev/null
@@ -1,4 +0,0 @@
-
\ No newline at end of file
diff --git a/frontend/src/core/editor/global/templates/partials/part_editorItemSidebar.hbs b/frontend/src/core/editor/global/templates/partials/part_editorItemSidebar.hbs
deleted file mode 100644
index b511bcf217..0000000000
--- a/frontend/src/core/editor/global/templates/partials/part_editorItemSidebar.hbs
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
diff --git a/frontend/src/core/editor/global/views/editorPasteZoneView.js b/frontend/src/core/editor/global/views/editorPasteZoneView.js
deleted file mode 100644
index 7f0de2bf4c..0000000000
--- a/frontend/src/core/editor/global/views/editorPasteZoneView.js
+++ /dev/null
@@ -1,84 +0,0 @@
-// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE
-define(function(require){
-
- var Backbone = require('backbone');
- var Handlebars = require('handlebars');
- var EditorOriginView = require('editorGlobal/views/editorOriginView');
- var Origin = require('coreJS/app/origin');
-
- var EditorPasteZone = EditorOriginView.extend({
- className: 'display-none paste-zone',
-
- events: {
- 'click .editor-paste-zone-paste': 'onPasteElementClicked'
- },
-
- onPasteElementClicked: function(event) {
- event && event.preventDefault();
- var parentId = this.model.get('_parentId');
- var sortOrder = this.model.get('_pasteZoneSortOrder');
- var layout = this.model.get('_pasteZoneLayout');
-
- Origin.trigger('editorView:paste', parentId, sortOrder, layout);
- },
-
- preRender: function() {
- this.listenTo(this.model, 'destroy', this.remove);
- this.listenTo(Origin, 'editorView:removeSubViews', this.remove);
- this.listenTo(Origin, 'editorPageView:removePageSubViews', this.remove);
- },
-
- postRender: function () {
- var view = this;
- var type = view.model.get('_type');
- var parentId = view.model.get('_parentId');
- this.$el.addClass('paste-zone-' + type);
-
- this.$el.droppable({
- accept: '.' + type + '-draggable',
- hoverClass: 'paste-zone-droppable',
- drop: function (e, ui) {
- var $component = $(ui.draggable);
- var contentId = $component.attr('data-' + type + '-id');
- var droppedOnId = $component.attr('data-' + view.model.get('_parent') + '-id');
- var sortOrder = $(this).find('.paste-' + type).attr('data-sort-order');
- var newData = {
- _sortOrder: sortOrder,
- _parentId: parentId
- };
- $.ajax({
- type: 'PUT',
- url:'/api/content/' + type + '/' + contentId,
- data: newData,
- success: function(jqXHR, textStatus, errorThrown) {
- var contentCollection = Origin.editor.data[view.model._siblings];
- contentCollection.fetch().done(function() {
- // Re-render the move-from content item
- Origin.trigger('editorView:move' + view.capitalise(type) + ':' + droppedOnId);
- // Re-render the move-to content item if needed
- if (droppedOnId !== parentId) {
- Origin.trigger('editorView:move' + view.capitalise(type) + ':' + parentId);
- }
- });
- },
- error: function(jqXHR, textStatus, errorThrown) {
- Origin.Notify.alert({
- type: 'error',
- text: jqXHR.responseJSON.message
- });
- }
- });
- }
- });
- },
-
- capitalise: function(string) {
- return string.charAt(0).toUpperCase() + string.slice(1);
- }
- }, {
- template: 'editorPasteZone'
- });
-
- return EditorPasteZone;
-
-});
diff --git a/frontend/src/core/editor/menu/less/editorMenu.less b/frontend/src/core/editor/menu/less/editorMenu.less
deleted file mode 100644
index b6876806d7..0000000000
--- a/frontend/src/core/editor/menu/less/editorMenu.less
+++ /dev/null
@@ -1,7 +0,0 @@
-.editor-menu {
- overflow-y:hidden;
- overflow-x:auto;
- &-inner {
- height:100%;
- }
-}
\ No newline at end of file
diff --git a/frontend/src/core/editor/menu/models/editorContentObjectModel.js b/frontend/src/core/editor/menu/models/editorContentObjectModel.js
deleted file mode 100644
index f25b41ac94..0000000000
--- a/frontend/src/core/editor/menu/models/editorContentObjectModel.js
+++ /dev/null
@@ -1,40 +0,0 @@
-// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE
-define(function(require) {
-
- var EditorModel = require('editorGlobal/models/editorModel');
- var Origin = require('coreJS/app/origin');
-
- var EditorContentObjectModel = EditorModel.extend({
-
- urlRoot: '/api/content/contentobject',
-
- _parent: 'contentObjects',
-
- _siblings:'contentObjects',
-
- _children: 'articles',
-
- defaults: {
- _isSelected: false,
- _isExpanded: false
- },
-
- initialize: function() {
- this.listenTo(this, 'sync', this.setupConstructor);
- this.setupConstructor();
- this.listenTo(this, 'change:_type', this.setupConstructor);
- },
-
- setupConstructor: function() {
- if (this.get('_parentId') === Origin.editor.data.course.get('_id')) {
- this._parent === 'course';
- }
- if (this.get('_type') === 'menu') {
- this._children = 'contentObjects';
- }
- }
- });
-
- return EditorContentObjectModel;
-
-});
\ No newline at end of file
diff --git a/frontend/src/core/editor/menu/templates/editorMenu.hbs b/frontend/src/core/editor/menu/templates/editorMenu.hbs
deleted file mode 100644
index c28e5942bb..0000000000
--- a/frontend/src/core/editor/menu/templates/editorMenu.hbs
+++ /dev/null
@@ -1,2 +0,0 @@
-
\ No newline at end of file
diff --git a/frontend/src/core/editor/menu/templates/editorMenuItem.hbs b/frontend/src/core/editor/menu/templates/editorMenuItem.hbs
deleted file mode 100644
index f78bee195c..0000000000
--- a/frontend/src/core/editor/menu/templates/editorMenuItem.hbs
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/frontend/src/core/editor/menu/templates/editorMenuLayer.hbs b/frontend/src/core/editor/menu/templates/editorMenuLayer.hbs
deleted file mode 100644
index e8582b6bce..0000000000
--- a/frontend/src/core/editor/menu/templates/editorMenuLayer.hbs
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
\ No newline at end of file
diff --git a/frontend/src/core/editor/menu/views/editorMenuItemView.js b/frontend/src/core/editor/menu/views/editorMenuItemView.js
deleted file mode 100644
index e2d15d91b6..0000000000
--- a/frontend/src/core/editor/menu/views/editorMenuItemView.js
+++ /dev/null
@@ -1,335 +0,0 @@
-// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE
-define(function(require){
-
- var Origin = require('coreJS/app/origin');
- var EditorOriginView = require('editorGlobal/views/editorOriginView');
-
- var EditorMenuItemView = EditorOriginView.extend({
-
- tagName: "div",
-
- className: "editor-menu-item",
-
- autoScrollTimer: false,
-
- events: {
- 'click .editor-menu-item-inner' : 'onMenuItemClicked',
- 'click a.open-context-contentObject' : 'openContextMenu',
- 'click a.contentObject-delete' : 'deleteItemPrompt',
- 'mousedown .handle' : 'enableDrag'
- },
-
- preRender: function() {
- this.setupEvents();
- this.setupClasses();
- },
-
- postRender: function() {
- // setup drag
- this.$el.closest('.editor-menu').on('mousemove', _.bind(this.handleDrag, this));
-
- // Check if the current item is expanded and update the next menuLayerView
- // This can end up being recursive if an item is selected inside a few menu items
- if (this.model.get('_isExpanded')) {
- Origin.trigger('editorView:menuView:updateSelectedItem', this);
- }
- },
-
- remove: function() {
- this.$el.closest('.editor-menu-layer').off('mousemove');
-
- // Call original remove
- EditorOriginView.prototype.remove.apply(this, arguments);
- },
-
- setupEvents: function() {
- this.listenTo(Origin, 'editorView:removeSubViews', this.remove);
- this.listenTo(this.model, 'change:_isExpanded', this.onExpandedChange);
- this.listenTo(this.model, 'change:_isSelected', this.onSelectedChange);
-
- // Handle the context menu clicks
- this.on('contextMenu:menu:edit', this.editMenuItem);
- this.on('contextMenu:menu:copy', this.copyMenuItem);
- this.on('contextMenu:menu:copyID', this.copyID);
- this.on('contextMenu:menu:delete', this.deleteItemPrompt);
-
- this.on('contextMenu:page:edit', this.editMenuItem);
- this.on('contextMenu:page:copy', this.copyMenuItem);
- this.on('contextMenu:page:copyID', this.copyID);
- this.on('contextMenu:page:delete', this.deleteItemPrompt);
- },
-
- setupClasses: function() {
- var classString = '';
- if (this.model.get('_isSelected')) {
- classString += 'selected ';
- }
- if (this.model.get('_isExpanded')) {
- classString += 'expanded ';
- }
- classString += ('content-type-'+this.model.get('_type'));
-
- this.$el.addClass(classString);
- },
-
- onMenuItemClicked: function(event) {
- // TODO - Fix this to the view not the model
- // Boo - jQuery doesn't allow dblclick and single click on the same element
- // time for a timer timing clicks against time delay
- var delay = 300;
- var timer = null;
- // Needing to store this on the model as global variables
- // cause an issue that double click loses scope
- var clicks = this.model.get('clicks');
- this.model.set('clicks', clicks ? clicks : 0);
-
- var currentClicks = this.model.get('clicks') + 1;
- this.model.set('clicks', currentClicks);
- // No matter what type of click - select the item straight away
- this.setItemAsSelected();
-
- if(currentClicks === 1) {
-
- timer = setTimeout(_.bind(function() {
-
- this.model.set('clicks', 0);
-
- }, this), delay);
-
- } else if (currentClicks === 2) {
-
- clearTimeout(timer);
- // Only if the current double clicked it is a page item
- if (this.model.get('_type') == 'page') {
- this.gotoPageEditor();
- } else if (this.model.get('_type') == 'menu') {
- this.gotoSubMenuEditor();
- }
- this.model.set('clicks', 0);
- }
-
- },
-
- selectedLevel: function() {
- $(".editor-menu-layer").each(function() {
- if($(this).hasClass("selected")){
- $(this).removeClass("selected");
- }
- });
-
- if($(this.el).hasClass("content-type-menu")) {
- $(this.el).parent().parent().next().addClass("selected");
- }
- else {
- $(this.el).parent().parent().addClass("selected");
- }
- event && event.preventDefault();
- },
-
- onMenuItemDblClicked: function(event) {
- event && event.preventDefault();
- },
-
- gotoPageEditor: function() {
- Origin.router.navigate('#/editor/' + Origin.editor.data.course.get('_id') + '/page/' + this.model.get('_id'));
- },
-
-
- gotoSubMenuEditor: function() {
- Origin.router.navigate('#/editor/' + Origin.editor.data.course.get('_id') + '/menu/' + this.model.get('_id') + '/edit');
- },
-
- setItemAsSelected: function() {
-
- // If this item is already selected please do nothing
- // because sometimes nothing is quite compelling
- if (this.model.get('_isSelected')) return;
- // When item is clicked check whether this a menu item or not
- var isMenuType = (this.model.get('_type') === 'menu');
-
- // If this view is already expanded - reset to no be expanded
- // this will trigger the events to remove child views
- if (this.model.get('_isExpanded')) {
- this.model.set({'_isExpanded' : false});
- } else {
- this.setSiblingsSelectedState();
- this.setParentSelectedState();
- }
-
- this.model.set({'_isExpanded' : (isMenuType ? true : false)});
-
- this.model.set({'_isSelected': true});
-
- // This event passes out the view to the editorMenuView to add
- // a editorMenuLayerView and setup this.subView
- Origin.trigger('editorView:menuView:updateSelectedItem', this);
-
- this.selectedLevel();
-
- },
-
- setParentSelectedState: function() {
- this.model.getParent().set('_isSelected', false);
- },
-
- setSiblingsSelectedState: function() {
- this.model.getSiblings().each(function(sibling) {
- sibling.set({'_isSelected': false, '_isExpanded': false});
- });
- },
-
- setChildrenSelectedState: function() {
- this.model.getChildren().each(function(child) {
- child.set({'_isSelected': false, '_isExpanded': false});
- })
- },
-
- onSelectedChange: function(model, isSelected) {
- // This is used to toggle between _isSelected on the model
- if (!isSelected) {
- this.$el.removeClass('selected');
- } else {
- this.$el.addClass('selected');
- }
- },
-
- onExpandedChange: function(model, isExpanded) {
- var isMenuType = (this.model.get('_type') === 'menu');
- if (isExpanded) {
- //Origin.trigger('editorView:menuView:updateSelectedItem', this);
- this.$el.addClass('expanded');
- } else {
- // If not expanded unselect and unexpand child - this will work
- // recursively as _isExpanded will keep getting set
- if (isMenuType) {
- this.setChildrenSelectedState();
- }
- this.$el.removeClass('expanded');
- }
-
- // If this item is not meant to be expanded - remove subView
- if (!isExpanded && isMenuType && this.subView) {
- this.subView.remove();
- }
-
- },
-
- editMenuItem: function() {
- var courseId = Origin.editor.data.course.get('_id');
- var type = this.model.get('_type');
- var menuItemId = this.model.get('_id');
-
- Origin.router.navigate('#/editor/'
- + courseId
- + '/'
- + type
- + '/'
- + menuItemId
- + '/edit', {trigger: true});
- },
-
- deleteItemPrompt: function(event) {
- event && event.preventDefault();
-
- this.listenToOnce(Origin, 'editorView:removeItem:'+ this.model.get('_id'), this.deleteItem);
- this.listenToOnce(Origin, 'editorView:cancelRemoveItem:'+ this.model.get('_id'), this.cancelDeleteItem);
-
- var self = this;
-
- Origin.Notify.confirm({
- type: 'warning',
- title: window.polyglot.t('app.deleteitem'+ this.model.get('_type')),
- text: window.polyglot.t('app.confirmdelete' + this.model.get('_type')) + '' + '
' + window.polyglot.t('app.confirmdeletewarning' + this.model.get('_type')), - callback: function(isConfirmed) { - self.onConfirmRemovePopup(isConfirmed); - } - }); - - }, - - onConfirmRemovePopup: function(isConfirmed) { - var id = this.model.get('_id'); - if (isConfirmed) { - Origin.trigger('editorView:removeItem:' + id); - } else { - Origin.trigger('editorView:cancelRemoveItem:' + id); - } - }, - - copyMenuItem: function() { - $('.paste-zone').addClass('show'); - $('.add-zone').css('visibility','hidden'); - Origin.trigger('editorView:copy', this.model); - }, - - copyID: function() { - Origin.trigger('editorView:copyID', this.model); - }, - - deleteItem: function(event) { - this.stopListening(Origin, 'editorView:cancelRemoveItem:'+ this.model.get('_id'), this.cancelDeleteItem); - this.model.set({_isExpanded:false, _isSelected: false}); - // When deleting an item - the parent needs to be selected - this.model.getParent().set({_isSelected:true, _isExpanded: true}); - - // We also need to navigate to the parent element - but if it's the courseId let's - // navigate up to the menu - var parentId = (this.model.get('_parentId') === Origin.editor.data.course.id) ? '' : '/' + this.model.get('_parentId'); - Origin.router.navigate('#editor/' + Origin.editor.data.course.id + '/menu' + parentId); - - if (this.model.destroy()) { - this.remove(); - } - }, - - cancelDeleteItem: function() { - this.stopListening(Origin, 'editorView:removeItem:'+ this.model.get('_id'), this.deleteItem); - this.model.set({_isSelected: true}); - }, - - enableDrag: function(event) { - this.model.set('_isDragging', true); - }, - - handleDrag: function(event) { - window.clearInterval(this.autoScrollTimer); - this.autoScrollTimer = false; - - if(!this.model.get('_isDragging')) { - return; - } - - var $currentLayer = $(".editor-menu-layer[data-over='true'] > .editor-menu-layer-inner"); - - if(!$currentLayer.length) { - return; - } - - this.autoScrollTimer = window.setInterval(function() { - var SCROLL_THRESHOLD = $currentLayer.height()*0.2; - var SCROLL_INCREMENT = 4; - - var offsetTop = $currentLayer.offset().top; - var clientY = event.clientY; - var scrollAmount; - - if (clientY < (offsetTop+SCROLL_THRESHOLD)) { - scrollAmount = -SCROLL_INCREMENT; - } - else if (clientY > (($currentLayer.height()+offsetTop) - SCROLL_THRESHOLD)) { - scrollAmount = SCROLL_INCREMENT; - } - - if(scrollAmount) { - $currentLayer.scrollTop($currentLayer.scrollTop()+scrollAmount); - } - }, 10); - } - - }, { - template: 'editorMenuItem' - }); - - return EditorMenuItemView; - -}); diff --git a/frontend/src/core/editor/menu/views/editorMenuLayerView.js b/frontend/src/core/editor/menu/views/editorMenuLayerView.js deleted file mode 100644 index 394c2431c9..0000000000 --- a/frontend/src/core/editor/menu/views/editorMenuLayerView.js +++ /dev/null @@ -1,214 +0,0 @@ -// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -define(function(require) { - - var Origin = require('coreJS/app/origin'); - var EditorOriginView = require('editorGlobal/views/editorOriginView'); - var EditorContentObjectModel = require('editorMenu/models/editorContentObjectModel'); - var EditorArticleModel = require('editorPage/models/editorArticleModel'); - var EditorBlockModel = require('editorPage/models/editorBlockModel'); - var EditorMenuItemView = require('editorMenu/views/editorMenuItemView'); - - var EditorMenuLayerView = EditorOriginView.extend({ - - className: 'editor-menu-layer', - - events: { - 'click button.editor-menu-layer-add-page' : 'addPage', - 'click button.editor-menu-layer-add-menu' : 'addMenu', - 'click .editor-menu-layer-paste' : 'pasteMenuItem', - 'click .editor-menu-layer-paste-cancel' : 'cancelPasteMenuItem' - }, - - preRender: function(options) { - if (options._parentId) { - this._parentId = options._parentId; - } - - this.listenTo(Origin, 'editorView:removeSubViews', this.remove); - this.listenTo(Origin, 'editorMenuView:removeMenuViews', this.remove); - }, - - postRender: function() { - if (this._parentId) { - // Append the parentId value to the container to allow us to move pages, etc. - this.$el.attr('data-parentId', this._parentId); - } - this.setHeight(); - }, - - render: function() { - var data = this.data ? this.data : false; - var template = Handlebars.templates[this.constructor.template]; - this.$el.html(template(data)); - _.defer(_.bind(function() { - this.postRender(); - }, this)); - - return this; - }, - - setHeight: function() { - var windowHeight = $(window).height(); - var offsetTop = $('.editor-menu-inner').offset().top; - var controlsHeight = this.$('.editor-menu-layer-controls').outerHeight(); - - this.$('.editor-menu-layer-inner').height(windowHeight-(offsetTop+controlsHeight)); - }, - - addMenu: function(event) { - this.addMenuItem(event, 'menu'); - }, - - addPage: function(event) { - this.addMenuItem(event, 'page'); - }, - - /** - * Adds a new contentObject of a given type - * @param {String} type Given contentObject type, i.e. 'menu' or 'page' - */ - addMenuItem: function(event, type) { - event.preventDefault(); - - var newMenuItemModel = new EditorContentObjectModel({ - _parentId: this._parentId, - _courseId: Origin.editor.data.course.get('_id'), - title: (type == 'page'? window.polyglot.t('app.placeholdernewpage') : window.polyglot.t('app.placeholdernewmenu')), - displayTitle: (type == 'page'? window.polyglot.t('app.placeholdernewpage') : window.polyglot.t('app.placeholdernewmenu')), - body: '', - linkText: window.polyglot.t('app.view'), - graphic: { - alt: '', - src: '' - }, - _type: type - }); - - // Instantly add the view for UI purposes - var newMenuItemView = this.addMenuItemView(newMenuItemModel); - - // Save the model - newMenuItemModel.save(null, { - error: function(error) { - // If there's an error show the menu item fading out - // and show an unobtrusive pop notification - var timeOut = 3000; - newMenuItemView.$el.removeClass('syncing').addClass('not-synced'); - - Origin.Notify.alert({ - type: 'error', - text: window.polyglot.t('app.errormenueditorbody'), - }); - - _.delay(function() { - newMenuItemView.remove(); - }, timeOut); - - }, - success: _.bind(function(model) { - Origin.editor.data.contentObjects.add(model); - // Force setting the data-id attribute as this is required for drag-drop sorting - newMenuItemView.$el.children('.editor-menu-item-inner').attr('data-id', model.get('_id')); - - if (type == 'page') { - // HACK -- This should be removed and placed on the server-side - return this.addNewPageArticleAndBlock(model, newMenuItemView); - } else { - newMenuItemView.$el.removeClass('syncing').addClass('synced'); - } - - this.setHeight(); - - }, this) - }); - }, - - addNewPageArticleAndBlock: function(model, newMenuItemView) { - - var typeToAdd; - var newChildModel; - var newChildTitle; - - this.pageModel; - this.pageView; - - if (model.get('_type') === 'page') { - this.pageModel = model; - this.pageView = newMenuItemView; - typeToAdd = 'article'; - newChildTitle = window.polyglot.t('app.placeholdernewarticle'); - var newChildModel = new EditorArticleModel(); - } else { - typeToAdd = 'block'; - newChildTitle = window.polyglot.t('app.placeholdernewblock'); - var newChildModel = new EditorBlockModel(); - } - - newChildModel.save({ - title: newChildTitle, - displayTitle: (typeToAdd == 'block') ? '' : newChildTitle, - body: '', - _parentId: model.get('_id'), - _courseId: Origin.editor.data.course.get('_id') - }, { - error: function() { - var timeOut = 3000; - newMenuItemView.$el.removeClass('syncing').addClass('not-synced'); - - Origin.Notify.alert({ - type: 'error', - text: window.polyglot.t('app.errormenueditorbody'), - }); - - _.delay(function() { - newMenuItemView.remove(); - }, timeOut); - }, - success: _.bind(function(model, response, options) { - // Add this new element to the collect - Origin.editor.data[model.get('_type') + 's'].add(model); - - if (typeToAdd === 'article') { - this.addNewPageArticleAndBlock(model, newMenuItemView); - } else { - newMenuItemView.$el.removeClass('syncing').addClass('synced'); - } - - }, this) - }); - }, - - addMenuItemView: function(model) { - var newMenuItemView = new EditorMenuItemView({ - model: model - }); - this.$('.editor-menu-layer-inner').append(newMenuItemView.$el.addClass('syncing')); - return newMenuItemView; - }, - - pasteMenuItem: function(event) { - event.preventDefault(); - Origin.trigger('editorView:paste', this._parentId, this.$('.editor-menu-item').length + 1); - /*_.delay(_.bind(function() { - Origin.trigger('editorView:menuView:updateSelectedItem', this); - }, this), 2000)*/ - }, - - cancelPasteMenuItem: function(event) { - event.preventDefault(); - $('.add-zone').css('visibility','visible'); - var parentId = this._parentId; - var target = new EditorContentObjectModel({ - _parentId: parentId, - _courseId: Origin.editor.data.course.get('_id') - }); - Origin.trigger('editorView:pasteCancel', target); - } - - }, { - template: 'editorMenuLayer' - }); - - return EditorMenuLayerView; - -}); diff --git a/frontend/src/core/editor/menu/views/editorMenuSidebarView.js b/frontend/src/core/editor/menu/views/editorMenuSidebarView.js deleted file mode 100644 index 88fd2dc2b4..0000000000 --- a/frontend/src/core/editor/menu/views/editorMenuSidebarView.js +++ /dev/null @@ -1,17 +0,0 @@ -// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -define(function(require) { - - var Origin = require('coreJS/app/origin'); - var SidebarItemView = require('coreJS/sidebar/views/sidebarItemView'); - - var EditorMenuSidebarView = SidebarItemView.extend({ - - // If adding 'events', extend from the base view - - }, { - template: 'editorMenuSidebar' - }); - - return EditorMenuSidebarView; - -}); diff --git a/frontend/src/core/editor/menu/views/editorMenuView.js b/frontend/src/core/editor/menu/views/editorMenuView.js deleted file mode 100644 index 7476e98fe2..0000000000 --- a/frontend/src/core/editor/menu/views/editorMenuView.js +++ /dev/null @@ -1,214 +0,0 @@ -// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -define(function(require){ - - var Origin = require('coreJS/app/origin'); - var EditorOriginView = require('editorGlobal/views/editorOriginView'); - var EditorContentObjectModel = require('editorMenu/models/editorContentObjectModel'); - var EditorMenuLayerView = require('editorMenu/views/editorMenuLayerView'); - var EditorMenuItemView = require('editorMenu/views/editorMenuItemView'); - - var EditorMenuView = EditorOriginView.extend({ - - tagName: "div", - - className: "editor-menu", - - preRender: function() { - this.listenTo(Origin, 'editorView:menuView:updateSelectedItem', this.updateSelectedItem); - this.listenTo(Origin, 'window:resize', this.setupHorizontalScroll); - }, - - postRender: function() { - this.setupMenuViews(); - _.defer(this.setViewToReady); - }, - - /** - * Renders a menu layer for each child of the contentObject, and each item within - */ - setupMenuViews: function() { - - // If there's no currentContentObjectId - if (!Origin.editor.currentContentObjectId) { - this.addMenuLayerView(this); - } else { - this.addMenuLayerView(this); - this.preserveCurrentMenuState(); - } - - }, - - /** - * Recursive function which shows the expanded children for a given context model - * @param {Model} A given contextObject model - */ - addMenuLayerView: function(view) { - // Render menu layer view - var menuLayer = this.renderMenuLayerView(view, false); - - // Add children views of current model - view.model.getChildren().each(function(contentObject) { - menuLayer.append(new EditorMenuItemView({ - model: contentObject - }).$el) - }, this); - - _.defer(_.bind(function() { - this.setupDragDrop(); - var $window = $(window); - this.setupHorizontalScroll($window.width(), $window.height()); - this.scrollToElement(); - }, this)); - }, - - /** - * Presever the current menu state by finding the current element - * then setting it's parent recursively to _isExpanded - */ - - preserveCurrentMenuState: function() { - // Find current menu item - var currentSelectedMenuItem = Origin.editor.data.contentObjects.findWhere({ - _id: Origin.editor.currentContentObjectId - }); - currentSelectedMenuItem.set({'_isSelected': true, '_isExpanded': true}); - this.setParentElementToSelected(currentSelectedMenuItem); - }, - - /** - * Appemds a menu item layer for a given ID to the editor - * @param {String} parentId Unique identifier of the parent - * @param {Boolean} isCourseObject Flag to indicate if this is at the root level - */ - renderMenuLayerView: function(view) { - // Get the current views _id to store as the _parentId - var parentId = view.model.get('_id'); - - // Create MenuLayerView - var menuLayerView = new EditorMenuLayerView({_parentId: parentId}); - - // Set subview on layerView so this can be removed - view.subView = menuLayerView; - - // Render and append the view - $('.editor-menu-inner').append(menuLayerView.$el); - - // Return the container ready to render menuItemView's - return menuLayerView.$('.editor-menu-layer-inner'); - }, - - updateSelectedItem: function(view) { - - // This is triggered when an item is clicked - // Store this id and fake navigate to bookmark current users position - this.storeSelectedItem(view); - - // If this item is a menu item let's render a MenuItemLayerView - if (view.model.get('_type') === 'menu') { - this.addMenuLayerView(view); - } else { - this.scrollToElement(); - } - }, - - /** - * Adds a specified contentObject ID to Origin.editor, synchronises the address bar, - * and sets up the menu UI for editing - * @param {Number} Unique _id for a given contentObject - */ - storeSelectedItem: function(view) { - var selectedItemId = view.model.get('_id'); - // Store the ID of the currently selected contentObject - Origin.editor.currentContentObjectId = selectedItemId; - - // Reset the address bar to allow persistance of the 'Back' button - Origin.router.navigate('#editor/' + Origin.editor.data.course.id + '/menu/' + selectedItemId); - }, - - /** - * Recursive function which shows any children for a given contentObject and sets - * the UI element to 'expanded' - * @param {Model} selectedItem A given contextObject model - */ - setParentElementToSelected: function(selectedItem) { - - if (selectedItem.get('_parentId') === Origin.editor.data.course.get('_id')) { - return; - } - - var parentModel = Origin.editor.data.contentObjects.findWhere({ - _id: selectedItem.get('_parentId') - }); - - parentModel.set('_isExpanded', true); - - this.setParentElementToSelected(parentModel); - }, - - setupHorizontalScroll: function(windowWidth, windowHeight) { - var $menuLayers = this.$('.editor-menu-layer'); - var $menuView = this.$el; - var $menuControls = this.$('.editor-menu-layer-controls'); - // Get item width - var itemWidth = $menuLayers.first().outerWidth(true); - // Set menu holder to width by items length - $('.editor-menu-inner').width(itemWidth * $menuLayers.length); - }, - - scrollToElement: function() { - if ($('.selected').length) { - this.$('.editor-menu-layer-inner').scrollTo('.expanded, .selected', {duration:300, offset: {top:-20, left:0}, axis: 'y'}); - this.$el.scrollTo($('.selected').closest('.editor-menu-layer'), {duration:300, axis: 'x'}); - } - }, - - /** - * Configures the JQuery UI sortable() plugin to enable drag and drop on the menu editor - */ - setupDragDrop: function() { - var view = this; - $(".editor-menu-layer-inner").sortable({ - containment: '.editor-menu', - appendTo: '.editor-menu', - items: '.editor-menu-item', - handle: '.handle', - connectWith: ".editor-menu-layer-inner", - scroll: true, - helper: 'clone', - stop: function(event,ui) { - var $draggedElement = ui.item; - var id = $('.editor-menu-item-inner', $draggedElement).attr('data-id'); - var sortOrder = $draggedElement.index() + 1; - var parentId = $draggedElement.closest('.editor-menu-layer').attr('data-parentId'); - - // Find the model - var currentModel = Origin.editor.data.contentObjects.findWhere({_id: id}); - - // Save just the new attributes and patch them - currentModel.save({_sortOrder: sortOrder, _parentId: parentId}, {patch: true}); - - currentModel.set('_isDragging', false); - - }, - over: function(event, ui) { - $(event.target).closest('.editor-menu-layer').attr('data-over', true); - }, - out: function(event, ui) { - $(event.target).closest('.editor-menu-layer').attr('data-over', false); - }, - receive: function(event, ui) { - if (ui.item.hasClass('content-type-menu')) { - // Prevent moving a menu item between levels - ui.sender.sortable("cancel"); - } - } - }); - } - - }, { - template: 'editorMenu' - }); - - return EditorMenuView; - -}); diff --git a/frontend/src/core/editor/menuSettings/less/menusettings.less b/frontend/src/core/editor/menuSettings/less/menusettings.less deleted file mode 100644 index 09d934f8e2..0000000000 --- a/frontend/src/core/editor/menuSettings/less/menusettings.less +++ /dev/null @@ -1,23 +0,0 @@ -.menu-settings-list { - padding-left: 30px; - padding-top: 30px; -} - -.menu-settings-list-item { - height: 175px; - width: 275px; - margin-left:0px; - margin-right: 30px; - margin-bottom: 30px; - list-style-type: none; - overflow: hidden; - border-radius: 3px; - float: left; - &:hover { - cursor: pointer; - } - &-inner { - padding: 20px; - } - -} diff --git a/frontend/src/core/editor/menuSettings/models/editorMenuSettingsModel.js b/frontend/src/core/editor/menuSettings/models/editorMenuSettingsModel.js deleted file mode 100644 index a1c72aa474..0000000000 --- a/frontend/src/core/editor/menuSettings/models/editorMenuSettingsModel.js +++ /dev/null @@ -1,9 +0,0 @@ -// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -define(function(require) { - var Backbone = require('backbone'); - var EditorMenuSettingsModel = Backbone.Model.extend({ - - }); - - return EditorMenuSettingsModel; -}); \ No newline at end of file diff --git a/frontend/src/core/editor/menuSettings/templates/editorMenuSettingsEdit.hbs b/frontend/src/core/editor/menuSettings/templates/editorMenuSettingsEdit.hbs deleted file mode 100644 index 673aa1a007..0000000000 --- a/frontend/src/core/editor/menuSettings/templates/editorMenuSettingsEdit.hbs +++ /dev/null @@ -1,2 +0,0 @@ - \ No newline at end of file diff --git a/frontend/src/core/editor/menuSettings/templates/editorMenuSettingsEditSidebar.hbs b/frontend/src/core/editor/menuSettings/templates/editorMenuSettingsEditSidebar.hbs deleted file mode 100644 index af1526460f..0000000000 --- a/frontend/src/core/editor/menuSettings/templates/editorMenuSettingsEditSidebar.hbs +++ /dev/null @@ -1,12 +0,0 @@ - \ No newline at end of file diff --git a/frontend/src/core/editor/menuSettings/templates/editorMenuSettingsItem.hbs b/frontend/src/core/editor/menuSettings/templates/editorMenuSettingsItem.hbs deleted file mode 100644 index 844a15283b..0000000000 --- a/frontend/src/core/editor/menuSettings/templates/editorMenuSettingsItem.hbs +++ /dev/null @@ -1,4 +0,0 @@ - \ No newline at end of file diff --git a/frontend/src/core/editor/menuSettings/views/editorMenuSettingsEditSidebarView.js b/frontend/src/core/editor/menuSettings/views/editorMenuSettingsEditSidebarView.js deleted file mode 100644 index d2a2665555..0000000000 --- a/frontend/src/core/editor/menuSettings/views/editorMenuSettingsEditSidebarView.js +++ /dev/null @@ -1,27 +0,0 @@ -// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -define(function(require) { - - var Origin = require('coreJS/app/origin'); - var SidebarItemView = require('coreJS/sidebar/views/sidebarItemView'); - var Backbone = require('backbone'); - - var EditorMenuSettingsEditSidebarView = SidebarItemView.extend({ - - events: { - 'click .editor-menusettings-edit-sidebar-save' : 'saveEditing' - }, - - saveEditing: function(event) { - event.preventDefault(); - this.updateButton('.editor-menusettings-edit-sidebar-save', window.polyglot.t('app.saving')); - Origin.trigger('editorMenuSettingsEditSidebar:views:save'); - } - - }, { - template: 'editorMenuSettingsEditSidebar' - - }); - - return EditorMenuSettingsEditSidebarView; - -}); \ No newline at end of file diff --git a/frontend/src/core/editor/menuSettings/views/editorMenuSettingsEditView.js b/frontend/src/core/editor/menuSettings/views/editorMenuSettingsEditView.js deleted file mode 100644 index eaeef51083..0000000000 --- a/frontend/src/core/editor/menuSettings/views/editorMenuSettingsEditView.js +++ /dev/null @@ -1,85 +0,0 @@ -// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -define(function(require) { - - var Backbone = require('backbone'); - var Origin = require('coreJS/app/origin'); - var EditorOriginView = require('editorGlobal/views/editorOriginView'); - var MenuSettingsCollection = require('editorMenuSettings/collections/editorMenuSettingsCollection'); - var MenuSettingsView = require('editorMenuSettings/views/editorMenuSettingsView'); - - var EditorMenuSettingsEditView = EditorOriginView.extend({ - - tagName: "ul", - - className: "editor-menu-settings-edit", - - events: { - - }, - - preRender: function() { - this.collection = new MenuSettingsCollection(); - this.listenTo(this.collection, 'sync', this.addMenuItemView); - this.collection.fetch(); - - this.listenTo(Origin, 'editorSideBarView:removeEditView', this.remove); - this.listenTo(Origin, 'editorMenuSettingsEditSidebar:views:save', this.saveData); - }, - - postRender: function() { - }, - - addMenuItemView: function() { - this.renderMenuItemViews(); - _.defer(this.setViewToReady); - }, - - renderMenuItemViews: function() { - - this.collection.each(function(menu) { - - var isSelected = false; - if (menu.get('name') === this.model.get('_menu')) { - isSelected = true; - } - - menu.set('_isSelected', isSelected); - this.$('.menu-settings-list').append(new MenuSettingsView({model: menu}).$el); - - }, this); - - }, - - cancel: function(event) { - event.preventDefault(); - Origin.trigger('editorSidebarView:removeEditView', this.model); - }, - - saveData: function(event) { - if (event) { - event.preventDefault(); - } - - var selectedMenu = this.collection.findWhere({_isSelected: true}); - - if (selectedMenu === undefined) { - return this.onSaveError(null, window.polyglot.t('app.errornomenuselected')); - } - - var selectedMenuId = selectedMenu.get('_id'); - - // Should push to api - - $.post('/api/menu/' + selectedMenuId + '/makeitso/' + this.model.get('_courseId')) - .error(this.onSaveError) - .done(this.onSaveSuccess); - } - - }, - { - template: "editorMenuSettingsEdit" - }); - - return EditorMenuSettingsEditView; - -}); diff --git a/frontend/src/core/editor/page/less/editorComponentList.less b/frontend/src/core/editor/page/less/editorComponentList.less deleted file mode 100644 index 3403407748..0000000000 --- a/frontend/src/core/editor/page/less/editorComponentList.less +++ /dev/null @@ -1,254 +0,0 @@ -.editor-component-list { - .click-capture { - width: 100vw; - height: 100vh; - z-index: 0; - } - position:fixed; - top:0px; - // to avoid flicker when first rendered - right:-100vw; - /* - left:0px; - width:100%; - */ - height:100%; - z-index:500; - - &-sidebar { - z-index: 5; - float:right; - width:440px; - height:100%; - background-color:#fff; - box-shadow:0px 0px 4px 0px #454545; - } - - &-sidebar-exit { - float: right; - margin: 3px 10px; - font-size: 150%; - color: #7D7D7D; - - &:hover { - cursor: pointer; - } - } - - &-sidebar-header { - border-bottom: 1px solid #CCCCCC; - } - - &-sidebar-title-inner { - padding:20px 20px 0px; - font-weight: 700; - } - - &-sidebar-body-inner { - padding-left:20px; - } - - &-sidebar-search { - &-icon { - position: relative; - left: 380px; - top: 33px; - font-size: 130%; - color: #B7B4B4; - } - - &-field { - input { - margin: 0 0 25px 20px; - border-radius:0; - background-color: #F2F0F1; - } - } - } - - &-sidebar-list { - width: 100%; - overflow-y: auto; - overflow-x: hidden; - } - - - &-sidebar-filter-half { - float:left; - width:50%; - padding:18px 0px; - text-align:center; - } - - &-sidebar-filter-full { - float:left; - width:50%; - padding:18px 0px; - text-align:center; - } - - &-sidebar-filter-single { - width:100%; - padding:18px 0px; - background-color:#333c4e; - color:#fff; - text-align:center; - } - - &-sidebar-filter { - button { - background-color:#333c4e; - color:#9cabc4; - transition: all 0.3s; - &:hover { - background-color:#293141; - color:#fff; - } - &.selected { - background-color:#15a4fa; - color:#fff; - } - } - } - -} - -.editor-component-list-item { - position:relative; - width:100%; - padding:0; - overflow:hidden; - text-align:left; - border-bottom:1px solid #ccc; - transition: background-color 0.3s; - cursor: pointer; - - &.restricted { - color: lightgray; - } - - &.selected { - background-color:darken(#e9f0fa, 10%); - &:hover { - background-color:darken(#e9f0fa, 10%); - } - &.restricted { - color: black; - } - } - - &-details { - padding-left: 75px; - } - - &:hover { - background-color:#f3fcfe; - } - - &-inner { - padding:20px; - min-height: 44px; - } - - - &-display-name { - font-weight:600; - } - - &-version, &-name { - margin-top:6px; - font-size:11px; - } - - &-overlay { - //position:absolute; - top:0; - width:100%; - height:100%; - //background-color:rgba(156, 171, 196, 0.8); - } - - &-overlay-inner { - text-align: center; - padding-bottom: 10px; - } - - &-overlay-left { - float:left; - } - - &-overlay-right { - float:right; - } - - &-overlay-button { - width: 20%; - padding:0; - color:#9cabc4; - background-color:#333c4e; - transition:color 0.3s; - &:hover { - color:#fff; - background-color:#293141; - } - } - - &-overlay-button-inner { - display: block; - padding: 16px; - border-right:1px solid #454545; - } - - &-icon { - background-image: url("assets/component-icons/default.png"); - // core components, override above - &.adapt-contrib- { - &assessmentResults { - background-image: url("assets/component-icons/assessment.png"); - } - &blank { - background-image: url("assets/component-icons/blank.png"); - } - &accordion { - background-image: url("assets/component-icons/accordion.png"); - } - &graphic { - background-image: url("assets/component-icons/graphic.png"); - } - &gmcq { - background-image: url("assets/component-icons/gmcq.png"); - } - &hotgraphic { - background-image: url("assets/component-icons/hot-graphic.png"); - } - &matching { - background-image: url("assets/component-icons/matching.png"); - } - &media { - background-image: url("assets/component-icons/media.png"); - } - &mcq { - background-image: url("assets/component-icons/mcq.png"); - } - &narrative { - background-image: url("assets/component-icons/narrative.png"); - } - &slider { - background-image: url("assets/component-icons/slider.png"); - } - &text { - background-image: url("assets/component-icons/text.png"); - } - &textInput { - background-image: url("assets/component-icons/text.png"); - } - } - - background-repeat: no-repeat; - width: 55px; - height: 40px; - float: left; - margin: 5px 20px 0 0; - - } -} diff --git a/frontend/src/core/editor/page/less/pageEditor.less b/frontend/src/core/editor/page/less/pageEditor.less deleted file mode 100644 index ead2e3d096..0000000000 --- a/frontend/src/core/editor/page/less/pageEditor.less +++ /dev/null @@ -1,63 +0,0 @@ -.page-edit-button { - font-size:16px; - text-decoration: none; - color: #34bee0; - transition: all 0.3s; - &:hover { - color:#15a4fa; - } -} - -.page-inner { - padding:30px; - .editor-item-settings { - top: 9px; - left: 5px; - [class$="-delete"], - [class*="-delete "] { - position: absolute; - right: 20px - } - } -} - -/*.paste-zone { - border:none; - display:block!important; -}*/ - -.page-detail { - position: relative; - height: 100%; - background-color: white; - padding: 15px; - border: 1px solid #D2E4E6; - cursor: pointer; - &:hover { - box-shadow: 0px 0px 5px 2px #CBE1E6; - } -} - -.editor-inner { - > .page { - overflow-y: scroll; - .title { - font-size: 16px; - font-weight: 400; - } - - .description { - font-size: 16px; - } - - .page-edit-panel { - position: absolute; - right: 0; - top: 0; - } - - .page-articles { - margin:20px 0px; - } - } -} diff --git a/frontend/src/core/editor/page/models/editorArticleModel.js b/frontend/src/core/editor/page/models/editorArticleModel.js deleted file mode 100644 index 50af86edd0..0000000000 --- a/frontend/src/core/editor/page/models/editorArticleModel.js +++ /dev/null @@ -1,17 +0,0 @@ -// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -define(function(require) { - - var EditorModel = require('editorGlobal/models/editorModel'); - - var EditorArticleModel = EditorModel.extend({ - - urlRoot: '/api/content/article', - initialize: function() {}, - _parent:'contentObjects', - _siblings:'articles', - _children: 'blocks' - }); - - return EditorArticleModel; - -}); diff --git a/frontend/src/core/editor/page/models/editorBlockModel.js b/frontend/src/core/editor/page/models/editorBlockModel.js deleted file mode 100644 index e1fe810825..0000000000 --- a/frontend/src/core/editor/page/models/editorBlockModel.js +++ /dev/null @@ -1,29 +0,0 @@ -// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -define(function(require) { - - var EditorModel = require('editorGlobal/models/editorModel'); - - var EditorBlockModel = EditorModel.extend({ - - urlRoot: '/api/content/block', - - initialize: function() {}, - - _parent: 'articles', - _siblings:'blocks', - _children: 'components', - - // Block specific properties - layoutOptions: null, - dragLayoutOptions: null, - - // These are the only attributes which should be permitted on a save - whitelistAttributes: ['_id', '_courseId', '_parentId', '_layoutOptions', - '_type', '_sortOrder', '_classes', '_isOptional', '_isAvailable', 'body', 'displayTitle', - 'title', '_extensions'] - - }); - - return EditorBlockModel; - -}); diff --git a/frontend/src/core/editor/page/models/editorComponentModel.js b/frontend/src/core/editor/page/models/editorComponentModel.js deleted file mode 100644 index 940a664dbd..0000000000 --- a/frontend/src/core/editor/page/models/editorComponentModel.js +++ /dev/null @@ -1,21 +0,0 @@ -// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -define(function(require) { - - var EditorModel = require('editorGlobal/models/editorModel'); - - var EditorComponentModel = EditorModel.extend({ - urlRoot: '/api/content/component', - initialize: function() {}, - - _parent: 'blocks', - _siblings:'components', - _children: false, - // These are the only attributes which should be permitted on a save - whitelistAttributes: ['_id', '_componentType', '_courseId', '_layout', '_parentId', - '_type', 'properties', '_component', '_extensions', '_classes', '_isOptional', '_isAvailable', 'body', 'displayTitle', - 'title', 'version'] - }); - - return EditorComponentModel; - -}); diff --git a/frontend/src/core/editor/page/models/editorComponentTypeModel.js b/frontend/src/core/editor/page/models/editorComponentTypeModel.js deleted file mode 100644 index ca598dd883..0000000000 --- a/frontend/src/core/editor/page/models/editorComponentTypeModel.js +++ /dev/null @@ -1,18 +0,0 @@ -// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -define(function(require) { - - var EditorModel = require('editorGlobal/models/editorModel'); - - var EditorComponentTypeModel = EditorModel.extend({ - - initialize: function() {}, - idAttribute: '_id', - urlRoot: '/api/componenttype', - _parent: 'blocks', - _siblings:'componenttypes', - _children: null - }); - - return EditorComponentTypeModel; - -}); \ No newline at end of file diff --git a/frontend/src/core/editor/page/templates/editorArticle.hbs b/frontend/src/core/editor/page/templates/editorArticle.hbs deleted file mode 100644 index 4b0d698798..0000000000 --- a/frontend/src/core/editor/page/templates/editorArticle.hbs +++ /dev/null @@ -1,26 +0,0 @@ -{{>part_editorItemSidebar}} - -
-
-
diff --git a/frontend/src/core/editor/page/templates/editorComponent.hbs b/frontend/src/core/editor/page/templates/editorComponent.hbs
deleted file mode 100644
index 75a131b912..0000000000
--- a/frontend/src/core/editor/page/templates/editorComponent.hbs
+++ /dev/null
@@ -1,20 +0,0 @@
-{{>part_editorItemSidebar}}
-
-
-
-
-
-
-
-
-
-
-
- - {{#if displayTitle}} - {{{displayTitle}}} - {{else}} - {{title}} - {{/if}} -
-{{{body}}}
-
-
-
-
\ No newline at end of file
diff --git a/frontend/src/core/editor/page/templates/editorComponentList.hbs b/frontend/src/core/editor/page/templates/editorComponentList.hbs
deleted file mode 100644
index 58af0dc0ec..0000000000
--- a/frontend/src/core/editor/page/templates/editorComponentList.hbs
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
\ No newline at end of file
diff --git a/frontend/src/core/editor/page/templates/editorComponentListItem.hbs b/frontend/src/core/editor/page/templates/editorComponentListItem.hbs
deleted file mode 100644
index a175615141..0000000000
--- a/frontend/src/core/editor/page/templates/editorComponentListItem.hbs
+++ /dev/null
@@ -1,30 +0,0 @@
-
- {{#if _componentTypeDisplayName}}
-
-
-{{_componentTypeDisplayName}}
- {{/if}}
- - {{#if displayTitle}} - {{{displayTitle}}} - {{else}} - {{title}} - {{/if}} -
-{{{body}}}
-
-
-
- {{#if displayName}}
-
-
\ No newline at end of file
diff --git a/frontend/src/core/editor/page/templates/editorComponentListSidebar.hbs b/frontend/src/core/editor/page/templates/editorComponentListSidebar.hbs
deleted file mode 100644
index 6ba1e3889b..0000000000
--- a/frontend/src/core/editor/page/templates/editorComponentListSidebar.hbs
+++ /dev/null
@@ -1,23 +0,0 @@
-
diff --git a/frontend/src/core/editor/page/templates/editorComponentPasteZone.hbs b/frontend/src/core/editor/page/templates/editorComponentPasteZone.hbs
deleted file mode 100644
index 5a5a2c82d8..0000000000
--- a/frontend/src/core/editor/page/templates/editorComponentPasteZone.hbs
+++ /dev/null
@@ -1,4 +0,0 @@
-
\ No newline at end of file
diff --git a/frontend/src/core/editor/page/templates/editorPage.hbs b/frontend/src/core/editor/page/templates/editorPage.hbs
deleted file mode 100644
index 2eef01bf9d..0000000000
--- a/frontend/src/core/editor/page/templates/editorPage.hbs
+++ /dev/null
@@ -1,26 +0,0 @@
-
- {{displayName}}
- {{#if description}}
{{description}}{{/if}} -
- {{/if}}
-{{description}}{{/if}} -
-
-
diff --git a/frontend/src/core/editor/page/templates/editorPageEdit.hbs b/frontend/src/core/editor/page/templates/editorPageEdit.hbs
deleted file mode 100644
index 11a8f6fdb6..0000000000
--- a/frontend/src/core/editor/page/templates/editorPageEdit.hbs
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
-
-
-
-
-
-
-- - - - {{#if displayTitle}} - {{{displayTitle}}} - {{else}} - {{title}} - {{/if}} -
- -{{{body}}}
-
-
-
diff --git a/frontend/src/core/editor/page/templates/editorPageEditSidebar.hbs b/frontend/src/core/editor/page/templates/editorPageEditSidebar.hbs
deleted file mode 100644
index 563645f425..0000000000
--- a/frontend/src/core/editor/page/templates/editorPageEditSidebar.hbs
+++ /dev/null
@@ -1,19 +0,0 @@
-
diff --git a/frontend/src/core/editor/page/templates/editorPageOverview.hbs b/frontend/src/core/editor/page/templates/editorPageOverview.hbs
deleted file mode 100644
index 63b229ee78..0000000000
--- a/frontend/src/core/editor/page/templates/editorPageOverview.hbs
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/frontend/src/core/editor/page/templates/partials/part_editorCommon.hbs b/frontend/src/core/editor/page/templates/partials/part_editorCommon.hbs
deleted file mode 100644
index 5b1cedc131..0000000000
--- a/frontend/src/core/editor/page/templates/partials/part_editorCommon.hbs
+++ /dev/null
@@ -1,80 +0,0 @@
-
diff --git a/frontend/src/core/editor/page/views/editorArticleEditSidebarView.js b/frontend/src/core/editor/page/views/editorArticleEditSidebarView.js
deleted file mode 100644
index 3c918d485c..0000000000
--- a/frontend/src/core/editor/page/views/editorArticleEditSidebarView.js
+++ /dev/null
@@ -1,35 +0,0 @@
-// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE
-define(function(require) {
-
- var Origin = require('coreJS/app/origin');
- var SidebarItemView = require('coreJS/sidebar/views/sidebarItemView');
- var Backbone = require('backbone');
-
- var EditorArticleEditSidebarView = SidebarItemView.extend({
-
- events: {
- 'click .editor-article-edit-sidebar-save': 'saveEditing',
- 'click .editor-article-edit-sidebar-cancel': 'cancelEditing'
- },
-
- postRender: function() {},
-
- saveEditing: function(event) {
- event.preventDefault();
- this.updateButton('.editor-article-edit-sidebar-save', window.polyglot.t('app.saving'));
- Origin.trigger('editorArticleEditSidebar:views:save');
- },
-
- cancelEditing: function(event) {
- event.preventDefault();
- Backbone.history.history.back();
- Origin.trigger('editingOverlay:views:hide');
- }
-
- }, {
- template: 'editorArticleEditSidebar'
- });
-
- return EditorArticleEditSidebarView;
-
-});
\ No newline at end of file
diff --git a/frontend/src/core/editor/page/views/editorBlockEditSidebarView.js b/frontend/src/core/editor/page/views/editorBlockEditSidebarView.js
deleted file mode 100644
index e417a64d3d..0000000000
--- a/frontend/src/core/editor/page/views/editorBlockEditSidebarView.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE
-define(function(require) {
-
- var Origin = require('coreJS/app/origin');
- var SidebarItemView = require('coreJS/sidebar/views/sidebarItemView');
- var Backbone = require('backbone');
-
- var EditorBlockEditSidebarView = SidebarItemView.extend({
-
- events: {
- 'click .editor-block-edit-sidebar-save': 'saveEditing',
- 'click .editor-block-edit-sidebar-cancel': 'cancelEditing'
- },
-
- saveEditing: function(event) {
- event.preventDefault();
- this.updateButton('.editor-block-edit-sidebar-save', window.polyglot.t('app.saving'));
- Origin.trigger('editorBlockEditSidebar:views:save');
- },
-
- cancelEditing: function(event) {
- event.preventDefault();
- Backbone.history.history.back();
- Origin.trigger('editingOverlay:views:hide');
- }
-
- }, {
- template: 'editorBlockEditSidebar'
- });
-
- return EditorBlockEditSidebarView;
-
-});
\ No newline at end of file
diff --git a/frontend/src/core/editor/page/views/editorBlockView.js b/frontend/src/core/editor/page/views/editorBlockView.js
deleted file mode 100644
index 82c1c6d284..0000000000
--- a/frontend/src/core/editor/page/views/editorBlockView.js
+++ /dev/null
@@ -1,364 +0,0 @@
-// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE
-define(function(require){
-
- var Backbone = require('backbone');
- var Handlebars = require('handlebars');
- var Origin = require('coreJS/app/origin');
- var EditorOriginView = require('editorGlobal/views/editorOriginView');
- var EditorComponentModel = require('editorPage/models/editorComponentModel');
- var EditorComponentView = require('editorPage/views/editorComponentView');
- var EditorComponentPasteZoneView = require('editorPage/views/editorComponentPasteZoneView');
- var EditorComponentListView = require('editorPage/views/editorComponentListView');
-
- var EditorBlockView = EditorOriginView.extend({
-
- tagName: 'div',
-
- className: 'block editable block-draggable',
-
- settings: {
- autoRender: false
- },
-
- events: _.extend({
- 'click a.block-delete' : 'deleteBlockPrompt',
- 'click a.add-component' : 'showComponentList',
- 'click a.open-context-block' : 'openContextMenu',
- 'dblclick' : 'loadBlockEdit'
- }, EditorOriginView.prototype.events),
-
- preRender: function() {
- this.listenTo(Origin, 'editorView:removeSubViews', this.remove);
- this.listenTo(Origin, 'editorPageView:removePageSubViews', this.remove);
- this.setupModelEvents();
-
- this.listenTo(this, {
- 'contextMenu:block:edit': this.loadBlockEdit,
- 'contextMenu:block:copy': this.onCopy,
- 'contextMenu:block:copyID': this.onCopyID,
- 'contextMenu:block:cut': this.onCut,
- 'contextMenu:block:delete': this.deleteBlockPrompt
- });
-
- this.model.set('componentTypes', Origin.editor.data.componentTypes.toJSON());
-
- this.evaluateComponents(this.render);
- },
-
- setupModelEvents: function() {
- this.listenTo(Origin, 'editorView:removeComponent:' + this.model.get('_id'), this.handleRemovedComponent);
- this.listenTo(Origin, 'editorView:moveComponent:' + this.model.get('_id'), this.reRender);
- this.listenTo(Origin, 'editorView:cutComponent:' + this.model.get('_id'), this.onCutComponent);
- this.listenTo(Origin, 'editorView:addComponent:' + this.model.get('_id'), this.addComponent);
- this.listenTo(Origin, 'editorView:deleteBlock:' + this.model.get('_id'), this.deleteBlock);
- },
-
- postRender: function() {
- this.addComponentViews();
- this.setupDragDrop();
-
- _.defer(_.bind(function(){
- this.trigger('blockView:postRender');
- Origin.trigger('pageView:itemRendered');
- }, this));
- },
-
- evaluateComponents: function(callback) {
- var layoutOptions = [
- {
- type: 'left',
- name: 'app.layoutleft',
- pasteZoneRenderOrder: 2
- },
- {
- type: 'full',
- name: 'app.layoutfull',
- pasteZoneRenderOrder: 1
- },
- {
- type: 'right',
- name: 'app.layoutright',
- pasteZoneRenderOrder: 3
- }
- ];
-
- this.model.getChildren().each(function(component) {
- switch (component.get('_layout')) {
- case 'full':
- layoutOptions = null;
- break;
- case 'left':
- layoutOptions.splice(_.indexOf(layoutOptions, _.findWhere(layoutOptions, { type : "full"})), 1);
- layoutOptions.splice(_.indexOf(layoutOptions, _.findWhere(layoutOptions, { type : "left"})), 1);
- break;
- case 'right':
- layoutOptions.splice(_.indexOf(layoutOptions, _.findWhere(layoutOptions, { type : "full"})), 1);
- layoutOptions.splice(_.indexOf(layoutOptions, _.findWhere(layoutOptions, { type : "right"})), 1);
- break;
- }
- }, this);
-
- var dragLayoutOptions = [];
- var components = this.model.getChildren();
- if (components.length === 1) {
- switch (components.at(0).get('_layout')) {
- case 'full':
- dragLayoutOptions.push({type: 'left', name: 'app.layoutleft'});
- dragLayoutOptions.push({type: 'right', name: 'app.layoutright'});
- break;
- case 'left':
- dragLayoutOptions.push({type: 'full', name: 'app.layoutfull'});
- break;
- case 'right':
- dragLayoutOptions.push({type: 'full', name: 'app.layoutfull'});
- break;
- }
- }
-
- this.model.set({"layoutOptions": layoutOptions, "dragLayoutOptions": dragLayoutOptions});
-
- if (callback) {
- callback.apply(this);
- }
- },
-
- deleteBlockPrompt: function(event) {
- if (event) {
- event.preventDefault();
- }
-
- Origin.Notify.confirm({
- type: 'warning',
- title: window.polyglot.t('app.deleteblock'),
- text: window.polyglot.t('app.confirmdeleteblock') + '' + '
' + window.polyglot.t('app.confirmdeleteblockwarning'), - callback: _.bind(this.deleteBlockConfirm, this) - }); - }, - - deleteBlockConfirm: function(confirmed) { - if (confirmed) { - var id = this.model.get('_id'); - Origin.trigger('editorView:deleteBlock:' + id); - } - }, - - deleteBlock: function(event) { - var _this = this; - _this.model.destroy({ - success: function(model, response) { - _this.remove(); - }, - error: function(model, response) { - Origin.Notify.alert({ - type: 'error', - text: window.polyglot.t('app.errorgeneric') - }); - } - }); - }, - - handleRemovedComponent: function() { - this.evaluateComponents(this.render); - }, - - reRender: function() { - this.evaluateComponents(this.render); - }, - - onCutComponent: function(view) { - this.once('blockView:postRender', function() { - view.showPasteZones(); - }); - - this.evaluateComponents(this.render); - }, - - setupDragDrop: function() { - var view = this; - var autoScrollTimer = false; - var $container = $('.page'); - - this.$el.draggable({ - opacity: 0.8, - handle: '.handle', - revert: 'invalid', - zIndex: 10000, - cursorAt: { - top: 22, - left: 0 - }, - appendTo:'.editor-view', - containment: '.editor-view', - helper: function (e) { - // Store the offset to stop the page jumping during the start of drag - // because of the drop zones changing the scroll position on the page - view.offsetTopFromWindow = view.$el.offset().top - $(window).scrollTop(); - // This is in the helper method because the height needs to be - // manipulated before the drag start method due to adding drop zones - view.showDropZones(); - $(this).attr('data-' + view.model.get('_type') + '-id', view.model.get('_id')); - $(this).attr('data-' + view.model.get('_parent') + '-id', view.model.get('_parentId')); - return $('
' + view.model.get('title') + '
');
- },
- start: function(event) {
- // Using the initial offset we're able to position the window back in place
- $(window).scrollTop(view.$el.offset().top -view.offsetTopFromWindow);
- },
- drag: function(event) {
- window.clearInterval(autoScrollTimer);
-
- var SCROLL_THRESHOLD = $container.height()*0.2;
- var SCROLL_INCREMENT = 7;
-
- var offsetTop = $container.offset().top;
- var clientY = event.originalEvent.clientY;
- var scrollAmount;
-
- if (clientY < (offsetTop+SCROLL_THRESHOLD)) {
- scrollAmount = -SCROLL_INCREMENT;
- }
- else if (clientY > (($container.height()+offsetTop) - SCROLL_THRESHOLD)) {
- scrollAmount = SCROLL_INCREMENT;
- }
-
- if(scrollAmount) {
- autoScrollTimer = window.setInterval(function() {
- $container.scrollTop($container.scrollTop()+scrollAmount);
- }, 10);
- }
- },
- stop: function () {
- window.clearInterval(autoScrollTimer);
- view.hideDropZones();
- $container.scrollTop($(this).offset().top*-1);
- }
- });
- },
-
- addComponentViews: function() {
- this.$('.page-components').empty();
- var components = this.model.getChildren();
- var addPasteZonesFirst = components.length && components.at(0).get('_layout') != 'full';
-
- this.addComponentButtonLayout(components);
-
- if (addPasteZonesFirst) {
- this.setupPasteZones();
- }
-
- // Add component elements
- this.model.getChildren().each(function(component) {
- this.$('.page-components').append(new EditorComponentView({model: component}).$el);
- }, this);
-
- if (!addPasteZonesFirst) {
- this.setupPasteZones();
- }
- },
-
- addComponentButtonLayout: function(components){
- if(components.length == 2) return;
- else if (components.length == 0){
- this.$('.add-component').addClass('full');
- return;
- }
- else {
- if(components.models[0].attributes._layout == 'left')
- this.$('.add-component').addClass('right');
- else
- this.$('.add-component').addClass('left');
- }
- },
-
- loadBlockEdit: function (event) {
- var courseId = Origin.editor.data.course.get('_id');
- var type = this.model.get('_type');
- var Id = this.model.get('_id');
- Origin.router.navigate('#/editor/'
- + courseId
- + '/'
- + type
- + '/'
- + Id
- + '/edit', {trigger: true});
- },
-
- showComponentList: function(event) {
- event.preventDefault();
- // If adding a new component
- // get current layoutOptions
- var layoutOptions = this.model.get('layoutOptions');
-
- var componentSelectModel = new Backbone.Model({
- title: window.polyglot.t('app.addcomponent'),
- body: window.polyglot.t('app.pleaseselectcomponent'),
- _parentId: this.model.get('_id'),
- componentTypes: Origin.editor.data.componentTypes.toJSON(),
- layoutOptions: layoutOptions
- });
-
- $('body').append(new EditorComponentListView({
- model: componentSelectModel,
- $parentElement: this.$el,
- parentView: this
- }).$el);
-
- },
-
- setupPasteZones: function() {
- // Add available paste zones
- var layouts = [];
- var dragLayouts = [];
-
- _.each(this.model.get('dragLayoutOptions'), function (dragLayout) {
- dragLayouts.push(dragLayout);
- });
- _.each(this.model.get('layoutOptions'), function (layout) {
- layouts.push(layout);
- });
-
- _.each(this.sortArrayByKey(dragLayouts, 'pasteZoneRenderOrder'), function(layout) {
- var pasteComponent = new EditorComponentModel();
- pasteComponent.set('_parentId', this.model.get('_id'));
- pasteComponent.set('_type', 'component');
- pasteComponent.set('_pasteZoneLayout', layout.type);
- var $pasteEl = new EditorComponentPasteZoneView({model: pasteComponent}).$el;
- $pasteEl.addClass('drop-only');
- this.$('.page-components').append($pasteEl);
- }, this);
-
- _.each(this.sortArrayByKey(layouts, 'pasteZoneRenderOrder'), function(layout) {
- var pasteComponent = new EditorComponentModel();
- pasteComponent.set('_parentId', this.model.get('_id'));
- pasteComponent.set('_type', 'component');
- pasteComponent.set('_pasteZoneLayout', layout.type);
- this.$('.page-components').append(new EditorComponentPasteZoneView({model: pasteComponent}).$el);
- }, this);
- },
-
- swapLayout: function (layout) {
- var newLayout = 'full';
- if (layout != 'full') {
- newLayout = (layout == 'left') ? 'right' : 'left';
- }
- return newLayout;
- },
-
- toggleAddComponentsButton: function() {
- var layoutOptions = this.model.get('layoutOptions');
- // Have to check here if it's null as layoutOptions can sometimes not be set
- if (layoutOptions === null) layoutOptions = [];
- if (layoutOptions === null || layoutOptions.length === 0) {
- this.$('.add-control').addClass('display-none');
- } else {
- this.$('.add-control').removeClass('display-none');
- }
- }
-
- }, {
- template: 'editorBlock'
- });
-
- return EditorBlockView;
-
-});
diff --git a/frontend/src/core/editor/page/views/editorComponentListItemView.js b/frontend/src/core/editor/page/views/editorComponentListItemView.js
deleted file mode 100644
index 079cc7927a..0000000000
--- a/frontend/src/core/editor/page/views/editorComponentListItemView.js
+++ /dev/null
@@ -1,125 +0,0 @@
-// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE
-define(function(require) {
-
- var Backbone = require('backbone');
- var Origin = require('coreJS/app/origin');
- var EditorOriginView = require('editorGlobal/views/editorOriginView');
- var EditorComponentModel = require('editorPage/models/editorComponentModel');
- var EditorComponentView = require('editorPage/views/editorComponentView');
-
- var EditorComponentListItemView = EditorOriginView.extend({
-
- tagName: 'div',
-
- className: 'editor-component-list-item',
-
- events: {
- 'click': 'onItemClicked',
- 'click div.editor-component-list-item-overlay-inner > a': 'onButtonClicked'
- },
-
- preRender: function(options) {
- this.listenTo(Origin, 'editorComponentListView:removeSubviews', this.remove);
- this.listenTo(Origin, 'editorComponentListItemView:deselect', this.deselectItem);
- this.listenTo(Origin, 'editorComponentListView:searchKeyup', this.onSearchValueChanged);
- this.model.set({
- 'availablePositions': options.availablePositions
- });
- this._parentId = options._parentId;
- this.$parentElement = options.$parentElement;
- this.parentView = options.parentView;
- this.searchTerms = options.searchTerms;
- },
-
- postRender: function() {
- if (this.model.get('_isAvailableInEditor') == false) {
- this.$el.addClass('restricted');
- }
-
- },
-
- onItemClicked: function(event) {
- event.preventDefault();
-
- Origin.trigger('editorComponentListItemView:deselect')
- this.$el.addClass('selected');
- this.$('.editor-component-list-item-overlay')
- .removeClass('display-none');
- },
-
- deselectItem: function() {
- $('.editor-component-list-item').removeClass('selected');
- this.$('.editor-component-list-item-overlay')
- .addClass('display-none');
- },
-
- onSearchValueChanged: function(searchValue) {
- if (this.searchTerms.indexOf(searchValue.toLowerCase()) > -1 || searchValue.length === 0) {
- this.$el.removeClass('display-none');
- } else {
- this.$el.addClass('display-none');
- }
- },
-
- onButtonClicked: function(event) {
- event.preventDefault();
-
- this.addComponent(event.currentTarget.getAttribute('data-position'));
- },
-
- addComponent: function(layout) {
-
- Origin.trigger('editorComponentListView:remove');
-
- var componentName = this.model.get('name');
-
- var componentType = _.find(Origin.editor.data.componentTypes.models, function(type){
- return type.get('name') == componentName;
- });
-
- var newComponentModel = new EditorComponentModel({
- title: window.polyglot.t('app.placeholdernewcomponent'),
- displayTitle: window.polyglot.t('app.placeholdernewcomponent'),
- body: '',
- _parentId: this._parentId,
- _courseId: Origin.editor.data.course.get('_id'),
- _type: 'component',
- _componentType: componentType.get('_id'),
- _componentTypeDisplayName: componentType.get('displayName'),
- _component: componentType.get('component'),
- _layout: layout,
- version: componentType.get('version')
- });
-
- var newComponentView = new EditorComponentView({model: newComponentModel}).$el.addClass('syncing');
- this.$parentElement
- .find('.page-components')
- .append(newComponentView);
-
- newComponentModel.save(null, {
- error: function() {
- $('html').css('overflow-y', '');
- Origin.Notify.alert({
- type: 'error',
- text: window.polyglot.t('app.erroraddingcomponent')
- });
- },
- success: _.bind(function() {
- Origin.editor.data.components.add(newComponentModel);
- this.parentView.evaluateComponents(this.parentView.toggleAddComponentsButton);
- // Re-render the block
- this.parentView.reRender();
- newComponentView.addClass('synced');
- $('html').css('overflow-y', '');
- $.scrollTo(newComponentView.$el);
- }, this)
- });
- }
-
- }, {
- template: 'editorComponentListItem'
- });
-
- return EditorComponentListItemView;
-
-})
diff --git a/frontend/src/core/editor/page/views/editorComponentListSidebarView.js b/frontend/src/core/editor/page/views/editorComponentListSidebarView.js
deleted file mode 100644
index b084b09695..0000000000
--- a/frontend/src/core/editor/page/views/editorComponentListSidebarView.js
+++ /dev/null
@@ -1,125 +0,0 @@
-// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE
-define(function(require) {
-
- var Origin = require('coreJS/app/origin');
- var SidebarItemView = require('coreJS/sidebar/views/sidebarItemView');
- var Backbone = require('backbone');
- var EditorComponentModel = require('editorPage/models/editorComponentModel');
-
- var EditorComponentListSidebarView = SidebarItemView.extend({
-
- events: {
- 'click .editor-component-list-sidebar-save': 'onSaveClicked',
- 'click .editor-component-list-sidebar-save-edit': 'onSaveAndEditClicked',
- 'click .editor-component-list-sidebar-cancel': 'cancelEditing'
- },
-
- onSaveClicked: function(event) {
- event.preventDefault();
- this.updateButton('.editor-component-list-sidebar-save', window.polyglot.t('app.saving'));
- if (!this.model.get('component') || !this.model.get('layout')) {
- return;
- }
-
- var componentType = _.find(Origin.editor.data.componentTypes.models, function(type){
- return type.get('name') == this.model.get('component');
- }, this);
-
- var _this = this;
- var newComponentModel = new EditorComponentModel();
-
- newComponentModel.save({
- title: window.polyglot.t('app.placeholdernewcomponent'),
- displayTitle: '',
- body: '',
- _parentId: this.model.get('_parentId'),
- _courseId: Origin.editor.data.course.get('_id'),
- _type: 'component',
- _componentType: componentType.get('_id'),
- _component: componentType.get('component'),
- _layout: this.model.get('layout'),
- version: componentType.get('version')
- },
- {
- error: function() {
- Origin.Notify.alert({
- type: 'error',
- text: window.polyglot.t('app.erroraddingcomponent')
- });
- },
- success: function() {
- Origin.trigger('editor:refreshData', function() {
- Backbone.history.history.back();
- Origin.trigger('editingOverlay:views:hide');
- }, this);
- }
- });
- },
-
- onSaveAndEditClicked: function(event) {
- event.preventDefault();
- this.updateButton('.editor-component-list-sidebar-save-edit', window.polyglot.t('app.saving'));
- if (!this.model.get('component') || !this.model.get('layout')) {
- return;
- }
-
- var componentType = _.find(Origin.editor.data.componentTypes.models, function(type){
- return type.get('name') == this.model.get('component');
- }, this);
-
- var _this = this;
- var newComponentModel = new EditorComponentModel();
-
- newComponentModel.save({
- title: window.polyglot.t('app.placeholdernewcomponent'),
- displayTitle: '',
- body: '',
- _parentId: this.model.get('_parentId'),
- _courseId: Origin.editor.data.course.get('_id'),
- _type: 'component',
- _componentType: componentType.get('_id'),
- _component: componentType.get('component'),
- _layout: this.model.get('layout'),
- version: componentType.get('version')
- },
- {
- error: function() {
- Origin.Notify.alert({
- type: 'error',
- text: window.polyglot.t('app.erroraddingcomponent')
- });
- },
- success: function(data) {
- Origin.trigger('editor:refreshData', function() {
- Origin.trigger('editingOverlay:views:hide');
- Origin.router.navigate('#/editor/'
- + Origin.editor.data.course.get('_id')
- + '/component/'
- + data.get('_id'));
- }, this);
-
- }
- });
- },
-
- cancelEditing: function(event) {
- event.preventDefault();
- var currentCourseId = Origin.location.route1;
- var currentBlockId = Origin.location.route3;
- var currentBlock = Origin.editor.data.blocks.findWhere({_id: currentBlockId});
- // Don't like this line but until we have findAncestor this will do
- var currentPage = currentBlock.getParent().getParent();
- var currentPageId = currentPage.get('_id');
-
- Origin.router.navigate('#/editor/' + currentCourseId + '/page/' + currentPageId);
- Origin.trigger('editingOverlay:views:hide');
-
- }
-
- }, {
- template: 'editorComponentListSidebar'
- });
-
- return EditorComponentListSidebarView;
-
-});
diff --git a/frontend/src/core/editor/page/views/editorPageEditSidebarView.js b/frontend/src/core/editor/page/views/editorPageEditSidebarView.js
deleted file mode 100644
index 7de8f2ab0d..0000000000
--- a/frontend/src/core/editor/page/views/editorPageEditSidebarView.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE
-define(function(require) {
-
- var Origin = require('coreJS/app/origin');
- var SidebarItemView = require('coreJS/sidebar/views/sidebarItemView');
- var Backbone = require('backbone');
-
- var EditorPageEditSidebarView = SidebarItemView.extend({
-
- events: {
- 'click .editor-page-edit-sidebar-save': 'saveEditing',
- 'click .editor-page-edit-sidebar-cancel': 'cancelEditing'
- },
-
- saveEditing: function(event) {
- event.preventDefault();
- this.updateButton('.editor-page-edit-sidebar-save', window.polyglot.t('app.saving'))
- Origin.trigger('editorPageEditSidebar:views:save');
- },
-
- cancelEditing: function(event) {
- event.preventDefault();
- Backbone.history.history.back();
- Origin.trigger('editingOverlay:views:hide');
- }
-
- }, {
- template: 'editorPageEditSidebar'
- });
-
- return EditorPageEditSidebarView;
-
-});
\ No newline at end of file
diff --git a/frontend/src/core/editor/page/views/editorPageOverviewView.js b/frontend/src/core/editor/page/views/editorPageOverviewView.js
deleted file mode 100644
index c412bf3d97..0000000000
--- a/frontend/src/core/editor/page/views/editorPageOverviewView.js
+++ /dev/null
@@ -1,128 +0,0 @@
-// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE
-define(function(require) {
-
- var Origin = require('coreJS/app/origin');
- var EditorOriginView = require('editorGlobal/views/editorOriginView');
-
- var EditorPageOverviewView = EditorOriginView.extend({
- settings: {
- autoRender: false
- },
-
- className: 'editor-page-overview',
-
- events: {
- "click a.load-page" : "goToPage"
- },
-
- preRender: function() {
- this.listenTo(Origin, 'editorSidebarView:removeEditView', this.remove);
- this.listenTo(Origin, 'editorView:refreshPageList', this.refreshProjectStructure);
-
- this.render();
- this.refreshProjectStructure();
- },
-
- postRender: function() {},
-
- /**
- * Converts an array of Backbone Models to a JavaScript tree structure
- * @param {Array} data
- * @return A JavaScript treeview-like object structure
- */
- convertModelsToTree: function(data){
- var map = {},
- flat = {},
- root = [];
-
- // Flatten the data
- for (var i = 0; i < data.length; i++) {
- var key = data[i].get('_id');
-
- flat[key] = {
- _id: data[i].get('_id'),
- _type: data[i].get('_type'),
- _parentId: data[i].get('_parentId'),
- title: data[i].get('title')
- };
- }
-
- // Add a 'children' container to each node
- for (var i in flat) {
- flat[i].children = [];
- }
-
- // Populate any 'children' container arrays
- for (var i in flat) {
- var parentkey = flat[i]._parentId;
-
- if (flat[parentkey]) {
- flat[parentkey].children.push(flat[i]);
- }
- }
-
- // Find the root nodes (no parent found) and create the hierarchy tree from them
- for (var i in flat) {
- var parentkey = flat[i]._parentId;
-
- if (!flat[parentkey]) {
- root.push(flat[i]);
- }
- }
-
- return root;
- },
-
- /**
- * Creates a HTML string from a given items treeview structure
- * NOTE: string contatenation is faster here than DOM manipulation
- * @param {String} html
- * @param {Array} items
- * @return A HTML unordered list snippet
- */
- createOverviewTreeviewHtml: function(html, items) {
- html += '- '
-
- for (var i = 0; i < items.length; i++) {
- if (items[i].children.length != 0 || items[i]._type == 'menu') {
- html += '
- ' + items[i].title; - html = this.createOverviewTreeviewHtml(html, items[i].children); - html += ' '; - } else { - html += '
- ' + items[i].title + ' '; - } - } - - html += '
-
diff --git a/frontend/src/core/editor/theme/templates/editorThemeCollectionSidebar.hbs b/frontend/src/core/editor/theme/templates/editorThemeCollectionSidebar.hbs
deleted file mode 100644
index be1a3c8d26..0000000000
--- a/frontend/src/core/editor/theme/templates/editorThemeCollectionSidebar.hbs
+++ /dev/null
@@ -1,12 +0,0 @@
-
\ No newline at end of file
diff --git a/frontend/src/core/editor/theme/templates/editorThemeEdit.hbs b/frontend/src/core/editor/theme/templates/editorThemeEdit.hbs
deleted file mode 100644
index 3fd70a9b4b..0000000000
--- a/frontend/src/core/editor/theme/templates/editorThemeEdit.hbs
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/frontend/src/core/editor/theme/templates/editorThemeEditSidebar.hbs b/frontend/src/core/editor/theme/templates/editorThemeEditSidebar.hbs
deleted file mode 100644
index a65a00a35f..0000000000
--- a/frontend/src/core/editor/theme/templates/editorThemeEditSidebar.hbs
+++ /dev/null
@@ -1,17 +0,0 @@
-
\ No newline at end of file
diff --git a/frontend/src/core/editor/theme/templates/editorThemeItem.hbs b/frontend/src/core/editor/theme/templates/editorThemeItem.hbs
deleted file mode 100644
index 3a5a6f1f20..0000000000
--- a/frontend/src/core/editor/theme/templates/editorThemeItem.hbs
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
diff --git a/frontend/src/core/editor/theme/views/editorThemeCollectionSidebarView.js b/frontend/src/core/editor/theme/views/editorThemeCollectionSidebarView.js
deleted file mode 100644
index 1d4847161d..0000000000
--- a/frontend/src/core/editor/theme/views/editorThemeCollectionSidebarView.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE
-define(function(require) {
-
- var Origin = require('coreJS/app/origin');
- var SidebarItemView = require('coreJS/sidebar/views/sidebarItemView');
- var Backbone = require('backbone');
-
- var EditorThemeCollectionSidebarView = SidebarItemView.extend({
-
- events: {
- 'click .editor-theme-edit-sidebar-save' : 'saveEditing',
- 'click .editor-theme-edit-sidebar-cancel' : 'cancelEditing'
- },
-
- saveEditing: function(event) {
- event.preventDefault();
- this.updateButton('.editor-theme-edit-sidebar-save', window.polyglot.t('app.saving'));
- Origin.trigger('editorThemeEditSidebar:views:save');
- },
-
- cancelEditing: function(event) {
- event.preventDefault();
- Backbone.history.history.back();
- Origin.trigger('editingOverlay:views:hide');
- }
-
- }, {
- template: 'editorThemeCollectionSidebar'
- });
-
- return EditorThemeCollectionSidebarView;
-
-});
\ No newline at end of file
diff --git a/frontend/src/core/editor/theme/views/editorThemeCollectionView.js b/frontend/src/core/editor/theme/views/editorThemeCollectionView.js
deleted file mode 100644
index 32e428d385..0000000000
--- a/frontend/src/core/editor/theme/views/editorThemeCollectionView.js
+++ /dev/null
@@ -1,107 +0,0 @@
-// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE
-define(function(require) {
-
- var Backbone = require('backbone');
- var Origin = require('coreJS/app/origin');
- var EditorOriginView = require('editorGlobal/views/editorOriginView');
- var ThemeCollection = require('editorTheme/collections/editorThemeCollection');
- var ThemeItemView = require('editorTheme/views/editorThemeItemView');
-
- var EditorThemeCollectionView = EditorOriginView.extend({
-
- tagName: "ul",
-
- className: "editor-theme-edit",
-
- events: {
-
- },
-
- preRender: function() {
- this.collection = new ThemeCollection();
- this.listenTo(this.collection, 'sync', this.addThemeViews);
- this.collection.fetch();
-
- this.listenTo(Origin, 'editorSidebarView:removeEditView', this.remove);
- this.listenTo(Origin, 'editorThemeEditSidebar:views:save', this.saveData);
- },
-
- postRender: function() {
- },
-
- addThemeViews: function() {
- this.renderThemeViews();
- _.defer(this.setViewToReady);
- },
-
- renderThemeViews: function() {
-
- this.collection.each(function(theme) {
-
- var isSelected = false;
-
- if (theme.get('name') === this.model.get('_theme')) {
- isSelected = true;
- }
-
- theme.set('_isSelected', isSelected);
- this.$('.theme-list').append(new ThemeItemView({model: theme}).$el);
-
- }, this);
-
- },
-
- cancel: function(event) {
- event.preventDefault();
- Origin.trigger('editorSidebarView:removeEditView', this.model);
- },
-
- saveData: function(event) {
- if (event) {
- event.preventDefault();
- }
-
- var selectedTheme = this.collection.findWhere({_isSelected: true});
-
- if (selectedTheme === undefined) {
- Origin.Notify.alert({
- type: 'error',
- text: window.polyglot.t('app.errornothemeselected')
- });
-
- Origin.trigger('sidebar:resetButtons');
-
- return;
- }
-
- var selectedThemeId = selectedTheme.get('_id');
-
- // Should push to api
-
- $.post('/api/theme/' + selectedThemeId + '/makeitso/' + this.model.get('_courseId'))
- .error(function() {
- Origin.Notify.alert({
- type: 'error',
- text: window.polyglot.t('app.errorsave')
- });
- })
- .done(_.bind(function() {
-
- Origin.trigger('editingOverlay:views:hide');
-
- Origin.trigger('editor:refreshData', function() {
- Backbone.history.history.back();
- this.remove();
- }, this);
-
- }, this));
-
- }
- },
- {
- template: 'editorThemeCollection'
- });
-
- return EditorThemeCollectionView;
-
-});
diff --git a/frontend/src/core/globalMenu/less/globalMenu.less b/frontend/src/core/globalMenu/less/globalMenu.less
deleted file mode 100644
index a93c440e50..0000000000
--- a/frontend/src/core/globalMenu/less/globalMenu.less
+++ /dev/null
@@ -1,36 +0,0 @@
-.global-menu {
- display:none;
- top:61px;
- position:absolute;
- width:260px;
- a {
- display:block;
- text-decoration: none;
- }
-
- .global-menu-inner {
- border-left: 1px solid rgba(0,0,0,0.1);
- border-right: 1px solid rgba(0,0,0,0.1);
- }
-
- .global-menu-submenu {
- display:none;
- width:260px;
- position:absolute;
- background-color:#FFF;
- border-top:1px solid #FFF;
- border-left:1px solid #FFF;
- }
-
- .global-menu-item {
-
- }
-
- .global-menu-item-inner {
- padding:14px 18px;
- }
-
- .global-menu-item-text-inner {
- color: white;
- }
-}
diff --git a/frontend/src/core/app/helpers.js b/frontend/src/core/helpers.js
similarity index 91%
rename from frontend/src/core/app/helpers.js
rename to frontend/src/core/helpers.js
index 40556ebb40..622249bc58 100644
--- a/frontend/src/core/app/helpers.js
+++ b/frontend/src/core/helpers.js
@@ -1,7 +1,7 @@
// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE
define(function(require){
var Handlebars = require('handlebars');
- var Origin = require('coreJS/app/origin');
+ var Origin = require('core/origin');
var moment = require('moment');
var helpers = {
@@ -137,7 +137,7 @@ define(function(require){
for (var placeholder in options.hash) {
options[placeholder] = options.hash[placeholder];
}
- return (window.polyglot != undefined ? window.polyglot.t(str, options) : str);
+ return Origin.l10n.t(str, options);
},
stripHtml: function(html) {
@@ -213,11 +213,19 @@ define(function(require){
}
},
+ ifMailEnabled: function(block) {
+ if (Origin.constants.useSmtp === true) {
+ return block.fn(this);
+ } else {
+ return block.inverse(this);
+ }
+ },
+
getAssetFromValue: function(url) {
var urlSplit = url.split('/');
var fileName = urlSplit[urlSplit.length - 1];
// Get courseAsset model
- var courseAsset = Origin.editor.data.courseAssets.findWhere({_fieldName: fileName});
+ var courseAsset = Origin.editor.data.courseassets.findWhere({_fieldName: fileName});
if (courseAsset) {
var courseAssetId = courseAsset.get('_assetId');
@@ -240,7 +248,7 @@ define(function(require){
var urlSplit = url.split('/');
var fileName = urlSplit[urlSplit.length - 1];
// Get courseAsset model
- var courseAsset = Origin.editor.data.courseAssets.findWhere({_fieldName: fileName});
+ var courseAsset = Origin.editor.data.courseassets.findWhere({_fieldName: fileName});
if (courseAsset) {
var courseAssetId = courseAsset.get('_assetId');
return '/api/asset/thumb/' + courseAssetId;
@@ -319,13 +327,14 @@ define(function(require){
if (currentChildren.length === 0) {
containsAtLeastOneChild = false;
+ var children = _.isArray(model._children) ? model._children.join('/') : model._children;
alerts.push(
"There seems to be a "
+ model.get('_type')
+ " with the title - '"
+ model.get('title')
+ "' with no "
- + model._children
+ + children
);
return;
} else {
@@ -347,7 +356,7 @@ define(function(require){
Origin.Notify.alert({
type: 'error',
- title: window.polyglot.t('app.validationfailed'),
+ title: Origin.l10n.t('app.validationfailed'),
text: errorMessage,
callback: _.bind(this.validateCourseConfirm, this)
});
@@ -361,6 +370,16 @@ define(function(require){
Origin.trigger('editor:courseValidation');
}
}
+ },
+
+ isValidEmail: function(value) {
+ var regEx = /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+ if (value.length === 0 || !regEx.test(value)) {
+ return false;
+ } else {
+ return true;
+ }
+ }
};
for(var name in helpers) {
diff --git a/frontend/src/core/l10n.js b/frontend/src/core/l10n.js
new file mode 100644
index 0000000000..94dd1d9ae4
--- /dev/null
+++ b/frontend/src/core/l10n.js
@@ -0,0 +1,21 @@
+// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE
+define(['require', 'jquery', 'polyglot', 'core/origin'], function(require, $, Polyglot, Origin) {
+ var polyglot;
+ // set up global l10n object
+ Origin.l10n = {
+ t: function(string, data) {
+ if(!polyglot || !polyglot.t) {
+ return string;
+ }
+ return polyglot.t.apply(polyglot, arguments);
+ }
+ };
+ /**
+ * Initialise from language file
+ */
+ var locale = localStorage.getItem('lang') || 'en';
+ $.getJSON('lang/' + locale, function(data) {
+ polyglot = new Polyglot({ phrases: data });
+ Origin.trigger('l10n:loaded');
+ });
+});
diff --git a/frontend/src/core/app/less/_reset.less b/frontend/src/core/less/_reset.less
similarity index 100%
rename from frontend/src/core/app/less/_reset.less
rename to frontend/src/core/less/_reset.less
diff --git a/frontend/src/core/app/less/app.less b/frontend/src/core/less/app.less
similarity index 86%
rename from frontend/src/core/app/less/app.less
rename to frontend/src/core/less/app.less
index 62cf807a0e..537498d7d7 100644
--- a/frontend/src/core/app/less/app.less
+++ b/frontend/src/core/less/app.less
@@ -1,7 +1,14 @@
+@import 'colours';
+
html {
overflow-y: hidden;
}
+body {
+ background-color:@ui-content-color;
+ color:@sidebar-color;
+}
+
#app {
margin-top:60px;
margin-left:250px;
@@ -12,12 +19,14 @@ html {
}
span.error {
- color: red;
+ color: @alert-color;
}
// Loading overlay styling
// =======================
+@loading-icon-size: 8px;
+
.loading {
width: 100vw;
height: 100vh;
@@ -28,23 +37,19 @@ span.error {
text-align: center;
opacity:1;
transition: opacity 0.3s;
- background-color:#F3FCFE;
+ background-color: @ui-content-color;
+
&.fade-out {
opacity: 0;
}
&.cover-top-bar {
position:fixed;
z-index:50000;
- .loading-inner {
- margin-top:41px;
- }
}
.loading-inner {
margin-top: 25%;
}
-
- @loading-icon-size: 8px;
.loading-logo {
margin-bottom: @loading-icon-size;
@@ -53,13 +58,6 @@ span.error {
}
}
- .loading-text {
- h3 {
- font-size: 16px;
- font-weight: 500;
- }
- }
-
.loading-anim {
margin: 0 auto 15px auto;
text-align: center;
@@ -91,10 +89,10 @@ span.error {
}
@keyframes sk-bouncedelay {
- 0%, 80%, 100% {
+ 0%, 80%, 100% {
-webkit-transform: scale(0);
transform: scale(0);
- } 40% {
+ } 40% {
-webkit-transform: scale(1.0);
transform: scale(1.0);
}
diff --git a/frontend/src/less/buttons.less b/frontend/src/core/less/buttons.less
similarity index 99%
rename from frontend/src/less/buttons.less
rename to frontend/src/core/less/buttons.less
index 2c167fdea1..a44b7a68e1 100644
--- a/frontend/src/less/buttons.less
+++ b/frontend/src/core/less/buttons.less
@@ -1,4 +1,4 @@
-@import 'variables';
+@import 'colours';
button {
border:none;
@@ -52,7 +52,7 @@ button {
background:none;
border:@button-border;
border-radius:@button-radius;
- font-weight:600;
+ font-weight: @font-weight-bold;
text-decoration: none;
transition:all 0.3s;
diff --git a/frontend/src/less/variables.less b/frontend/src/core/less/colours.less
similarity index 79%
rename from frontend/src/less/variables.less
rename to frontend/src/core/less/colours.less
index 01e292db38..0b34a02d49 100644
--- a/frontend/src/less/variables.less
+++ b/frontend/src/core/less/colours.less
@@ -30,25 +30,30 @@
@ui-content-header-color:#e0e8f7;
@ui-content-color:#f3fcfe;
-@warning-color:#ffa08d;
-@alert-color:#ff5567;
-@disabled-color:#454545;
+@alert-color: #ff5567;
+@warning-color: #ffa08d;
+@info-color: fade(@primary-color, 60%);
+@success-color: @secondary-color;
+
+@disabled-color: #454545;
/*///////////
// Layout colors
/////////*/
-@navigation-text-color:@white;
-@navigation-hover-text-color:darken(@navigation-text-color, 2%);
+@navigation-text-color: @white;
+@navigation-hover-text-color: darken(@navigation-text-color, 2%);
-@sidebar-title-text-color:@white;
-@sidebar-color:@tertiary-color;
-@sidebar-input-font-size:15px;
-@sidebar-text-color:@primary-color;
-@sidebar-item-hover-color:lighten(@tertiary-color, 10%);
-@sidebar-item-hover-text-color:white;
-@sidebar-input-color:#627178;
-@sidebar-input-text-color:@white;
+@sidebar-title-text-color: @white;
+@sidebar-color: @tertiary-color;
+@sidebar-text-color: @primary-color;
+@sidebar-item-hover-color: lighten(@tertiary-color, 10%);
+@sidebar-item-hover-text-color: white;
+@sidebar-input-text-color: @white;
+@sidebar-input-placeholder-color: #9fa8ad;
+@sidebar-input-color: #627178;
+@sidebar-input-border-color: lighten(@sidebar-input-color, 10%);
+@sidebar-input-button-color: @sidebar-input-text-color;
@location-title:#000;
@location-background-color:@white;
@@ -106,7 +111,7 @@
// Warning button
@button-warning-color:@warning-color;
-@button-warning-hover-color:darken(@warning-color, 10%);
+@button-warning-hover-color:darken(@button-warning-color, 15%);
@button-warning-text-color:@white;
@button-warning-hover-text-color:@white;
diff --git a/frontend/src/core/app/less/columns.less b/frontend/src/core/less/columns.less
similarity index 100%
rename from frontend/src/core/app/less/columns.less
rename to frontend/src/core/less/columns.less
diff --git a/frontend/src/core/less/fonts.less b/frontend/src/core/less/fonts.less
new file mode 100644
index 0000000000..5d693e123b
--- /dev/null
+++ b/frontend/src/core/less/fonts.less
@@ -0,0 +1,30 @@
+@import url('https://fonts.googleapis.com/css?family=Open+Sans:@{font-weight},@{font-weight-bold}|Raleway:@{font-weight},@{font-weight-bold}');
+
+@font-title: 'Raleway', sans-serif;
+@font-family: 'Open Sans', sans-serif;
+
+@font-size:13px;
+@font-weight: 400;
+@font-weight-bold: 700;
+
+// Fonts sizes
+
+body {
+ font-family:@font-family;
+ font-size: @font-size;
+ font-weight:@font-weight;
+}
+
+h1 {
+ font-size:15px;
+ font-family: @font-title;
+}
+
+h1, h2, h3, h4, h5, h6 {
+ font-weight: @font-weight-bold;
+}
+
+button, input, textarea {
+ font-family:@font-family;
+ font-size:13px;
+}
diff --git a/frontend/src/core/app/less/forms.less b/frontend/src/core/less/forms.less
similarity index 100%
rename from frontend/src/core/app/less/forms.less
rename to frontend/src/core/less/forms.less
diff --git a/frontend/src/core/app/less/helpers.less b/frontend/src/core/less/helpers.less
similarity index 100%
rename from frontend/src/core/app/less/helpers.less
rename to frontend/src/core/less/helpers.less
diff --git a/frontend/src/core/less/sharedStyles.less b/frontend/src/core/less/sharedStyles.less
new file mode 100644
index 0000000000..eede0cfcb7
--- /dev/null
+++ b/frontend/src/core/less/sharedStyles.less
@@ -0,0 +1,40 @@
+// Page-style form background
+.form-container-style {
+ max-width: 800px;
+ margin: 20px;
+ border: 1px solid #d6f2f9;
+ background-color: #fff;
+ > .inner {
+ padding: 30px;
+ form .form-group {
+ padding-bottom: 0;
+ border-bottom: none;
+ }
+ }
+}
+
+.no-wrap {
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ width: 90%;
+}
+
+.no-select {
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
+ cursor: default;
+}
+
+.no-ui {
+ background: url(assets/login_bg.jpg) no-repeat center center fixed;
+ -webkit-background-size: cover;
+ -moz-background-size: cover;
+ -o-background-size: cover;
+ background-size: cover;
+ .sidebar, .navigation, .location-title {
+ display: none;
+ }
+}
diff --git a/frontend/src/core/app/less/tables.less b/frontend/src/core/less/tables.less
similarity index 82%
rename from frontend/src/core/app/less/tables.less
rename to frontend/src/core/less/tables.less
index c510485376..1f80a66abb 100644
--- a/frontend/src/core/app/less/tables.less
+++ b/frontend/src/core/less/tables.less
@@ -1,4 +1,4 @@
-@import '../../../less/variables.less';
+@import 'colours';
.tb-title {
background-color: #9cabc4;
@@ -15,6 +15,9 @@
.tb-col-inner {
padding-right:10px;
+ :not(.tb-heading)& {
+ font-weight: @font-weight;
+ }
}
}
@@ -22,6 +25,5 @@
padding: 35px 30px;
h1, h2, h3, h4, h5, h6 {
color: @primary-color;
- font-weight: bold;
}
}
diff --git a/frontend/src/core/less/tags.less b/frontend/src/core/less/tags.less
new file mode 100644
index 0000000000..4c400c19ab
--- /dev/null
+++ b/frontend/src/core/less/tags.less
@@ -0,0 +1,194 @@
+@import 'colours';
+
+div.tagsinput {
+ border:1px solid #CCC;
+ background: #FFF;
+ padding:5px;
+ overflow-y: auto;
+ border-radius: @button-radius;
+
+ span.tag {
+ border: 1px solid @tag-title-color;
+ -moz-border-radius:2px;
+ -webkit-border-radius:2px;
+ display: block;
+ float: left;
+ padding: 5px;
+ text-decoration:none;
+ background: @tag-background-color;
+ color: @tag-title-color;
+ margin-right: 5px;
+ margin-bottom:5px;
+
+ a {
+ color: @tag-title-color;
+ font-weight: @font-weight-bold;
+ text-decoration:none;
+ }
+ }
+
+ input {
+ width: 80px;
+ margin:0px;
+ border:1px solid transparent;
+ padding:5px;
+ background: transparent;
+ color: #000;
+ outline:0px;
+ margin-right:5px;
+ margin-bottom:5px;
+ }
+
+ div {
+ display:block;
+ float: left;
+ }
+}
+
+.tags_clear {
+ clear: both;
+ width: 100%;
+ height: 0px;
+}
+
+.ui-autocomplete {
+ position: absolute;
+ top: 100%;
+ left: 0;
+ float: left;
+ display: none;
+ min-width: 160px;
+ padding: 4px 0 4px 0;
+ margin: 2px 0 0 0;
+ list-style: none;
+ background-color: #ffffff;
+ border-color: #ccc;
+ border-color: rgba(0, 0, 0, 0.2);
+ border-style: solid;
+ border-width: 1px;
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
+ -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+ -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+ box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+ -webkit-background-clip: padding-box;
+ -moz-background-clip: padding;
+ background-clip: padding-box;
+ *border-right-width: 2px;
+ *border-bottom-width: 2px;
+}
+
+.ui-helper-hidden {
+ display: none;
+}
+.ui-helper-hidden-accessible {
+ border: 0;
+ clip: rect(0 0 0 0);
+ height: 1px;
+ margin: -1px;
+ overflow: hidden;
+ padding: 0;
+ position: absolute;
+ width: 1px;
+}
+.ui-helper-reset {
+ margin: 0;
+ padding: 0;
+ border: 0;
+ outline: 0;
+ line-height: 1.3;
+ text-decoration: none;
+ font-size: 100%;
+ list-style: none;
+}
+.ui-helper-clearfix:before,
+.ui-helper-clearfix:after {
+ content: "";
+ display: table;
+ border-collapse: collapse;
+}
+.ui-helper-clearfix:after {
+ clear: both;
+}
+.ui-helper-clearfix {
+ min-height: 0; /* support: IE7 */
+}
+.ui-helper-zfix {
+ width: 100%;
+ height: 100%;
+ top: 0;
+ left: 0;
+ position: absolute;
+ opacity: 0;
+ filter:Alpha(Opacity=0); /* support: IE8 */
+}
+
+.ui-front {
+ z-index: 100;
+}
+
+.ui-menu {
+ list-style: none;
+ padding: 0;
+ margin: 0;
+ display: block;
+ outline: none;
+}
+.ui-menu .ui-menu {
+ position: absolute;
+}
+.ui-menu .ui-menu-item {
+ position: relative;
+ margin: 0;
+ padding: 3px 1em 3px .4em;
+ cursor: pointer;
+ min-height: 0; /* support: IE7 */
+ /* support: IE10, see #8844 */
+ list-style-image: url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7");
+}
+.ui-menu .ui-menu-divider {
+ margin: 5px 0;
+ height: 0;
+ font-size: 0;
+ line-height: 0;
+ border-width: 1px 0 0 0;
+}
+.ui-menu .ui-state-focus,
+.ui-menu .ui-state-active {
+ margin: -1px;
+}
+
+/* icon support */
+.ui-menu-icons {
+ position: relative;
+}
+.ui-menu-icons .ui-menu-item {
+ padding-left: 2em;
+}
+
+/* left-aligned */
+.ui-menu .ui-icon {
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ left: .2em;
+ margin: auto 0;
+}
+
+/* right-aligned */
+.ui-menu .ui-menu-icon {
+ left: auto;
+ right: 0;
+}
+
+.ui-state-hover,
+.ui-widget-content .ui-state-hover,
+.ui-widget-header .ui-state-hover,
+.ui-state-focus,
+.ui-widget-content .ui-state-focus,
+.ui-widget-header .ui-state-focus {
+ background: #15a4fa;
+ font-weight: bold;
+ color: #fff;
+}
diff --git a/frontend/src/core/libraries/backbone.localStorage.js b/frontend/src/core/libraries/backbone.localStorage.js
deleted file mode 100644
index 121399d825..0000000000
--- a/frontend/src/core/libraries/backbone.localStorage.js
+++ /dev/null
@@ -1,184 +0,0 @@
-/**
- * Backbone localStorage Adapter
- * Version 1.1.0
- *
- * https://github.com/jeromegn/Backbone.localStorage
- */
-(function (root, factory) {
- if (typeof define === "function" && define.amd) {
- // AMD. Register as an anonymous module.
- define(["underscore","backbone"], function(_, Backbone) {
- // Use global variables if the locals are undefined.
- return factory(_ || root._, Backbone || root.Backbone);
- });
- } else {
- // RequireJS isn't being used. Assume underscore and backbone are loaded in
+
+
+
+
{{#if isProduction}}
-
+
{{else}}
-
-
-
+
+
+
{{/if}}
@@ -37,14 +37,13 @@
-
-
- {{#if settings}}
- {{displayName}}
{{description}}
-
-
- {{else}}
- {{#if settings}}
- {{#with properties}}
- -
-
-
- - --
-
-
- - --
-
-
- - --
-
-
- {{/with}}
- {{else}}
- {{/if}}
- {{/if}}
--
-
-
- - --
-
-
- - --
-
-
- - --
-
- 
+ 
+
%{email}.
This is a one-way trip. Continue?", + "app.unlockuser": "Unlock user", + "app.restoreuser": "Restore user", + "app.resetlogins": "Reset logins", + "app.confirmresetlogins": "Reset failed login attempts for
%{email}?", + "app.resetpasswordtitle": "Change password", + "app.resetpasswordinstruction": "Enter a new password for
%{email}", + "app.changepasswordtext": "Password updated for
%{email}", + "app.passwordempty": "You need to write something!", + "app.changeadminaccounts": "Please log in as another admin for full access.", + "app.failedlogins": "Failed logins", + "app.lastaccess": "Last access", + "app.duplicateuservalueerror": "Couldn't save user data. A user already exists with %{key}: %{value}", + "app.uservalueerror": "Couldn't save user data.", "app.addnewuser": "Add new user", - "app.usernameoremail": "E-mail address", - "app.authenticationtype": "Authentication Type", - "app.active": "Active", + "app.adduserformtitle": "New user account details", + "app.usernameoremail": "Email address", "app.action": "Action", "app.forgotpassword": "Forgot your password?", "app.password": "Password", - "app.login": "Login", - "app.logout": "Logout", + "app.login": "Log in", + "app.logout": "Log out", "app.signin": "Sign in", "app.help": "Help", - "app.register": "Register", - "app.pleaseloginor": "Please login, or", - "app.invalidusernameoremail": "Invalid e-mail address", - "app.invalidusernameorpassword": "Invalid e-mail address or password", - "app.accountlockedout": "Your account is locked. Please contact an administrator.", - "app.areyousureyouwantto": "Are you sure you want to", + "app.invalidusernameoremail": "Invalid email address", + "app.invalidusernameorpassword": "Invalid email address or password", "app.dashboard": "Dashboard", + "app.gotodashboard": "Go to Dashboard", "app.loggedinas": "Logged in as", + "app.logbackinas": "Log back in as", "app.edit": "Edit", "app.view": "View", "app.restore": "Restore", "app.editsettings": "Edit settings", "app.editcourse": "Edit course", - "app.editproperties": "Edit properties", "app.duplicate": "Duplicate", "app.delete": "Delete", "app.copy": "Copy", "app.copyidtoclipboard": "Copy ID to clipboard", "app.paste": "Paste", - "app.cut": "Cut", "app.save": "Save", "app.saving": "Saving...", "app.saveandedit": "Save and edit", + "app.done": "Done", "app.continue": "Continue", "app.cancel": "Cancel", "app.confirmduplicate": "Are you sure you want to duplicate this course so you can edit it locally?", @@ -60,8 +67,6 @@ "app.noprojectstodisplay": "No courses to display", "app.pleaseentervalue": "Please enter a value here", "app.pleaseaddfile": "Please choose a file to upload", - "app.projecttitle": "Project title", - "app.projectdescription": "Project description", "app.addarticle": "Add article", "app.addblock": "Add block", "app.addcomponent": "Add component", @@ -74,28 +79,24 @@ "app.addtoright": "Add to right", "app.typetofiltercomponents": "Type to filter components", "app.addpage": "Add page", - "app.addsubmenu": "Add sub menu", - "app.editthistext": "{Edit this text}", - "app.overview": "Overview", + "app.addsubmenu": "Add submenu", "app.resetpassword": "Reset password", - "app.resetpasswordsuccess": "You password has been changed", + "app.resetpasswordsuccess": "You password has been changed successfully. Click the button below to return to the login screen.", "app.resetpassworderror": "Your password could not be changed", - "app.submit": "Submit", "app.newpassword": "New password", - "app.forgotpasswordblurb": "Enter the e-mail address associated with your Adapt account, then click Continue.", + "app.confirmpassword": "Confirm password", + "app.passwordtip": "Enter a new password below. The most secure passwords have a mix of numbers, letters (including capitals) and other characters.", + "app.forgotpasswordblurb": "Enter the email address associated with your Adapt account, then click Continue.", "app.forgotpasswordfooter": "Contact Support for help with restoring access to your account.", - "app.hasyouremailchanged": "Has your e-mail address changed?", + "app.hasyouremailchanged": "Has your email address changed?", "app.forgotpasswordsuccess": "Your request is being processed. If the details you provided match our records, you will receive further instructions via email.", - "app.forgotpassworderror": "We could not process your request. Please try again.", "app.returnto": "Return to", "app.deleteproject": "Delete project", - "app.deletesharedproject": "Delete shared project", + "app.deletesharedproject": "Delete shared project", "app.confirmdelete": "Are you sure you want to remove this?", "app.confirmdeleteproject": "Are you sure you want to delete this project?", "app.confirmdeleteprojectwarning": "IMPORTANT: This will delete all the content in the project", "app.confirmdeletesharedprojectwarning": "IMPORTANT: This is a shared project and will affect all users of the system.", - "app.confirmdeleteuser": "Are you sure you want to delete this user?", - "app.confirmrestoreuser": "Are you sure you want to restore this user?", "app.confirmdeletepage": "Are you sure you want to delete this page?", "app.confirmdeletemenu": "Are you sure you want to delete this section?", "app.confirmdeletewarningpage": "IMPORTANT: You will lose all the contents of this page", @@ -106,7 +107,6 @@ "app.confirmdeleteblockwarning": "IMPORTANT: This will remove any components inside this block.", "app.confirmdeletecomponent": "Are you sure you want to delete this component?", "app.confirmdeletecomponentwarning": "IMPORTANT: This will remove any formatting and information from this component.", - "app.confirmapplyextension": "Are you sure you want to apply %{extension}?", "app.confirmdeleteextension": "IMPORTANT: This will remove any configuration that may have been made to properties of this extension. Are you sure you want to remove this extension?", "app.deleteextension": "Delete extension", "app.deleteitempage": "Delete page", @@ -120,10 +120,6 @@ "app.placeholdernewarticle": "Article title", "app.placeholdernewblock": "Block title", "app.placeholdernewcomponent": "Component title", - "app.placeholdereditthistext": "{Edit this text...}", - "app.confirmpublish": "Are you sure you want to publish?", - "app.publish": "Publish", - "app.publishing": "Publishing...", "app.download": "Download", "app.downloading": "Downloading...", "app.preview": "Preview", @@ -133,40 +129,30 @@ "app.firstname": "First name", "app.lastname": "Last name", "app.email": "Email", - "app.resetpasswordfor": "Reset password for %{username}", "app.validationrequired": "A value is required here", "app.validationlength": "At least %{length} characters are required", "app.changepassword": "Change password", - "app.accountislocked": "This account has been locked because of too many failed login attempts. It can be unlocked by clicking 'Change password' to reset the user's password", - "app.undochangepassword": "Cancel", + "app.accountislocked": "This account has been locked because of too many failed login attempts. You can unlock it by clicking the 'Forgotten your password?' button.", "app.validationpasswordmatch": "Passwords do not match", - "app.passwordindicatorweak": "Weak -- try using numbers and capital letters", + "app.passwordindicatorweak": "Weak – try using numbers and capital letters", "app.passwordindicatormedium": "Make your password stronger with more capital letters, more numbers and special characters", "app.passwordindicatorstrong": "Strong password!", "app.fixerrors": "Please fix the below errors before continuing.", "app.manageextensions": "Manage extensions", - "app.defaultlanguage": "Default language", - "app.questionweight": "Question weight", - "app.accessibilityenabled": "Enable accessibility", - "app.accessibilitylegacy": "Enable support for older browsers", - "app.drawershoweasing": "Show easing", - "app.drawerhideeasing": "Hide easing", - "app.drawerduration": "Duration", - "app.editcoursesettings": "Edit Course Settings", "app.projectsettings": "Project settings", + "app.projectcontentbody": "This is a text component", "app.configurationsettings": "Configuration settings", "app.themesettings": "Theme settings", "app.themepicker": "Theme picker", - "app.themecustomisation": "Theme customisation", - "app.status": "Status", + "app.themepreviewalt": "Preview image", "app.lastupdated": "UPDATED", "app.recent": "Recent", - "app.category": "Category", - "app.owner": "Owner", "app.assettitle": "Asset title", "app.assetdescription": "Asset description", "app.assetfile": "File", + "app.fileuploaded": "File has been uploaded", "app.noassetsfound": "No assets found", + "app.assetpreviewinstruction": "Select an asset to see a preview here", "app.uploadnewasset": "Upload new asset", "app.upload": "Upload", "app.assetfilters": "Filters", @@ -175,14 +161,14 @@ "app.removeasset": "Remove Asset", "app.removeexternalasset": "Remove External Asset", "app.nothumbnailforimage": "No thumbnail available, but click here to view the image", - "app.assetcollections": "Collections", "app.assetconfirmdelete": "Are you sure you want to delete this asset?", "app.assetconfirmrestore": "Are you sure you want to restore this asset?", "app.search": "Search", "app.searchbyname": "Search by name", "app.searchbytag": "Search by tag", "app.searchtitleordescription": "Search title or description", - "app.filetype": "File type", + "app.filter": "Filter", + "app.filterbytags": "Filter by tags", "app.filetypeother": "Other", "app.filetypeimage": "Image", "app.filetypeaudio": "Audio", @@ -195,12 +181,19 @@ "app.class": "Classes", "app.description": "Description", "app.bodytext": "Body text", - "app.settingsgeneral": "General", - "app.settingsextensions": "Extensions", - "app.assetmanager": "Asset Manager", + "app.general": "General", + "app.properties": "Properties", + "app.settings": "Settings", + "app.extensions": "Extensions", + "app.assetmanagement": "Asset Management", + "app.autofill": "Autofill", "app.extension": "Extension", + "app.components": "Components", + "app.themes": "Themes", + "app.menus": "Menus", + "app.getnewplugins": "Get new plugins", + "app.required": "Required", "app.options": "Options", - "app.select": "Select", "app.remove": "Remove", "app.add": "Add", "app.enabledextensions": "Enabled extensions", @@ -210,89 +203,50 @@ "app.extensionmanagement": "Manage Available Extensions", "app.thememanagement": "Theme Management", "app.componentmanagement": "Manage Available Components", - "app.checking": "Checking ... ", + "app.checking": "Checking...", "app.updateplugin": "Click to update", "app.uptodate": "Up to date!", "app.updatefailed": "Failed to update!", - "app.updating": "Updating ...", + "app.updating": "Updating...", "app.tags": "Tags", "app.addtag": "Add tag", + "app.viewtags": "View tags", + "app.hidetags": "Hide tags", "app.pluginmanagement": "Plugin Management", "app.uploadplugin": "Upload Plugin", "app.uploadpluginsuccess": "The plugin was uploaded successfully!", "app.uploadpluginerror": "Plugin upload failed", "app.uploadedbyuser": "Uploaded By User", + "app.checkforupdates": "Check for updates", "app.pluginfile": "Plugin File", + "app.noplugintypes": "No plugin types to display", "app.menupicker": "Menu picker", "app.menumanagement": "Manage Available Menus", - "app.uploadnewtheme": "Upload new theme", - "app.customisetheme": "Customise selected theme", - "app.themenoneselectedtitle": "No theme selected", - "app.themenoneselectedbody": "There is no theme currently selected.", - "app.themenoteditabletitle": "Current theme is not editable", - "app.themenoteditablebody": "The theme currently associated with this course is not editable.", "app.tenantmanagement": "Tenant Management", - "app.database": "Database", - "app.databasename": "Database Name", - "app.databasehost": "Database Host", - "app.databaseuser": "Database User", - "app.databasepass": "Database Password", - "app.databaseport": "Database Port", - "app.emailadminpasswordresetsubject": "Your Adapt password has been reset", - "app.emailadminpasswordresetbody": "Your password has been reset. Your new password is: %{data}", - "app.emailforgottenpasswordsubject": "Password reset", - "app.emailforgottenpasswordbody": "You (or someone else) has requested to reset your password. To reset your password follow the link:\n%{rootUrl}/#user/reset/%{data}", + "app.emailadminpasswordchangesubject": "Your Adapt password has been changed", + "app.emailadminpasswordchangebody": "The password for your Adapt authoring tool account has been successfully changed. If you did not request this, please contact an administrator.", + "app.emailforgottenpasswordsubject": "Reset Your Adapt Password", + "app.emailforgottenpasswordbody": "
We've received a request to reset the password for your Adapt authoring tool account.
If you weren't expecting this email, don't worry! You can safely ignore it. Otherwise, please click the button below.
", "app.edittenant": "Edit Tenant", "app.addtenant": "Add Tenant", "app.tenant": "Tenant", - "app.rolemanagement": "Role Management", - "app.roleassignments": "Role Assignments", - "app.norolesassigned": "No roles assigned", - "app.assignroles": "Assign Roles", - "app.selectroles": "Select roles to assign to the user %{username}", - "app.unassignrole": "Unassign Role", - "app.assignrole": "Assign Role", - "app.addrole": "Add Role", - "app.editrole": "Edit Role", + "app.role": "Role", "app.version": "Version", - "app.policystatements": "Policy Statements", - "app.norolestoassign": "No roles to assign", - "app.confirmroleunassign": "Are you sure you want to remove the %{role} role?", - "app.errorunassigningrole": "Could not unassign role!", - "app.errorassigningrole": "Could not assign role!", - "app.productmanagement": "Product Management", - "app.addproduct": "Add Product", - "app.editproduct": "Edit Product", - "app.product": "Product", "app.enabled": "Enabled", - "app.actions": "Actions", - "app.managecourses": "Manage Courses", - "app.availablecourses": "Available Courses", - "app.selectedcourses": "Selected Courses", "app.tenantnotenabled": "Your tenant is currently disabled. Please contact an administrator.", "app.accountnotactive": "Your account is not currently active. Please contact an administrator.", - "app.loginas": "Login As", "app.errorlogginginas": "Error logging in as selected user.", - "app.managesubscriptions": "Manage Subscriptions", - "app.addsubscription": "Add Subscription", - "app.editsubscription": "Edit Subscription", - "app.timestart": "Time Start", - "app.timeend": "Time End", - "app.unlimited": "Unlimited", - "app.deletesubscription": "Delete Subscription", - "app.confirmdeletesubscription": "Are you sure you want to delete this subscription?", "app.errormenueditorbody": "An error occurred during the save", "app.validationfailed": "Validation failed", "app.validationfailedmessage": "You need to fix the following before you can save your data:", "app.successdefaulttitle": "Success", "app.export": "Export source code", "app.exporting": "Exporting source code", - "app.exportcoursetitle": "Exporting course", "app.exporterrortitle": "Course export failed", - "app.exportcoursetext": "Please stand by, this may take a few moments.", "app.exportcoursesuccess": "Course exported successfully!", "app.infodefaulttitle": "Information", "app.errordefaulttitle": "Error", + "app.warningdefaulttitle": "Warning", "app.confirmdefaulttitle": "Are you sure?", "app.confirmdefaultyes": "Yes, I'm sure", "app.confirmwait": "Wait", @@ -301,24 +255,58 @@ "app.errordeleteasset": "Couldn't delete this asset, %{message}", "app.errorsave": "Something went wrong while saving your data.Please try again.", "app.errorgeneric": "Oops, something went wrong!", - "app.errorpreview": "Something went wrong while generating your preview.
Please contact Administrator for assistance.", + "app.errorpreview": "Something went wrong while generating your preview.
Please contact an administrator for assistance.", "app.errornomenuselected": "No menu has been selected.", "app.errornothemeselected": "No theme has been selected.", - "app.erroraddingarticle": "Something went wrong while adding article.
Please try again.", - "app.erroraddingblock": "Something went wrong while adding block.
Please try again.", - "app.erroraddingcomponent": "Something went wrong while adding component.
Please try again.", - "app.errorduplication": "Something went wrong during duplication.
Please try again.", + "app.erroraddingarticle": "Something went wrong while adding article.
Please try again.", + "app.erroraddingblock": "Something went wrong while adding block.
Please try again.", + "app.erroraddingcomponent": "Something went wrong while adding component.
Please try again.", + "app.errorduplication": "Something went wrong during duplication.
Please try again.", "app.errorgettingschemas": "An error occurred while getting schemas.", - "app.errorgeneratingpreview": "Error generating preview, please contact Administrator.", + "app.errorgeneratingpreview": "Error generating preview, please contact an administrator.", "app.errorcopy": "Error during copy.", "app.errorpaste": "Error during paste", "app.errorsaveasset": "An error occurred doing the save", "app.errorusernoaccess": "Sorry, the current user doesn't have access to this course", + "app.errorpagenoaccesstitle": "Access Denied", + "app.errorpagenoaccess": "Sorry, you don't have the correct permissions to view this page. Click the button below to go to the dashboard.", "app.copyidtoclipboardsuccess": "Copied %{id} to clipboard", - "app.copyingidtoclipboarderror": "Error copying %{id} to clipboard", + "app.copyidtoclipboarderror": "Error copying %{id} to clipboard", "app.grid": "Grid", "app.list": "List", "app.ascending": "A to Z", "app.descending": "Z to A", - "app.visitpluginhomepage": "Visit plugin homepage" + "app.visitpluginhomepage": "Visit plugin homepage", + "app.greeting": "Hi", + "app.emaillogotext": "ADAPT", + "app.emailfooter": "Sent by Adapt Learning.", + "app.errorfetchingdata": "An error occured fetching data. Please try refreshing your page.", + "app.backtoassets": "Back to assets", + "app.newasset": "New Asset", + "app.editasset": "Edit Asset", + "app.assetmanagement": "Asset Management", + "app.tagfetcherror": "An error occured getting the tags collection. Please try refreshing your page.", + "app.editornew": "Add course", + "app.editornewcoursetitle": "New course", + "app.editormenu": "Course structure", + "app.backtomenu": "Back to course structure", + "app.editorpage": "Page structure", + "app.editorpageedit": "Page settings", + "app.editorarticle": "Article settings", + "app.editorblock": "Block settings", + "app.editorcomponent": "Component settings", + "app.editorsettings": "Project settings", + "app.editorsettingstitle": "Adjust course attributes", + "app.editorconfig": "Configuration settings", + "app.editorconfigtitle": "Configure your course", + "app.editormenusettings": "Menu picker", + "app.editormenusettingstitle": "Select a menu for your course", + "app.editorextensions": "Manage extensions", + "app.editorextensionstitle": "Manage course extensions", + "app.editing": "Editing %{type}: %{text}", + "app.menu": "menu", + "app.page": "page", + "app.article": "article", + "app.block": "block", + "app.component": "component" } diff --git a/routes/lang/es-application.json b/routes/lang/es-application.json index e9784382cc..818e053c25 100644 --- a/routes/lang/es-application.json +++ b/routes/lang/es-application.json @@ -99,7 +99,6 @@ "app.confirmdeleteblockwarning": "IMPORTANTE: Esto eliminará todos los componentes dentro de este bloque.", "app.confirmdeletecomponent": "¿Está seguro que desea eliminar este componente?", "app.confirmdeletecomponentwarning": "IMPORTANTE: Esto eliminará todos los formatos e informacion dentro de este componente.", - "app.confirmapplyextension": "¿Está seguro que desea aplicar %{extension}?", "app.confirmdeleteextension": "IMPORTANTE: Esto eliminará toda la configuración que haya sido aplicada a las propiedades de esta extensión. ¿Está seguro que desea eliminar esta extensión?", "app.deleteitempage": "Eliminar página", "app.deleteitemmenu": "Eliminar sección", diff --git a/routes/loading/index.js b/routes/loading/index.js new file mode 100644 index 0000000000..79a1de23ee --- /dev/null +++ b/routes/loading/index.js @@ -0,0 +1,22 @@ +var configuration = require('../../lib/configuration'); +var express = require('express'); +var server = module.exports = express(); +var origin = require('../../'); +var app = origin(); + +server.set('views', __dirname); +server.set('view engine', 'hbs'); + +server.get('/loading', function (req, res, next) { + var dateStamp = new Date(); + var isProduction = configuration.getConfig('isProduction'); + var useAnalytics = configuration.getConfig('useAnalytics') || false; + var trackingId = configuration.getConfig('trackingId') || 'UA-XXXXX-Y'; + + res.render('loading', { + productName: app.polyglot.t('app.productname'), + useAnalytics: useAnalytics, + trackingId: trackingId + }); + +}); \ No newline at end of file diff --git a/routes/loading/loading.hbs b/routes/loading/loading.hbs new file mode 100644 index 0000000000..670da7e043 --- /dev/null +++ b/routes/loading/loading.hbs @@ -0,0 +1,38 @@ + + + +
+
+
+
diff --git a/server.js b/server.js
index fc68ffd7e2..b9cb5f5099 100644
--- a/server.js
+++ b/server.js
@@ -1,5 +1,3 @@
// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE
-var builder = require('./lib/application');
-var app = builder();
+var app = require('./lib/application')();
app.run();
-
diff --git a/test/entry.js b/test/entry.js
new file mode 100644
index 0000000000..1611ee2150
--- /dev/null
+++ b/test/entry.js
@@ -0,0 +1,144 @@
+var async = require('async');
+var fs = require('fs-extra');
+var path = require('path');
+var mongodb = require('mongodb');
+
+var origin = require('../');
+var auth = require('../lib/auth');
+var logger = require('../lib/logger');
+var permissions = require('../lib/permissions');
+var usermanager = require('../lib/usermanager');
+var tenantmanager = require('../lib/tenantmanager');
+
+var testData = require('./testData.json');
+var testConfig = require('./testConfig.json');
+
+var app = origin();
+
+var EXTENDED_TIMEOUT = 600000;
+
+before(function(done) {
+ this.timeout(EXTENDED_TIMEOUT);
+
+ process.env.SILENT = true;
+
+ async.series([
+ removeTestData,
+ function initApp(cb) {
+ // only show errors
+ logger.level('console','error');
+ // bootstrapping!
+ app.use({ configFile: path.join('test', 'testConfig.json') });
+ // add some test entities ...
+ app.on('serverStarted', function(server) {
+ createTestTenant(testData.testTenant, function(error, tenant) {
+ if(error) {
+ return cb(error);
+ }
+ testData.testTenant = tenant;
+ testData.testUser._tenantId = tenant._id;
+
+ app.configuration.setConfig('masterTenantID', tenant._id);
+ app.configuration.setConfig('masterTenantName', tenant.name);
+
+ createTestUser(testData.testUser, function(error, user) {
+ if(error) {
+ return cb(error);
+ }
+ testData.testUser._id = user._id;
+ app.rolemanager.assignRoleByName('Super Admin', user._id, cb);
+ });
+ });
+ });
+ app.run();
+ }
+ ], done);
+});
+
+after(function(done) {
+ this.timeout(EXTENDED_TIMEOUT);
+
+ async.parallel([
+ function removePolicies(cb) {
+ permissions.clearPolicies(testData.testUser._id, cb);
+ },
+ function removeUser(cb) {
+ usermanager.deleteUser({ _id: testData.testUser._id }, cb);
+ },
+ function removeTenant(cb) {
+ tenantmanager.deleteTenant({ _id: testData.testTenant._id }, cb);
+ },
+ function removeRoles(cb) {
+ app.rolemanager.retrieveRoles({}, {}, function(error, roles) {
+ async.each(roles, function(role, cb2) {
+ app.rolemanager.destroyRole(role._id, cb2);
+ }, cb);
+ });
+ },
+ removeTestData
+ ], done);
+});
+
+function createTestTenant (tenantDetails, cb) {
+ tenantmanager.createTenant(tenantDetails, function(error, tenant) {
+ if(error && error instanceof tenantmanager.errors.DuplicateTenantError) {
+ return tenantmanager.retrieveTenant({name: tenantDetails.name}, cb);
+ }
+ return cb(error, tenant);
+ });
+}
+
+function createTestUser (userDetails, cb) {
+ auth.hashPassword(userDetails.plainPassword, function(error, hash) {
+ if(error) return done(error);
+ userDetails.password = hash;
+ usermanager.createUser(userDetails, function(error, user) {
+ if(error && error instanceof usermanager.errors.DuplicateUserError) {
+ return usermanager.retrieveUser({email: userDetails.email}, cb);
+ }
+ return cb(error, user);
+ });
+ });
+}
+
+function removeTestData(done) {
+ async.parallel([
+ function dumpOldDb(cb) {
+ var MongoClient = mongodb.MongoClient;
+ var connStr = 'mongodb://' + testConfig.dbHost + ':' + testConfig.dbPort + '/' + testConfig.dbName;
+ MongoClient.connect(connStr, function(error, db) {
+ if(error) return cb(error);
+ db.dropDatabase(function(error, result) {
+ if(error) return cb(error);
+ db.close();
+ return cb();
+ });
+ });
+ },
+ function removeData(cb) {
+ fs.remove(testConfig.dataRoot, cb);
+ }
+ ], done);
+}
+
+// Assumes any .js file in this folder is a test script
+// Skips this file, non-recursive
+function testLoader() {
+ var contents = fs.readdirSync(__dirname);
+
+ for(var i = 0, count = contents.length; i < count; i++) {
+ var item = contents[i];
+ if(path.join(__dirname, item) === __filename) continue;
+
+ var parts = item.split('.');
+ if(parts.pop() !== 'js') continue;
+
+ describe(parts.pop(), function() { require('./' + item) });
+ }
+}
+
+/**
+* Entry point
+*/
+console.log('\n\nRunning mocha test suite');
+testLoader();
diff --git a/test/lib.application.js b/test/lib.application.js
index 9adb7e746d..dddb83b7ab 100644
--- a/test/lib.application.js
+++ b/test/lib.application.js
@@ -1,133 +1,19 @@
-var path = require('path'),
- origin = require('../'),
- logger = require('../lib/logger'),
- auth = require('../lib/auth'),
- permissions = require('../lib/permissions'),
- usermanager = require('../lib/usermanager'),
- tenantmanager = require('../lib/tenantmanager');
-
-var helper = {
- testUser: {
- email: "testuser@adapt.org",
- password: '',
- plainPassword: 'password',
- auth: 'local',
- _isDeleted: false
- },
- testTenant: {
- name: "adapt-tenant-unit-test",
- displayName: 'Test Tenant',
- isMaster: true
- }
-};
-
-before(function (done) {
- // this initialization appears to take a little longer
- this.timeout(600000);
-
- // suppress all logging!
- logger.clear();
-
- // bootstrapping!
- var app = origin();
- app.use({ configFile: path.join('test', 'testConfig.json')});
-
- function createTestTenant (tenantDetails, cb) {
- tenantmanager.createTenant(tenantDetails, function (error, tenant) {
- if (error) {
- // cleanup may have failed from a previous test
- if (error instanceof tenantmanager.errors.DuplicateTenantError) {
- return tenantmanager.retrieveTenant({name: tenantDetails.name}, cb);
- }
-
- return cb(error);
- }
-
- return cb(null, tenant);
- });
- }
-
- function createTestUser (userDetails, cb) {
- auth.hashPassword(userDetails.plainPassword, function (error, hash) {
- if (error) {
- return cb(error);
- }
-
- userDetails.password = hash;
- usermanager.createUser(userDetails, function (error, user) {
- if (error) {
- // cleanup failed
- if (error instanceof usermanager.errors.DuplicateUserError) {
- return usermanager.retrieveUser({email: userDetails.email}, cb);
- }
-
- return cb(error);
- }
-
- return cb(null, user);
- });
- });
- }
-
- // add some test entities ...
- app.on('serverStarted', function (server) {
- createTestTenant(helper.testTenant, function (error, tenant) {
- if (error) {
- return done(error);
- } else {
- // update helper obj
- helper.testTenant = tenant;
- // assign user to test tenant
- helper.testUser._tenantId = tenant._id;
- // set master tenant ID
- app.configuration.setConfig('masterTenantID', tenant._id);
- app.configuration.setConfig('masterTenantName', tenant.name);
-
- createTestUser(helper.testUser, function (error, user) {
- if (error) {
- return done(error);
- }
-
- helper.testUser._id = user._id;
- // this user is super ...
- app.rolemanager.assignRoleByName('Super Admin', user._id, done);
- });
- }
- });
-
- });
-
- // start server
- app.run();
+var request = require('supertest');
+var should = require('should');
+
+var origin = require('../');
+
+it('should be listening to HTTP requests on the specified host/port', function(done) {
+ var agent = request.agent(origin().getServerURL())
+ .get('/')
+ .set('Accept', 'text/html')
+ .expect(200)
+ .expect('Content-Type', /html/)
+ .end(done);
});
-after(function (done) {
- // remove test entities
- permissions.clearPolicies(helper.testUser._id, function (error) {
- if (error) {
- return done(error);
- }
-
- usermanager.deleteUser({ _id: helper.testUser._id }, function (error) {
- if (error) {
- return done(error);
- }
-
- tenantmanager.deleteTenant({ _id: helper.testTenant._id}, function (error) {
- if (error) {
- return done(error);
- }
-
- done();
- });
- });
- });
-});
-
-describe('application', function(){
- it ('should inherit from event emmiter', function(done) {
- var app = origin();
- app.on('foo', done);
- app.emit('foo');
- });
+it('should inherit from event emitter', function(done) {
+ var app = origin();
+ app.on('foo', done);
+ app.emit('foo');
});
diff --git a/test/lib.assetmanager.js b/test/lib.assetmanager.js
index 7a7580e16b..cbee043857 100644
--- a/test/lib.assetmanager.js
+++ b/test/lib.assetmanager.js
@@ -1,88 +1,155 @@
-var origin = require('../'),
- assetmanager = require('../lib/assetmanager'),
- request = require('supertest'),
- should = require('should');
-
-describe ('assetmanager', function () {
- var app = origin();
- var agent = {};
- var assetId = false;
-
- before (function (done){
- agent = request.agent(app.getServerURL());
-
- // need to authenticate
- agent
- .post('/api/login')
- .set('Accept', 'application/json')
- .send({
- email: 'testuser@adapt.org', // created in test/lib.application.js
- password: 'password'
- })
- .expect(200)
- .expect('Content-Type', /json/)
- .end(done);
- });
-
- it ('should allow storing of a multimedia resource', function (done) {
- agent
- .post('/api/asset')
- .field('title', 'Temporary Asset')
- .field('description', 'A temporary asset')
- .field('repository', 'localfs')
- .field('path', 'myasset.js')
- .attach('file', __filename)
- .expect(200)
- .expect('Content-Type', /json/)
- .end(function (error, res) {
- should.not.exist(error);
- should.exist(res.body);
- should.exist(res.body._id);
- assetId = res.body._id;
- done();
- });
- });
-
- it ('should allow retrieval of a multimedia resource', function (done) {
- agent
- .get('/api/asset/' + assetId)
- .expect(200)
- .expect('Content-Type', /json/)
- .end(function (error, res) {
- should.not.exist(error);
- should.exist(res.body);
- res.body.title.should.equal('Temporary Asset');
- done();
- });
- });
-
- it ('should allow updating of a multimedia resource', function (done) {
- agent
- .put('/api/asset/' + assetId)
- .field('title', 'Updated Temporary Asset')
- .attach('file', __filename)
- .expect(200)
- .expect('Content-Type', /json/)
- .end(function (error, res) {
- should.not.exist(error);
- should.exist(res.body);
- should.exist(res.body.success);
- res.body.success.should.be.true;
- done();
- });
- });
-
- it ('should allow deleting of a multimedia resource', function (done) {
- agent
- .del('/api/asset/' + assetId)
- .expect(200)
- .expect('Content-Type', /json/)
- .end(function (error, res) {
- should.not.exist(error);
- should.exist(res.body);
- should.exist(res.body.success);
- res.body.success.should.be.true;
- done();
- });
- });
+var async = require('async');
+var fs = require('fs');
+var request = require('supertest');
+var should = require('should');
+
+var origin = require('../');
+var assetmanager = require('../lib/assetmanager');
+
+var testUser = require('./testData.json').testUser;
+var testData = require('./testData.json').assetmanager;
+
+var app = origin();
+
+var agent = {};
+var assetIds = [];
+
+before(function(done) {
+ agent = request.agent(app.getServerURL());
+ // need to authenticate
+ agent
+ .post('/api/login')
+ .set('Accept', 'application/json')
+ .send({
+ email: testUser.email,
+ password: testUser.plainPassword
+ })
+ .expect(200)
+ .expect('Content-Type', /json/)
+ .end(done);
+});
+
+it('should allow requests to create an new asset', function(done) {
+ postAsset(done);
+});
+
+it('should allow requests to retrieve an asset', function(done) {
+ agent
+ .get('/api/asset/' + assetIds[0])
+ .expect(200)
+ .expect('Content-Type', /json/)
+ .end(function(error, res) {
+ should.not.exist(error);
+ should.exist(res.body);
+ res.body.title.should.equal('Temporary Asset');
+ testData.asset = res.body;
+ done();
+ });
+});
+
+it('should allow requests to query assets', function(done) {
+ // test by file extension to be a bit more generic
+ var fileExtension = testData.asset.filename.split('.').pop();
+ agent
+ .get('/api/asset/query')
+ .send({ search: { filename: `\.${fileExtension}$` } })
+ .expect(200)
+ .expect('Content-Type', /json/)
+ .end(function(error, res) {
+ should.not.exist(error);
+ should.exist(res.body);
+ res.body.length.should.equal(1, 'Expected 1 result, got ' + res.body.length);
+ done();
+ });
+});
+
+it('should allow requests to serve an asset', function(done) {
+ agent
+ .get('/api/asset/serve/' + assetIds[0])
+ .expect(200)
+ .expect('Content-Type', /javascript/, done);
+});
+
+it('should allow requests to serve an asset thumbnail', function(done) {
+ agent
+ .get('/api/asset/thumb/' + assetIds[0])
+ .expect(200)
+ .expect('Content-Type', /image/, done);
+});
+
+
+it('should allow requests to update an asset', function(done) {
+ agent
+ .put('/api/asset/' + assetIds[0])
+ .field('title', 'Updated Temporary Asset')
+ .attach('file', __filename)
+ .expect(200)
+ .expect('Content-Type', /json/)
+ .end(function(error, res) {
+ should.not.exist(error);
+ should.exist(res.body);
+ should.exist(res.body.success);
+ res.body.success.should.be.true;
+ done();
+ });
});
+
+it('should allow requests to soft-delete an asset', function(done) {
+ agent
+ .put('/api/asset/trash/' + assetIds[0])
+ .expect(200)
+ .expect('Content-Type', /json/)
+ .end(function(error, res) {
+ should.not.exist(error);
+ should.exist(res.body);
+ should.exist(res.body.success);
+ res.body.success.should.be.true;
+ done();
+ });
+});
+
+it('should allow requests to restore a soft-deleted asset', function(done) {
+ agent
+ .put('/api/asset/restore/' + assetIds[0])
+ .expect(200)
+ .expect('Content-Type', /json/)
+ .end(function(error, res) {
+ should.not.exist(error);
+ should.exist(res.body);
+ should.exist(res.body.success);
+ res.body.success.should.be.true;
+ done();
+ });
+});
+
+function postAsset(cb) {
+ agent
+ .post('/api/asset')
+ .field('title', testData.asset.title)
+ .field('description', testData.asset.description)
+ .field('repository', testData.asset.repo)
+ .attach('file', __filename)
+ .expect(200)
+ .expect('Content-Type', /json/)
+ .end(function(error, res) {
+ should.not.exist(error);
+ should.exist(res.body);
+ should.exist(res.body._id);
+ assetIds.push(res.body._id);
+ cb();
+ });
+}
+
+function deleteAsset(assetId, cb) {
+ agent
+ .del('/api/asset/' + assetId)
+ .expect(200)
+ .expect('Content-Type', /json/)
+ .end(function(error, res) {
+ should.not.exist(error);
+ should.exist(res.body);
+ should.exist(res.body.success);
+ res.body.success.should.be.true;
+ cb();
+ });
+}
diff --git a/test/lib.auth.js b/test/lib.auth.js
index ca6be90c96..824ad05806 100644
--- a/test/lib.auth.js
+++ b/test/lib.auth.js
@@ -1,206 +1,190 @@
-var should = require('should'),
- origin = require('../'),
- request = require('supertest'),
- usermanager = require('../lib/usermanager'),
- auth = require('../lib/auth');
-
-describe('auth', function() {
- var app = origin();
- var helper = {
- passwordPlain: 'this is my password',
- passwordCipher: '',
- email: 'auth@foo.bar',
- userId: '',
- userAgent: {},
- token: "testtokentesttokentesttokentest1",
- newPassword: 'newpassword'
- };
-
- before (function (done) {
- // retaining a reference to the agent allows us to
- // take advantage of cookies
- helper.userAgent = request.agent(app.getServerURL());
+var should = require('should');
+var request = require('supertest');
+
+var origin = require('../');
+var auth = require('../lib/auth');
+var usermanager = require('../lib/usermanager');
+
+var testData = require('./testData.json');
+var app = origin();
+
+var helper = {
+ passwordCipher: '',
+ userId: '',
+ userAgent: {},
+};
+
+before (function(done) {
+ // store the agent to use cookies
+ helper.userAgent = request.agent(app.getServerURL());
+ done();
+});
+
+after (function(done) {
+ if (!helper.userId) return done();
+ usermanager.deleteUser({ email: testData.auth.email }, function(error) {
+ if (error) return done(error);
+ usermanager.retrieveUserPasswordReset({ token: testData.auth.token }, function(error, record) {
+ if (error) return done(error);
+ usermanager.deleteUserPasswordReset({user:record.id}, done);
+ });
+ });
+});
+
+it('should be able to hash a password', function(done) {
+ auth.hashPassword(testData.auth.passwordPlain, function(error, hash) {
+ should.not.exist(error);
+ helper.passwordCipher = hash;
done();
});
+});
- after (function (done) {
- // cleanup
- if (helper.userId) {
- usermanager.deleteUser({ _id: helper.userId }, function (err) {
- usermanager.retrieveUserPasswordReset({ token: helper.token }, function (error, record) {
- if (error) {
- return done(error)
- }
-
- usermanager.deleteUserPasswordReset({user:record.id}, function(error) {
- if (error) {
- return done(error);
- }
-
- return done();
- });
- });
- });
- } else {
- done();
- }
+it('should validate a correct password', function(done) {
+ auth.validatePassword(testData.auth.passwordPlain, helper.passwordCipher, function(error, valid) {
+ should.not.exist(error);
+ valid.should.be.true;
+ done();
+ });
+});
+
+it('should not validate an incorrect password', function(done) {
+ auth.validatePassword('this is not my password', helper.passwordCipher, function(error, valid) {
+ should.not.exist(error);
+ valid.should.not.be.true;
+ done();
});
+});
+
+it('should accept requests to register a user with the default auth strategy', function(done) {
+ helper.userAgent
+ .post('/api/register')
+ .set('Accept', 'application/json')
+ .send({
+ 'email': testData.auth.email,
+ 'password': testData.auth.passwordPlain
+ })
+ .expect(200)
+ .expect('Content-Type', /json/)
+ .end(function(error, res) {
+ should.exist(res.body);
+ should.exist(res.body.email);
+ should.exist(res.body._id);
+ res.body.email.should.equal(testData.auth.email);
+ helper.userId = res.body._id;
+ // we need to set the tenant
+ app.usermanager.updateUser({ _id: helper.userId }, { _tenantId: app.configuration.getConfig('masterTenantID') }, done);
+ });
+});
- it ('should hash a password', function (done) {
- auth.hashPassword(helper.passwordPlain, function (error, hash) {
+it('should accept authenticated requests to create a user session', function(done) {
+ helper.userAgent
+ .post('/api/login')
+ .set('Accept', 'application/json')
+ .send({
+ 'email': testData.auth.email,
+ 'password': testData.auth.passwordPlain
+ })
+ .expect(200)
+ .expect('Content-Type', /json/)
+ .end(function(error, res) {
should.not.exist(error);
- helper.passwordCipher = hash;
done();
});
- });
+});
- it ('should validate a correct password', function (done) {
- auth.validatePassword(helper.passwordPlain, helper.passwordCipher, function (error, valid) {
+it('should reject a user with an incorrect login', function(done) {
+ helper.userAgent
+ .post('/api/login')
+ .set('Accept', 'application/json')
+ .send({
+ 'email': 'nobody@nowhere.com',
+ 'password': '12345'
+ })
+ .expect(401)
+ .expect('Content-Type', /json/)
+ .end(function(error, res) {
should.not.exist(error);
- valid.should.be.true;
done();
});
- });
+});
- it ('should not validate an incorrect password', function (done) {
- auth.validatePassword('this is not my password', helper.passwordCipher, function (error, valid) {
+// TODO not sure what this functionality's for
+it('should accept authenticated requests to log in as another user', function(done) {
+ helper.userAgent
+ .post('/api/loginas')
+ .set('Accept', 'application/json')
+ .send({
+ "email": testData.testUser.email,
+ "password": testData.testUser.plainPassword
+ })
+ .expect(200)
+ .expect('Content-Type', /json/)
+ .end(function(error, res) {
should.not.exist(error);
- valid.should.not.be.true;
+ res.body.success.should.be.true;
+ helper.userId = res.body.id;
done();
});
- });
-
- it ('should allow me to register a user with default auth strategy', function (done) {
- helper.userAgent
- .post('/api/register')
- .set('Accept', 'application/json')
- .send({
- 'email': helper.email,
- 'password': helper.passwordPlain
- })
- .expect(200)
- .expect('Content-Type', /json/)
- .end(function (error, res) {
- should.exist(res.body);
- should.exist(res.body.email);
- should.exist(res.body._id);
- res.body.email.should.equal(helper.email);
- helper.userId = res.body._id;
-
- // having registered a user, we need to set the tenant
- app.usermanager.updateUser({ _id: helper.userId }, { _tenantId: app.configuration.getConfig('masterTenantID') }, done);
- });
- });
-
- it ('should create a user session with a correct login', function (done) {
- helper.userAgent
- .post('/api/login')
- .set('Accept', 'application/json')
- .send({
- 'email': helper.email,
- 'password': helper.passwordPlain
- })
- .expect(200)
- .expect('Content-Type', /json/)
- .end(function (error, res) {
- should.not.exist(error);
- done();
- });
- });
+});
- it ('should verify that an authenticated user is authenticated', function (done) {
- helper.userAgent
- .get('/api/authcheck')
- .send()
- .expect(200)
- .end(function (error, res) {
- should.not.exist(error);
- done();
- });
- });
+it('should accept requests to verify if a user is authenticated', function(done) {
+ helper.userAgent
+ .get('/api/authcheck')
+ .send()
+ .expect(200)
+ .end(function(error, res) {
+ should.not.exist(error);
+ res.body.id.should.equal(helper.userId);
+ done();
+ });
+});
- it ('should reject a user with an incorrect login', function (done) {
- helper.userAgent
- .post('/api/login')
- .set('Accept', 'application/json')
- .send({
- 'email': 'nobody@nowhere.com',
- 'password': '12345'
- })
- .expect(401)
- .expect('Content-Type', /json/)
- .end(function (error, res) {
- should.not.exist(error);
- done();
- });
+it('should be able to generate a random token', function(done) {
+ auth.createToken(function(error, token) {
+ should.not.exist(error);
+ token.should.have.lengthOf(24);
+ done();
});
+});
- it ('should generate a token', function (done) {
- auth.createToken(function (error, token) {
+it('should accept requests to create a password reset token', function(done) {
+ helper.userAgent
+ .post('/api/createtoken')
+ .set('Accept', 'application/json')
+ .send({ 'email': testData.auth.email })
+ .expect(200)
+ .end(function(error, res) {
should.not.exist(error);
- token.should.have.lengthOf(24);
+ res.body.success.should.be.true;
done();
});
- });
+});
- it ('should accept requests to create a token', function (done) {
- helper.userAgent
- .post('/api/createtoken')
- .set('Accept', 'application/json')
- .send({
- 'email': helper.email
- })
- .expect(200)
- .end(function (error, res) {
- should.not.exist(error);
- done();
- });
- });
+it('should accept requests to reset a user\'s password', function(done) {
+ helper.userAgent
+ .post('/api/userpasswordreset/' + testData.auth.token)
+ .set('Accept', 'application/json')
+ .send({
+ 'user': helper.userId,
+ 'password': testData.testUser.newpassword,
+ 'token': testData.auth.token
+ })
+ .expect(200)
+ .end(function(error, res) {
+ should.not.exist(error);
+ res.body.success.should.be.true;
+ done();
+ });
+});
- // @TODO something a bit funky about this test, needs revisiting
- //
- // it ('should reset a users password', function (done) {
- // // Manually pass in a reset request
- // var userReset = {
- // email: helper.email,
- // token: helper.token,
- // tokenCreated: new Date(),
- // ipAddress: '127.0.0.1'
- // };
- //
- // usermanager.createUserPasswordReset(userReset, function (error) {
- // if (error) {
- // return done(error);
- // }
- //
- // // Reset the users password
- // helper.userAgent
- // .post('/api/resetpassword')
- // .set('Accept', 'application/json')
- // .send({
- // 'user': helper.userId,
- // 'password': helper.newPassword,
- // 'token': userReset.token
- // })
- // .expect(200)
- // .end(function (error, res) {
- // should.not.exist(error);
- //
- // // Should allow user to login with the new password
- // helper.userAgent
- // .post('/api/login')
- // .set('Accept', 'application/json')
- // .send({
- // 'email': helper.email,
- // 'password': helper.newPassword
- // })
- // .expect(200)
- // .expect('Content-Type', /json/)
- // .end(function (error, res) {
- // should.not.exist(error);
- // done();
- // });
- // });
- // });
- // });
+it('should accept requests to end a user session', function(done) {
+ helper.userAgent
+ .post('/api/logout')
+ .expect(200)
+ .expect('Content-Type', /json/)
+ .end(function(error, res) {
+ should.not.exist(error);
+ res.body.success.should.be.true;
+ done();
+ });
});
diff --git a/test/lib.contentmanager.js b/test/lib.contentmanager.js
index 9a8e155ba3..ae33a42d12 100644
--- a/test/lib.contentmanager.js
+++ b/test/lib.contentmanager.js
@@ -1,80 +1,66 @@
-var origin = require('../'),
- database = require('../lib/database'),
- auth = require('../lib/auth'),
- usermanager = require('../lib/usermanager'),
- request = require('supertest'),
- should = require('should'),
- async = require('async');
+var async = require('async');
+var request = require('supertest');
+var should = require('should');
-describe('contentmanager', function() {
- var app = origin();
- var agent = {};
- var userId = false;
- var contentObj = {};
- var otherContentObj = {};
- var content = app.contentmanager;
+var origin = require('../');
+var auth = require('../lib/auth');
+var database = require('../lib/database');
- before (function (done) {
- agent = request.agent(app.getServerURL());
+var testData = require('./testData.json');
+var app = origin();
- // need to authenticate
- agent
- .post('/api/login')
- .set('Accept', 'application/json')
- .send({
- email: 'testuser@adapt.org', // created in test/lib.application.js
- password: 'password'
- })
- .expect(200)
- .expect('Content-Type', /json/)
- .end(function (error, res) {
- if (error) {
- return done(error);
- }
-
- userId = res.body.id;
- done();
- });
- });
+var agent = {};
+var userId = false;
+var contentObj = {};
+var otherContentObj = {};
+var content = app.contentmanager;
- after (function (done) {
- // cleanup
- if (contentObj._id) {
- database.getDatabase(function(err, db){
- if(err){
- return done(err);
- }
-
- db.destroy('course', { _id: contentObj._id }, function (error) {
- db.destroy('course', { _id: otherContentObj._id }, done);
- });
- }, configuration.getConfig('dbName'));
- }
- });
-
- it ('should allow me to create some content', function (done) {
- agent
- .post('/api/content/course')
- .set('Accept', 'application/json')
- .send({
- title: 'some name',
- body: 'lorem ispum',
- })
- .expect(200)
- .expect('Content-Type', /json/)
- .end(function (error, res) {
- if (error) {
- return done(error);
- }
+before(function(done) {
+ agent = request.agent(app.getServerURL());
+ // need to authenticate
+ agent
+ .post('/api/login')
+ .set('Accept', 'application/json')
+ .send({
+ email: testData.testUser.email,
+ password: testData.testUser.newpassword
+ })
+ .expect(200)
+ .expect('Content-Type', /json/)
+ .end(function(error, res) {
+ if(error) return done(error);
+ userId = res.body.id;
+ done();
+ });
+});
- contentObj = res.body;
- should.exist(contentObj._id);
- return done();
+after(function(done) {
+ if(contentObj._id) {
+ database.getDatabase(function(error, db) {
+ if(error) return done(error);
+ db.destroy('course', { _id: contentObj._id }, function(error) {
+ db.destroy('course', { _id: otherContentObj._id }, done);
});
- });
+ }, app.configuration.getConfig('dbName'));
+ }
+});
- it ('should allow me to create some more content', function (done) {
- agent
+it('should accept requests to create content', function(done) {
+ agent
+ .post('/api/content/course')
+ .set('Accept', 'application/json')
+ .send({
+ title: 'some name',
+ body: 'lorem ispum',
+ })
+ .expect(200)
+ .expect('Content-Type', /json/)
+ .end(function(error, res) {
+ should.not.exist(error);
+ contentObj = res.body;
+ should.exist(contentObj._id);
+ // create some more content
+ agent
.post('/api/content/course')
.set('Accept', 'application/json')
.send({
@@ -83,232 +69,208 @@ describe('contentmanager', function() {
})
.expect(200)
.expect('Content-Type', /json/)
- .end(function (error, res) {
- if (error) {
- return done(error);
- }
-
+ .end(function(error, res) {
+ should.not.exist(error);
otherContentObj = res.body;
should.exist(otherContentObj._id);
return done();
});
- });
-
- it ('should be unsuccessful when attempting to create some unknown content type', function (done) {
- agent
- .post('/api/content/iwillneverbeacontenttype')
- .set('Accept', 'application/json')
- .send({
- title: 'some name'
- })
- .expect(400)
- .expect('Content-Type', /json/)
- .end(function (error, res) {
- if (error) {
- return done(error);
- }
-
- res.body.success.should.be.false;
- return done();
- });
- });
-
- it ('should allow me to retrieve a content item by id', function (done) {
- agent
- .get('/api/content/course/' + contentObj._id)
- .set('Accept', 'application/json')
- .send()
- .expect(200)
- .expect('Content-Type', /json/)
- .end(function (error, res) {
- if (error) {
- return done(error);
- }
-
- should.exist(res.body._id);
- res.body._id.should.equal(contentObj._id);
- return done();
- });
- });
-
- it ('should allow me to retrieve an array of content items', function (done) {
- agent
- .get('/api/content/course')
- .set('Accept', 'application/json')
- .send()
- .expect(200)
- .expect('Content-Type', /json/)
- .end(function (error, res) {
- if (error) {
- return done(error);
- }
-
- res.body.length.should.be.above(0);
- return done();
- });
- });
-
- it ('should allow me to retrieve an array of content items by searching with a regex query', function (done) {
- agent
- .get('/api/content/course/query')
- .set('Accept', 'application/json')
- .send({
- search: { body: { $regex: '^lorem' } }
- })
- .expect(200)
- .expect('Content-Type', /json/)
- .end(function (error, res) {
- if (error) {
- return done(error);
- }
-
- res.body.length.should.equal(1);
- return done();
- });
- });
-
- it ('should allow me to retrieve an array of content items with a field less-than-or-equal to another value', function (done) {
- agent
- .get('/api/content/course/query')
- .set('Accept', 'application/json')
- .send({
- search: { createdAt: { $lte: new Date() } }
- })
- .expect(200)
- .expect('Content-Type', /json/)
- .end(function (error, res) {
- if (error) {
- return done(error);
- }
+ });
+});
- res.body.length.should.be.above(0);
- return done();
- });
- });
+it('should reject requests to create unknown content types', function(done) {
+ agent
+ .post('/api/content/iwillneverbeacontenttype')
+ .set('Accept', 'application/json')
+ .send({ title: 'some name' })
+ .expect(400)
+ .expect('Content-Type', /json/)
+ .end(function(error, res) {
+ should.not.exist(error);
+ res.body.success.should.be.false;
+ return done();
+ });
+});
- it ('should allow me to populate a subdocument and select only desired attributes', function (done) {
- agent
- .get('/api/content/course/query')
- .set('Accept', 'application/json')
- .send({
- populate: { createdBy: [ 'email', '_id' ] }
- })
- .expect(200)
- .expect('Content-Type', /json/)
- .end(function (error, res) {
- if (error) {
- return done(error);
- }
+it('should accept requests to retrieve content by id', function(done) {
+ agent
+ .get('/api/content/course/' + contentObj._id)
+ .set('Accept', 'application/json')
+ .send()
+ .expect(200)
+ .expect('Content-Type', /json/)
+ .end(function(error, res) {
+ should.not.exist(error);
+ should.exist(res.body._id);
+ res.body._id.should.equal(contentObj._id);
+ return done();
+ });
+});
- res.body.length.should.be.above(0);
- res.body[0].createdBy._id.should.equal(userId);
- return done();
- });
- });
+it('should accept requests to retrieve multiple content items', function(done) {
+ agent
+ .get('/api/content/course')
+ .set('Accept', 'application/json')
+ .send()
+ .expect(200)
+ .expect('Content-Type', /json/)
+ .end(function(error, res) {
+ should.not.exist(error);
+ res.body.length.should.be.above(0);
+ return done();
+ });
+});
- it ('should allow me to sort a retrieved collection on a field in descending order', function (done) {
- agent
- .get('/api/content/course/query')
- .set('Accept', 'application/json')
- .send({
- operators: { sort: { 'createdAt': -1 } }
- })
- .expect(200)
- .expect('Content-Type', /json/)
- .end(function (error, res) {
- if (error) {
- return done(error);
- }
+it('should accept requests to retrieve multiple content items filtered by a regex query', function(done) {
+ agent
+ .get('/api/content/course/query')
+ .set('Accept', 'application/json')
+ .send({ search: { body: { $regex: '^lorem' } } })
+ .expect(200)
+ .expect('Content-Type', /json/)
+ .end(function(error, res) {
+ should.not.exist(error);
+ res.body.length.should.be.above(0);
+ return done();
+ });
+});
- res.body.length.should.equal(2);
- res.body[0].createdAt.should.be.above(res.body[1].createdAt);
- return done();
- });
- });
+it('should accept requests to retrieve multiple content items with a field less-than-or-equal to a value', function(done) {
+ agent
+ .get('/api/content/course/query')
+ .set('Accept', 'application/json')
+ .send({ search: { createdAt: { $lte: new Date() } } })
+ .expect(200)
+ .expect('Content-Type', /json/)
+ .end(function(error, res) {
+ should.not.exist(error);
+ res.body.length.should.be.above(0);
+ return done();
+ });
+});
- it ('should allow me to limit the number of items retrieved from a collection', function (done) {
- agent
- .get('/api/content/course/query')
- .set('Accept', 'application/json')
- .send({
- operators: { limit: 1 }
- })
- .expect(200)
- .expect('Content-Type', /json/)
- .end(function (error, res) {
- if (error) {
- return done(error);
- }
+it('should accept requests to retrieve content with a custom-populated subdocument', function(done) {
+ agent
+ .get('/api/content/course/query')
+ .set('Accept', 'application/json')
+ .send({ populate: { 'createdBy': ['_id', 'email'] } })
+ .expect(200)
+ .expect('Content-Type', /json/)
+ .end(function(error, res) {
+ should.not.exist(error);
+ res.body.length.should.be.above(0);
+ if(res.body[0].createdBy === null) {
+ throw new Error('Sub-document not populated');
+ }
+ res.body[0].createdBy._id.should.equal(userId, 'Invalid _id specified');
+ return done();
+ });
+});
- res.body.length.should.equal(1);
- return done();
- });
- });
+it('should accept requests to retrieve only desired content attributes', function(done) {
+ agent
+ .get('/api/content/course/query')
+ .set('Accept', 'application/json')
+ .send({ fields: { _id: 0, title: 1 } })
+ .expect(200)
+ .expect('Content-Type', /json/)
+ .end(function(error, res) {
+ should.not.exist(error);
+ res.body.length.should.be.above(0);
+ var bodyKeys = Object.keys(res.body[0]);
+ bodyKeys.length.should.equal(1);
+ bodyKeys.should.containEql('title');
+ done();
+ });
+});
- it ('should allow me to update a content item', function (done) {
- agent
- .put('/api/content/course/' + contentObj._id)
- .set('Accept', 'application/json')
- .send({
- title: "some different name"
- })
- .expect(200)
- .expect('Content-Type', /json/)
- .end(function (error, res) {
- if (error) {
- return done(error);
- }
+it('should accept requests to retrieve a sorted list of content items', function(done) {
+ agent
+ .get('/api/content/course/query')
+ .set('Accept', 'application/json')
+ .send({ operators: { sort: { 'createdAt': -1 } } })
+ .expect(200)
+ .expect('Content-Type', /json/)
+ .end(function(error, res) {
+ should.not.exist(error);
+ for(var i = 1, count = res.body.length; i < count; i++) {
+ res.body[i].createdAt.should.be.below(res.body[i-1].createdAt);
+ }
+ done();
+ });
+});
- res.body.success.should.be.true;
- return done();
- });
- });
+it('should accept requests to retrieve a limited number of content items', function(done) {
+ agent
+ .get('/api/content/course/query')
+ .set('Accept', 'application/json')
+ .send({ operators: { limit: 1 } })
+ .expect(200)
+ .expect('Content-Type', /json/)
+ .end(function(error, res) {
+ should.not.exist(error);
+ res.body.length.should.equal(1);
+ return done();
+ });
+});
- it ('should allow cascading deletes for content that supports it (course/contentobject/article)', function (done) {
- var pageContent = false; // will retain our contentobject _id for assertion
- async.series([
- function (next) {
- agent
- .post('/api/content/contentobject')
- .set('Accept', 'application/json')
- .send({
- _parentId: contentObj._id,
- _courseId: contentObj._id,
- title: "A Page",
- body: "A Page Body"
- })
- .expect(200)
- .expect('Content-Type', /json/)
- .end(function (error, res) {
- // retain id
- should.exist(res.body._id);
- pageContent = res.body;
- return next(null);
- });
- },
- function (next) {
- // delete the course
- agent
- .del('/api/content/course/' + contentObj._id)
- .set('Accept', 'application/json')
- .send()
- .expect(200)
- .end(function (res) {
- return next(null);
- });
- },
- function (next) {
- // check that the pageContent was also deleted
- agent
- .get('/api/content/contentobject/' + pageContent._id)
- .send()
- .expect(404)
- .end(function (res) {
- return next(null);
- });
- }
- ],
- done);
- });
+it('should accept requests to update a content item', function(done) {
+ agent
+ .put('/api/content/course/' + contentObj._id)
+ .set('Accept', 'application/json')
+ .send({ title: "some different name" })
+ .expect(200)
+ .expect('Content-Type', /json/)
+ .end(function(error, res) {
+ should.not.exist(error);
+ res.body.success.should.be.true;
+ return done();
+ });
+});
+// only applies to course/contentobject/article
+it('should accept cascading delete requests for supported content', function(done) {
+ var pageContent = false; // will retain our contentobject _id for assertion
+ async.series([
+ function(next) {
+ agent
+ .post('/api/content/contentobject')
+ .set('Accept', 'application/json')
+ .send({
+ _parentId: contentObj._id,
+ _courseId: contentObj._id,
+ title: "A Page",
+ body: "A Page Body"
+ })
+ .expect(200)
+ .expect('Content-Type', /json/)
+ .end(function(error, res) {
+ should.not.exist(error);
+ should.exist(res.body._id);
+ pageContent = res.body;
+ return next(null);
+ });
+ },
+ // delete the course
+ function(next) {
+ agent
+ .del('/api/content/course/' + contentObj._id)
+ .set('Accept', 'application/json')
+ .send()
+ .expect(200)
+ .end(function(res) {
+ return next(null);
+ });
+ },
+ // check that the pageContent was also deleted
+ function(next) {
+ agent
+ .get('/api/content/contentobject/' + pageContent._id)
+ .send()
+ .expect(404)
+ .end(function(res) {
+ return next(null);
+ });
+ }
+ ], done);
});
diff --git a/test/lib.database.js b/test/lib.database.js
index 6768c0e82f..4dcb76215b 100644
--- a/test/lib.database.js
+++ b/test/lib.database.js
@@ -1,55 +1,37 @@
-var mongoose = require('mongoose'),
- should = require('should'),
- origin = require('../');
+var mongoose = require('mongoose');
+var should = require('should');
-describe('database', function() {
+var testData = require('./testData.json').database;
+var origin = require('../');
- before(function(){
- var app = origin();
- var db = app.db;
- db.addModel('foo', { properties: { email: { type: 'string' } } });
- });
+var app = origin();
- it ('should allow me to insert a new object', function(done) {
- var app = origin();
- var db = app.db;
- db.create('foo', { email: "foo@bar.com" }, done);
- });
+before(function() {
+ app.db.addModel(testData.model, { properties: { email: { type: 'string' } } });
+});
- it ('should allow me to retrieve that object', function(done) {
- var app = origin();
- var db = app.db;
- db.retrieve('foo', { email: "foo@bar.com" }, done);
- });
+it('should be able to insert new objects', function(done) {
+ app.db.create(testData.model, { email: testData.email }, done);
+});
- it ('should allow me to update an object', function(done) {
- var app = origin();
- var db = app.db;
- db.retrieve('foo', { email: "foo@bar.com" }, function (error, results) {
- if (error) {
- done(error);
- } else if (results && results.length) {
- var obj = results[0];
- db.update('foo', { _id: obj._id }, { email: "bar@foo.com" }, done);
- } else {
- done(new Error('Expected result was not retrieved'));
- }
- });
- });
+it('should be able to retrieve stored objects', function(done) {
+ app.db.retrieve(testData.model, { email: testData.email }, done);
+});
- it ('should allow me to delete an object', function(done) {
- var app = origin();
- var db = app.db;
- db.retrieve('foo', { email: "bar@foo.com" }, function (error, results) {
- if (error) {
- done(error);
- } else if (results && results.length) {
- var obj = results[0];
- db.destroy('foo', { _id: obj._id }, done);
- } else {
- done(new Error('Expected result was not retrieved'));
- }
- });
+it('should be able to update stored objects', function(done) {
+ app.db.retrieve(testData.model, { email: testData.email }, function(error, results) {
+ should.not.exist(error);
+ results.length.should.be.above(0, 'Expected result was not retrieved');
+ var obj = results[0];
+ app.db.update(testData.model, { _id: obj._id }, { email: testData.altEmail }, done);
});
+});
+it('should be able to delete stored objects', function(done) {
+ app.db.retrieve(testData.model, { email: testData.altEmail }, function(error, results) {
+ should.not.exist(error);
+ results.length.should.be.above(0, 'Expected result was not retrieved');
+ var obj = results[0];
+ app.db.destroy(testData.model, { _id: obj._id }, done);
+ });
});
diff --git a/test/lib.filestorage.js b/test/lib.filestorage.js
index dda60585ee..150fa6ad24 100644
--- a/test/lib.filestorage.js
+++ b/test/lib.filestorage.js
@@ -1,104 +1,90 @@
-var origin = require('../'),
- path = require('path'),
- filestorage = require('../lib/filestorage');
+var fs = require('fs');
+var path = require('path');
+var should = require('should');
-describe('filestorage', function() {
- var filePath = '';
- var newFilePath = '';
+var filestorage = require('../lib/filestorage');
+var configuration = require('../lib/configuration');
- before(function(){
- // @TODO create a file instance
- var app = origin();
- filePath = path.join(app.configuration.serverRoot, 'tmp', 'tmpFile');
- newFilePath = path.join(app.configuration.serverRoot, 'tmp', 'tmpFileNew');
+var testData = require('./testData.json').filestorage;
+
+var localfs;
+
+before(function(done) {
+ filestorage.getStorage('localfs', function(error, storage) {
+ if(error) return done(error);
+ localfs = storage;
+ done();
});
+});
- it ('should allow me to read a file from disk', function(done) {
- done(); return; // @TODO - remove when filesystem plugin is added
- var fs = filestorage.getStorage('filesystem');
- fs.getFileContents(filePath, function(error, result) {
- if (error) {
- done(error);
- } else {
- // @TODO check file contents are as expected
- done();
- }
+it('should be able to write a file to disk', function(done) {
+ localfs.putFileContents(testData.filename, {}, testData.fileContents, function(error) {
+ should.not.exist(error);
+ fs.readFile(localfs.resolvePath(testData.filename), function(error, fsContents) {
+ should.not.exist(error);
+ fsContents.toString().should.equal(testData.fileContents, 'Unexpected file contents');
+ done();
});
});
+});
- it ('should allow me to write a file to disk', function(done) {
- done(); return; // @TODO - remove when filesystem plugin is added
- var fs = filestorage.getStorage('filesystem');
- fs.putFileContents(filePath, 'w', 'foobar', function(error, result) {
- if (error) {
- done(error);
- } else {
- // @TODO check file contents are as expected
- done();
- }
- });
+it('should be able to read a file from disk', function(done) {
+ localfs.getFileContents(testData.filename, function(error, contents) {
+ should.not.exist(error);
+ contents.toString().should.equal(testData.fileContents, 'Unexpected file contents');
+ done();
});
+});
- it ('should allow me to move a file', function(done) {
- done(); return; // @TODO - remove when filesystem plugin is added
- var fs = filestorage.getStorage('filesystem');
- fs.moveFile(filePath, newFilePath, function(error) {
- if (error) {
- done(error);
- } else {
- done();
- }
+it('should be able to generate stats for file or directory', function(done) {
+ localfs.getFileStats(testData.filename, function(error, stats) {
+ should.not.exist(error);
+ fs.stat(localfs.resolvePath(testData.filename), function(error, fsStats) {
+ should.not.exist(error);
+ stats.should.eql(fsStats);
+ done();
});
});
+});
- it ('should allow me to create a directory', function(done) {
- done(); return; // @TODO - remove when filesystem plugin is added
- var fs = filestorage.getStorage('filesystem');
- fs.createDirectory(filePath, function(error) {
- if (error) {
- done(error);
- } else {
- done();
- }
+it('should be able to create a new directory', function(done) {
+ localfs.createDirectory(testData.dirname, function(error) {
+ should.not.exist(error);
+ fs.stat(localfs.resolvePath(testData.dirname), function(error, stats) {
+ should.not.exist(error);
+ done();
});
});
+});
- it ('should allow me to recursively remove a directory', function(done) {
- done(); return; // @TODO - remove when filesystem plugin is added
- var fs = filestorage.getStorage('filesystem');
- fs.removeDirectory(filePath, function(error) {
- if (error) {
- done(error);
- } else {
- done();
- }
+it('should be able to move a file', function(done) {
+ localfs.moveFile(testData.filename, path.join(testData.dirname, testData.filename), function(error) {
+ should.not.exist(error);
+ fs.readFile(localfs.resolvePath(path.join(testData.dirname, testData.filename)), function(error, fsContents) {
+ should.not.exist(error);
+ fsContents.toString().should.equal(testData.fileContents, 'Unexpected file contents');
+ done();
});
});
+});
- it ('should allow me to list the contents of a directory', function(done) {
- done(); return; // @TODO - remove when filesystem plugin is added
- var fs = filestorage.getStorage('filesystem');
- fs.getDirectoryListing(filePath, function(error, results) {
- if (error) {
- done(error);
- } else {
- // @TODO check directory contents are as expected
- done();
- }
+it('should be able to list the contents of a directory', function(done) {
+ localfs.getDirectoryListing(testData.dirname, function(error, contents) {
+ should.not.exist(error);
+ fs.readdir(localfs.resolvePath(testData.dirname), function(error, fsContents) {
+ should.not.exist(error);
+ contents.should.eql(fsContents);
+ done();
});
});
+});
- it ('should allow me to stat a file or directory', function(done) {
- done(); return; // @TODO - remove when filesystem plugin is added
- var fs = filestorage.getStorage('filesystem');
- fs.getFileStats(filePath, function(error, result) {
- if (error) {
- done(error);
- } else {
- // @TODO check file contents are as expected
- done();
- }
+it('should be able to remove a directory recursively', function(done) {
+ localfs.removeDirectory(testData.dirname, function(error) {
+ should.not.exist(error);
+ fs.stat(localfs.resolvePath(testData.dirname), function(error, fsStats) {
+ should.exist(error);
+ done();
});
});
-
});
diff --git a/test/lib.logger.js b/test/lib.logger.js
index fee1d635a7..78015f495f 100644
--- a/test/lib.logger.js
+++ b/test/lib.logger.js
@@ -1,33 +1,26 @@
-var logger = require('../lib/logger');
+var should = require('should');
-describe('logger', function() {
- before(function() {
- var winston = require('winston');
- logger.add(winston.transports.Memory);
- });
+var logger = require('../lib/logger');
- it ('should allow me to log messages of valid type', function(done) {
- logger.once('logging', function (transport, level, msg, meta){
- if ('error' === level && -1 !== msg.indexOf('test') && 'bar' === meta.foo) {
- done();
- } else {
- throw new Error('Log failed to raise event correctly');
- }
- });
+before(function() {
+ var winston = require('winston');
+ logger.add(winston.transports.Memory);
+});
- logger.log('error', 'test', { foo: 'bar' });
+it('should be able to log messages of valid type', function(done) {
+ logger.once('logging', function (transport, level, msg, meta) {
+ var isValid = 'error' === level && -1 !== msg.indexOf('test') && 'bar' === meta.foo;
+ isValid.should.equal(true, 'Log failed to raise event correctly');
+ done();
});
+ logger.log('error', 'test', { foo: 'bar' });
+});
- it ('should gracefully handle log messages of invalid type', function(done) {
- logger.once('logging', function (transport, level, msg, meta){
- if ('info' === level && -1 !== msg.indexOf('test') && 'bar' === meta.foo) {
- done();
- } else {
- throw new Error('Log failed to raise event correctly');
- }
- });
-
- logger.log('skippitydoodaa', 'test', { foo: 'bar' });
+it('should gracefully handle log messages of invalid type', function(done) {
+ logger.once('logging', function (transport, level, msg, meta) {
+ var isValid = 'info' === level && -1 !== msg.indexOf('test') && 'bar' === meta.foo;
+ isValid.should.equal(true, 'Log failed to raise event correctly');
+ done();
});
-
+ logger.log('skippitydoodaa', 'test', { foo: 'bar' });
});
diff --git a/test/lib.permissions.js b/test/lib.permissions.js
index 5f277e3bf2..9283a5dbb3 100644
--- a/test/lib.permissions.js
+++ b/test/lib.permissions.js
@@ -1,98 +1,73 @@
-var origin = require('../'),
- should = require('should'),
- usermanager = require('../lib/usermanager'),
- permissions = require('../lib/permissions'),
- rolemanager = require('../lib/rolemanager'),
- configuration = require('../lib/configuration');
+var should = require('should');
-describe('permissions', function () {
- var user = {
- email: 'testpermissions@adapt.org'
- };
+var configuration = require('../lib/configuration');
+var permissions = require('../lib/permissions');
+var rolemanager = require('../lib/rolemanager');
+var usermanager = require('../lib/usermanager');
- before(function (done) {
- // set user tenant from config
- user._tenantId = configuration.getConfig('masterTenantID');
+var testData = require('./testData.json').permissions;
- // add a policy with delete access on all foos
- usermanager.createUser(user, function (error, userRec) {
- should.not.exist(error);
- user = userRec;
+var user = {
+ email: testData.email
+};
- permissions.createPolicy(user._id, function (error, policy) {
- should.not.exist(error);
- // add a new policy statement
- permissions.addStatement(policy, 'delete', permissions.buildResourceString(user._tenantId, '/foos/*'), 'allow', function (error) {
- if (error) {
- return done(error);
- }
-
- return rolemanager.assignRoleByName('Authenticated User', user._id, done);
- });
+before(function(done) {
+ user._tenantId = configuration.getConfig('masterTenantID');
+ usermanager.createUser(user, function(error, userRec) {
+ if(error) return done(error);
+ user = userRec;
+ permissions.createPolicy(user._id, function(error, policy) {
+ if(error) return done(error);
+ permissions.addStatement(policy, 'delete', permissions.buildResourceString(user._tenantId, '/foos/*'), 'allow', function(error) {
+ if(error) return done(error);
+ return rolemanager.assignRoleByName('Authenticated User', user._id, done);
});
});
});
+});
- // cleanup - make sure we remove any policies we created
- after(function (done) {
- permissions.clearPolicies(user._id, function (error) {
- if (error) {
- return done(error);
- }
-
- usermanager.deleteUser({ _id: user._id }, done);
- });
+after(function(done) {
+ permissions.clearPolicies(user._id, function(error) {
+ if(error) return done(error);
+ usermanager.deleteUser({ _id: user._id }, done);
});
+});
- it ('should should allow me to specify a permission for a user', function (done) {
- // permission
- permissions.createPolicy(user._id, function (error, policy) {
- should.not.exist(error);
- // add a new policy statement
- permissions.addStatement(policy, 'create', permissions.buildResourceString(user._tenantId, '/courses'), 'allow', function (error) {
- if (error) {
- return done(error);
- }
-
- return done();
- });
- });
+it('should be able to create permissions for a user', function(done) {
+ permissions.createPolicy(user._id, function(error, policy) {
+ should.not.exist(error);
+ permissions.addStatement(policy, 'create', permissions.buildResourceString(user._tenantId, '/courses'), 'allow', done);
});
+});
- it ('should verify user permissions using an exact resource identifier', function (done) {
- // should have permission
- permissions.hasPermission(user._id, 'create', permissions.buildResourceString(user._tenantId, '/courses'), function (error, allowed) {
- should.not.exist(error);
- allowed.should.be.true;
- done();
- });
+it('should verify user permissions using an exact resource identifier', function(done) {
+ permissions.hasPermission(user._id, 'create', permissions.buildResourceString(user._tenantId, '/courses'), function(error, allowed) {
+ should.not.exist(error);
+ allowed.should.be.true;
+ done();
});
+});
- it ('should verify user permissions using a glob-type resource identifier', function (done) {
- // should have permission
- permissions.hasPermission(user._id, 'delete', permissions.buildResourceString(user._tenantId, '/foos/bars'), function (error, allowed) {
- should.not.exist(error);
- allowed.should.be.true;
- done();
- });
+it('should verify user permissions using a glob-type resource identifier', function(done) {
+ permissions.hasPermission(user._id, 'delete', permissions.buildResourceString(user._tenantId, '/foos/bars'), function(error, allowed) {
+ should.not.exist(error);
+ allowed.should.be.true;
+ done();
});
+});
- it ('should deny permission when the action is not matched', function (done) {
- // should have permission
- permissions.hasPermission(user._id, 'delete', permissions.buildResourceString(user._tenantId, '/courses'), function (error, allowed) {
- should.not.exist(error);
- allowed.should.be.false;
- done();
- });
+it('should deny permission when the action is not matched', function(done) {
+ permissions.hasPermission(user._id, 'delete', permissions.buildResourceString(user._tenantId, '/courses'), function(error, allowed) {
+ should.not.exist(error);
+ allowed.should.be.false;
+ done();
});
+});
- it ('should deny permission when no specific policy exists', function (done) {
- // should have permission
- permissions.hasPermission(user._id, 'create', permissions.buildResourceString(user._tenantId, '/foos'), function (error, allowed) {
- should.not.exist(error);
- allowed.should.be.false;
- done();
- });
+it('should deny permission when no specific policy exists', function(done) {
+ permissions.hasPermission(user._id, 'create', permissions.buildResourceString(user._tenantId, '/foos'), function(error, allowed) {
+ should.not.exist(error);
+ allowed.should.be.false;
+ done();
});
-
});
diff --git a/test/lib.pluginmanager.js b/test/lib.pluginmanager.js
index 6dc1a81b84..d8f386f4f5 100644
--- a/test/lib.pluginmanager.js
+++ b/test/lib.pluginmanager.js
@@ -1,163 +1,126 @@
-var origin = require('../'),
- fs = require('fs'),
- path = require('path'),
- configuration = require('../lib/configuration'),
- database = require('../lib/database'),
- should = require('should'),
- pluginmanager = require('../lib/pluginmanager');
+var fs = require('fs');
+var path = require('path');
+var should = require('should');
-/**
- * It is conceivable that someone might write an output/fooPlugin plugin, but
- * I'd say we can address that if it happens ...
- */
+var configuration = require('../lib/configuration');
+var database = require('../lib/database');
+var pluginmanager = require('../lib/pluginmanager');
-describe('pluginmanager', function(){
- var helper = {
- pluginManager: {},
- fooPlugin: {
- "displayName": "Foo Plugin",
- "version": "1.0.0",
- "requires": "0.0.1"
- },
- init: function () {
- this.pluginManager = pluginmanager.getManager();
- },
- addPlugin: function () {
- // adds a temporary plugin on disk
- var pluginDir = path.join(configuration.serverRoot, this.pluginManager.pluginDir, 'output');
- if (!fs.existsSync(pluginDir)) {
- fs.mkdirSync(pluginDir);
- }
+var testData = require('./testData.json').pluginmanager;
+var pm;
- pluginDir = path.join(pluginDir, 'fooPlugin');
- if (!fs.existsSync(pluginDir)) {
- fs.mkdirSync(pluginDir);
- var filePath = path.join(pluginDir, 'package.json');
- var fd = fs.openSync(filePath, 'w');
- fs.writeSync(fd, JSON.stringify(this.fooPlugin));
- fs.closeSync(fd);
- }
- },
- removePlugin: function () {
- // remove the temporary plugin
- var pluginDir = path.join(configuration.serverRoot, this.pluginManager.pluginDir, 'output', 'fooPlugin');
- if (fs.existsSync(pluginDir)) {
- var filePath = path.join(pluginDir, 'package.json');
- fs.unlinkSync(filePath);
- fs.rmdirSync(pluginDir);
- }
- }
- };
+before(function() {
+ pm = pluginmanager.getManager();
+});
- before(function(){
- helper.init();
- });
+after(function() {
+ removePlugin();
+});
- after(function(){
- helper.removePlugin();
- });
+it('should inherit from event emitter', function(done) {
+ pm.on('foo', done);
+ pm.emit('foo');
+});
- it ('should inherit from event emmiter', function(done){
- helper.pluginManager.on('foo', done);
- helper.pluginManager.emit('foo');
+it('should detect when a new plugin needs to be installed', function(done) {
+ addPlugin();
+ pm.isUpgradeRequired(function(required) {
+ required.should.be.true;
+ done();
});
+});
- it ('should detect when a new plugin needs to be installed', function (done) {
- helper.addPlugin();
- helper.pluginManager.isUpgradeRequired(function (required) {
- required.should.be.true;
- done();
- });
+it('should verify if a plugin is of a particular type and validate it', function () {
+ // @TODO need to do fine grained validation, for now, just verify the type is correct
+ addPlugin();
+ pm.getPlugin(testData.type, testData.name, function(error, pluginInfo) {
+ should.not.exist(error);
+ var pluginTypes = pm.getPluginTypes();
+ pluginTypes.should.containEql(pluginInfo.type);
});
+});
- it ('should verify if a plugin is of a particular type and validate it', function (){
- // @TODO need to do fine grained validation, for now, just verify the type is correct
- helper.addPlugin();
- helper.pluginManager.getPlugin('output', 'fooPlugin', function (error, pluginInfo) {
+it('should be able to install new plugins', function(done) {
+ addPlugin();
+ pm.getPlugin(testData.type, testData.name, function(error, pluginInfo) {
+ should.not.exist(error);
+ pm.installPlugin(pluginInfo, function(error) {
should.not.exist(error);
- var pluginTypes = helper.pluginManager.getPluginTypes();
- pluginTypes.should.include(pluginInfo.type);
+ // confirm that the plugin was installed
+ pm.isInstalled(pluginInfo, function(installed) {
+ installed.should.equal(true, 'Failed to verify that plugin was installed!');
+ done();
+ });
});
});
+});
- it ('should allow installation of a new plugin', function (done){
- helper.addPlugin();
- helper.pluginManager.getPlugin('output', 'fooPlugin', function (error, pluginInfo) {
- should.not.exist(error);
- helper.pluginManager.installPlugin(pluginInfo, function (error) {
- if (error) {
- done(error);
- } else {
- // confirm that the plugin was installed
- helper.pluginManager.isInstalled(pluginInfo, function (installed) {
- if (installed) {
- done();
- } else {
- done(new Error('Failed to verify that plugin was installed!'));
- }
- });
- }
- });
+it('should provide a list of all installed plugins', function(done) {
+ var plugin = { name: testData.name, type: testData.type };
+ pm.getInstalledPlugins(function(error, pluginList) {
+ should.not.exist(error);
+ if (!pluginList[plugin.type] || !pluginList[plugin.type][plugin.name]) {
+ throw new Error('failed to find expected plugin in installed plugins: ' + plugin.name);
+ }
+ done();
+ });
+});
+
+it('should detect when an installed plugin has been removed from disk', function(done) {
+ pm.getPlugin(testData.type, testData.name, function(error, pluginInfo) {
+ should.not.exist(error);
+ removePlugin();
+ pm.testPluginState(pluginInfo, pluginmanager.states.MISSING_FROM_DISK, function(state) {
+ state.should.equal(pluginmanager.states.MISSING_FROM_DISK);
+ done();
});
});
+});
- it ('should provide a list of all installed plugins', function (done) {
- // these plugins should be installed
- var shouldBeInstalled = [
- { name: "fooPlugin", type: "output" }
- ];
- helper.pluginManager.getInstalledPlugins(function (error, pluginList) {
- should.not.exist(error);
- if (error) {
+it('should be able to uninstall plugins', function(done) {
+ // first, make sure it's installed
+ addPlugin();
+ pm.getPlugin(testData.type, testData.name, function(error, pluginInfo) {
+ should.not.exist(error);
+ pm.uninstallPlugin(pluginInfo, function(error) {
+ if(error) {
done(error);
} else {
- for (var i = 0; i < shouldBeInstalled.length; ++i) {
- var plugin = shouldBeInstalled[i];
- if (!pluginList[plugin.type] || !pluginList[plugin.type][plugin.name]) {
- done(new Error('failed to find expected plugin in installed plugins: ' + plugin.name));
- return;
+ // confirm that the plugin was uninstalled
+ pm.isInstalled(pluginInfo, function(installed) {
+ if(installed) {
+ done(new Error('Failed to verify that plugin was uninstalled!'));
+ } else {
+ done();
}
- }
- done();
+ });
}
});
});
+});
- //it ('should allow a plugin to be disabled', function (){
- //});
-
- it ('should detect when an installed plugin has been removed from disk', function (done) {
- helper.pluginManager.getPlugin('output', 'fooPlugin', function (error, pluginInfo) {
- should.not.exist(error);
- helper.removePlugin();
- helper.pluginManager.testPluginState(pluginInfo, pluginmanager.states.MISSING_FROM_DISK, function (state) {
- // should be missing
- state.should.equal(pluginmanager.states.MISSING_FROM_DISK);
- done();
- });
- });
- });
-
- it ('should allow a plugin to be uninstalled', function (done) {
- // first, make sure it's installed
- helper.addPlugin();
- helper.pluginManager.getPlugin('output', 'fooPlugin', function (error, pluginInfo) {
- should.not.exist(error);
- helper.pluginManager.uninstallPlugin(pluginInfo, function (error) {
- if (error) {
- done(error);
- } else {
- // confirm that the plugin was uninstalled
- helper.pluginManager.isInstalled(pluginInfo, function (installed) {
- if (installed) {
- done(new Error('Failed to verify that plugin was uninstalled!'));
- } else {
- done();
- }
- });
- }
- });
- });
- });
+function addPlugin() {
+ // adds a temporary plugin on disk
+ var pluginDir = path.join(configuration.serverRoot, pm.pluginDir, testData.type);
+ if (!fs.existsSync(pluginDir)) {
+ fs.mkdirSync(pluginDir);
+ }
+ pluginDir = path.join(pluginDir, testData.name);
+ if (!fs.existsSync(pluginDir)) {
+ fs.mkdirSync(pluginDir);
+ var filePath = path.join(pluginDir, 'package.json');
+ var fd = fs.openSync(filePath, 'w');
+ fs.writeSync(fd, JSON.stringify(testData.data));
+ fs.closeSync(fd);
+ }
+}
-});
+function removePlugin() {
+ // remove the temporary plugin
+ var pluginDir = path.join(configuration.serverRoot, pm.pluginDir, testData.type, testData.name);
+ if(fs.existsSync(pluginDir)) {
+ var filePath = path.join(pluginDir, 'package.json');
+ fs.unlinkSync(filePath);
+ fs.rmdirSync(pluginDir);
+ }
+}
diff --git a/test/lib.rest.js b/test/lib.rest.js
index de798c425e..f717da14e7 100644
--- a/test/lib.rest.js
+++ b/test/lib.rest.js
@@ -1,94 +1,88 @@
-var rest = require('../lib/rest'),
- logger = require('../lib/logger'),
- permissions = require('../lib/permissions'),
- origin = require('../'),
- should = require('should'),
- request = require('supertest');
+var request = require('supertest');
+var should = require('should');
-describe('rest', function() {
- var app = origin();
- var agent = {};
+var origin = require('../');
+var logger = require('../lib/logger');
+var permissions = require('../lib/permissions');
+var rest = require('../lib/rest');
- before (function (done) {
- // we don't care about authentication here, so ignore routes
- permissions.ignoreRoute(/^\/api\/.*/);
- agent = request.agent(app.getServerURL());
- done();
- });
+var agent = {};
- it ('should allow the addition of a put handler', function (done) {
- // add a dummy put service
- rest.put('/foo/:bar', function (req, res, next) {
- res.statusCode = 200;
- return res.json({ bar: parseInt(req.params.bar,10) });
- });
+before(function(done) {
+ permissions.ignoreRoute(/^\/api\/.*/);
+ agent = request.agent(origin().getServerURL());
+ done();
+});
- // fire request
- agent.put('/api/foo/1')
- .set('Accept', 'application/json')
- .expect(200)
- .expect('Content-Type', /json/)
- .end(function (error, res) {
- should.not.exist(error);
- res.body.bar.should.equal(1);
- done();
- });
+it('should be able to add POST handlers', function(done) {
+ // add a dummy post service
+ rest.post('/foo/:bar', function(req, res, next) {
+ res.statusCode = 200;
+ return res.json({ bar: parseInt(req.params.bar,10) });
});
-
- it ('should allow the addition of a get handler', function (done) {
- // add a dummy get service
- rest.get('/foo/:bar', function (req, res, next) {
- res.statusCode = 200;
- return res.json({ bar: parseInt(req.params.bar,10) });
+ // fire request
+ agent.post('/api/foo/1')
+ .set('Accept', 'application/json')
+ .expect(200)
+ .expect('Content-Type', /json/)
+ .end(function(error, res) {
+ should.not.exist(error);
+ res.body.bar.should.equal(1);
+ done();
});
+});
- // fire request
- agent.get('/api/foo/1')
- .set('Accept', 'application/json')
- .expect(200)
- .expect('Content-Type', /json/)
- .end(function (error, res) {
- should.not.exist(error);
- res.body.bar.should.equal(1);
- done();
- });
+it('should be able to add GET handlers', function(done) {
+ // add a dummy get service
+ rest.get('/foo/:bar', function(req, res, next) {
+ res.statusCode = 200;
+ return res.json({ bar: parseInt(req.params.bar,10) });
});
-
- it ('should allow the addition of a post handler', function (done) {
- // add a dummy post service
- rest.post('/foo/:bar', function (req, res, next) {
- res.statusCode = 200;
- return res.json({ bar: parseInt(req.params.bar,10) });
+ // fire request
+ agent.get('/api/foo/1')
+ .set('Accept', 'application/json')
+ .expect(200)
+ .expect('Content-Type', /json/)
+ .end(function(error, res) {
+ should.not.exist(error);
+ res.body.bar.should.equal(1);
+ done();
});
+});
- // fire request
- agent.post('/api/foo/1')
- .set('Accept', 'application/json')
- .expect(200)
- .expect('Content-Type', /json/)
- .end(function (error, res) {
- should.not.exist(error);
- res.body.bar.should.equal(1);
- done();
- });
+it('should be able to add PUT handlers', function(done) {
+ // add a dummy put service
+ rest.put('/foo/:bar', function(req, res, next) {
+ res.statusCode = 200;
+ return res.json({ bar: parseInt(req.params.bar,10) });
});
- it ('should allow the addition of a delete handler', function (done) {
- // add a dummy delete service
- rest.delete('/foo/:bar', function (req, res, next) {
- res.statusCode = 200;
- return res.json({ bar: parseInt(req.params.bar,10) });
+ // fire request
+ agent.put('/api/foo/1')
+ .set('Accept', 'application/json')
+ .expect(200)
+ .expect('Content-Type', /json/)
+ .end(function(error, res) {
+ should.not.exist(error);
+ res.body.bar.should.equal(1);
+ done();
});
+});
- // fire request
- agent.del('/api/foo/1')
- .set('Accept', 'application/json')
- .expect(200)
- .expect('Content-Type', /json/)
- .end(function (error, res) {
- should.not.exist(error);
- res.body.bar.should.equal(1);
- done();
- });
+it('should be able to add DELETE handlers', function(done) {
+ // add a dummy delete service
+ rest.delete('/foo/:bar', function(req, res, next) {
+ res.statusCode = 200;
+ return res.json({ bar: parseInt(req.params.bar,10) });
});
+ // fire request
+ agent.del('/api/foo/1')
+ .set('Accept', 'application/json')
+ .expect(200)
+ .expect('Content-Type', /json/)
+ .end(function(error, res) {
+ should.not.exist(error);
+ res.body.bar.should.equal(1);
+ done();
+ });
});
diff --git a/test/lib.tenant.js b/test/lib.tenant.js
deleted file mode 100644
index e8e508581d..0000000000
--- a/test/lib.tenant.js
+++ /dev/null
@@ -1,94 +0,0 @@
-var path = require('path'),
- configuration = require('../lib/configuration'),
- tenantmanager = require('../lib/tenantmanager.js'),
- origin = require('../');
-
-describe('tenant', function(){
- var tenantRec = {
- name: "unit-test-tenant",
- displayName: 'UnitTestTenant',
- createdAt: new Date(),
- updatedAt: new Date(),
- isMaster: true,
- active: true
- };
-
- // ensure the tenant record is deleted
- after (function (done) {
- this.timeout(10000);
- tenantmanager.retrieveTenant({ _id: tenantRec._id }, function (error, tenant) {
- if (error) {
- done(error)
- } else if (tenant) {
- tenantmanager.deleteTenant(tenantRec, function(error) {
- if (error) {
- done(error);
- }
-
- return done();
- });
- }
-
- // happily, the tenant doesn't exist
- return done(null);
- });
- });
-
- it ('should allow the creation of a new tenant', function(done) {
- this.timeout(600000);
- tenantmanager.createTenant(tenantRec, function (error, tenant) {
- if (error) {
- return done(error);
- }
-
- tenantRec = tenant;
- return done(null);
- });
- });
-
- it ('should allow the retrieval of a single tenant', function(done) {
- tenantmanager.retrieveTenant({ name: tenantRec.name }, function (error, tenant) {
- if (error) {
- done(error);
- } else if (tenant) {
- done();
- } else {
- done(new Error('Failed to retrieve tenant record'));
- }
- });
- });
-
- it ('should allow updating of a tenant', function(done) {
- tenantmanager.updateTenant({ name: tenantRec.name }, { active: false } , function (error, tenant) {
- if (error) {
- done(error);
- } else {
- // verify that the update occurred
- tenantmanager.retrieveTenant({ name: tenantRec.name }, function (error, tenant) {
- if (!tenant.active) { // it worked
- done();
- } else {
- done(new Error('Failed to update tenant'));
- }
- });
- }
- });
- });
-
- it ('should allow the deleting of tenants', function(done) {
- tenantmanager.deleteTenant( { name: tenantRec.name }, function (error) {
- if (error) {
- done(error);
- } else {
- // verify the tenant was deleted
- tenantmanager.retrieveTenant({ name: tenantRec.name }, function (error, tenant) {
- if (!tenant) { // it worked
- done();
- } else {
- done(new Error('Failed to delete tenant'));
- }
- });
- }
- });
- });
-});
diff --git a/test/lib.tenantmanager.js b/test/lib.tenantmanager.js
new file mode 100644
index 0000000000..db474ac00e
--- /dev/null
+++ b/test/lib.tenantmanager.js
@@ -0,0 +1,67 @@
+var should = require('should');
+
+var origin = require('../');
+var configuration = require('../lib/configuration');
+var path = require('path');
+var tenantmanager = require('../lib/tenantmanager.js');
+
+var testData = require('./testData.json').tenantmanager;
+
+var tenantRec = {
+ name: testData.name,
+ displayName: testData.displayName,
+ createdAt: new Date(),
+ updatedAt: new Date(),
+ isMaster: testData.isMaster,
+ active: testData.active
+};
+
+after(function(done) {
+ this.timeout(10000);
+ tenantmanager.retrieveTenant({ _id: tenantRec._id }, function(error, tenant) {
+ if(error) return done(error);
+ if(!tenant) return done();
+ tenantmanager.deleteTenant(tenantRec, done);
+ });
+});
+
+it('should be able to create new tenants', function(done) {
+ this.timeout(600000);
+ tenantmanager.createTenant(tenantRec, function(error, tenant) {
+ should.not.exist(error);
+ should.exist(tenant);
+ tenantRec = tenant;
+ done();
+ });
+});
+
+it('should be able to retrieve a single tenant', function(done) {
+ tenantmanager.retrieveTenant({ name: tenantRec.name }, function(error, tenant) {
+ should.not.exist(error);
+ should.exist(tenant, 'Failed to retrieve tenant record');
+ done();
+ });
+});
+
+it('should be able to update tenants', function(done) {
+ tenantmanager.updateTenant({ name: tenantRec.name }, { displayName: testData.newDisplayName } , function(error, tenant) {
+ should.not.exist(error);
+ // verify that the update occurred
+ tenantmanager.retrieveTenant({ name: tenantRec.name }, function(error, tenant) {
+ tenant.displayName.should.equal(testData.newDisplayName, 'Failed to update tenant');
+ done();
+ });
+ });
+});
+
+it('should be able to delete tenants', function(done) {
+ tenantmanager.deleteTenant( { name: tenantRec.name }, function(error) {
+ should.not.exist(error);
+ // verify the tenant was deleted
+ tenantmanager.retrieveTenant({ name: tenantRec.name }, function(error, tenant) {
+ should.not.exist(error);
+ tenant.should.equal(false, 'Failed to delete tenant');
+ done();
+ });
+ });
+});
diff --git a/test/lib.user.js b/test/lib.user.js
deleted file mode 100644
index 08fd4bc43a..0000000000
--- a/test/lib.user.js
+++ /dev/null
@@ -1,151 +0,0 @@
-var path = require('path'),
- usermanager = require('../lib/usermanager.js'),
- origin = require('../');
-
-describe('usermanager', function(){
- var user = {
- email: "foo@bar.com",
- auth: 'local',
- _isDeleted: false
- };
-
- var userReset = {
- email: user.email,
- token: "testtokentesttokentesttokentest1",
- tokenCreated: new Date(),
- ipAddress: '127.0.0.1',
- issueDate: new Date()
- };
-
- // ensure the user record is deleted
- after (function (done) {
- usermanager.retrieveUser({ email: user.email }, function (error, record) {
- if (error) {
- return done(error);
- }
-
- usermanager.deleteUser(user, function(error) {
- if (error) {
- return done(error);
- }
- usermanager.retrieveUserPasswordReset({ token: userReset.token }, function (error, record) {
- if (error) {
- return done(error);
- }
-
- usermanager.deleteUserPasswordReset({user:record.id}, function(error) {
- if (error) {
- return done(error);
- }
-
- return done();
- });
- });
- });
- });
- });
-
- it ('should allow the creation of a new user', function(done) {
- usermanager.createUser(user, done);
- });
-
- it ('should allow the retrieval of a single user', function(done) {
- usermanager.retrieveUser({ email: user.email }, function (error, record) {
- if (error) {
- done(error);
- } else if (record) {
- done();
- } else {
- done(new Error('Failed to retrieve user record'));
- }
- });
- });
-
- it ('should allow updating of a user', function(done) {
- usermanager.updateUser({ email: user.email }, { _isDeleted: true } , function (error, result) {
- if (error) {
- done(error);
- } else {
- // verify that the update occurred
- usermanager.retrieveUser({ email: user.email }, function (error, record) {
- if (record._isDeleted) { // it worked
- done();
- } else {
- done(new Error('Failed to update user'));
- }
- });
- }
- });
- });
-
- it ('should allow the creation of a user password reset', function(done) {
- usermanager.createUserPasswordReset(userReset, function (error) {
- if (error) {
- done(error);
- } else {
- // verify the user password reset was created
- usermanager.retrieveUserPasswordReset({ token: userReset.token }, function (error, record) {
- if (record) {
- done();
- } else {
- done(new Error('Failed to create user password reset'));
- }
- });
- }
- });
- });
-
- it ('should allow the retrieval of a single user password reset', function(done) {
- usermanager.retrieveUserPasswordReset({ token: userReset.token }, function (error, record) {
- if (error) {
- done(error);
- } else if (record) {
- done();
- } else {
- done(new Error('Failed to retrieve user password reset record'));
- }
- });
- });
-
- it ('should allow the deletion of a user password reset', function(done) {
- usermanager.retrieveUser({ email: user.email }, function (error, record) {
- if (error) {
- done(error);
- } else if (record) {
- // Remove reset request
- usermanager.deleteUserPasswordReset({user:record.id}, function (error, user) {
- if (error) {
- return done(error);
- }
- // Ensure reset request was deleted
- usermanager.retrieveUserPasswordReset({ token: userReset.token }, function (error, resetRecord) {
- if (!resetRecord) {
- done();
- } else {
- done(new Error('Failed to delete user password reset'));
- }
- });
- });
- } else {
- done(new Error('Failed to retrieve user record'));
- }
- });
- });
-
- it ('should allow the deleting of users', function(done) {
- usermanager.deleteUser( { email: user.email }, function (error) {
- if (error) {
- done(error);
- } else {
- // verify the user was deleted
- usermanager.retrieveUser({ email: user.email }, function (error, record) {
- if (!record) { // it worked
- done();
- } else {
- done(new Error('Failed to delete user'));
- }
- });
- }
- });
- });
-});
diff --git a/test/lib.usermanager.js b/test/lib.usermanager.js
new file mode 100644
index 0000000000..393f4ae31f
--- /dev/null
+++ b/test/lib.usermanager.js
@@ -0,0 +1,96 @@
+var path = require('path');
+var should = require('should');
+
+var usermanager = require('../lib/usermanager.js');
+
+var testData = require('./testData.json').usermanager;
+
+var userReset = {
+ email: testData.user.email,
+ token: testData.token,
+ tokenCreated: new Date(),
+ ipAddress: testData.ipAddress,
+ issueDate: new Date()
+};
+
+// ensure the user record is deleted
+after(function(done) {
+ usermanager.retrieveUser({ email: testData.user.email }, function(error, record) {
+ if(error) return done(error);
+ usermanager.deleteUser(record, function(error) {
+ if(error) return done(error);
+ usermanager.retrieveUserPasswordReset({ token: userReset.token }, function(error, record) {
+ if(error) return done(error);
+ usermanager.deleteUserPasswordReset({ user: record.id }, done);
+ });
+ });
+ });
+});
+
+it('should be able to create new users', function(done) {
+ usermanager.createUser(testData.user, function(error, user) {
+ should.not.exist(error);
+ should.exist(user);
+ user.email.should.equal(testData.user.email);
+ userReset.user = user._id;
+ done();
+ });
+});
+
+it('should be able to retrieve a single user', function(done) {
+ usermanager.retrieveUser({ email: testData.user.email }, function(error, record) {
+ should.not.exist(error);
+ should.exist(record, 'Failed to retrieve user record');
+ done();
+ });
+});
+
+it('should be able to update existing users', function(done) {
+ usermanager.updateUser({ email: testData.user.email }, { _isDeleted: true } , function(error, result) {
+ should.not.exist(error);
+ usermanager.retrieveUser({ email: testData.user.email }, function(error, record) {
+ if(record._isDeleted.should.equal(true, 'Failed to update user'));
+ done();
+ });
+ });
+});
+
+it('should be able to create a user password reset', function(done) {
+ usermanager.createUserPasswordReset(userReset, function(error, resetData) {
+ should.not.exist(error);
+ resetData.token.should.equal(userReset.token);
+ done();
+ });
+});
+
+it('should be able to retrieve a user password reset', function(done) {
+ usermanager.retrieveUserPasswordReset({ token: userReset.token }, function(error, record) {
+ should.not.exist(error);
+ should.exist(record, 'Failed to retrieve user password reset record');
+ done();
+ });
+});
+
+it('should be able to delete a user password reset', function(done) {
+ usermanager.deleteUserPasswordReset({ user: userReset.user }, function(error, user) {
+ should.not.exist(error);
+ // Ensure reset request was deleted
+ usermanager.retrieveUserPasswordReset({ token: userReset.token }, function(error, resetRecord) {
+ should.not.exist(error);
+ resetRecord.should.equal(false, 'Failed to delete user password reset');
+ done();
+ });
+ });
+});
+
+it('should be able to delete users', function(done) {
+ usermanager.deleteUser( { email: testData.user.email }, function(error) {
+ should.not.exist(error);
+ // verify the user was deleted
+ usermanager.retrieveUser({ email: testData.user.email }, function(error, userRecord) {
+ should.not.exist(error);
+ userRecord.should.equal(false, 'Failed to delete user');
+ done();
+ });
+ });
+});
diff --git a/test/mocha.opts b/test/mocha.opts
deleted file mode 100644
index 7b4d45ec81..0000000000
--- a/test/mocha.opts
+++ /dev/null
@@ -1,5 +0,0 @@
---require should
---reporter dot
---ui bdd
---timeout 3500
---globals app
diff --git a/test/testConfig.json b/test/testConfig.json
index c09531d648..bd77a0e345 100644
--- a/test/testConfig.json
+++ b/test/testConfig.json
@@ -1,18 +1,18 @@
{
- "serverPort": 5000,
+ "rootUrl": "http://localhost:5000",
"serverName": "localhost",
+ "serverPort": 5000,
"dbType": "mongoose",
"dbHost": "localhost",
- "dbName": "adapt-tenant-unit-test",
"dbPort": 27017,
+ "dbName": "adapt-tenant-mocha",
"dataRoot": "testDataRoot",
"sessionSecret": "your-session-secret",
- "auth": "local",
"smtpService": "none",
"smtpUsername": "",
"smtpPassword": "",
"fromAddress": "",
"outputPlugin": "adapt",
- "masterTenantName": "adapt-tenant-unit-test",
+ "auth": "local",
"isTestEnvironment": true
}
diff --git a/test/testData.json b/test/testData.json
new file mode 100644
index 0000000000..21e7a00166
--- /dev/null
+++ b/test/testData.json
@@ -0,0 +1,64 @@
+{
+ "testUser": {
+ "email": "user@adaptlearning.org",
+ "plainPassword": "password",
+ "newpassword": "newpassword",
+ "auth": "local",
+ "_isDeleted": false
+ },
+ "testTenant": {
+ "name": "adapt-tenant-mocha",
+ "displayName": "Test Tenant",
+ "isMaster": true
+ },
+ "assetmanager": {
+ "asset": {
+ "title": "Temporary Asset",
+ "description": "This is just a temp file",
+ "repo": "localfs"
+ }
+ },
+ "auth": {
+ "passwordPlain": "this is my password",
+ "email": "auth@foo.bar",
+ "token": "testtokentesttokentesttokentest1",
+ "newPassword": "newpassword"
+ },
+ "database": {
+ "model": "foo",
+ "email": "foo@bar.com",
+ "altEmail": "bar@foo.com"
+ },
+ "filestorage": {
+ "filename": "tempFile",
+ "dirname": "tempDir",
+ "fileContents": "foobar"
+ },
+ "permissions": {
+ "email": "testpermissions@adapt.org"
+ },
+ "pluginmanager": {
+ "name": "fooPlugin",
+ "type": "output",
+ "data": {
+ "displayName": "Foo Plugin",
+ "version": "1.0.0",
+ "requires": "0.0.1"
+ }
+ },
+ "tenantmanager": {
+ "name": "unit-test-tenant",
+ "displayName": "UnitTestTenant",
+ "isMaster": false,
+ "newDisplayName": "UnitTestTenant2"
+ },
+ "usermanager": {
+ "user": {
+ "email": "foo@bar.com",
+ "auth": "local",
+ "_isDeleted": false
+ },
+ "token": "testtokentesttokentesttokentest1",
+ "ipAddress": "127.0.0.1"
+ }
+}
diff --git a/test_frontend/Data/adaptlearning.jpeg b/test_frontend/Data/adaptlearning.jpeg
deleted file mode 100644
index 918f3d8a3a..0000000000
Binary files a/test_frontend/Data/adaptlearning.jpeg and /dev/null differ
diff --git a/test_frontend/asset.js b/test_frontend/asset.js
deleted file mode 100644
index c0cfbfd637..0000000000
--- a/test_frontend/asset.js
+++ /dev/null
@@ -1,145 +0,0 @@
-// asset.js
-var loginModule = require("./login");
-//tests the asset manager
-casper.test.begin('Test Asset Manager', 7, function suite(test) {
- loginModule.login();
-
- casper.then(function() {
- this.wait(500, function() {});
- test.assertExists("a[class='project-layout-list']", "Menu is there");
- });
-
-
- //checks if menu exists and opens it
- casper.then(function() {
- test.assertExists("a[class='navigation-item navigation-global-menu']", "Menu button at top left exists ");
- });
- casper.then(function() {
- this.click("a[class='navigation-item navigation-global-menu']");
- });
- casper.then(function() {
- this.wait(1000, function() {
- this.capture("./test_frontend/img/asset/01-submenu open.png");
- });
- });
-
- //clicks on the asset manager button
- casper.then(function() {
- this.click("div.global-menu-item:nth-child(2) > a:nth-child(1)");
- });
-
- casper.then(function() {
- this.wait(1000, function() {
- this.capture("./test_frontend/img/asset/02-opened asset page.png");
- });
- });
-
- casper.then(function() {
- casper.test.comment("Filter with no results");
- });
- //enters a value into the search box that doesn't match any of the files
- casper.then(function() {
- casper.evaluate(function() {
- document.querySelector('input[name="search"]').setAttribute("value","no results");
- });
-
- });
- casper.then(function() {
- this.click("button[type=submit]");
- });
- casper.then(function() {
- this.wait(1000, function() {
- this.capture("./test_frontend/img/asset/03-no results in filter.png");
- });
- });
-
- //checks for an error message being displayed on the page
- casper.then(function() {
- this.wait(1000, function() {
- test.assertSelectorHasText('.unit-40', 'No assets found');
- });
- });
-
- casper.then(function() {
- casper.test.comment("Adding an asset");
- });
-
- casper.then(function() {
- casper.test.comment("Testing uploading");
- test.assertExists(".asset-nav-tabs > ul:nth-child(1) > li:nth-child(2) > a:nth-child(1)", "Able to upload a new file");
- });
-
- //clicks on the "Upload new asset" tab
- casper.then(function() {
- this.click(".asset-nav-tabs > ul:nth-child(1) > li:nth-child(2) > a:nth-child(1)");
- });
-
- casper.then(function() {
- this.wait(2000);
- });
-
- //fill in the form
- casper.then(function() {
- this.fill("form.asset-form", {
- 'file' : config.assetPath
- });
- });
-
- casper.then(function() {
- this.fill("form.asset-form", {
- 'title' : 'testing',
- 'description' : 'description'
- }, true);
- });
-
- casper.then(function() {
- this.capture("./test_frontend/img/asset/04-uploading an image.png");
- });
-
- //submits the image
- casper.then(function() {
- this.click("button[type=submit]");
- });
-
- //clicks the "Filters" tab
- casper.then(function() {
- this.click(".asset-nav-tabs > ul:nth-child(1) > li:nth-child(1) > a:nth-child(1)")
- });
-
- casper.then(function() {
- this.capture("./test_frontend/img/asset/05-back to filter tab.png");
- });
-
- casper.then(function() {
- casper.test.comment("Filter with results");
- });
-
- //inputs a name that should match one of the files
- casper.then(function() {
- casper.evaluate(function() {
- document.querySelector('input[name="search"]').setAttribute("value", "testing");
- });
-
- });
-
- casper.then(function() {
- this.wait(1000, function() {
- this.click("button[type=submit]");
- });
- });
-
- casper.then(function() {
- this.wait(1000, function() {
- this.capture("./test_frontend/img/asset/06-filter showing result.png");
- });
- });
-
- //checks to make sure the error text isn't on the page
- casper.then(function() {
- test.assertSelectorDoesntHaveText('.unit-40', 'No assets found');
- });
-
- casper.run(function() {
- test.done();
- });
-});
diff --git a/test_frontend/buttons.js b/test_frontend/buttons.js
deleted file mode 100644
index fb1dc15461..0000000000
--- a/test_frontend/buttons.js
+++ /dev/null
@@ -1,57 +0,0 @@
-// buttons.js
-var loginModule = require("./login");
-casper.test.begin('Testing the buttons on the main page', 2, function suite(test) {
- loginModule.login();
-
- /*
- Clicks all the buttons that rearrange the projects to ensure they work
- */
- casper.then(function() {
- casper.test.comment("Testing the buttons");
- });
-
- casper.then(function() {
- this.click(".project-layout-list");
- });
-
- casper.then(function() {
- this.wait(1000, function() {
- this.capture("./test_frontend/img/buttons/list.png");
- });
- });
-
- casper.then(function() {
- this.click(".project-layout-grid");
- });
-
- casper.then(function() {
- this.wait(1000, function() {
- this.capture("./test_frontend/img/buttons/grid.png");
- });
- });
-
- casper.then(function() {
- this.click(".project-sort-asc");
- });
-
- casper.then(function() {
- this.wait(1000, function() {
- this.capture("./test_frontend/img/buttons/ascending.png");
- });
- });
-
- casper.then(function() {
- this.click(".project-sort-desc");
- });
-
- casper.then(function() {
- this.wait(1000, function() {
- this.capture("./test_frontend/img/buttons/descending.png");
- });
- });
-
- casper.run(function() {
- test.done();
- });
-});
-
diff --git a/test_frontend/config.json b/test_frontend/config.json
deleted file mode 100644
index 748b8a5384..0000000000
--- a/test_frontend/config.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{"serverPort":"3000",
-"username":"email@email.com",
-"password":"password",
-"createCourseName" : "Name",
-"createCourseDescription" : "This is a description",
-"assetPath" : "./test_frontend/Data/adaptlearning.jpeg"
-}
diff --git a/test_frontend/copy.js b/test_frontend/copy.js
deleted file mode 100644
index 39517c29b4..0000000000
--- a/test_frontend/copy.js
+++ /dev/null
@@ -1,63 +0,0 @@
-
-// copy.js
-var loginModule = require("./login");
-var num;
-//tests the course editor
-casper.test.begin('Testing copying a course', 5, function suite(test) {
- loginModule.login();
- casper.then(function() {
- this.wait(500, function() {});
-
- });
-
- casper.then(function() {
- casper.test.comment("Testing copy");
- });
-
- casper.then(function() {
- casper.capture("./test_frontend/img/copy/01-on home page.png");
- });
-
- //checks if menu exists and opens it
- casper.then(function() {
- test.assertExists("a[class='open-context-icon open-context-course']", "Edit button exists");
- });
- casper.then(function() {
- this.click("li.project-list-item:nth-child(2) > div:nth-child(1) > div:nth-child(1) > div:nth-child(1) > a:nth-child(1)");
- });
-
- casper.then(function() {
- casper.capture("./test_frontend/img/copy/02-submenu open.png");
- test.assertExists("div.context-menu-item:nth-child(2) > a:nth-child(1) > div:nth-child(1) > h5:nth-child(1)", "Submenu is open ");
- });
-
- //clicks on the "duplicate" item in the submenu
- casper.then(function() {
- var x = require('casper').selectXPath;
- this.click(x('//h5[text()="Duplicate"]'));
- });
-
- casper.then(function() {
- this.wait(1000, function() {
- this.capture("./test_frontend/img/copy/03-copy menu.png");
- test.assertExists("#projectDetailTitle", "Copy rename/description page open ");
- });
- });
-
- //submits the duplicate project without making any changes- name defaults to "Copy of X"
- casper.then(function() {
- this.wait(1000, function() {
- this.click(".editor-project-edit-sidebar-save");
- });
- });
-
- casper.then(function() {
- this.wait(1000, function() {
- casper.capture("./test_frontend/img/copy/04-copy results.png");
- });
- });
-
- casper.run(function() {
- test.done();
- });
-});
diff --git a/test_frontend/createProject.js b/test_frontend/createProject.js
deleted file mode 100644
index 96540ca5db..0000000000
--- a/test_frontend/createProject.js
+++ /dev/null
@@ -1,70 +0,0 @@
-// createProject.js
-var loginModule = require("./login");
-//creates a new project
-casper.test.begin('Create Course', 5, function suite(test) {
- loginModule.login();
- casper.then(function() {
- this.wait(500, function() {});
- casper.test.comment("Creating the course");
- });
-
- //checks that the add course button exists, then clicks it
- casper.then(function() {
- test.assertExists("button[class='btn dashboard-sidebar-add-course']", "Add new course button exists");
- this.wait(1000, function() {
- this.capture("./test_frontend/img/create/01-on home page.png");
- });
- });
- casper.then(function() {
- this.click("button[class='btn dashboard-sidebar-add-course']");
- });
-
-
- casper.then(function() {
- test.assertExists('input[id="projectDetailTitle"]', "Found the add project page");
- this.wait(1000, function() {
- this.capture("./test_frontend/img/create/02-create project page.png");
- });
- });
-
- //testing to see if error message appears when no title is entered
- casper.then(function() {
- this.click(".editor-project-edit-sidebar-save");
- casper.test.comment("Testing error message when no title is entered");
- });
- casper.then(function() {
- this.test.assertEval(function() {
- return __utils__.findOne('#titleErrorMessage').textContent !== '';
- }, "Error message appeared properly - no title given");
- //this.test.assertSelectorHasText("#titleErrorMessage", "Please", "Error message appeared properly - no title given");
- this.wait(1000, function() {
- this.capture("./test_frontend/img/create/03-error report working.png");
- });
- });
-
- //fills in the form with valid information and submits it
- casper.then(function() {
- this.fillSelectors("form.forms", {
- 'input[id=projectDetailTitle]' : config.createCourseName,
- 'textarea[id=projectDetailDescription]' : config.createCourseDescription
- });
- });
- casper.then(function() {
- this.wait(1000, function() {
- this.capture("./test_frontend/img/create/04-values filled in.png");
- });
- });
- casper.then(function() {
- this.click(".editor-project-edit-sidebar-save");
- });
-
- casper.then(function() {
- this.wait(1000, function() {
- this.capture("./test_frontend/img/create/05-project was created.png");
- });
- });
-
- casper.run(function() {
- test.done();
- });
-});
diff --git a/test_frontend/delete.js b/test_frontend/delete.js
deleted file mode 100644
index 752bd9d08f..0000000000
--- a/test_frontend/delete.js
+++ /dev/null
@@ -1,54 +0,0 @@
-// delete.js
-var loginModule = require("./login");
-var num;
-//tests the course editor
-casper.test.begin('Testing deleting a course', 4, function suite(test) {
- loginModule.login();
- casper.then(function() {
- this.wait(500, function() {});
-
- });
-
- casper.then(function() {
- casper.test.comment("Testing delete on the last project");
- //stores the number of projects in a variable to be used later
- num = this.evaluate(function() {
- return __utils__.findAll("li.project-list-item").length;
- });
- });
-
- casper.then(function() {
- this.capture("./test_frontend/img/delete/01-on home page.png");
- });
-
- casper.then(function() {
- test.assertExists("a[class='open-context-icon open-context-course']", "Edit button exists");
- });
- //click on the submenu button on the project numbered "num", which is the last project
- casper.then(function() {
- this.click("li.project-list-item:nth-child("+num+") > div:nth-child(1) > div:nth-child(1) > div:nth-child(1) > a:nth-child(1) > i:nth-child(1)");
- });
-
- casper.then(function() {
- this.capture("./test_frontend/img/delete/02-submenu open.png");
- this.wait(1000, function() {
- test.assertExists("div.context-menu-item:nth-child(3) > a:nth-child(1) > div:nth-child(1) > h5:nth-child(1)", "Submenu is open");
- });
- });
- //clicks the delete option
- casper.then(function() {
- this.click("div.context-menu-item:nth-child(3) > a:nth-child(1) > div:nth-child(1) > h5:nth-child(1)");
- });
-
- casper.then(function() {
- this.capture("./test_frontend/img/delete/03-project was deleted.png");
- });
- //confirms the delete because it uses a confirm box
- casper.setFilter("page.confirm", function(msg) {
- return true;
- });
-
- casper.run(function() {
- test.done();
- });
-});
\ No newline at end of file
diff --git a/test_frontend/editConfig.js b/test_frontend/editConfig.js
deleted file mode 100644
index 989d4d85b7..0000000000
--- a/test_frontend/editConfig.js
+++ /dev/null
@@ -1,92 +0,0 @@
-// editConfig.js
-var loginModule = require("./login");
-var num;
-var sections;
-//tests the course editor
-casper.test.begin('Test Course Editor - Configuration', 5, function suite(test) {
- loginModule.login();
- casper.then(function() {
- //stores the number of projects in a variable to be used later
- num = this.evaluate(function() {
- return __utils__.findAll("li.project-list-item").length;
- });
- this.wait(500, function() {});
- casper.test.comment("Project settings");
- });
-
- //checks if menu exists and opens it, then clicks the "Edit" option
- casper.then(function() {
- test.assertExists("a[class='open-context-icon open-context-course']", "Edit button exists");
- });
- casper.then(function() {
- this.capture("./test_frontend/img/editConfig/01-on home page.png");
- });
- casper.then(function() {
- this.click("li.project-list-item:nth-child("+num+") > div:nth-child(1) > div:nth-child(1) > div:nth-child(1) > a:nth-child(1)");
- });
- casper.then(function() {
- this.capture("./test_frontend/img/editConfig/02-submenu open.png");
- });
- casper.then(function() {
- var x = require('casper').selectXPath;
- this.click(x('//h5[text()="Edit"]'));
- this.wait(1000);
- });
-
- casper.then(function() {
- test.assertExists("div[class='editor-menu-layer-controls units-row']", "Got into the edit window");
- });
-
- casper.then(function() {
- this.capture("./test_frontend/img/editConfig/03-on main editor page.png");
- });
-
- casper.then(function() {
- this.click(".editor-common-sidebar-config");
- });
- casper.then(function() {
- this.wait(1000, function() {
- this.capture("./test_frontend/img/editConfig/04-configuration page opened.png");
- });
- });
-
- casper.then(function() {
- this.test.assertExists("#config-defaultLanguage", "On configuration page");
- });
-
-
- //changes values on the configuration page and saves them
- casper.then(function() {
- this.fillSelectors("form.forms", {
- 'input[id=config-defaultLanguage]' : 'fr',
- 'input[id=config-questionWeight]' : '3',
- 'input[id=config-drawerduration]' : '600'
- });
- });
- casper.then(function() {
- casper.evaluate(function() {
- document.querySelector('#config-accessibilityenabled').selectedIndex = 1;
- document.querySelector('#config-accessibilitylegacy').selectedIndex = 1;
- document.querySelector('#config-drawershoweasing').selectedIndex = 3;
- document.querySelector('#config-drawerhideeasing').selectedIndex = 4;
- });
- });
- casper.then(function() {
- this.wait(1000, function() {
- this.capture("./test_frontend/img/editConfig/05-configuration values edited.png");
- });
- });
- casper.then(function() {
- this.click("button[class='btn editor-config-edit-sidebar-save']");
- });
-
- casper.then(function() {
- this.wait(1000, function() {
- this.capture("./test_frontend/img/editConfig/06-configuration saved and back to main page.png");
- });
- });
-
- casper.run(function() {
- test.done();
- });
-});
diff --git a/test_frontend/editCourse.js b/test_frontend/editCourse.js
deleted file mode 100644
index 6f8603ba26..0000000000
--- a/test_frontend/editCourse.js
+++ /dev/null
@@ -1,159 +0,0 @@
-// editCourse.js
-var loginModule = require("./login");
-var num;
-var sections;
-//tests the course editor
-casper.test.begin('Test Course Editor', 11, function suite(test) {
- loginModule.login();
- casper.then(function() {
- //stores the number of projects in a variable to be used later
- num = this.evaluate(function() {
- return __utils__.findAll("li.project-list-item").length;
- });
- this.wait(500, function() {});
- casper.test.comment("Project settings");
- });
-
- //checks if menu exists and opens it, then clicks the "Edit" option
- casper.then(function() {
- test.assertExists("a[class='open-context-icon open-context-course']", "Edit button exists");
- });
- casper.then(function() {
- this.capture("./test_frontend/img/edit/01-on home page.png");
- });
- casper.then(function() {
- this.click("li.project-list-item:nth-child("+num+") > div:nth-child(1) > div:nth-child(1) > div:nth-child(1) > a:nth-child(1)");
- });
- casper.then(function() {
- this.capture("./test_frontend/img/edit/02-submenu open.png");
- });
- casper.then(function() {
- var x = require('casper').selectXPath;
- this.click(x('//h5[text()="Edit"]'));
- this.wait(1000);
- });
-
- casper.then(function() {
- test.assertExists("div[class='editor-menu-layer-controls units-row']", "Got into the edit window");
- });
-
- casper.then(function() {
- this.capture("./test_frontend/img/edit/03-main editor page open.png");
- });
-
- //clicks the button to add a section
- casper.then(function() {
- this.click(".editor-menu-layer-add-menu");
- });
- casper.then(function() {
- this.wait(1000, function() {
- sections = this.evaluate(function() {
- return __utils__.findAll("div.editor-menu-item").length;
- });
- });
- });
- casper.then(function() {
- this.wait(2000, function() {
- test.assertExists("div.editor-menu-item:nth-child("+(sections+2)+") > div:nth-child(1) > div:nth-child(3) > span:nth-child(1)", "Added a section");
- this.capture("./test_frontend/img/edit/04-section was added.png");
- });
- });
-
- //clicks the section to open it, then adds a page to that section
- casper.then(function() {
- this.wait(1000, function() {
- this.click("div.editor-menu-item:nth-child("+(sections+2)+") > div:nth-child(1) > div:nth-child(3) > span:nth-child(1)");
- });
- });
- casper.then(function() {
- this.wait(1000, function() {
- test.assertExists("div.editor-menu-layer:nth-child(2) > div:nth-child(1) > div:nth-child(1) > button:nth-child(1)", "Opened the section");
- this.capture("./test_frontend/img/edit/05-section opened.png");
- });
- });
- casper.then(function() {
- this.wait(1000, function() {
- this.click("div.editor-menu-layer:nth-child(2) > div:nth-child(1) > div:nth-child(1) > button:nth-child(1)");
- });
- });
- casper.then(function() {
- this.wait(1000, function() {
- this.capture("./test_frontend/img/edit/06-page was added to section.png");
- test.assertExists("div.content-type-page:nth-child(3) > div:nth-child(1)", "Added a page");
- });
- });
-
- //opens the page
- casper.then(function() {
- this.wait(1000, function() {
- this.mouse.doubleclick("div.content-type-page:nth-child(3) > div:nth-child(1)");
- });
- });
- casper.then(function() {
- this.wait(1000, function() {
- this.capture("./test_frontend/img/edit/07-page opened.png");
- test.assertExists("a.btn", "Opened project page");
- });
- });
-
- //adds an article to the page, then a block to the article, then a component to the block
- casper.then(function() {
- this.click("a.btn");
- });
- casper.then(function() {
- this.wait(1000, function() {
- this.capture("./test_frontend/img/edit/08-article added to page.png");
- test.assertExists("div.page-article:nth-child(2) > div:nth-child(2) > div:nth-child(5) > a:nth-child(1)", "Added an article");
- });
- });
- casper.then(function() {
- this.click("div.page-article:nth-child(2) > div:nth-child(2) > div:nth-child(5) > a:nth-child(1)");
- });
- casper.then(function() {
- this.wait(1000, function() {
- this.capture("./test_frontend/img/edit/09-block added to article.png");
- test.assertExists("div.block:nth-child(2) > div:nth-child(2) > div:nth-child(5) > a:nth-child(1)", "Added a block");
- });
- });
- casper.then(function() {
- this.click("div.block:nth-child(2) > div:nth-child(2) > div:nth-child(5) > a:nth-child(1)");
- });
- casper.then(function() {
- this.wait(1000, function() {
- this.capture("./test_frontend/img/edit/10-component menu.png");
- test.assertExists("div.notify-popup-component-option:nth-child(6)", "Adding a component");
- });
- });
-
- //chooses which component to add: a blank, full width one
- casper.then(function() {
- this.wait(1000, function() {
- this.click("div.notify-popup-component-option:nth-child(6)");
- });
- });
- casper.then(function() {
- this.wait(1000, function() {
- this.click("div.notify-popup-layout-option:nth-child(2)");
- });
- });
- casper.then(function() {
- this.wait(1000, function() {
- this.capture("./test_frontend/img/edit/11-components are chosen.png");
- });
- });
- casper.then(function() {
- this.wait(1000, function() {
- this.click("a.notify-popup-button:nth-child(1)");
- });
- });
- casper.then(function() {
- this.wait(1000, function() {
- this.capture("./test_frontend/img/edit/12-component added to block.png");
- });
- });
-
- casper.run(function() {
- test.done();
- });
-});
-
diff --git a/test_frontend/editDetails.js b/test_frontend/editDetails.js
deleted file mode 100644
index 9a78049290..0000000000
--- a/test_frontend/editDetails.js
+++ /dev/null
@@ -1,83 +0,0 @@
-
-// edit.js
-var loginModule = require("./login");
-var num;
-//tests the course editor
-casper.test.begin('Testing editing a course', 5, function suite(test) {
- loginModule.login();
-
- casper.then(function() {
- casper.capture("./test_frontend/img/editInfo/01-on main page.png");
- //returns the amount of courses, is used to decide which one to edit- the last one
- num = this.evaluate(function() {
- return __utils__.findAll("li.project-list-item").length;
- });
- });
- //checks if menu exists and opens it
- casper.then(function() {
- test.assertExists("a[class='open-context-icon open-context-course']", "Edit button exists");
- });
- casper.then(function() {
- this.click("li.project-list-item:nth-child("+num+") > div:nth-child(1) > div:nth-child(1) > div:nth-child(1) > a:nth-child(1)");
- });
-
- casper.then(function() {
- test.assertExists("div.context-menu-item:nth-child(2) > a:nth-child(1) > div:nth-child(1) > h5:nth-child(1)","Submenu is open");
- casper.capture("./test_frontend/img/editInfo/02-submenu open.png");
- });
-
- casper.then(function() {
- var x = require('casper').selectXPath;
- this.click(x('//h5[text()="Edit"]'));
- });
-
- casper.then(function() {
- this.wait(2000, function() {
- test.assertExists(".editor-common-sidebar-project","Project page is open");
- });
- });
-
- casper.then(function() {
- this.wait(2000, function() {
- casper.capture("./test_frontend/img/editInfo/03-editor page open.png");
- this.click(".editor-common-sidebar-project");
- });
- });
-
- casper.then(function() {
- this.wait(2000, function() {
- casper.capture("./test_frontend/img/editInfo/04-project settings page open.png");
- });
- });
-
- casper.then(function() {
- this.fillSelectors("form.forms", {
- 'input[id=projectDetailTitle]' : 'Edited',
- 'textArea[id=projectDetailDescription]' : 'EditedImage'
- });
- });
-
- casper.then(function() {
- casper.capture("./test_frontend/img/editInfo/05-values edited.png");
- });
-
- casper.then(function() {
- this.click(".editor-project-edit-sidebar-save");
- });
-
- casper.then(function() {
- this.wait(1000, function() {
- this.click(".sidebar-breadcrumb-inner > a:nth-child(1)");
- });
- });
-
- casper.then(function() {
- casper.wait(1000, function() {
- this.capture("./test_frontend/img/editInfo/06-values saved.png");
- });
- });
-
- casper.run(function() {
- test.done();
- });
-});
\ No newline at end of file
diff --git a/test_frontend/editExtensions.js b/test_frontend/editExtensions.js
deleted file mode 100644
index 151b8e0f59..0000000000
--- a/test_frontend/editExtensions.js
+++ /dev/null
@@ -1,121 +0,0 @@
-// editCourse.js
-var loginModule = require("./login");
-var num;
-var sections;
-//tests the course editor
-casper.test.begin('Test Course Editor', 6, function suite(test) {
- loginModule.login();
- casper.then(function() {
- //stores the number of projects in a variable to be used later
- num = this.evaluate(function() {
- return __utils__.findAll("li.project-list-item").length;
- });
- this.wait(500, function() {});
- casper.test.comment("Project settings");
- });
-
- //checks if menu exists and opens it, then clicks the "Edit" option
- casper.then(function() {
- test.assertExists("a[class='open-context-icon open-context-course']", "Edit button exists");
- });
- casper.then(function() {
- this.capture("./test_frontend/img/editEx/01-on home page.png");
- });
- casper.then(function() {
- this.click("li.project-list-item:nth-child("+num+") > div:nth-child(1) > div:nth-child(1) > div:nth-child(1) > a:nth-child(1)");
- });
- casper.then(function() {
- this.capture("./test_frontend/img/editEx/02-submenu open.png");
- });
- casper.then(function() {
- var x = require('casper').selectXPath;
- this.click(x('//h5[text()="Edit"]'));
- this.wait(1000);
- });
-
- casper.then(function() {
- test.assertExists("div[class='editor-menu-layer-controls units-row']", "Got into the edit window");
- });
-
- casper.then(function() {
- this.capture("./test_frontend/img/editEx/03-on editor page.png");
- });
-
- casper.then(function() {
- this.click("button[class='editor-common-sidebar-extensions btn']");
- });
-
- casper.then(function() {
- this.wait(1000, function() {
- this.capture("./test_frontend/img/editEx/04-opened extensions page.png");
- });
- });
-
- casper.then(function() {
- this.click("#checkbox-1");
- });
-
- casper.then(function() {
- this.wait(1000, function() {
- this.capture("./test_frontend/img/editEx/05-chose one extension to add.png");
- });
- });
-
- casper.then(function() {
- test.assertExists(".editor-extensions-edit-sidebar-save", "At the manage extensions page");
- })
-
- casper.then(function() {
- this.click(".editor-extensions-edit-sidebar-save");
- });
-
- casper.then(function() {
- this.wait(1000, function() {
- this.capture("./test_frontend/img/editEx/06-confirmation message for extensions.png");
- });
- });
-
- casper.then(function() {
- this.click("a.notify-popup-button:nth-child(1)");
- });
-
- casper.then(function() {
- this.wait(1000, function() {
- this.click("button[class='editor-common-sidebar-extensions btn']");
- });
- });
-
- casper.then(function() {
- this.wait(1000, function() {
- this.capture("./test_frontend/img/editEx/07-shows enabled extension.png");
- });
- });
-
- casper.then(function() {
- test.assertExists(".btn-red", "An extension has been added");
- })
-
- casper.then(function() {
- this.click(".btn-red");
- });
-
- casper.then(function() {
- this.wait(1000, function() {
- this.capture("./test_frontend/img/editEx/08-confirmation message for removing extension.png");
- });
- });
-
- casper.then(function() {
- this.click("a.notify-popup-button:nth-child(1)");
- });
-
- casper.then(function() {
- this.wait(1000, function() {
- this.capture("./test_frontend/img/editEx/09-extension removed.png");
- });
- });
-
- casper.run(function() {
- test.done();
- });
-});
\ No newline at end of file
diff --git a/test_frontend/failedLogin.js b/test_frontend/failedLogin.js
deleted file mode 100644
index fadd988bec..0000000000
--- a/test_frontend/failedLogin.js
+++ /dev/null
@@ -1,89 +0,0 @@
-//opens page
-casper.test.begin('Failing login test (no values)', 2, function suite(test) {
- casper.start("http://localhost:3000", function() {
- this.evaluate(function() {
- document.querySelector('body').style.backgroundColor = "white";
- });
- this.wait(1000, function(){});
- this.test.assertTitle("Adapt Origin", "Adapt login page title is the one expected");
- }).viewport(1366,768);
-
- //screenshot of the homepage before anything is entered
- casper.then(function() {
- this.capture("./test_frontend/img/failLogin/failNoInfo1.png");
- });
-
- //clicks login button without filling in any values
- casper.then(function() {
- this.wait(1000, function(){});
- this.click("button[type=submit]");
- casper.test.comment("Pressed the submit button without entering any values");
- });
-
- //takes a screenshot of the error message when submit is pressed
- casper.then(function() {
- this.capture("./test_frontend/img/failLogin/failNoInfo2.png");
- });
-
- //test output if the error message is there
- casper.then(function() {
- //this.test.assertSelectorDoesntHaveText("#loginErrorMessage", "");
- this.test.assertEval(function() {
- return __utils__.findOne('#loginErrorMessage').textContent !== '';
- }, "Error message appeared properly - no information provided");
- });
-
- casper.run(function() {
- test.done();
- });
-});
-
-casper.test.begin('Failing login test (wrong values)', 2, function suite(test) {
- casper.start("http://localhost:3000", function() {
- this.evaluate(function() {
- document.querySelector('body').style.backgroundColor = "white";
- });
- this.wait(1000, function(){});
- this.test.assertTitle("Adapt Origin", "Adapt login page title is the one expected");
- }).viewport(1366,768);
-
- //screenshot of the homepage before anything is entered
- casper.then(function() {
- this.capture("./test_frontend/img/failLogin/failWrongInfo1.png");
- });
-
- //fill in the form with incorrect information
- casper.then(function() {
- this.fillSelectors("form.forms", {
- 'input[id=login-input-username]' : 'this is incorrect information',
- 'input[id=login-input-password]' : 'pass'
- });
- });
-
- //clicks login button with incorrect values
- casper.then(function() {
- this.click("button[type=submit]");
- casper.test.comment("Entered incorrect values and pressed submit");
- });
-
- //test output if the error message is there
- //commented out because of bug
- casper.then(function() {
- //this.test.assertExists("loginErrorMessage", "Error message appeared properly - wrong information");
- this.wait(1000, function() {
- this.test.assertEval(function() {
- return __utils__.findOne('#loginErrorMessage').textContent !== '';
- }, "Error message appeared properly - wrong information");
- });
- });
-
- casper.then(function() {
- this.wait(2000, function() {
- this.capture("./test_frontend/img/failLogin/failWrongInfo2.png");
- });
- });
-
- casper.run(function() {
- test.done();
- });
-});
diff --git a/test_frontend/login.js b/test_frontend/login.js
deleted file mode 100644
index af110556c2..0000000000
--- a/test_frontend/login.js
+++ /dev/null
@@ -1,49 +0,0 @@
-// login.js
-
-//opens page
-exports.login = function() {
- var fs = require('fs');
- configFile = fs.read('./test_frontend/config.json');
- config = JSON.parse(configFile);
-
- casper.start("http://localhost:"+config.serverPort, function() {
- this.evaluate(function() {
- document.querySelector('body').style.backgroundColor = "white";
- });
- this.wait(1000, function(){});
- casper.test.comment("Login");
- this.test.assertTitle("Adapt Origin", "Adapt homepage title is the one expected");
- }).viewport(1366,768);
-
- casper.then(function() {
- this.capture("./test_frontend/img/login/01-login page.png");
- });
-
- //fills in fields and clicks button
- casper.then(function() {
- this.fillSelectors("form.forms", {
- 'input[id=login-input-username]' : config.username,
- 'input[id=login-input-password]' : config.password
- });
- });
- casper.then(function() {
- this.wait(1000, function(){
- this.capture("./test_frontend/img/login/02-correct information entered.png");
- });
- });
- casper.then(function() {
- this.wait(1000, function(){
- this.click("button[type=submit]");
- });
-
- });
-
- casper.then(function() {
- this.wait(1000, function(){
- this.capture("./test_frontend/img/login/03-proceeded to main page.png");
- });
- this.test.assertExists("div[class=location-title-inner]", "Logged in");
- });
-
- return casper.then(function() {});
-};
diff --git a/test_frontend/logout.js b/test_frontend/logout.js
deleted file mode 100644
index 06a5cc52ec..0000000000
--- a/test_frontend/logout.js
+++ /dev/null
@@ -1,42 +0,0 @@
-// logout.js
-var loginModule = require("./login");
-//creates a new project
-casper.test.begin('Logging Out', 4, function suite(test) {
- //runs the login module
- loginModule.login();
-
- casper.then(function() {
- this.wait(500, function() {});
- casper.test.comment("Logging out");
- });
-
- //click the logout button
- casper.then(function() {
- this.click("a[class='navigation-item navigation-user-logout']");
- });
-
- //check if the logout link exists
- casper.then(function() {
- test.assertExists('a[id="linkLogout"]', "Clicked the logout button, confirm screen exists");
- });
-
- casper.then(function() {
- this.capture("./test_frontend/img/logout/01-logout confirmation.png");
- });
-
- //click the logout button, then confirm you want to log out
- casper.then(function() {
- this.click("a[id='linkLogout']");
- });
- casper.then(function() {
- test.assertExists('input[id="login-input-username"]',
- "Clicked the confirm link, back at the login screen");
- });
- casper.then(function() {
- this.capture("./test_frontend/img/logout/02-back to login page.png");
- });
-
- casper.run(function() {
- test.done();
- });
-});
\ No newline at end of file
diff --git a/upgrade.js b/upgrade.js
index e9ac704f0e..2a4f4d8432 100644
--- a/upgrade.js
+++ b/upgrade.js
@@ -1,397 +1,158 @@
-var builder = require('./lib/application');
-var prompt = require('prompt');
-var fs = require('fs');
-var request = require('request');
+var _ = require('underscore');
var async = require('async');
-var exec = require('child_process').exec;
-var rimraf = require('rimraf');
-var path = require('path');
+var chalk = require('chalk');
+var fs = require('fs-extra');
var optimist = require('optimist');
+var path = require('path');
+var semver = require('semver');
-// Constants
-var DEFAULT_USER_AGENT = 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2272.118 Safari/537.36';
-
-// Helper
-var isVagrant = function () {
- if (process.argv.length > 2) {
- return true;
- }
- return false;
-};
-
-// GLOBALS
-var app = builder();
-var installedBuilderVersion = '';
-var latestBuilderTag = '';
-var installedFrameworkVersion = '';
-var latestFrameworkTag = '';
-var shouldUpdateBuilder = false;
-var shouldUpdateFramework = false;
-var versionFile = JSON.parse(fs.readFileSync('version.json'), {encoding: 'utf8'});
-var configFile = JSON.parse(fs.readFileSync('conf/config.json'), {encoding: 'utf8'});
-
-var steps = [
- function(callback) {
-
- console.log('Checking versions');
-
- if (versionFile) {
- installedBuilderVersion = versionFile.adapt_authoring;
- installedFrameworkVersion = versionFile.adapt_framework;
- }
-
- console.log('Currently installed versions:\n- ' + app.polyglot.t('app.productname') + ': ' + installedBuilderVersion + '\n- Adapt Framework: ' + installedFrameworkVersion);
- callback();
-
- },
- function(callback) {
-
- console.log('Checking for ' + app.polyglot.t('app.productname') + ' upgrades...');
- // Check the latest version of the project
- request({
- headers: {
- 'User-Agent' : DEFAULT_USER_AGENT
- },
- uri: 'https://api.github.com/repos/adaptlearning/adapt_authoring/tags',
- method: 'GET'
- }, function (error, response, body) {
+var configuration = require('./lib/configuration');
+var logger = require('./lib/logger');
+var origin = require('./lib/application');
+var OutputConstants = require('./lib/outputmanager').Constants;
+var installHelpers = require('./lib/installHelpers');
- if (!error && response.statusCode == 200) {
- var tagInfo = JSON.parse(body);
+var DEFAULT_USER_AGENT = 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2272.118 Safari/537.36';
+var app = origin();
- if (tagInfo) {
- latestBuilderTag = tagInfo[0].name;
- }
+/**
+* Start of execution
+*/
+start();
+
+function start() {
+ // don't show any logger messages in the console
+ logger.level('console','error');
+ // start the server first
+ app.run({ skipVersionCheck: true, skipStartLog: true });
+ app.on('serverStarted', getUserInput);
+}
- callback();
+function getUserInput() {
+ // properties for the prompts
+ var confirmProperties = {
+ name: 'continue',
+ description: 'Continue? Y/n',
+ type: 'string',
+ default: 'Y',
+ before: installHelpers.inputHelpers.toBoolean
+ };
+ var upgradeProperties = {
+ properties: {
+ updateAutomatically: {
+ description: 'Update automatically? Y/n',
+ type: 'string',
+ default: 'Y',
+ before: installHelpers.inputHelpers.toBoolean
}
-
- });
-
- },
- function(callback) {
-
- console.log('Checking for Adapt Framework upgrades...');
- // Check the latest version of the framework
- request({
- headers: {
- 'User-Agent' : DEFAULT_USER_AGENT
+ }
+ };
+ var tagProperties = {
+ properties: {
+ authoringToolGitTag: {
+ type: 'string',
+ description: 'Specific git revision to be used for the authoring tool. Accepts any valid revision type (e.g. branch/tag/commit)',
+ default: ''
},
- uri: 'https://api.github.com/repos/adaptlearning/adapt_framework/tags',
- method: 'GET'
- }, function (error, response, body) {
- if (!error && response.statusCode == 200) {
- var tagInfo = JSON.parse(body);
-
- if (tagInfo) {
- latestFrameworkTag = tagInfo[0].name;
- }
-
- callback();
+ frameworkGitTag: {
+ type: 'string',
+ description: 'Specific git revision to be used for the framework. Accepts any valid revision type (e.g. branch/tag/commit)',
+ default: ''
}
- });
-
- },
- function(callback) {
- // Check what needs upgrading
- if (latestBuilderTag != installedBuilderVersion) {
- shouldUpdateBuilder = true;
- console.log('Update for ' + app.polyglot.t('app.productname') + ' is available: ' + latestBuilderTag);
- }
-
- if (latestFrameworkTag != installedFrameworkVersion) {
- shouldUpdateFramework = true;
- console.log('Update for Adapt Framework is available: ' + latestFrameworkTag);
- }
-
- // If neither of the Builder or Framework need updating then quit the upgrading process
- if (!shouldUpdateFramework && !shouldUpdateBuilder) {
- console.log('No updates available at this time\n');
- process.exit(0);
- }
-
- callback();
-
- }, function(callback) {
- // Upgrade Builder if we need to
- if (shouldUpdateBuilder) {
-
- upgradeBuilder(latestBuilderTag, function(err) {
- if (err) {
- return callback(err);
- }
-
- versionFile.adapt_authoring = latestBuilderTag;
- callback();
-
- });
-
- } else {
- callback();
}
-
- }, function(callback) {
-
- // Upgrade Framework if we need to
- if (shouldUpdateFramework) {
-
- upgradeFramework(latestFrameworkTag, function(err) {
- if (err) {
- return callback(err);
- }
-
- versionFile.adapt_framework = latestFrameworkTag;
- callback();
-
- });
-
- } else {
- callback();
+ };
+ console.log(`\nThis script will update the ${app.polyglot.t('app.productname')} and/or Adapt Framework. Would you like to continue?`);
+ installHelpers.getInput(confirmProperties, function(result) {
+ if(!result.continue) {
+ return installHelpers.exit();
}
-
- }, function(callback) {
-
- // After upgrading let's update the version.json to the latest version
- fs.writeFile('version.json', JSON.stringify(versionFile, null, 4), function(err) {
- if(err) {
- callback(err);
- } else {
- console.log("Version file updated\n");
- callback();
- }
- });
-
- }, function(callback) {
- if (shouldUpdateFramework) {
- // If the framework has been updated, interrogate the adapt.json file from the adapt_framework
- // folder and install the latest versions of the core plugins
- fs.readFile(path.join(configFile.root, 'temp', configFile.masterTenantID, 'adapt_framework', 'adapt.json'), function (err, data) {
- if (err) {
- return callback(err);
- }
-
- var json = JSON.parse(data);
- // 'dependencies' contains a key-value pair representing the plugin name and the semver
- var plugins = Object.keys(json.dependencies);
-
- async.eachSeries(plugins, function(plugin, pluginCallback) {
- app.bowermanager.installPlugin(plugin, json.dependencies[plugin], function(err) {
- if (err) {
- return pluginCallback(err);
- }
-
- pluginCallback();
- });
-
- }, function(err) {
- if (err) {
- console.log(err);
- return callback(err);
+ installHelpers.getInput(upgradeProperties, function(result) {
+ console.log('');
+ if(result.updateAutomatically) {
+ return checkForUpdates(function(error, updateData) {
+ if(error) {
+ return installHelpers.exit(1, error);
}
-
- callback();
+ doUpdate(updateData);
});
- });
- } else {
- callback();
- }
- },
- function(callback) {
- // Left empty for any upgrade scripts - just remember to call the callback when done.
- callback();
- }
-];
-
-app.run({skipVersionCheck: true, skipStartLog: true});
-
-app.on('serverStarted', function () {
- prompt.override = optimist.argv;
- prompt.start();
-
- // Prompt the user to begin the install
- if (isVagrant()) {
- console.log(`\nUpdate the ${app.polyglot.t('app.productname')} (and/or Adapt Framework) to the latest released version.`);
- } else {
- console.log(`\nThis script will update the ${app.polyglot.t('app.productname')} (and/or Adapt Framework) to the latest released version. Would you like to continue?`);
- }
-
- prompt.get({ name: 'Y/n', type: 'string', default: 'Y' }, function (err, result) {
- if (!/(Y|y)[es]*$/.test(result['Y/n'])) {
- return exitUpgrade();
- }
-
- // run steps
- async.series(steps, function (err, results) {
-
- if (err) {
- console.log('ERROR: ', err);
- return exitUpgrade(1, 'Upgrade was unsuccessful. Please check the console output.');
}
-
- console.log(' ');
-
- exitUpgrade(0, 'Great work! Your ' + app.polyglot.t('app.productname') + ' is now updated.');
- });
- });
-});
-
-// This upgrades the Builder
-function upgradeBuilder(tagName, callback) {
-
- console.log('Upgrading the ' + app.polyglot.t('app.productname') + '...please hold on!');
- var child = exec('git fetch origin', {
- stdio: [0, 'pipe', 'pipe']
- });
-
- child.stdout.on('data', function(err) {
- console.log(err);
- });
- child.stderr.on('data', function(err) {
- console.log(err);
- });
-
- child.on('exit', function (error, stdout, stderr) {
- if (error) {
- return console.log('ERROR: ' + error);
- }
-
- console.log("Fetch from GitHub was successful.");
- console.log("Pulling latest changes...");
-
- var secondChild = exec('git reset --hard ' + tagName, {
- stdio: [0, 'pipe', 'pipe']
- });
-
- secondChild.stdout.on('data', function(err) {
- console.log(err);
- });
-
- secondChild.stderr.on('data', function(err) {
- console.log(err);
- });
-
- secondChild.on('exit', function (error, stdout, stderr) {
- if (error) {
- return console.log('ERROR: ' + error);
- }
-
- console.log("Installing " + app.polyglot.t('app.productname') + " dependencies.\n");
-
- var thirdChild = exec('npm install', {
- stdio: [0, 'pipe', 'pipe']
- });
-
- thirdChild.stdout.on('data', function(err) {
- console.log(err);
- });
-
- thirdChild.stderr.on('data', function(err) {
- console.log(err);
- });
-
- thirdChild.on('exit', function (error, stdout, stderr) {
- if (error) {
- return console.log('ERROR: ' + error);
+ // no automatic update, so get the intended versions
+ installHelpers.getInput(tagProperties, function(result) {
+ console.log('');
+ if(!result.authoringToolGitTag && !result.frameworkGitTag) {
+ return installHelpers.exit(1, 'Cannot update sofware if no revisions are specified.');
}
- console.log("Dependencies installed.\n");
-
- console.log("Building front-end.\n");
-
- var fourthChild = exec('grunt build:prod', {
- stdio: [0, 'pipe', 'pipe']
- });
-
- fourthChild.stdout.on('data', function(err) {
- console.log(err);
- });
-
- fourthChild.stderr.on('data', function(err) {
- console.log(err);
- });
-
- fourthChild.on('exit', function (error, stdout, stderr) {
- if (error) {
- return console.log('ERROR: ' + error);
- }
-
- console.log("front-end built.\n");
-
- console.log(app.polyglot.t('app.productname') + " has been updated.\n");
- callback();
+ doUpdate({
+ adapt_authoring: result.authoringToolGitTag,
+ adapt_framework: result.frameworkGitTag
});
});
});
});
}
-// This upgrades the Framework
-function upgradeFramework(tagName, callback) {
- console.log('Upgrading the Adapt Framework...please hold on!');
-
- var child = exec('git fetch origin', {
- cwd: 'temp/' + configFile.masterTenantID + '/adapt_framework',
- stdio: [0, 'pipe', 'pipe']
- });
-
- child.stdout.on('data', function(err) {
- console.log(err);
- });
-
- child.stderr.on('data', function(err) {
- console.log(err);
- });
-
- child.on('exit', function (error, stdout, stderr) {
- if (error) {
- return console.log('ERROR: ' + error);
+function checkForUpdates(callback) {
+ var isCustomFramework = configuration.getConfig('frameworkRepository') !== installHelpers.DEFAULT_FRAMEWORK_REPO;
+ var isCustomServer = configuration.getConfig('authoringToolRepository') !== installHelpers.DEFAULT_SERVER_REPO;
+ if(isCustomFramework || isCustomServer) {
+ return callback('Cannot perform an automatic upgrade when custom repositories are used.');
+ }
+ installHelpers.showSpinner('Checking for updates');
+ installHelpers.getUpdateData(function(error, data) {
+ installHelpers.hideSpinner();
+ if(error) {
+ return callback(error);
}
+ if(!data) {
+ return installHelpers.exit(0, `Your software is already up-to-date, no need to upgrade.`);
+ }
+ console.log(chalk.underline('Software updates found.\n'));
+ callback(null, data);
+ });
+}
- console.log("Fetch from GitHub was successful.");
- console.log("Pulling latest changes...");
-
- var secondChild = exec('git reset --hard ' + tagName + ' && npm install', {
- cwd: 'temp/' + configFile.masterTenantID + '/adapt_framework',
- stdio: [0, 'pipe', 'pipe']
- });
-
- secondChild.stdout.on('data', function(err) {
- console.log(err);
- });
-
- secondChild.stderr.on('data', function(err) {
- console.log(err);
- });
-
- secondChild.on('exit', function (error, stdout, stderr) {
- if (error) {
- return console.log('ERROR: ' + error);
+function doUpdate(data) {
+ async.series([
+ function upgradeAuthoring(cb) {
+ if(!data.adapt_authoring) {
+ return cb();
}
-
- console.log("Framework has been updated.\n");
-
- rimraf(configFile.root + '/temp/' + configFile.masterTenantID + '/adapt_framework/src/course', function(err) {
- if (err) {
- console.log(err);
+ installHelpers.updateAuthoring({
+ repository: configuration.getConfig('authoringToolRepository'),
+ revision: data.adapt_authoring,
+ directory: configuration.serverRoot
+ }, function(error) {
+ if(error) {
+ console.log(`Failed to update ${configuration.serverRoot} to '${data.adapt_authoring}'`);
+ return cb(error);
}
-
- callback();
+ console.log(`${app.polyglot.t('app.productname')} upgraded to ${data.adapt_authoring}`);
+ cb();
});
-
- });
-
+ },
+ function upgradeFramework(cb) {
+ if(!data.adapt_framework) {
+ return cb();
+ }
+ var dir = path.join(configuration.tempDir, configuration.getConfig('masterTenantID'), OutputConstants.Folders.Framework);
+ installHelpers.updateFramework({
+ repository: configuration.getConfig('frameworkRepository'),
+ revision: data.adapt_framework,
+ directory: dir
+ }, function(error) {
+ if(error) {
+ console.log(`Failed to upgrade ${dir.replace(configuration.serverRoot, '')} to ${data.adapt_framework}`);
+ return cb(error);
+ }
+ console.log(`Adapt framework upgraded to ${data.adapt_framework}`);
+ cb();
+ });
+ },
+ ], function(error) {
+ if(error) {
+ console.error('ERROR:', error);
+ return installHelpers.exit(1, 'Upgrade was unsuccessful. Please check the console output.');
+ }
+ installHelpers.exit(0, `Your ${app.polyglot.t('app.productname')} was updated successfully.`);
});
}
-
-/**
- * Exits the install with some cleanup, should there be an error
- *
- * @param {int} code
- * @param {string} msg
- */
-
-function exitUpgrade (code, msg) {
- code = code || 0;
- msg = msg || 'Bye!';
- console.log(msg);
- process.exit(code);
-}
diff --git a/vagrant_setup.sh b/vagrant_setup.sh
deleted file mode 100644
index b56b17e7ed..0000000000
--- a/vagrant_setup.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-#
-# This script handles the provisioning of software for the machine.
-
-# need this ppa for ffmpeg on trusty tahr
-add-apt-repository ppa:mc3man/trusty-media
-apt-get update
-apt-get dist-upgrade
-apt-get install -y build-essential libssl-dev
-apt-get install -y git
-apt-get install -y mongodb
-apt-get install -y ffmpeg
-
-# install nodejs via nodesource
-curl -sL https://deb.nodesource.com/setup_4.x | sudo bash -
-apt-get install -y nodejs
-
-# npm needs some swap space, else it fails
-fallocate -l 1G /swapfile
-chmod 600 /swapfile
-mkswap /swapfile
-swapon /swapfile
-
-# global npm dependencies
-npm install -g pm2
-npm install -g grunt-cli
-npm install -g adapt-cli
-
-# upgrade the version of npm to help Windows users
-# sudo npm install npm -g
-
-# run the install with some default configuration settings
-# url: http://localhost:5000
-# username: admin
-# password: password
-cd /vagrant/
-npm install --production
-node install --install Y --serverPort 5000 --serverName localhost --dbHost localhost \
- --dbName adapt-tenant-master --dbPort 27017 \
- --dataRoot data --sessionSecret your-session-secret --useffmpeg Y \
- --smtpService dummy --smtpUsername smtpUser --smtpPassword smtpPass --fromAddress you@example.com \
- --name master --displayName Master --email admin --password password
-
- # upgrade the AuthoringTool and or Framework
- node upgrade --Y/n Y
\ No newline at end of file
diff --git a/vagrant_setup_win.sh b/vagrant_setup_win.sh
deleted file mode 100644
index 700fea5146..0000000000
--- a/vagrant_setup_win.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/bash
-#
-# This script handles the provisioning of software for windows machines.
-
-cd /vagrant/
-
-# copy the authoring_tool into the VM box
-# this will create the following /home/vagrant/vagrant
-cp -r /vagrant /home/vagrant
-# move back into right location
-mv /home/vagrant/vagrant/{.,}* /home/vagrant
-
-# need this ppa for ffmpeg on trusty tahr
-add-apt-repository ppa:mc3man/trusty-media
-apt-get update
-apt-get dist-upgrade
-apt-get install -y build-essential libssl-dev
-apt-get install -y git
-apt-get install -y mongodb
-apt-get install -y ffmpeg
-
-# install nodejs via nodesource
-curl -sL https://deb.nodesource.com/setup_4.x | sudo bash -
-apt-get install -y nodejs
-
-# npm needs some swap space, else it fails
-fallocate -l 1G /swapfile
-chmod 600 /swapfile
-mkswap /swapfile
-swapon /swapfile
-
-# update npm version
-# sudo npm install npm -g
-
-# global npm dependencies
-npm install -g pm2
-npm install -g grunt-cli
-npm install -g adapt-cli
-
-# navigate to the AT src
-cd /home/vagrant/
-
-# run the install with some default configuration settings
-# url: http://localhost:5000
-# username: admin
-# password: password
-npm install --production
-node install --install Y --serverPort 5000 --serverName localhost --dbHost localhost \
- --dbName adapt-tenant-master --dbPort 27017 \
- --dataRoot data --sessionSecret your-session-secret --useffmpeg Y \
- --smtpService dummy --smtpUsername smtpUser --smtpPassword smtpPass --fromAddress you@example.com \
- --name master --displayName Master --email admin --password password
-
-# change permissions
-sudo chown -R vagrant:vagrant /home/vagrant
-
-# upgrade the AuthoringTool and or Framework
-node upgrade --Y/n Y
\ No newline at end of file
diff --git a/version.json b/version.json
deleted file mode 100644
index 75064ef970..0000000000
--- a/version.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "adapt_authoring": "v0.2.1",
- "adapt_framework": "v2.0.7"
-}
+
+
+
+
+ 
+
+
+
+
+
+
+
+