Merge branch 'main' into tournament

This commit is contained in:
Torsten Schulz
2025-03-13 16:24:08 +01:00
10 changed files with 2176 additions and 1374 deletions

View File

@@ -7,12 +7,8 @@ import {
User, Log, Club, UserClub, Member, DiaryDate, Participant, Activity, MemberNote,
DiaryNote, DiaryTag, MemberDiaryTag, DiaryDateTag, DiaryMemberNote, DiaryMemberTag,
PredefinedActivity, DiaryDateActivity, Match, League, Team, Group,
GroupActivity,
Tournament,
TournamentGroup,
TournamentMatch,
TournamentResult,
TournamentMember
GroupActivity, Tournament, TournamentGroup, TournamentMatch, TournamentResult,
TournamentMember, Accident
} from './models/index.js';
import authRoutes from './routes/authRoutes.js';
import clubRoutes from './routes/clubRoutes.js';
@@ -33,6 +29,7 @@ import groupRoutes from './routes/groupRoutes.js';
import diaryDateTagRoutes from './routes/diaryDateTagRoutes.js';
import sessionRoutes from './routes/sessionRoutes.js';
import tournamentRoutes from './routes/tournamentRoutes.js';
import accidentRoutes from './routes/accidentRoutes.js';
const app = express();
const port = process.env.PORT || 3000;
@@ -60,6 +57,7 @@ app.use('/api/group', groupRoutes);
app.use('/api/diarydatetags', diaryDateTagRoutes);
app.use('/api/session', sessionRoutes);
app.use('/api/tournament', tournamentRoutes);
app.use('/api/accident', accidentRoutes);
app.use(express.static(path.join(__dirname, '../frontend/dist')));
@@ -100,6 +98,7 @@ app.get('*', (req, res) => {
await TournamentMember.sync({ alter: true });
await TournamentMatch.sync({ alter: true });
await TournamentResult.sync({ alter: true });
await Accident.sync({ alter: true });
app.listen(port, () => {
console.log(`Server is running on http://localhost:${port}`);