Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file added public/assets/app/charts/EFKT/EFKT_ARR_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/app/charts/EFKT/EFKT_DEP_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/app/charts/EFKT/EFKT_GND_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/app/charts/EGHI/EGHI_GND.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/app/charts/EGKK/EGKK_ARR_1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/assets/app/charts/EGKK/EGKK_ARR_1.png
Binary file not shown.
Binary file added public/assets/app/charts/EGKK/EGKK_ARR_2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/assets/app/charts/EGKK/EGKK_ARR_2.png
Binary file not shown.
Binary file added public/assets/app/charts/EGKK/EGKK_DEP_1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/assets/app/charts/EGKK/EGKK_DEP_1.png
Binary file not shown.
Binary file added public/assets/app/charts/EGKK/EGKK_DEP_2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/assets/app/charts/EGKK/EGKK_DEP_2.png
Binary file not shown.
Binary file added public/assets/app/charts/EGKK/EGKK_DEP_3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/assets/app/charts/EGKK/EGKK_DEP_3.png
Binary file not shown.
Binary file modified public/assets/app/charts/EGKK/EGKK_GND_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/app/charts/EGKK/EGKK_GND_2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/assets/app/charts/EGKK/EGKK_GND_2.png
Binary file not shown.
Binary file added public/assets/app/charts/GCLP/GCLP_ARR_1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/assets/app/charts/GCLP/GCLP_ARR_1.png
Binary file not shown.
Binary file added public/assets/app/charts/GCLP/GCLP_ARR_2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/assets/app/charts/GCLP/GCLP_ARR_2.png
Binary file not shown.
Binary file added public/assets/app/charts/GCLP/GCLP_ARR_3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/assets/app/charts/GCLP/GCLP_ARR_3.png
Binary file not shown.
Binary file added public/assets/app/charts/GCLP/GCLP_DEP_1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/assets/app/charts/GCLP/GCLP_DEP_1.png
Binary file not shown.
Binary file added public/assets/app/charts/GCLP/GCLP_DEP_2.jpg
Binary file removed public/assets/app/charts/GCLP/GCLP_DEP_2.png
Diff not rendered.
Binary file added public/assets/app/charts/GCLP/GCLP_DEP_3.jpg
Binary file removed public/assets/app/charts/GCLP/GCLP_DEP_3.png
Diff not rendered.
Binary file added public/assets/app/charts/GCLP/GCLP_GND_1.jpg
Binary file removed public/assets/app/charts/GCLP/GCLP_GND_1.png
Diff not rendered.
Binary file modified public/assets/app/charts/LCLK/LCLK_GND_1.png
Binary file modified public/assets/app/charts/LCLK/LCLK_GND_2.png
Binary file added public/assets/app/charts/LCLK/LCLK_GND_3.png
Binary file added public/assets/app/charts/LCPH/LCPH_GND_1.png
Binary file added public/assets/app/charts/LCPH/LCPH_GND_2.png
Binary file added public/assets/app/charts/LCPH/LCPH_GND_3.png
Binary file added public/assets/app/charts/LCRA/LCRA_GND_1.png
Binary file added public/assets/app/charts/LEMH/LEMH_ARR_1.png
Binary file added public/assets/app/charts/LEMH/LEMH_DEP_1.png
Binary file added public/assets/app/charts/LEMH/LEMH_GND_1.png
Binary file added public/assets/app/charts/MDAB/MDAB_GND.png
Binary file added public/assets/app/charts/MDCR/MDCR_GND.png
Binary file modified public/assets/app/charts/MDPC/MDPC_ARR_1.png
Binary file added public/assets/app/charts/MDPC/MDPC_ARR_2.png
Binary file added public/assets/app/charts/MDPC/MDPC_ARR_3.png
Binary file modified public/assets/app/charts/MDPC/MDPC_DEP_1.png
Binary file added public/assets/app/charts/MDPC/MDPC_DEP_2.png
Binary file added public/assets/app/charts/MDPC/MDPC_GND_1.jpg
Binary file removed public/assets/app/charts/MDPC/MDPC_GND_1.png
Diff not rendered.
Binary file added public/assets/app/charts/MDPC/MDPC_GND_2.jpg
Binary file removed public/assets/app/charts/MDPC/MDPC_GND_2.png
Diff not rendered.
Binary file added public/assets/app/charts/MDST/MDST_GND.png
Binary file added public/assets/app/charts/MTCA/MTCA_GND.png
18 changes: 11 additions & 7 deletions server/db/admin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ export async function getAllUsers(page = 1, limit = 50, search = '', filterAdmin
} else {
query = query.where('u.id', 'not in', adminIds);
}
} else if (filterAdmin === 'admin') {
} else {
return {
users: [],
pagination: { page, limit, total: 0, pages: 0 }
Expand Down Expand Up @@ -282,12 +282,16 @@ export async function getAllUsers(page = 1, limit = 50, search = '', filterAdmin
}

const userIds = (rawUsers as RawUser[]).map(u => u.id);
const sessionCounts = await mainDb
.selectFrom('sessions')
.select(['created_by', mainDb.fn.countAll().as('count')])
.where('created_by', 'in', userIds)
.groupBy('created_by')
.execute();
type SessionCountRow = { created_by: string; count: string | number };
let sessionCounts: SessionCountRow[] = [];
if (userIds.length > 0) {
sessionCounts = await mainDb
.selectFrom('sessions')
.select(['created_by', mainDb.fn.countAll().as('count')])
.where('created_by', 'in', userIds)
.groupBy('created_by')
.execute() as SessionCountRow[];
}
const sessionCountMap = Object.fromEntries(sessionCounts.map(row => [row.created_by, Number(row.count)]));

const usersWithAdminStatus = (rawUsers as RawUser[]).map((user: RawUser) => {
Expand Down
1 change: 1 addition & 0 deletions server/db/leaderboard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export const STATS_KEYS = [
'total_sessions_created',
'total_flights_submitted.total',
'total_time_controlling_minutes',
'total_chat_messages_sent',
'total_flight_edits.total_edit_actions'
];

Expand Down
12 changes: 12 additions & 0 deletions src/components/Footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,18 @@ export default function Footer() {
<ExternalLink className="h-3 w-3 ml-1 opacity-0 group-hover:opacity-100 transition-opacity" />
</a>
</p>
<p className="text-gray-500 text-sm">
Charts by{' '}
<a
href="https://discord.gg/pfatc"
className="text-blue-400 hover:text-blue-300 transition-all duration-200 underline inline-flex items-center group"
target="_blank"
rel="noopener noreferrer"
>
PFATC
<ExternalLink className="h-3 w-3 ml-1 opacity-0 group-hover:opacity-100 transition-opacity" />
</a>
</p>
</div>
<div className="flex items-center space-x-2 text-gray-500 text-sm">
<span>Version {version}</span>
Expand Down
Loading
Loading