Skip to content
This repository has been archived by the owner on Apr 7, 2021. It is now read-only.

Commit

Permalink
💚 Fix builds + bump deps
Browse files Browse the repository at this point in the history
  • Loading branch information
@bmiddha
bmiddha committed Sep 7, 2020
1 parent 2f4da30 commit 36757b2
Show file tree
Hide file tree
Showing 18 changed files with 1,331 additions and 1,360 deletions.
36 changes: 18 additions & 18 deletions projects/api/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"watch:ts": "tsc -w --preserveWatchOutput"
},
"dependencies": {
"@sendgrid/mail": "^7.2.3",
"@sendgrid/mail": "^7.2.5",
"axios": "^0.20.0",
"axios-cookiejar-support": "^1.0.0",
"bcrypt": "^5.0.0",
Expand All @@ -25,7 +25,7 @@
"express": "^4.17.1",
"express-session": "^1.17.1",
"helmet": "^4.1.0",
"jest": "^26.4.0",
"jest": "^26.4.2",
"mongoose": "^5.10.3",
"morgan": "^1.10.0",
"passport": "^0.4.1",
Expand All @@ -36,37 +36,37 @@
},
"devDependencies": {
"@types/bcrypt": "^3.0.0",
"@types/chai": "^4.2.11",
"@types/chai": "^4.2.12",
"@types/compression": "^1.7.0",
"@types/cors": "^2.8.6",
"@types/eslint": "^7.2.0",
"@types/cors": "^2.8.7",
"@types/eslint": "^7.2.2",
"@types/express": "^4.17.8",
"@types/express-session": "^1.17.0",
"@types/helmet": "^0.0.47",
"@types/jest": "^26.0.10",
"@types/helmet": "^0.0.48",
"@types/jest": "^26.0.13",
"@types/mongoose": "^5.7.36",
"@types/morgan": "^1.9.0",
"@types/node": "^14.0.14",
"@types/passport": "^1.0.3",
"@types/morgan": "^1.9.1",
"@types/node": "^14.6.4",
"@types/passport": "^1.0.4",
"@types/passport-local": "^1.0.33",
"@types/supertest": "^2.0.9",
"@types/supertest": "^2.0.10",
"@types/tough-cookie": "^4.0.0",
"@types/web-push": "~3.3.0",
"@typescript-eslint/eslint-plugin": "^3.9.0",
"@typescript-eslint/parser": "^3.9.0",
"@typescript-eslint/eslint-plugin": "^4.1.0",
"@typescript-eslint/parser": "^4.1.0",
"chai": "^4.2.0",
"codecov": "^3.7.0",
"codecov": "^3.7.2",
"concurrently": "^5.3.0",
"eslint": "^7.7.0",
"eslint": "^7.8.1",
"eslint-config-prettier": "^6.11.0",
"eslint-plugin-prettier": "^3.1.4",
"mongodb-memory-server": "^6.6.0",
"mongodb-memory-server": "^6.6.7",
"nodemon": "^2.0.4",
"prettier": "^2.1.1",
"supertest": "^4.0.2",
"ts-jest": "^26.3.0",
"ts-node": "^8.10.1",
"ts-node": "^9.0.0",
"tslib": "^2.0.1",
"typescript": "^3.9.6"
"typescript": "^4.0.2"
}
}
24 changes: 12 additions & 12 deletions projects/banner-data/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"watch:ts": "tsc -w --preserveWatchOutput"
},
"dependencies": {
"argparse": "^2.0.0",
"argparse": "^2.0.1",
"axios": "^0.20.0",
"axios-cookiejar-support": "^1.0.0",
"dotenv": "^8.2.0",
Expand All @@ -24,27 +24,27 @@
"tough-cookie": "^4.0.0"
},
"devDependencies": {
"@types/argparse": "^1.0.38",
"@types/chai": "^4.2.11",
"@types/jest": "^26.0.10",
"@types/argparse": "^2.0.0",
"@types/chai": "^4.2.12",
"@types/jest": "^26.0.13",
"@types/mongoose": "^5.7.36",
"@types/node": "^14.0.14",
"@types/node": "^14.6.4",
"@types/node-cron": "^2.0.3",
"@types/tough-cookie": "^4.0.0",
"@typescript-eslint/eslint-plugin": "^3.9.0",
"@typescript-eslint/parser": "^3.9.0",
"@typescript-eslint/eslint-plugin": "^4.1.0",
"@typescript-eslint/parser": "^4.1.0",
"chai": "^4.2.0",
"codecov": "^3.7.0",
"codecov": "^3.7.2",
"concurrently": "^5.3.0",
"eslint": "^7.7.0",
"eslint": "^7.8.1",
"eslint-config-prettier": "^6.11.0",
"eslint-plugin-prettier": "^3.1.4",
"jest": "^26.4.0",
"jest": "^26.4.2",
"nodemon": "^2.0.4",
"prettier": "^2.1.1",
"ts-jest": "^26.3.0",
"ts-node": "^8.10.1",
"ts-node": "^9.0.0",
"tslib": "^2.0.1",
"typescript": "^3.9.6"
"typescript": "^4.0.2"
}
}
57 changes: 13 additions & 44 deletions projects/banner-data/src/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,82 +10,51 @@ const defaultConfig = {
now: false,
cronCourses: '*/5 * * * *',
cronDb: '0 0 * * *',
pageRetryCount: 5,
pageRetryTime: 1000,
maxPageSize: 500,
waitBetweenPages: 0,
termsToUpdate: 3,
maxPageSize: 500,
waitBetweenTerms: 5000
};

