Skip to content
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

Jump to bottom

Fix of the build environment and the import Vue component #1442

Merged
merged 4 commits into from Jan 14, 2023
Merged

Fix of the build environment and the import Vue component #1442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b2148c1
Make Vue app compile again
christianlupus Jan 14, 2023
51225df
Remove native event handling and use Vue events for input text
christianlupus Jan 14, 2023
c1b55a5
Update changelog
christianlupus Jan 14, 2023
771f6f6
Fix appinfo dist file
christianlupus Jan 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/deploy/appinfo/info.xml.dist
View file
Open in desktop
Expand Up @@ -20,7 +20,7 @@
<screenshot>https://raw.githubusercontent.com/nextcloud/cookbook/stable/img/screenshot2.png</screenshot>
<dependencies>
<php min-version="7.4"/>
<nextcloud min-version="25" max-version="25"/>
<nextcloud min-version="25" max-version="26"/>
</dependencies>
<navigations>
<navigation>
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Expand Up @@ -3,12 +3,16 @@
### Fixed
- Make "None" category string translatable
[#1323](https://github.com/nextcloud/cookbook/pull/1344) @seyfeb
- Import was no longer possible as the handling of native events caused a glitch
[#1442](https://github.com/nextcloud/cookbook/pull/1442) @christianlupus

### Maintenance
- Update dependency for GitHub pages builder
- Fix package.json sort order
- Migrate the dev environment to [docker-dev by Julius Haertl](https://github.com/juliushaertl/nextcloud-docker-dev)
[#1440](https://github.com/nextcloud/cookbook/pull/1440) @christianlupus
- Fix the build environment after regression
[#1442](https://github.com/nextcloud/cookbook/pull/1442) @christianlupus

## Documentation
- Fixed some issues in the API description
Expand Down
2 changes: 1 addition & 1 deletion appinfo/info.xml
View file
Open in desktop
Expand Up @@ -20,7 +20,7 @@
<screenshot>https://raw.githubusercontent.com/nextcloud/cookbook/stable/img/screenshot2.png</screenshot>
<dependencies>
<php min-version="7.4"/>
<nextcloud min-version="25" max-version="25"/>
<nextcloud min-version="25" max-version="26"/>
</dependencies>
<navigations>
<navigation>
Expand Down
17 changes: 17 additions & 0 deletions package-lock.json
View file
Open in desktop

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

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Expand Up @@ -49,6 +49,7 @@
"vuex": "^3.1.3"
},
"devDependencies": {
"@nextcloud/browserslist-config": "^2.3.0",
"@nextcloud/stylelint-config": "^2.1.2",
"@nextcloud/webpack-vue-config": "^5.3.0",
"check-peer-dependencies": "^4.1.0",
Expand Down
9 changes: 7 additions & 2 deletions src/components/AppNavi.vue
View file
Open in desktop
Expand Up @@ -16,6 +16,7 @@
:disabled="downloading ? 'disabled' : null"
:icon="downloading ? 'icon-loading-small' : 'icon-download'"
@submit="downloadRecipe"
@update:value="updateUrl"
>
{{ t("cookbook", "Download recipe from URL") }}
</NcActionInput>
Expand Down Expand Up @@ -121,6 +122,7 @@ export default {
isCategoryUpdating: [],
loading: { categories: true },
uncatRecipes: 0,
importUrl: "",
}
},
computed: {
Expand Down Expand Up @@ -232,14 +234,17 @@ export default {
}
},

updateUrl(e) {
this.importUrl = e
},
/**
* Download and import the recipe at given URL
*/
async downloadRecipe(e) {
async downloadRecipe() {
this.downloading = true
const $this = this
try {
const response = await api.recipes.import(e.target[1].value)
const response = await api.recipes.import(this.importUrl)
const recipe = response.data
$this.downloading = false
helpers.goTo(`/recipe/${recipe.id}`)
Expand Down