Skip to content

Commit

Permalink
Migrated to Fusebox
Browse files Browse the repository at this point in the history
  • Loading branch information
NGPixel committed Mar 27, 2017
1 parent d4e0b74 commit 5189ec3
Show file tree
Hide file tree
Showing 21 changed files with 59,663 additions and 217 deletions.
15 changes: 15 additions & 0 deletions .deployexclude
@@ -0,0 +1,15 @@
client/js
client/scss
coverage
data
logs
node_modules
npm
repo
test
.*
*.log
*.tar.gz
*.zip
config.yml
fuse.js
7 changes: 7 additions & 0 deletions .eslintignore
@@ -0,0 +1,7 @@
**/node_modules/**
**/*.min.js
assets/**
coverage/**
repo/**
data/**
logs/**
146 changes: 3 additions & 143 deletions .eslintrc.json
@@ -1,23 +1,12 @@
{
"parserOptions": {
"ecmaVersion": 8,
"ecmaFeatures": {
"experimentalObjectRestSpread": true,
"jsx": true
},
"sourceType": "module"
},
"extends": "standard",

"env": {
"node": true,
"es6": true,
"node": true
"jest": true
},

"plugins": [
"standard",
"promise"
],

"globals": {
"document": false,
"navigator": false,
Expand All @@ -41,134 +30,5 @@
"ROOTPATH": true,
"IS_DEBUG": true,
"PROCNAME": true
},

"rules": {
"accessor-pairs": 2,
"arrow-spacing": [2, { "before": true, "after": true }],
"block-spacing": [2, "always"],
"brace-style": [2, "1tbs", { "allowSingleLine": true }],
"camelcase": [2, { "properties": "never" }],
"comma-dangle": [2, "never"],
"comma-spacing": [2, { "before": false, "after": true }],
"comma-style": [2, "last"],
"constructor-super": 2,
"curly": [2, "multi-line"],
"dot-location": [2, "property"],
"eol-last": 2,
"eqeqeq": [2, "always", {"null": "ignore"}],
"func-call-spacing": [2, "never"],
"handle-callback-err": [2, "^(err|error)$" ],
"indent": [2, 2, { "SwitchCase": 1 }],
"key-spacing": [2, { "beforeColon": false, "afterColon": true }],
"keyword-spacing": [2, { "before": true, "after": true }],
"new-cap": [2, { "newIsCap": true, "capIsNew": false }],
"new-parens": 2,
"no-array-constructor": 2,
"no-caller": 2,
"no-class-assign": 2,
"no-cond-assign": 2,
"no-const-assign": 2,
"no-constant-condition": [2, { "checkLoops": false }],
"no-control-regex": 2,
"no-debugger": 2,
"no-delete-var": 2,
"no-dupe-args": 2,
"no-dupe-class-members": 2,
"no-dupe-keys": 2,
"no-duplicate-case": 2,
"no-duplicate-imports": 2,
"no-empty-character-class": 2,
"no-empty-pattern": 2,
"no-eval": 2,
"no-ex-assign": 2,
"no-extend-native": 2,
"no-extra-bind": 2,
"no-extra-boolean-cast": 2,
"no-extra-parens": [2, "functions"],
"no-fallthrough": 2,
"no-floating-decimal": 2,
"no-func-assign": 2,
"no-global-assign": 2,
"no-implied-eval": 2,
"no-inner-declarations": [2, "functions"],
"no-invalid-regexp": 2,
"no-irregular-whitespace": 2,
"no-iterator": 2,
"no-label-var": 2,
"no-labels": [2, { "allowLoop": false, "allowSwitch": false }],
"no-lone-blocks": 2,
"no-mixed-spaces-and-tabs": 2,
"no-multi-spaces": 2,
"no-multi-str": 2,
"no-multiple-empty-lines": [2, { "max": 1 }],
"no-negated-in-lhs": 2,
"no-new": 2,
"no-new-func": 2,
"no-new-object": 2,
"no-new-require": 2,
"no-new-symbol": 2,
"no-new-wrappers": 2,
"no-obj-calls": 2,
"no-octal": 2,
"no-octal-escape": 2,
"no-path-concat": 2,
"no-proto": 2,
"no-redeclare": 2,
"no-regex-spaces": 2,
"no-return-assign": [2, "except-parens"],
"no-self-assign": 2,
"no-self-compare": 2,
"no-sequences": 2,
"no-shadow-restricted-names": 2,
"no-sparse-arrays": 2,
"no-tabs": 2,
"no-template-curly-in-string": 2,
"no-this-before-super": 2,
"no-throw-literal": 2,
"no-trailing-spaces": 2,
"no-undef": 2,
"no-undef-init": 2,
"no-unexpected-multiline": 2,
"no-unmodified-loop-condition": 2,
"no-unneeded-ternary": [2, { "defaultAssignment": false }],
"no-unreachable": 2,
"no-unsafe-finally": 2,
"no-unsafe-negation": 2,
"no-unused-vars": [2, { "vars": "all", "args": "none" }],
"no-useless-call": 2,
"no-useless-computed-key": 2,
"no-useless-constructor": 2,
"no-useless-escape": 2,
"no-useless-rename": 2,
"no-whitespace-before-property": 2,
"no-with": 2,
"object-property-newline": [2, { "allowMultiplePropertiesPerLine": true }],
"one-var": [2, { "initialized": "never" }],
"operator-linebreak": [2, "after", { "overrides": { "?": "before", ":": "before" } }],
"padded-blocks": [2, "never"],
"quotes": [2, "single", { "avoidEscape": true, "allowTemplateLiterals": true }],
"rest-spread-spacing": [2, "never"],
"semi": [2, "never"],
"semi-spacing": [2, { "before": false, "after": true }],
"space-before-blocks": [2, "always"],
"space-before-function-paren": [2, "always"],
"space-in-parens": [2, "never"],
"space-infix-ops": 2,
"space-unary-ops": [2, { "words": true, "nonwords": false }],
"spaced-comment": [2, "always", { "line": { "markers": ["*package", "!", ","] }, "block": { "balanced": true, "markers": ["*package", "!", ","], "exceptions": ["*"] } }],
"template-curly-spacing": [2, "never"],
"unicode-bom": [2, "never"],
"use-isnan": 2,
"valid-typeof": 2,
"wrap-iife": [2, "any", { "functionPrototypeMethods": true }],
"yield-star-spacing": [2, "both"],
"yoda": [2, "never"],

"standard/object-curly-even-spacing": [2, "either"],
"standard/array-bracket-even-spacing": [2, "either"],
"standard/computed-property-even-spacing": [2, "even"],

"promise/param-names": 2
}
}
4 changes: 2 additions & 2 deletions .gitignore
Expand Up @@ -41,8 +41,8 @@ jspm_packages
# Optional REPL history
.node_repl_history

# SublimeText Files
*.sublime-workspace
# Fusebox
.fusebox

# Config Files
config.yml
Expand Down
12 changes: 6 additions & 6 deletions .travis.yml
Expand Up @@ -2,7 +2,7 @@ language: node_js
node_js:
- '7'
- '6'
#- '4'
- '4'
addons:
apt:
sources:
Expand All @@ -18,20 +18,20 @@ cache:
directories:
- node_modules
before_script:
- npm run build
- npm install -g snyk
- snyk auth $SNYK_TOKEN
before_deploy:
- npm install github:requarks/core -f
- npm install -g gulp
- gulp deploy
- tar -czf wiki-js.tar.gz * -X='.deployexclude'
- zip -R -q 'wiki-js' -x@.deployexclude
- snyk monitor
deploy:
provider: releases
api_key:
secure: TyasQ2QnWQoBhsiwm88oHoeJ+PWBZnbWEJwu6JdN5HA9cXqIdHqd1msCh84gGtKRfL2EObw4AvDwLSEd5mIM0cmQfTiokYbmb7OSjOq880rbZwtXt9t9KkC5b+TIxkhJzkzi7vIpssTeNkVJBbo/R3m0suaCRqzypkW5mhVcsFhhZ8oVCZnI1uZAXCwFNMcFFUAHxWYE98tW5bfxknRU1NJFcXysN8VXskIZ82wQQBAzZ1aQgVyMl6Uw2hns399hxCx8gVKWOIdbpO1bliHBMdm5z+lR5i723IQnHpYJf4gWvPf3oHnSS1ocrJeWVoBqanC5Iu3QhwOvPLPw/AUcJOqhvS/QiGZ2AuA9GwtBpYNVYYGD9RqcODBKZy0fWluwCuVNNoQHmwMWVP7lRnwP+SNtLzzV5ZC8mrjb4B9KGoBUR8Q7lz8cMtLoPOixk1WdWOpIFzKcw/fy8Ze6cnnFKrzsPVUZy3E3SKit3GuP6Nd7ghO0Kxp4x0eAlqFDYRZ9nG55ctd0i2b5u1r+VArt21dk2aMFxL6i67funIraEndLQFHhRgPVmjemJBRXf8j8OYrGStTsm0S26IXo3iVh/NJakIg6mEFJ3j4BXPEjCUmIW0iD6sKGTeNH6jaON+DV4T+ErGnYzgwO5KIfo9cI00DqjG0tjBQ45lWaLGy6PEo=
file:
- dist/wiki-js.zip
- dist/wiki-js.tar.gz
- wiki-js.zip
- wiki-js.tar.gz
skip_cleanup: true
overwrite: true
on:
Expand Down
59,306 changes: 59,306 additions & 0 deletions assets/js/bundle.min.js

Large diffs are not rendered by default.

20 changes: 20 additions & 0 deletions client/index.js
@@ -0,0 +1,20 @@
'use strict'

let logic = document.documentElement.dataset.logic

switch (logic) {
case 'login':
require('./scss/login.scss')
require('./js/login.js')
break
case 'configure':
require('./scss/configure.scss')
require('./js/configure.js')
break
default:
require('./node_modules/highlight.js/styles/tomorrow.css')
require('./node_modules/simplemde/dist/simplemde.min.css')
require('./scss/app.scss')
require('./js/app.js')
break
}
8 changes: 7 additions & 1 deletion client/js/app.js
@@ -1,6 +1,12 @@
'use strict'

/* global jQuery, _, io, Sticky, alertsData, Alerts */
/* global alertsData */

