Skip to content

Commit

Permalink
Merge pull request #4 from CEDT-Chula/add-assignment-url
Browse files Browse the repository at this point in the history
merge add assignment url to main
  • Loading branch information
NewBieCoderXD authored Aug 12, 2024
2 parents 0e3345b + 9939d88 commit fb2d50c
Show file tree
Hide file tree
Showing 33 changed files with 1,727 additions and 1,211 deletions.
2 changes: 1 addition & 1 deletion .env.example
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
DATABASE_URL=

# for docker (compose prod)
POSTGRES_PASSWORD=
POSTGRES_PASSWORD=postgresql://[user[:password]]@[host][:port][/dbname]

# Discord
DISCORD_TOKEN=
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/on_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ jobs:
node-version: 'latest'
- run: npm ci
- run: npm test
- run: npm run lint
- run: npm run lint
- run: npm run checkStyle
2 changes: 1 addition & 1 deletion docker-compose-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ services:
volumes:
- postgres-db-noti:/var/lib/postgresql/data
volumes:
postgres-db-noti:
postgres-db-noti:
2 changes: 1 addition & 1 deletion docker-compose-prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ services:
depends_on:
- postgres
volumes:
postgres-db-noti:
postgres-db-noti:
4 changes: 2 additions & 2 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ services:
env_file:
- ./.env
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:${PORT}/health"]
test: ['CMD', 'curl', '-f', 'http://localhost:${PORT}/health']
interval: 1m30s
timeout: 30s
retries: 5
start_period: 30s
start_period: 30s
31 changes: 15 additions & 16 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -1,35 +1,34 @@
import globals from "globals";
import pluginJs from "@eslint/js";
import tseslint from "typescript-eslint";
import tsPlugin from "@typescript-eslint/eslint-plugin";
import tsParser from "@typescript-eslint/parser";
import unusedImports from "eslint-plugin-unused-imports";

export default [
{
files: ["src/**/*.ts"]
},
{
ignores: ["build/**/*"]
},
{ languageOptions: { globals: globals.browser } },
pluginJs.configs.recommended,
...tseslint.configs.recommended,
export default tseslint.config(
{
files: ["src/**/*.ts","tests/**/*.ts"],
languageOptions: {
parser: tsParser,
globals: globals.node
},
plugins: {
"unused-imports": unusedImports
"unused-imports": unusedImports,
"@typescript-eslint": tsPlugin
},
rules: {
...tsPlugin.configs.recommended.rules,
"no-unused-vars": "off",
"no-undef": "off",
"unused-imports/no-unused-imports": "error",
"@typescript-eslint/no-unused-vars": [
"@typescript-eslint/no-unused-vars":
[
"error",
{
"varsIgnorePattern": "^_",
"argsIgnorePattern": "^_",
"caughtErrorsIgnorePattern": "^_"
}
],
// "@typescript-eslint/no-explicit-any": "off"
"@typescript-eslint/no-explicit-any": "off"
}
},
];
)
5 changes: 4 additions & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,7 @@
module.exports = {
preset: 'ts-jest',
testEnvironment: 'node',
};
moduleNameMapper: {
'^@/(.*)$': '<rootDir>/src/$1',
},
}
Loading

0 comments on commit fb2d50c

Please sign in to comment.