Skip to content

Commit a7f9f1a

Browse files
Jeffrey BrownJeffrey Brown
Jeffrey Brown
authored and
Jeffrey Brown
committed
APOD Linter Config and Updates
1 parent 3921291 commit a7f9f1a

9 files changed

+1946
-47
lines changed

.eslintrc.js

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
module.exports = {
2+
env: {
3+
browser: true,
4+
commonjs: true,
5+
es2021: true
6+
},
7+
extends: [
8+
'standard'
9+
],
10+
parserOptions: {
11+
ecmaVersion: 12
12+
},
13+
rules: {
14+
}
15+
}

environments/environment_dev.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
export const environment = {
2-
production: false,
3-
version: "v0.0.1"
4-
};
2+
production: false,
3+
version: "0.0.3"
4+
};
55

66

environments/environment_prod.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
export const environment = {
2-
production: true,
3-
version: "v0.0.1"
4-
};
2+
production: true,
3+
version: "0.0.3"
4+
};

environments/environment_stage.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export const environment = {
22
production: false,
3-
version: "v0.0.1"
3+
version: "0.0.3"
44
};
55

gulpfile.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// import libraries //
12
var gulp = require("gulp");
23
var sourcemaps = require("gulp-sourcemaps");
34
var babel = require("gulp-babel");
@@ -10,7 +11,6 @@ gulp.task('cleanFolders', () => {
1011
'./src/assets/public/*', './dist/*'
1112
]);
1213
});
13-
//
1414

1515
// primary compile //
1616
gulp.task("primaryCompile", function () {
@@ -21,7 +21,7 @@ gulp.task("primaryCompile", function () {
2121
.pipe(sourcemaps.write("."))
2222
.pipe(gulp.dest("dist"));
2323
});
24-
//
2524

2625

26+
// run all gulp tasks //
2727
gulp.task('default', gulp.series('cleanFolders', 'primaryCompile'));

index.js

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
1-
//** export modules **//
21
'use strict'
32

4-
module.exports = require('./lib/apod.js');
5-
6-
// // astronomy picture of the day //
7-
// module.exports = require('./lib/apod.js');
8-
9-
// // asteroids - near earth object web service //
10-
// module.exports = require('./lib/asteroids.js');
3+
// export modules
4+
module.exports = require('./lib/apod.js')

lib/apod.js

+27-28
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// import libraries //
2-
const axios = require('axios');
3-
const Joi = require('joi');
2+
const axios = require('axios')
3+
const Joi = require('joi')
44

55
// define validation schema for payload processing //
66
const validationSchema = Joi.object({
@@ -10,42 +10,41 @@ const validationSchema = Joi.object({
1010
key: Joi.string().required(),
1111
start_date: Joi.date().less(Joi.ref('end_date')),
1212
thumbs: Joi.boolean()
13-
});
13+
})
1414

1515
// Astronomy Picture of the Day //
16-
const apod = function(payload, callback) {
17-
16+
const apod = function (payload, callback) {
1817
// validate the payload input //
19-
const { error, value } = validationSchema.validate(payload);
20-
if (error) throw error;
18+
const { error } = validationSchema.validate(payload)
19+
if (error) throw error
2120

22-
if (payload.date && (payload.start_date || payload.end_date)) throw new Error('If using Date, you cannot also use Start Date or End Date');
23-
if (payload.end_date && !payload.start_date) throw new Error('Start Date must be included if using End Date');
24-
if (payload.count && (payload.start_date || payload.end_date)) throw new Error('If using count, you cannot use Start Date or End Date');
21+
if (payload.date && (payload.start_date || payload.end_date)) throw new Error('If using Date, you cannot also use Start Date or End Date')
22+
if (payload.end_date && !payload.start_date) throw new Error('Start Date must be included if using End Date')
23+
if (payload.count && (payload.start_date || payload.end_date)) throw new Error('If using count, you cannot use Start Date or End Date')
2524

2625
// define API variables //
27-
let requestURLParameters = `api_key=${payload.key}`;
28-
if (payload.date) requestURLParameters = requestURLParameters.concat(`&date=${payload.date}`);
29-
if (payload.start_date) requestURLParameters = requestURLParameters.concat(`&start_date=${payload.start_date}`);
30-
if (payload.end_date) requestURLParameters = requestURLParameters.concat(`&end_date=${payload.end_date}`);
31-
if (payload.count) requestURLParameters = requestURLParameters.concat(`&count=${payload.count}`);
32-
if (payload.thumbs) requestURLParameters = requestURLParameters.concat(`&thumbs=${payload.thumbs}`);
26+
let requestURLParameters = `api_key=${payload.key}`
27+
if (payload.date) requestURLParameters = requestURLParameters.concat(`&date=${payload.date}`)
28+
if (payload.start_date) requestURLParameters = requestURLParameters.concat(`&start_date=${payload.start_date}`)
29+
if (payload.end_date) requestURLParameters = requestURLParameters.concat(`&end_date=${payload.end_date}`)
30+
if (payload.count) requestURLParameters = requestURLParameters.concat(`&count=${payload.count}`)
31+
if (payload.thumbs) requestURLParameters = requestURLParameters.concat(`&thumbs=${payload.thumbs}`)
3332

3433
// request url //
35-
const request = `https://api.nasa.gov/planetary/apod?${requestURLParameters}`;
34+
const request = `https://api.nasa.gov/planetary/apod?${requestURLParameters}`
3635

3736
// api request //
3837
return axios(request)
39-
.then((response) => {
40-
try {
41-
callback(response.data);
42-
return response.data;
43-
}
44-
catch (error) {
45-
callback(response.data);
46-
return response.data;
47-
}
48-
})
38+
.then((response) => {
39+
try {
40+
callback(response.data)
41+
return response.data
42+
} catch (error) {
43+
callback(response.data)
44+
return response.data
45+
}
46+
})
4947
}
5048

51-
module.exports.apod = apod;
49+
// export module //
50+
module.exports.apod = apod

0 commit comments

Comments
 (0)