-
Notifications
You must be signed in to change notification settings - Fork 0
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
Overhaul project summary page #859
Merged
sven1103
merged 43 commits into
development
from
feature/#812-improve-the-project-summary-view-for-better-visualisation
Nov 14, 2024
Merged
Changes from all commits
Commits
Show all changes
43 commits
Select commit
Hold shift + click to select a range
7a297ce
Draft scaffold
sven1103 e1f6130
Checkin current progress
sven1103 d3ba5f9
Checkin current progress
sven1103 6d206c2
Checkin daily progress
sven1103 03b1668
Checkin current progress
sven1103 888d6ef
Checkin progress
sven1103 742d50f
Checkin progress
sven1103 682e0a0
Checkin current progress
sven1103 e4e49f9
Checkin progress
sven1103 8db15d5
Checkin progress
sven1103 91e22d0
Checkin fix
sven1103 3a02d7d
Checkin progress
sven1103 d1f1a7c
Checkin progress
sven1103 7e6749f
Checkin edit use case funding
sven1103 60f5a10
Refactor funding info
sven1103 99bb33d
Merge branch 'development' into feature/#812-improve-the-project-summ…
sven1103 0872502
Refactor action bar
sven1103 77977d3
Merge branch 'feature/#812-improve-the-project-summary-view-for-bette…
sven1103 e241f63
Provide JDs
sven1103 9c7c0dd
More JDs
sven1103 3021c92
Checkin
sven1103 3d2e06a
Checkin
sven1103 75b8d69
Checkin
sven1103 9358b11
Checking work
sven1103 3eebc9e
Clean up
sven1103 9b12fcc
Checkin
sven1103 7cabcb3
Delelte empty and orphaned classes
sven1103 933a2f4
Adjust contact box width
sven1103 a1875bd
Add class annotation to contact section content
sven1103 7ce26e6
Enable to delete funding information
sven1103 e4b942b
Checkin progress
sven1103 e4d698f
Enable validation
sven1103 4b46b0a
Add JDs
sven1103 0470b0e
Address change requests
sven1103 d07834b
Merge branch 'development' into feature/#812-improve-the-project-summ…
Steffengreiner 24f2231
Optimize imports
sven1103 bed2cf3
Hide factory constructor
sven1103 d1d2b17
Reduce side effect risk
sven1103 6a97c0e
Make fields transient
sven1103 521e15d
Address severity issues
sven1103 e23bb30
Add transient modifier to fields
sven1103 3dcb13f
More fixes
sven1103 a4634cb
More improvements
sven1103 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
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
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
209 changes: 209 additions & 0 deletions
209
user-interface/frontend/themes/datamanager/components/all.css
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 |
---|---|---|
@@ -0,0 +1,209 @@ | ||
.flex-horizontal { | ||
display: flex; | ||
flex-direction: row; | ||
} | ||
|
||
.heading-with-icon { | ||
color: #878787; | ||
column-gap: var(--lumo-space-s); | ||
display: flex; | ||
flex-direction: row; | ||
font-weight: bold; | ||
line-height: 1; | ||
font-size: var(--lumo-space-m); | ||
} | ||
|
||
.heading-with-icon vaadin-icon { | ||
height: auto; | ||
} | ||
|
||
.section { | ||
width: 100%; | ||
} | ||
|
||
.full-width { | ||
width: 100%; | ||
} | ||
|
||
.section-header { | ||
display: flex; | ||
flex-direction: column; | ||
width: 100%; | ||
} | ||
|
||
|
||
.trailing-margin-large { | ||
margin-bottom: var(--lumo-space-xl); | ||
} | ||
|
||
.trailing-margin-normal { | ||
margin-bottom: var(--lumo-space-l); | ||
} | ||
|
||
.trailing-margin-small { | ||
margin-bottom: var(--lumo-space-s); | ||
} | ||
|
||
.section-header-row { | ||
display: flex; | ||
width: 100%; | ||
} | ||
|
||
.section-content { | ||
display: flex; | ||
flex-direction: column; | ||
width: 100%; | ||
row-gap: var(--lumo-space-m); | ||
} | ||
|
||
.section-title { | ||
font-weight: bold; | ||
color: var(--lumo-secondary-text-color); | ||
margin-bottom: 0.5rem; | ||
width: 100%; | ||
} | ||
|
||
.font-size-small { | ||
font-size: var(--lumo-font-size-l); | ||
} | ||
|
||
.font-size-medium { | ||
font-size: var(--lumo-font-size-xl); | ||
} | ||
|
||
.font-size-large { | ||
font-size: var(--lumo-font-size-xxl); | ||
} | ||
|
||
.sub-header { | ||
font-size: var(--lumo-font-size-s); | ||
color: #878787; | ||
margin-bottom: 0.5rem; | ||
} | ||
|
||
.tag-list { | ||
width: 100%; | ||
display: flex; | ||
} | ||
|
||
.detail-box { | ||
display: flex; | ||
flex-direction: column; | ||
border: 1px solid lightgray; | ||
border-radius: var(--lumo-space-s); | ||
max-height: 10rem; | ||
} | ||
|
||
.detail-box-header { | ||
display: flex; | ||
flex-direction: row; | ||
width: 100%; | ||
gap: var(--lumo-space-s); | ||
font-size: var(--lumo-font-size-m); | ||
font-weight: bold; | ||
color: #878787; | ||
line-height: 1; | ||
} | ||
|
||
.detail-box-header vaadin-icon { | ||
height: auto; | ||
} | ||
|
||
.detail-box-child { | ||
border-width: 1px 1px 1px 1px; | ||
border-color: lightgray; | ||
padding: var(--lumo-space-m) var(--lumo-space-m) var(--lumo-space-m); | ||
} | ||
|
||
.detail-box-child:first-child { | ||
border-width: 0 0 1px 0; | ||
border-style: solid; | ||
border-color: lightgray; | ||
} | ||
|
||
.icon-label { | ||
font-size: var(--lumo-font-size-m); | ||
line-height: 1; | ||
display: flex; | ||
flex-direction: row; | ||
gap: var(--lumo-space-l); | ||
} | ||
|
||
.icon-label-container { | ||
display: flex; | ||
flex-direction: row; | ||
font-size: var(--lumo-font-size-m); | ||
color: #878787; | ||
font-weight: bold; | ||
gap: var(--lumo-space-s); | ||
} | ||
|
||
.icon-label-container vaadin-icon { | ||
height: auto; | ||
} | ||
|
||
.vertical-list { | ||
display: flex; | ||
flex-direction: column; | ||
width: 100%; | ||
} | ||
|
||
.horizontal-list { | ||
display: flex; | ||
flex-direction: row; | ||
width: 100%; | ||
} | ||
|
||
.dynamic-growing-flex-item { | ||
flex-grow: 1; | ||
} | ||
|
||
.wrapping-flex-container { | ||
flex-wrap: wrap; | ||
} | ||
|
||
.overflow-hidden-ellipsis { | ||
white-space: nowrap; | ||
overflow: hidden; | ||
text-overflow: ellipsis; | ||
} | ||
|
||
.gap-large { | ||
gap: var(--lumo-space-l); | ||
} | ||
|
||
.gap-medium { | ||
gap: var(--lumo-space-m); | ||
} | ||
|
||
.gap-small { | ||
gap: var(--lumo-space-s); | ||
} | ||
|
||
.allow-row-wrap { | ||
flex-wrap: wrap; | ||
} | ||
|
||
.overflow-scroll-height { | ||
overflow: auto; | ||
} | ||
|
||
.ontology-term { | ||
width: 100%; | ||
display: flex; | ||
flex-direction: row; | ||
gap: var(--lumo-space-s); | ||
white-space: nowrap; | ||
flex-wrap: wrap; | ||
} | ||
|
||
.fixed-medium-width { | ||
width: 25rem; | ||
} | ||
|
||
.simple-paragraph { | ||
font-size: var(--lumo-font-size-m); | ||
margin-bottom: var(--lumo-space-m); | ||
max-width: 40em; | ||
} | ||
|
1 change: 1 addition & 0 deletions
1
user-interface/frontend/themes/datamanager/components/custom.css
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,3 @@ | ||
@import "theme-editor.css"; | ||
@import "components/custom.css"; | ||
@import "components/vaadin-custom.css"; | ||
@import "components/vaadin-custom.css"; |
Binary file not shown.
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
24 changes: 24 additions & 0 deletions
24
user-interface/src/main/java/life/qbic/datamanager/views/MeasurementType.java
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 |
---|---|---|
@@ -0,0 +1,24 @@ | ||
package life.qbic.datamanager.views; | ||
|
||
/** | ||
* <b>Measurement Type</b> | ||
* <p> | ||
* Some controlled enum vocabulary for different measurement types to use in the frontend part of | ||
* the application. | ||
* | ||
* @since 1.6.0 | ||
*/ | ||
public enum MeasurementType { | ||
PROTEOMICS("Proteomics"), | ||
GENOMICS("Genomics"); | ||
|
||
private final String type; | ||
|
||
MeasurementType(String type) { | ||
this.type = type; | ||
} | ||
|
||
public String getType() { | ||
return type; | ||
} | ||
} |
42 changes: 42 additions & 0 deletions
42
user-interface/src/main/java/life/qbic/datamanager/views/TagFactory.java
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 |
---|---|---|
@@ -0,0 +1,42 @@ | ||
package life.qbic.datamanager.views; | ||
|
||
import life.qbic.datamanager.views.general.Tag; | ||
import life.qbic.datamanager.views.general.Tag.TagColor; | ||
|
||
/** | ||
* <b>Tag Factory</b> | ||
* | ||
* <p>Create display tags for all thinkable use cases.</p> | ||
* | ||
* @since 1.6.0 | ||
*/ | ||
public class TagFactory { | ||
|
||
private TagFactory() {} | ||
|
||
public static Tag forMeasurement(MeasurementType measurementType) { | ||
return switch (measurementType) { | ||
case GENOMICS -> pinkTag("Genomics"); | ||
case PROTEOMICS -> violetTag("Proteomics"); | ||
}; | ||
} | ||
|
||
public static Tag forCustom(String label, TagColor tagColor) { | ||
return tagWithColor(label, tagColor); | ||
} | ||
|
||
private static Tag tagWithColor(String label, TagColor color) { | ||
var tag = new Tag(label); | ||
tag.setTagColor(color); | ||
return tag; | ||
} | ||
|
||
private static Tag violetTag(String label) { | ||
return tagWithColor(label, TagColor.VIOLET); | ||
} | ||
|
||
private static Tag pinkTag(String label) { | ||
return tagWithColor(label, TagColor.PINK); | ||
} | ||
|
||
} |
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.
I'm unclear on the purpose of the all.css class?
I guess that we're moving into having all css into a singular file as @KochTobi suggested or is it css classes that are used in general components? Maybe a small comment would help her?