Skip to content

Commit c39bb78

Browse files
App redesign (#2946)
* Start of app redesign * format * continue progress * Content page nearly done * Fix recursion issues with content page * Fix update all alignment * Discover page progress * Settings progress * Removed unlocked-size hack that breaks web * Revamp project page, refactor web project page to share code with app, fixed loading bar, misc UI/UX enhancements, update ko-fi logo, update arrow icons, fix web issues caused by floating-vue migration, fix tooltip issues, update web tooltips, clean up web hydration issues * Ads + run prettier * Begin auth refactor, move common messages to ui lib, add i18n extraction to all apps, begin Library refactor * fix ads not hiding when plus log in * rev lockfile changes/conflicts * Fix sign in page * Add generated * (mostly) Data driven search * Fix search mobile issue * profile fixes * Project versions page, fix typescript on UI lib and misc fixes * Remove unused gallery component * Fix linkfunction err * Search filter controls at top, localization for locked filters * Fix provided filter names * Fix navigating from instance browse to main browse * Friends frontend (#2995) * Friends system frontend * (almost) finish frontend * finish friends, fix lint * Fix lint --------- Signed-off-by: Geometrically <[email protected]> * Refresh macOS app icon * Update web search UI more * Fix link opens * Fix frontend build --------- Signed-off-by: Geometrically <[email protected]> Co-authored-by: Jai A <[email protected]> Co-authored-by: Geometrically <[email protected]>
1 parent 6ec1dcf commit c39bb78

File tree

257 files changed

+15663
-9425
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

257 files changed

+15663
-9425
lines changed

.github/ISSUE_TEMPLATE/1-app-bug.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,4 @@ body:
5656
label: Additional context
5757
description: Add any other context about the problem here.
5858
validations:
59-
required: false
59+
required: false

.github/ISSUE_TEMPLATE/4-feature-request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ body:
4343
label: Additional context
4444
description: Add any other context or screenshots about the suggested enhancement here.
4545
validations:
46-
required: false
46+
required: false

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ contact_links:
1111
url: https://roadmap.modrinth.com
1212
- name: 📚 Documentation
1313
about: Useful documentation about Modrinth's API
14-
url: https://docs.modrinth.com
14+
url: https://docs.modrinth.com

.github/workflows/daedalus-docker.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ on:
88
- .github/workflows/daedalus-docker.yml
99
- 'apps/daedalus_client/**'
1010
pull_request:
11-
types: [ opened, synchronize ]
11+
types: [opened, synchronize]
1212
paths:
1313
- .github/workflows/daedalus-docker.yml
1414
- 'apps/daedalus_client/**'
1515
merge_group:
16-
types: [ checks_requested ]
16+
types: [checks_requested]
1717

1818
jobs:
1919
docker:
@@ -26,15 +26,13 @@ jobs:
2626
uses: docker/metadata-action@v3
2727
with:
2828
images: ghcr.io/modrinth/daedalus
29-
-
30-
name: Login to GitHub Images
29+
- name: Login to GitHub Images
3130
uses: docker/login-action@v1
3231
with:
3332
registry: ghcr.io
3433
username: ${{ github.actor }}
3534
password: ${{ secrets.GITHUB_TOKEN }}
36-
-
37-
name: Build and push
35+
- name: Build and push
3836
id: docker_build
3937
uses: docker/build-push-action@v2
4038
with:

.github/workflows/daedalus-run.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ jobs:
2121
username: ${{ github.actor }}
2222
password: ${{ secrets.GITHUB_TOKEN }}
2323

24-
2524
- name: Pull Docker image from GHCR
2625
run: docker pull ghcr.io/modrinth/daedalus:main
2726

.github/workflows/labrinth-docker.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ on:
88
- .github/workflows/labrinth-docker.yml
99
- 'apps/labrinth/**'
1010
pull_request:
11-
types: [ opened, synchronize ]
11+
types: [opened, synchronize]
1212
paths:
1313
- .github/workflows/labrinth-docker.yml
1414
- 'apps/labrinth/**'
1515
merge_group:
16-
types: [ checks_requested ]
16+
types: [checks_requested]
1717

1818
jobs:
1919
docker:
@@ -29,19 +29,17 @@ jobs:
2929
uses: docker/metadata-action@v3
3030
with:
3131
images: ghcr.io/modrinth/labrinth
32-
-
33-
name: Login to GitHub Images
32+
- name: Login to GitHub Images
3433
uses: docker/login-action@v1
3534
with:
3635
registry: ghcr.io
3736
username: ${{ github.actor }}
3837
password: ${{ secrets.GITHUB_TOKEN }}
39-
-
40-
name: Build and push
38+
- name: Build and push
4139
id: docker_build
4240
uses: docker/build-push-action@v2
4341
with:
4442
context: ./apps/labrinth
4543
push: ${{ github.event_name != 'pull_request' }}
4644
tags: ${{ steps.docker_meta.outputs.tags }}
47-
labels: ${{ steps.docker_meta.outputs.labels }}
45+
labels: ${{ steps.docker_meta.outputs.labels }}

.github/workflows/turbo-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ name: CI
22

33
on:
44
push:
5-
branches: ["main"]
5+
branches: ['main']
66
pull_request:
77
types: [opened, synchronize]
88
merge_group:
9-
types: [ checks_requested ]
9+
types: [checks_requested]
1010

1111
jobs:
1212
build:

.vscode/settings.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
{
22
"prettier.endOfLine": "lf",
33
"editor.formatOnSave": true,
4-
"eslint.validate": [
5-
"javascript",
6-
"javascriptreact",
7-
"typescript",
8-
"typescriptreact"
9-
],
4+
"eslint.validate": ["javascript", "javascriptreact", "typescript", "typescriptreact"],
105
"editor.codeActionsOnSave": {
116
"source.fixAll.eslint": "explicit"
127
}

apps/app-frontend/package.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
"build": "vue-tsc --noEmit && vite build",
99
"tsc:check": "vue-tsc --noEmit",
1010
"lint": "eslint . && prettier --check .",
11-
"fix": "eslint . --fix && prettier --write ."
11+
"fix": "eslint . --fix && prettier --write .",
12+
"intl:extract": "formatjs extract \"{,src/components,src/composables,src/helpers,src/pages,src/store}/**/*.{vue,ts,tsx,js,jsx,mts,cts,mjs,cjs}\" --ignore '**/*.d.ts' --ignore 'node_modules' --out-file src/locales/en-US/index.json --format crowdin --preserve-whitespace"
1213
},
1314
"dependencies": {
1415
"@modrinth/assets": "workspace:*",
@@ -28,12 +29,13 @@
2829
"pinia": "^2.1.7",
2930
"posthog-js": "^1.158.2",
3031
"vite-svg-loader": "^5.1.0",
31-
"vue": "^3.4.21",
32+
"vue": "^3.5.13",
3233
"vue-multiselect": "3.0.0",
3334
"vue-router": "4.3.0",
3435
"vue-virtual-scroller": "v2.0.0-beta.8"
3536
},
3637
"devDependencies": {
38+
"@formatjs/cli": "^6.2.12",
3739
"@eslint/compat": "^1.1.1",
3840
"@nuxt/eslint-config": "^0.5.6",
3941
"@vitejs/plugin-vue": "^5.0.4",
@@ -47,8 +49,9 @@
4749
"tailwindcss": "^3.4.4",
4850
"tsconfig": "workspace:*",
4951
"typescript": "^5.5.4",
50-
"vite": "^5.2.8",
52+
"vite": "^5.4.6",
5153
"vue-tsc": "^2.1.6"
5254
},
53-
"packageManager": "[email protected]"
55+
"packageManager": "[email protected]",
56+
"web-types": "../../web-types.json"
5457
}

0 commit comments

Comments
 (0)