Skip to content

Commit 5032c0c

Browse files
afonsojramosrxri
afonsojramos
and
rxri
authored
feat: rename repos (#757)
Co-authored-by: ririxi <[email protected]>
1 parent 15900b9 commit 5032c0c

File tree

10 files changed

+139
-115
lines changed

10 files changed

+139
-115
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ body:
55
- type: checkboxes
66
attributes:
77
label: 🔍 Is there already an issue for your problem?
8-
description: Please make sure you are not creating an already submitted <a href="https://github.com/spicetify/spicetify-marketplace/issues">Issue</a>. Check closed issues as well, because your issue may have already been fixed.
8+
description: Please make sure you are not creating an already submitted <a href="https://github.com/spicetify/marketplace/issues">Issue</a>. Check closed issues as well, because your issue may have already been fixed.
99
options:
1010
- label: I have checked older issues, open and closed
1111
required: true

‎.github/workflows/auto_release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ jobs:
5050
wait-interval: 10
5151
- name: Download target branch
5252

53-
run: curl -s -o spicetify-marketplace.zip https://codeload.github.com/${{ github.repository }}/zip/refs/heads/dist
53+
run: curl -s -o marketplace.zip https://codeload.github.com/${{ github.repository }}/zip/refs/heads/dist
5454
- name: Publish the release
5555
uses: softprops/action-gh-release@v1
5656
with:
5757
tag_name: ${{ needs.check_version.outputs.new_version }}
5858
generate_release_notes: true
59-
files: spicetify-marketplace.zip
59+
files: marketplace.zip

‎CONTRIBUTING.md

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!-- omit in toc -->
2-
# Contributing to Spicetify-Marketplace
2+
# Contributing to Spicetify's Marketplace
33

44
First off, thanks for taking the time to contribute! ❤️
55

@@ -30,11 +30,11 @@ All types of contributions are encouraged and valued. See the [Table of Contents
3030

3131
> If you want to ask a question, we assume that you have read the available [Documentation](https://spicetify.app/docs/getting-started/).
3232
33-
Before you ask a question, it is best to search for existing [Issues](https://github.com/spicetify/spicetify-marketplace/issues) that might help you. In case you have found a suitable issue and still need clarification, you can write your question in this issue. It is also advisable to search the internet for answers first.
33+
Before you ask a question, it is best to search for existing [Issues](https://github.com/spicetify/marketplace/issues) that might help you. In case you have found a suitable issue and still need clarification, you can write your question in this issue. It is also advisable to search the internet for answers first.
3434

3535
If you then still feel the need to ask a question and need clarification, we recommend the following:
3636

37-
- Open an [Issue](https://github.com/spicetify/spicetify-marketplace/issues/new).
37+
- Open an [Issue](https://github.com/spicetify/marketplace/issues/new).
3838
- Provide as much context as you can about what you're running into.
3939
- Provide project and platform versions (nodejs, npm, etc), depending on what seems relevant.
4040

@@ -69,7 +69,7 @@ A good bug report shouldn't leave others needing to chase you up for more inform
6969

7070
- Make sure that you are using the latest version.
7171
- Determine if your bug is really a bug and not an error on your side e.g. using incompatible environment components/versions (Make sure that you have read the [documentation](https://spicetify.app/docs/getting-started/). If you are looking for support, you might want to check [this section](#i-have-a-question)).
72-
- To see if other users have experienced (and potentially already solved) the same issue you are having, check if there is not already a bug report existing for your bug or error in the [bug tracker](https://github.com/spicetify/spicetify-marketplace/issues?q=label%3Abug).
72+
- To see if other users have experienced (and potentially already solved) the same issue you are having, check if there is not already a bug report existing for your bug or error in the [bug tracker](https://github.com/spicetify/marketplace/issues?q=label%3Abug).
7373
- Also make sure to search the internet (including Stack Overflow) to see if users outside of the GitHub community have discussed the issue.
7474
- Collect information about the bug:
7575
- Stack trace (Traceback)
@@ -86,7 +86,7 @@ A good bug report shouldn't leave others needing to chase you up for more inform
8686
8787
We use GitHub issues to track bugs and errors. If you run into an issue with the project:
8888

89-
- Open an [Issue](https://github.com/spicetify/spicetify-marketplace/issues/new). (Since we can't be sure at this point whether it is a bug or not, we ask you not to talk about a bug yet and not to label the issue.)
89+
- Open an [Issue](https://github.com/spicetify/marketplace/issues/new). (Since we can't be sure at this point whether it is a bug or not, we ask you not to talk about a bug yet and not to label the issue.)
9090
- Explain the behavior you would expect and the actual behavior.
9191
- Please provide as much context as possible and describe the *reproduction steps* that someone else can follow to recreate the issue on their own. This usually includes your code. For good bug reports you should isolate the problem and create a reduced test case.
9292
- Provide the information you collected in the previous section.
@@ -102,26 +102,26 @@ Once it's filed:
102102

103103
### Suggesting Enhancements
104104

105-
This section guides you through submitting an enhancement suggestion for Spicetify-Marketplace, **including completely new features and minor improvements to existing functionality**. Following these guidelines will help maintainers and the community to understand your suggestion and find related suggestions.
105+
This section guides you through submitting an enhancement suggestion for Marketplace, **including completely new features and minor improvements to existing functionality**. Following these guidelines will help maintainers and the community to understand your suggestion and find related suggestions.
106106

107107
<!-- omit in toc -->
108108
#### Before Submitting an Enhancement
109109

110110
- Make sure that you are using the latest version.
111111
- Read the [documentation](https://spicetify.app/docs/getting-started/) carefully and find out if the functionality is already covered, maybe by an individual configuration.
112-
- Perform a [search](https://github.com/spicetify/spicetify-marketplace/issues) to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one.
112+
- Perform a [search](https://github.com/spicetify/marketplace/issues) to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one.
113113
- Find out whether your idea fits with the scope and aims of the project. It's up to you to make a strong case to convince the project's developers of the merits of this feature. Keep in mind that we want features that will be useful to the majority of our users and not just a small subset. If you're just targeting a minority of users, consider writing an add-on/plugin library.
114114

115115
<!-- omit in toc -->
116116
#### How Do I Submit a Good Enhancement Suggestion?
117117

118-
Enhancement suggestions are tracked as [GitHub issues](https://github.com/spicetify/spicetify-marketplace/issues).
118+
Enhancement suggestions are tracked as [GitHub issues](https://github.com/spicetify/marketplace/issues).
119119

120120
- Use a **clear and descriptive title** for the issue to identify the suggestion.
121121
- Provide a **step-by-step description of the suggested enhancement** in as many details as possible.
122122
- **Describe the current behavior** and **explain which behavior you expected to see instead** and why. At this point you can also tell which alternatives do not work for you.
123123
- You may want to **include screenshots and animated GIFs** which help you demonstrate the steps or point out the part which the suggestion is related to. You can use [this tool](https://www.cockos.com/licecap/) to record GIFs on macOS and Windows, and [this tool](https://github.com/colinkeenan/silentcast) or [this tool](https://github.com/GNOME/byzanz) on Linux. <!-- this should only be included if the project has a GUI -->
124-
- **Explain why this enhancement would be useful** to most Spicetify-Marketplace users. You may also want to point out the other projects that solved it better and which could serve as inspiration.
124+
- **Explain why this enhancement would be useful** to most Marketplace users. You may also want to point out the other projects that solved it better and which could serve as inspiration.
125125

126126
<!-- You might want to create an issue template for enhancement suggestions that can be used as a guide and that defines the structure of the information to be included. If you do so, reference it here in the description. -->
127127

‎README.md

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
# Spicetify Marketplace
22

33
<p>
4-
<a href="https://github.com/spicetify/spicetify-marketplace/releases/latest">
5-
<img src="https://img.shields.io/github/v/release/spicetify/spicetify-marketplace?include_prereleases">
4+
<a href="https://github.com/spicetify/marketplace/releases/latest">
5+
<img src="https://img.shields.io/github/v/release/spicetify/marketplace?include_prereleases">
66
</a>
7-
<a href="https://github.com/spicetify/spicetify-marketplace/releases">
8-
<img src="https://img.shields.io/github/downloads/spicetify/spicetify-marketplace/total.svg">
7+
<a href="https://github.com/spicetify/marketplace/releases">
8+
<img src="https://img.shields.io/github/downloads/spicetify/marketplace/total.svg">
99
</a>
10-
<a href="https://github.com/spicetify/spicetify-marketplace/issues?q=is%3Aissue+is%3Aclosed">
11-
<img src="https://img.shields.io/github/issues-closed/spicetify/spicetify-marketplace">
10+
<a href="https://github.com/spicetify/marketplace/issues?q=is%3Aissue+is%3Aclosed">
11+
<img src="https://img.shields.io/github/issues-closed/spicetify/marketplace">
1212
</a>
13-
<a href="https://github.com/spicetify/spicetify-marketplace/commits/main">
14-
<img src="https://img.shields.io/github/commit-activity/m/spicetify/spicetify-marketplace">
13+
<a href="https://github.com/spicetify/marketplace/commits/main">
14+
<img src="https://img.shields.io/github/commit-activity/m/spicetify/marketplace">
1515
</a>
1616
</p>
1717

18-
Customize your Spotify client directly from within [Spicetify](https://github.com/spicetify/spicetify-cli)!
18+
Customize your Spotify client directly from within [Spicetify](https://github.com/spicetify/cli)!
1919

2020
Marketplace allows you to **browse, download, and install** extensions, themes, and CSS snippets with ease. You can also browse custom apps, but will need to do some manual installation to get them working.
2121

2222
Made with [Spicetify Creator](https://github.com/spicetify/spicetify-creator)
2323

24-
Head to the [wiki](https://github.com/spicetify/spicetify-marketplace/wiki) to get started!
24+
Head to the [wiki](https://github.com/spicetify/marketplace/wiki) to get started!
2525

2626
---
2727

2828
## Links
29-
- [Overview](https://github.com/spicetify/spicetify-marketplace/wiki)
30-
- [Installation](https://github.com/spicetify/spicetify-marketplace/wiki/Installation)
31-
- [Publishing to Marketplace](https://github.com/spicetify/spicetify-marketplace/wiki/Publishing-to-Marketplace)
32-
- [Contributions](https://github.com/spicetify/spicetify-marketplace/wiki/Contributions)
33-
- [Development](https://github.com/spicetify/spicetify-marketplace/wiki/Development)
34-
- [Translating/Localizing Marketplace](https://github.com/spicetify/spicetify-marketplace/wiki/Localizing-Marketplace)
29+
- [Overview](https://github.com/spicetify/marketplace/wiki)
30+
- [Installation](https://github.com/spicetify/marketplace/wiki/Installation)
31+
- [Publishing to Marketplace](https://github.com/spicetify/marketplace/wiki/Publishing-to-Marketplace)
32+
- [Contributions](https://github.com/spicetify/marketplace/wiki/Contributions)
33+
- [Development](https://github.com/spicetify/marketplace/wiki/Development)
34+
- [Translating/Localizing Marketplace](https://github.com/spicetify/marketplace/wiki/Localizing-Marketplace)
3535

‎package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"name": "spicetify-marketplace",
2+
"name": "marketplace",
33
"version": "1.0.2",
4-
"homepage": "https://github.com/spicetify/spicetify-marketplace",
5-
"repository": "github:spicetify/spicetify-marketplace",
4+
"homepage": "https://github.com/spicetify/marketplace",
5+
"repository": "github:spicetify/marketplace",
66
"bugs": {
7-
"url": "https://github.com/spicetify/spicetify-marketplace/issues"
7+
"url": "https://github.com/spicetify/marketplace/issues"
88
},
99
"packageManager": "[email protected]",
1010
"scripts": {
@@ -17,7 +17,7 @@
1717
"type-check": "tsc --noEmit",
1818
"watch": "spicetify-creator --watch",
1919
"prepare": "husky install",
20-
"update-types": "curl -s -o src/types/spicetify.d.ts https://raw.githubusercontent.com/spicetify/spicetify-cli/master/globals.d.ts"
20+
"update-types": "curl -s -o src/types/spicetify.d.ts https://raw.githubusercontent.com/spicetify/cli/main/globals.d.ts"
2121
},
2222
"engines": {
2323
"yarn": "please-use-pnpm",
@@ -47,4 +47,4 @@
4747
"semver": "^7.6.0"
4848
},
4949
"private": true
50-
}
50+
}

‎resources/install.ps1

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ if (-not (Get-Command -Name 'spicetify' -ErrorAction 'SilentlyContinue')) {
77
Write-Host -Object 'Spicetify not found.' -ForegroundColor 'Yellow'
88
Write-Host -Object 'Installing it for you...' -ForegroundColor 'Cyan'
99
$Parameters = @{
10-
Uri = 'https://raw.githubusercontent.com/spicetify/spicetify-cli/master/install.ps1'
10+
Uri = 'https://raw.githubusercontent.com/spicetify/cli/main/install.ps1'
1111
UseBasicParsing = $true
1212
}
1313
Invoke-WebRequest @Parameters | Invoke-Expression
@@ -33,9 +33,9 @@ New-Item -Path $marketAppPath, $marketThemePath -ItemType 'Directory' -Force | O
3333

3434
Write-Host -Object 'Downloading Marketplace...' -ForegroundColor 'Cyan'
3535
$marketArchivePath = "$marketAppPath\marketplace.zip"
36-
$unpackedFolderPath = "$marketAppPath\spicetify-marketplace-dist"
36+
$unpackedFolderPath = "$marketAppPath\marketplace-dist"
3737
$Parameters = @{
38-
Uri = 'https://github.com/spicetify/spicetify-marketplace/releases/latest/download/spicetify-marketplace.zip'
38+
Uri = 'https://github.com/spicetify/marketplace/releases/latest/download/marketplace.zip'
3939
UseBasicParsing = $true
4040
OutFile = $marketArchivePath
4141
}
@@ -51,7 +51,7 @@ spicetify config inject_css 1 replace_colors 1
5151

5252
Write-Host -Object 'Downloading placeholder theme...' -ForegroundColor 'Cyan'
5353
$Parameters = @{
54-
Uri = 'https://raw.githubusercontent.com/spicetify/spicetify-marketplace/main/resources/color.ini'
54+
Uri = 'https://raw.githubusercontent.com/spicetify/marketplace/main/resources/color.ini'
5555
UseBasicParsing = $true
5656
OutFile = "$marketThemePath\color.ini"
5757
}

‎resources/install.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set -e
66

77

88
# download uri
9-
releases_uri=https://github.com/spicetify/spicetify-marketplace/releases
9+
releases_uri=https://github.com/spicetify/marketplace/releases
1010
if [ $# -gt 0 ]; then
1111
tag=$1
1212
else
@@ -20,8 +20,8 @@ tag=${tag#v}
2020

2121
echo "FETCHING Version $tag"
2222

23-
download_uri=$releases_uri/download/v$tag/spicetify-marketplace.zip
24-
default_color_uri="https://raw.githubusercontent.com/spicetify/spicetify-marketplace/main/resources/color.ini"
23+
download_uri=$releases_uri/download/v$tag/marketplace.zip
24+
default_color_uri="https://raw.githubusercontent.com/spicetify/marketplace/main/resources/color.ini"
2525

2626
SPICETIFY_CONFIG_DIR="${SPICETIFY_CONFIG:-$HOME/.config/spicetify}"
2727
INSTALL_DIR="$SPICETIFY_CONFIG_DIR/CustomApps"
@@ -42,8 +42,8 @@ unzip -q -d "$INSTALL_DIR/marketplace-tmp" -o "$TAR_FILE"
4242

4343
cd "$INSTALL_DIR/marketplace-tmp"
4444
echo "COPYING"
45-
rm -rf "$INSTALL_DIR/spicetify-marketplace/" "$INSTALL_DIR/marketplace/"
46-
mv "$INSTALL_DIR/marketplace-tmp/spicetify-marketplace-dist" "$INSTALL_DIR/marketplace"
45+
rm -rf "$INSTALL_DIR/marketplace/" "$INSTALL_DIR/marketplace/"
46+
mv "$INSTALL_DIR/marketplace-tmp/marketplace-dist" "$INSTALL_DIR/marketplace"
4747

4848
echo "INSTALLING"
4949
cd "$INSTALL_DIR/marketplace"

‎src/components/Modals/Update/index.tsx

+66-46
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,81 @@
11
import { t } from "i18next";
22
import React from "react";
33

4-
import { LATEST_RELEASE_URL, MARKETPLACE_VERSION, RELEASES_URL } from "../../../constants";
4+
import {
5+
LATEST_RELEASE_URL,
6+
MARKETPLACE_VERSION,
7+
RELEASES_URL,
8+
} from "../../../constants";
59
import { getMarkdownHTML } from "../../../logic/Utils";
610

711
async function fetchLatestReleaseInfo(): Promise<{
8-
version: string;
9-
changelog: string | null;
12+
version: string;
13+
changelog: string | null;
1014
} | null> {
11-
try {
12-
const result = await fetch(LATEST_RELEASE_URL);
13-
const resultJson = await result.json();
14-
const { body, tag_name, message } = resultJson;
15-
return body && tag_name && !message
16-
? {
17-
version: tag_name.replace("v", ""),
18-
changelog: await getMarkdownHTML(body.match(/## What's Changed([\s\S]*?)(\r\n\r|\n\n##)/)[1], "spicetify", "spicetify-marketplace")
19-
}
20-
: null;
21-
} catch (error) {
22-
console.error(error);
23-
return null;
24-
}
15+
try {
16+
const result = await fetch(LATEST_RELEASE_URL);
17+
const resultJson = await result.json();
18+
const { body, tag_name, message } = resultJson;
19+
return body && tag_name && !message
20+
? {
21+
version: tag_name.replace("v", ""),
22+
changelog: await getMarkdownHTML(
23+
body.match(/## What's Changed([\s\S]*?)(\r\n\r|\n\n##)/)[1],
24+
"spicetify",
25+
"marketplace",
26+
),
27+
}
28+
: null;
29+
} catch (error) {
30+
console.error(error);
31+
return null;
32+
}
2533
}
2634

2735
function UpdateModal(): React.ReactElement {
28-
const [releaseInfo, setReleaseInfo] = React.useState<{
29-
version: string;
30-
changelog: string | null;
31-
} | null>(null);
36+
const [releaseInfo, setReleaseInfo] = React.useState<{
37+
version: string;
38+
changelog: string | null;
39+
} | null>(null);
3240

33-
React.useEffect(() => {
34-
fetchLatestReleaseInfo().then((releaseInfo) => setReleaseInfo(releaseInfo));
35-
}, []);
41+
React.useEffect(() => {
42+
fetchLatestReleaseInfo().then((releaseInfo) => setReleaseInfo(releaseInfo));
43+
}, []);
3644

37-
return (
38-
<div id="marketplace-update-container">
39-
<div id="marketplace-update-description">
40-
<h4>{t("updateModal.description")}</h4>
41-
<a href={`${RELEASES_URL}/tag/v${MARKETPLACE_VERSION}`}>{t("updateModal.currentVersion", { version: MARKETPLACE_VERSION })}</a>
42-
<a href={`${RELEASES_URL}/tag/v${releaseInfo?.version}`}>{t("updateModal.latestVersion", { version: releaseInfo?.version })}</a>
43-
</div>
44-
<hr />
45-
<div id="marketplace-update-whats-changed">
46-
<h3 className="marketplace-update-header">{t("updateModal.whatsChanged")}</h3>
47-
<details>
48-
<summary>{t("updateModal.seeChangelog")}</summary>
49-
<ul dangerouslySetInnerHTML={{ __html: releaseInfo?.changelog ?? "" }} />
50-
</details>
51-
</div>
52-
<hr />
53-
<div id="marketplace-update-guide">
54-
<h3 className="marketplace-update-header">{t("updateModal.howToUpgrade")}</h3>
55-
<a href="https://github.com/spicetify/spicetify-marketplace/wiki/Installation">{t("updateModal.viewGuide")}</a>
56-
</div>
57-
</div>
58-
);
45+
return (
46+
<div id="marketplace-update-container">
47+
<div id="marketplace-update-description">
48+
<h4>{t("updateModal.description")}</h4>
49+
<a href={`${RELEASES_URL}/tag/v${MARKETPLACE_VERSION}`}>
50+
{t("updateModal.currentVersion", { version: MARKETPLACE_VERSION })}
51+
</a>
52+
<a href={`${RELEASES_URL}/tag/v${releaseInfo?.version}`}>
53+
{t("updateModal.latestVersion", { version: releaseInfo?.version })}
54+
</a>
55+
</div>
56+
<hr />
57+
<div id="marketplace-update-whats-changed">
58+
<h3 className="marketplace-update-header">
59+
{t("updateModal.whatsChanged")}
60+
</h3>
61+
<details>
62+
<summary>{t("updateModal.seeChangelog")}</summary>
63+
<ul
64+
dangerouslySetInnerHTML={{ __html: releaseInfo?.changelog ?? "" }}
65+
/>
66+
</details>
67+
</div>
68+
<hr />
69+
<div id="marketplace-update-guide">
70+
<h3 className="marketplace-update-header">
71+
{t("updateModal.howToUpgrade")}
72+
</h3>
73+
<a href="https://github.com/spicetify/marketplace/wiki/Installation">
74+
{t("updateModal.viewGuide")}
75+
</a>
76+
</div>
77+
</div>
78+
);
5979
}
6080

6181
export default UpdateModal;

0 commit comments

Comments
 (0)