const parser = new ArgumentParser({
addHelp: true
add_help: true
});

parser.addArgument('--now', {
parser.add_argument('-n', '--now', {
help: `Perform one-off sync immediately. Cannot be used with --cron.\n
Example: --now`,
action: 'storeTrue',
defaultValue: false
default: false
});
parser.addArgument('--cron-db', {
parser.add_argument('-d', '--cron-db', {
help: `Sync schedule in cron syntax. Cannot be used with --now. \
Default: ${defaultConfig.cronDb}. \
Example: --cron-db 0 0 * * *`,
type: 'string',
defaultValue: defaultConfig.cronDb
default: defaultConfig.cronDb
});
parser.addArgument('--cron-courses', {
parser.add_argument('-c', '--cron-courses', {
help: `Sync schedule in cron syntax. Cannot be used with --now. \
Default: ${defaultConfig.cronCourses}. \
Example: --cron-courses */10 * * * *`,
type: 'string',
defaultValue: defaultConfig.cronCourses
});
parser.addArgument('--page-retry-count', {
help: `Number of attempts to re-fetch from banner if unsuccessful. \
Default: ${defaultConfig.pageRetryCount}. \
Example: --page-retry-count 10`,
type: 'int',
defaultValue: defaultConfig.pageRetryCount
});
parser.addArgument('--page-retry-time', {
help: `Number of milliseconds to wait between page request retry if unsuccessful. \
Default: ${defaultConfig.pageRetryCount}. \
Example: --page-retry-time 100`,
type: 'int',
defaultValue: defaultConfig.pageRetryCount
});
parser.addArgument('--wait-between-pages', {
help: `Number of milliseconds to wait between page requests to banner. \
Default: ${defaultConfig.waitBetweenPages}. \
Example: --wait-between-pages 100`,
type: 'int',
defaultValue: defaultConfig.waitBetweenPages
});
parser.addArgument('--wait-between-terms', {
help: `Number of milliseconds to wait between term requests to banner. \
Default: ${defaultConfig.waitBetweenTerms}. \
Example: --wait-between-terms 100`,
type: 'int',
defaultValue: defaultConfig.waitBetweenTerms
default: defaultConfig.cronCourses
});
parser.addArgument('--max-page-size', {
parser.add_argument('-s', '--max-page-size', {
help: `Max page size for banner search requests. \
Default: ${defaultConfig.maxPageSize}. \
Example: --max-page-size 100`,
type: 'int',
defaultValue: defaultConfig.maxPageSize
default: defaultConfig.maxPageSize
});
parser.addArgument('--terms-to-update', {
parser.add_argument('-t', '--terms-to-update', {
help: `Number of terms to update in database. \
Default: ${defaultConfig.termsToUpdate}. \
Example: --terms-to-update 3`,
type: 'int',
defaultValue: defaultConfig.termsToUpdate
default: defaultConfig.termsToUpdate
});

const args = parser.parseArgs();
const args = parser.parse_args();

const mongoUri = process.env.MONGODB_URI || 'mongodb://localhost:27017/registrum';

Expand Down
28 changes: 14 additions & 14 deletions projects/banner/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,36 +23,36 @@
"express": "^4.17.1",
"mongoose": "^5.10.3",
"morgan": "^1.10.0",
"node-fetch": "^2.6.0",
"node-fetch": "^2.6.1",
"registrum-common": "^0.1.0",
"tough-cookie": "^4.0.0"
},
"devDependencies": {
"@types/chai": "^4.2.11",
"@types/chai": "^4.2.12",
"@types/compression": "^1.7.0",
"@types/cors": "^2.8.6",
"@types/cors": "^2.8.7",
"@types/express": "^4.17.8",
"@types/ioredis": "^4.17.4",
"@types/jest": "^26.0.10",
"@types/jest": "^26.0.13",
"@types/mongoose": "^5.7.36",
"@types/morgan": "^1.9.0",
"@types/node": "^14.0.14",
"@types/morgan": "^1.9.1",
"@types/node": "^14.6.4",
"@types/node-fetch": "^2.5.7",
"@types/tough-cookie": "^4.0.0",
"@typescript-eslint/eslint-plugin": "^3.9.0",
"@typescript-eslint/parser": "^3.9.0",
"@typescript-eslint/eslint-plugin": "^4.1.0",
"@typescript-eslint/parser": "^4.1.0",
"chai": "^4.2.0",
"codecov": "^3.7.0",
"codecov": "^3.7.2",
"concurrently": "^5.3.0",
"eslint": "^7.7.0",
"eslint": "^7.8.1",
"eslint-config-prettier": "^6.11.0",
"eslint-plugin-prettier": "^3.1.4",
"ioredis": "^4.17.1",
"jest": "^26.4.0",
"ioredis": "^4.17.3",
"jest": "^26.4.2",
"nodemon": "^2.0.4",
"prettier": "^2.1.1",
"ts-jest": "^26.3.0",
"ts-node": "^8.10.1",
"typescript": "^3.9.6"
"ts-node": "^9.0.0",
"typescript": "^4.0.2"
}
}
38 changes: 19 additions & 19 deletions projects/client/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@
"dependencies": {
"@babel/plugin-transform-runtime": "^7.11.5",
"@babel/runtime": "^7.11.2",
"@fluentui/react": "^7.128.1",
"@fluentui/react": "^7.134.3",
"@reduxjs/toolkit": "^1.4.0",
"@uifabric/react-cards": "^0.112.4",
"@uifabric/react-cards": "^0.112.5",
"@uifabric/react-hooks": "^7.12.0",
"axios": "^0.20.0",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-redux": "^7.2.0",
"react-redux": "^7.2.1",
"react-router-dom": "^5.2.0",
"redux": "^4.0.5",
"redux-devtools-extension": "^2.13.8",
"redux-thunk": "^2.3.0",
"regenerator-runtime": "^0.13.5",
"regenerator-runtime": "^0.13.7",
"registrum-common": "^0.1.0",
"uniq": "^1.0.1",
"workbox-cacheable-response": "^5.1.3",
Expand All @@ -38,47 +38,47 @@
},
"devDependencies": {
"@babel/cli": "^7.11.6",
"@babel/core": "^7.11.4",
"@babel/core": "^7.11.6",
"@babel/plugin-proposal-class-properties": "^7.10.4",
"@babel/plugin-transform-runtime": "^7.11.5",
"@babel/preset-env": "^7.10.4",
"@babel/preset-env": "^7.11.5",
"@babel/preset-react": "^7.10.4",
"@babel/preset-typescript": "^7.10.4",
"@babel/runtime": "^7.11.2",
"@types/copy-webpack-plugin": "^6.0.0",
"@types/git-revision-webpack-plugin": "^3.0.0",
"@types/jest": "^26.0.10",
"@types/node": "^14.0.14",
"@types/react": "^16.9.48",
"@types/jest": "^26.0.13",
"@types/node": "^14.6.4",
"@types/react": "^16.9.49",
"@types/react-dom": "^16.9.8",
"@types/react-redux": "^7.1.9",
"@types/react-router-dom": "^5.1.5",
"@types/uniq": "^0.0.27",
"@types/webpack": "^4.41.21",
"@types/webpack": "^4.41.22",
"@types/webpack-dev-server": "^3.11.0",
"@types/webpack-env": "^1.15.2",
"@types/workbox-sw": "^4.3.1",
"@types/workbox-webpack-plugin": "^5.1.1",
"@typescript-eslint/eslint-plugin": "^3.9.0",
"@typescript-eslint/parser": "^3.9.0",
"@types/workbox-webpack-plugin": "^5.1.4",
"@typescript-eslint/eslint-plugin": "^4.1.0",
"@typescript-eslint/parser": "^4.1.0",
"babel-loader": "^8.1.0",
"clean-webpack-plugin": "^3.0.0",
"copy-webpack-plugin": "^6.0.3",
"css-loader": "^4.2.1",
"copy-webpack-plugin": "^6.1.0",
"css-loader": "^4.2.2",
"dotenv-webpack": "^2.0.0",
"eslint-config-prettier": "^6.11.0",
"eslint-plugin-prettier": "^3.1.4",
"eslint-plugin-react": "^7.20.6",
"file-loader": "^6.1.0",
"git-revision-webpack-plugin": "^3.0.6",
"html-webpack-plugin": "^4.3.0",
"html-webpack-plugin": "^4.4.1",
"prettier": "^2.1.1",
"react-svg-loader": "^3.0.3",
"style-loader": "^1.2.1",
"svg-inline-loader": "^0.8.2",
"ts-node": "^8.10.1",
"typescript": "^3.9.6",
"webpack": "^4.43.0",
"ts-node": "^9.0.0",
"typescript": "^4.0.2",
"webpack": "^4.44.1",
"webpack-cli": "^3.3.12",
"webpack-dev-server": "^3.11.0",
"webpack-manifest-plugin": "^2.2.0",
Expand Down
Loading

0 comments on commit 36757b2

Please sign in to comment.