Skip to content

Commit

Permalink
enhancement: merge abe users into core
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolaslabbe committed Nov 22, 2016
1 parent 3e310d4 commit e416161
Show file tree
Hide file tree
Showing 6 changed files with 382 additions and 385 deletions.
4 changes: 3 additions & 1 deletion src/cli/core/utils/index.js
Expand Up @@ -4,12 +4,14 @@ import * as text from './text'
import locales from './locales'
import * as slug from './slug'
import * as file from './file'
import * as number from './number'

export {
array,
sort,
text,
locales,
slug,
file
file,
number
}
4 changes: 2 additions & 2 deletions src/cli/users/utils.js → src/cli/core/utils/number.js 100755 → 100644
Expand Up @@ -8,7 +8,7 @@
* @return {String}
* @api private
*/
exports.uid = function(len) {
export function uid(len) {
var buf = []
, chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'
, charlen = chars.length;
Expand All @@ -29,6 +29,6 @@ exports.uid = function(len) {
* @api private
*/

function getRandomInt(min, max) {
export function random(min, max) {
return Math.floor(Math.random() * (max - min + 1)) + min;
}
4 changes: 3 additions & 1 deletion src/cli/index.js
Expand Up @@ -47,6 +47,7 @@ import * as cmsTemplates from './cms/templates'
import * as cmsReference from './cms/reference'
import * as coreUtils from './core/utils'
import * as abeExtend from './extend'
import * as User from './users'

export {
cmsData,
Expand Down Expand Up @@ -81,7 +82,8 @@ export {
ifCond,
config,
Manager,
Page
Page,
User
}

export {compileAbe as compileAbe}

0 comments on commit e416161

Please sign in to comment.