Skip to content

fix(settings): apps list layout #44236

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

Merged
skjnldsv merged 11 commits into from
Mar 19, 2024
Merged

fix(settings): apps list layout #44236

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
af61611
fix(settings): use correct dynamic component load for apps/users
ShGKme Mar 13, 2024
295b7cb
fix(settings): apps list layout on mobile
ShGKme Mar 15, 2024
31baf8d
refactor(settings): remove unneeded classes from hidden header
ShGKme Mar 13, 2024
eac928a
refactor(settings): remove unused styles from apps settings
ShGKme Mar 13, 2024
d181a82
refactor(settings): move apps list styles to components
ShGKme Mar 13, 2024
17c865d
refactor(settings): use more BEM styles in apps settings
ShGKme Mar 15, 2024
73dec20
refactor(settings): move AppItem styles to AppItem component
ShGKme Mar 15, 2024
a173f90
fix(settings): app list scroll on Safari
ShGKme Mar 16, 2024
9397599
fix(settings): make apps list search result valid table
ShGKme Mar 18, 2024
127e361
test(settings): adjust e2e tests selectors to new structure
ShGKme Mar 18, 2024
3ff6211
chore(assets): Recompile assets
ShGKme Mar 16, 2024
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
Prev Previous commit
Next Next commit
refactor(settings): move AppItem styles to AppItem component 
Signed-off-by: Grigorii K. Shartsev <[email protected]>
  • Loading branch information
@ShGKme
ShGKme committed Mar 19, 2024
commit 73dec209037ef281afa2362ee9b17ff1afede661
172 changes: 1 addition & 171 deletions apps/settings/src/components/AppList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
:class="{
'apps-list--list-view': (useBundleView || useListView),
'apps-list--store-view': useAppStoreView,
'apps-list--with-sidebar': !!selectedApp,
}">
<template v-if="useListView">
<div v-if="showUpdateAll" class="apps-list__toolbar">
Expand Down Expand Up @@ -212,6 +211,7 @@ export default {
// An app level of `200` will be set for apps featured on the app store
return apps.filter(app => app.level === 200)
}

// filter app store categories
return apps.filter(app => {
return app.appstore && app.category !== undefined
Expand Down Expand Up @@ -241,9 +241,6 @@ export default {
return false
})
},
selectedApp() {
return this.apps.find(app => app.id === this.$route.params.id)
},
useAppStoreView() {
return !this.useListView && !this.useBundleView
},
Expand Down Expand Up @@ -318,9 +315,6 @@ export default {
</script>

<style lang="scss" scoped>
@use '../../../../core/css/variables.scss' as variables;
@use 'sass:math';

$toolbar-padding: 8px;
$toolbar-height: 44px + $toolbar-padding * 2;

Expand Down Expand Up @@ -354,118 +348,18 @@ $toolbar-height: 44px + $toolbar-padding * 2;

&--list-view {
margin-bottom: 100px;

:deep(.app-item) {
display: table-row;
padding: 0;
margin: 0;

> * {
display: table-cell;
height: initial;
vertical-align: middle;
float: none;
border-bottom: 1px solid var(--color-border);
padding: 6px;
box-sizing: border-box;
}

> .app-actions {
display: flex;
gap: 8px;
flex-wrap: wrap;
justify-content: end;
}

&.app-item--selected {
background-color: var(--color-background-dark);
}
}

:deep(.app-image) {
width: 44px;
height: auto;
text-align: right;
}

:deep(.app-image-icon svg),
:deep(.app-image-icon .icon-settings-dark) {
margin-top: 5px;
width: 20px;
height: 20px;
opacity: .5;
background-size: cover;
display: inline-block;
}

:deep(.app-actions) {
text-align: right;

.icon-loading-small {
display: inline-block;
top: 4px;
margin-right: 10px;
}
}
}

&__list-container {
display: table;
width: 100%;
height: auto;
white-space: normal;
}

&--store-view {
:deep(.app-item) {
border: 0;
padding: 30px;
}

:deep(.app-name) {
display: block;
margin: 5px 0;
}

:deep(.app-image-icon .icon-settings-dark) {
width: 100%;
height: 150px;
background-size: 45px;
opacity: 0.5;
}

:deep(.app-actions) {
margin-top: 10px;

button {
margin: 10px 0;
}
}

:deep(.app-image-icon svg) {
position: absolute;
bottom: 43px;
/* position halfway vertically */
width: 64px;
height: 64px;
opacity: .1;
}
}

&__store-container {
display: flex;
flex-wrap: wrap;
}

:deep(.app-item) {
position: relative;
flex: 0 0 auto;

&:hover {
background-color: var(--color-background-dark);
}
}

&__bundle-heading {
display: flex;
align-items: center;
Expand All @@ -488,68 +382,4 @@ $toolbar-height: 44px + $toolbar-padding * 2;
}
}
}

