Browse Source

fix refresh & update workflow

update/libraries
dskvr 2 years ago
parent
commit
7444da8764
  1. 7
      .github/workflows/deploy.yml
  2. 1
      nginx/conf.d/default.conf
  3. 9
      src/components/RefreshComponent.vue

7
.github/workflows/deploy.yml

@ -31,9 +31,12 @@ jobs:
run: yarn docker:push run: yarn docker:push
- name: Pull new image and restart - name: Pull new image and restart
uses: appleboy/ssh-action@v0.1.2 uses: appleboy/ssh-action@v0.1.6
with: with:
host: ${{secrets.SSH_DEPLOY_HOST}} host: ${{secrets.SSH_DEPLOY_HOST}}
key: ${{secrets.SSH_DEPLOY_KEY}} key: ${{secrets.SSH_DEPLOY_KEY}}
username: deploy username: deploy
script: docker pull registry.digitalocean.com/sandwich-farm/nostr-relay-status:latest && docker-compose stop && docker-compose up -d script: |
docker pull registry.digitalocean.com/sandwich-farm/nostr-relay-status:latest
docker-compose stop
docker-compose up -d

1
nginx/conf.d/default.conf

@ -9,7 +9,6 @@ server {
} }
location ~ /?(.*)$ { location ~ /?(.*)$ {
index index.html; index index.html;
} }
} }

9
src/components/RefreshComponent.vue

@ -27,13 +27,12 @@ const localMethods = {
}, },
setRefreshInterval: function(){ setRefreshInterval: function(){
this.interval = setInterval(() => { this.interval = setInterval(() => {
if(!this.preferences.refresh) return false
this.preferences = this.getState('preferences') || this.preferences this.preferences = this.getState('preferences') || this.preferences
this.refreshData.untilNext = this.timeUntilRefresh() this.refreshData.untilNext = this.timeUntilRefresh()
this.refreshData.sinceLast = this.timeSinceRefresh() this.refreshData.sinceLast = this.timeSinceRefresh()
if(this.isExpired()) if(this.isExpired() && this.preferences.refresh)
this.invalidate() this.invalidate()
}, 1000) }, 1000)
@ -53,8 +52,7 @@ export default defineComponent({
sinceLast: this.timeSinceRefresh() sinceLast: this.timeSinceRefresh()
}) })
if(this.preferences.refresh) this.setRefreshInterval()
this.setRefreshInterval()
}, },
updated(){ updated(){
this.saveState('preferences') this.saveState('preferences')
@ -66,9 +64,6 @@ export default defineComponent({
this.refreshData.untilNext = this.timeUntilRefresh() this.refreshData.untilNext = this.timeUntilRefresh()
this.refreshData.sinceLast = this.timeSinceRefresh() this.refreshData.sinceLast = this.timeSinceRefresh()
if(this.preferences.refresh)
this.setRefreshInterval()
}, },
computed: {}, computed: {},
methods: Object.assign(localMethods, sharedMethods), methods: Object.assign(localMethods, sharedMethods),

Loading…
Cancel
Save