diff --git a/.circleci/config.yml b/.circleci/config.yml index 2d7b5b75..4c387387 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,9 +15,6 @@ jobs: executor: cider-ci steps: - checkout - - run: - name: Set App Version - command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1)" >> $BASH_ENV # - run: # name: Rename Repository # command: sed -i 's/github:ciderapp\/Cider/github:ciderapp\/cider-releases/' package.json @@ -45,6 +42,7 @@ jobs: root: . # Must be relative path from root paths: + - src - node_modules - build - resources @@ -155,6 +153,9 @@ jobs: mv ~/Cider/dist/*.blockmap ~/Cider/dist/artifacts - store_artifacts: path: ~/Cider/dist/artifacts + - run: + name: Set App Version + command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1)" >> $BASH_ENV - run: name: Publish Release command: | @@ -167,25 +168,25 @@ workflows: - prepare-build: filters: branches: - only: main + only: develop - build-windows: requires: - prepare-build filters: branches: - only: main + only: develop - build-linux: requires: - prepare-build filters: branches: - only: main + only: develop - build-winget: requires: - prepare-build filters: branches: - only: main + only: develop - release: requires: - build-windows @@ -193,4 +194,4 @@ workflows: - build-winget filters: branches: - only: main + only: develop diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml index c5d6402b..d18e0e23 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -1,7 +1,7 @@ name: Bug Report description: If you encounter an issue whilst using our app, please use this template to help improve the app. title: "[Bug]: " -labels: ["bug", "triage"] +labels: ["bug", "needs-triage"] assignees: [] body: - type: markdown diff --git a/.github/workflows/auto-project.yml b/.github/workflows/auto-project.yml new file mode 100644 index 00000000..742d82e1 --- /dev/null +++ b/.github/workflows/auto-project.yml @@ -0,0 +1,18 @@ +name: Add bugs to bugs project + +on: + issues: + types: + - opened + +jobs: + add-to-project: + name: Add issue to project + runs-on: ubuntu-latest + steps: + - uses: actions/add-to-project@main + with: + project-url: https://github.com/orgs/ciderapp/projects/5 + github-token: ${{ secrets.ADD_TO_PROJECT_PAT }} + labeled: bug, needs-triage + label-operator: OR diff --git a/.github/workflows/stale-issues.yml b/.github/workflows/stale-issues.yml new file mode 100644 index 00000000..923438ae --- /dev/null +++ b/.github/workflows/stale-issues.yml @@ -0,0 +1,20 @@ +name: 'Close stale issues and PRs' +on: + schedule: + - cron: '30 1 * * *' + +permissions: + issues: write + pull-requests: write + +jobs: + stale: + runs-on: ubuntu-latest + steps: + - uses: actions/stale@v4 + with: + stale-issue-message: 'This issue is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 7 days.' + days-before-stale: 30 + days-before-close: 7 + stale-issue-label: "stale" + stale-pr-label: "stale" diff --git a/Assets/Cider Icons/svg/cider-backward.svg b/Assets/Cider Icons/svg/cider-backward.svg new file mode 100644 index 00000000..e5801e05 --- /dev/null +++ b/Assets/Cider Icons/svg/cider-backward.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/Assets/Cider Icons/svg/cider-forward.svg b/Assets/Cider Icons/svg/cider-forward.svg new file mode 100644 index 00000000..41154a4c --- /dev/null +++ b/Assets/Cider Icons/svg/cider-forward.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/Assets/Cider Icons/svg/cider-pause.svg b/Assets/Cider Icons/svg/cider-pause.svg new file mode 100644 index 00000000..bcc4cf53 --- /dev/null +++ b/Assets/Cider Icons/svg/cider-pause.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/Assets/Cider Icons/svg/cider-play.svg b/Assets/Cider Icons/svg/cider-play.svg new file mode 100644 index 00000000..4246456a --- /dev/null +++ b/Assets/Cider Icons/svg/cider-play.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/README.md b/README.md index 7b8fface..f6cfbb0b 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ GitHub Forks
- Buy Me A Coffee + Buy Me A Coffee Open Collective GitHub Sponsor
@@ -28,7 +28,7 @@ [![Get it from the Microsoft Store](https://img.shields.io/badge/Get_It_From_The_Microsoft_Store-100000?style=for-the-badge&logo=microsoft)](https://www.microsoft.com/store/apps/9P21XJ9D9G66) -[![Get it from Windows Package Manager](https://custom-icon-badges.herokuapp.com/badge/Get_It_via_Winget_(Nightly)_-100000?style=for-the-badge&logo=winstall)](https://winstall.app/apps/CiderCollective.Cider.Nightly) +[![Get it from Windows Package Manager](https://custom-icon-badges.herokuapp.com/badge/Get_It_via_Winget_(Nightly)_-100000?style=for-the-badge&logo=winstall)](https://winstall.app/apps/CiderCollective.Cider) - + + + + \ No newline at end of file diff --git a/src/renderer/views/app/chrome-bottom.ejs b/src/renderer/views/app/chrome-bottom.ejs index e27a6e13..733b73e7 100644 --- a/src/renderer/views/app/chrome-bottom.ejs +++ b/src/renderer/views/app/chrome-bottom.ejs @@ -39,7 +39,8 @@ @@ -361,7 +361,7 @@ if (this.data.type.includes('albums')) { let date = this.data.attributes.releaseDate; if (date == null || date === "") return ""; - return `${this.data.relationships.tracks.data[0].attributes.genreNames[0]} · ${new Date(date).getFullYear()}` + return `${this.data.relationships.tracks.data[0].attributes.genreNames[0]} · ${new Date(date).getFullYear()}` } }, async isInLibrary() { diff --git a/src/renderer/views/pages/podcasts.ejs b/src/renderer/views/pages/podcasts.ejs index 7430c01d..169a8b76 100644 --- a/src/renderer/views/pages/podcasts.ejs +++ b/src/renderer/views/pages/podcasts.ejs @@ -68,7 +68,7 @@
- +
diff --git a/src/renderer/views/pages/search.ejs b/src/renderer/views/pages/search.ejs index ed71d84e..292f1a62 100644 --- a/src/renderer/views/pages/search.ejs +++ b/src/renderer/views/pages/search.ejs @@ -1,5 +1,5 @@