-
Notifications
You must be signed in to change notification settings - Fork 165
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.
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
Grading Overview: TS/Tremor -> AG/Blueprint Migration #2893
Merged
RichDom2185
merged 100 commits into
source-academy:master
from
InfinityTwo:grading-overview-ag-bp-migration
Aug 19, 2024
Merged
Changes from 1 commit
Commits
Show all changes
100 commits
Select commit
Hold shift + click to select a range
97a1ae4
added filterable columns in grading overview
InfinityTwo 567a471
some cleanup code
InfinityTwo 0c5df89
merge conflicts
InfinityTwo 5a5eaab
moved some grading overview FE components from tremor to blueprint
InfinityTwo 852da3c
missing code from previous commit
InfinityTwo c4f0ddf
halfway done for porting tanstack/tremor to ag grid/blueprint
InfinityTwo 34f8d9a
Merge pull request #4 from InfinityTwo/grading-filterable-columns
InfinityTwo b22cb6f
more changes to grading table - animation whilst loading, filter/edit…
InfinityTwo 30014c8
Merge pull request #5 from InfinityTwo/grading-filterable-columns
InfinityTwo 63932c6
code refactoring
InfinityTwo 5a4eb0d
Merge pull request #6 from InfinityTwo/grading-filterable-columns
InfinityTwo de27b6d
filterable columns, backend sorting shell, and some partial removal o…
InfinityTwo 48684a5
more component migrations, refactoring and preparation for backend sort
InfinityTwo 1e7eafc
multi -> single sorting, moved over all ts/tremor components to ag/bp…
InfinityTwo f7021b0
fix table cutoff on small horizontal resolution and missing hover eff…
InfinityTwo e54fe6e
refresh button for table
InfinityTwo 6ae6df5
Merge branch 'master' of https://github.com/source-academy/frontend i…
RichDom2185 c16e3ae
fixed richard's comments (mostly), and added a fix for josh's comment…
InfinityTwo d1d4a09
fixed edge case of attempted/submitted on filter from prev commit
InfinityTwo 2db1749
mock files, change josh's pr 2nd issue to remove non-submitted filter…
InfinityTwo 83f00cf
fixed wrong username and text overflow
InfinityTwo f1f8652
eslint
InfinityTwo 2ed0eec
prettier checks
InfinityTwo 2d5cae3
Merge branch 'source-academy:master' into grading-overview-ag-bp-migr…
InfinityTwo 886c976
backend mock changes
InfinityTwo d901660
minor adjustments and cleanups
InfinityTwo 768cb8a
minor ui adjustments for better mobile compatability
InfinityTwo 20fe50a
Merge branch 'source-academy:master' into grading-overview-ag-bp-migr…
InfinityTwo ca6ac7e
preparation for P2 merge
InfinityTwo b73044b
Merge branch 'grading-overview-ag-bp-migration' of https://github.com…
InfinityTwo 651e457
eslint prettier
InfinityTwo 2dc8125
compile erros
InfinityTwo 480bbfc
compile error and eslint
InfinityTwo 2aa51e5
Merge branch 'source-academy:master' into grading-overview-ag-bp-migr…
InfinityTwo 9dad80b
master conflicts
InfinityTwo f608c87
prettier checks
InfinityTwo e849778
minor ui adjustments
InfinityTwo fef4031
Merge branch 'master' of https://github.com/source-academy/frontend i…
RichDom2185 3c4c939
Revert change back to raw strings
RichDom2185 d57f0d8
typescript v5 fixes and richard's comments
InfinityTwo 4b76614
Merge branch 'source-academy:master' into grading-overview-ag-bp-migr…
InfinityTwo 3c5edf1
more typescript v5 fixes
InfinityTwo fbba60a
prettier
InfinityTwo b03cfe9
some refactoring and bug fixing
InfinityTwo 9b2348e
Merge branch 'source-academy:master' into grading-overview-ag-bp-migr…
InfinityTwo 505de5f
null value error in empty cell & wider actions col
InfinityTwo d161760
added submitted to unpublished allowed filters
InfinityTwo a4ff982
Merge branch 'master' into grading-overview-ag-bp-migration
InfinityTwo db2961c
Merge branch 'master' of https://github.com/source-academy/frontend i…
RichDom2185 e93a8d5
Merge branch 'master' into grading-overview-ag-bp-migration
RichDom2185 04cc13e
Merge branch 'master' into grading-overview-ag-bp-migration
RichDom2185 8b02ad1
Merge branch 'master' of https://github.com/source-academy/frontend i…
RichDom2185 86a431b
Merge branch 'master' of https://github.com/source-academy/frontend i…
RichDom2185 c4134c0
Fix format
RichDom2185 f7ea428
Merge branch 'master' of https://github.com/source-academy/frontend i…
RichDom2185 7449edf
Fix compile error post-merge
RichDom2185 5428c57
Refactor GradingFlex
RichDom2185 ceebfb9
Refactor GradingText
RichDom2185 916680c
Update BackendSaga.ts
RichDom2185 8a1cad8
Refactor GradingFilterable.tsx
RichDom2185 847a6ab
Refactor GradingActions
RichDom2185 1f4108f
Simplify conditions in conditionals
RichDom2185 d2756bc
Refactor conditions
RichDom2185 71eb6d6
Refactor GradingColumnCustomHeaders.tsx
RichDom2185 a14c365
Refactor GradingColumnFilters.tsx
RichDom2185 70fbc0f
Refactor GradingBadges.tsx
RichDom2185 3d1ec43
Add missing React import
RichDom2185 0d91ae8
Merge branch 'master' into grading-overview-ag-bp-migration
RichDom2185 f79be42
Merge branch 'master' into grading-overview-ag-bp-migration
RichDom2185 da2e269
Merge branch 'master' into grading-overview-ag-bp-migration
RichDom2185 fa7a309
Merge branch 'master' of https://github.com/source-academy/frontend i…
RichDom2185 14b8360
Fix imports and format post merge
RichDom2185 e8e68c5
Merge branch 'master' into grading-overview-ag-bp-migration
lhw-1 72f301f
Merge branch 'master' of https://github.com/InfinityTwo/sourceacademy…
InfinityTwo e08d9b5
hw review changes and child key error fix
InfinityTwo 086460d
Merge branch 'grading-overview-ag-bp-migration' of https://github.com…
InfinityTwo 5f88cd2
fixed randomly broken grading table headers and merge conflicts
InfinityTwo a858c18
prettier
InfinityTwo f02d792
Merge branch 'master' into grading-overview-ag-bp-migration
RichDom2185 f6664ac
Merge branch 'master' into grading-overview-ag-bp-migration
RichDom2185 c9bf19c
Merge branch 'master' of https://github.com/source-academy/frontend i…
RichDom2185 6d21dca
Reformat post-lint updates
RichDom2185 e48bb8f
Merge branch 'master' into grading-overview-ag-bp-migration
RichDom2185 d2db6d2
Add TODO
RichDom2185 057dd5a
Remove unused CSS class
RichDom2185 74aa4e7
Scope most styles to CSS modules
RichDom2185 9544a0c
Migrate more styles to CSS modules
RichDom2185 21fb5f6
Simplify to use new actions format
RichDom2185 286a204
Migrate more classes to CSS modules
RichDom2185 de628df
Refactor grading badge styles to separate module file
RichDom2185 23d330f
Remove hardcoded CSS namespace
RichDom2185 24fffed
Make fix less hacky
RichDom2185 5c95916
Remove unnecessary default with enum type
RichDom2185 8960ade
Refactor column builder to separate file
RichDom2185 874ae71
Remove unnecessary space
RichDom2185 1b32f44
Improve readability
RichDom2185 3abcdad
Remove unused param
RichDom2185 248c03f
Remove unnecessary `={true}`
RichDom2185 fedce2a
Add TODO
RichDom2185 9bc2656
Refactor grading badge
RichDom2185 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
prettier checks
- Loading branch information
commit 2ed0eec18086ab0f8d906551eb9d100fc98e614a
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,27 +1,34 @@ | ||
import { Property } from "csstype"; | ||
import { Property } from 'csstype'; | ||
|
||
type GradingFlexProps = { | ||
justifyContent?: Property.JustifyContent; | ||
alignItems?: Property.AlignItems; | ||
flexDirection?: Property.FlexDirection; | ||
children?: React.ReactNode; | ||
style?: React.CSSProperties; | ||
className?: string; | ||
justifyContent?: Property.JustifyContent; | ||
alignItems?: Property.AlignItems; | ||
flexDirection?: Property.FlexDirection; | ||
children?: React.ReactNode; | ||
style?: React.CSSProperties; | ||
className?: string; | ||
} & React.RefAttributes<HTMLDivElement>; | ||
|
||
const GradingFlex: React.FC<GradingFlexProps> = ({ justifyContent, alignItems, flexDirection, children, style, className, }: GradingFlexProps) => { | ||
const GradingFlex: React.FC<GradingFlexProps> = ({ | ||
justifyContent, | ||
alignItems, | ||
flexDirection, | ||
children, | ||
style, | ||
className | ||
}: GradingFlexProps) => { | ||
const defaultStyle: React.CSSProperties = { | ||
display: "flex", | ||
display: 'flex', | ||
justifyContent: justifyContent, | ||
alignItems: alignItems, | ||
flexDirection: flexDirection, | ||
flexDirection: flexDirection | ||
}; | ||
|
||
return ( | ||
<div className={className} style={{...defaultStyle, ...style}}> | ||
<div className={className} style={{ ...defaultStyle, ...style }}> | ||
{children} | ||
</div> | ||
); | ||
} | ||
}; | ||
|
||
export default GradingFlex; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
import { Text } from "@blueprintjs/core"; | ||
import { Text } from '@blueprintjs/core'; | ||
|
||
type GradingTextProps = { | ||
children?: React.ReactNode; | ||
|
@@ -7,20 +7,25 @@ type GradingTextProps = { | |
className?: string; | ||
} & React.RefAttributes<HTMLDivElement>; | ||
|
||
const GradingText: React.FC<GradingTextProps> = ({ children, style, secondaryText, className = "", }: GradingTextProps) => { | ||
const GradingText: React.FC<GradingTextProps> = ({ | ||
children, | ||
style, | ||
secondaryText, | ||
className = '' | ||
}: GradingTextProps) => { | ||
const defaultStyle: React.CSSProperties = { | ||
width: "max-content", | ||
margin: "auto 0" | ||
width: 'max-content', | ||
margin: 'auto 0' | ||
}; | ||
|
||
return ( | ||
<Text | ||
className={"bp5-ui-text " + className + (secondaryText ? " bp5-text-muted" : "")} | ||
style={{...defaultStyle, ...style}} | ||
<Text | ||
className={'bp5-ui-text ' + className + (secondaryText ? ' bp5-text-muted' : '')} | ||
style={{ ...defaultStyle, ...style }} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Don't use raw class names because this is very fragile. Use the abstracted class names from |
||
> | ||
{children} | ||
</Text> | ||
); | ||
} | ||
}; | ||
|
||
export default GradingText; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unnecessary type annotation