Skip to content

Commit 081bd76

Browse files
authored
Eslint upgrade & rename frontend to react-client (#11)
* upgrade @nish1896/eslint-config * lint express-server * lint frontend * lint nestjs-server * lint next-client * rename frontend folder to react-client * rename frontend to react-client in files * update react-client name in pkg.json * rm yarn.lock and run yarn again
1 parent a458c0a commit 081bd76

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+1777
-1575
lines changed

.github/workflows/docker-img.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
# - name: Build Server Image
2626
# run: docker build -f ./apps/fastify-server/Dockerfile -t ${{secrets.DOCKER_HUB_USERNAME}}/rnm-server:${{ steps.date.outputs.date }} .
2727

28-
# - name: Build Frontend Image
29-
# run: docker build -f ./apps/frontend/Dockerfile -t ${{ secrets.DOCKER_HUB_USERNAME }}/rnm-frontend:${{ steps.date.outputs.date }} .
28+
# - name: Build react-client Image
29+
# run: docker build -f ./apps/react-client/Dockerfile -t ${{ secrets.DOCKER_HUB_USERNAME }}/rnm-react-client:${{ steps.date.outputs.date }} .
3030

3131
# - name: Login to DockerHub
3232
# uses: docker/login-action@v2
@@ -37,5 +37,5 @@
3737
# - name: Push Backend Image to Docker Hub
3838
# run: docker push ${{ secrets.DOCKER_HUB_USERNAME }}/rnm-server:${{ steps.date.outputs.date }}
3939

40-
# - name: Push Frontend Image to Docker Hub
41-
# run: docker push ${{ secrets.DOCKER_HUB_USERNAME }}/rnm-frontend:${{ steps.date.outputs.date }}
40+
# - name: Push react-client Image to Docker Hub
41+
# run: docker push ${{ secrets.DOCKER_HUB_USERNAME }}/rnm-react-client:${{ steps.date.outputs.date }}

.github/workflows/github-actions.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ jobs:
3333
- name: Build nestjs-server
3434
run: yarn workspace nestjs-server build
3535

36-
- name: Build frontend
37-
run: yarn workspace frontend build
36+
- name: Build react-client
37+
run: yarn workspace react-client build
3838

3939
- name: Build next-client
4040
run: yarn workspace next-client build

Docker-commands.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
# Docker Commands
22

3-
1. Build `frontend` image
3+
1. Build `react-client` image
44

55
```
6-
docker build -f ./apps/frontend/Dockerfile -t docker_username/frontend.
6+
docker build -f ./apps/react-client/Dockerfile -t docker_username/react-client.
77
```
88

99
2. Run Image
1010

1111
```
12-
docker run -p 3000:3000 docker_username/frontend
12+
docker run -p 3000:3000 docker_username/react-client
1313
```
1414

1515
3. Run Image with [Volume Mount](https://docs.docker.com/get-started/06_bind_mounts/)
1616

1717
```
18-
docker run -p 3000:3000 -v /app/node_modules -v "$(pwd):/app" docker_username/frontend
18+
docker run -p 3000:3000 -v /app/node_modules -v "$(pwd):/app" docker_username/react-client
1919
```
2020

2121
If using the `-v /app/node_modules` flag, you don't need to install `node_modules` folder. It means that not to take reference for `node_modules` in the actual directory
@@ -29,7 +29,7 @@ docker-compose up
2929
To run a particular service,
3030

3131
```
32-
docker-compose up [serviceName] // eg. frontend-dev
32+
docker-compose up [serviceName] // eg. react-client-dev
3333
```
3434

3535
Add `--build` flag to rebuild and then restart containers.

apps/express-server/.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module.exports = {
2-
extends: ['@nish1896']
2+
extends: ['@nish1896/eslint-config/js']
33
};

apps/express-server/src/app-constants/env_vars.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ const env = process.env;
77

88
export const ENV_VARS = Object.freeze({
99
env: env.NODE_ENV ?? 'development',
10-
port: env.PORT ?? 5000,
10+
port: env.PORT ?? 5000
1111
});

apps/express-server/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ function bootstrap() {
2323

2424
server.listen(port, () => {
2525
winstonLogger.info(
26-
`[ ⚡️ ${hostName} ⚡️ ] - Server running on port ${port}`,
26+
`[ ⚡️ ${hostName} ⚡️ ] - Server running on port ${port}`
2727
);
2828
});
2929
}

apps/express-server/src/middleware/guard.ts

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,16 @@ import { winstonLogger } from './winston-logger';
44
export function validateAuthHeader(
55
req: Request<object, object, object, object>,
66
res: Response,
7-
next: NextFunction,
7+
next: NextFunction
88
) {
99
/* Check presence of jwt and refresh-token */
1010
const token: string | undefined = req.cookies?.jwt;
1111

1212
if (!token) {
1313
const errorMsg = 'Unauthorized request';
1414
winstonLogger.error(errorMsg);
15-
return res.status(401).send(errorMsg).end();
15+
return res.status(401).send(errorMsg)
16+
.end();
1617
}
1718
/* Set user info after extracting his details from token */
1819
// res.locals.user = userInfo;
@@ -22,25 +23,27 @@ export function validateAuthHeader(
2223
export function authenticateAdmin(
2324
_: Request<object, object, object, object>,
2425
res: Response,
25-
next: NextFunction,
26+
next: NextFunction
2627
) {
2728
if (res.locals?.user?.role === 'Admin') {
2829
next();
2930
} else {
3031
const errMsg = 'FORBIDDEN from accessing Admin route';
3132
winstonLogger.error(errMsg);
32-
res.status(403).send(errMsg).end();
33+
res.status(403).send(errMsg)
34+
.end();
3335
}
3436
}
3537

3638
export function checkTokenMismatchInReqParams(
3739
/* eslint-disable-next-line @typescript-eslint/no-explicit-any */
3840
req: Request<any, object, object, object>,
3941
res: Response,
40-
next: NextFunction,
42+
next: NextFunction
4143
) {
4244
if (res.locals?.user?._id !== req.params.id) {
43-
return res.status(406).send('Token Mismatch').end();
45+
return res.status(406).send('Token Mismatch')
46+
.end();
4447
}
4548
next();
4649
}

apps/express-server/src/middleware/request-logger.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ import { winstonLogger } from './winston-logger';
44
export function requestLogger(
55
request: Request,
66
response: Response,
7-
next: NextFunction,
7+
next: NextFunction
88
) {
99
winstonLogger.info(`${request.method} ${request.url}`);
1010
response.on('finish', () => {
1111
const isSuccess = response.statusCode < 400;
1212
winstonLogger.log(
1313
isSuccess ? 'info' : 'error',
14-
`${response.statusCode} ${response.statusMessage}`,
14+
`${response.statusCode} ${response.statusMessage}`
1515
);
1616
});
1717
next();

apps/express-server/src/middleware/winston-logger.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@ const customLevels = {
1212
warn: 1,
1313
info: 2,
1414
http: 3,
15-
success: 4,
15+
success: 4
1616
},
1717
colors: {
1818
error: 'bold red blackBG',
1919
warn: 'italic yellow',
2020
info: 'blue',
2121
http: 'magenta',
22-
success: 'green',
23-
},
22+
success: 'green'
23+
}
2424
};
2525

2626
const myFormat = printf(
27-
({ level, message, timestamp }) => `[ ${level} ]:: ${timestamp} - ${message}`,
27+
({ level, message, timestamp }) => `[ ${level} ]:: ${timestamp} - ${message}`
2828
);
2929

3030
/**
@@ -47,7 +47,7 @@ const winstonLogger = createLogger({
4747

4848
/* Aligns in a tabular format */
4949
// format.align(),
50-
myFormat,
50+
myFormat
5151
),
5252
// defaultMeta: { service: 'log-service' },
5353
transports: [
@@ -57,10 +57,10 @@ const winstonLogger = createLogger({
5757
*/
5858
new transports.File({
5959
filename: 'logs/error.log',
60-
level: 'error',
60+
level: 'error'
6161
}),
62-
new transports.File({ filename: 'logs/info-warning.log' }),
63-
],
62+
new transports.File({ filename: 'logs/info-warning.log' })
63+
]
6464
});
6565

6666
addColors(customLevels.colors);
@@ -72,7 +72,7 @@ addColors(customLevels.colors);
7272

7373
if (ENV_VARS.env !== 'production') {
7474
winstonLogger.add(
75-
new transports.Console({ format: format.colorize({ all: true }) }),
75+
new transports.Console({ format: format.colorize({ all: true }) })
7676
);
7777
}
7878

apps/express-server/src/routes/auth/controller.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,20 @@ import * as AuthTypes from './types';
55
const authRouter = Router();
66

77
authRouter.get('/test', function printHello(_, res: Response) {
8-
return res.status(200).send('Hello World !!').end();
8+
return res.status(200).send('Hello World !!')
9+
.end();
910
});
1011

1112
/* Login user */
1213
authRouter.post(
1314
'/login',
1415
function loginUser(
1516
req: Request<object, object, AuthTypes.UserLoginBody>,
16-
res: Response,
17+
res: Response
1718
) {
1819
const { email, password } = req.body;
1920
return authService.loginUser(res, email, password);
20-
},
21+
}
2122
);
2223

2324
export { authRouter };

0 commit comments

Comments
 (0)