diff --git a/.bowerrc b/.bowerrc index 4a52096b99..552e7d2622 100644 --- a/.bowerrc +++ b/.bowerrc @@ -1,3 +1,3 @@ { - "directory": "website/public/bower_components" + "directory": "website/client/bower_components" } diff --git a/.eslintignore b/.eslintignore index 6aab3499ed..5b7664ac76 100644 --- a/.eslintignore +++ b/.eslintignore @@ -8,18 +8,18 @@ website/transpiled-babel/ migrations/* -# The files in website/public/js should be moved out and browserified -website/public/ +# The files in website/client/js should be moved out and browserified +website/client/ # Temporarilly disabled. These should be removed when the linting errors are fixed common/script/content/index.js common/script/public/**/*.js -website/src/**/api-v2/**/*.js -website/src/routes/payments.js -website/src/routes/pages.js -website/src/middlewares/apiThrottle.js -website/src/middlewares/forceRefresh.js +website/server/**/api-v2/**/*.js +website/server/routes/payments.js +website/server/routes/pages.js +website/server/middlewares/apiThrottle.js +website/server/middlewares/forceRefresh.js debug-scripts/* scripts/* diff --git a/.gitignore b/.gitignore index a54367ceb3..4e3d867081 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ .DS_Store -website/public/gen -website/public/common -website/public/apidoc +website/client/gen +website/client/common +website/client/apidoc website/transpiled-babel/ common/transpiled-babel/ node_modules @@ -10,8 +10,8 @@ node_modules config.json npm-debug.log* lib -website/public/bower_components -website/public/new-stuff.html +website/client/bower_components +website/client/new-stuff.html website/build newrelic_agent.log .bower-tmp @@ -25,7 +25,7 @@ src/*/*.map src/*/*/*.map test/*.js test/*.map -website/public/docs +website/client/docs *.sublime-workspace coverage coverage.html diff --git a/.nodemonignore b/.nodemonignore index 5aa436cfa3..c698b88598 100644 --- a/.nodemonignore +++ b/.nodemonignore @@ -2,7 +2,7 @@ node_modules/** .bower-cache/** .bower-tmp/** .bower-registry/** -website/public/** +website/client/** website/views/** website/build/** .git/** diff --git a/Gruntfile.js b/Gruntfile.js index 8b416e203c..8f716518fe 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -43,11 +43,11 @@ module.exports = function(grunt) { options: { compress: false, // AFTER 'include css': true, - paths: ['website/public'] + paths: ['website/client'] }, files: { - 'website/build/app.css': ['website/public/css/index.styl'], - 'website/build/static.css': ['website/public/css/static.styl'] + 'website/build/app.css': ['website/client/css/index.styl'], + 'website/build/static.css': ['website/client/css/static.styl'] } } }, @@ -55,13 +55,13 @@ module.exports = function(grunt) { copy: { build: { files: [ - {expand: true, cwd: 'website/public/', src: 'favicon.ico', dest: 'website/build/'}, - {expand: true, cwd: 'website/public/', src: 'favicon_192x192.png', dest: 'website/build/'}, + {expand: true, cwd: 'website/client/', src: 'favicon.ico', dest: 'website/build/'}, + {expand: true, cwd: 'website/client/', src: 'favicon_192x192.png', dest: 'website/build/'}, {expand: true, cwd: '', src: 'common/dist/sprites/spritesmith*.png', dest: 'website/build/'}, {expand: true, cwd: '', src: 'common/img/sprites/backer-only/*.gif', dest: 'website/build/'}, {expand: true, cwd: '', src: 'common/img/sprites/npc_ian.gif', dest: 'website/build/'}, {expand: true, cwd: '', src: 'common/img/sprites/quest_*.gif', dest: 'website/build/'}, - {expand: true, cwd: 'website/public/', src: 'bower_components/bootstrap/dist/fonts/*', dest: 'website/build/'} + {expand: true, cwd: 'website/client/', src: 'bower_components/bootstrap/dist/fonts/*', dest: 'website/build/'} ] } }, @@ -88,9 +88,9 @@ module.exports = function(grunt) { } }); - //Load build files from public/manifest.json - grunt.registerTask('loadManifestFiles', 'Load all build files from public/manifest.json', function(){ - var files = grunt.file.readJSON('./website/public/manifest.json'); + //Load build files from client/manifest.json + grunt.registerTask('loadManifestFiles', 'Load all build files from client/manifest.json', function(){ + var files = grunt.file.readJSON('./website/client/manifest.json'); var uglify = {}; var cssmin = {}; @@ -101,7 +101,7 @@ module.exports = function(grunt) { _.each(files[key].js, function(val){ var path = "./"; if( val.indexOf('common/') == -1) - path = './website/public/'; + path = './website/client/'; js.push(path + val); }); @@ -110,7 +110,7 @@ module.exports = function(grunt) { _.each(files[key].css, function(val){ var path = "./"; if( val.indexOf('common/') == -1) { - path = (val == 'app.css' || val == 'static.css') ? './website/build/' : './website/public/'; + path = (val == 'app.css' || val == 'static.css') ? './website/build/' : './website/client/'; } css.push(path + val) }); @@ -122,7 +122,7 @@ module.exports = function(grunt) { grunt.config.set('cssmin.build.files', cssmin); // Rewrite urls to relative path - grunt.config.set('cssmin.build.options', {'target': 'website/public/css/whatever-css.css'}); + grunt.config.set('cssmin.build.options', {'target': 'website/client/css/whatever-css.css'}); }); // Register tasks. @@ -131,7 +131,7 @@ module.exports = function(grunt) { grunt.registerTask('build:test', ['test:prepare:translations', 'build:dev']); grunt.registerTask('test:prepare:translations', function() { - var i18n = require('./website/src/libs/api-v3/i18n'), + var i18n = require('./website/server/libs/api-v3/i18n'), fs = require('fs'); fs.writeFileSync('test/spec/mocks/translations.js', "if(!window.env) window.env = {};\n" + diff --git a/bower.json b/bower.json index 8788581cd1..7e6e6f6790 100644 --- a/bower.json +++ b/bower.json @@ -9,7 +9,7 @@ "ignore": [ "**/.*", "node_modules", - "public/bower_components", + "website/client/bower_components", "test", "tests" ], diff --git a/common/script/content/spells.js b/common/script/content/spells.js index 41a6571dec..e7a198ec97 100644 --- a/common/script/content/spells.js +++ b/common/script/content/spells.js @@ -15,7 +15,7 @@ import { NotAuthorized } from '../libs/errors'; web, this function can be performed on the client and on the server. `user` param is self (needed for determining your own stats for effectiveness of cast), and `target` param is one of [task, party, user]. In the case of `self` spells, you act on `user` instead of `target`. You can trust these are the correct objects, as long as the `target` attr of the - spell is correct. Take a look at habitrpg/src/models/user.js and habitrpg/src/models/task.js for what attributes are + spell is correct. Take a look at habitrpg/website/server/models/user.js and habitrpg/website/server/models/task.js for what attributes are available on each model. Note `task.value` is its "redness". If party is passed in, it's an array of users, so you'll want to iterate over them like: `_.each(target,function(member){...})` diff --git a/common/script/cron.js b/common/script/cron.js index 30b7fde486..a0f28f9d5a 100644 --- a/common/script/cron.js +++ b/common/script/cron.js @@ -1,4 +1,4 @@ -// TODO what can be moved to /website/src? +// TODO what can be moved to /website/server? /* ------------------------------------------------------ Cron and time / day functions diff --git a/karma.conf.js b/karma.conf.js index 2ae3a52a9d..3d8344a7eb 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -11,41 +11,41 @@ module.exports = function karmaConfig (config) { // list of files / patterns to load in the browser files: [ - 'website/public/bower_components/jquery/dist/jquery.js', - 'website/public/bower_components/pnotify/jquery.pnotify.js', - 'website/public/bower_components/angular/angular.js', - 'website/public/bower_components/angular-loading-bar/build/loading-bar.min.js', - 'website/public/bower_components/angular-resource/angular-resource.min.js', - 'website/public/bower_components/hello/dist/hello.all.min.js', - 'website/public/bower_components/angular-sanitize/angular-sanitize.js', - 'website/public/bower_components/bootstrap/dist/js/bootstrap.js', - 'website/public/bower_components/angular-bootstrap/ui-bootstrap.js', - 'website/public/bower_components/angular-bootstrap/ui-bootstrap-tpls.js', - 'website/public/bower_components/angular-ui-router/release/angular-ui-router.js', - 'website/public/bower_components/angular-filter/dist/angular-filter.js', - 'website/public/bower_components/angular-ui/build/angular-ui.js', - 'website/public/bower_components/angular-ui-utils/ui-utils.min.js', - 'website/public/bower_components/Angular-At-Directive/src/at.js', - 'website/public/bower_components/Angular-At-Directive/src/caret.js', - 'website/public/bower_components/angular-mocks/angular-mocks.js', - 'website/public/bower_components/ngInfiniteScroll/build/ng-infinite-scroll.js', - 'website/public/bower_components/select2/select2.js', - 'website/public/bower_components/angular-ui-select2/src/select2.js', - 'website/public/bower_components/habitica-markdown/dist/habitica-markdown.min.js', + 'website/client/bower_components/jquery/dist/jquery.js', + 'website/client/bower_components/pnotify/jquery.pnotify.js', + 'website/client/bower_components/angular/angular.js', + 'website/client/bower_components/angular-loading-bar/build/loading-bar.min.js', + 'website/client/bower_components/angular-resource/angular-resource.min.js', + 'website/client/bower_components/hello/dist/hello.all.min.js', + 'website/client/bower_components/angular-sanitize/angular-sanitize.js', + 'website/client/bower_components/bootstrap/dist/js/bootstrap.js', + 'website/client/bower_components/angular-bootstrap/ui-bootstrap.js', + 'website/client/bower_components/angular-bootstrap/ui-bootstrap-tpls.js', + 'website/client/bower_components/angular-ui-router/release/angular-ui-router.js', + 'website/client/bower_components/angular-filter/dist/angular-filter.js', + 'website/client/bower_components/angular-ui/build/angular-ui.js', + 'website/client/bower_components/angular-ui-utils/ui-utils.min.js', + 'website/client/bower_components/Angular-At-Directive/src/at.js', + 'website/client/bower_components/Angular-At-Directive/src/caret.js', + 'website/client/bower_components/angular-mocks/angular-mocks.js', + 'website/client/bower_components/ngInfiniteScroll/build/ng-infinite-scroll.js', + 'website/client/bower_components/select2/select2.js', + 'website/client/bower_components/angular-ui-select2/src/select2.js', + 'website/client/bower_components/habitica-markdown/dist/habitica-markdown.min.js', 'common/dist/scripts/habitrpg-shared.js', 'test/spec/mocks/**/*.js', - 'website/public/js/env.js', - 'website/public/js/app.js', + 'website/client/js/env.js', + 'website/client/js/app.js', 'common/script/public/config.js', 'common/script/public/userServices.js', 'common/script/public/directives.js', - 'website/public/js/services/**/*.js', - 'website/public/js/filters/**/*.js', - 'website/public/js/directives/**/*.js', - 'website/public/js/controllers/**/*.js', + 'website/client/js/services/**/*.js', + 'website/client/js/filters/**/*.js', + 'website/client/js/directives/**/*.js', + 'website/client/js/controllers/**/*.js', 'test/spec/specHelper.js', 'test/spec/**/*.js', @@ -77,7 +77,7 @@ module.exports = function karmaConfig (config) { browsers: ['PhantomJS'], preprocessors: { - 'website/public/js/**/*.js': ['coverage'], + 'website/client/js/**/*.js': ['coverage'], 'test/**/*.js': ['babel'], }, diff --git a/migrations/api_v3/challenges.js b/migrations/api_v3/challenges.js index a1b9b7d4fa..c29dc82df4 100644 --- a/migrations/api_v3/challenges.js +++ b/migrations/api_v3/challenges.js @@ -23,7 +23,7 @@ var fs = require('fs'); consoleStamp(console); // Initialize configuration -require('../../website/src/libs/api-v3/setupNconf')(); +require('../../website/server/libs/api-v3/setupNconf')(); var MONGODB_OLD = nconf.get('MONGODB_OLD'); var MONGODB_NEW = nconf.get('MONGODB_NEW'); @@ -33,8 +33,8 @@ var MongoClient = MongoDB.MongoClient; mongoose.Promise = Bluebird; // otherwise mongoose models won't work // Load new models -var NewChallenge = require('../../website/src/models/challenge').model; -var Tasks = require('../../website/src/models/task'); +var NewChallenge = require('../../website/server/models/challenge').model; +var Tasks = require('../../website/server/models/task'); // To be defined later when MongoClient connects var mongoDbOldInstance; diff --git a/migrations/api_v3/challengesMembers.js b/migrations/api_v3/challengesMembers.js index 7f7b2c99fd..650c7375ab 100644 --- a/migrations/api_v3/challengesMembers.js +++ b/migrations/api_v3/challengesMembers.js @@ -23,7 +23,7 @@ var consoleStamp = require('console-stamp'); consoleStamp(console); // Initialize configuration -require('../../website/src/libs/api-v3/setupNconf')(); +require('../../website/server/libs/api-v3/setupNconf')(); var MONGODB_OLD = nconf.get('MONGODB_OLD'); var MONGODB_NEW = nconf.get('MONGODB_NEW'); diff --git a/migrations/api_v3/coupons.js b/migrations/api_v3/coupons.js index ce7058e3f0..e329a6b676 100644 --- a/migrations/api_v3/coupons.js +++ b/migrations/api_v3/coupons.js @@ -22,7 +22,7 @@ var consoleStamp = require('console-stamp'); consoleStamp(console); // Initialize configuration -require('../../website/src/libs/api-v3/setupNconf')(); +require('../../website/server/libs/api-v3/setupNconf')(); var MONGODB_OLD = nconf.get('MONGODB_OLD'); var MONGODB_NEW = nconf.get('MONGODB_NEW'); @@ -32,7 +32,7 @@ var MongoClient = MongoDB.MongoClient; mongoose.Promise = Bluebird; // otherwise mongoose models won't work // Load new models -var Coupon = require('../../website/src/models/coupon').model; +var Coupon = require('../../website/server/models/coupon').model; // To be defined later when MongoClient connects var mongoDbOldInstance; diff --git a/migrations/api_v3/emailUnsubscriptions.js b/migrations/api_v3/emailUnsubscriptions.js index 099d23cd27..5787cc3395 100644 --- a/migrations/api_v3/emailUnsubscriptions.js +++ b/migrations/api_v3/emailUnsubscriptions.js @@ -22,7 +22,7 @@ var consoleStamp = require('console-stamp'); consoleStamp(console); // Initialize configuration -require('../../website/src/libs/api-v3/setupNconf')(); +require('../../website/server/libs/api-v3/setupNconf')(); var MONGODB_OLD = nconf.get('MONGODB_OLD'); var MONGODB_NEW = nconf.get('MONGODB_NEW'); @@ -32,7 +32,7 @@ var MongoClient = MongoDB.MongoClient; mongoose.Promise = Bluebird; // otherwise mongoose models won't work // Load new models -var EmailUnsubscription = require('../../website/src/models/emailUnsubscription').model; +var EmailUnsubscription = require('../../website/server/models/emailUnsubscription').model; // To be defined later when MongoClient connects var mongoDbOldInstance; diff --git a/migrations/api_v3/groups.js b/migrations/api_v3/groups.js index 9399024c53..3230bec0d8 100644 --- a/migrations/api_v3/groups.js +++ b/migrations/api_v3/groups.js @@ -30,7 +30,7 @@ var consoleStamp = require('console-stamp'); consoleStamp(console); // Initialize configuration -require('../../website/src/libs/api-v3/setupNconf')(); +require('../../website/server/libs/api-v3/setupNconf')(); var MONGODB_OLD = nconf.get('MONGODB_OLD'); var MONGODB_NEW = nconf.get('MONGODB_NEW'); @@ -40,9 +40,9 @@ var MongoClient = MongoDB.MongoClient; mongoose.Promise = Bluebird; // otherwise mongoose models won't work // Load new models -var NewGroup = require('../../website/src/models/group').model; +var NewGroup = require('../../website/server/models/group').model; -var TAVERN_ID = require('../../website/src/models/group').TAVERN_ID; +var TAVERN_ID = require('../../website/server/models/group').TAVERN_ID; // To be defined later when MongoClient connects var mongoDbOldInstance; diff --git a/migrations/api_v3/users.js b/migrations/api_v3/users.js index cea6e58d2d..87b39ae615 100644 --- a/migrations/api_v3/users.js +++ b/migrations/api_v3/users.js @@ -25,7 +25,7 @@ var moment = require('moment'); consoleStamp(console); // Initialize configuration -require('../../website/src/libs/api-v3/setupNconf')(); +require('../../website/server/libs/api-v3/setupNconf')(); var MONGODB_OLD = nconf.get('MONGODB_OLD'); var MONGODB_NEW = nconf.get('MONGODB_NEW'); @@ -36,8 +36,8 @@ var MongoClient = MongoDB.MongoClient; mongoose.Promise = Bluebird; // otherwise mongoose models won't work // Load new models -var NewUser = require('../../website/src/models/user').model; -var NewTasks = require('../../website/src/models/task'); +var NewUser = require('../../website/server/models/user').model; +var NewTasks = require('../../website/server/models/task'); // To be defined later when MongoClient connects var mongoDbOldInstance; diff --git a/migrations/manual_password_reset.js b/migrations/manual_password_reset.js index 68b69cbbbe..622e16913b 100644 --- a/migrations/manual_password_reset.js +++ b/migrations/manual_password_reset.js @@ -7,7 +7,7 @@ nconf.argv().env().file('user', path.join(path.resolve(__dirname, '../config.jso var Users = require('mongoskin').db(nconf.get("PRODUCTION_DB:URL"), nconf.get("PRODUCTION_DB").CREDS).collection('users'), async = require('async'), - utils = require('../website/src/utils'), + utils = require('../website/server/utils'), salt = utils.makeSalt(), newPassword = utils.makeSalt(), // use a salt as the new password too (they'll change it later) hashed_password = utils.encryptPassword(newPassword, salt); diff --git a/package.json b/package.json index 3b13ca318f..eb7e278837 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "habitrpg", "description": "A habit tracker app which treats your goals like a Role Playing Game.", "version": "3.0.0", - "main": "./website/src/index.js", + "main": "./website/server/index.js", "dependencies": { "accepts": "^1.3.2", "amazon-payments": "0.0.4", @@ -107,7 +107,7 @@ "test:api-v3:unit": "gulp test:api-v3:unit", "test:api-v3:integration": "gulp test:api-v3:integration", "test:api-v3:integration:separate-server": "gulp test:api-v3:integration:separate-server", - "test:api-legacy": "istanbul cover -i \"website/src/**\" --dir coverage/api ./node_modules/mocha/bin/_mocha test/api-legacy", + "test:api-legacy": "istanbul cover -i \"website/server/**\" --dir coverage/api ./node_modules/mocha/bin/_mocha test/api-legacy", "test:common": "mocha test/common --recursive", "test:content": "mocha test/content --recursive", "test:karma": "karma start --single-run", diff --git a/tasks/gulp-apidoc.js b/tasks/gulp-apidoc.js index a14c9df0c7..b8f65d2abd 100644 --- a/tasks/gulp-apidoc.js +++ b/tasks/gulp-apidoc.js @@ -3,7 +3,7 @@ import clean from 'rimraf'; import apidoc from 'apidoc'; const APIDOC_DEST_PATH = './website/build/apidoc'; -const APIDOC_SRC_PATH = './website/src'; +const APIDOC_SRC_PATH = './website/server'; gulp.task('apidoc:clean', (done) => { clean(APIDOC_DEST_PATH, done); }); diff --git a/tasks/gulp-build.js b/tasks/gulp-build.js index 923caad2c8..e660145d92 100644 --- a/tasks/gulp-build.js +++ b/tasks/gulp-build.js @@ -12,7 +12,7 @@ gulp.task('build', () => { }); gulp.task('build:src', () => { - return gulp.src('website/src/**/*.js') + return gulp.src('website/server/**/*.js') .pipe(babel()) .pipe(gulp.dest('website/transpiled-babel/')); }); @@ -30,7 +30,7 @@ gulp.task('build:dev', ['browserify', 'prepare:staticNewStuff'], (done) => { }); gulp.task('build:dev:watch', ['build:dev'], () => { - gulp.watch(['website/public/**/*.styl', 'common/script/*']); + gulp.watch(['website/client/**/*.styl', 'common/script/*']); }); gulp.task('build:prod', ['browserify', 'build:server', 'prepare:staticNewStuff'], (done) => { diff --git a/tasks/gulp-console.js b/tasks/gulp-console.js index 96af26a27a..026d646cee 100644 --- a/tasks/gulp-console.js +++ b/tasks/gulp-console.js @@ -1,6 +1,6 @@ import mongoose from 'mongoose'; import autoinc from 'mongoose-id-autoinc'; -import logger from '../website/src/libs/api-v3/logger'; +import logger from '../website/server/libs/api-v3/logger'; import nconf from 'nconf'; import repl from 'repl'; import gulp from 'gulp'; @@ -18,9 +18,9 @@ let improveRepl = (context) => { process.stdout.write('\u001B[2J\u001B[0;0f'); }}); - context.Challenge = require('../website/src/models/challenge').model; - context.Group = require('../website/src/models/group').model; - context.User = require('../website/src/models/user').model; + context.Challenge = require('../website/server/models/challenge').model; + context.Group = require('../website/server/models/group').model; + context.User = require('../website/server/models/user').model; var isProd = nconf.get('NODE_ENV') === 'production'; var mongooseOptions = !isProd ? {} : { diff --git a/tasks/gulp-newstuff.js b/tasks/gulp-newstuff.js index 16085e5c1c..b6d8093ee5 100644 --- a/tasks/gulp-newstuff.js +++ b/tasks/gulp-newstuff.js @@ -4,7 +4,7 @@ import {writeFileSync} from 'fs'; gulp.task('prepare:staticNewStuff', () => { writeFileSync( - './website/public/new-stuff.html', + './website/client/new-stuff.html', jade.compileFile('./website/views/shared/new-stuff.jade')() ); }); diff --git a/tasks/gulp-start.js b/tasks/gulp-start.js index 7cb842af00..51825f71ea 100644 --- a/tasks/gulp-start.js +++ b/tasks/gulp-start.js @@ -9,7 +9,7 @@ gulp.task('nodemon', () => { nodemon({ script: pkg.main, ignore: [ - 'website/public/*', + 'website/client/*', 'website/views/*', 'common/dist/script/content/*', ] diff --git a/tasks/gulp-tests.js b/tasks/gulp-tests.js index 18d9a8777b..7db299a5c4 100644 --- a/tasks/gulp-tests.js +++ b/tasks/gulp-tests.js @@ -68,7 +68,7 @@ gulp.task('test:prepare:mongo', (cb) => { gulp.task('test:prepare:server', ['test:prepare:mongo'], () => { if (!server) { - server = exec(testBin(`node ./website/src/index.js`, `NODE_DB_URI=${TEST_DB_URI} PORT=${TEST_SERVER_PORT}`), (error, stdout, stderr) => { + server = exec(testBin(`node ./website/server/index.js`, `NODE_DB_URI=${TEST_DB_URI} PORT=${TEST_SERVER_PORT}`), (error, stdout, stderr) => { if (error) { throw `Problem with the server: ${error}`; } if (stderr) { console.error(stderr); } }); @@ -219,7 +219,7 @@ gulp.task('test:api-legacy:watch', [ 'test:prepare:mongo', 'test:api-legacy:clean' ], () => { - gulp.watch(['website/src/**', 'test/api-legacy/**'], ['test:api-legacy:clean']); + gulp.watch(['website/server/**', 'test/api-legacy/**'], ['test:api-legacy:clean']); }); gulp.task('test:karma', ['test:prepare:build'], (cb) => { @@ -318,7 +318,7 @@ gulp.task('test:e2e:safe', ['test:prepare', 'test:prepare:server'], (cb) => { gulp.task('test:api-v2:watch', ['test:prepare:server'], () => { process.env.RUN_INTEGRATION_TEST_FOREVER = true; - gulp.watch(['website/src/**', 'test/api/v2/**'], ['test:api-v2']); + gulp.watch(['website/server/**', 'test/api/v2/**'], ['test:api-v2']); }); gulp.task('test:api-v2:safe', ['test:prepare:server'], (done) => { @@ -359,7 +359,7 @@ gulp.task('test:api-v3:unit', (done) => { }); gulp.task('test:api-v3:unit:watch', () => { - gulp.watch(['website/src/libs/api-v3/*', 'test/api/v3/unit/**/*', 'website/src/controllers/**/*'], ['test:api-v3:unit']); + gulp.watch(['website/server/libs/api-v3/*', 'test/api/v3/unit/**/*', 'website/server/controllers/**/*'], ['test:api-v3:unit']); }); gulp.task('test:api-v3:integration', (done) => { @@ -373,7 +373,7 @@ gulp.task('test:api-v3:integration', (done) => { }); gulp.task('test:api-v3:integration:watch', () => { - gulp.watch(['website/src/controllers/api-v3/**/*', 'common/script/ops/*', 'website/src/libs/api-v3/*.js', + gulp.watch(['website/server/controllers/api-v3/**/*', 'common/script/ops/*', 'website/server/libs/api-v3/*.js', 'test/api/v3/integration/**/*'], ['test:api-v3:integration']); }); @@ -417,7 +417,7 @@ gulp.task('test:api-v3:unit', (done) => {*/ /*}); gulp.task('test:api-v3:unit:watch', () => { - gulp.watch(['website/src/**', 'test/api/v3/unit/**'], ['test:api-v3:unit']); + gulp.watch(['website/server/**', 'test/api/v3/unit/**'], ['test:api-v3:unit']); }); gulp.task('test:api-v3:integration', ['test:prepare:server'], (done) => { @@ -429,7 +429,7 @@ gulp.task('test:api-v3:integration', ['test:prepare:server'], (done) => { gulp.task('test:api-v3:integration:watch', ['test:prepare:server'], () => { process.env.RUN_INTEGRATION_TEST_FOREVER = true; - gulp.watch(['website/src/**', 'test/api/v3/integration/**'], ['test:api-v3:integration']); + gulp.watch(['website/server/**', 'test/api/v3/integration/**'], ['test:api-v3:integration']); }); gulp.task('test:api-v3:safe', ['test:prepare:server'], (done) => { diff --git a/test/api-legacy/api-helper.js b/test/api-legacy/api-helper.js index e6b9b53d23..1b994a80a8 100644 --- a/test/api-legacy/api-helper.js +++ b/test/api-legacy/api-helper.js @@ -17,7 +17,7 @@ global._ = require("lodash"); global.shared = require("../../common"); -global.User = require("../../website/src/models/user").model; +global.User = require("../../website/server/models/user").model; global.chai = require("chai"); diff --git a/test/api-legacy/challenges.js b/test/api-legacy/challenges.js index 2f264655ef..b09754bc5c 100644 --- a/test/api-legacy/challenges.js +++ b/test/api-legacy/challenges.js @@ -1,10 +1,10 @@ var Challenge, Group, app; -app = require("../../website/src/server"); +app = require("../../website/server/server"); -Group = require("../../website/src/models/group").model; +Group = require("../../website/server/models/group").model; -Challenge = require("../../website/src/models/challenge").model; +Challenge = require("../../website/server/models/challenge").model; describe("Challenges", function() { var challenge, group, updateTodo; diff --git a/test/api-legacy/chat.js b/test/api-legacy/chat.js index 89b32b0c54..1f2dbab487 100644 --- a/test/api-legacy/chat.js +++ b/test/api-legacy/chat.js @@ -2,9 +2,9 @@ var Group, app, diff; diff = require("deep-diff"); -Group = require("../../website/src/models/group").model; +Group = require("../../website/server/models/group").model; -app = require("../../website/src/server"); +app = require("../../website/server/server"); describe("Chat", function() { var chat, group; diff --git a/test/api-legacy/coupons.js b/test/api-legacy/coupons.js index 31d840de61..4d4e366473 100644 --- a/test/api-legacy/coupons.js +++ b/test/api-legacy/coupons.js @@ -1,8 +1,8 @@ var Coupon, app, makeSudoUser; -app = require("../../website/src/server"); +app = require("../../website/server/server"); -Coupon = require("../../website/src/models/coupon").model; +Coupon = require("../../website/server/models/coupon").model; makeSudoUser = function(usr, cb) { return registerNewUser(function() { diff --git a/test/api-legacy/inAppPurchases.js b/test/api-legacy/inAppPurchases.js index d4182e437c..96809a7717 100644 --- a/test/api-legacy/inAppPurchases.js +++ b/test/api-legacy/inAppPurchases.js @@ -1,12 +1,12 @@ var app, iapMock, inApp, rewire, sinon; -app = require('../../website/src/server'); +app = require('../../website/server/server'); rewire = require('rewire'); sinon = require('sinon'); -inApp = rewire('../../website/src/controllers/payments/iap'); +inApp = rewire('../../website/server/controllers/payments/iap'); iapMock = {}; diff --git a/test/api-legacy/party.js b/test/api-legacy/party.js index 8ea8188713..2f98b67bde 100644 --- a/test/api-legacy/party.js +++ b/test/api-legacy/party.js @@ -2,9 +2,9 @@ var Group, app, diff; diff = require("deep-diff"); -Group = require("../../website/src/models/group").model; +Group = require("../../website/server/models/group").model; -app = require("../../website/src/server"); +app = require("../../website/server/server"); describe("Party", function() { return context("Quests", function() { diff --git a/test/api-legacy/pushNotifications.js b/test/api-legacy/pushNotifications.js index ce3d9672f8..7f98ddccfa 100644 --- a/test/api-legacy/pushNotifications.js +++ b/test/api-legacy/pushNotifications.js @@ -1,6 +1,6 @@ var app, rewire, sinon; -app = require("../../website/src/server"); +app = require("../../website/server/server"); rewire = require('rewire'); @@ -21,7 +21,7 @@ describe("Push-Notifications", function() { }); context("Challenges", function() { var challengeMock, challenges, userMock; - challenges = rewire("../../website/src/controllers/api-v2/challenges"); + challenges = rewire("../../website/server/controllers/api-v2/challenges"); challenges.__set__('pushNotify', pushSpy); challengeMock = { findById: function(arg, cb) { @@ -76,7 +76,7 @@ describe("Push-Notifications", function() { context("Groups", function() { var groups, recipient; recipient = null; - groups = rewire("../../website/src/controllers/api-v2/groups"); + groups = rewire("../../website/server/controllers/api-v2/groups"); groups.__set__('pushNotify', pushSpy); before(function(done) { return registerNewUser(function(err, _user) { @@ -304,7 +304,7 @@ describe("Push-Notifications", function() { }); context("sending gems from balance", function() { var members; - members = rewire("../../website/src/controllers/api-v2/members"); + members = rewire("../../website/server/controllers/api-v2/members"); members.sendMessage = function() { return true; }; @@ -342,7 +342,7 @@ describe("Push-Notifications", function() { }); return describe("Purchases", function() { var membersMock, payments; - payments = rewire("../../website/src/controllers/payments"); + payments = rewire("../../website/server/controllers/payments"); payments.__set__('pushNotify', pushSpy); membersMock = { sendMessage: function() { diff --git a/test/api-legacy/score.js b/test/api-legacy/score.js index 8c6906acfb..af31a4f334 100644 --- a/test/api-legacy/score.js +++ b/test/api-legacy/score.js @@ -1,4 +1,4 @@ -require("../../website/src/server"); +require("../../website/server/server"); describe("Score", function() { before(function(done) { diff --git a/test/api-legacy/subscriptions.js b/test/api-legacy/subscriptions.js index 9d8624cb73..73b55039df 100644 --- a/test/api-legacy/subscriptions.js +++ b/test/api-legacy/subscriptions.js @@ -1,8 +1,8 @@ var app, payments; -payments = require("../../website/src/controllers/payments"); +payments = require("../../website/server/controllers/payments"); -app = require("../../website/src/server"); +app = require("../../website/server/server"); describe("Subscriptions", function() { before(function(done) { diff --git a/test/api-legacy/todos.js b/test/api-legacy/todos.js index 5285847fd1..b72ea57223 100644 --- a/test/api-legacy/todos.js +++ b/test/api-legacy/todos.js @@ -1,4 +1,4 @@ -require("../../website/src/server"); +require("../../website/server/server"); describe("Todos", function() { before(function(done) { diff --git a/test/api/v2/groups/GET-groups.test.js b/test/api/v2/groups/GET-groups.test.js index 0b6cd4923e..d941b2533e 100644 --- a/test/api/v2/groups/GET-groups.test.js +++ b/test/api/v2/groups/GET-groups.test.js @@ -5,7 +5,7 @@ import { } from '../../../helpers/api-integration/v2'; import { TAVERN_ID, -} from '../../../../website/src/models/group'; +} from '../../../../website/server/models/group'; describe('GET /groups', () => { const NUMBER_OF_PUBLIC_GUILDS = 3; diff --git a/test/api/v3/integration/emails/GET-email-unsubscribe.test.js b/test/api/v3/integration/emails/GET-email-unsubscribe.test.js index bd13cbdc1e..1bd3a532fa 100644 --- a/test/api/v3/integration/emails/GET-email-unsubscribe.test.js +++ b/test/api/v3/integration/emails/GET-email-unsubscribe.test.js @@ -2,7 +2,7 @@ import { generateUser, translate as t, } from '../../../../helpers/api-v3-integration.helper'; -import { encrypt } from '../../../../../website/src/libs/api-v3/encryption'; +import { encrypt } from '../../../../../website/server/libs/api-v3/encryption'; import { v4 as generateUUID } from 'uuid'; describe('GET /email/unsubscribe', () => { diff --git a/test/api/v3/integration/groups/GET-groups.test.js b/test/api/v3/integration/groups/GET-groups.test.js index d076e52a18..279f091411 100644 --- a/test/api/v3/integration/groups/GET-groups.test.js +++ b/test/api/v3/integration/groups/GET-groups.test.js @@ -5,7 +5,7 @@ import { } from '../../../../helpers/api-v3-integration.helper'; import { TAVERN_ID, -} from '../../../../../website/src/models/group'; +} from '../../../../../website/server/models/group'; describe('GET /groups', () => { let user; diff --git a/test/api/v3/integration/user/auth/POST-register_local.test.js b/test/api/v3/integration/user/auth/POST-register_local.test.js index d0b46ecfa9..63d8f755a5 100644 --- a/test/api/v3/integration/user/auth/POST-register_local.test.js +++ b/test/api/v3/integration/user/auth/POST-register_local.test.js @@ -6,7 +6,7 @@ import { } from '../../../../../helpers/api-integration/v3'; import { v4 as generateRandomUserName } from 'uuid'; import { each } from 'lodash'; -import { encrypt } from '../../../../../../website/src/libs/api-v3/encryption'; +import { encrypt } from '../../../../../../website/server/libs/api-v3/encryption'; describe('POST /user/auth/local/register', () => { context('username and email are free', () => { diff --git a/test/api/v3/unit/libs/analyticsService.test.js b/test/api/v3/unit/libs/analyticsService.test.js index 8ff14c2408..771678cc3d 100644 --- a/test/api/v3/unit/libs/analyticsService.test.js +++ b/test/api/v3/unit/libs/analyticsService.test.js @@ -1,4 +1,4 @@ -import analyticsService from '../../../../../website/src/libs/api-v3/analyticsService'; +import analyticsService from '../../../../../website/server/libs/api-v3/analyticsService'; import nock from 'nock'; diff --git a/test/api/v3/unit/libs/baseModel.test.js b/test/api/v3/unit/libs/baseModel.test.js index 9a51998053..39bf7df047 100644 --- a/test/api/v3/unit/libs/baseModel.test.js +++ b/test/api/v3/unit/libs/baseModel.test.js @@ -1,4 +1,4 @@ -import baseModel from '../../../../../website/src/libs/api-v3/baseModel'; +import baseModel from '../../../../../website/server/libs/api-v3/baseModel'; import mongoose from 'mongoose'; describe('Base model plugin', () => { diff --git a/test/api/v3/unit/libs/buildManifest.test.js b/test/api/v3/unit/libs/buildManifest.test.js index 0978d8fb41..1444738f10 100644 --- a/test/api/v3/unit/libs/buildManifest.test.js +++ b/test/api/v3/unit/libs/buildManifest.test.js @@ -1,6 +1,6 @@ import { getManifestFiles, -} from '../../../../../website/src/libs/api-v3/buildManifest'; +} from '../../../../../website/server/libs/api-v3/buildManifest'; describe('Build Manifest', () => { describe('getManifestFiles', () => { diff --git a/test/api/v3/unit/libs/collectionManipulators.test.js b/test/api/v3/unit/libs/collectionManipulators.test.js index e32e953d51..da44fd5319 100644 --- a/test/api/v3/unit/libs/collectionManipulators.test.js +++ b/test/api/v3/unit/libs/collectionManipulators.test.js @@ -1,7 +1,7 @@ import mongoose from 'mongoose'; import { removeFromArray, -} from '../../../../../website/src/libs/api-v3/collectionManipulators'; +} from '../../../../../website/server/libs/api-v3/collectionManipulators'; describe('Collection Manipulators', () => { describe('removeFromArray', () => { diff --git a/test/api/v3/unit/libs/cron.test.js b/test/api/v3/unit/libs/cron.test.js index 382246a3c8..a7e732442c 100644 --- a/test/api/v3/unit/libs/cron.test.js +++ b/test/api/v3/unit/libs/cron.test.js @@ -1,8 +1,8 @@ /* eslint-disable global-require */ import moment from 'moment'; -import { cron } from '../../../../../website/src/libs/api-v3/cron'; -import { model as User } from '../../../../../website/src/models/user'; -import * as Tasks from '../../../../../website/src/models/task'; +import { cron } from '../../../../../website/server/libs/api-v3/cron'; +import { model as User } from '../../../../../website/server/models/user'; +import * as Tasks from '../../../../../website/server/models/task'; import { clone } from 'lodash'; import common from '../../../../../common'; diff --git a/test/api/v3/unit/libs/email.test.js b/test/api/v3/unit/libs/email.test.js index d997751a3c..bb76e05cfb 100644 --- a/test/api/v3/unit/libs/email.test.js +++ b/test/api/v3/unit/libs/email.test.js @@ -4,7 +4,7 @@ import nconf from 'nconf'; import nodemailer from 'nodemailer'; import Bluebird from 'bluebird'; import requireAgain from 'require-again'; -import logger from '../../../../../website/src/libs/api-v3/logger'; +import logger from '../../../../../website/server/libs/api-v3/logger'; function defer () { let resolve; @@ -49,7 +49,7 @@ function getUser () { } describe('emails', () => { - let pathToEmailLib = '../../../../../website/src/libs/api-v3/email'; + let pathToEmailLib = '../../../../../website/server/libs/api-v3/email'; describe('sendEmail', () => { it('can send an email using the default transport', () => { diff --git a/test/api/v3/unit/libs/encryption.test.js b/test/api/v3/unit/libs/encryption.test.js index 34c159ed02..a63a527e74 100644 --- a/test/api/v3/unit/libs/encryption.test.js +++ b/test/api/v3/unit/libs/encryption.test.js @@ -1,7 +1,7 @@ import { encrypt, decrypt, -} from '../../../../../website/src/libs/api-v3/encryption'; +} from '../../../../../website/server/libs/api-v3/encryption'; describe('encryption', () => { it('can encrypt and decrypt', () => { diff --git a/test/api/v3/unit/libs/errors.test.js b/test/api/v3/unit/libs/errors.test.js index d36e1615c7..efa694d5ab 100644 --- a/test/api/v3/unit/libs/errors.test.js +++ b/test/api/v3/unit/libs/errors.test.js @@ -5,7 +5,7 @@ import { BadRequest, InternalServerError, NotFound, -} from '../../../../../website/src/libs/api-v3/errors'; +} from '../../../../../website/server/libs/api-v3/errors'; describe('Custom Errors', () => { describe('CustomError', () => { diff --git a/test/api/v3/unit/libs/i18n.test.js b/test/api/v3/unit/libs/i18n.test.js index 098bfefa21..06ebcbc0b6 100644 --- a/test/api/v3/unit/libs/i18n.test.js +++ b/test/api/v3/unit/libs/i18n.test.js @@ -2,7 +2,7 @@ import { translations, localePath, langCodes, -} from '../../../../../website/src/libs/api-v3/i18n'; +} from '../../../../../website/server/libs/api-v3/i18n'; import fs from 'fs'; import path from 'path'; diff --git a/test/api/v3/unit/libs/logger.js b/test/api/v3/unit/libs/logger.js index a0f5eb011f..b7e1d490fc 100644 --- a/test/api/v3/unit/libs/logger.js +++ b/test/api/v3/unit/libs/logger.js @@ -3,7 +3,7 @@ import requireAgain from 'require-again'; /* eslint-disable global-require */ describe('logger', () => { - let pathToLoggerLib = '../../../../../website/src/libs/api-v3/logger'; + let pathToLoggerLib = '../../../../../website/server/libs/api-v3/logger'; let infoSpy; let errorSpy; diff --git a/test/api/v3/unit/libs/password.test.js b/test/api/v3/unit/libs/password.test.js index 6bc652963e..68290aebc6 100644 --- a/test/api/v3/unit/libs/password.test.js +++ b/test/api/v3/unit/libs/password.test.js @@ -1,7 +1,7 @@ import { encrypt as encryptPassword, makeSalt, -} from '../../../../../website/src/libs/api-v3/password'; +} from '../../../../../website/server/libs/api-v3/password'; describe('Password Utilities', () => { describe('Encrypt', () => { diff --git a/test/api/v3/unit/libs/payments.test.js b/test/api/v3/unit/libs/payments.test.js index bc4a3e647d..30fe78b643 100644 --- a/test/api/v3/unit/libs/payments.test.js +++ b/test/api/v3/unit/libs/payments.test.js @@ -1,6 +1,6 @@ -import * as sender from '../../../../../website/src/libs/api-v3/email'; -import * as api from '../../../../../website/src/libs/api-v3/payments'; -import { model as User } from '../../../../../website/src/models/user'; +import * as sender from '../../../../../website/server/libs/api-v3/email'; +import * as api from '../../../../../website/server/libs/api-v3/payments'; +import { model as User } from '../../../../../website/server/models/user'; import moment from 'moment'; describe('payments/index', () => { diff --git a/test/api/v3/unit/libs/preening.test.js b/test/api/v3/unit/libs/preening.test.js index aaccd47ec4..af503ca480 100644 --- a/test/api/v3/unit/libs/preening.test.js +++ b/test/api/v3/unit/libs/preening.test.js @@ -1,4 +1,4 @@ -import { preenHistory } from '../../../../../website/src/libs/api-v3/preening'; +import { preenHistory } from '../../../../../website/server/libs/api-v3/preening'; import moment from 'moment'; import sinon from 'sinon'; // eslint-disable-line no-shadow import { generateHistory } from '../../../../helpers/api-unit.helper.js'; diff --git a/test/api/v3/unit/libs/setupNconf.test.js b/test/api/v3/unit/libs/setupNconf.test.js index e0647d38d2..3e848b845f 100644 --- a/test/api/v3/unit/libs/setupNconf.test.js +++ b/test/api/v3/unit/libs/setupNconf.test.js @@ -1,4 +1,4 @@ -import setupNconf from '../../../../../website/src/libs/api-v3/setupNconf'; +import setupNconf from '../../../../../website/server/libs/api-v3/setupNconf'; import path from 'path'; import nconf from 'nconf'; diff --git a/test/api/v3/unit/libs/webhooks.test.js b/test/api/v3/unit/libs/webhooks.test.js index 9bef501257..502bfe3839 100644 --- a/test/api/v3/unit/libs/webhooks.test.js +++ b/test/api/v3/unit/libs/webhooks.test.js @@ -1,5 +1,5 @@ import request from 'request'; -import { sendTaskWebhook } from '../../../../../website/src/libs/api-v3/webhook'; +import { sendTaskWebhook } from '../../../../../website/server/libs/api-v3/webhook'; describe('webhooks', () => { beforeEach(() => { diff --git a/test/api/v3/unit/middlewares/analytics.test.js b/test/api/v3/unit/middlewares/analytics.test.js index 2f3a0b7ff0..2a25380713 100644 --- a/test/api/v3/unit/middlewares/analytics.test.js +++ b/test/api/v3/unit/middlewares/analytics.test.js @@ -4,13 +4,13 @@ import { generateReq, generateNext, } from '../../../../helpers/api-unit.helper'; -import analyticsService from '../../../../../website/src/libs/api-v3/analyticsService'; +import analyticsService from '../../../../../website/server/libs/api-v3/analyticsService'; import nconf from 'nconf'; import requireAgain from 'require-again'; describe('analytics middleware', () => { let res, req, next; - let pathToAnalyticsMiddleware = '../../../../../website/src/middlewares/api-v3/analytics'; + let pathToAnalyticsMiddleware = '../../../../../website/server/middlewares/api-v3/analytics'; beforeEach(() => { res = generateRes(); diff --git a/test/api/v3/unit/middlewares/cors.test.js b/test/api/v3/unit/middlewares/cors.test.js index 3fd449c963..78d11651f8 100644 --- a/test/api/v3/unit/middlewares/cors.test.js +++ b/test/api/v3/unit/middlewares/cors.test.js @@ -4,7 +4,7 @@ import { generateReq, generateNext, } from '../../../../helpers/api-unit.helper'; -import cors from '../../../../../website/src/middlewares/api-v3/cors'; +import cors from '../../../../../website/server/middlewares/api-v3/cors'; describe('cors middleware', () => { let res, req, next; diff --git a/test/api/v3/unit/middlewares/cronMiddleware.js b/test/api/v3/unit/middlewares/cronMiddleware.js index 71b4843b8b..f4e040a11c 100644 --- a/test/api/v3/unit/middlewares/cronMiddleware.js +++ b/test/api/v3/unit/middlewares/cronMiddleware.js @@ -5,12 +5,12 @@ import { generateTodo, generateDaily, } from '../../../../helpers/api-unit.helper'; -import cronMiddleware from '../../../../../website/src/middlewares/api-v3/cron'; +import cronMiddleware from '../../../../../website/server/middlewares/api-v3/cron'; import moment from 'moment'; -import { model as User } from '../../../../../website/src/models/user'; -import { model as Group } from '../../../../../website/src/models/group'; -import * as Tasks from '../../../../../website/src/models/task'; -import analyticsService from '../../../../../website/src/libs/api-v3/analyticsService'; +import { model as User } from '../../../../../website/server/models/user'; +import { model as Group } from '../../../../../website/server/models/group'; +import * as Tasks from '../../../../../website/server/models/task'; +import analyticsService from '../../../../../website/server/libs/api-v3/analyticsService'; import { v4 as generateUUID } from 'uuid'; describe('cron middleware', () => { diff --git a/test/api/v3/unit/middlewares/ensureAccessRight.test.js b/test/api/v3/unit/middlewares/ensureAccessRight.test.js index 6c50e3d674..cc25e4f16b 100644 --- a/test/api/v3/unit/middlewares/ensureAccessRight.test.js +++ b/test/api/v3/unit/middlewares/ensureAccessRight.test.js @@ -5,8 +5,8 @@ import { generateNext, } from '../../../../helpers/api-unit.helper'; import i18n from '../../../../../common/script/i18n'; -import { ensureAdmin, ensureSudo } from '../../../../../website/src/middlewares/api-v3/ensureAccessRight'; -import { NotAuthorized } from '../../../../../website/src/libs/api-v3/errors'; +import { ensureAdmin, ensureSudo } from '../../../../../website/server/middlewares/api-v3/ensureAccessRight'; +import { NotAuthorized } from '../../../../../website/server/libs/api-v3/errors'; describe('ensure access middlewares', () => { let res, req, next; diff --git a/test/api/v3/unit/middlewares/ensureDevelpmentMode.js b/test/api/v3/unit/middlewares/ensureDevelpmentMode.js index 8d0f8efbab..d7915b365f 100644 --- a/test/api/v3/unit/middlewares/ensureDevelpmentMode.js +++ b/test/api/v3/unit/middlewares/ensureDevelpmentMode.js @@ -4,8 +4,8 @@ import { generateReq, generateNext, } from '../../../../helpers/api-unit.helper'; -import ensureDevelpmentMode from '../../../../../website/src/middlewares/api-v3/ensureDevelpmentMode'; -import { NotFound } from '../../../../../website/src/libs/api-v3/errors'; +import ensureDevelpmentMode from '../../../../../website/server/middlewares/api-v3/ensureDevelpmentMode'; +import { NotFound } from '../../../../../website/server/libs/api-v3/errors'; import nconf from 'nconf'; describe('developmentMode middleware', () => { diff --git a/test/api/v3/unit/middlewares/errorHandler.test.js b/test/api/v3/unit/middlewares/errorHandler.test.js index 89ce1b7db6..72cad12a32 100644 --- a/test/api/v3/unit/middlewares/errorHandler.test.js +++ b/test/api/v3/unit/middlewares/errorHandler.test.js @@ -4,15 +4,15 @@ import { generateNext, } from '../../../../helpers/api-unit.helper'; -import errorHandler from '../../../../../website/src/middlewares/api-v3/errorHandler'; -import responseMiddleware from '../../../../../website/src/middlewares/api-v3/response'; +import errorHandler from '../../../../../website/server/middlewares/api-v3/errorHandler'; +import responseMiddleware from '../../../../../website/server/middlewares/api-v3/response'; import { getUserLanguage, attachTranslateFunction, -} from '../../../../../website/src/middlewares/api-v3/language'; +} from '../../../../../website/server/middlewares/api-v3/language'; -import { BadRequest } from '../../../../../website/src/libs/api-v3/errors'; -import logger from '../../../../../website/src/libs/api-v3/logger'; +import { BadRequest } from '../../../../../website/server/libs/api-v3/errors'; +import logger from '../../../../../website/server/libs/api-v3/logger'; describe('errorHandler', () => { let res, req, next; diff --git a/test/api/v3/unit/middlewares/language.test.js b/test/api/v3/unit/middlewares/language.test.js index 2316f0b540..23ef6deddd 100644 --- a/test/api/v3/unit/middlewares/language.test.js +++ b/test/api/v3/unit/middlewares/language.test.js @@ -6,10 +6,10 @@ import { import { getUserLanguage, attachTranslateFunction, -} from '../../../../../website/src/middlewares/api-v3/language'; +} from '../../../../../website/server/middlewares/api-v3/language'; import common from '../../../../../common'; import Bluebird from 'bluebird'; -import { model as User } from '../../../../../website/src/models/user'; +import { model as User } from '../../../../../website/server/models/user'; const i18n = common.i18n; diff --git a/test/api/v3/unit/middlewares/response.js b/test/api/v3/unit/middlewares/response.js index e46da348c0..a24bd881ce 100644 --- a/test/api/v3/unit/middlewares/response.js +++ b/test/api/v3/unit/middlewares/response.js @@ -3,7 +3,7 @@ import { generateReq, generateNext, } from '../../../../helpers/api-unit.helper'; -import responseMiddleware from '../../../../../website/src/middlewares/api-v3/response'; +import responseMiddleware from '../../../../../website/server/middlewares/api-v3/response'; describe('response middleware', () => { let res, req, next; diff --git a/test/api/v3/unit/models/challenge.test.js b/test/api/v3/unit/models/challenge.test.js index c1cbd83e18..b2f0e7ff98 100644 --- a/test/api/v3/unit/models/challenge.test.js +++ b/test/api/v3/unit/models/challenge.test.js @@ -1,7 +1,7 @@ -import { model as Challenge } from '../../../../../website/src/models/challenge'; -import { model as Group } from '../../../../../website/src/models/group'; -import { model as User } from '../../../../../website/src/models/user'; -import * as Tasks from '../../../../../website/src/models/task'; +import { model as Challenge } from '../../../../../website/server/models/challenge'; +import { model as Group } from '../../../../../website/server/models/group'; +import { model as User } from '../../../../../website/server/models/user'; +import * as Tasks from '../../../../../website/server/models/task'; import common from '../../../../../common/'; import { each, find } from 'lodash'; diff --git a/test/api/v3/unit/models/group.test.js b/test/api/v3/unit/models/group.test.js index e1323baa07..32007e068d 100644 --- a/test/api/v3/unit/models/group.test.js +++ b/test/api/v3/unit/models/group.test.js @@ -1,8 +1,8 @@ import { sleep } from '../../../../helpers/api-unit.helper'; -import { model as Group } from '../../../../../website/src/models/group'; -import { model as User } from '../../../../../website/src/models/user'; +import { model as Group } from '../../../../../website/server/models/group'; +import { model as User } from '../../../../../website/server/models/user'; import { quests as questScrolls } from '../../../../../common/script/content'; -import * as email from '../../../../../website/src/libs/api-v3/email'; +import * as email from '../../../../../website/server/libs/api-v3/email'; describe('Group Model', () => { context('Instance Methods', () => { diff --git a/test/api/v3/unit/models/task.test.js b/test/api/v3/unit/models/task.test.js index 8a889a2145..1c3082d863 100644 --- a/test/api/v3/unit/models/task.test.js +++ b/test/api/v3/unit/models/task.test.js @@ -1,7 +1,7 @@ -import { model as Challenge } from '../../../../../website/src/models/challenge'; -import { model as Group } from '../../../../../website/src/models/group'; -import { model as User } from '../../../../../website/src/models/user'; -import * as Tasks from '../../../../../website/src/models/task'; +import { model as Challenge } from '../../../../../website/server/models/challenge'; +import { model as Group } from '../../../../../website/server/models/group'; +import { model as User } from '../../../../../website/server/models/user'; +import * as Tasks from '../../../../../website/server/models/task'; import { each } from 'lodash'; import { generateHistory } from '../../../../helpers/api-unit.helper.js'; diff --git a/test/api/v3/unit/models/user.test.js b/test/api/v3/unit/models/user.test.js index 414052a3b6..d7f509712c 100644 --- a/test/api/v3/unit/models/user.test.js +++ b/test/api/v3/unit/models/user.test.js @@ -1,4 +1,4 @@ -import { model as User } from '../../../../../website/src/models/user'; +import { model as User } from '../../../../../website/server/models/user'; describe('User Model', () => { it('keeps user._tmp when calling .toJSON', () => { diff --git a/test/helpers/api-integration/translate.js b/test/helpers/api-integration/translate.js index 1e1ab83869..3ef7d68541 100644 --- a/test/helpers/api-integration/translate.js +++ b/test/helpers/api-integration/translate.js @@ -1,5 +1,5 @@ import i18n from '../../../common/script/i18n'; -i18n.translations = require('../../../website/src/libs/api-v3/i18n').translations; +i18n.translations = require('../../../website/server/libs/api-v3/i18n').translations; // Use this to verify error messages returned by the server // That way, if the translated string changes, the test diff --git a/test/helpers/api-integration/v3/object-generators.js b/test/helpers/api-integration/v3/object-generators.js index 3717d27a11..f257c3543f 100644 --- a/test/helpers/api-integration/v3/object-generators.js +++ b/test/helpers/api-integration/v3/object-generators.js @@ -5,7 +5,7 @@ import Bluebird from 'bluebird'; import { v4 as generateUUID } from 'uuid'; import { ApiUser, ApiGroup, ApiChallenge } from '../api-classes'; import { requester } from '../requester'; -import * as Tasks from '../../../../website/src/models/task'; +import * as Tasks from '../../../../website/server/models/task'; // Creates a new user and returns it // If you need the user to have specific requirements, diff --git a/test/helpers/api-unit.helper.js b/test/helpers/api-unit.helper.js index beeac66098..ca8b57ae7f 100644 --- a/test/helpers/api-unit.helper.js +++ b/test/helpers/api-unit.helper.js @@ -1,12 +1,12 @@ -import '../../website/src/libs/api-v3/i18n'; +import '../../website/server/libs/api-v3/i18n'; import mongoose from 'mongoose'; import { defaultsDeep as defaults } from 'lodash'; -import { model as User } from '../../website/src/models/user'; -import { model as Group } from '../../website/src/models/group'; +import { model as User } from '../../website/server/models/user'; +import { model as Group } from '../../website/server/models/group'; import mongo from './mongo'; // eslint-disable-line import moment from 'moment'; import i18n from '../../common/script/i18n'; -import * as Tasks from '../../website/src/models/task'; +import * as Tasks from '../../website/server/models/task'; afterEach((done) => { sandbox.restore(); diff --git a/test/helpers/common.helper.js b/test/helpers/common.helper.js index 96064b8142..4cd82ca4b4 100644 --- a/test/helpers/common.helper.js +++ b/test/helpers/common.helper.js @@ -1,13 +1,13 @@ import mongoose from 'mongoose'; import { wrap as wrapUser } from '../../common/script/index'; -import { model as User } from '../../website/src/models/user'; +import { model as User } from '../../website/server/models/user'; import { DailySchema, HabitSchema, RewardSchema, TodoSchema, -} from '../../website/src/models/task'; +} from '../../website/server/models/task'; export function generateUser (options = {}) { let user = new User(options).toObject(); diff --git a/test/helpers/content.helper.js b/test/helpers/content.helper.js index b77ff83383..c1ac3c5657 100644 --- a/test/helpers/content.helper.js +++ b/test/helpers/content.helper.js @@ -1,6 +1,6 @@ require('./globals.helper'); import i18n from '../../common/script/i18n'; -i18n.translations = require('../../website/src/libs/api-v3/i18n').translations; +i18n.translations = require('../../website/server/libs/api-v3/i18n').translations; export const STRING_ERROR_MSG = 'Error processing the string. Please see Help > Report a Bug.'; export const STRING_DOES_NOT_EXIST_MSG = /^String '.*' not found.$/; diff --git a/test/helpers/globals.helper.js b/test/helpers/globals.helper.js index eaaf8b7bfc..d57474bc4e 100644 --- a/test/helpers/globals.helper.js +++ b/test/helpers/globals.helper.js @@ -23,17 +23,17 @@ import mongoose from 'mongoose'; // Load nconf for unit tests //------------------------------ if (process.env.LOAD_SERVER === '0') { // when the server is in a different process we simply connect to mongoose - require('../../website/src/libs/api-v3/setupNconf')('./config.json'); + require('../../website/server/libs/api-v3/setupNconf')('./config.json'); // Use Q promises instead of mpromise in mongoose mongoose.Promise = Bluebird; mongoose.connect(nconf.get('NODE_DB_URI')); } else { // When running tests and the server in the same process - require('../../website/src/libs/api-v3/setupNconf')('./config.json.example'); + require('../../website/server/libs/api-v3/setupNconf')('./config.json.example'); nconf.set('NODE_DB_URI', 'mongodb://localhost/habitrpg_test'); nconf.set('NODE_ENV', 'test'); nconf.set('IS_TEST', true); // We require src/server and npt src/index because // 1. nconf is already setup // 2. we don't need clustering - require('../../website/src/server'); + require('../../website/server/server'); } diff --git a/test/helpers/mongo.js b/test/helpers/mongo.js index 6b51ff2af0..9ad5cc8700 100644 --- a/test/helpers/mongo.js +++ b/test/helpers/mongo.js @@ -1,5 +1,5 @@ import mongoose from 'mongoose'; -import { TAVERN_ID } from '../../website/src/models/group'; +import { TAVERN_ID } from '../../website/server/models/group'; // Useful for checking things that have been deleted, // but you no longer have access to, diff --git a/test/migrations/20150605_ultimate_achievement_backfill.coffee b/test/migrations/20150605_ultimate_achievement_backfill.coffee index b5646020b0..689b49cb67 100644 --- a/test/migrations/20150605_ultimate_achievement_backfill.coffee +++ b/test/migrations/20150605_ultimate_achievement_backfill.coffee @@ -2,7 +2,7 @@ TEST_DB = process.env.DB_NAME = 'habitrpg_migration_test' process.env.NODE_DB_URI = 'mongodb://localhost/' + TEST_DB -app = require('../../website/src/server') +app = require('../../website/server/server') sh = require('shelljs') runMigration = -> diff --git a/test/server_side/analytics.test.js b/test/server_side/analytics.test.js index 56dd8f1787..5257303242 100644 --- a/test/server_side/analytics.test.js +++ b/test/server_side/analytics.test.js @@ -30,7 +30,7 @@ describe('analytics', function() { }); describe('init', function() { - var analytics = rewire('../../website/src/libs/api-v2/analytics'); + var analytics = rewire('../../website/server/libs/api-v2/analytics'); it('throws an error if no options are passed in', function() { expect(analytics).to.throw('No options provided'); @@ -62,7 +62,7 @@ describe('analytics', function() { describe('track', function() { var analyticsData, event_type; - var analytics = rewire('../../website/src/libs/api-v2/analytics'); + var analytics = rewire('../../website/server/libs/api-v2/analytics'); var initializedAnalytics; beforeEach(function() { @@ -370,7 +370,7 @@ describe('analytics', function() { var purchaseData; - var analytics = rewire('../../website/src/libs/api-v2/analytics'); + var analytics = rewire('../../website/server/libs/api-v2/analytics'); var initializedAnalytics; beforeEach(function() { diff --git a/test/server_side/controllers/groups.test.js b/test/server_side/controllers/groups.test.js index 664a5b8d11..bf12df321b 100644 --- a/test/server_side/controllers/groups.test.js +++ b/test/server_side/controllers/groups.test.js @@ -4,11 +4,11 @@ chai.use(require("sinon-chai")); var expect = chai.expect; var Bluebird = require('bluebird'); -var Group = require('../../../website/src/models/group').model; -var groupsController = require('../../../website/src/controllers/api-v2/groups'); +var Group = require('../../../website/server/models/group').model; +var groupsController = require('../../../website/server/controllers/api-v2/groups'); describe('Groups Controller', function() { - var utils = require('../../../website/src/libs/api-v2/utils'); + var utils = require('../../../website/server/libs/api-v2/utils'); describe('#invite', function() { var res, req, user, group; @@ -69,7 +69,7 @@ describe('Groups Controller', function() { }); context('emails', function() { - var EmailUnsubscription = require('../../../website/src/models/emailUnsubscription').model; + var EmailUnsubscription = require('../../../website/server/models/emailUnsubscription').model; var execStub, selectStub; beforeEach(function() { diff --git a/test/server_side/controllers/user.test.js b/test/server_side/controllers/user.test.js index 2be7f7215a..59589df511 100644 --- a/test/server_side/controllers/user.test.js +++ b/test/server_side/controllers/user.test.js @@ -4,7 +4,7 @@ chai.use(require("sinon-chai")) var expect = chai.expect var rewire = require('rewire'); -var userController = rewire('../../../website/src/controllers/api-v2/user'); +var userController = rewire('../../../website/server/controllers/api-v2/user'); describe('User Controller', function() { @@ -359,7 +359,7 @@ describe('User Controller', function() { }); it('sends webhooks', function() { - var webhook = require('../../../website/src/libs/webhook'); + var webhook = require('../../../website/server/libs/webhook'); sinon.spy(webhook, 'sendTaskWebhook'); userController.score(req, res); @@ -384,7 +384,7 @@ describe('User Controller', function() { }); context('save callback dealing with non challenge tasks', function() { - var Challenge = require('../../../website/src/models/challenge').model; + var Challenge = require('../../../website/server/models/challenge').model; beforeEach(function() { user.save.yields(null, user); @@ -446,7 +446,7 @@ describe('User Controller', function() { }); context('save callback dealing with challenge tasks', function() { - var Challenge = require('../../../website/src/models/challenge').model; + var Challenge = require('../../../website/server/models/challenge').model; var chal; beforeEach(function() { diff --git a/test/server_side/webhooks.test.js b/test/server_side/webhooks.test.js index 45e042db8a..621d0daba3 100644 --- a/test/server_side/webhooks.test.js +++ b/test/server_side/webhooks.test.js @@ -4,7 +4,7 @@ chai.use(require("sinon-chai")) var expect = chai.expect var rewire = require('rewire'); -var webhook = rewire('../../website/src/libs/api-v2/webhook'); +var webhook = rewire('../../website/server/libs/api-v2/webhook'); describe('webhooks', function() { var postSpy; diff --git a/website/public/500.html b/website/client/500.html similarity index 100% rename from website/public/500.html rename to website/client/500.html diff --git a/website/public/apple-touch-icon-114-precomposed.png b/website/client/apple-touch-icon-114-precomposed.png similarity index 100% rename from website/public/apple-touch-icon-114-precomposed.png rename to website/client/apple-touch-icon-114-precomposed.png diff --git a/website/public/apple-touch-icon-144-precomposed.png b/website/client/apple-touch-icon-144-precomposed.png similarity index 100% rename from website/public/apple-touch-icon-144-precomposed.png rename to website/client/apple-touch-icon-144-precomposed.png diff --git a/website/public/apple-touch-icon-57-precomposed.png b/website/client/apple-touch-icon-57-precomposed.png similarity index 100% rename from website/public/apple-touch-icon-57-precomposed.png rename to website/client/apple-touch-icon-57-precomposed.png diff --git a/website/public/apple-touch-icon-72-precomposed.png b/website/client/apple-touch-icon-72-precomposed.png similarity index 100% rename from website/public/apple-touch-icon-72-precomposed.png rename to website/client/apple-touch-icon-72-precomposed.png diff --git a/website/public/apple-touch-icon-precomposed.png b/website/client/apple-touch-icon-precomposed.png similarity index 100% rename from website/public/apple-touch-icon-precomposed.png rename to website/client/apple-touch-icon-precomposed.png diff --git a/website/public/cake.png b/website/client/cake.png similarity index 100% rename from website/public/cake.png rename to website/client/cake.png diff --git a/website/public/community-guidelines-images/backCorner.png b/website/client/community-guidelines-images/backCorner.png similarity index 100% rename from website/public/community-guidelines-images/backCorner.png rename to website/client/community-guidelines-images/backCorner.png diff --git a/website/public/community-guidelines-images/beingHabitican.png b/website/client/community-guidelines-images/beingHabitican.png similarity index 100% rename from website/public/community-guidelines-images/beingHabitican.png rename to website/client/community-guidelines-images/beingHabitican.png diff --git a/website/public/community-guidelines-images/consequences.png b/website/client/community-guidelines-images/consequences.png similarity index 100% rename from website/public/community-guidelines-images/consequences.png rename to website/client/community-guidelines-images/consequences.png diff --git a/website/public/community-guidelines-images/contributing.png b/website/client/community-guidelines-images/contributing.png similarity index 100% rename from website/public/community-guidelines-images/contributing.png rename to website/client/community-guidelines-images/contributing.png diff --git a/website/public/community-guidelines-images/github.gif b/website/client/community-guidelines-images/github.gif similarity index 100% rename from website/public/community-guidelines-images/github.gif rename to website/client/community-guidelines-images/github.gif diff --git a/website/public/community-guidelines-images/infractions.png b/website/client/community-guidelines-images/infractions.png similarity index 100% rename from website/public/community-guidelines-images/infractions.png rename to website/client/community-guidelines-images/infractions.png diff --git a/website/public/community-guidelines-images/intro.png b/website/client/community-guidelines-images/intro.png similarity index 100% rename from website/public/community-guidelines-images/intro.png rename to website/client/community-guidelines-images/intro.png diff --git a/website/public/community-guidelines-images/moderators.png b/website/client/community-guidelines-images/moderators.png similarity index 100% rename from website/public/community-guidelines-images/moderators.png rename to website/client/community-guidelines-images/moderators.png diff --git a/website/public/community-guidelines-images/publicGuilds.png b/website/client/community-guidelines-images/publicGuilds.png similarity index 100% rename from website/public/community-guidelines-images/publicGuilds.png rename to website/client/community-guidelines-images/publicGuilds.png diff --git a/website/public/community-guidelines-images/publicSpaces.png b/website/client/community-guidelines-images/publicSpaces.png similarity index 100% rename from website/public/community-guidelines-images/publicSpaces.png rename to website/client/community-guidelines-images/publicSpaces.png diff --git a/website/public/community-guidelines-images/restoration.png b/website/client/community-guidelines-images/restoration.png similarity index 100% rename from website/public/community-guidelines-images/restoration.png rename to website/client/community-guidelines-images/restoration.png diff --git a/website/public/community-guidelines-images/staff.png b/website/client/community-guidelines-images/staff.png similarity index 100% rename from website/public/community-guidelines-images/staff.png rename to website/client/community-guidelines-images/staff.png diff --git a/website/public/community-guidelines-images/tavern.png b/website/client/community-guidelines-images/tavern.png similarity index 100% rename from website/public/community-guidelines-images/tavern.png rename to website/client/community-guidelines-images/tavern.png diff --git a/website/public/community-guidelines-images/trello.png b/website/client/community-guidelines-images/trello.png similarity index 100% rename from website/public/community-guidelines-images/trello.png rename to website/client/community-guidelines-images/trello.png diff --git a/website/public/community-guidelines-images/wiki.png b/website/client/community-guidelines-images/wiki.png similarity index 100% rename from website/public/community-guidelines-images/wiki.png rename to website/client/community-guidelines-images/wiki.png diff --git a/website/public/css/README.md b/website/client/css/README.md similarity index 100% rename from website/public/css/README.md rename to website/client/css/README.md diff --git a/website/public/css/alerts.styl b/website/client/css/alerts.styl similarity index 100% rename from website/public/css/alerts.styl rename to website/client/css/alerts.styl diff --git a/website/public/css/avatar.styl b/website/client/css/avatar.styl similarity index 100% rename from website/public/css/avatar.styl rename to website/client/css/avatar.styl diff --git a/website/public/css/challenges.styl b/website/client/css/challenges.styl similarity index 100% rename from website/public/css/challenges.styl rename to website/client/css/challenges.styl diff --git a/website/public/css/classes.styl b/website/client/css/classes.styl similarity index 100% rename from website/public/css/classes.styl rename to website/client/css/classes.styl diff --git a/website/public/css/customizer.styl b/website/client/css/customizer.styl similarity index 100% rename from website/public/css/customizer.styl rename to website/client/css/customizer.styl diff --git a/website/public/css/filters.styl b/website/client/css/filters.styl similarity index 100% rename from website/public/css/filters.styl rename to website/client/css/filters.styl diff --git a/website/public/css/footer.styl b/website/client/css/footer.styl similarity index 100% rename from website/public/css/footer.styl rename to website/client/css/footer.styl diff --git a/website/public/css/game-pane.styl b/website/client/css/game-pane.styl similarity index 100% rename from website/public/css/game-pane.styl rename to website/client/css/game-pane.styl diff --git a/website/public/css/global-colors.styl b/website/client/css/global-colors.styl similarity index 100% rename from website/public/css/global-colors.styl rename to website/client/css/global-colors.styl diff --git a/website/public/css/global-modules.styl b/website/client/css/global-modules.styl similarity index 100% rename from website/public/css/global-modules.styl rename to website/client/css/global-modules.styl diff --git a/website/public/css/header.styl b/website/client/css/header.styl similarity index 100% rename from website/public/css/header.styl rename to website/client/css/header.styl diff --git a/website/public/css/helpers.styl b/website/client/css/helpers.styl similarity index 100% rename from website/public/css/helpers.styl rename to website/client/css/helpers.styl diff --git a/website/public/css/index.styl b/website/client/css/index.styl similarity index 100% rename from website/public/css/index.styl rename to website/client/css/index.styl diff --git a/website/public/css/inventory.styl b/website/client/css/inventory.styl similarity index 100% rename from website/public/css/inventory.styl rename to website/client/css/inventory.styl diff --git a/website/public/css/items.styl b/website/client/css/items.styl similarity index 100% rename from website/public/css/items.styl rename to website/client/css/items.styl diff --git a/website/public/css/menu.styl b/website/client/css/menu.styl similarity index 100% rename from website/public/css/menu.styl rename to website/client/css/menu.styl diff --git a/website/public/css/no-script.styl b/website/client/css/no-script.styl similarity index 100% rename from website/public/css/no-script.styl rename to website/client/css/no-script.styl diff --git a/website/public/css/npcs.styl b/website/client/css/npcs.styl similarity index 100% rename from website/public/css/npcs.styl rename to website/client/css/npcs.styl diff --git a/website/public/css/options.styl b/website/client/css/options.styl similarity index 100% rename from website/public/css/options.styl rename to website/client/css/options.styl diff --git a/website/public/css/quests.styl b/website/client/css/quests.styl similarity index 100% rename from website/public/css/quests.styl rename to website/client/css/quests.styl diff --git a/website/public/css/scrollbars.styl b/website/client/css/scrollbars.styl similarity index 100% rename from website/public/css/scrollbars.styl rename to website/client/css/scrollbars.styl diff --git a/website/public/css/shared.styl b/website/client/css/shared.styl similarity index 100% rename from website/public/css/shared.styl rename to website/client/css/shared.styl diff --git a/website/public/css/static.styl b/website/client/css/static.styl similarity index 100% rename from website/public/css/static.styl rename to website/client/css/static.styl diff --git a/website/public/css/tasks.styl b/website/client/css/tasks.styl similarity index 100% rename from website/public/css/tasks.styl rename to website/client/css/tasks.styl diff --git a/website/public/css/variables/screen-size.styl b/website/client/css/variables/screen-size.styl similarity index 100% rename from website/public/css/variables/screen-size.styl rename to website/client/css/variables/screen-size.styl diff --git a/website/public/emails/images/10-days-recapture-v1.png b/website/client/emails/images/10-days-recapture-v1.png similarity index 100% rename from website/public/emails/images/10-days-recapture-v1.png rename to website/client/emails/images/10-days-recapture-v1.png diff --git a/website/public/emails/images/3-days-1-month-recapture-v1.png b/website/client/emails/images/3-days-1-month-recapture-v1.png similarity index 100% rename from website/public/emails/images/3-days-1-month-recapture-v1.png rename to website/client/emails/images/3-days-1-month-recapture-v1.png diff --git a/website/public/emails/images/PROMO-Enchanted-Armoire-v1.png b/website/client/emails/images/PROMO-Enchanted-Armoire-v1.png similarity index 100% rename from website/public/emails/images/PROMO-Enchanted-Armoire-v1.png rename to website/client/emails/images/PROMO-Enchanted-Armoire-v1.png diff --git a/website/public/emails/images/android-promo-v1.png b/website/client/emails/images/android-promo-v1.png similarity index 100% rename from website/public/emails/images/android-promo-v1.png rename to website/client/emails/images/android-promo-v1.png diff --git a/website/public/emails/images/iphone-promo-v1.png b/website/client/emails/images/iphone-promo-v1.png similarity index 100% rename from website/public/emails/images/iphone-promo-v1.png rename to website/client/emails/images/iphone-promo-v1.png diff --git a/website/public/emails/images/one-day-v1.png b/website/client/emails/images/one-day-v1.png similarity index 100% rename from website/public/emails/images/one-day-v1.png rename to website/client/emails/images/one-day-v1.png diff --git a/website/public/emails/images/spring-2015-00-v1.png b/website/client/emails/images/spring-2015-00-v1.png similarity index 100% rename from website/public/emails/images/spring-2015-00-v1.png rename to website/client/emails/images/spring-2015-00-v1.png diff --git a/website/public/emails/images/spring-2015-01-v1.png b/website/client/emails/images/spring-2015-01-v1.png similarity index 100% rename from website/public/emails/images/spring-2015-01-v1.png rename to website/client/emails/images/spring-2015-01-v1.png diff --git a/website/public/emails/images/subscription-begins-time-travelers-v1.png b/website/client/emails/images/subscription-begins-time-travelers-v1.png similarity index 100% rename from website/public/emails/images/subscription-begins-time-travelers-v1.png rename to website/client/emails/images/subscription-begins-time-travelers-v1.png diff --git a/website/public/emails/images/subscription-begins-v1.png b/website/client/emails/images/subscription-begins-v1.png similarity index 100% rename from website/public/emails/images/subscription-begins-v1.png rename to website/client/emails/images/subscription-begins-v1.png diff --git a/website/public/favicon.ico b/website/client/favicon.ico similarity index 100% rename from website/public/favicon.ico rename to website/client/favicon.ico diff --git a/website/public/favicon_192x192.png b/website/client/favicon_192x192.png similarity index 100% rename from website/public/favicon_192x192.png rename to website/client/favicon_192x192.png diff --git a/website/public/fontello/LICENSE.txt b/website/client/fontello/LICENSE.txt similarity index 100% rename from website/public/fontello/LICENSE.txt rename to website/client/fontello/LICENSE.txt diff --git a/website/public/fontello/README.txt b/website/client/fontello/README.txt similarity index 100% rename from website/public/fontello/README.txt rename to website/client/fontello/README.txt diff --git a/website/public/fontello/css/animation.css b/website/client/fontello/css/animation.css similarity index 100% rename from website/public/fontello/css/animation.css rename to website/client/fontello/css/animation.css diff --git a/website/public/fontello/css/fontelico-codes.css b/website/client/fontello/css/fontelico-codes.css similarity index 100% rename from website/public/fontello/css/fontelico-codes.css rename to website/client/fontello/css/fontelico-codes.css diff --git a/website/public/fontello/css/fontelico-embedded.css b/website/client/fontello/css/fontelico-embedded.css similarity index 100% rename from website/public/fontello/css/fontelico-embedded.css rename to website/client/fontello/css/fontelico-embedded.css diff --git a/website/public/fontello/css/fontelico-ie7-codes.css b/website/client/fontello/css/fontelico-ie7-codes.css similarity index 100% rename from website/public/fontello/css/fontelico-ie7-codes.css rename to website/client/fontello/css/fontelico-ie7-codes.css diff --git a/website/public/fontello/css/fontelico-ie7.css b/website/client/fontello/css/fontelico-ie7.css similarity index 100% rename from website/public/fontello/css/fontelico-ie7.css rename to website/client/fontello/css/fontelico-ie7.css diff --git a/website/public/fontello/css/fontelico.css b/website/client/fontello/css/fontelico.css similarity index 100% rename from website/public/fontello/css/fontelico.css rename to website/client/fontello/css/fontelico.css diff --git a/website/public/fontello/demo.html b/website/client/fontello/demo.html similarity index 100% rename from website/public/fontello/demo.html rename to website/client/fontello/demo.html diff --git a/website/public/fontello/font/fontelico.eot b/website/client/fontello/font/fontelico.eot similarity index 100% rename from website/public/fontello/font/fontelico.eot rename to website/client/fontello/font/fontelico.eot diff --git a/website/public/fontello/font/fontelico.svg b/website/client/fontello/font/fontelico.svg similarity index 100% rename from website/public/fontello/font/fontelico.svg rename to website/client/fontello/font/fontelico.svg diff --git a/website/public/fontello/font/fontelico.ttf b/website/client/fontello/font/fontelico.ttf similarity index 100% rename from website/public/fontello/font/fontelico.ttf rename to website/client/fontello/font/fontelico.ttf diff --git a/website/public/fontello/font/fontelico.woff b/website/client/fontello/font/fontelico.woff similarity index 100% rename from website/public/fontello/font/fontelico.woff rename to website/client/fontello/font/fontelico.woff diff --git a/website/public/front/README.md b/website/client/front/README.md similarity index 100% rename from website/public/front/README.md rename to website/client/front/README.md diff --git a/website/public/front/css/blockScroll.css b/website/client/front/css/blockScroll.css similarity index 100% rename from website/public/front/css/blockScroll.css rename to website/client/front/css/blockScroll.css diff --git a/website/public/front/css/bootstrap.min.css b/website/client/front/css/bootstrap.min.css similarity index 100% rename from website/public/front/css/bootstrap.min.css rename to website/client/front/css/bootstrap.min.css diff --git a/website/public/front/css/fixed-positioning.css b/website/client/front/css/fixed-positioning.css similarity index 100% rename from website/public/front/css/fixed-positioning.css rename to website/client/front/css/fixed-positioning.css diff --git a/website/public/front/fonts/glyphicons-halflings-regular.eot b/website/client/front/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from website/public/front/fonts/glyphicons-halflings-regular.eot rename to website/client/front/fonts/glyphicons-halflings-regular.eot diff --git a/website/public/front/fonts/glyphicons-halflings-regular.svg b/website/client/front/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from website/public/front/fonts/glyphicons-halflings-regular.svg rename to website/client/front/fonts/glyphicons-halflings-regular.svg diff --git a/website/public/front/fonts/glyphicons-halflings-regular.ttf b/website/client/front/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from website/public/front/fonts/glyphicons-halflings-regular.ttf rename to website/client/front/fonts/glyphicons-halflings-regular.ttf diff --git a/website/public/front/fonts/glyphicons-halflings-regular.woff b/website/client/front/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from website/public/front/fonts/glyphicons-halflings-regular.woff rename to website/client/front/fonts/glyphicons-halflings-regular.woff diff --git a/website/public/front/fonts/glyphicons-halflings-regular.woff2 b/website/client/front/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from website/public/front/fonts/glyphicons-halflings-regular.woff2 rename to website/client/front/fonts/glyphicons-halflings-regular.woff2 diff --git a/website/public/front/images/Feeding_Time.png b/website/client/front/images/Feeding_Time.png similarity index 100% rename from website/public/front/images/Feeding_Time.png rename to website/client/front/images/Feeding_Time.png diff --git a/website/public/front/images/Guilds Sample Screen.png b/website/client/front/images/Guilds Sample Screen.png similarity index 100% rename from website/public/front/images/Guilds Sample Screen.png rename to website/client/front/images/Guilds Sample Screen.png diff --git a/website/public/front/images/HabitRPGPromoPostCard6.png b/website/client/front/images/HabitRPGPromoPostCard6.png similarity index 100% rename from website/public/front/images/HabitRPGPromoPostCard6.png rename to website/client/front/images/HabitRPGPromoPostCard6.png diff --git a/website/public/front/images/HabitRPGPromoThin.png b/website/client/front/images/HabitRPGPromoThin.png similarity index 100% rename from website/public/front/images/HabitRPGPromoThin.png rename to website/client/front/images/HabitRPGPromoThin.png diff --git a/website/public/front/images/Habitica_banner_by_uncommoncriminal.png b/website/client/front/images/Habitica_banner_by_uncommoncriminal.png similarity index 100% rename from website/public/front/images/Habitica_banner_by_uncommoncriminal.png rename to website/client/front/images/Habitica_banner_by_uncommoncriminal.png diff --git a/website/public/front/images/Habitica_map_by_uncommoncriminal.png b/website/client/front/images/Habitica_map_by_uncommoncriminal.png similarity index 100% rename from website/public/front/images/Habitica_map_by_uncommoncriminal.png rename to website/client/front/images/Habitica_map_by_uncommoncriminal.png diff --git a/website/public/front/images/Healer.png b/website/client/front/images/Healer.png similarity index 100% rename from website/public/front/images/Healer.png rename to website/client/front/images/Healer.png diff --git a/website/public/front/images/Mount.png b/website/client/front/images/Mount.png similarity index 100% rename from website/public/front/images/Mount.png rename to website/client/front/images/Mount.png diff --git a/website/public/front/images/Mount_Body_Dragon-Golden.png b/website/client/front/images/Mount_Body_Dragon-Golden.png similarity index 100% rename from website/public/front/images/Mount_Body_Dragon-Golden.png rename to website/client/front/images/Mount_Body_Dragon-Golden.png diff --git a/website/public/front/images/Mount_Body_Dragon-Red.png b/website/client/front/images/Mount_Body_Dragon-Red.png similarity index 100% rename from website/public/front/images/Mount_Body_Dragon-Red.png rename to website/client/front/images/Mount_Body_Dragon-Red.png diff --git a/website/public/front/images/Mount_Body_Wolf-Base.png b/website/client/front/images/Mount_Body_Wolf-Base.png similarity index 100% rename from website/public/front/images/Mount_Body_Wolf-Base.png rename to website/client/front/images/Mount_Body_Wolf-Base.png diff --git a/website/public/front/images/Mount_Head_Dragon-Golden.png b/website/client/front/images/Mount_Head_Dragon-Golden.png similarity index 100% rename from website/public/front/images/Mount_Head_Dragon-Golden.png rename to website/client/front/images/Mount_Head_Dragon-Golden.png diff --git a/website/public/front/images/Mount_Head_Dragon-Red.png b/website/client/front/images/Mount_Head_Dragon-Red.png similarity index 100% rename from website/public/front/images/Mount_Head_Dragon-Red.png rename to website/client/front/images/Mount_Head_Dragon-Red.png diff --git a/website/public/front/images/Mount_Head_Wolf-Base.png b/website/client/front/images/Mount_Head_Wolf-Base.png similarity index 100% rename from website/public/front/images/Mount_Head_Wolf-Base.png rename to website/client/front/images/Mount_Head_Wolf-Base.png diff --git a/website/public/front/images/Party-Header.png b/website/client/front/images/Party-Header.png similarity index 100% rename from website/public/front/images/Party-Header.png rename to website/client/front/images/Party-Header.png diff --git a/website/public/front/images/Pet-Dragon-Red.png b/website/client/front/images/Pet-Dragon-Red.png similarity index 100% rename from website/public/front/images/Pet-Dragon-Red.png rename to website/client/front/images/Pet-Dragon-Red.png diff --git a/website/public/front/images/Pet-Fox-Red.png b/website/client/front/images/Pet-Fox-Red.png similarity index 100% rename from website/public/front/images/Pet-Fox-Red.png rename to website/client/front/images/Pet-Fox-Red.png diff --git a/website/public/front/images/Promo_springclasses2015.png b/website/client/front/images/Promo_springclasses2015.png similarity index 100% rename from website/public/front/images/Promo_springclasses2015.png rename to website/client/front/images/Promo_springclasses2015.png diff --git a/website/public/front/images/Quest_dilatory_drag'on.png b/website/client/front/images/Quest_dilatory_drag'on.png similarity index 100% rename from website/public/front/images/Quest_dilatory_drag'on.png rename to website/client/front/images/Quest_dilatory_drag'on.png diff --git a/website/public/front/images/Quest_dilatory_drag'onSmall.png b/website/client/front/images/Quest_dilatory_drag'onSmall.png similarity index 100% rename from website/public/front/images/Quest_dilatory_drag'onSmall.png rename to website/client/front/images/Quest_dilatory_drag'onSmall.png diff --git a/website/public/front/images/Rogue.png b/website/client/front/images/Rogue.png similarity index 100% rename from website/public/front/images/Rogue.png rename to website/client/front/images/Rogue.png diff --git a/website/public/front/images/SAMPLEadventurers.png b/website/client/front/images/SAMPLEadventurers.png similarity index 100% rename from website/public/front/images/SAMPLEadventurers.png rename to website/client/front/images/SAMPLEadventurers.png diff --git a/website/public/front/images/TVreward.png b/website/client/front/images/TVreward.png similarity index 100% rename from website/public/front/images/TVreward.png rename to website/client/front/images/TVreward.png diff --git a/website/public/front/images/VICE_by_Baconsaur.png b/website/client/front/images/VICE_by_Baconsaur.png similarity index 100% rename from website/public/front/images/VICE_by_Baconsaur.png rename to website/client/front/images/VICE_by_Baconsaur.png diff --git a/website/public/front/images/Warrior.png b/website/client/front/images/Warrior.png similarity index 100% rename from website/public/front/images/Warrior.png rename to website/client/front/images/Warrior.png diff --git a/website/public/front/images/Wizard.png b/website/client/front/images/Wizard.png similarity index 100% rename from website/public/front/images/Wizard.png rename to website/client/front/images/Wizard.png diff --git a/website/public/front/images/achievement-perfect.png b/website/client/front/images/achievement-perfect.png similarity index 100% rename from website/public/front/images/achievement-perfect.png rename to website/client/front/images/achievement-perfect.png diff --git a/website/public/front/images/achievement-triadbingo.png b/website/client/front/images/achievement-triadbingo.png similarity index 100% rename from website/public/front/images/achievement-triadbingo.png rename to website/client/front/images/achievement-triadbingo.png diff --git a/website/public/front/images/avatar/Warrior.png b/website/client/front/images/avatar/Warrior.png similarity index 100% rename from website/public/front/images/avatar/Warrior.png rename to website/client/front/images/avatar/Warrior.png diff --git a/website/public/front/images/avatar/avatar.png b/website/client/front/images/avatar/avatar.png similarity index 100% rename from website/public/front/images/avatar/avatar.png rename to website/client/front/images/avatar/avatar.png diff --git a/website/public/front/images/avatar/avatarstatic.png b/website/client/front/images/avatar/avatarstatic.png similarity index 100% rename from website/public/front/images/avatar/avatarstatic.png rename to website/client/front/images/avatar/avatarstatic.png diff --git a/website/public/front/images/avatar/hair_bangs_1_brown.png b/website/client/front/images/avatar/hair_bangs_1_brown.png similarity index 100% rename from website/public/front/images/avatar/hair_bangs_1_brown.png rename to website/client/front/images/avatar/hair_bangs_1_brown.png diff --git a/website/public/front/images/avatar/head_0.png b/website/client/front/images/avatar/head_0.png similarity index 100% rename from website/public/front/images/avatar/head_0.png rename to website/client/front/images/avatar/head_0.png diff --git a/website/public/front/images/avatar/head_warrior_3.png b/website/client/front/images/avatar/head_warrior_3.png similarity index 100% rename from website/public/front/images/avatar/head_warrior_3.png rename to website/client/front/images/avatar/head_warrior_3.png diff --git a/website/public/front/images/avatar/head_warrior_5.png b/website/client/front/images/avatar/head_warrior_5.png similarity index 100% rename from website/public/front/images/avatar/head_warrior_5.png rename to website/client/front/images/avatar/head_warrior_5.png diff --git a/website/public/front/images/avatar/shield_warrior_3.png b/website/client/front/images/avatar/shield_warrior_3.png similarity index 100% rename from website/public/front/images/avatar/shield_warrior_3.png rename to website/client/front/images/avatar/shield_warrior_3.png diff --git a/website/public/front/images/avatar/shield_warrior_5.png b/website/client/front/images/avatar/shield_warrior_5.png similarity index 100% rename from website/public/front/images/avatar/shield_warrior_5.png rename to website/client/front/images/avatar/shield_warrior_5.png diff --git a/website/public/front/images/avatar/skin_f5a76e.png b/website/client/front/images/avatar/skin_f5a76e.png similarity index 100% rename from website/public/front/images/avatar/skin_f5a76e.png rename to website/client/front/images/avatar/skin_f5a76e.png diff --git a/website/public/front/images/avatar/slim_armor_warrior_3.png b/website/client/front/images/avatar/slim_armor_warrior_3.png similarity index 100% rename from website/public/front/images/avatar/slim_armor_warrior_3.png rename to website/client/front/images/avatar/slim_armor_warrior_3.png diff --git a/website/public/front/images/avatar/slim_armor_warrior_5.png b/website/client/front/images/avatar/slim_armor_warrior_5.png similarity index 100% rename from website/public/front/images/avatar/slim_armor_warrior_5.png rename to website/client/front/images/avatar/slim_armor_warrior_5.png diff --git a/website/public/front/images/avatar/slim_shirt_black.png b/website/client/front/images/avatar/slim_shirt_black.png similarity index 100% rename from website/public/front/images/avatar/slim_shirt_black.png rename to website/client/front/images/avatar/slim_shirt_black.png diff --git a/website/public/front/images/avatar/weapon_healer_6.png b/website/client/front/images/avatar/weapon_healer_6.png similarity index 100% rename from website/public/front/images/avatar/weapon_healer_6.png rename to website/client/front/images/avatar/weapon_healer_6.png diff --git a/website/public/front/images/avatar/weapon_warrior_3.png b/website/client/front/images/avatar/weapon_warrior_3.png similarity index 100% rename from website/public/front/images/avatar/weapon_warrior_3.png rename to website/client/front/images/avatar/weapon_warrior_3.png diff --git a/website/public/front/images/avatar/weapon_warrior_5.png b/website/client/front/images/avatar/weapon_warrior_5.png similarity index 100% rename from website/public/front/images/avatar/weapon_warrior_5.png rename to website/client/front/images/avatar/weapon_warrior_5.png diff --git a/website/public/front/images/blackish_fox_by_kellllly-d7pzd46.png b/website/client/front/images/blackish_fox_by_kellllly-d7pzd46.png similarity index 100% rename from website/public/front/images/blackish_fox_by_kellllly-d7pzd46.png rename to website/client/front/images/blackish_fox_by_kellllly-d7pzd46.png diff --git a/website/public/front/images/coding_by_phoneix_faerie.png b/website/client/front/images/coding_by_phoneix_faerie.png similarity index 100% rename from website/public/front/images/coding_by_phoneix_faerie.png rename to website/client/front/images/coding_by_phoneix_faerie.png diff --git a/website/public/front/images/devices.png b/website/client/front/images/devices.png similarity index 100% rename from website/public/front/images/devices.png rename to website/client/front/images/devices.png diff --git a/website/public/front/images/explosion.jpg b/website/client/front/images/explosion.jpg similarity index 100% rename from website/public/front/images/explosion.jpg rename to website/client/front/images/explosion.jpg diff --git a/website/public/front/images/explosion.png b/website/client/front/images/explosion.png similarity index 100% rename from website/public/front/images/explosion.png rename to website/client/front/images/explosion.png diff --git a/website/public/front/images/habitrpg_pixel.png b/website/client/front/images/habitrpg_pixel.png similarity index 100% rename from website/public/front/images/habitrpg_pixel.png rename to website/client/front/images/habitrpg_pixel.png diff --git a/website/public/front/images/icon175x175.png b/website/client/front/images/icon175x175.png similarity index 100% rename from website/public/front/images/icon175x175.png rename to website/client/front/images/icon175x175.png diff --git a/website/public/front/images/intro.jpg b/website/client/front/images/intro.jpg similarity index 100% rename from website/public/front/images/intro.jpg rename to website/client/front/images/intro.jpg diff --git a/website/public/front/images/intro.psd b/website/client/front/images/intro.psd similarity index 100% rename from website/public/front/images/intro.psd rename to website/client/front/images/intro.psd diff --git a/website/public/front/images/misc/Pet_Food_Cake_Base.png b/website/client/front/images/misc/Pet_Food_Cake_Base.png similarity index 100% rename from website/public/front/images/misc/Pet_Food_Cake_Base.png rename to website/client/front/images/misc/Pet_Food_Cake_Base.png diff --git a/website/public/front/images/misc/inventory_quest_scroll_harpy.png b/website/client/front/images/misc/inventory_quest_scroll_harpy.png similarity index 100% rename from website/public/front/images/misc/inventory_quest_scroll_harpy.png rename to website/client/front/images/misc/inventory_quest_scroll_harpy.png diff --git a/website/public/front/images/misc/rebirth_orb.png b/website/client/front/images/misc/rebirth_orb.png similarity index 100% rename from website/public/front/images/misc/rebirth_orb.png rename to website/client/front/images/misc/rebirth_orb.png diff --git a/website/public/front/images/misc/shop_gold.png b/website/client/front/images/misc/shop_gold.png similarity index 100% rename from website/public/front/images/misc/shop_gold.png rename to website/client/front/images/misc/shop_gold.png diff --git a/website/public/front/images/misc/shop_potion.png b/website/client/front/images/misc/shop_potion.png similarity index 100% rename from website/public/front/images/misc/shop_potion.png rename to website/client/front/images/misc/shop_potion.png diff --git a/website/public/front/images/mockup_for_habit_by_cosmic_caterpillar-d8mf5mb.png b/website/client/front/images/mockup_for_habit_by_cosmic_caterpillar-d8mf5mb.png similarity index 100% rename from website/public/front/images/mockup_for_habit_by_cosmic_caterpillar-d8mf5mb.png rename to website/client/front/images/mockup_for_habit_by_cosmic_caterpillar-d8mf5mb.png diff --git a/website/public/front/images/party/AnnaCosplay.png b/website/client/front/images/party/AnnaCosplay.png similarity index 100% rename from website/public/front/images/party/AnnaCosplay.png rename to website/client/front/images/party/AnnaCosplay.png diff --git a/website/public/front/images/party/Ariel_cosplay.png b/website/client/front/images/party/Ariel_cosplay.png similarity index 100% rename from website/public/front/images/party/Ariel_cosplay.png rename to website/client/front/images/party/Ariel_cosplay.png diff --git a/website/public/front/images/party/Big_Daddy_(BioShock).png b/website/client/front/images/party/Big_Daddy_(BioShock).png similarity index 100% rename from website/public/front/images/party/Big_Daddy_(BioShock).png rename to website/client/front/images/party/Big_Daddy_(BioShock).png diff --git a/website/public/front/images/party/Cosplay_Daenerys_Targaryen.png b/website/client/front/images/party/Cosplay_Daenerys_Targaryen.png similarity index 100% rename from website/public/front/images/party/Cosplay_Daenerys_Targaryen.png rename to website/client/front/images/party/Cosplay_Daenerys_Targaryen.png diff --git a/website/public/front/images/party/GrimReaper.png b/website/client/front/images/party/GrimReaper.png similarity index 100% rename from website/public/front/images/party/GrimReaper.png rename to website/client/front/images/party/GrimReaper.png diff --git a/website/public/front/images/party/HomeStuckLusus.png b/website/client/front/images/party/HomeStuckLusus.png similarity index 100% rename from website/public/front/images/party/HomeStuckLusus.png rename to website/client/front/images/party/HomeStuckLusus.png diff --git a/website/public/front/images/presslogos/Cnetlogo.png b/website/client/front/images/presslogos/Cnetlogo.png similarity index 100% rename from website/public/front/images/presslogos/Cnetlogo.png rename to website/client/front/images/presslogos/Cnetlogo.png diff --git a/website/public/front/images/presslogos/Fast-Company-logo.png b/website/client/front/images/presslogos/Fast-Company-logo.png similarity index 100% rename from website/public/front/images/presslogos/Fast-Company-logo.png rename to website/client/front/images/presslogos/Fast-Company-logo.png diff --git a/website/public/front/images/presslogos/Forbes_logo.png b/website/client/front/images/presslogos/Forbes_logo.png similarity index 100% rename from website/public/front/images/presslogos/Forbes_logo.png rename to website/client/front/images/presslogos/Forbes_logo.png diff --git a/website/public/front/images/presslogos/GitHub_Logo.png b/website/client/front/images/presslogos/GitHub_Logo.png similarity index 100% rename from website/public/front/images/presslogos/GitHub_Logo.png rename to website/client/front/images/presslogos/GitHub_Logo.png diff --git a/website/public/front/images/presslogos/discover_logo.png b/website/client/front/images/presslogos/discover_logo.png similarity index 100% rename from website/public/front/images/presslogos/discover_logo.png rename to website/client/front/images/presslogos/discover_logo.png diff --git a/website/public/front/images/presslogos/ionic-logo-blog.png b/website/client/front/images/presslogos/ionic-logo-blog.png similarity index 100% rename from website/public/front/images/presslogos/ionic-logo-blog.png rename to website/client/front/images/presslogos/ionic-logo-blog.png diff --git a/website/public/front/images/presslogos/ionic-logo-horizontal-transparent.png b/website/client/front/images/presslogos/ionic-logo-horizontal-transparent.png similarity index 100% rename from website/public/front/images/presslogos/ionic-logo-horizontal-transparent.png rename to website/client/front/images/presslogos/ionic-logo-horizontal-transparent.png diff --git a/website/public/front/images/presslogos/kickstarter-logo.png b/website/client/front/images/presslogos/kickstarter-logo.png similarity index 100% rename from website/public/front/images/presslogos/kickstarter-logo.png rename to website/client/front/images/presslogos/kickstarter-logo.png diff --git a/website/public/front/images/presslogos/landing_slack_hash_wordmark_logo.png b/website/client/front/images/presslogos/landing_slack_hash_wordmark_logo.png similarity index 100% rename from website/public/front/images/presslogos/landing_slack_hash_wordmark_logo.png rename to website/client/front/images/presslogos/landing_slack_hash_wordmark_logo.png diff --git a/website/public/front/images/presslogos/lifehacker.png b/website/client/front/images/presslogos/lifehacker.png similarity index 100% rename from website/public/front/images/presslogos/lifehacker.png rename to website/client/front/images/presslogos/lifehacker.png diff --git a/website/public/front/images/presslogos/logo_webstorm.png b/website/client/front/images/presslogos/logo_webstorm.png similarity index 100% rename from website/public/front/images/presslogos/logo_webstorm.png rename to website/client/front/images/presslogos/logo_webstorm.png diff --git a/website/public/front/images/presslogos/makeuseof.png b/website/client/front/images/presslogos/makeuseof.png similarity index 100% rename from website/public/front/images/presslogos/makeuseof.png rename to website/client/front/images/presslogos/makeuseof.png diff --git a/website/public/front/images/presslogos/nyt-logo.png b/website/client/front/images/presslogos/nyt-logo.png similarity index 100% rename from website/public/front/images/presslogos/nyt-logo.png rename to website/client/front/images/presslogos/nyt-logo.png diff --git a/website/public/front/images/presslogos/slack.png b/website/client/front/images/presslogos/slack.png similarity index 100% rename from website/public/front/images/presslogos/slack.png rename to website/client/front/images/presslogos/slack.png diff --git a/website/public/front/images/presslogos/trello-logo-blue.png b/website/client/front/images/presslogos/trello-logo-blue.png similarity index 100% rename from website/public/front/images/presslogos/trello-logo-blue.png rename to website/client/front/images/presslogos/trello-logo-blue.png diff --git a/website/public/front/images/quest_vice3.png b/website/client/front/images/quest_vice3.png similarity index 100% rename from website/public/front/images/quest_vice3.png rename to website/client/front/images/quest_vice3.png diff --git a/website/public/front/images/screenshot.png b/website/client/front/images/screenshot.png similarity index 100% rename from website/public/front/images/screenshot.png rename to website/client/front/images/screenshot.png diff --git a/website/public/front/images/t_bone_fight_2_by_mortquitue-d8dtxbl.png b/website/client/front/images/t_bone_fight_2_by_mortquitue-d8dtxbl.png similarity index 100% rename from website/public/front/images/t_bone_fight_2_by_mortquitue-d8dtxbl.png rename to website/client/front/images/t_bone_fight_2_by_mortquitue-d8dtxbl.png diff --git a/website/public/front/images/testimonial_by_Streak.png b/website/client/front/images/testimonial_by_Streak.png similarity index 100% rename from website/public/front/images/testimonial_by_Streak.png rename to website/client/front/images/testimonial_by_Streak.png diff --git a/website/public/front/images/testimonials/16bitFil.png b/website/client/front/images/testimonials/16bitFil.png similarity index 100% rename from website/public/front/images/testimonials/16bitFil.png rename to website/client/front/images/testimonials/16bitFil.png diff --git a/website/public/front/images/testimonials/AlexandraSo.png b/website/client/front/images/testimonials/AlexandraSo.png similarity index 100% rename from website/public/front/images/testimonials/AlexandraSo.png rename to website/client/front/images/testimonials/AlexandraSo.png diff --git a/website/public/front/images/testimonials/Althaire.png b/website/client/front/images/testimonials/Althaire.png similarity index 100% rename from website/public/front/images/testimonials/Althaire.png rename to website/client/front/images/testimonials/Althaire.png diff --git a/website/public/front/images/testimonials/AndeeLiao.png b/website/client/front/images/testimonials/AndeeLiao.png similarity index 100% rename from website/public/front/images/testimonials/AndeeLiao.png rename to website/client/front/images/testimonials/AndeeLiao.png diff --git a/website/public/front/images/testimonials/Brenna.png b/website/client/front/images/testimonials/Brenna.png similarity index 100% rename from website/public/front/images/testimonials/Brenna.png rename to website/client/front/images/testimonials/Brenna.png diff --git a/website/public/front/images/testimonials/Drag0nsilver.png b/website/client/front/images/testimonials/Drag0nsilver.png similarity index 100% rename from website/public/front/images/testimonials/Drag0nsilver.png rename to website/client/front/images/testimonials/Drag0nsilver.png diff --git a/website/public/front/images/testimonials/Drei-M.png b/website/client/front/images/testimonials/Drei-M.png similarity index 100% rename from website/public/front/images/testimonials/Drei-M.png rename to website/client/front/images/testimonials/Drei-M.png diff --git a/website/public/front/images/testimonials/Elmi.png b/website/client/front/images/testimonials/Elmi.png similarity index 100% rename from website/public/front/images/testimonials/Elmi.png rename to website/client/front/images/testimonials/Elmi.png diff --git a/website/public/front/images/testimonials/EvaGantz.png b/website/client/front/images/testimonials/EvaGantz.png similarity index 100% rename from website/public/front/images/testimonials/EvaGantz.png rename to website/client/front/images/testimonials/EvaGantz.png diff --git a/website/public/front/images/testimonials/Helcura.png b/website/client/front/images/testimonials/Helcura.png similarity index 100% rename from website/public/front/images/testimonials/Helcura.png rename to website/client/front/images/testimonials/Helcura.png diff --git a/website/public/front/images/testimonials/InfH.png b/website/client/front/images/testimonials/InfH.png similarity index 100% rename from website/public/front/images/testimonials/InfH.png rename to website/client/front/images/testimonials/InfH.png diff --git a/website/public/front/images/testimonials/Kai.png b/website/client/front/images/testimonials/Kai.png similarity index 100% rename from website/public/front/images/testimonials/Kai.png rename to website/client/front/images/testimonials/Kai.png diff --git a/website/public/front/images/testimonials/Kazui.png b/website/client/front/images/testimonials/Kazui.png similarity index 100% rename from website/public/front/images/testimonials/Kazui.png rename to website/client/front/images/testimonials/Kazui.png diff --git a/website/public/front/images/testimonials/Zelah_Meyer.png b/website/client/front/images/testimonials/Zelah_Meyer.png similarity index 100% rename from website/public/front/images/testimonials/Zelah_Meyer.png rename to website/client/front/images/testimonials/Zelah_Meyer.png diff --git a/website/public/front/images/testimonials/autumnesquirrel.png b/website/client/front/images/testimonials/autumnesquirrel.png similarity index 100% rename from website/public/front/images/testimonials/autumnesquirrel.png rename to website/client/front/images/testimonials/autumnesquirrel.png diff --git a/website/public/front/images/testimonials/frabjabulous.png b/website/client/front/images/testimonials/frabjabulous.png similarity index 100% rename from website/public/front/images/testimonials/frabjabulous.png rename to website/client/front/images/testimonials/frabjabulous.png diff --git a/website/public/front/images/testimonials/galarix.png b/website/client/front/images/testimonials/galarix.png similarity index 100% rename from website/public/front/images/testimonials/galarix.png rename to website/client/front/images/testimonials/galarix.png diff --git a/website/public/front/images/testimonials/gwyn.blath.png b/website/client/front/images/testimonials/gwyn.blath.png similarity index 100% rename from website/public/front/images/testimonials/gwyn.blath.png rename to website/client/front/images/testimonials/gwyn.blath.png diff --git a/website/public/front/images/testimonials/irishfeet123.png b/website/client/front/images/testimonials/irishfeet123.png similarity index 100% rename from website/public/front/images/testimonials/irishfeet123.png rename to website/client/front/images/testimonials/irishfeet123.png diff --git a/website/public/front/images/testimonials/skysailor.png b/website/client/front/images/testimonials/skysailor.png similarity index 100% rename from website/public/front/images/testimonials/skysailor.png rename to website/client/front/images/testimonials/skysailor.png diff --git a/website/public/front/images/testimonials/supermouse35.png b/website/client/front/images/testimonials/supermouse35.png similarity index 100% rename from website/public/front/images/testimonials/supermouse35.png rename to website/client/front/images/testimonials/supermouse35.png diff --git a/website/public/front/images/testimonials/tonitonirocca.png b/website/client/front/images/testimonials/tonitonirocca.png similarity index 100% rename from website/public/front/images/testimonials/tonitonirocca.png rename to website/client/front/images/testimonials/tonitonirocca.png diff --git a/website/public/front/images/uses/achievement-bkgd.png b/website/client/front/images/uses/achievement-bkgd.png similarity index 100% rename from website/public/front/images/uses/achievement-bkgd.png rename to website/client/front/images/uses/achievement-bkgd.png diff --git a/website/public/front/images/uses/clipart-rosemonkeyct-meditation.png b/website/client/front/images/uses/clipart-rosemonkeyct-meditation.png similarity index 100% rename from website/public/front/images/uses/clipart-rosemonkeyct-meditation.png rename to website/client/front/images/uses/clipart-rosemonkeyct-meditation.png diff --git a/website/public/front/images/uses/clipart-rosemonkeyct-meditation.psd b/website/client/front/images/uses/clipart-rosemonkeyct-meditation.psd similarity index 100% rename from website/public/front/images/uses/clipart-rosemonkeyct-meditation.psd rename to website/client/front/images/uses/clipart-rosemonkeyct-meditation.psd diff --git a/website/public/front/images/uses/clipart-rosemonkeyct-reading.png b/website/client/front/images/uses/clipart-rosemonkeyct-reading.png similarity index 100% rename from website/public/front/images/uses/clipart-rosemonkeyct-reading.png rename to website/client/front/images/uses/clipart-rosemonkeyct-reading.png diff --git a/website/public/front/images/uses/coding.png b/website/client/front/images/uses/coding.png similarity index 100% rename from website/public/front/images/uses/coding.png rename to website/client/front/images/uses/coding.png diff --git a/website/public/front/images/uses/coding_3_by_phoneix_faerie-d7idtti.png b/website/client/front/images/uses/coding_3_by_phoneix_faerie-d7idtti.png similarity index 100% rename from website/public/front/images/uses/coding_3_by_phoneix_faerie-d7idtti.png rename to website/client/front/images/uses/coding_3_by_phoneix_faerie-d7idtti.png diff --git a/website/public/front/images/uses/consequences.png b/website/client/front/images/uses/consequences.png similarity index 100% rename from website/public/front/images/uses/consequences.png rename to website/client/front/images/uses/consequences.png diff --git a/website/public/front/images/uses/dusting-bkgd.png b/website/client/front/images/uses/dusting-bkgd.png similarity index 100% rename from website/public/front/images/uses/dusting-bkgd.png rename to website/client/front/images/uses/dusting-bkgd.png diff --git a/website/public/front/images/uses/dusting_by_leephon.png b/website/client/front/images/uses/dusting_by_leephon.png similarity index 100% rename from website/public/front/images/uses/dusting_by_leephon.png rename to website/client/front/images/uses/dusting_by_leephon.png diff --git a/website/public/front/images/uses/gaining_an_achievement_by_cosmic_caterpillar-d7uyv5z.png b/website/client/front/images/uses/gaining_an_achievement_by_cosmic_caterpillar-d7uyv5z.png similarity index 100% rename from website/public/front/images/uses/gaining_an_achievement_by_cosmic_caterpillar-d7uyv5z.png rename to website/client/front/images/uses/gaining_an_achievement_by_cosmic_caterpillar-d7uyv5z.png diff --git a/website/public/front/images/uses/meditation-bkgd.png b/website/client/front/images/uses/meditation-bkgd.png similarity index 100% rename from website/public/front/images/uses/meditation-bkgd.png rename to website/client/front/images/uses/meditation-bkgd.png diff --git a/website/public/front/images/uses/publicSpaces.png b/website/client/front/images/uses/publicSpaces.png similarity index 100% rename from website/public/front/images/uses/publicSpaces.png rename to website/client/front/images/uses/publicSpaces.png diff --git a/website/public/front/images/uses/reading.png b/website/client/front/images/uses/reading.png similarity index 100% rename from website/public/front/images/uses/reading.png rename to website/client/front/images/uses/reading.png diff --git a/website/public/front/js/blockScroll.js b/website/client/front/js/blockScroll.js similarity index 100% rename from website/public/front/js/blockScroll.js rename to website/client/front/js/blockScroll.js diff --git a/website/public/front/js/bootstrap.min.js b/website/client/front/js/bootstrap.min.js similarity index 100% rename from website/public/front/js/bootstrap.min.js rename to website/client/front/js/bootstrap.min.js diff --git a/website/public/front/js/skrollr.min.js b/website/client/front/js/skrollr.min.js similarity index 100% rename from website/public/front/js/skrollr.min.js rename to website/client/front/js/skrollr.min.js diff --git a/website/public/front/landingv1Wireframe.jpg b/website/client/front/landingv1Wireframe.jpg similarity index 100% rename from website/public/front/landingv1Wireframe.jpg rename to website/client/front/landingv1Wireframe.jpg diff --git a/website/public/front/staticstyle.css b/website/client/front/staticstyle.css similarity index 100% rename from website/public/front/staticstyle.css rename to website/client/front/staticstyle.css diff --git a/website/public/front/style.css b/website/client/front/style.css similarity index 100% rename from website/public/front/style.css rename to website/client/front/style.css diff --git a/website/public/google280633b772b94345.html b/website/client/google280633b772b94345.html similarity index 100% rename from website/public/google280633b772b94345.html rename to website/client/google280633b772b94345.html diff --git a/website/public/google8ca65b6ff3506fb8.html b/website/client/google8ca65b6ff3506fb8.html similarity index 100% rename from website/public/google8ca65b6ff3506fb8.html rename to website/client/google8ca65b6ff3506fb8.html diff --git a/website/public/googlef3b1402b0e28338a.html b/website/client/googlef3b1402b0e28338a.html similarity index 100% rename from website/public/googlef3b1402b0e28338a.html rename to website/client/googlef3b1402b0e28338a.html diff --git a/website/public/js/.eslintrc b/website/client/js/.eslintrc similarity index 100% rename from website/public/js/.eslintrc rename to website/client/js/.eslintrc diff --git a/website/public/js/app.js b/website/client/js/app.js similarity index 100% rename from website/public/js/app.js rename to website/client/js/app.js diff --git a/website/public/js/controllers/authCtrl.js b/website/client/js/controllers/authCtrl.js similarity index 100% rename from website/public/js/controllers/authCtrl.js rename to website/client/js/controllers/authCtrl.js diff --git a/website/public/js/controllers/autoCompleteCtrl.js b/website/client/js/controllers/autoCompleteCtrl.js similarity index 100% rename from website/public/js/controllers/autoCompleteCtrl.js rename to website/client/js/controllers/autoCompleteCtrl.js diff --git a/website/public/js/controllers/challengesCtrl.js b/website/client/js/controllers/challengesCtrl.js similarity index 100% rename from website/public/js/controllers/challengesCtrl.js rename to website/client/js/controllers/challengesCtrl.js diff --git a/website/public/js/controllers/chatCtrl.js b/website/client/js/controllers/chatCtrl.js similarity index 100% rename from website/public/js/controllers/chatCtrl.js rename to website/client/js/controllers/chatCtrl.js diff --git a/website/public/js/controllers/copyMessageModalCtrl.js b/website/client/js/controllers/copyMessageModalCtrl.js similarity index 100% rename from website/public/js/controllers/copyMessageModalCtrl.js rename to website/client/js/controllers/copyMessageModalCtrl.js diff --git a/website/public/js/controllers/filtersCtrl.js b/website/client/js/controllers/filtersCtrl.js similarity index 100% rename from website/public/js/controllers/filtersCtrl.js rename to website/client/js/controllers/filtersCtrl.js diff --git a/website/public/js/controllers/footerCtrl.js b/website/client/js/controllers/footerCtrl.js similarity index 100% rename from website/public/js/controllers/footerCtrl.js rename to website/client/js/controllers/footerCtrl.js diff --git a/website/public/js/controllers/groupsCtrl.js b/website/client/js/controllers/groupsCtrl.js similarity index 100% rename from website/public/js/controllers/groupsCtrl.js rename to website/client/js/controllers/groupsCtrl.js diff --git a/website/public/js/controllers/guildsCtrl.js b/website/client/js/controllers/guildsCtrl.js similarity index 100% rename from website/public/js/controllers/guildsCtrl.js rename to website/client/js/controllers/guildsCtrl.js diff --git a/website/public/js/controllers/hallCtrl.js b/website/client/js/controllers/hallCtrl.js similarity index 100% rename from website/public/js/controllers/hallCtrl.js rename to website/client/js/controllers/hallCtrl.js diff --git a/website/public/js/controllers/headerCtrl.js b/website/client/js/controllers/headerCtrl.js similarity index 100% rename from website/public/js/controllers/headerCtrl.js rename to website/client/js/controllers/headerCtrl.js diff --git a/website/public/js/controllers/inventoryCtrl.js b/website/client/js/controllers/inventoryCtrl.js similarity index 100% rename from website/public/js/controllers/inventoryCtrl.js rename to website/client/js/controllers/inventoryCtrl.js diff --git a/website/public/js/controllers/inviteToGroupCtrl.js b/website/client/js/controllers/inviteToGroupCtrl.js similarity index 100% rename from website/public/js/controllers/inviteToGroupCtrl.js rename to website/client/js/controllers/inviteToGroupCtrl.js diff --git a/website/public/js/controllers/memberModalCtrl.js b/website/client/js/controllers/memberModalCtrl.js similarity index 100% rename from website/public/js/controllers/memberModalCtrl.js rename to website/client/js/controllers/memberModalCtrl.js diff --git a/website/public/js/controllers/menuCtrl.js b/website/client/js/controllers/menuCtrl.js similarity index 100% rename from website/public/js/controllers/menuCtrl.js rename to website/client/js/controllers/menuCtrl.js diff --git a/website/public/js/controllers/notificationCtrl.js b/website/client/js/controllers/notificationCtrl.js similarity index 100% rename from website/public/js/controllers/notificationCtrl.js rename to website/client/js/controllers/notificationCtrl.js diff --git a/website/public/js/controllers/partyCtrl.js b/website/client/js/controllers/partyCtrl.js similarity index 100% rename from website/public/js/controllers/partyCtrl.js rename to website/client/js/controllers/partyCtrl.js diff --git a/website/public/js/controllers/rootCtrl.js b/website/client/js/controllers/rootCtrl.js similarity index 100% rename from website/public/js/controllers/rootCtrl.js rename to website/client/js/controllers/rootCtrl.js diff --git a/website/public/js/controllers/settingsCtrl.js b/website/client/js/controllers/settingsCtrl.js similarity index 100% rename from website/public/js/controllers/settingsCtrl.js rename to website/client/js/controllers/settingsCtrl.js diff --git a/website/public/js/controllers/sortableInventoryCtrl.js b/website/client/js/controllers/sortableInventoryCtrl.js similarity index 100% rename from website/public/js/controllers/sortableInventoryCtrl.js rename to website/client/js/controllers/sortableInventoryCtrl.js diff --git a/website/public/js/controllers/tasksCtrl.js b/website/client/js/controllers/tasksCtrl.js similarity index 100% rename from website/public/js/controllers/tasksCtrl.js rename to website/client/js/controllers/tasksCtrl.js diff --git a/website/public/js/controllers/tavernCtrl.js b/website/client/js/controllers/tavernCtrl.js similarity index 100% rename from website/public/js/controllers/tavernCtrl.js rename to website/client/js/controllers/tavernCtrl.js diff --git a/website/public/js/controllers/userCtrl.js b/website/client/js/controllers/userCtrl.js similarity index 100% rename from website/public/js/controllers/userCtrl.js rename to website/client/js/controllers/userCtrl.js diff --git a/website/public/js/directives/close-menu.directive.js b/website/client/js/directives/close-menu.directive.js similarity index 100% rename from website/public/js/directives/close-menu.directive.js rename to website/client/js/directives/close-menu.directive.js diff --git a/website/public/js/directives/expand-menu.directive.js b/website/client/js/directives/expand-menu.directive.js similarity index 100% rename from website/public/js/directives/expand-menu.directive.js rename to website/client/js/directives/expand-menu.directive.js diff --git a/website/public/js/directives/focus-element.directive.js b/website/client/js/directives/focus-element.directive.js similarity index 100% rename from website/public/js/directives/focus-element.directive.js rename to website/client/js/directives/focus-element.directive.js diff --git a/website/public/js/directives/from-now.directive.js b/website/client/js/directives/from-now.directive.js similarity index 100% rename from website/public/js/directives/from-now.directive.js rename to website/client/js/directives/from-now.directive.js diff --git a/website/public/js/directives/habitrpg-tasks.directive.js b/website/client/js/directives/habitrpg-tasks.directive.js similarity index 100% rename from website/public/js/directives/habitrpg-tasks.directive.js rename to website/client/js/directives/habitrpg-tasks.directive.js diff --git a/website/public/js/directives/hrpg-sort-checklist.directive.js b/website/client/js/directives/hrpg-sort-checklist.directive.js similarity index 100% rename from website/public/js/directives/hrpg-sort-checklist.directive.js rename to website/client/js/directives/hrpg-sort-checklist.directive.js diff --git a/website/public/js/directives/hrpg-sort-tags.directive.js b/website/client/js/directives/hrpg-sort-tags.directive.js similarity index 100% rename from website/public/js/directives/hrpg-sort-tags.directive.js rename to website/client/js/directives/hrpg-sort-tags.directive.js diff --git a/website/public/js/directives/hrpg-sort-tasks.directive.js b/website/client/js/directives/hrpg-sort-tasks.directive.js similarity index 100% rename from website/public/js/directives/hrpg-sort-tasks.directive.js rename to website/client/js/directives/hrpg-sort-tasks.directive.js diff --git a/website/public/js/directives/popover-html-popup.directive.js b/website/client/js/directives/popover-html-popup.directive.js similarity index 100% rename from website/public/js/directives/popover-html-popup.directive.js rename to website/client/js/directives/popover-html-popup.directive.js diff --git a/website/public/js/directives/popover-html.directive.js b/website/client/js/directives/popover-html.directive.js similarity index 100% rename from website/public/js/directives/popover-html.directive.js rename to website/client/js/directives/popover-html.directive.js diff --git a/website/public/js/directives/when-scrolled.directive.js b/website/client/js/directives/when-scrolled.directive.js similarity index 100% rename from website/public/js/directives/when-scrolled.directive.js rename to website/client/js/directives/when-scrolled.directive.js diff --git a/website/public/js/env.js b/website/client/js/env.js similarity index 100% rename from website/public/js/env.js rename to website/client/js/env.js diff --git a/website/public/js/filters/money.js b/website/client/js/filters/money.js similarity index 100% rename from website/public/js/filters/money.js rename to website/client/js/filters/money.js diff --git a/website/public/js/filters/roundLargeNumbers.js b/website/client/js/filters/roundLargeNumbers.js similarity index 100% rename from website/public/js/filters/roundLargeNumbers.js rename to website/client/js/filters/roundLargeNumbers.js diff --git a/website/public/js/filters/taskOrdering.js b/website/client/js/filters/taskOrdering.js similarity index 100% rename from website/public/js/filters/taskOrdering.js rename to website/client/js/filters/taskOrdering.js diff --git a/website/public/js/filters/timezoneOffsetToUtc.js b/website/client/js/filters/timezoneOffsetToUtc.js similarity index 100% rename from website/public/js/filters/timezoneOffsetToUtc.js rename to website/client/js/filters/timezoneOffsetToUtc.js diff --git a/website/public/js/services/analyticsServices.js b/website/client/js/services/analyticsServices.js similarity index 100% rename from website/public/js/services/analyticsServices.js rename to website/client/js/services/analyticsServices.js diff --git a/website/public/js/services/challengeServices.js b/website/client/js/services/challengeServices.js similarity index 100% rename from website/public/js/services/challengeServices.js rename to website/client/js/services/challengeServices.js diff --git a/website/public/js/services/chatServices.js b/website/client/js/services/chatServices.js similarity index 100% rename from website/public/js/services/chatServices.js rename to website/client/js/services/chatServices.js diff --git a/website/public/js/services/groupServices.js b/website/client/js/services/groupServices.js similarity index 100% rename from website/public/js/services/groupServices.js rename to website/client/js/services/groupServices.js diff --git a/website/public/js/services/guideServices.js b/website/client/js/services/guideServices.js similarity index 100% rename from website/public/js/services/guideServices.js rename to website/client/js/services/guideServices.js diff --git a/website/public/js/services/memberServices.js b/website/client/js/services/memberServices.js similarity index 100% rename from website/public/js/services/memberServices.js rename to website/client/js/services/memberServices.js diff --git a/website/public/js/services/notificationServices.js b/website/client/js/services/notificationServices.js similarity index 100% rename from website/public/js/services/notificationServices.js rename to website/client/js/services/notificationServices.js diff --git a/website/public/js/services/paymentServices.js b/website/client/js/services/paymentServices.js similarity index 100% rename from website/public/js/services/paymentServices.js rename to website/client/js/services/paymentServices.js diff --git a/website/public/js/services/questServices.js b/website/client/js/services/questServices.js similarity index 100% rename from website/public/js/services/questServices.js rename to website/client/js/services/questServices.js diff --git a/website/public/js/services/sharedServices.js b/website/client/js/services/sharedServices.js similarity index 100% rename from website/public/js/services/sharedServices.js rename to website/client/js/services/sharedServices.js diff --git a/website/public/js/services/socialServices.js b/website/client/js/services/socialServices.js similarity index 100% rename from website/public/js/services/socialServices.js rename to website/client/js/services/socialServices.js diff --git a/website/public/js/services/statServices.js b/website/client/js/services/statServices.js similarity index 100% rename from website/public/js/services/statServices.js rename to website/client/js/services/statServices.js diff --git a/website/public/js/services/tagsServices.js b/website/client/js/services/tagsServices.js similarity index 100% rename from website/public/js/services/tagsServices.js rename to website/client/js/services/tagsServices.js diff --git a/website/public/js/services/taskServices.js b/website/client/js/services/taskServices.js similarity index 100% rename from website/public/js/services/taskServices.js rename to website/client/js/services/taskServices.js diff --git a/website/public/js/services/userServices.js b/website/client/js/services/userServices.js similarity index 100% rename from website/public/js/services/userServices.js rename to website/client/js/services/userServices.js diff --git a/website/public/js/static.js b/website/client/js/static.js similarity index 100% rename from website/public/js/static.js rename to website/client/js/static.js diff --git a/website/public/logo.png b/website/client/logo.png similarity index 100% rename from website/public/logo.png rename to website/client/logo.png diff --git a/website/public/logo/HABITRPG logo version 1.psd b/website/client/logo/HABITRPG logo version 1.psd similarity index 100% rename from website/public/logo/HABITRPG logo version 1.psd rename to website/client/logo/HABITRPG logo version 1.psd diff --git a/website/public/logo/HABITRPG-logo-version-1.gif b/website/client/logo/HABITRPG-logo-version-1.gif similarity index 100% rename from website/public/logo/HABITRPG-logo-version-1.gif rename to website/client/logo/HABITRPG-logo-version-1.gif diff --git a/website/public/logo/habitrpg.jpg b/website/client/logo/habitrpg.jpg similarity index 100% rename from website/public/logo/habitrpg.jpg rename to website/client/logo/habitrpg.jpg diff --git a/website/public/logo/habitrpg_bl.eps b/website/client/logo/habitrpg_bl.eps similarity index 100% rename from website/public/logo/habitrpg_bl.eps rename to website/client/logo/habitrpg_bl.eps diff --git a/website/public/logo/habitrpg_pixel.png b/website/client/logo/habitrpg_pixel.png similarity index 100% rename from website/public/logo/habitrpg_pixel.png rename to website/client/logo/habitrpg_pixel.png diff --git a/website/public/manifest.json b/website/client/manifest.json similarity index 100% rename from website/public/manifest.json rename to website/client/manifest.json diff --git a/website/public/marketing/android_iphone.png b/website/client/marketing/android_iphone.png similarity index 100% rename from website/public/marketing/android_iphone.png rename to website/client/marketing/android_iphone.png diff --git a/website/public/marketing/animals.png b/website/client/marketing/animals.png similarity index 100% rename from website/public/marketing/animals.png rename to website/client/marketing/animals.png diff --git a/website/public/marketing/challenge.png b/website/client/marketing/challenge.png similarity index 100% rename from website/public/marketing/challenge.png rename to website/client/marketing/challenge.png diff --git a/website/public/marketing/devices.png b/website/client/marketing/devices.png similarity index 100% rename from website/public/marketing/devices.png rename to website/client/marketing/devices.png diff --git a/website/public/marketing/drops.png b/website/client/marketing/drops.png similarity index 100% rename from website/public/marketing/drops.png rename to website/client/marketing/drops.png diff --git a/website/public/marketing/education.png b/website/client/marketing/education.png similarity index 100% rename from website/public/marketing/education.png rename to website/client/marketing/education.png diff --git a/website/public/marketing/gear.png b/website/client/marketing/gear.png similarity index 100% rename from website/public/marketing/gear.png rename to website/client/marketing/gear.png diff --git a/website/public/marketing/guild.png b/website/client/marketing/guild.png similarity index 100% rename from website/public/marketing/guild.png rename to website/client/marketing/guild.png diff --git a/website/public/marketing/guild_small.png b/website/client/marketing/guild_small.png similarity index 100% rename from website/public/marketing/guild_small.png rename to website/client/marketing/guild_small.png diff --git a/website/public/marketing/integration.png b/website/client/marketing/integration.png similarity index 100% rename from website/public/marketing/integration.png rename to website/client/marketing/integration.png diff --git a/website/public/marketing/lefnire.png b/website/client/marketing/lefnire.png similarity index 100% rename from website/public/marketing/lefnire.png rename to website/client/marketing/lefnire.png diff --git a/website/public/marketing/promos/201403_Forest_Walker.png b/website/client/marketing/promos/201403_Forest_Walker.png similarity index 100% rename from website/public/marketing/promos/201403_Forest_Walker.png rename to website/client/marketing/promos/201403_Forest_Walker.png diff --git a/website/public/marketing/promos/April14SAMPLE2.png b/website/client/marketing/promos/April14SAMPLE2.png similarity index 100% rename from website/public/marketing/promos/April14SAMPLE2.png rename to website/client/marketing/promos/April14SAMPLE2.png diff --git a/website/public/marketing/screenshot.png b/website/client/marketing/screenshot.png similarity index 100% rename from website/public/marketing/screenshot.png rename to website/client/marketing/screenshot.png diff --git a/website/public/marketing/social_competitve.png b/website/client/marketing/social_competitve.png similarity index 100% rename from website/public/marketing/social_competitve.png rename to website/client/marketing/social_competitve.png diff --git a/website/public/marketing/wellness.png b/website/client/marketing/wellness.png similarity index 100% rename from website/public/marketing/wellness.png rename to website/client/marketing/wellness.png diff --git a/website/public/merch/stickermule-logo.png b/website/client/merch/stickermule-logo.png similarity index 100% rename from website/public/merch/stickermule-logo.png rename to website/client/merch/stickermule-logo.png diff --git a/website/public/merch/stickermule-logo.svg b/website/client/merch/stickermule-logo.svg similarity index 100% rename from website/public/merch/stickermule-logo.svg rename to website/client/merch/stickermule-logo.svg diff --git a/website/public/merch/stickermule.png b/website/client/merch/stickermule.png similarity index 100% rename from website/public/merch/stickermule.png rename to website/client/merch/stickermule.png diff --git a/website/public/merch/teespring-eu-logo.png b/website/client/merch/teespring-eu-logo.png similarity index 100% rename from website/public/merch/teespring-eu-logo.png rename to website/client/merch/teespring-eu-logo.png diff --git a/website/public/merch/teespring-eu.png b/website/client/merch/teespring-eu.png similarity index 100% rename from website/public/merch/teespring-eu.png rename to website/client/merch/teespring-eu.png diff --git a/website/public/merch/teespring-logo.png b/website/client/merch/teespring-logo.png similarity index 100% rename from website/public/merch/teespring-logo.png rename to website/client/merch/teespring-logo.png diff --git a/website/public/merch/teespring-logo.svg b/website/client/merch/teespring-logo.svg similarity index 100% rename from website/public/merch/teespring-logo.svg rename to website/client/merch/teespring-logo.svg diff --git a/website/public/merch/teespring.png b/website/client/merch/teespring.png similarity index 100% rename from website/public/merch/teespring.png rename to website/client/merch/teespring.png diff --git a/website/public/page-loader.gif b/website/client/page-loader.gif similarity index 100% rename from website/public/page-loader.gif rename to website/client/page-loader.gif diff --git a/website/public/presskit/Boss - Basi-List.png b/website/client/presskit/Boss - Basi-List.png similarity index 100% rename from website/public/presskit/Boss - Basi-List.png rename to website/client/presskit/Boss - Basi-List.png diff --git a/website/public/presskit/Boss - Battling the Ghost Stag.png b/website/client/presskit/Boss - Battling the Ghost Stag.png similarity index 100% rename from website/public/presskit/Boss - Battling the Ghost Stag.png rename to website/client/presskit/Boss - Battling the Ghost Stag.png diff --git a/website/public/presskit/Boss - Laundromancer.png b/website/client/presskit/Boss - Laundromancer.png similarity index 100% rename from website/public/presskit/Boss - Laundromancer.png rename to website/client/presskit/Boss - Laundromancer.png diff --git a/website/public/presskit/Boss - Necro-Vice.png b/website/client/presskit/Boss - Necro-Vice.png similarity index 100% rename from website/public/presskit/Boss - Necro-Vice.png rename to website/client/presskit/Boss - Necro-Vice.png diff --git a/website/public/presskit/Boss - SnackLess Monster.png b/website/client/presskit/Boss - SnackLess Monster.png similarity index 100% rename from website/public/presskit/Boss - SnackLess Monster.png rename to website/client/presskit/Boss - SnackLess Monster.png diff --git a/website/public/presskit/Boss - Stagnant Dishes.png b/website/client/presskit/Boss - Stagnant Dishes.png similarity index 100% rename from website/public/presskit/Boss - Stagnant Dishes.png rename to website/client/presskit/Boss - Stagnant Dishes.png diff --git a/website/public/presskit/Habitica Gryphon.png b/website/client/presskit/Habitica Gryphon.png similarity index 100% rename from website/public/presskit/Habitica Gryphon.png rename to website/client/presskit/Habitica Gryphon.png diff --git a/website/public/presskit/Habitica Logo - Android.png b/website/client/presskit/Habitica Logo - Android.png similarity index 100% rename from website/public/presskit/Habitica Logo - Android.png rename to website/client/presskit/Habitica Logo - Android.png diff --git a/website/public/presskit/Habitica Logo - Icon with Text.png b/website/client/presskit/Habitica Logo - Icon with Text.png similarity index 100% rename from website/public/presskit/Habitica Logo - Icon with Text.png rename to website/client/presskit/Habitica Logo - Icon with Text.png diff --git a/website/public/presskit/Habitica Logo - Icon.png b/website/client/presskit/Habitica Logo - Icon.png similarity index 100% rename from website/public/presskit/Habitica Logo - Icon.png rename to website/client/presskit/Habitica Logo - Icon.png diff --git a/website/public/presskit/Habitica Logo - Text.png b/website/client/presskit/Habitica Logo - Text.png similarity index 100% rename from website/public/presskit/Habitica Logo - Text.png rename to website/client/presskit/Habitica Logo - Text.png diff --git a/website/public/presskit/Habitica Logo - iOS.png b/website/client/presskit/Habitica Logo - iOS.png similarity index 100% rename from website/public/presskit/Habitica Logo - iOS.png rename to website/client/presskit/Habitica Logo - iOS.png diff --git a/website/public/presskit/Habitica Promo - Thin.png b/website/client/presskit/Habitica Promo - Thin.png similarity index 100% rename from website/public/presskit/Habitica Promo - Thin.png rename to website/client/presskit/Habitica Promo - Thin.png diff --git a/website/public/presskit/Habitica Promo.png b/website/client/presskit/Habitica Promo.png similarity index 100% rename from website/public/presskit/Habitica Promo.png rename to website/client/presskit/Habitica Promo.png diff --git a/website/public/presskit/Sample Screen - Boss (iOS).png b/website/client/presskit/Sample Screen - Boss (iOS).png similarity index 100% rename from website/public/presskit/Sample Screen - Boss (iOS).png rename to website/client/presskit/Sample Screen - Boss (iOS).png diff --git a/website/public/presskit/Sample Screen - Challenges.png b/website/client/presskit/Sample Screen - Challenges.png similarity index 100% rename from website/public/presskit/Sample Screen - Challenges.png rename to website/client/presskit/Sample Screen - Challenges.png diff --git a/website/public/presskit/Sample Screen - Equipment.png b/website/client/presskit/Sample Screen - Equipment.png similarity index 100% rename from website/public/presskit/Sample Screen - Equipment.png rename to website/client/presskit/Sample Screen - Equipment.png diff --git a/website/public/presskit/Sample Screen - Guilds.png b/website/client/presskit/Sample Screen - Guilds.png similarity index 100% rename from website/public/presskit/Sample Screen - Guilds.png rename to website/client/presskit/Sample Screen - Guilds.png diff --git a/website/public/presskit/Sample Screen - Level Up (iOS).png b/website/client/presskit/Sample Screen - Level Up (iOS).png similarity index 100% rename from website/public/presskit/Sample Screen - Level Up (iOS).png rename to website/client/presskit/Sample Screen - Level Up (iOS).png diff --git a/website/public/presskit/Sample Screen - Market.png b/website/client/presskit/Sample Screen - Market.png similarity index 100% rename from website/public/presskit/Sample Screen - Market.png rename to website/client/presskit/Sample Screen - Market.png diff --git a/website/public/presskit/Sample Screen - Party (iOS).png b/website/client/presskit/Sample Screen - Party (iOS).png similarity index 100% rename from website/public/presskit/Sample Screen - Party (iOS).png rename to website/client/presskit/Sample Screen - Party (iOS).png diff --git a/website/public/presskit/Sample Screen - Pets (iOS).png b/website/client/presskit/Sample Screen - Pets (iOS).png similarity index 100% rename from website/public/presskit/Sample Screen - Pets (iOS).png rename to website/client/presskit/Sample Screen - Pets (iOS).png diff --git a/website/public/presskit/Sample Screen - Tasks Page (iOS).png b/website/client/presskit/Sample Screen - Tasks Page (iOS).png similarity index 100% rename from website/public/presskit/Sample Screen - Tasks Page (iOS).png rename to website/client/presskit/Sample Screen - Tasks Page (iOS).png diff --git a/website/public/presskit/Sample Screen - Tasks Page.png b/website/client/presskit/Sample Screen - Tasks Page.png similarity index 100% rename from website/public/presskit/Sample Screen - Tasks Page.png rename to website/client/presskit/Sample Screen - Tasks Page.png diff --git a/website/public/presskit/World Boss - Dread Drag'on of Dilatory.png b/website/client/presskit/World Boss - Dread Drag'on of Dilatory.png similarity index 100% rename from website/public/presskit/World Boss - Dread Drag'on of Dilatory.png rename to website/client/presskit/World Boss - Dread Drag'on of Dilatory.png diff --git a/website/public/presskit/presskit.zip b/website/client/presskit/presskit.zip similarity index 100% rename from website/public/presskit/presskit.zip rename to website/client/presskit/presskit.zip diff --git a/website/public/refresh.png b/website/client/refresh.png similarity index 100% rename from website/public/refresh.png rename to website/client/refresh.png diff --git a/website/src/controllers/api-v2/auth.js b/website/server/controllers/api-v2/auth.js similarity index 100% rename from website/src/controllers/api-v2/auth.js rename to website/server/controllers/api-v2/auth.js diff --git a/website/src/controllers/api-v2/challenges.js b/website/server/controllers/api-v2/challenges.js similarity index 100% rename from website/src/controllers/api-v2/challenges.js rename to website/server/controllers/api-v2/challenges.js diff --git a/website/src/controllers/api-v2/coupon.js b/website/server/controllers/api-v2/coupon.js similarity index 100% rename from website/src/controllers/api-v2/coupon.js rename to website/server/controllers/api-v2/coupon.js diff --git a/website/src/controllers/api-v2/dataexport.js b/website/server/controllers/api-v2/dataexport.js similarity index 100% rename from website/src/controllers/api-v2/dataexport.js rename to website/server/controllers/api-v2/dataexport.js diff --git a/website/src/controllers/api-v2/groups.js b/website/server/controllers/api-v2/groups.js similarity index 100% rename from website/src/controllers/api-v2/groups.js rename to website/server/controllers/api-v2/groups.js diff --git a/website/src/controllers/api-v2/hall.js b/website/server/controllers/api-v2/hall.js similarity index 100% rename from website/src/controllers/api-v2/hall.js rename to website/server/controllers/api-v2/hall.js diff --git a/website/src/controllers/api-v2/members.js b/website/server/controllers/api-v2/members.js similarity index 100% rename from website/src/controllers/api-v2/members.js rename to website/server/controllers/api-v2/members.js diff --git a/website/src/controllers/api-v2/pushNotifications.js b/website/server/controllers/api-v2/pushNotifications.js similarity index 100% rename from website/src/controllers/api-v2/pushNotifications.js rename to website/server/controllers/api-v2/pushNotifications.js diff --git a/website/src/controllers/api-v2/unsubscription.js b/website/server/controllers/api-v2/unsubscription.js similarity index 100% rename from website/src/controllers/api-v2/unsubscription.js rename to website/server/controllers/api-v2/unsubscription.js diff --git a/website/src/controllers/api-v2/user.js b/website/server/controllers/api-v2/user.js similarity index 100% rename from website/src/controllers/api-v2/user.js rename to website/server/controllers/api-v2/user.js diff --git a/website/src/controllers/api-v3/auth.js b/website/server/controllers/api-v3/auth.js similarity index 100% rename from website/src/controllers/api-v3/auth.js rename to website/server/controllers/api-v3/auth.js diff --git a/website/src/controllers/api-v3/challenges.js b/website/server/controllers/api-v3/challenges.js similarity index 100% rename from website/src/controllers/api-v3/challenges.js rename to website/server/controllers/api-v3/challenges.js diff --git a/website/src/controllers/api-v3/chat.js b/website/server/controllers/api-v3/chat.js similarity index 100% rename from website/src/controllers/api-v3/chat.js rename to website/server/controllers/api-v3/chat.js diff --git a/website/src/controllers/api-v3/content.js b/website/server/controllers/api-v3/content.js similarity index 100% rename from website/src/controllers/api-v3/content.js rename to website/server/controllers/api-v3/content.js diff --git a/website/src/controllers/api-v3/coupon.js b/website/server/controllers/api-v3/coupon.js similarity index 100% rename from website/src/controllers/api-v3/coupon.js rename to website/server/controllers/api-v3/coupon.js diff --git a/website/src/controllers/api-v3/debug.js b/website/server/controllers/api-v3/debug.js similarity index 100% rename from website/src/controllers/api-v3/debug.js rename to website/server/controllers/api-v3/debug.js diff --git a/website/src/controllers/api-v3/email.js b/website/server/controllers/api-v3/email.js similarity index 100% rename from website/src/controllers/api-v3/email.js rename to website/server/controllers/api-v3/email.js diff --git a/website/src/controllers/api-v3/groups.js b/website/server/controllers/api-v3/groups.js similarity index 100% rename from website/src/controllers/api-v3/groups.js rename to website/server/controllers/api-v3/groups.js diff --git a/website/src/controllers/api-v3/hall.js b/website/server/controllers/api-v3/hall.js similarity index 100% rename from website/src/controllers/api-v3/hall.js rename to website/server/controllers/api-v3/hall.js diff --git a/website/src/controllers/api-v3/members.js b/website/server/controllers/api-v3/members.js similarity index 100% rename from website/src/controllers/api-v3/members.js rename to website/server/controllers/api-v3/members.js diff --git a/website/src/controllers/api-v3/modelsPaths.js b/website/server/controllers/api-v3/modelsPaths.js similarity index 100% rename from website/src/controllers/api-v3/modelsPaths.js rename to website/server/controllers/api-v3/modelsPaths.js diff --git a/website/src/controllers/api-v3/quests.js b/website/server/controllers/api-v3/quests.js similarity index 100% rename from website/src/controllers/api-v3/quests.js rename to website/server/controllers/api-v3/quests.js diff --git a/website/src/controllers/api-v3/status.js b/website/server/controllers/api-v3/status.js similarity index 100% rename from website/src/controllers/api-v3/status.js rename to website/server/controllers/api-v3/status.js diff --git a/website/src/controllers/api-v3/tags.js b/website/server/controllers/api-v3/tags.js similarity index 100% rename from website/src/controllers/api-v3/tags.js rename to website/server/controllers/api-v3/tags.js diff --git a/website/src/controllers/api-v3/tasks.js b/website/server/controllers/api-v3/tasks.js similarity index 100% rename from website/src/controllers/api-v3/tasks.js rename to website/server/controllers/api-v3/tasks.js diff --git a/website/src/controllers/api-v3/user.js b/website/server/controllers/api-v3/user.js similarity index 100% rename from website/src/controllers/api-v3/user.js rename to website/server/controllers/api-v3/user.js diff --git a/website/src/controllers/top-level/auth.js b/website/server/controllers/top-level/auth.js similarity index 100% rename from website/src/controllers/top-level/auth.js rename to website/server/controllers/top-level/auth.js diff --git a/website/src/controllers/top-level/dataexport.js b/website/server/controllers/top-level/dataexport.js similarity index 100% rename from website/src/controllers/top-level/dataexport.js rename to website/server/controllers/top-level/dataexport.js diff --git a/website/src/controllers/top-level/pages.js b/website/server/controllers/top-level/pages.js similarity index 100% rename from website/src/controllers/top-level/pages.js rename to website/server/controllers/top-level/pages.js diff --git a/website/src/controllers/top-level/payments/amazon.js b/website/server/controllers/top-level/payments/amazon.js similarity index 100% rename from website/src/controllers/top-level/payments/amazon.js rename to website/server/controllers/top-level/payments/amazon.js diff --git a/website/src/controllers/top-level/payments/iap.js b/website/server/controllers/top-level/payments/iap.js similarity index 100% rename from website/src/controllers/top-level/payments/iap.js rename to website/server/controllers/top-level/payments/iap.js diff --git a/website/src/controllers/top-level/payments/paypal.js b/website/server/controllers/top-level/payments/paypal.js similarity index 100% rename from website/src/controllers/top-level/payments/paypal.js rename to website/server/controllers/top-level/payments/paypal.js diff --git a/website/src/controllers/top-level/payments/stripe.js b/website/server/controllers/top-level/payments/stripe.js similarity index 100% rename from website/src/controllers/top-level/payments/stripe.js rename to website/server/controllers/top-level/payments/stripe.js diff --git a/website/src/index.js b/website/server/index.js similarity index 100% rename from website/src/index.js rename to website/server/index.js diff --git a/website/src/libs/api-v2/analytics.js b/website/server/libs/api-v2/analytics.js similarity index 100% rename from website/src/libs/api-v2/analytics.js rename to website/server/libs/api-v2/analytics.js diff --git a/website/src/libs/api-v2/buildManifest.js b/website/server/libs/api-v2/buildManifest.js similarity index 95% rename from website/src/libs/api-v2/buildManifest.js rename to website/server/libs/api-v2/buildManifest.js index 458bd8ac1e..bfbab1421a 100644 --- a/website/src/libs/api-v2/buildManifest.js +++ b/website/server/libs/api-v2/buildManifest.js @@ -2,7 +2,7 @@ var fs = require('fs'); var path = require('path'); var nconf = require('nconf'); var _ = require('lodash'); -var manifestFiles = require("../../../public/manifest.json"); +var manifestFiles = require("../../../client/manifest.json"); var IS_PROD = nconf.get('NODE_ENV') === 'production'; var buildFiles = []; @@ -56,4 +56,4 @@ module.exports.getManifestFiles = function(page){ } return code; -}; \ No newline at end of file +}; diff --git a/website/src/libs/api-v2/firebase.js b/website/server/libs/api-v2/firebase.js similarity index 100% rename from website/src/libs/api-v2/firebase.js rename to website/server/libs/api-v2/firebase.js diff --git a/website/src/libs/api-v2/i18n.js b/website/server/libs/api-v2/i18n.js similarity index 100% rename from website/src/libs/api-v2/i18n.js rename to website/server/libs/api-v2/i18n.js diff --git a/website/src/libs/api-v2/logging.js b/website/server/libs/api-v2/logging.js similarity index 100% rename from website/src/libs/api-v2/logging.js rename to website/server/libs/api-v2/logging.js diff --git a/website/src/libs/api-v2/utils.js b/website/server/libs/api-v2/utils.js similarity index 100% rename from website/src/libs/api-v2/utils.js rename to website/server/libs/api-v2/utils.js diff --git a/website/src/libs/api-v2/webhook.js b/website/server/libs/api-v2/webhook.js similarity index 100% rename from website/src/libs/api-v2/webhook.js rename to website/server/libs/api-v2/webhook.js diff --git a/website/src/libs/api-v3/amazonPayments.js b/website/server/libs/api-v3/amazonPayments.js similarity index 100% rename from website/src/libs/api-v3/amazonPayments.js rename to website/server/libs/api-v3/amazonPayments.js diff --git a/website/src/libs/api-v3/analyticsService.js b/website/server/libs/api-v3/analyticsService.js similarity index 100% rename from website/src/libs/api-v3/analyticsService.js rename to website/server/libs/api-v3/analyticsService.js diff --git a/website/src/libs/api-v3/baseModel.js b/website/server/libs/api-v3/baseModel.js similarity index 100% rename from website/src/libs/api-v3/baseModel.js rename to website/server/libs/api-v3/baseModel.js diff --git a/website/src/libs/api-v3/buildManifest.js b/website/server/libs/api-v3/buildManifest.js similarity index 95% rename from website/src/libs/api-v3/buildManifest.js rename to website/server/libs/api-v3/buildManifest.js index 94d6d49a2d..55db474354 100644 --- a/website/src/libs/api-v3/buildManifest.js +++ b/website/server/libs/api-v3/buildManifest.js @@ -2,7 +2,7 @@ import fs from 'fs'; import path from 'path'; import nconf from 'nconf'; -const MANIFEST_FILE_PATH = path.join(__dirname, '/../../../public/manifest.json'); +const MANIFEST_FILE_PATH = path.join(__dirname, '/../../../client/manifest.json'); const BUILD_FOLDER_PATH = path.join(__dirname, '/../../../build'); let manifestFiles = require(MANIFEST_FILE_PATH); @@ -59,4 +59,4 @@ export function getManifestFiles (page) { } return htmlCode; -} \ No newline at end of file +} diff --git a/website/src/libs/api-v3/collectionManipulators.js b/website/server/libs/api-v3/collectionManipulators.js similarity index 100% rename from website/src/libs/api-v3/collectionManipulators.js rename to website/server/libs/api-v3/collectionManipulators.js diff --git a/website/src/libs/api-v3/cron.js b/website/server/libs/api-v3/cron.js similarity index 100% rename from website/src/libs/api-v3/cron.js rename to website/server/libs/api-v3/cron.js diff --git a/website/src/libs/api-v3/csvStringify.js b/website/server/libs/api-v3/csvStringify.js similarity index 100% rename from website/src/libs/api-v3/csvStringify.js rename to website/server/libs/api-v3/csvStringify.js diff --git a/website/src/libs/api-v3/email.js b/website/server/libs/api-v3/email.js similarity index 100% rename from website/src/libs/api-v3/email.js rename to website/server/libs/api-v3/email.js diff --git a/website/src/libs/api-v3/encryption.js b/website/server/libs/api-v3/encryption.js similarity index 100% rename from website/src/libs/api-v3/encryption.js rename to website/server/libs/api-v3/encryption.js diff --git a/website/src/libs/api-v3/errors.js b/website/server/libs/api-v3/errors.js similarity index 100% rename from website/src/libs/api-v3/errors.js rename to website/server/libs/api-v3/errors.js diff --git a/website/src/libs/api-v3/firebase.js b/website/server/libs/api-v3/firebase.js similarity index 100% rename from website/src/libs/api-v3/firebase.js rename to website/server/libs/api-v3/firebase.js diff --git a/website/src/libs/api-v3/i18n.js b/website/server/libs/api-v3/i18n.js similarity index 100% rename from website/src/libs/api-v3/i18n.js rename to website/server/libs/api-v3/i18n.js diff --git a/website/src/libs/api-v3/logger.js b/website/server/libs/api-v3/logger.js similarity index 100% rename from website/src/libs/api-v3/logger.js rename to website/server/libs/api-v3/logger.js diff --git a/website/src/libs/api-v3/password.js b/website/server/libs/api-v3/password.js similarity index 100% rename from website/src/libs/api-v3/password.js rename to website/server/libs/api-v3/password.js diff --git a/website/src/libs/api-v3/payments.js b/website/server/libs/api-v3/payments.js similarity index 100% rename from website/src/libs/api-v3/payments.js rename to website/server/libs/api-v3/payments.js diff --git a/website/src/libs/api-v3/preening.js b/website/server/libs/api-v3/preening.js similarity index 100% rename from website/src/libs/api-v3/preening.js rename to website/server/libs/api-v3/preening.js diff --git a/website/src/libs/api-v3/pushNotifications.js b/website/server/libs/api-v3/pushNotifications.js similarity index 100% rename from website/src/libs/api-v3/pushNotifications.js rename to website/server/libs/api-v3/pushNotifications.js diff --git a/website/src/libs/api-v3/routes.js b/website/server/libs/api-v3/routes.js similarity index 100% rename from website/src/libs/api-v3/routes.js rename to website/server/libs/api-v3/routes.js diff --git a/website/src/libs/api-v3/setupMongoose.js b/website/server/libs/api-v3/setupMongoose.js similarity index 100% rename from website/src/libs/api-v3/setupMongoose.js rename to website/server/libs/api-v3/setupMongoose.js diff --git a/website/src/libs/api-v3/setupNconf.js b/website/server/libs/api-v3/setupNconf.js similarity index 100% rename from website/src/libs/api-v3/setupNconf.js rename to website/server/libs/api-v3/setupNconf.js diff --git a/website/src/libs/api-v3/setupPassport.js b/website/server/libs/api-v3/setupPassport.js similarity index 100% rename from website/src/libs/api-v3/setupPassport.js rename to website/server/libs/api-v3/setupPassport.js diff --git a/website/src/libs/api-v3/webhook.js b/website/server/libs/api-v3/webhook.js similarity index 100% rename from website/src/libs/api-v3/webhook.js rename to website/server/libs/api-v3/webhook.js diff --git a/website/src/middlewares/api-v2/domain.js b/website/server/middlewares/api-v2/domain.js similarity index 100% rename from website/src/middlewares/api-v2/domain.js rename to website/server/middlewares/api-v2/domain.js diff --git a/website/src/middlewares/api-v2/errorHandler.js b/website/server/middlewares/api-v2/errorHandler.js similarity index 100% rename from website/src/middlewares/api-v2/errorHandler.js rename to website/server/middlewares/api-v2/errorHandler.js diff --git a/website/src/middlewares/api-v2/locals.js b/website/server/middlewares/api-v2/locals.js similarity index 100% rename from website/src/middlewares/api-v2/locals.js rename to website/server/middlewares/api-v2/locals.js diff --git a/website/src/middlewares/api-v3/analytics.js b/website/server/middlewares/api-v3/analytics.js similarity index 100% rename from website/src/middlewares/api-v3/analytics.js rename to website/server/middlewares/api-v3/analytics.js diff --git a/website/src/middlewares/api-v3/auth.js b/website/server/middlewares/api-v3/auth.js similarity index 100% rename from website/src/middlewares/api-v3/auth.js rename to website/server/middlewares/api-v3/auth.js diff --git a/website/src/middlewares/api-v3/cors.js b/website/server/middlewares/api-v3/cors.js similarity index 100% rename from website/src/middlewares/api-v3/cors.js rename to website/server/middlewares/api-v3/cors.js diff --git a/website/src/middlewares/api-v3/cron.js b/website/server/middlewares/api-v3/cron.js similarity index 100% rename from website/src/middlewares/api-v3/cron.js rename to website/server/middlewares/api-v3/cron.js diff --git a/website/src/middlewares/api-v3/domain.js b/website/server/middlewares/api-v3/domain.js similarity index 100% rename from website/src/middlewares/api-v3/domain.js rename to website/server/middlewares/api-v3/domain.js diff --git a/website/src/middlewares/api-v3/ensureAccessRight.js b/website/server/middlewares/api-v3/ensureAccessRight.js similarity index 100% rename from website/src/middlewares/api-v3/ensureAccessRight.js rename to website/server/middlewares/api-v3/ensureAccessRight.js diff --git a/website/src/middlewares/api-v3/ensureDevelpmentMode.js b/website/server/middlewares/api-v3/ensureDevelpmentMode.js similarity index 100% rename from website/src/middlewares/api-v3/ensureDevelpmentMode.js rename to website/server/middlewares/api-v3/ensureDevelpmentMode.js diff --git a/website/src/middlewares/api-v3/errorHandler.js b/website/server/middlewares/api-v3/errorHandler.js similarity index 100% rename from website/src/middlewares/api-v3/errorHandler.js rename to website/server/middlewares/api-v3/errorHandler.js diff --git a/website/src/middlewares/api-v3/index.js b/website/server/middlewares/api-v3/index.js similarity index 97% rename from website/src/middlewares/api-v3/index.js rename to website/server/middlewares/api-v3/index.js index cadee52a1b..4b526c10e1 100644 --- a/website/src/middlewares/api-v3/index.js +++ b/website/server/middlewares/api-v3/index.js @@ -28,7 +28,7 @@ import { const IS_PROD = nconf.get('IS_PROD'); const DISABLE_LOGGING = nconf.get('DISABLE_REQUEST_LOGGING'); -const PUBLIC_DIR = path.join(__dirname, '/../../../public'); +const PUBLIC_DIR = path.join(__dirname, '/../../../client'); const SESSION_SECRET = nconf.get('SESSION_SECRET'); const TWO_WEEKS = 1000 * 60 * 60 * 24 * 14; diff --git a/website/src/middlewares/api-v3/language.js b/website/server/middlewares/api-v3/language.js similarity index 100% rename from website/src/middlewares/api-v3/language.js rename to website/server/middlewares/api-v3/language.js diff --git a/website/src/middlewares/api-v3/locals.js b/website/server/middlewares/api-v3/locals.js similarity index 100% rename from website/src/middlewares/api-v3/locals.js rename to website/server/middlewares/api-v3/locals.js diff --git a/website/src/middlewares/api-v3/notFound.js b/website/server/middlewares/api-v3/notFound.js similarity index 100% rename from website/src/middlewares/api-v3/notFound.js rename to website/server/middlewares/api-v3/notFound.js diff --git a/website/src/middlewares/api-v3/redirects.js b/website/server/middlewares/api-v3/redirects.js similarity index 100% rename from website/src/middlewares/api-v3/redirects.js rename to website/server/middlewares/api-v3/redirects.js diff --git a/website/src/middlewares/api-v3/response.js b/website/server/middlewares/api-v3/response.js similarity index 100% rename from website/src/middlewares/api-v3/response.js rename to website/server/middlewares/api-v3/response.js diff --git a/website/src/middlewares/api-v3/setupBody.js b/website/server/middlewares/api-v3/setupBody.js similarity index 100% rename from website/src/middlewares/api-v3/setupBody.js rename to website/server/middlewares/api-v3/setupBody.js diff --git a/website/src/middlewares/api-v3/static.js b/website/server/middlewares/api-v3/static.js similarity index 93% rename from website/src/middlewares/api-v3/static.js rename to website/server/middlewares/api-v3/static.js index eda3a9e39d..19c1c9025c 100644 --- a/website/src/middlewares/api-v3/static.js +++ b/website/server/middlewares/api-v3/static.js @@ -4,7 +4,7 @@ import path from 'path'; const IS_PROD = nconf.get('IS_PROD'); const MAX_AGE = IS_PROD ? 31536000000 : 0; -const PUBLIC_DIR = path.join(__dirname, '/../../../public'); +const PUBLIC_DIR = path.join(__dirname, '/../../../client'); const BUILD_DIR = path.join(__dirname, '/../../../build'); module.exports = function staticMiddleware (expressApp) { diff --git a/website/src/middlewares/api-v3/v1.js b/website/server/middlewares/api-v3/v1.js similarity index 100% rename from website/src/middlewares/api-v3/v1.js rename to website/server/middlewares/api-v3/v1.js diff --git a/website/src/middlewares/api-v3/v2.js b/website/server/middlewares/api-v3/v2.js similarity index 100% rename from website/src/middlewares/api-v3/v2.js rename to website/server/middlewares/api-v3/v2.js diff --git a/website/src/middlewares/api-v3/v3.js b/website/server/middlewares/api-v3/v3.js similarity index 100% rename from website/src/middlewares/api-v3/v3.js rename to website/server/middlewares/api-v3/v3.js diff --git a/website/src/middlewares/apiThrottle.js b/website/server/middlewares/apiThrottle.js similarity index 100% rename from website/src/middlewares/apiThrottle.js rename to website/server/middlewares/apiThrottle.js diff --git a/website/src/middlewares/forceRefresh.js b/website/server/middlewares/forceRefresh.js similarity index 100% rename from website/src/middlewares/forceRefresh.js rename to website/server/middlewares/forceRefresh.js diff --git a/website/src/models/challenge.js b/website/server/models/challenge.js similarity index 100% rename from website/src/models/challenge.js rename to website/server/models/challenge.js diff --git a/website/src/models/coupon.js b/website/server/models/coupon.js similarity index 100% rename from website/src/models/coupon.js rename to website/server/models/coupon.js diff --git a/website/src/models/emailUnsubscription.js b/website/server/models/emailUnsubscription.js similarity index 100% rename from website/src/models/emailUnsubscription.js rename to website/server/models/emailUnsubscription.js diff --git a/website/src/models/group.js b/website/server/models/group.js similarity index 100% rename from website/src/models/group.js rename to website/server/models/group.js diff --git a/website/src/models/tag.js b/website/server/models/tag.js similarity index 100% rename from website/src/models/tag.js rename to website/server/models/tag.js diff --git a/website/src/models/task.js b/website/server/models/task.js similarity index 100% rename from website/src/models/task.js rename to website/server/models/task.js diff --git a/website/src/models/user.js b/website/server/models/user.js similarity index 100% rename from website/src/models/user.js rename to website/server/models/user.js diff --git a/website/src/routes/api-v2/auth.js b/website/server/routes/api-v2/auth.js similarity index 100% rename from website/src/routes/api-v2/auth.js rename to website/server/routes/api-v2/auth.js diff --git a/website/src/routes/api-v2/coupon.js b/website/server/routes/api-v2/coupon.js similarity index 100% rename from website/src/routes/api-v2/coupon.js rename to website/server/routes/api-v2/coupon.js diff --git a/website/src/routes/api-v2/swagger.js b/website/server/routes/api-v2/swagger.js similarity index 100% rename from website/src/routes/api-v2/swagger.js rename to website/server/routes/api-v2/swagger.js diff --git a/website/src/routes/api-v2/unsubscription.js b/website/server/routes/api-v2/unsubscription.js similarity index 100% rename from website/src/routes/api-v2/unsubscription.js rename to website/server/routes/api-v2/unsubscription.js diff --git a/website/src/routes/pages.js b/website/server/routes/pages.js similarity index 100% rename from website/src/routes/pages.js rename to website/server/routes/pages.js diff --git a/website/src/routes/payments.js b/website/server/routes/payments.js similarity index 100% rename from website/src/routes/payments.js rename to website/server/routes/payments.js diff --git a/website/src/server.js b/website/server/server.js similarity index 100% rename from website/src/server.js rename to website/server/server.js diff --git a/website/views/static/api.jade b/website/views/static/api.jade index 8c7ebcce8a..cf290cc0f8 100644 --- a/website/views/static/api.jade +++ b/website/views/static/api.jade @@ -93,7 +93,7 @@ html p All API requests should be prefaced by https://habitica.com. Every authenticated request should include two headers. Your api key (x-api-key) and your user id (x-api-user). Do not include {} braces in your header (-H 'x-api-user: a94b6d9d-6b64-43ae-856c-2c3f211bd426') h2 Requirements: p The base-url for all routes is /api/v2. So /user actions will be at https://habitica.com/api/v2/*. You need to send x-api-user and x-api-key headers for each request. - p For create & edit paths (PUT & POST), you'll need to know the schema of the object you're trying to create or edit. See Schema definitions here + p For create & edit paths (PUT & POST), you'll need to know the schema of the object you're trying to create or edit. See Schema definitions here p If any of the documentation is lacking or you're having trouble with it, please post an issue to Github #message-bar.swagger-ui-wrap #swagger-ui-container.swagger-ui-wrap