Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Test deploy #44

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Test deploy #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6467b10
test
May 12, 2023
0e1ed0b
no strict type checks
May 12, 2023
70e0f0d
no implicit any on server
May 12, 2023
d998557
public url for verification link
May 12, 2023
8f446d9
remove extra forward slash
May 12, 2023
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
4 changes: 4 additions & 0 deletions client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@
"@reduxjs/toolkit": "^1.8.1",
"axios": "^1.1.2",
"chart.js": "^4.2.1",
"eslint": "^8.40.0",
"eslint-config-airbnb-typescript-prettier": "^5.0.0",
"prettier": "^2.8.8",
"prop-types": "^15.8.1",
"react": "^18.2.0",
"react-chartjs-2": "^5.2.0",
Expand All @@ -50,6 +53,7 @@
"redux-persist": "^6.0.0",
"styled-components": "^5.3.5",
"typeface-hk-grotesk": "^1.0.0",
"typescript": "^5.0.4",
"web-vitals": "^3.0.3"
},
"devDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions server/src/services/mail.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import SGmail, { MailDataRequired } from '@sendgrid/mail';

const appName = 'Boilerplate'; // Replace with a relevant project name
const senderName = 'Hack4Impact UPenn'; // Replace with a relevant project sender
const baseUrl = 'http://localhost:3000'; // TODO: figure out better place to put this
const baseUrl = process.env.PUBLIC_URL ?? 'http://localhost:3000'; // TODO: figure out better place to put this

// eslint-disable-next-line no-useless-concat
SGmail.setApiKey(`${process.env.SENDGRID_API_KEY}`);
Expand All @@ -18,7 +18,7 @@ SGmail.setApiKey(`${process.env.SENDGRID_API_KEY}`);
*/
const emailResetPasswordLink = async (email: string, token: string) => {
// TODO DURING DEVELOPMENT: use a template to make this prettier and match client's style
const resetLink = `${baseUrl}/reset-password/${token}`;
const resetLink = `${baseUrl}reset-password/${token}`;
const mailSettings: MailDataRequired = {
from: {
email: process.env.SENDGRID_EMAIL_ADDRESS || 'missing@mail.com',
Expand All @@ -45,7 +45,7 @@ const emailResetPasswordLink = async (email: string, token: string) => {
* @param token The unique token identifying this verification attempt
*/
const emailVerificationLink = async (email: string, token: string) => {
const resetLink = `${baseUrl}/verify-account/${token}`;
const resetLink = `${baseUrl}verify-account/${token}`;
const mailSettings: MailDataRequired = {
from: {
email: process.env.SENDGRID_EMAIL_ADDRESS || 'missing@mail.com',
Expand Down
3 changes: 2 additions & 1 deletion server/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@
"lib": ["es2021", "DOM"],
"module": "commonjs",
"moduleResolution": "Node",
"strict": true,
"strict": false,
"noImplicitOverride": true,
"noImplicitAny": false ,
// Needed for CommonJS modules: markdown-it, fs-extra
"allowSyntheticDefaultImports": true,
//
Expand Down
5 changes: 2 additions & 3 deletions tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
// "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */

/* Strict Type-Checking Options */
"strict": true /* Enable all strict type-checking options. */,
"noImplicitAny": true /* Raise error on expressions and declarations with an implied 'any' type. */,
"strict": false /* Enable all strict type-checking options. */,
"noImplicitAny": false /* Raise error on expressions and declarations with an implied 'any' type. */,
// "strictNullChecks": true, /* Enable strict null checks. */
// "strictFunctionTypes": true, /* Enable strict checking of function types. */
// "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
Expand Down Expand Up @@ -61,7 +61,6 @@
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
// "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */
// "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */

/* Experimental Options */
// "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */
// "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */
Expand Down