Skip to content
This repository has been archived by the owner on May 15, 2023. It is now read-only.

Pull Request(Backend): Migrate to Typescript #3

Merged
merged 14 commits into from
Dec 6, 2021
Merged
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
7 changes: 4 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
node_modules
node_modules/
/.pnp
.pnp.js

# testing
/coverage
coverage/

# production
/build
dist/
build/

# misc
.DS_Store
Expand Down
13 changes: 13 additions & 0 deletions backend/jest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/** @type {import('ts-jest/dist/types').InitialOptionsTsJest} */
module.exports = {
roots: ['<rootDir>/src'],
preset: 'ts-jest',
testEnvironment: 'node',
verbose: true,
collectCoverage: true,
coverageDirectory: 'coverage',
testPathIgnorePatterns: [
"/node_modules/",
"/routes/"
]
};
4,014 changes: 3,509 additions & 505 deletions backend/package-lock.json

Large diffs are not rendered by default.

15 changes: 12 additions & 3 deletions backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,19 @@
"express": "^4.17.1"
},
"scripts": {
"start": "node src/index.js",
"dev": "nodemon src/index.js"
"postinstall": "npm run build",
"start": "node dist/index.js",
"dev": "nodemon dist/index.js",
"test": "jest",
"build": "tsc -p tsconfig.json"
},
"devDependencies": {
"nodemon": "^2.0.15"
"@types/express": "^4.17.13",
"@types/jest": "^27.0.3",
"@types/node": "^16.11.11",
"jest": "^27.4.3",
"nodemon": "^2.0.15",
"ts-jest": "^27.0.7",
"typescript": "^4.5.2"
}
}
7 changes: 7 additions & 0 deletions backend/src/client-consumer.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import Client from "./structures/client";
import dotenv from 'dotenv';

dotenv.config();
const client = new Client(process.env.CATALOG_DIRECTORY!);

export default client;
201 changes: 0 additions & 201 deletions backend/src/client.js

This file was deleted.

29 changes: 0 additions & 29 deletions backend/src/index.js

This file was deleted.

16 changes: 16 additions & 0 deletions backend/src/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import express from "express";
import dotenv from "dotenv";
import { channelsRouter, messagesRouter, wordsRouter } from "./routes";

dotenv.config();

const app = express();

app.use(express.json());

app.use('/', messagesRouter);
app.use('/', channelsRouter);
app.use('/', wordsRouter);

const port = parseInt(process.env.PORT || "3000");
app.listen(port, () => console.log(`Backend server listening on port ${port}`));
16 changes: 0 additions & 16 deletions backend/src/routes/channels.js

This file was deleted.

8 changes: 8 additions & 0 deletions backend/src/routes/channels.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import express from "express";
import client from "../client-consumer";

export const channelsRouter = express.Router();

channelsRouter.get('/user/channels/rankedByMessages', (req, res) => {
res.send(client.channelsByYourSentMessages.slice(0, 10));
});
3 changes: 3 additions & 0 deletions backend/src/routes/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export * from "./channels";
export * from "./messages";
export * from "./words";
Loading