Merge pull request #46 from ronger-x/master

🐛 fix query is not defined
This commit is contained in:
ronger 2022-10-11 11:15:09 +08:00 committed by GitHub
commit 899065c56b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 44 additions and 3 deletions

View File

@ -34,7 +34,6 @@ jobs:
path: /root/.npm path: /root/.npm
timeout: 3600 timeout: 3600
- name: Build Docker Image - name: Build Docker Image
jobExecutor: internal
steps: steps:
- !CheckoutStep - !CheckoutStep
name: Checkout Code name: Checkout Code
@ -47,6 +46,7 @@ jobs:
tags: rymcu/nebula:latest tags: rymcu/nebula:latest
publish: false publish: false
condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
jobExecutor: internal
triggers: triggers:
- !TagCreateTrigger - !TagCreateTrigger
projects: nebula projects: nebula
@ -56,3 +56,44 @@ jobs:
cpuRequirement: 250 cpuRequirement: 250
memoryRequirement: 256 memoryRequirement: 256
timeout: 3600 timeout: 3600
- name: Pull from GitHub
steps:
- !PullRepository
name: Pull from GitHub
remoteUrl: https://github.com/ronger-x/nebula
syncToChildProject: false
passwordSecret: access_token
refs: refs/heads/* refs/tags/*
withLfs: false
force: false
condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
triggers:
- !ScheduleTrigger
cronExpression: 0 0 1 * * ?
projects: nebula
retryCondition: never
maxRetries: 3
retryDelay: 30
cpuRequirement: 250
memoryRequirement: 256
timeout: 3600
- name: Push to GitHub
steps:
- !PushRepository
name: Push to GitHub
remoteUrl: https://github.com/ronger-x/nebula
passwordSecret: access_token
withLfs: false
force: false
condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
triggers:
- !BranchUpdateTrigger
projects: nebula
- !TagCreateTrigger
projects: nebula
retryCondition: never
maxRetries: 3
retryDelay: 30
cpuRequirement: 250
memoryRequirement: 256
timeout: 3600

View File

@ -17,7 +17,7 @@ export default {
name: "Portfolios", name: "Portfolios",
components: {PortfolioList}, components: {PortfolioList},
fetch() { fetch() {
let {store, params, error} = this.$nuxt.context let {store, query, error} = this.$nuxt.context
return Promise.all([ return Promise.all([
store store
.dispatch('portfolio/fetchList', {page: query.page || 1}) .dispatch('portfolio/fetchList', {page: query.page || 1})

View File

@ -14,7 +14,7 @@ export default {
name: "products", name: "products",
components: {ProductList}, components: {ProductList},
fetch() { fetch() {
let {store, params, error} = this.$nuxt.context let {store, query, error} = this.$nuxt.context
return Promise.all([ return Promise.all([
store store
.dispatch('product/fetchList', {page: query.page || 1}) .dispatch('product/fetchList', {page: query.page || 1})