Skip to content

Commit

Permalink
Remake group and quota details section with Vue
Browse files Browse the repository at this point in the history
Signed-off-by: Christopher Ng <[email protected]>
  • Loading branch information
Pytal committed Aug 12, 2022
1 parent 257ab46 commit e5c81e9
Show file tree
Hide file tree
Showing 14 changed files with 144 additions and 93 deletions.
22 changes: 0 additions & 22 deletions apps/settings/css/settings.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apps/settings/css/settings.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 0 additions & 28 deletions apps/settings/css/settings.scss
Original file line number Diff line number Diff line change
Expand Up @@ -342,30 +342,6 @@ select {
}
}


#body-settings #quota {
cursor: default;
position: relative;

progress {
height: 6px;

&::-moz-progress-bar {
border-radius: 3px 0 0 3px;
}

&::-webkit-progress-value {
border-radius: 3px 0 0 3px;
}
}

div {
font-weight: normal;
white-space: nowrap;
}
}


/* verify accounts */
/* only show pointer cursor when popup will be there */
.verification-dialog {
Expand Down Expand Up @@ -454,10 +430,6 @@ select {
}
}

#groups-groups {
padding-top: 5px;
}

.clientsbox img {
height: 60px;
}
Expand Down
10 changes: 5 additions & 5 deletions apps/settings/lib/Settings/Personal/PersonalInfo.php
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,6 @@ public function getForm(): TemplateResponse {
$messageParameters = $this->getMessageParameters($account);

$parameters = [
'total_space' => $totalSpace,
'usage' => \OC_Helper::humanFileSize($storageInfo['used']),
'usage_relative' => round($storageInfo['relative']),
'quota' => $storageInfo['quota'],
'avatarChangeSupported' => $user->canChangeAvatar(),
'federationEnabled' => $federationEnabled,
'lookupServerUploadEnabled' => $lookupServerUploadEnabled,
Expand All @@ -154,13 +150,17 @@ public function getForm(): TemplateResponse {
'website' => $account->getProperty(IAccountManager::PROPERTY_WEBSITE)->getValue(),
'websiteScope' => $account->getProperty(IAccountManager::PROPERTY_WEBSITE)->getScope(),
'websiteVerification' => $account->getProperty(IAccountManager::PROPERTY_WEBSITE)->getVerified(),
'groups' => $this->getGroups($user),
'isFairUseOfFreePushService' => $this->isFairUseOfFreePushService(),
'profileEnabledGlobally' => $this->profileManager->isProfileEnabled(),
] + $messageParameters + $localeParameters;

$personalInfoParameters = [
'userId' => $uid,
'groups' => $this->getGroups($user),
'quota' => $storageInfo['quota'],
'totalSpace' => $totalSpace,
'usage' => \OC_Helper::humanFileSize($storageInfo['used']),
'usageRelative' => round($storageInfo['relative']),
'displayName' => $this->getProperty($account, IAccountManager::PROPERTY_DISPLAYNAME),
'twitter' => $this->getProperty($account, IAccountManager::PROPERTY_TWITTER),
'emailMap' => $this->getEmailMap($account),
Expand Down
124 changes: 124 additions & 0 deletions apps/settings/src/components/PersonalInfo/DetailsSection.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
<!--
- @copyright 2022 Christopher Ng <chrng8@gmail.com>
-
- @author Christopher Ng <[email protected]>
-
- @license AGPL-3.0-or-later
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation, either version 3 of the
- License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-->

<template>
<section>
<HeaderBar :readable="t('settings', 'Details')" />

<div class="details">
<div class="details__groups">
<Account :size="20" />
<div class="details__groups-info">
<p>{{ t('settings', 'You are a member of the following groups:') }}</p>
<p class="details__groups-list">{{ groups.join(', ') }}</p>
</div>
</div>
<div class="details__quota">
<CircleSlice :size="20" />
<div class="details__quota-info">
<p class="details__quota-text" v-html="quotaText" />
<ProgressBar size="medium"
:value="usageRelative"
:error="usageRelative > 80" />
</div>
</div>
</div>
</section>
</template>

<script>
import { loadState } from '@nextcloud/initial-state'
import ProgressBar from '@nextcloud/vue/dist/Components/ProgressBar'

import Account from 'vue-material-design-icons/Account'
import CircleSlice from 'vue-material-design-icons/CircleSlice3'

import HeaderBar from './shared/HeaderBar.vue'

/** SYNC to be kept in sync with `lib/public/Files/FileInfo.php` */
const SPACE_UNLIMITED = -3

const { groups, quota, totalSpace, usage, usageRelative } = loadState('settings', 'personalInfoParameters', {})

export default {
name: 'DetailsSection',

components: {
Account,
CircleSlice,
HeaderBar,
ProgressBar,
},

computed: {
quotaText() {
if (quota === SPACE_UNLIMITED) {
return t('settings', 'You are using <strong>{usage}</strong>', { usage })
}
return t(
'settings',
'You are using <strong>{usage}</strong> of <strong>{totalSpace}</strong> (<strong>{usageRelative} %</strong>)',
{ usage, totalSpace, usageRelative },
)
}
},

data() {
return {
groups,
usageRelative,
}
},
}
</script>

<style lang="scss" scoped>
.details {
display: flex;
flex-direction: column;
margin: 10px 32px 10px 0;
gap: 16px 0;
color: var(--color-text-lighter);

&__groups,
&__quota {
display: flex;
gap: 0 10px;

&-info {
display: flex;
flex-direction: column;
width: 100%;
gap: 4px 0;
}

&-list {
font-weight: bold;
}

&::v-deep .material-design-icon {
align-self: flex-start;
margin-top: 2px;
}
}
}
</style>
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ import FederationControl from './FederationControl.vue'

import {
ACCOUNT_PROPERTY_READABLE_ENUM,
ACCOUNT_SETTING_PROPERTY_READABLE_ENUM,
PROFILE_READABLE_ENUM,
} from '../../../constants/AccountPropertyConstants.js'

Expand All @@ -77,7 +76,6 @@ export default {
readable: {
type: String,
required: true,
validator: (value) => Object.values(ACCOUNT_PROPERTY_READABLE_ENUM).includes(value) || Object.values(ACCOUNT_SETTING_PROPERTY_READABLE_ENUM).includes(value) || value === PROFILE_READABLE_ENUM.PROFILE_VISIBILITY,
},
inputId: {
type: String,
Expand Down Expand Up @@ -109,7 +107,7 @@ export default {
},

isSettingProperty() {
return Object.values(ACCOUNT_SETTING_PROPERTY_READABLE_ENUM).includes(this.readable)
return !Object.values(ACCOUNT_PROPERTY_READABLE_ENUM).includes(this.readable) && !Object.values(PROFILE_READABLE_ENUM).includes(this.readable)
},
},

Expand Down
Loading

0 comments on commit e5c81e9

Please sign in to comment.