arch/dev-connect
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed a docker issue updated the README

Browse Source
This commit is contained in:
QkoSad
2024-09-30 21:26:58 +03:00
parent da43bec842
commit 27c1741bc0
15 changed files with 76 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/Dockerfile
+2 -4
View File
@@ -1,15 +1,13 @@
FROM node:20
WORKDIR /usr/src/app
WORKDIR /usr/src/app
COPY --chown=node:node . .
RUN npm ci
ENV DEBUG=express:*
USER node
CMD npm start
CMD npm start
server/dev.Dockerfile
+2 -2
View File
@@ -1,5 +1,5 @@
FROM node:20
WORKDIR /usr/src/app
COPY --chown=node:node . .
@@ -10,4 +10,4 @@ ENV DEBUG=express:*
USER node
CMD npm start server
CMD npm run server
server/docker-compose.dev.yml
-25
View File
@@ -1,25 +0,0 @@
services:
mongo:
image: mongo
ports:
- 3456:27017
environment:
MONGO_INITDB_ROOT_USERNAME: root
MONGO_INITDB_ROOT_PASSWORD: example
MONGO_INITDB_DATABASE: the_database
volumes:
- ../mongo/mongo-init.js:/docker-entrypoint-initdb.d/mongo-init.js
- mongo_data:/data/db
server: # The name of the service, can be anything
image: devcon-backend-dev # Declares which image to use
build: . # Declares where to build if image is not found
ports: # Declares the ports to publish
- 5000:5000
volumes:
- ./.:/usr/src/app
environment:
MONGO_URL: "mongodb://the_username:the_password@mongo:27017/the_database"
volumes:
mongo_data:
server/docker-compose.yml
-20
View File
@@ -1,20 +0,0 @@
services:
app: # The name of the service, can be anything
image: devcon-backend # Declares which image to use
build: . # Declares where to build if image is not found
ports: # Declares the ports to publish
- 3000:3000
mongo:
image: mongo
ports:
- 3456:27017
environment:
MONGO_INITDB_ROOT_USERNAME: root
MONGO_INITDB_ROOT_PASSWORD: example
MONGO_INITDB_DATABASE: the_database
volumes:
- ./mongo/mongo-init.js:/docker-entrypoint-initdb.d/mongo-init.js
- mongo_data:/data/db
volumes:
mongo_data:
server/package.json
+1 -3
View File
@@ -5,9 +5,7 @@
"main": "server.ts",
"scripts": {
"start": "ts-node server.ts",
"server": "ts-node-dev server.ts",
"client": "npm start --prefix client --trace-depracation",
"dev": "concurrently \"npm run server\" \"npm run client\""
"server": "ts-node-dev server.ts"
},
"author": "",
"license": "ISC",
server/routers/api/auth.ts
+26 -31
View File
@@ -1,14 +1,14 @@
import express from 'express'
import bcrypt from 'bcryptjs'
import jwt from 'jsonwebtoken';
import express from "express";
import bcrypt from "bcryptjs";
import jwt from "jsonwebtoken";
import auth from '../../middleware/auth'
import config from 'config'
import auth from "../../middleware/auth";
import config from "config";
import { check, validationResult } from "express-validator";
import User from '../../models/User'
import type { Request, Response } from 'express';
import { isUserId } from '../../utils';
import User from "../../models/User";
import type { Request, Response } from "express";
import { isUserId } from "../../utils";
const router = express.Router();
// @route GET api/auth
@@ -16,19 +16,16 @@ const router = express.Router();
// @access Private
router.get("/", auth, async (req: any, res) => {
try {
let user: unknown = null
let user: unknown = null;
if (isUserId(req)) {
user = await User.findById(req.user.id).select("-password");
res.json(user);
}
else {
throw new Error('missing id in request')
} else {
throw new Error("missing id in request");
}
} catch (err: unknown) {
if (typeof err === 'string')
console.error(err)
else if (err instanceof Error)
console.error(err.message);
if (typeof err === "string") console.error(err);
else if (err instanceof Error) console.error(err.message);
res.status(500).send("Server Error");
}
});
@@ -72,25 +69,23 @@ router.post(
id: user.id,
},
};
const jwtSecret = config.get('jwtSecret')
if (typeof jwtSecret === 'string') jwt.sign(
payload,
jwtSecret,
{ expiresIn: 360000 },
(err, token) => {
const jwtSecret = process.env.JWT_SECRET
? process.env.JWT_SECRET
: config.get("jwtSecret");
if (typeof jwtSecret === "string")
jwt.sign(payload, jwtSecret, { expiresIn: 360000 }, (err, token) => {
if (err) throw err;
res.json({ token });
}
);
else throw new Error('Error signing the jwt token')
});
else throw new Error("Error signing the jwt token");
} catch (err: unknown) {
if (typeof err === 'string')
console.error(err)
else if (err instanceof Error)
console.error(err.message);
if (typeof err === "string") console.error(err);
else if (err instanceof Error) console.error(err.message);
res.status(500).send("Server error");
}
}
},
);
module.exports = router
module.exports = router;
server/routers/api/users.ts
+13 -17
View File
@@ -8,7 +8,6 @@ import User from "../../models/User";
import normalizeUrl from "normalize-url";
const router = express.Router();
// @route POST api/users
@@ -20,7 +19,7 @@ router.post(
check("email", "Please include a valid email").isEmail(),
check(
"password",
"Please enter a password with 6 or more characters"
"Please enter a password with 6 or more characters",
).isLength({ min: 6 }),
async (req, res) => {
const errors = validationResult(req);
@@ -45,7 +44,7 @@ router.post(
r: "pg",
d: "mm",
}),
{ forceHttps: true }
{ forceHttps: true },
);
user = new User({
@@ -67,24 +66,21 @@ router.post(
},
};
const jwtSecret = config.get('jwtSecret')
if (typeof jwtSecret === 'string') jwt.sign(
payload,
jwtSecret,
{ expiresIn: "5 days" },
(err, token) => {
const jwtSecret = process.env.JWT_SECRET
? process.env.JWT_SECRET
: config.get("jwtSecret");
if (typeof jwtSecret === "string")
jwt.sign(payload, jwtSecret, { expiresIn: "5 days" }, (err, token) => {
if (err) throw err;
res.json({ token });
}
);
});
} catch (err: unknown) {
if (typeof err === 'string')
console.error(err)
else if (err instanceof Error)
console.error(err.message);
if (typeof err === "string") console.error(err);
else if (err instanceof Error) console.error(err.message);
res.status(500).send("Server error");
}
}
},
);
module.exports = router
module.exports = router;