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): use more BEM styles in apps settings 
Signed-off-by: Grigorii K. Shartsev <[email protected]>
  • Loading branch information
@ShGKme
ShGKme committed Mar 19, 2024
commit 17c865d910402ed42d77f8f19512210ef36949b1
194 changes: 100 additions & 94 deletions apps/settings/src/components/AppList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,16 @@
-->

<template>
<div id="app-content-inner" class="{ 'with-app-sidebar': !!selectedApp }">
<div id="apps-list" class="apps-list" :class="{installed: (useBundleView || useListView), store: useAppStoreView }">
<div id="app-content-inner">
<div id="apps-list"
class="apps-list"
: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="toolbar">
<div v-if="showUpdateAll" class="apps-list__toolbar">
{{ n('settings', '%n app has an update available', '%n apps have an update available', counter) }}
<NcButton v-if="showUpdateAll"
id="app-list-update-all"
Expand All @@ -34,11 +40,11 @@
</NcButton>
</div>

<div v-if="!showUpdateAll" class="toolbar">
<div v-if="!showUpdateAll" class="apps-list__toolbar">
{{ t('settings', 'All apps are up-to-date.') }}
</div>

<transition-group name="app-list" tag="table" class="apps-list-container">
<TransitionGroup name="apps-list" tag="table" class="apps-list__list-container">
<tr key="app-list-view-header">
<th>
<span class="hidden-visually">{{ t('settings', 'Icon') }}</span>
Expand All @@ -60,11 +66,11 @@
:key="app.id"
:app="app"
:category="category" />
</transition-group>
</TransitionGroup>
</template>

<table v-if="useBundleView"
class="apps-list-container">
class="apps-list__list-container">
<tr key="app-list-view-header">
<th id="app-table-col-icon">
<span class="hidden-visually">{{ t('settings', 'Icon') }}</span>
Expand All @@ -85,8 +91,8 @@
<template v-for="bundle in bundles">
<tr :key="bundle.id">
<th :id="`app-table-rowgroup-${bundle.id}`" colspan="5" scope="rowgroup">
<div class="app-bundle-heading">
<span class="app-bundle-header">
<div class="apps-list__bundle-heading">
<span class="apps-list__bundle-header">
{{ bundle.name }}
</span>
<NcButton type="secondary" @click="toggleBundle(bundle.id)">
Expand All @@ -103,7 +109,7 @@
:category="category" />
</template>
</table>
<ul v-if="useAppStoreView" class="apps-store-view">
<ul v-if="useAppStoreView" class="apps-list__store-container">
<AppItem v-for="app in apps"
:key="app.id"
:app="app"
Expand All @@ -112,10 +118,10 @@
</ul>
</div>

<div id="apps-list-search" class="apps-list installed">
<div class="apps-list-container">
<div id="apps-list-search" class="apps-list apps-list--list-view">
<div class="apps-list__list-container">
<template v-if="search !== '' && searchApps.length > 0">
<div class="section">
<div class="app-item">
<div />
<td colspan="5">
<h2>{{ t('settings', 'Results from other categories') }}</h2>
Expand Down Expand Up @@ -318,47 +324,21 @@ export default {
$toolbar-padding: 8px;
$toolbar-height: 44px + $toolbar-padding * 2;

#apps-list.store {
.section {
border: 0;
}

: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(.actions) {
margin-top: 10px;

button {
margin: 10px 0;
}
}
}

.apps-list {
display: flex;
flex-wrap: wrap;
align-content: flex-start;

// For transition group
.app-list-move {
&--move {
transition: transform 1s;
}

#app-list-update-all {
margin-left: 10px;
}

.toolbar {
&__toolbar {
height: $toolbar-height;
padding: $toolbar-padding;
// Leave room for app-navigation-toggle
Expand All @@ -372,18 +352,10 @@ $toolbar-height: 44px + $toolbar-padding * 2;
align-items: center;
}

// Installed = list/bundle view in a table, not cards in store view
&.installed {
&--list-view {
margin-bottom: 100px;

.apps-list-container {
display: table;
width: 100%;
height: auto;
white-space: normal;
}

:deep(.section) {
:deep(.app-item) {
display: table-row;
padding: 0;
margin: 0;
Expand All @@ -398,14 +370,14 @@ $toolbar-height: 44px + $toolbar-padding * 2;
box-sizing: border-box;
}

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

&.selected {
&.app-item--selected {
background-color: var(--color-background-dark);
}
}
Expand All @@ -426,7 +398,7 @@ $toolbar-height: 44px + $toolbar-padding * 2;
display: inline-block;
}

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

.icon-loading-small {
Expand All @@ -437,103 +409,137 @@ $toolbar-height: 44px + $toolbar-padding * 2;
}
}

&:not(.installed) :deep(.app-image-icon svg) {
position: absolute;
bottom: 43px;
/* position halfway vertically */
width: 64px;
height: 64px;
opacity: .1;
&__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(.section) {
:deep(.app-item) {
position: relative;
flex: 0 0 auto;

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

&__bundle-heading {
display: flex;
align-items: center;
margin: 20px 10px 20px 0;
}

&__bundle-header {
margin: 0 10px 0 50px;
font-weight: bold;
font-size: 20px;
line-height: 30px;
color: var(--color-text-light);
}
}

#apps-list-search {
.section {
.app-item {
h2 {
margin-bottom: 0;
}
}
}

.app-bundle-heading {
display: flex;
align-items: center;
margin: 20px 10px 20px 0;
}

.app-bundle-header {
margin: 0 10px 0 50px;
font-weight: bold;
font-size: 20px;
line-height: 30px;
color: var(--color-text-light);
}

.apps-store-view {
display: flex;
flex-wrap: wrap;
}

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

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

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

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

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

@media only screen and (max-width: 480px) {
.store .section {
.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.installed {
.apps-list--list-view {
:deep(.app-version), :deep(.app-level) {
display: none !important;
}
Expand All @@ -542,7 +548,7 @@ $toolbar-height: 44px + $toolbar-padding * 2;

// Display buttons above each other on mobile
@media (max-width: math.div(variables.$breakpoint-mobile, 2)) {
.apps-list.installed .section > :deep(.actions) {
.apps-list--list-view .app-item > :deep(.app-actions) {
display: table-cell;
}
}
Expand Down
10 changes: 7 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 @@ -22,8 +22,12 @@

<template>
<component :is="listView ? `tr` : `li`"
class="section"
:class="{ selected: isSelected }">
class="app-item"
:class="{
'app-item--list-view': listView,
'app-item--store-view': !listView,
'app-item--selected': isSelected,
}">
<component :is="dataItemTag"
class="app-image app-image-icon"
:headers="getDataItemHeaders(`app-table-col-icon`)">
Expand Down Expand Up @@ -77,7 +81,7 @@
<AppLevelBadge :level="app.level" />
<AppScore v-if="hasRating && !listView" :score="app.score" />
</component>
<component :is="dataItemTag" :headers="getDataItemHeaders(`app-table-col-actions`)" class="actions">
<component :is="dataItemTag" :headers="getDataItemHeaders(`app-table-col-actions`)" class="app-actions">
<div v-if="app.error" class="warning">
{{ app.error }}
</div>
Expand Down