Skip to content

Commit 7281235

Browse files
jeffreysuljeffreysul
authored
Merge pull request #114 from open-source-labs/p-o-vue-merge
Team P-O-Vue OverVue 4.0.0 merge with dev branch
2 parents 98bb399 + eb848d7 commit 7281235

File tree

129 files changed

+80174
-19098
lines changed

Some content is hidden

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

129 files changed

+80174
-19098
lines changed

‎.editorconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
root = true
2-
32
[*]
43
charset = utf-8
54
indent_style = space

‎.env.example

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#DO NOT DELETE THIS FILE, and follow instructions:
2+
# Required for Slack Oauth features
3+
# Create TWO files, one named ".env" and the second named ".env.development" in this directory, and give them the following variables
4+
# Any environment variables you create MUST also be created here in .env.example
5+
6+
SLACK_CLIENT_SECRET = "ENTER_CLIENT_SECRET_HERE"
7+
SLACK_CLIENT_ID = "ENTER_CLIENT_ID_HERE"
8+
SLACK_REDIRECT_URI = "REDIRECT URL HERE"
9+
10+
# https://www.npmjs.com/package/dotenv
11+
# https://www.npmjs.com/package/quasar-dotenv
12+
# https://v1.quasar.dev/quasar-cli/handling-process-env
13+
# https://v1.quasar.dev/quasar-cli/quasar-conf-js#using-dotenv

‎.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
12
/dist

‎.eslintrc.js

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
1-
module.exports = {
2-
root: true,
3-
4-
parserOptions: {
5-
parser: 'babel-eslint',
6-
sourceType: 'module'
7-
},
8-
9-
env: {
10-
browser: true
11-
},
12-
13-
extends: [
14-
// https://github.com/vuejs/eslint-plugin-vue#priority-a-essential-error-prevention
15-
// consider switching to `plugin:vue/strongly-recommended` or `plugin:vue/recommended` for stricter rules.
16-
'plugin:vue/essential',
17-
'@vue/standard'
18-
],
19-
20-
// required to lint *.vue files
21-
plugins: [
22-
'vue'
23-
],
24-
25-
globals: {
26-
'ga': true, // Google Analytics
27-
'cordova': true,
28-
'__statics': true,
29-
'process': true
30-
},
31-
32-
// add your custom rules here
33-
rules: {
34-
// allow async-await
35-
'generator-star-spacing': 'off',
36-
// allow paren-less arrow functions
37-
'arrow-parens': 'off',
38-
'one-var': 'off',
39-
40-
'import/first': 'off',
41-
'import/named': 'error',
42-
'import/namespace': 'error',
43-
'import/default': 'error',
44-
'import/export': 'error',
45-
'import/extensions': 'off',
46-
'import/no-unresolved': 'off',
47-
'import/no-extraneous-dependencies': 'off',
48-
'prefer-promise-reject-errors': 'off',
49-
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: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
#
2+
.env
3+
.env.development
4+
#
15
.quasar
26
.DS_Store
37
.thumbs.db
@@ -11,8 +15,9 @@ node_modules
1115
npm-debug.log*
1216
yarn-debug.log*
1317
yarn-error.log*
14-
/test
1518
/coverage
19+
# package-lock.json
20+
vetur.config.js
1621

1722
# Editor directories and files
1823
.idea

‎.postcssrc.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// https://github.com/michael-ciniawsky/postcss-load-config
21

32
module.exports = {
43
plugins: [

‎.stylintrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,5 @@
3232
"valid": true,
3333
"zeroUnits": "never",
3434
"zIndexNormalize": false
35+
3536
}

‎.vsls.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"$schema": "http://json.schemastore.org/vsls",
3+
"gitignore":"none"
4+
}

‎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+
}

0 commit comments

Comments
 (0)