oh god what is this merge help - #18

Open

tyranasaurus wants to merge 245 commits into

MustangMathTech:masterfrom

comp-development:test_merge

Commits on Dec 23, 2023

add initial grading frontend
Eesha-Jain
committed
53f187c

Commits on Dec 24, 2023

adding swiping
Eesha-Jain
committed
07fde4a
animted swiping
Eesha-Jain
committed
8f634d7
fix the alerts not working
Eesha-Jain
committed
2f1a9a0
attempted swiping
Eesha-Jain
committed
0ecd99d

Commits on Jan 1, 2024

working towards integrating swiping
Eesha-Jain
committed
41986e9

Commits on Jan 9, 2024

working swipe actions.
tyranasaurus
committed
2ba29c7
Swiping!
tyranasaurus
committed
6c9e99a

Commits on Jan 19, 2024

finished keyboard and swiping
Eesha-Jain
committed
787075e

Commits on Jan 21, 2024

add axis snapping, nonlinear scale, fade out
Tweoss
committed
d0dcd12
use inline style instead of class
Tweoss
committed
8da6e3f

Commits on Jan 22, 2024

Commits on Jan 29, 2024

Merge pull request #10 from ContestOrganizationManagementPlatform/master
stanfordmathtournament
authored
b7f23ba
Update scheme.json
stanfordmathtournament
authored
69c0b55
Update scheme.json
tyranasaurus
committed
60193f7

Commits on Jan 30, 2024

Merge pull request #11 from ContestOrganizationManagementPlatform/master
stanfordmathtournament
authored
9ec3603

Commits on Jan 31, 2024

Update scheme.json
tyranasaurus
authored
47a17b2
Update scheme.json
tyranasaurus
authored
ef1f9f1

Commits on Feb 3, 2024

Commits on Feb 5, 2024

Commits on Feb 11, 2024

Update +page.svelte
tyranasaurus
authored
7ff4a4b

Commits on Feb 17, 2024

Merge pull request #14 from ContestOrganizationManagementPlatform/master
stanfordmathtournament
authored
7b0c500
Update scheme.json
stanfordmathtournament
authored
6eec047
Update +page.svelte
stanfordmathtournament
authored
786d5e9

Commits on Mar 4, 2024

Commits on Mar 7, 2024

add dividing line measurement
Tweoss
committed
20a234a
output answer sheet bounding boxes
Tweoss
committed
ce5c689

Commits on Mar 9, 2024

Update package.json
tyranasaurus
committed
fed7cb8
Update grading.ts
tyranasaurus
committed
7b2b0b6
Create page.svelte
tyranasaurus
committed
eff843d
me
tyranasaurus
committed
a6c4e55
Create +page.svelte
tyranasaurus
committed
3089660
Create +page.svelte
tyranasaurus
committed
11f9abe
Update Menu.svelte
tyranasaurus
committed
7247b10
Update +page.svelte
tyranasaurus
committed
161daf9
Create ImageZoomer.svelte
tyranasaurus
committed
738e66f
smt
tyranasaurus
committed
c9f2d52
Update +page.svelte
tyranasaurus
committed
635a266
Update tournaments.ts
tyranasaurus
committed
811b0ab
Update tournaments.ts
tyranasaurus
committed
09084e5
smth
tyranasaurus
committed
ea264a6
Merge pull request #83 from ContestOrganizationManagementPlatform/take-3
tyranasaurus
authored
50221a3
Update +page.svelte
tyranasaurus
committed
aae55db
Update +page.svelte
tyranasaurus
committed
0fde420
Added problem id
SidhartK
committed
f13f1f1
Merge pull request #84 from ContestOrganizationManagementPlatform/grading-frontend
tyranasaurus
authored
fae19af
Fetch works again
SidhartK
committed
177b054
Merge branch 'grading-backend-edits' of https://github.com/MustangMath-Tournament/COMPOSE into grading-backend-edits
SidhartK
committed
dfe3146
Undo grade working
SidhartK
committed
e65c891
Update +page.svelte
tyranasaurus
committed
509061b
Merge pull request #85 from ContestOrganizationManagementPlatform/grading-frontend
tyranasaurus
authored
4f284ef
Pushing whatever I have
SidhartK
committed
8304f9d
Update +page.svelte
tyranasaurus
committed
ce5609d
Create +page.svelte
tyranasaurus
committed
8eb2fbc
Update +page.svelte
tyranasaurus
committed
0c1fcab
Create FileUpload.svelte
tyranasaurus
committed
0b14307
Update Menu.svelte
tyranasaurus
committed
6297587

Commits on Mar 10, 2024

