chore(): rename website/src -> website/server and website/public -> website/client (#7199)

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;

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', () => {

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;

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', () => {

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';
 

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', () => {

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', () => {

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', () => {

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';
 

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', () => {

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', () => {

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', () => {

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';
 

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;
 

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', () => {

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', () => {

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';

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';

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(() => {

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();

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;

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', () => {

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;

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', () => {

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;

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;
 

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;

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';
 

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', () => {

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';
 

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', () => {