import jQuery from 'jquery'
import _ from 'lodash'
import Sticky from 'sticky-js'
import io from 'socket.io-client'
import Alerts from './components/alerts.js'
/* eslint-disable spaced-comment */

jQuery(document).ready(function ($) {
Expand Down
7 changes: 5 additions & 2 deletions client/js/components/alerts.js
@@ -1,11 +1,12 @@
'use strict'

/* global Vue, _ */
import Vue from 'vue'
import _ from 'lodash'

/**
* Alerts
*/
class Alerts { // eslint-disable-line no-unused-vars
class Alerts {
/**
* Constructor
*
Expand Down Expand Up @@ -107,3 +108,5 @@ class Alerts { // eslint-disable-line no-unused-vars
}
}
}

export default Alerts
6 changes: 5 additions & 1 deletion client/js/configure.js
@@ -1,6 +1,10 @@
'use strict'

/* global jQuery, _, Vue, VeeValidate, axios */
import jQuery from 'jquery'
import _ from 'lodash'
import Vue from 'vue'
import VeeValidate from 'vee-validate'
import axios from 'axios'

Vue.use(VeeValidate, {
enableAutoClasses: true,
Expand Down
2 changes: 1 addition & 1 deletion client/js/login.js
@@ -1,6 +1,6 @@
'use strict'

/* global jQuery */
import jQuery from 'jquery'

jQuery(document).ready(function ($) {
$('#login-user').focus()
Expand Down
2 changes: 1 addition & 1 deletion client/scss/app.scss
Expand Up @@ -26,4 +26,4 @@ $primary: 'indigo';
//@import './layout/_content';

//@import './pages/_account';
@import './pages/_welcome';
@import './pages/_welcome';

0 comments on commit 5189ec3

Please sign in to comment.