Pushing all edits so far
SidhartK
committed
3a421fe
Add modal functionality
tyranasaurus
committed
b5951f3
migration to Svelte 4
tyranasaurus
committed
83356db
Remove svelte-chart-js and add svelte-flowbite
tyranasaurus
committed
2d4d3a1
Update +page.svelte
tyranasaurus
committed
970b7a8
rename modal
tyranasaurus
committed
d0c6908
Rename Modal
tyranasaurus
committed
4341471
Delete PieChart.svelte
tyranasaurus
committed
a8c4391
Update ProblemFeedback.svelte
tyranasaurus
committed
1d390d7
Merge pull request #87 from ContestOrganizationManagementPlatform/svelte-migration
tyranasaurus
authored
1e06c3b
implement flowbite modal
tyranasaurus
committed
56720a3
Update +page.svelte
tyranasaurus
committed
142f625
Merge pull request #88 from ContestOrganizationManagementPlatform/grading-backend-edits
tyranasaurus
authored
6a251f2

Commits on Mar 12, 2024

add processing of uploaded pdf/zip files
Tweoss
committed
e8718e4
add uploading to supabase scans table
Tweoss
committed
fe66bf6

Commits on Mar 14, 2024

add previewing images before upload
Tweoss
committed
302d7cc
Merge pull request #89 from ContestOrganizationManagementPlatform/scan-uploading
SidhartK
authored
02d080b
reference correct PDF_SCALE constant
Tweoss
committed
9aaf0e7

Commits on Mar 17, 2024

add more spacing to checkbox to edit test problems
Tweoss
committed
4e10286
Update +page.svelte

tyranasaurus
authored and
SidhartK
committed
22b6685
Update +page.svelte

tyranasaurus
authored and
SidhartK
committed
94cd7bc
Undo grade working
SidhartK
committed
c8da77f
Update +page.svelte

tyranasaurus
authored and
SidhartK
committed
4c1f13d
Pushing whatever I have
SidhartK
committed
6f00880
Update +page.svelte

tyranasaurus
authored and
SidhartK
committed
75e386e
Create +page.svelte

tyranasaurus
authored and
SidhartK
committed
796c570
Update +page.svelte

tyranasaurus
authored and
SidhartK
committed
7f2d2e3
Create FileUpload.svelte

tyranasaurus
authored and
SidhartK
committed
58aa564
Update Menu.svelte

tyranasaurus
authored and
SidhartK
committed
032a8fa
Pushing all edits so far
SidhartK
committed
262546c
Add modal functionality

tyranasaurus
authored and
SidhartK
committed
709cd11
migration to Svelte 4

tyranasaurus
authored and
SidhartK
committed
ce8f791
Remove svelte-chart-js and add svelte-flowbite

tyranasaurus
authored and
SidhartK
committed
df9cf42
Update +page.svelte

tyranasaurus
authored and
SidhartK
committed
0150cef
rename modal

tyranasaurus
authored and
SidhartK
committed
fe6d962
Rename Modal

tyranasaurus
authored and
SidhartK
committed
b431bbb
Delete PieChart.svelte

tyranasaurus
authored and
SidhartK
committed
ef9cba1
Update ProblemFeedback.svelte

tyranasaurus
authored and
SidhartK
committed
1ace40b
implement flowbite modal

tyranasaurus
authored and
SidhartK
committed
b641423
Update +page.svelte

tyranasaurus
authored and
SidhartK
committed
a7495f6
add processing of uploaded pdf/zip files

Tweoss
authored and
SidhartK
committed
d1630fd
add uploading to supabase scans table

Tweoss
authored and
SidhartK
committed
bda0e0b
add previewing images before upload

Tweoss
authored and
SidhartK
committed
acccf58
reference correct PDF_SCALE constant

Tweoss
authored and
SidhartK
committed
f88d874
add more spacing to checkbox to edit test problems

Tweoss
authored and
SidhartK
committed
ee3da31
Co-authored-by: tyranasaurus <tyranasaurus@users.noreply.github.com>
SidhartK
committed
1b9494f
Merge pull request #91 from ContestOrganizationManagementPlatform/master
tyranasaurus
authored
d2a4dd8
Added comment for Francis
SidhartK
committed
285941c
increase threshold
tyranasaurus
committed
76683ea
implement progress bars
tyranasaurus
committed
158ba25
Update +page.svelte
tyranasaurus
committed
b83cf3a
Merge pull request #92 from ContestOrganizationManagementPlatform/grading-frontend
tyranasaurus
authored
42163e9
JSON
natalieshell22
committed
d405757
fix problem loading logic for grading
Tweoss
committed
dd0ea4a

Commits on Mar 18, 2024

