Skip to content

Commit be99aed

Browse files
authored
Merge pull request #167 from oslabs-beta/dev
Merging Dev branch to OverVue dev branch
2 parents 7feb832 + a16290f commit be99aed

File tree

99 files changed

+15134
-7417
lines changed

Some content is hidden

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

99 files changed

+15134
-7417
lines changed

.env

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
SLACK_CLIENT_SECRET = "6a6206cc93da2e49243ee9683f958438"
2-
SLACK_CLIENT_ID = "2696943977700.2696948669268"
3-
SLACK_REDIRECT_URI = "overvue://slack"
1+
SLACK_CLIENT_SECRET = "f58eea5761562d05dfa266207726f2aa"
2+
SLACK_CLIENT_ID = "4070788123922.4067827840757"
3+
SLACK_REDIRECT_URI = "https://app.slack.com/client/T0422P63MT4/C041W53TYBG?redir=%2Fapi%2Fapps%3Fnew_app%3D1"
44

55
# SLACK_CLIENT_ID = 2863575808677.2851894215719
66
# SLACK_CLIENT_SECRET = "f2298f5fbb83d842616711d19c829a45"
7-
# SLACK_REDIRECT_URI = "overvue://slack"
7+
# SLACK_REDIRECT_URI = "overvue://slack"

.env.development

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
SLACK_CLIENT_SECRET = "6a6206cc93da2e49243ee9683f958438"
2-
SLACK_CLIENT_ID = "2696943977700.2696948669268"
3-
SLACK_REDIRECT_URI = "overvuedev://test"
1+
SLACK_CLIENT_SECRET = "f58eea5761562d05dfa266207726f2aa"
2+
SLACK_CLIENT_ID = "4070788123922.4067827840757"
3+
SLACK_REDIRECT_URI = "https://app.slack.com/client/T0422P63MT4/C041W53TYBG?redir=%2Fapi%2Fapps%3Fnew_app%3D1"
44

55
# SLACK_CLIENT_ID = "2863575808677.2851894215719"
66
# SLACK_CLIENT_SECRET = "f2298f5fbb83d842616711d19c829a45"
7-
# SLACK_REDIRECT_URI = "overvuedev://test"
7+
# SLACK_REDIRECT_URI = "overvuedev://test"

.eslintrc.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,15 @@ module.exports = {
88
'vue/no-deprecated-slot-attribute': 'off',
99
},
1010

11+
"parser": "vue-eslint-parser",
1112
parserOptions: {
12-
parser: '@babel/eslint-parser',
1313
ecmaVersion: 2018, // Allows for the parsing of modern ECMAScript features
14+
parser: { //attempt to speed up runtime using TS when coding
15+
"ts":'@typescript-eslint/parser',
16+
"<template>": "espree"
17+
},
18+
requireConfigFile: false,
1419
sourceType: 'module', // Allows for the use of imports
15-
requireConfigFile: false
1620
},
1721

1822
env: {
@@ -68,4 +72,4 @@ module.exports = {
6872
// allow debugger during development only
6973
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
7074
}
71-
}
75+
};

LICENSE

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2022 OSLabs
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

0 commit comments

Comments
 (0)