Skip to content
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

Jump to bottom

Alerts #49

Merged
merged 27 commits into from
Mar 6, 2024
Merged

Alerts #49

merged 27 commits into from
Mar 6, 2024

Conversation

Corepex
Copy link
Contributor

@Corepex Corepex commented Feb 22, 2024

Changes in this pull request

Resolves AP-136

@Corepex Corepex self-assigned this Feb 22, 2024
@Corepex
Copy link
Contributor Author

Corepex commented Feb 23, 2024 •
edited
Loading

TODOs:

  • create modalFileList component (which takes care of file styles in the content)
  • create modalFooter component (to address different styles)
  • create different types of modal (info, danger, success, warning, ...)
  • create custom use hook for all modals (basic + types)
  • create stories for different modal types

Questions:

  • how should the text button look on hovering

Corepex and others added 13 commits February 23, 2024 10:45
@Corepex
Merge branch '1.x' into alerts
f680ac1 
# Conflicts:
#	assets/js/src/components/icon/icon.tsx
@Corepex
renamed icon and icon file, changed icon in stories
bb9d82c
@Corepex
Merge branch '1.x' into alerts
4fbb238 
# Conflicts:
#	assets/js/src/components/icon/icon.tsx
@Corepex
added file list component
16cb0dd
@Corepex
added modalFooter and fileList as seperate component, added icons…
f6c71a8 
…, added custom hook `useModal`
@Corepex
added warn icon, added warn story
4450e52
@Corepex
added build files
3708db4
@Corepex
Merge branch '1.x' into alerts
312a877 
# Conflicts:
#	assets/js/src/components/icon/icon.tsx
#	public/build/239.37566adc.js.LICENSE.txt
#	public/build/entrypoints.json
#	public/build/manifest.json
@Corepex
added several types
d6610b7
@Corepex
added some more return types
52c5afc
@Corepex
added some more return types V2
1866777
@Corepex
added displayName to function, added return type
f303365
@Corepex @github-actions
Apply eslint-fixer changes
448017e
@Corepex Corepex marked this pull request as ready for review March 6, 2024 09:10
Corepex and others added 7 commits March 6, 2024 11:09
@Corepex
final_5
c2af720
@Corepex
Merge remote-tracking branch 'origin/alerts' into alerts
5de4cb9 
# Conflicts:
#	assets/js/src/components/modal/modal.tsx
#	assets/js/src/components/modal/useModal/index.tsx
@Corepex
Merge branch '1.x' into alerts
dac96cd 
# Conflicts:
#	assets/js/src/components/icon/icon.tsx
#	public/build/entrypoints.json
#	public/build/manifest.json
@Corepex
removed unused import
8890f00
@Corepex @github-actions
Apply eslint-fixer changes
c6a052c
@Corepex
readded missing icon.tsx changes
136115a
@Corepex @github-actions
Automatic frontend build
eabd884
@vin0401 vin0401 merged commit 9146e28 into 1.x Mar 6, 2024
@github-actions github-actions bot locked and limited conversation to collaborators Mar 6, 2024
@Corepex Corepex deleted the alerts branch March 13, 2024 09:21
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees

@Corepex Corepex

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Corepex @vin0401