From 578fc9fbe61919cc1de493eac7e4b2705aa27cfc Mon Sep 17 00:00:00 2001 From: elraphty Date: Tue, 30 Jan 2024 18:53:48 +0100 Subject: [PATCH 1/2] removed frontend build files --- .github/workflows/prjob_build.yml | 17 ----------------- .github/workflows/prjob_eslint.yml | 17 ----------------- .github/workflows/prjob_prettier.yml | 18 ------------------ 3 files changed, 52 deletions(-) delete mode 100644 .github/workflows/prjob_build.yml delete mode 100644 .github/workflows/prjob_eslint.yml delete mode 100644 .github/workflows/prjob_prettier.yml diff --git a/.github/workflows/prjob_build.yml b/.github/workflows/prjob_build.yml deleted file mode 100644 index e7aa1f9c5..000000000 --- a/.github/workflows/prjob_build.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: Build -on: - pull_request: - branches: - - master -jobs: - build: - name: build - runs-on: - - ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Install modules - run: yarn --cwd ./frontend/app install - - name: Build - run: CI=false yarn --cwd ./frontend/app run build - diff --git a/.github/workflows/prjob_eslint.yml b/.github/workflows/prjob_eslint.yml deleted file mode 100644 index 8f3247933..000000000 --- a/.github/workflows/prjob_eslint.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: Eslint -on: - pull_request: - branches: - - master -jobs: - eslint: - name: eslint - runs-on: - - ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Install modules - run: yarn --cwd ./frontend/app install - - name: Eslint - run: yarn --cwd ./frontend/app run lint - diff --git a/.github/workflows/prjob_prettier.yml b/.github/workflows/prjob_prettier.yml deleted file mode 100644 index bfd1431dd..000000000 --- a/.github/workflows/prjob_prettier.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: Prettier -on: - pull_request: - branches: - - master -jobs: - - prettier: - name: prettier - runs-on: - - ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Install modules - run: yarn --cwd ./frontend/app install - - name: Prettier - run: CI=false yarn --cwd ./frontend/app run prettier:check - From 453bc5586917c7cf0e8fd20f6ed711b8f13db779 Mon Sep 17 00:00:00 2001 From: elraphty Date: Tue, 30 Jan 2024 19:03:17 +0100 Subject: [PATCH 2/2] updated next and previous buttons to remove deleted bounty --- db/db.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/db/db.go b/db/db.go index 28e6d3017..772ce7426 100644 --- a/db/db.go +++ b/db/db.go @@ -643,25 +643,25 @@ func (db database) GetBountyById(id string) ([]Bounty, error) { func (db database) GetNextBountyById(id string) ([]Bounty, error) { ms := []Bounty{} - err := db.db.Raw(`SELECT * FROM public.bounty WHERE id > '` + id + `' ORDER BY id ASC LIMIT 1`).Find(&ms).Error + err := db.db.Raw(`SELECT * FROM public.bounty WHERE id > '` + id + `' AND show = true ORDER BY id ASC LIMIT 1`).Find(&ms).Error return ms, err } func (db database) GetPreviousBountyById(id string) ([]Bounty, error) { ms := []Bounty{} - err := db.db.Raw(`SELECT * FROM public.bounty WHERE id < '` + id + `' ORDER BY id DESC LIMIT 1`).Find(&ms).Error + err := db.db.Raw(`SELECT * FROM public.bounty WHERE id < '` + id + `' AND show = true ORDER BY id DESC LIMIT 1`).Find(&ms).Error return ms, err } func (db database) GetNextOrganizationBountyById(uuid string, id string) ([]Bounty, error) { ms := []Bounty{} - err := db.db.Raw(`SELECT * FROM public.bounty WHERE org_uuid = '` + uuid + `' AND id > '` + id + `' ORDER BY id ASC LIMIT 1`).Find(&ms).Error + err := db.db.Raw(`SELECT * FROM public.bounty WHERE org_uuid = '` + uuid + `' AND id > '` + id + `' AND show = true ORDER BY id ASC LIMIT 1`).Find(&ms).Error return ms, err } func (db database) GetPreviousOrganizationBountyById(uuid string, id string) ([]Bounty, error) { ms := []Bounty{} - err := db.db.Raw(`SELECT * FROM public.bounty WHERE org_uuid = '` + uuid + `' AND id < '` + id + `' ORDER BY id DESC LIMIT 1`).Find(&ms).Error + err := db.db.Raw(`SELECT * FROM public.bounty WHERE org_uuid = '` + uuid + `' AND id < '` + id + `' AND show = true ORDER BY id DESC LIMIT 1`).Find(&ms).Error return ms, err }