Skip to content

Commit

Permalink
use nc/vue 8.14.0, make some adjustments, bump min NC version to 30
Browse files Browse the repository at this point in the history
Signed-off-by: Julien Veyssier <julien-nc@posteo.net>
  • Loading branch information
julien-nc committed Jul 4, 2024
1 parent edc9acd commit c8f0a39
Show file tree
Hide file tree
Showing 9 changed files with 2,486 additions and 1,125 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/phpunit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ jobs:
strategy:
fail-fast: false
matrix:
php-versions: ['8.1', '8.2']
server-versions: ['stable27', 'master']
php-versions: ['8.1', '8.2', '8.3']
server-versions: ['master']
databases: ['sqlite', 'mysql', 'pgsql']
#php-versions: ['8.2']
#databases: ['sqlite']
Expand Down
2 changes: 1 addition & 1 deletion appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<screenshot>https://github.com/julien-nc/cospend-nc/raw/main/img/screenshots/cospend3.jpg</screenshot>
<screenshot>https://github.com/julien-nc/cospend-nc/raw/main/img/screenshots/cospend4.jpg</screenshot>
<dependencies>
<nextcloud min-version="27" max-version="30"/>
<nextcloud min-version="30" max-version="30"/>
</dependencies>
<background-jobs>
<job>OCA\Cospend\Cron\RepeatBills</job>
Expand Down
3,578 changes: 2,468 additions & 1,110 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
"chart.js": "^3.9.1",
"kjua-svg": "^1.13.1",
"sass": "^1.54.5",
"stylelint": "^16.5.0",
"vue": "^2.7.13",
"vue-awesome-countdown": "^1.1.4",
"vue-chartjs": "^4.1.1",
Expand All @@ -69,6 +68,7 @@
"@nextcloud/stylelint-config": "^3.0.1",
"@nextcloud/webpack-vue-config": "^6.0.0",
"eslint-webpack-plugin": "^4.0.0",
"stylelint": "^16.5.0",
"stylelint-webpack-plugin": "^5.0.0"
}
}
1 change: 1 addition & 0 deletions src/BillForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -1900,6 +1900,7 @@ button {
.field-with-info {
display: flex;
align-items: center;
}
.field-with-info select,
Expand Down
4 changes: 1 addition & 3 deletions src/components/AppNavigationProjectItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -295,9 +295,7 @@ export default {

<style scoped lang="scss">
.memberItem {
height: 44px;
// padding-left: 30px !important;
padding-right: 0 !important;
padding-left: 20px !important;
}
::v-deep .detailButton {
Expand Down
15 changes: 11 additions & 4 deletions src/components/BillListItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,9 @@
</NcActionButton>
</template>
<template #extra>
<div v-if="editionAccess && selectMode" class="icon-selector">
<div v-if="editionAccess && selectMode"
class="icon-selector"
@click="onItemClick">
<CheckboxMarkedIcon v-if="selected" class="selected" :size="20" />
<CheckboxBlankOutlineIcon v-else :size="20" />
</div>
Expand Down Expand Up @@ -352,12 +354,17 @@ export default {
}
.icon-selector {
cursor: pointer !important;
display: flex;
justify-content: right;
padding-right: 8px;
padding-right: 0px;
position: absolute;
right: 14px;
bottom: 12px;
right: 0px;
bottom: 15px;
> * {
cursor: pointer !important;
}
}
.subname {
Expand Down
1 change: 1 addition & 0 deletions src/components/SettingsTabSidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -553,6 +553,7 @@ export default {
.renameProject {
display: flex;
align-items: center;
input[type='text'] {
flex-grow: 1;
}
Expand Down
4 changes: 0 additions & 4 deletions stylelint.config.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
module.exports = {
extends: 'stylelint-config-recommended-vue',
rules: {
indentation: 'tab',
'selector-type-no-unknown': null,
'number-leading-zero': null,
'rule-empty-line-before': [
'always',
{
Expand All @@ -18,9 +16,7 @@ module.exports = {
],
'comment-empty-line-before': null,
'selector-type-case': null,
'selector-list-comma-newline-after': null,
'no-descending-specificity': null,
'string-quotes': 'single',
'selector-pseudo-element-no-unknown': [
true,
{
Expand Down

0 comments on commit c8f0a39

Please sign in to comment.