Skip to content

Depends on to prevent crash #116

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

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

Depends on to prevent crash #116

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
f7d3081
Refactored _app.tsx
RiyanMak Feb 24, 2026
a1035b7
should be fixed now
RiyanMak Feb 28, 2026
5ad6c26
forgotten routes in merge
Eskan0r Mar 3, 2026
f59188a
try with actual files here
RiyanMak Mar 4, 2026
3034fa8
Merge branch 'main' into depends_on_to_prevent_crash
RiyanMak Mar 4, 2026
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
11 changes: 11 additions & 0 deletions bsg-frontend/apps/extension/pages/_app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,24 @@ import { faPaperPlane, faSmile, faCopy } from '@fortawesome/free-solid-svg-icons
import { faGoogle } from '@fortawesome/free-brands-svg-icons'
import RoomChoice from './room-choice'
import { useChatSocket } from '../hooks/useChatSocket'
import DefaultPopup from './defaultPopup'

const poppins = Poppins({ weight: '400', subsets: ['latin'] })


export default function App({ Component, pageProps }: AppProps) {
const isDefaultPopup = Component === DefaultPopup

if(isDefaultPopup){
return (
<div className={poppins.className}>
<Component {...pageProps} />
</div>
)
}

return (
//Implement Scrollbar code here
<div className={poppins.className}>
<Component {...pageProps} />
</div>
Expand Down
2 changes: 2 additions & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@ services:
# image: bsg-server
ports:
- 3001:3000
depends_on:
Copy link
Contributor

@ryanpolasky ryanpolasky Feb 28, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i dunno why i was requested for review but this is chill. it doesn't really do much on my server since we're putting up the redis already, so this depends_on just tells docker compose to up redis before the server. won't break anythin on my end 👍

- redis-cache
environment:
- GOOGLE_CLIENT_ID=${GOOGLE_CLIENT_ID}
- GOOGLE_CLIENT_SECRET=${GOOGLE_CLIENT_SECRET}
Expand Down
5 changes: 5 additions & 0 deletions server/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,11 @@ async function startServer() {
}
});

const submissionRoutes = require('./routes/submission');
app.use('/submission', submissionRoutes);

const roomsRoutes = require('./routes/rooms');
app.use('/rooms', roomsRoutes);

app.listen(port, () => {
console.log(`Server listening on port ${port}`);
Expand Down
6 changes: 6 additions & 0 deletions server/src/routes/room.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
const express = require('express')
const router = express.Router();

router.get('/room:id', (req, res) => {
res.send("This is the room")
})