diff --git a/services/web/app/src/Features/StaticPages/UniversityController.js b/services/web/app/src/Features/StaticPages/UniversityController.js index c6ca05da91..a350bb0241 100644 --- a/services/web/app/src/Features/StaticPages/UniversityController.js +++ b/services/web/app/src/Features/StaticPages/UniversityController.js @@ -13,7 +13,6 @@ let UniversityController const settings = require('settings-sharelatex') const logger = require('logger-sharelatex') const Settings = require('settings-sharelatex') -const sixpack = require('../../infrastructure/Sixpack') module.exports = UniversityController = { getPage(req, res, next) { diff --git a/services/web/app/src/infrastructure/Sixpack.js b/services/web/app/src/infrastructure/Sixpack.js deleted file mode 100644 index fe54a0fb53..0000000000 --- a/services/web/app/src/infrastructure/Sixpack.js +++ /dev/null @@ -1,156 +0,0 @@ -/* eslint-disable - camelcase, - max-len, - no-undef, - no-unused-vars, -*/ -// TODO: This file was created by bulk-decaffeinate. -// Fix any style issues and re-enable lint. -/* - * decaffeinate suggestions: - * DS102: Remove unnecessary code created because of implicit returns - * DS207: Consider shorter variations of null checks - * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md - */ -let sixpack -const settings = require('settings-sharelatex') -const request = require('request') -const logger = require('logger-sharelatex') - -const timeout = process.env.NODE_ENV === 'production' ? 500 : 5000 -logger.log(`using timeout of ${timeout}ms for sixpack server calls`) - -const generate_client_id = () => - // from http://stackoverflow.com/questions/105034 - 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) { - const r = (Math.random() * 16) | 0 - const v = c === 'x' ? r : (r & 0x3) | 0x8 - return v.toString(16) - }) - -const _request_uri = function(endpoint, params) { - const query_string = [] - const e = encodeURIComponent - for (let key in params) { - if (params.hasOwnProperty(key)) { - let vals = params[key] - if (Object.prototype.toString.call(vals) !== '[object Array]') { - vals = [vals] - } - let i = 0 - while (i < vals.length) { - query_string.push(e(key) + '=' + e(vals[i])) - i += 1 - } - } - } - if (query_string.length) { - endpoint += `?${query_string.join('&')}` - } - return endpoint -} - -const _request = function(uri, params, callback) { - const opts = { - uri: _request_uri(uri, params), - json: true, - timeout - } - return request.get(opts, (err, res, body) => callback(err, body)) -} - -module.exports = sixpack = { - client(user_id) { - const client = new sixpack.Session(user_id, settings.apis.sixpack.url) - return client - }, - - Session(client_id, base_url, ip_address, user_agent) { - this.client_id = client_id || sixpack.generate_client_id() - this.base_url = base_url || sixpack.base_url - - return { - participate: (experiment_name, alternatives, force, callback) => { - if (typeof force === 'function') { - callback = force - force = null - } - if (!/^[a-z0-9][a-z0-9\-_ ]*$/.test(experiment_name)) { - return callback(new Error('Bad experiment_name')) - } - if (alternatives.length < 2) { - return callback(new Error('Must specify at least 2 alternatives')) - } - let i = 0 - while (i < alternatives.length) { - if (!/^[a-z0-9][a-z0-9\-_ ]*$/.test(alternatives[i])) { - return callback( - new Error(`Bad alternative name: ${alternatives[i]}`) - ) - } - i += 1 - } - const params = { - client_id: this.client_id, - experiment: experiment_name, - alternatives - } - - if (force !== null && _in_array(alternatives, force)) { - return callback(null, { - status: 'ok', - alternative: { - name: force - }, - experiment: { - version: 0, - name: experiment_name - }, - client_id: this.client_id - }) - } - - return _request(this.base_url + '/participate', params, function( - err, - res - ) { - if (err != null) { - res = { - status: 'failed', - error: err, - alternative: { - name: alternatives[0] - } - } - } - return callback(null, res) - }) - }, - - convert: (experiment_name, callback) => { - if (!/^[a-z0-9][a-z0-9\-_ ]*$/.test(experiment_name)) { - return callback(new Error('Bad experiment_name')) - } - const params = { - client_id: this.client_id, - experiment: experiment_name - } - if (this.ip_address) { - params.ip_address = this.ip_address - } - if (this.user_agent) { - params.user_agent = this.user_agent - } - return _request(this.base_url + '/convert', params, function(err, res) { - if (err != null) { - res = { - status: 'failed', - error: err - } - } - return callback(null, res) - }) - } - } - } -} diff --git a/services/web/app/views/layout.pug b/services/web/app/views/layout.pug index 62950766e1..e799f48f39 100644 --- a/services/web/app/views/layout.pug +++ b/services/web/app/views/layout.pug @@ -62,7 +62,6 @@ html( siteUrl: '#{settings.siteUrl}', wsUrl: '#{settings.wsUrl}', jsPath: '#{jsPath}', - sixpackDomain: '#{settings.sixpack.domain}' }; window.systemMessages = !{StringHelper.stringifyJsonForScript(systemMessages)}; window.ab = {}; diff --git a/services/web/karma.conf.js b/services/web/karma.conf.js index c49572be3d..a86e09027f 100644 --- a/services/web/karma.conf.js +++ b/services/web/karma.conf.js @@ -13,7 +13,6 @@ module.exports = function (config) { }, browsers: ['ChromeCustom'], files: [ - 'test/unit_frontend/js/bootstrap.js', 'test/unit_frontend/es/es-bootstrap.js', // Angular must be loaded before requirejs to set up angular global 'public/js/libs/angular-1.6.4.min.js', diff --git a/services/web/npm-shrinkwrap.json b/services/web/npm-shrinkwrap.json index b68ce89c6d..e6481d0c2d 100644 --- a/services/web/npm-shrinkwrap.json +++ b/services/web/npm-shrinkwrap.json @@ -3195,7 +3195,7 @@ "ansi-regex": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==" }, "aproba": { "version": "1.2.0", @@ -3214,7 +3214,7 @@ "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" + "integrity": "sha512-9Y0g0Q8rmSt+H33DfKv7FOc3v+iRI+o1lbzt8jGcIosYW37IIW/2XVYq5NPdmaD5NQ59Nk26Kl/vZbwW9Fr8vg==" }, "brace-expansion": { "version": "1.1.11", @@ -3233,22 +3233,22 @@ "code-point-at": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" + "integrity": "sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==" }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" }, "console-control-strings": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" + "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==" }, "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==" }, "debug": { "version": "2.6.9", @@ -3266,12 +3266,12 @@ "delegates": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" + "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==" }, "detect-libc": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", - "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=" + "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==" }, "fs-minipass": { "version": "1.2.5", @@ -3284,12 +3284,12 @@ "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" }, "gauge": { "version": "2.7.4", "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", - "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", + "integrity": "sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg==", "requires": { "aproba": "^1.0.3", "console-control-strings": "^1.0.0", @@ -3317,7 +3317,7 @@ "has-unicode": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", - "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=" + "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==" }, "iconv-lite": { "version": "0.4.24", @@ -3338,7 +3338,7 @@ "inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", "requires": { "once": "^1.3.0", "wrappy": "1" @@ -3347,7 +3347,7 @@ "inherits": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==" }, "ini": { "version": "1.3.5", @@ -3357,7 +3357,7 @@ "is-fullwidth-code-point": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==", "requires": { "number-is-nan": "^1.0.0" } @@ -3365,7 +3365,7 @@ "isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==" }, "minimatch": { "version": "3.0.4", @@ -3378,7 +3378,7 @@ "minimist": { "version": "0.0.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" + "integrity": "sha512-miQKw5Hv4NS1Psg2517mV4e4dYNaO3++hjAvLOAzKqZ61rH8NS1SK+vbfBWZ5PY/Me/bEWhUwqMghEW5Fb9T7Q==" }, "minipass": { "version": "2.3.4", @@ -3397,7 +3397,7 @@ "yallist": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz", - "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=" + "integrity": "sha512-U+iKQ8rDYMRmvEpvDUIWZ3CtM9/imlAc+c1yJ7YV0vu+HNtP82sAkXzuDXPLkIPoLZohnXFSs9wf2E17xk5yZA==" } } }, @@ -3412,7 +3412,7 @@ "mkdirp": { "version": "0.5.1", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "integrity": "sha512-SknJC52obPfGQPnjIkXbmA6+5H15E+fR+E4iR2oQ3zzCLbd7/ONua69R/Gw7AgkTLsRG+r5fzksYwWe1AgTyWA==", "requires": { "minimist": "0.0.8" } @@ -3420,7 +3420,7 @@ "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, "nan": { "version": "2.12.1", @@ -3457,7 +3457,7 @@ "nopt": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz", - "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", + "integrity": "sha512-+5XZFpQZEY0cg5JaxLwGxDlKNKYxuXwGt8/Oi3UXm5/4ymrJve9d2CURituxv3rSrVCGZj4m1U1JlHTdcKt2Ng==", "requires": { "abbrev": "1", "osenv": "^0.1.4" @@ -3491,17 +3491,17 @@ "number-is-nan": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" + "integrity": "sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==" }, "object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==" }, "once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", "requires": { "wrappy": "1" } @@ -3509,12 +3509,12 @@ "os-homedir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" + "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==" }, "os-tmpdir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" + "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==" }, "osenv": { "version": "0.1.5", @@ -3528,7 +3528,7 @@ "path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==" }, "process-nextick-args": { "version": "2.0.0", @@ -3549,7 +3549,7 @@ "minimist": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" + "integrity": "sha512-7Wl+Jz+IGWuSdgsQEJ4JunV0si/iMhg42MnQQG6h1R6TNeVenp4U9x5CC5v/gYqz/fENLQITAWXidNtVL0NNbw==" } } }, @@ -3598,17 +3598,17 @@ "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" + "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==" }, "signal-exit": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", - "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=" + "integrity": "sha512-meQNNykwecVxdu1RlYMKpQx4+wefIYpmxi6gexo/KAbwquJrBUrBmKYJrE8KFkVQAAVWEnwNdu21PgrD77J3xA==" }, "string-width": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==", "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -3626,7 +3626,7 @@ "strip-ansi": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==", "requires": { "ansi-regex": "^2.0.0" } @@ -3634,7 +3634,7 @@ "strip-json-comments": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=" + "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==" }, "tar": { "version": "4.4.8", @@ -3658,14 +3658,14 @@ "yallist": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz", - "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=" + "integrity": "sha512-U+iKQ8rDYMRmvEpvDUIWZ3CtM9/imlAc+c1yJ7YV0vu+HNtP82sAkXzuDXPLkIPoLZohnXFSs9wf2E17xk5yZA==" } } }, "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" }, "wide-align": { "version": "1.1.3", @@ -3678,7 +3678,7 @@ "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" } } }, @@ -15940,7 +15940,7 @@ "q": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", - "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=" + "integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==" }, "qjobs": { "version": "1.2.0", @@ -17285,11 +17285,6 @@ "integrity": "sha512-d0rrL53wuDDs91GMCFAvQam64IpdVfkaxA4cGLTZfw1d5tTg6+F/D7F080d1n3d1gSHJBZLUf9pGpijC/x7xKQ==", "dev": true }, - "sixpack-client": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/sixpack-client/-/sixpack-client-1.0.0.tgz", - "integrity": "sha512-rJT6Bzo9/hKEzOyS7I9xxKVl8vaOlE8SCEvGSd8uOGOKs5ZkNd9Z82Tbq4RDwuMtjzZdA+2nKPcSWEvCAAY2YQ==" - }, "slack-node": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/slack-node/-/slack-node-0.2.0.tgz", diff --git a/services/web/package.json b/services/web/package.json index ab19b59b46..f607483acf 100644 --- a/services/web/package.json +++ b/services/web/package.json @@ -102,7 +102,6 @@ "sanitizer": "0.1.1", "sequelize": "^3.2.0", "settings-sharelatex": "^1.1.0", - "sixpack-client": "^1.0.0", "temp": "^0.8.3", "underscore": "1.6.0", "uuid": "^3.0.1", diff --git a/services/web/public/src/base.js b/services/web/public/src/base.js index 6bb5ac9bd3..afc2b899a3 100644 --- a/services/web/public/src/base.js +++ b/services/web/public/src/base.js @@ -33,25 +33,14 @@ define([ 'underscore', 'ngSanitize', 'ipCookie', - 'mvdSixpack', 'ErrorCatcher', 'localStorage', 'ngTagsInput', 'ui.select' ]) - .config(function( - $qProvider, - sixpackProvider, - $httpProvider, - uiSelectConfig - ) { + .config(function($qProvider, $httpProvider, uiSelectConfig) { $qProvider.errorOnUnhandledRejections(false) uiSelectConfig.spinnerClass = 'fa fa-refresh ui-select-spin' - sixpackProvider.setOptions({ - debug: false, - baseUrl: window.sharelatex.sixpackDomain, - client_id: window.user_id - }) return __guard__( typeof MathJax !== 'undefined' && MathJax !== null diff --git a/services/web/public/src/ide.js b/services/web/public/src/ide.js index 862fe614f3..08ca4d6528 100644 --- a/services/web/public/src/ide.js +++ b/services/web/public/src/ide.js @@ -81,7 +81,6 @@ define([ $timeout, ide, localStorage, - sixpack, event_tracking, metadata, $q, diff --git a/services/web/public/src/libraries.js b/services/web/public/src/libraries.js index c49e836066..b213261888 100644 --- a/services/web/public/src/libraries.js +++ b/services/web/public/src/libraries.js @@ -13,8 +13,6 @@ define([ 'libs/angular-sanitize-1.6.4', 'libs/angular-cookie', 'libs/passfield', - 'libs/sixpack', - 'libs/angular-sixpack', 'libs/ng-tags-input-3.0.0', 'libs/select/select' ], function() {}) diff --git a/services/web/public/src/main/account-upgrade.js b/services/web/public/src/main/account-upgrade.js index 35d0af6f20..020a91fa16 100644 --- a/services/web/public/src/main/account-upgrade.js +++ b/services/web/public/src/main/account-upgrade.js @@ -13,12 +13,7 @@ * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md */ define(['base'], App => - App.controller('FreeTrialModalController', function( - $scope, - abTestManager, - sixpack, - event_tracking - ) { + App.controller('FreeTrialModalController', function($scope, event_tracking) { $scope.buttonClass = 'btn-primary' return ($scope.startFreeTrial = function(source, couponCode) { diff --git a/services/web/public/stylesheets/app/editor.less b/services/web/public/stylesheets/app/editor.less index 17844dc31e..286c000a5e 100644 --- a/services/web/public/stylesheets/app/editor.less +++ b/services/web/public/stylesheets/app/editor.less @@ -504,7 +504,7 @@ CodeMirror top: 100%; } -.sl_references_search_hint-varDefault { +.sl_references_search_hint { position: relative; left: -1px; text-align: center; @@ -518,43 +518,6 @@ CodeMirror } } -.sl_references_search_hint-varButton { - position: absolute; - bottom: -65px; - left: -1px; - right: 0px; - padding: 0 6px 6px; - text-align: center; - background: #fbfbfb; - color: #FFF; - box-shadow: 3px 3px 5px rgba(0,0,0,.2); - border-left: 1px solid lightgray; - font-family: @font-family-sans-serif; - font-size: 13px; - font-weight: 600; - - hr { - margin: 6px -6px; - } - - button { - width: 100%; - font-size: inherit; - line-height: 1.4; - } - - span { - padding-left: 10px; - } - - kbd { - display: block; - font-family: inherit; - font-size: 12px; - font-weight: normal; - } -} - // -- References Search Modal -- .references-search-modal-backdrop { // don't grey out the editor when the diff --git a/services/web/test/unit_frontend/src/bootstrap.js b/services/web/test/unit_frontend/src/bootstrap.js deleted file mode 100644 index 1cafd60172..0000000000 --- a/services/web/test/unit_frontend/src/bootstrap.js +++ /dev/null @@ -1,6 +0,0 @@ -// TODO: This file was created by bulk-decaffeinate. -// Sanity-check the conversion and remove this comment. -// Stub out some globals -window.sharelatex = { - sixpackDomain: '' -}