@media only screen and (min-width: 1601px) {
.apps-list--store-view .app-item {
width: 25%;
}
.apps-list--with-sidebar.apps-list--store-view .app-item {
width: 33%;
}
}

@media only screen and (max-width: 1600px) {
.apps-list--store-view .app-item {
width: 25%;
}
.apps-list--with-sidebar.apps-list--store-view .app-item {
width: 33%;
}
}

@media only screen and (max-width: 1400px) {
.apps-list--store-view .app-item {
width: 33%;
}
.apps-list--with-sidebar.apps-list--store-view .app-item {
width: 50%;
}
}

@media only screen and (max-width: 900px) {
.apps-list--store-view .app-item {
width: 50%;
}
.apps-list--with-sidebar.apps-list--store-view .app-item {
width: 100%;
}
}

@media only screen and (max-width: variables.$breakpoint-mobile) {
.apps-list--store-view .app-item {
width: 50%;
}
}

@media only screen and (max-width: 480px) {
.apps-list--store-view .app-item {
width: 100%;
}
}

/* hide app version and level on narrower screens */
@media only screen and (max-width: 900px) {
.apps-list--list-view {
:deep(.app-version), :deep(.app-level) {
display: none !important;
}
}
}

// Display buttons above each other on mobile
@media (max-width: math.div(variables.$breakpoint-mobile, 2)) {
.apps-list--list-view .app-item > :deep(.app-actions) {
display: table-cell;
}
}
</style>
137 changes: 134 additions & 3 deletions apps/settings/src/components/AppList/AppItem.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
'app-item--list-view': listView,
'app-item--store-view': !listView,
'app-item--selected': isSelected,
'app-item--with-sidebar': withSidebar,
}">
<component :is="dataItemTag"
class="app-image app-image-icon"
Expand Down Expand Up @@ -172,6 +173,9 @@ export default {
dataItemTag() {
return this.listView ? 'td' : 'div'
},
withSidebar() {
return !!this.$route.params.id
},
},
watch: {
'$route.params.id'(id) {
Expand Down Expand Up @@ -204,6 +208,133 @@ export default {
</script>

<style scoped lang="scss">
@use '../../../../../core/css/variables.scss' as variables;
Copy link
Contributor

@susnux susnux Mar 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They are deprecated it feels not right to still use them as we probably want to get rid of them soon.

Copy link
Contributor Author

@ShGKme ShGKme Mar 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Without PostCSS, would you prefer to use just constant numbers in @media queries?


.app-item {
position: relative;

&:hover {
background-color: var(--color-background-dark);
}

&--list-view {
&.app-item--selected {
background-color: var(--color-background-dark);
}

> * {
vertical-align: middle;
border-bottom: 1px solid var(--color-border);
padding: 6px;
}

.app-image {
width: 44px;
height: auto;
text-align: right;
}

.app-image-icon svg,
.app-image-icon .icon-settings-dark {
margin-top: 5px;
width: 20px;
height: 20px;
opacity: .5;
background-size: cover;
display: inline-block;
}

.app-actions {
display: flex;
gap: 8px;
flex-wrap: wrap;
justify-content: end;

.icon-loading-small {
display: inline-block;
top: 4px;
margin-right: 10px;
}
}

/* hide app version and level on narrower screens */
@media only screen and (max-width: 900px) {
.app-version,
.app-level {
display: none !important;
}
}
}

&--store-view {
padding: 30px;

.app-image-icon .icon-settings-dark {
width: 100%;
height: 150px;
background-size: 45px;
opacity: 0.5;
}

.app-image-icon svg {
position: absolute;
bottom: 43px;
/* position halfway vertically */
width: 64px;
height: 64px;
opacity: .1;
}

.app-name {
margin: 5px 0;
}

.app-actions {
margin: 10px 0;
}

@media only screen and (min-width: 1601px) {
width: 25%;

&.app-item--with-sidebar {
width: 33%;
}
}

@media only screen and (max-width: 1600px) {
width: 25%;

&.app-item--with-sidebar {
width: 33%;
}
}

@media only screen and (max-width: 1400px) {
width: 33%;

&.app-item--with-sidebar {
width: 50%;
}
}

@media only screen and (max-width: 900px) {
width: 50%;

&.app-item--with-sidebar {
width: 100%;
}
}

@media only screen and (max-width: variables.$breakpoint-mobile) {
width: 50%;
}

@media only screen and (max-width: 480px) {
width: 100%;
}
}
}

.app-icon {
filter: var(--background-invert-if-bright);
}
Expand All @@ -213,10 +344,10 @@ export default {
height: 150px;
opacity: 1;
overflow: hidden;
}

.app-image img {
width: 100%;
img {
width: 100%;
}
}

.app-name--link::after {
Expand Down