Skip to content

Commit

Permalink
Merge branch 'main'
Browse files Browse the repository at this point in the history
  • Loading branch information
ExtranoDev committed Sep 19, 2023
2 parents 14736ab + 65f32a9 commit 070b0ff
Show file tree
Hide file tree
Showing 11 changed files with 100 additions and 33 deletions.
10 changes: 10 additions & 0 deletions .github/ISSUE_TEMPLATE/custom.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
name: Custom issue template
about: Describe this issue template's purpose here.
title: ''
labels: ''
assignees: ''

---


20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
36 changes: 35 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,35 @@
./node_modules

# dependencies
/node_modules
/.pnp
.pnp.js

# testing
/coverage

# next.js
/.next/
/out/

# production
/build

# misc
.DS_Store
*.pem

# debug
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# local env files
.env*.local
.env

# vercel
.vercel

# typescript
*.tsbuildinfo
next-env.d.ts
36 changes: 29 additions & 7 deletions app.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,34 @@
const express = require('express')
require('dotenv').config()
const app = express()
const PORT = process.env.PORT || 3000
var createError = require('http-errors');
var express = require('express');
var cookieParser = require('cookie-parser');
var logger = require('morgan');

// middleware
app.use(express.json())


app.listen(PORT, (req, res) => {
console.log(`Server running on port ${PORT}...`)
})
app.use(logger('dev'));
app.use(express.json());
app.use(express.urlencoded({ extended: false }));
app.use(cookieParser());

app.use('/', indexRouter);
app.use('/users', usersRouter);

// catch 404 and forward to error handler
app.use(function (req, res, next) {
next(createError(404));
});

// error handler
app.use(function (err, req, res, next) {
// set locals, only providing error in development
res.locals.message = err.message;
res.locals.error = req.app.get('env') === 'development' ? err : {};

// render the error page
res.status(err.status || 500);
res.render('error');
});

module.exports = app;
File renamed without changes.
File renamed without changes.
Empty file added models/index.js
Empty file.
13 changes: 6 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,12 @@
"start": "nodemon app.js"
},
"dependencies": {
"eslint": "^8.49.0",
"express": "~4.16.1",
"http-errors": "~1.6.3",
"prettier": "^3.0.3",
"cookie-parser": "^1.4.6",
"debug": "^4.3.4",
"express": "^4.18.2",
"http-errors": "^2.0.0",
"morgan": "^1.10.0",
"mysql2": "^3.6.1",
"sequelize": "^6.33.0"
},
"devDependencies": {
"nodemon": "^3.0.1"
}
}
6 changes: 0 additions & 6 deletions views/error.jade

This file was deleted.

5 changes: 0 additions & 5 deletions views/index.jade

This file was deleted.

7 changes: 0 additions & 7 deletions views/layout.jade

This file was deleted.

0 comments on commit 070b0ff

Please sign in to comment.