Skip to content
Closed
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
2 changes: 1 addition & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"semi": true,
"trailingComma": "all",
"singleQuote": true,
"singleQuote": false,
"printWidth": 70
}
17 changes: 17 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "node",
"request": "launch",
"name": "Launch Program",
"skipFiles": [
"<node_internals>/**"
],
"program": "${workspaceFolder}/server.js"
}
]
}
28 changes: 18 additions & 10 deletions client/src/App.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,23 @@
import React from 'react';
import './App.css';
import Login from './pages/Login/Login';
import Account from './pages/Account/Account';
import Debate from './pages/Debate/Debate';
import NewDebates from './pages/NewDebates/NewDebates';
import Trending from './pages/Trending/Trending';
import React from "react";
import "./App.css";
import Login from "./pages/Login/Login";
import Account from "./pages/Account/Account";
import Debate from "./pages/Debate/Debate";
// import NewDebates from './pages/NewDebates/NewDebates';
// import Trending from './pages/Trending/Trending';
import { BrowserRouter as Router, Route } from "react-router-dom";
import Navbar from "./components/Navbar";

//import API from "./utils/api"

function App() {
// const [user, setUser] = useState({})
// const handleLogin = ()=>{
// API.logIn().then((res)=>{
// //call set
// //update state or hook with user info
// })
// }

return (
<Router>
<div>
Expand All @@ -19,8 +27,8 @@ function App() {
<Route exact path="/login" component={Login} />
<Route exact path="/account" component={Account} />
<Route exact path="/debate" component={Debate} />
<Route exact path="/newdebates" component={NewDebates} />
<Route exact path="/trending" component={Trending} />
{/* <Route exact path="/newdebates" component={NewDebates} />
<Route exact path="/trending" component={Trending} /> */}
</main>
</div>
</Router>
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/Vote.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { Button, Box } from '@material-ui/core';
import { Button } from '@material-ui/core';
import "./Vote.css"

const Vote = () => {
Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/Account/Account.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react";
import "./Account.css"
import "./Account.css";

const Account = () => {

Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/Debate/Debate.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const Debate = () => {
return (
<div className="form">
<header className="appHeader">
<h1>Triggered!!!</h1>
<h1>Triggered</h1>
</header>

<div>
Expand Down
21 changes: 12 additions & 9 deletions client/src/utils/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,16 @@ import axios from "axios";
// update commands to get arguements

export default {
getDebates: function() {
return axios.get("/api/debates");
signUp: function () {
return axios.get("/api/users/signup");
},
// getDogsOfBreed: function(breed) {
// return axios.get("https://dog.ceo/api/breed/" + breed + "/images");
// },
// getBaseBreedsList: function() {
// return axios.get("https://dog.ceo/api/breeds/list");
// }
};
logIn: function () {
return axios.post("/api/users/login");
},
// getDogsOfBreed: function(breed) {
// return axios.get("https://dog.ceo/api/breed/" + breed + "/images");
// },
// getBaseBreedsList: function() {
// return axios.get("https://dog.ceo/api/breeds/list");
// }
};
1 change: 1 addition & 0 deletions config/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"password": "password",
"database": "triggeredDB",
"host": "127.0.0.1",
"port": 3306,
"dialect": "mysql"
},
"production": {
Expand Down
82 changes: 0 additions & 82 deletions controllers/api/burger.js

This file was deleted.

8 changes: 4 additions & 4 deletions controllers/api/debates.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
const router = require('express').Router();
const debates = []
const router = require("express").Router();
const debates = [];
// get route -> index
router.get('/debates', function(req, res) {
res.json(debates)
router.get("/debates", function(req, res) {
res.json(debates);
});

module.exports = router;
9 changes: 5 additions & 4 deletions controllers/api/index.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
const router = require("express").Router();
const burgerRoutes = require("./burger");
const debateRoutes = require("./debates");

// Book routes
router.use("/burger", burgerRoutes);
const usersRoutes = require("./users.js");
const debateRoutes = require("./debates.js");

// api routes
router.use("/users", usersRoutes);
router.use("/debates", debateRoutes);

module.exports = router;
31 changes: 31 additions & 0 deletions controllers/api/users.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
const router = require("express").Router();
var db = require("../../models");

// post a user , route => ("api/user")
router.post("/signup", function (req, res) {
console.log("hit signup route");
// db.Users.create({
// username: req.body.usernmae,
// email: req.body.email,
// password: req.body.password,
// }).then(function (dbCreateUser) {
// res.json(dbCreateUser);
// });
});

// get a a user route => ("api/user")
router.post("/login", function (req, res) {
console.log("hit login route");
// console.log(req.body);
// db.Users.findAll({
// where: {
// username: req.body.username,
// },
// }).then(function (dbLoginUser) {
// //logic if no user found
// console.log(dbLoginUser);
// res.json(dbLoginUser);
// });
});

module.exports = router;
2 changes: 1 addition & 1 deletion controllers/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ router.use("/api", apiRoutes);

// If no API routes are hit, send the React app
router.use(function(req, res) {
res.sendFile(path.join(__dirname, "../client/build/index.html"));
res.sendFile(path.join(__dirname, "../client/public/index.html"));
});

module.exports = router;
24 changes: 0 additions & 24 deletions models/burger.js

This file was deleted.

14 changes: 0 additions & 14 deletions models/customer.js

This file was deleted.

6 changes: 4 additions & 2 deletions models/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,13 @@ if (config.use_env_variable) {
fs.readdirSync(__dirname)
.filter(function(file) {
return (
file.indexOf(".") !== 0 && file !== basename && file.slice(-3) === ".js"
file.indexOf(".") !== 0 &&
file !== basename &&
file.slice(-3) === ".js"
);
})
.forEach(function(file) {
var model = sequelize["import"](path.join(__dirname, file));
var model = sequelize.import(path.join(__dirname, file));
db[model.name] = model;
});

Expand Down
28 changes: 28 additions & 0 deletions models/users.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// Users model


module.exports = function(sequelize, DataTypes) {
var Users = sequelize.define("Users", {
username: {
type: DataTypes.STRING,
allowNull: false
},
email: {
type: DataTypes.STRING,
allowNull: true
},
password: {
type: DataTypes.STRING,
allowNull: false
},
},
{
classMethods: {
associate: function(models) {
User.hasOne(models.Debates);
}
}
});
return Users;
};

11 changes: 9 additions & 2 deletions package-lock.json

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

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
"express": "^4.17.1",
"if-env": "^1.0.4",
"mysql2": "^1.6.5",
"sequelize": "^5.8.9"
"react-icons": "^3.10.0",
"sequelize": "^5.22.3"
}
}
Loading