Skip to content

Commit

Permalink
Merge branch 'master' into 658-backend-define-data-structure-to-manag…
Browse files Browse the repository at this point in the history
…e-event-sign-ups
  • Loading branch information
jeffplays2005 authored Jul 29, 2024
2 parents 6b32be5 + 4c3d332 commit 1e7784b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions client/src/components/composite/LoginForm/LoginForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,9 @@ const LoginForm = ({
>
Login
</Button>
<Button variant="inverted-default-sm">
<Link href="/register">Register</Link>
</Button>
<Link href="/register" className="flex">
<Button variant="inverted-default-sm">Register</Button>
</Link>
</span>
<div className="mt-6 uppercase">
{messages.success && (
Expand Down
4 changes: 2 additions & 2 deletions server/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@ app.use("/api-docs", swaggerUi.serve, async (_req: Request, res: Response) => {
}
})
app.get("/", (req: Request, res: Response) => {
res.send("Hello World From the Typescript Server!")
res.send("UASC backend server is up!")
})

RegisterRoutes(app)

const port = process.env.PORT || 8000

const _app = app.listen(port, () => {
console.log(`Example app listening on port ${port}`)
console.log(`UASC backend server listening on port ${port}.`)
})

// So we can use for testing
Expand Down

0 comments on commit 1e7784b

Please sign in to comment.