krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-16 14:17:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Common reorg (#8025)

Browse Source 
* Re-organize common folder

* fix: Correct paths in tests

* fix: move new content to proper folder

* chore: Move audio folder to assets

* Move sprites to sprites assets directory

* Move css sprites to assets directory

* Split out readmes for common code and sprites

* Move images to assets directory

* Move destinatin of shared browserified file

* remove unused file

* move compiled js to client-old

* Fix karma tests

* fix: Correct paths for sprites
This commit is contained in:
Blade Barringer
2016-09-16 10:18:07 -05:00
committed by Matteo Pagliazzi
parent d971e673af
commit 81b7eeeb71
5956 changed files with 269 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
website/server/controllers/api-v3/content.js
View File

@@ -1,4 +1,4 @@
import common from '../../../../common';
import common from '../../../common';
import _ from 'lodash';
import { langCodes } from '../../libs/i18n';
import Bluebird from 'bluebird';

2
website/server/controllers/api-v3/debug.js
View File

@@ -1,7 +1,7 @@
import { authWithHeaders } from '../../middlewares/auth';
import ensureDevelpmentMode from '../../middlewares/ensureDevelpmentMode';
import { BadRequest } from '../../libs/errors';
import { content } from '../../../../common';
import { content } from '../../../common';
import _ from 'lodash';
let api = {};

2
website/server/controllers/api-v3/quests.js
View File

@@ -15,7 +15,7 @@ import {
getUserInfo,
sendTxn as sendTxnEmail,
} from '../../libs/email';
import common from '../../../../common';
import common from '../../../common';
import { sendNotification as sendPushNotification } from '../../libs/pushNotifications';
const questScrolls = common.content.quests;

2
website/server/controllers/api-v3/shops.js
View File

@@ -1,5 +1,5 @@
import { authWithHeaders } from '../../middlewares/auth';
import { shops } from '../../../../common/';
import { shops } from '../../../common/';
let api = {};

2
website/server/controllers/api-v3/tasks.js
View File

@@ -13,7 +13,7 @@ import {
createTasks,
getTasks,
} from '../../libs/taskManager';
import common from '../../../../common';
import common from '../../../common';
import Bluebird from 'bluebird';
import _ from 'lodash';
import logger from '../../libs/logger';

2
website/server/controllers/api-v3/user.js
View File

@@ -1,5 +1,5 @@
import { authWithHeaders } from '../../middlewares/auth';
import common from '../../../../common';
import common from '../../../common';
import {
NotFound,
BadRequest,