diff --git a/.eslintrc b/.eslintrc index e3ef87d..90e508e 100644 --- a/.eslintrc +++ b/.eslintrc @@ -12,9 +12,9 @@ "rules": { "quotes": ["warn", "single"], - "semi": ["warn", "never"], + "semi": ["error", "never"], "indent": ["warn", 2], "no-unused-vars": ["warn"], - "no-console": 0 + "no-console": ["off"] } } diff --git a/.prettierrc b/.prettierrc deleted file mode 100644 index ef58ff9..0000000 --- a/.prettierrc +++ /dev/null @@ -1,6 +0,0 @@ -{ - "trailingComma": "es5", - "tabWidth": 4, - "semi": false, - "singleQuote": true -} diff --git a/db/seed.js b/db/seed.js index f8f367a..cbb9025 100755 --- a/db/seed.js +++ b/db/seed.js @@ -1,27 +1,41 @@ -const db = require('../db') -const { Article } = require('./models') - +const db = require("../db"); +const { Article, Comment, User } = require("./models"); +// WHYYYYYYY const testArticle = { - title: 'read desert', - link: 'https://readdesert.org' -} + title: "read desert", + link: "https://readdesert.org" +}; + +const testComment = { + title: "best essay ever", + content: "read the sand book already!" +}; + +const testUser = { + nick: "nn" +}; -console.log(Article) async function runSeed() { - await db.sync({ force: true }) - console.log('db synced!') - console.log('seeding...') + await db.sync({ force: true }); + console.log("db synced!"); + console.log("seeding..."); try { - await Article.create(testArticle) - console.log('seeded successfully') + const article = await Article.create(testArticle); + + const user = await User.create(testUser); + const c1 = await Comment.create(testComment); + c1.addUser(user); + article.addUser(user); + article.addComment(c1); + console.log("seeded successfully"); } catch (err) { - console.error(err) - process.exitCode = 1 + console.error(err); + process.exitCode = 1; } finally { - console.log('closing db connection') - await db.close() - console.log('db connection closed') + console.log("closing db connection"); + await db.close(); + console.log("db connection closed"); } } -runSeed() +runSeed(); diff --git a/index.js b/index.js index ad44d27..ef1e9bc 100755 --- a/index.js +++ b/index.js @@ -1,41 +1,41 @@ -const express = require('express'); -const path = require('path'); -const morgan = require('morgan'); -const ascii = require('./ascii'); -const db = require('./db'); +const express = require('express') +const path = require('path') +const morgan = require('morgan') +const ascii = require('./ascii') +const db = require('./db') -const app = express(); -const port = process.env.PORT || 1337; +const app = express() +const port = process.env.PORT || 1337 db.authenticate() .then(() => { - console.log('Connection has been established successfully.'); + console.log('Connection has been established successfully.') }) .catch(err => { - console.error('Unable to connect to the database:', err); - }); + console.error('Unable to connect to the database:', err) + }) -app.use(morgan('tiny')); +app.use(morgan('tiny')) // body parsing middleware -app.use(express.json()); -app.use(express.urlencoded({ extended: true })); -app.use(require('body-parser').text()); -app.use('/api', require('./api')); +app.use(express.json()) +app.use(express.urlencoded({ extended: true })) +app.use(require('body-parser').text()) +app.use('/api', require('./api')) app.get('*', (req, res) => res.sendFile(path.resolve(__dirname, 'public', 'articles.html')) -); +) // error handling endware app.use((err, req, res, next) => { - console.error(err); - console.error(err.stack); - res.status(err.status || 500).send(err.message || 'Internal server error.'); - next(); -}); + console.error(err) + console.error(err.stack) + res.status(err.status || 500).send(err.message || 'Internal server error.') + next() +}) app.listen(port, () => { - console.log(`\n${ascii}\n`); - console.log(`Doin' haxor stuff on port ${port}`); -}); + console.log(`\n${ascii}\n`) + console.log(`Doin' haxor stuff on port ${port}`) +})