Skip to content

MVP #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

MVP #35

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitinore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
4 changes: 4 additions & 0 deletions api/database/dbConfig.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
const knex = require("knex");
const config = require("../knexfile");
// const environment = process.env.NODE_ENV || "development";
module.exports = knex(config.development);
12 changes: 12 additions & 0 deletions api/database/migrations/20210121220708_create-users-table.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
exports.up = function (knex) {
return knex.schema.createTable("users", (tbl) => {
tbl.increments("id");
tbl.string("name", 128).notNull(); //.unique()
tbl.integer("age", 128).notNull();
tbl.string("location", 128).notNull();
});
};

exports.down = function (knex) {
return knex.schema.dropTableIfExists("users");
};
10 changes: 10 additions & 0 deletions api/database/seeds/00-cleanup.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
const cleaner = require("knex-cleaner");

exports.seed = function (knex) {
return cleaner.clean(knex, {
mode: "truncate", // resets ids
// don't empty migration tables
//no need to use truncate on seed users
ignoreTables: ["knex_migrations", "knex_migrations_lock"],
});
};
56 changes: 56 additions & 0 deletions api/database/seeds/01-users.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
const faker = require("faker");

exports.seed = function (knex) {
return knex("users").insert([
{
name: faker.name.findName(),
age: faker.random.number(),
location: faker.address.city(),
},
{
name: faker.name.findName(),
age: faker.random.number(),
location: faker.address.city(),
},
{
name: faker.name.findName(),
age: faker.random.number(),
location: faker.address.city(),
},
{
name: faker.name.findName(),
age: faker.random.number(),
location: faker.address.city(),
},
{
name: faker.name.findName(),
age: faker.random.number(),
location: faker.address.city(),
},
{
name: faker.name.findName(),
age: faker.random.number(),
location: faker.address.city(),
},
{
name: faker.name.findName(),
age: faker.random.number(),
location: faker.address.city(),
},
{
name: faker.name.findName(),
age: faker.random.number(),
location: faker.address.city(),
},
{
name: faker.name.findName(),
age: faker.random.number(),
location: faker.address.city(),
},
{
name: faker.name.findName(),
age: faker.random.number(),
location: faker.address.city(),
},
]);
};
31 changes: 31 additions & 0 deletions api/server.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
const express = require("express");
const router = express.Router();
const helmet = require("helmet");
const cors = require("cors");

//server
const server = express();

//import routers
const welcomeRouter = require("../welcome/welcome-router");
const usersRouter = require("../users/users-router");

//Global middleware
server.use(helmet());
server.use(cors());
server.use(express.json());

//Server endpoints --------->
server.use("/", welcomeRouter);
// --> /api/users
server.use("/api/users", usersRouter);

//middleware for CATCH ERROR on all endpoints of /api/messages
server.use((err, req, res, next) => {
console.log(err);
res.status(500).json({
message: "500 error: Something went wrong",
});
});

module.exports = server;
6 changes: 6 additions & 0 deletions index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
const server = require("./api/server");

const port = process.env.PORT || 4000;
server.listen(port, () => {
console.log(`Server running at http://localhost:${port}`);
});
56 changes: 56 additions & 0 deletions knexfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
// Update with your config settings.
require("dotenv").config();

module.exports = {
development: {
client: "sqlite3",
connection: {
filename: "./database/users.db3",
},
useNullAsDefault: true,
migrations: {
directory: "./database/migrations",
},
seeds: {
directory: "./database/seeds",
},
pool: {
// for foreign keys only, will not add it to this project
afterCreate: (conn, done) => {
// runs after a connection is made to the sqlite engine
conn.run("PRAGMA foreign_keys = ON", done); // turn on FK enforcement
},
},
},

staging: {
client: "postgresql",
connection: {
database: "my_db",
user: "username",
password: "password",
},
pool: {
min: 2,
max: 10,
},
migrations: {
tableName: "knex_migrations",
},
},

production: {
client: "pg",
connection: process.env.DATABASE_URL,
migrations: {
directory: "./database/migrations",
tableName: "knex_migrations",
},
seeds: {
directory: "./database/seeds",
},
pool: { min: 2, max: 10 },
},
};

// require("./database/")
Loading