extract colors, names into constant for brevity
Tweoss
committed
5f605eb
Merge branch 'master' into grading-backend-edits
Tweoss
committed
a5653ea

Commits on Mar 21, 2024

Merge branch 'grading-backend-edits'
Tweoss
committed
d3de4a3

Commits on Mar 25, 2024

add test alignment dot, use qr+dot to align scans
Tweoss
committed
9ca2b51

Commits on Mar 26, 2024

Commits on Mar 31, 2024

extract grading component, add admin override
Tweoss
committed
cc1bae7

Commits on Apr 1, 2024

Merge pull request #94 from ContestOrganizationManagementPlatform/admin-grading
Tweoss
authored
6ef456b

Commits on Apr 6, 2024

add conflict count to progress bar
Tweoss
committed
0a41c64
Up and running
natalieshell22
committed
5c2b762
fix: fetch solution_latex images in test download
Tweoss
committed
dbd63ac
upload scans in parallel
Tweoss
committed
3fe30d1
feat: add warn on exit for problem editing
Tweoss
committed
f0c43f7

Commits on Apr 7, 2024

finalized MVP
natalieshell22
committed
b928736

Commits on Apr 8, 2024

aestheticgit add -A
natalieshell22
committed
e9db0fb
submit all
natalieshell22
committed
b5aabef
Merge branch 'master' into grading-test
SidhartK
committed
42aa507
Async
natalieshell22
committed
ed46869
Fixed multiple paths issue
SidhartK
committed
70ed041
await
natalieshell22
committed
b280d6f
fix: hardcode image size in test download
Tweoss
committed
1a90c80
Merge pull request #16 from ContestOrganizationManagementPlatform/master
stanfordmathtournament
authored
1e637ff
Update scheme.json
stanfordmathtournament
authored
6183f0f
add temporary padding fix to boxes
Tweoss
committed
ecec1f4
Merge pull request #17 from ContestOrganizationManagementPlatform/master
stanfordmathtournament
authored
dd3c8d6
add baseline and ans in test pdf gen
Tweoss
committed
ebebae5
Merge pull request #18 from ContestOrganizationManagementPlatform/master
stanfordmathtournament
authored
c39d059
add dirty checking on new problem page
Tweoss
committed
10e82c6
Merge pull request #19 from ContestOrganizationManagementPlatform/master
stanfordmathtournament
authored
080c2b6

Commits on Apr 9, 2024

Modified to use supabase
SidhartK
committed
33f2f09

Commits on Apr 10, 2024

Merge pull request #96 from ContestOrganizationManagementPlatform/grading-test
SidhartK
authored
37606bb
Update +page.svelte
SidhartK
authored
5011ea2
merge guts changes
Tweoss
committed
9d50324
Merge branch 'master' into master
Tweoss
authored
926b1bb
Fixed check submit feature for input guts
SidhartK
committed
43ff8e9
Only first 8 rounds
SidhartK
committed
7ad52e4
Updating the point values to match SMT
SidhartK
committed
1d110de
added team names
natalieshell22
committed
4740ba9
Fixed round display
natalieshell22
committed
b35af85
top teams stuck to board
natalieshell22
committed
a613bd9
Modified package.json to include pdfjs
SidhartK
committed
aafa684
Making sure that other rounds don't get cleared in guts
SidhartK
committed
7dc2a16
Update answer_sheet.typ
tyranasaurus
committed
74b1483
update scan upload code, match new sticker format
Tweoss
committed
8ec7722
add guts pdf generation
Tweoss
committed
c0fa82b
reduce margins and font size for guts generation
Tweoss
committed
64451e9
reduce margins further
Tweoss
committed
27236e1
Adding an incorrect column
SidhartK
committed
3cc6dec
special case circle image for spacing, update logo
Tweoss
committed
4de87b0

Commits on Apr 11, 2024

fix date, path to image
Tweoss
committed
3878954
trying to fix hardcoded path to image
Tweoss
committed
41187a1
add team name box to guts test pdf
Tweoss
committed
606a932
trigger vercel
Tweoss
committed
9835f3d
adjust ratio of guts layout
Tweoss
committed
f65ec87
have problem number in enum align to top
Tweoss
committed
0ef83d3
rename answer_sheet.typ to test_sheet.typ
Tweoss
committed
0a47d67
end and top are defaults (revert)
Tweoss
committed
87323d0
log errors if no qr codes found
Tweoss
committed
3f1e9ff
correct number of sets in guts pdf
Tweoss
committed
dd17173
Finalizing input gut format
SidhartK
committed
e544acb
Merge pull request #97 from ContestOrganizationManagementPlatform/grading-test
SidhartK
authored
f0dcc38

