Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

App redesign #2946

Merged
merged 37 commits into from
Dec 12, 2024
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
a168ed8
Start of app redesign
Prospector Oct 14, 2024
d6a4b28
format
Prospector Oct 14, 2024
cd21547
continue progress
Prospector Oct 31, 2024
797ff36
Content page nearly done
Prospector Nov 10, 2024
7199977
Fix recursion issues with content page
Prospector Nov 11, 2024
cbe98d4
Fix update all alignment
Prospector Nov 11, 2024
b411e42
Discover page progress
Prospector Nov 11, 2024
01ea43e
Merge origin
Geometrically Nov 12, 2024
53e8363
Settings progress
Geometrically Nov 13, 2024
2567a15
Removed unlocked-size hack that breaks web
Prospector Nov 14, 2024
fab4bfa
Revamp project page, refactor web project page to share code with app…
Prospector Nov 15, 2024
42bbc1c
Ads + run prettier
Geometrically Nov 16, 2024
8208b92
Begin auth refactor, move common messages to ui lib, add i18n extract…
Prospector Nov 16, 2024
335b91b
fix ads not hiding when plus log in
Geometrically Nov 17, 2024
d201ec2
merge
Geometrically Nov 17, 2024
54405bf
rev lockfile changes/conflicts
Geometrically Nov 27, 2024
d133ff9
Merge branch 'main' into app-redesign
Geometrically Nov 27, 2024
1e4e668
Fix sign in page
Geometrically Nov 27, 2024
65b625a
Merge origin
Geometrically Nov 27, 2024
88d97ea
Add generated
Geometrically Nov 27, 2024
029bbf6
(mostly) Data driven search
Prospector Nov 30, 2024
8a3864f
Fix search mobile issue
Prospector Nov 30, 2024
eadc5c9
profile fixes
Geometrically Nov 30, 2024
760fe33
Merge origin
Geometrically Dec 7, 2024
a6c13eb
Project versions page, fix typescript on UI lib and misc fixes
Prospector Dec 9, 2024
7bd3dc8
Remove unused gallery component
Prospector Dec 9, 2024
f420a2f
Fix linkfunction err
Geometrically Dec 9, 2024
264ded6
Search filter controls at top, localization for locked filters
Prospector Dec 10, 2024
34da2ee
Fix provided filter names
Prospector Dec 11, 2024
282c9cc
Fix navigating from instance browse to main browse
Prospector Dec 11, 2024
e359e3c
Friends frontend (#2995)
Geometrically Dec 12, 2024
ffd191c
Merge branch 'main' into app-redesign
Geometrically Dec 12, 2024
238dc2c
Refresh macOS app icon
Prospector Dec 12, 2024
fa395e8
Update web search UI more
Prospector Dec 12, 2024
1ac3188
Fix link opens
Geometrically Dec 12, 2024
76cf046
Merge remote-tracking branch 'origin/app-redesign' into app-redesign
Geometrically Dec 12, 2024
cf5a85c
Fix frontend build
Geometrically Dec 12, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/1-app-bug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,4 @@ body:
label: Additional context
description: Add any other context about the problem here.
validations:
required: false
required: false
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/2-web-bug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@ body:
label: Additional context
description: Add any other context about the problem here.
validations:
required: false
required: false
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/3-api-bug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ body:
label: Additional context
description: Add any other context about the problem here.
validations:
required: false
required: false
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/4-feature-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ body:
label: Additional context
description: Add any other context or screenshots about the suggested enhancement here.
validations:
required: false
required: false
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ contact_links:
url: https://roadmap.modrinth.com
- name: 📚 Documentation
about: Useful documentation about Modrinth's API
url: https://docs.modrinth.com
url: https://docs.modrinth.com
12 changes: 5 additions & 7 deletions .github/workflows/daedalus-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ name: daedalus-docker-build

on:
push:
branches: [ "main" ]
branches: ['main']
paths:
- .github/workflows/daedalus-docker.yml
- 'apps/daedalus_client/**'
pull_request:
types: [ opened, synchronize ]
types: [opened, synchronize]
paths:
- .github/workflows/daedalus-docker.yml
- 'apps/daedalus_client/**'
merge_group:
types: [ checks_requested ]
types: [checks_requested]

jobs:
docker:
Expand All @@ -25,15 +25,13 @@ jobs:
uses: docker/metadata-action@v3
with:
images: ghcr.io/modrinth/daedalus
-
name: Login to GitHub Images
- name: Login to GitHub Images
uses: docker/login-action@v1
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
-
name: Build and push
- name: Build and push
id: docker_build
uses: docker/build-push-action@v2
with:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/daedalus-run.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ jobs:
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}


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

Expand Down
14 changes: 6 additions & 8 deletions .github/workflows/labrinth-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ name: docker-build

on:
push:
branches: [ "main" ]
branches: ['main']
paths:
- .github/workflows/labrinth-docker.yml
- 'apps/labrinth/**'
pull_request:
types: [ opened, synchronize ]
types: [opened, synchronize]
paths:
- .github/workflows/labrinth-docker.yml
- 'apps/labrinth/**'
merge_group:
types: [ checks_requested ]
types: [checks_requested]

jobs:
docker:
Expand All @@ -28,19 +28,17 @@ jobs:
uses: docker/metadata-action@v3
with:
images: ghcr.io/modrinth/labrinth
-
name: Login to GitHub Images
- name: Login to GitHub Images
uses: docker/login-action@v1
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
-
name: Build and push
- name: Build and push
id: docker_build
uses: docker/build-push-action@v2
with:
context: ./apps/labrinth
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.docker_meta.outputs.tags }}
labels: ${{ steps.docker_meta.outputs.labels }}
labels: ${{ steps.docker_meta.outputs.labels }}
4 changes: 2 additions & 2 deletions .github/workflows/turbo-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ name: CI

on:
push:
branches: ["main"]
branches: ['main']
pull_request:
types: [opened, synchronize]
merge_group:
types: [ checks_requested ]
types: [checks_requested]

jobs:
build:
Expand Down
5 changes: 5 additions & 0 deletions .idea/daedalus.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 1 addition & 6 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
{
"prettier.endOfLine": "lf",
"editor.formatOnSave": true,
"eslint.validate": [
"javascript",
"javascriptreact",
"typescript",
"typescriptreact"
],
"eslint.validate": ["javascript", "javascriptreact", "typescript", "typescriptreact"],
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "explicit"
}
Expand Down
4 changes: 3 additions & 1 deletion apps/app-frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"build": "vue-tsc --noEmit && vite build",
"tsc:check": "vue-tsc --noEmit",
"lint": "eslint . && prettier --check .",
"fix": "eslint . --fix && prettier --write ."
"fix": "eslint . --fix && prettier --write .",
"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"
},
"dependencies": {
"@modrinth/assets": "workspace:*",
Expand All @@ -34,6 +35,7 @@
"vue-virtual-scroller": "v2.0.0-beta.8"
},
"devDependencies": {
"@formatjs/cli": "^6.2.12",
"@eslint/compat": "^1.1.1",
"@nuxt/eslint-config": "^0.5.6",
"@vitejs/plugin-vue": "^5.0.4",
Expand Down
Loading