Skip to content
This repository has been archived by the owner on Nov 7, 2020. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
Added changes to reflect best practices.
  • Loading branch information
BryceStPierre committed Oct 8, 2018
1 parent 2d225f7 commit 79e4111
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 2,500 deletions.
4 changes: 2 additions & 2 deletions README.md
@@ -1,2 +1,2 @@
# full-stack-react-app-tutorial
A codebase for a full stack React app.
# Weather App
A simple weather app, built following along a YouTube tutorial, using React, Express, and PostgreSQL.
2,488 changes: 2 additions & 2,486 deletions client/README.md

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Expand Up @@ -30,6 +30,7 @@
"dependencies": {
"body-parser": "^1.18.3",
"cookie-parser": "^1.4.3",
"dotenv": "^6.0.0",
"express": "^4.16.3",
"pg": "^7.4.3",
"request": "^2.88.0",
Expand Down
8 changes: 4 additions & 4 deletions server/api/cities.js
Expand Up @@ -3,18 +3,18 @@ var Cities = require('../models/cities');

var router = express.Router();

router.get('/', function (req, res) {
Cities.retrieveAll(function (err, cities) {
router.get('/', (req, res) => {
Cities.retrieveAll((err, cities) => {
if (err)
return res.json(err);
return res.json(cities);
});
});

router.post('/', function (req, res) {
router.post('/', (req, res) => {
var city = req.body.city;

Cities.insert(city, function (err, result) {
Cities.insert(city, (err, result) => {
if (err)
return res.json(err);
return res.json(result);
Expand Down
4 changes: 2 additions & 2 deletions server/api/weather.js
Expand Up @@ -3,10 +3,10 @@ var Weather = require('../models/weather');

var router = express.Router();

router.get('/:city', function (req, res) {
router.get('/:city', (req, res) => {
var city = req.params.city;

Weather.retrieveByCity(city, function (err, weather) {
Weather.retrieveByCity(city, (err, weather) => {
if (err)
return res.json(err);
return res.json(weather);
Expand Down
4 changes: 2 additions & 2 deletions server/models/cities.js
Expand Up @@ -2,15 +2,15 @@ const db = require('../database');

class Cities {
static retrieveAll (callback) {
db.query('SELECT city_name from cities', function (err, res) {
db.query('SELECT city_name from cities', (err, res) => {
if (err.error)
return callback(err);
callback(res);
});
}

static insert (city, callback) {
db.query('INSERT INTO cities (city_name) VALUES ($1)', [city], function (err, res) {
db.query('INSERT INTO cities (city_name) VALUES ($1)', [city], (err, res) => {
if (err.error)
return callback(err);
callback(res);
Expand Down
8 changes: 4 additions & 4 deletions server/models/weather.js
@@ -1,15 +1,15 @@
const request = require('request-promise');

const API_KEY = '865fa2abfcaa7fdeb5c2f20dedaca48b';
require('dotenv').config();

class Weather {
static retrieveByCity (city, callback) {
request({
uri: `https://api.openweathermap.org/data/2.5/weather?q=${city}&APPID=${API_KEY}&units=imperial`,
uri: `https://api.openweathermap.org/data/2.5/weather?q=${city}&APPID=${process.env.WEATHER_API_KEY}&units=imperial`,
json: true
}).then(function (res) {
}).then((res) => {
callback(res);
}).catch(function (err) {
}).catch((err) => {
console.log(err);
callback({ error: 'Could not reach OpenWeatherMap API.' });
});
Expand Down

0 comments on commit 79e4111

Please sign in to comment.