Skip to content

Commit 5f7f2b2

Browse files
committed
Merge branch 'dev' of https://github.com/oslabs-beta/OverVue into dev
2 parents f03554c + 9ac0bb5 commit 5f7f2b2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+38108
-30835
lines changed

.eslintrc.js

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
1-
/* eslint-disable max-len */
2-
module.exports = {
3-
root: true,
4-
5-
parserOptions: {
6-
parser: 'babel-eslint',
7-
sourceType: 'module'
8-
},
9-
10-
env: {
11-
browser: true
12-
},
13-
14-
extends: [
15-
// https://github.com/vuejs/eslint-plugin-vue#priority-a-essential-error-prevention
16-
// consider switching to `plugin:vue/strongly-recommended` or `plugin:vue/recommended` for stricter rules.
17-
'plugin:vue/essential',
18-
'@vue/standard'
19-
],
20-
21-
// required to lint *.vue files
22-
plugins: ['vue'],
23-
24-
globals: {
25-
ga: true, // Google Analytics
26-
cordova: true,
27-
__statics: true,
28-
process: true
29-
},
30-
31-
// add your custom rules here
32-
rules: {
33-
// allow async-await
34-
'generator-star-spacing': 'off',
35-
// allow paren-less arrow functions
36-
'arrow-parens': 'off',
37-
'one-var': 'off',
38-
'semi': 'off',
39-
'quotes': 'off',
40-
'space-before-function-paren': 'off',
41-
'import/first': 'off',
42-
'import/named': 'error',
43-
'import/namespace': 'error',
44-
'import/default': 'error',
45-
'import/export': 'error',
46-
'import/extensions': 'off',
47-
'import/no-unresolved': 'off',
48-
'import/no-extraneous-dependencies': 'off',
49-
'prefer-promise-reject-errors': 'off',
50-
// allow console.log during development only
51-
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
52-
// allow debugger during development only
53-
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
54-
}
55-
}
1+
/* eslint-disable max-len */
2+
module.exports = {
3+
root: true,
4+
5+
parserOptions: {
6+
parser: 'babel-eslint',
7+
sourceType: 'module'
8+
},
9+
10+
env: {
11+
browser: true
12+
},
13+
14+
extends: [
15+
// https://github.com/vuejs/eslint-plugin-vue#priority-a-essential-error-prevention
16+
// consider switching to `plugin:vue/strongly-recommended` or `plugin:vue/recommended` for stricter rules.
17+
'plugin:vue/essential',
18+
'@vue/standard'
19+
],
20+
21+
// required to lint *.vue files
22+
plugins: ['vue'],
23+
24+
globals: {
25+
ga: true, // Google Analytics
26+
cordova: true,
27+
__statics: true,
28+
process: true
29+
},
30+
31+
// add your custom rules here
32+
rules: {
33+
// allow async-await
34+
'generator-star-spacing': 'off',
35+
// allow paren-less arrow functions
36+
'arrow-parens': 'off',
37+
'one-var': 'off',
38+
'semi': 'off',
39+
'quotes': 'off',
40+
'space-before-function-paren': 'off',
41+
'import/first': 'off',
42+
'import/named': 'error',
43+
'import/namespace': 'error',
44+
'import/default': 'error',
45+
'import/export': 'error',
46+
'import/extensions': 'off',
47+
'import/no-unresolved': 'off',
48+
'import/no-extraneous-dependencies': 'off',
49+
'prefer-promise-reject-errors': 'off',
50+
// allow console.log during development only
51+
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
52+
// allow debugger during development only
53+
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
54+
}
55+
}

.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@ npm-debug.log*
1616
yarn-debug.log*
1717
yarn-error.log*
1818
/coverage
19-
<<<<<<< HEAD
2019
# package-lock.json
21-
=======
22-
>>>>>>> dev
2320
vetur.config.js
2421

2522
# Editor directories and files

Overvue.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#include <iostream>
2+
3+
void say_hello(){
4+
std::cout << "Hello, from Overvue!\n";
5+
}

binding.gyp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"targets": [
3+
{
4+
"target_name": "binding",
5+
"sources": [ "src/binding.cc" ]
6+
}
7+
]
8+
}

0 commit comments

Comments
 (0)