Skip to content

Commit 8c76c80

Browse files
committed
Merge branch 'master' of github.com:johnpapa/vue-heroes-node-api
2 parents af3ce90 + 944c534 commit 8c76c80

File tree

5 files changed

+22
-4
lines changed

5 files changed

+22
-4
lines changed

.env.example

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
NODE_ENV="development"
2+
PORT="7777"
3+
WWW="./"
4+
VUE_APP_API="api"
5+
# Toggle which one of these you want to use
6+
#DATA_OPTION="local_mongo"
7+
#DATA_OPTION="cloud_cosmos"
8+
DATA_OPTION="papa-cosmos-api-db"
9+
CORE_API_KEY="your key"
10+
CORE_API_URL="https://papa-cosmos-api-db.documents.azure.com:443/"

.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ module.exports = {
1414
'prettier/prettier': [
1515
'error',
1616
{
17-
trailingComma: 'es5',
17+
trailingComma: 'all',
1818
singleQuote: true,
1919
printWidth: 80,
2020
},

.prettierrc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"bracketSpacing": true,
3+
"printWidth": 80,
4+
"singleQuote": true,
5+
"tabWidth": 2,
6+
"trailingComma": "all",
7+
"useTabs": false
8+
}

server/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ function start() {
88
if (!process.env.NODE_ENV || !process.env.PORT) {
99
captains.error(
1010
'ENV variables are missing.',
11-
'Verify that you have set them directly or in a .env file.'
11+
'Verify that you have set them directly or in a .env file.',
1212
);
1313
process.exit(1);
1414
} else {
@@ -22,7 +22,7 @@ function start() {
2222
app.use(
2323
bodyParser.urlencoded({
2424
extended: false,
25-
})
25+
}),
2626
);
2727
app.use(express.static(www));
2828
app.use('/api', routes);

vue.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module.exports = {
55
devServer: {
66
proxy: {
77
'/api': {
8-
target: 'http://localhost:9000',
8+
target: 'http://localhost:7777',
99
ws: true,
1010
changeOrigin: true,
1111
},

0 commit comments

Comments
 (0)