Commits on Apr 12, 2024

Allowing scans table to be editable
SidhartK
committed
206e8ac
Uncommenting regex
SidhartK
committed
ce64bf4
allow editing of unrecognized scans
Tweoss
committed
97eea92
add deleting scans, partial success
Tweoss
committed
aa41f9e
add sorting for integration bee (untested)
Tweoss
committed
b6e3405
add log message
Tweoss
committed
446b24e
use average_difficulty for sorting integration bee
Tweoss
committed
7244253
Adding result exporting
SidhartK
committed
4f4748a
Merge branch 'master' of https://github.com/MustangMath-Tournament/COMPOSE
SidhartK
committed
950df5b
add guts layout but for tiebreakers (per kat)
Tweoss
committed
4c50378
fix blank image in grading display
Tweoss
committed
abc459a

Commits on Apr 13, 2024

Updating guts UI
SidhartK
committed
89addbc
Bolded the column headers
SidhartK
committed
8a11930
Added some spacing
SidhartK
committed
d8a1e7f
Added spacing for answer typing
SidhartK
committed
066df9a
Checking mobile grading layout
SidhartK
committed
67ca312
Added toasts to scan upload
SidhartK
committed
b396e75
updated package-lock.json
Tweoss
committed
dde9453
testing: replace admin grading with normal grading
Tweoss
committed
132e691
move admin grading to resolve-conflicts
Tweoss
committed
8c67148
remove resolve-conflicts, add urlparam to override
Tweoss
committed
5319472
try load fabric only on client
Tweoss
committed
e5587d7
revert package lock
Tweoss
committed
a7b4a22
add link to grading
Tweoss
committed
1842b40
run problem fetching in parallel for grading
Tweoss
committed
97afeb8
move grade resolution to admin. update admin menu
Tweoss
committed
7c4f8dc
wrap pdf.js script in div instead of head
Tweoss
committed
d3eca38
use svelte:head
Tweoss
committed
0381d0a
fix href's on resolve
Tweoss
committed
e6d2812
Changing queue size to 10
SidhartK
committed
2191d3b
Merge branch 'master' of https://github.com/MustangMath-Tournament/COMPOSE
SidhartK
committed
a8333d6
Adding console logs
SidhartK
committed
ae9278e
Fixed grading bug
SidhartK
committed
e6f9261
add mutex around fetching new problems
Tweoss
committed
aa11f2b
Updated guts
SidhartK
committed
8add4b2
Merge branch 'master' of https://github.com/MustangMath-Tournament/COMPOSE
SidhartK
committed
7a2c43b
unlock fetching_problems
Tweoss
committed
16c021f
reorder grading button orders
Tweoss
committed
8c38439
fix export button
Tweoss
committed
cf42006
hide answers on guts input
Tweoss
committed
329aa8d
remove extraneous scan error messages in upload
Tweoss
committed
ece9243
Pushing all changes to guts
SidhartK
committed
346a51c
Merge branch 'master' of https://github.com/MustangMath-Tournament/COMPOSE
SidhartK
committed
0e1e1ee
adding accurate counts
SidhartK
committed
962870d
fix counts to be truly accurate
Tweoss
committed
7d8127c
Merge pull request #98 from ContestOrganizationManagementPlatform/accurate-counts
Tweoss
authored
8b73b37
fix counts for normal grading route as well
Tweoss
committed
fea1a96

Commits on Apr 15, 2024

Updated export button so that it works! Please view /supabase/grading.ts to edit constants related to export
SidhartK
committed
05f8567
More comments
SidhartK
committed
b5f99e1
Did merge
SidhartK
committed
ac365c2

Commits on Jul 4, 2024

use default answer layout for guts+tiebreakers
Tweoss
committed
38ec71a
formatting
Tweoss
committed
535bd29

Commits on Jul 29, 2024

Commits on Jul 30, 2024

TestProblems.svelte file created
AhanaMGh
committed
ec1ce3b

Commits on Jul 31, 2024

fix problem feedback
tyranasaurus
committed
593ee3e
remove undefined
tyranasaurus
committed
8d7b580

Commits on Aug 1, 2024

Added new page for feedback + changed value of problem
AhanaMGh
committed
12aa7ab

Commits on Aug 9, 2024

Problems/Feedback Page
AhanaMGh
committed
ab3fba9

Commits on Aug 12, 2024

Function Added to get individual problem
AhanaMGh
committed
460a9d8

Commits on Aug 26, 2024

Changed Frontend Components of Feedback Page
AhanaMGh
committed
e267188

Commits on Sep 3, 2024

Commits on Oct 12, 2024