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

refactor(cat-voices): self contained frontend dir #1082

Merged
merged 44 commits into from
Nov 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
939d4a2
refactor: move uikit_example into utilities dir
damian-molinski Oct 29, 2024
e387a27
fix: exclude example packages from melos bootstrap
damian-molinski Oct 29, 2024
8847b78
refactor: move poc_local_storage into catalyst_voices/utilities
damian-molinski Oct 29, 2024
7960858
refactor: move catalyst_voices_remote_widgets package to catalyst_voi…
damian-molinski Oct 29, 2024
376cfb3
refactor: move scripts into catalyst_voices dir
damian-molinski Oct 29, 2024
93c9d24
refactor: move catalyst_voices/packages into catalyst_voices/packages…
damian-molinski Oct 29, 2024
cdd42d2
refactor: move catalyst_voices_packages into catalyst_voices/packages…
damian-molinski Oct 29, 2024
9571bc5
refactor: move melos.yaml into catalyst_voices
damian-molinski Oct 29, 2024
557748b
refactor: move app into apps/voices dir
damian-molinski Oct 30, 2024
166cf2d
refactor: rename packages/external to packages/libs
damian-molinski Oct 30, 2024
f0d301f
docs: update README
damian-molinski Oct 30, 2024
e0cde31
fix: builder target
damian-molinski Oct 30, 2024
665a38c
fix: update paths in Earthfile
damian-molinski Oct 30, 2024
9057dab
fix: uikit_example pubspec + libs examples deps override
damian-molinski Oct 30, 2024
75266d2
chore: test
damian-molinski Oct 30, 2024
13aef88
Merge main into refactor/self-contained-frontend_899
damian-molinski Oct 30, 2024
5bcc56d
fix: update cspell and check markdown rules
damian-molinski Oct 30, 2024
b02550d
fix: README formatting
damian-molinski Oct 30, 2024
ce24ad6
fix: build-web target path
damian-molinski Oct 31, 2024
7bcf37e
fix: remove build-web target suffix separator
damian-molinski Oct 31, 2024
431fef3
fix: wallet-automation tests target path
damian-molinski Oct 31, 2024
e581615
fix: wallet-automation builder target
damian-molinski Oct 31, 2024
5948d84
fix: voices automation tests target
damian-molinski Oct 31, 2024
79ae37c
fix: code-generator target path
damian-molinski Oct 31, 2024
b6f981f
fix: vscode launch.recommended paths
damian-molinski Oct 31, 2024
9009c0a
feat: catalyst_voices justfile
damian-molinski Oct 31, 2024
9497665
refactor: rename catalyst_voices_remote_widgets to remote_widgets
damian-molinski Oct 31, 2024
0e3d066
fix: remote_widget spelling and licence checks
damian-molinski Oct 31, 2024
7243017
fix: remote_widget analyzer
damian-molinski Oct 31, 2024
dfcb159
Merge branch 'main' into refactor/self-contained-frontend_899
damian-molinski Oct 31, 2024
13467fc
refactor: move repo-catalyst-voices from root Earthfile to catalyst_v…
damian-molinski Oct 31, 2024
dcd9f6c
Merge branch 'main' into refactor/self-contained-frontend_899
damian-molinski Nov 4, 2024
e7e426c
fix: file drop
damian-molinski Nov 4, 2024
5590248
fix: force downgraded version of flutter_dropzone
damian-molinski Nov 4, 2024
3c8d52c
chore: update repository links + codeowners paths
damian-molinski Nov 4, 2024
16853de
fix: deploy uikit workflow
damian-molinski Nov 4, 2024
c28f127
fix: uikit_example earthly build target
damian-molinski Nov 4, 2024
84779f6
fix: uikit deploy workflow path
damian-molinski Nov 4, 2024
b0a790c
chore: integration tests docs readme paths
damian-molinski Nov 4, 2024
f8e3f68
chore: remote widget readme path
damian-molinski Nov 4, 2024
6572b54
chore: markdown ignore macos pods path fix
damian-molinski Nov 4, 2024
171e4f9
chore: integration test scripts
damian-molinski Nov 4, 2024
6041b2f
chore: build_runner assets
damian-molinski Nov 4, 2024
b9b8543
chore: document flutter_dropzone issue
dtscalac Nov 4, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
26 changes: 12 additions & 14 deletions .config/dictionaries/project.dic
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ aapt
aarch
abnf
addr
addrof
addrr
adminer
afinet
Expand All @@ -10,6 +11,7 @@ anypolicy
appbar
appspot
Arbritrary
ARCHS
ARGB
Arissara
asmjs
Expand All @@ -28,8 +30,10 @@ bluefireteam
BROTLI
canvaskit
cardano
cargokit
carryforward
Catalyst
cbindgen
CBOR
cborg
cborseq
Expand Down Expand Up @@ -78,6 +82,7 @@ earthfile
Easterling
eddsa
Edgedriver
Embedder
emurgo
encryptor
endfunction
Expand Down Expand Up @@ -115,6 +120,7 @@ interps
inversed
iohk
iphoneos
iphonesimulator
jdbc
jetbrains
Joaquín
Expand All @@ -140,12 +146,14 @@ libasound
libatk
libatspi
libavcodec
libcatalyst
libdrm
libflutter
libgbm
libnss
libxkbcommon
libxshmfence
Lifetimeable
lintfix
localizable
loguru
Expand All @@ -161,6 +169,7 @@ miniaturizable
minicbor
mithril
mitigations
mocktail
moderations
moka
msedgedriver
Expand Down Expand Up @@ -191,6 +200,7 @@ pinenacl
plpgsql
podfile
podhelper
Podspec
postcss
Pozhylenkov
Precache
Expand Down Expand Up @@ -239,8 +249,10 @@ servernum
serviceworker
slotno
sqlfluff
SRCROOT
sslmode
sstableinfo
staticlib
Stefano
stevenj
stringzilla
Expand Down Expand Up @@ -306,17 +318,3 @@ xctestrun
xcworkspace
xvfb
yoroi
Pbkdf2
Embedder
Podspec
podspec
ARCHS
iphonesimulator
cargokit
SRCROOT
libcatalyst
staticlib
addrof
Lifetimeable
cbindgen
mocktail
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/catalyst_voices/ @minikin

/catalyst_voices_packages/ @minikin @stevenj
/catalyst_voices/packages/libs/ @minikin @stevenj

/catalyst-gateway/ @stevenj @Mr-Leshiy @FelipeRosa @cong-or @saibatizoku @minikin

Expand Down
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ updates:
- "minikin"

- package-ecosystem: "pub"
directory: "/catalyst_voices_packages"
directory: "/catalyst_voices/packages/libs"
schedule:
interval: "monthly"
assignees:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/flutter-mobile-integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ jobs:
run: melos build:pub_get:all

- name: 🤖 Run Android Integration Tests
run: ./scripts/flutter_android_integration_test.sh
run: ./catalyst_voices/scripts/flutter_android_integration_test.sh

# TODO: https://github.com/input-output-hk/catalyst-voices/issues/135
# - name: 📱 Run iOS Integration Tests
# run: ./scripts/flutter_ios_integration_test.sh
# run: ./catalyst_voices/scripts/flutter_ios_integration_test.sh
4 changes: 2 additions & 2 deletions .github/workflows/flutter-uikit-example-firebase-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
if: always()
continue-on-error: true
with:
earthfile: ./catalyst_voices/uikit_example
earthfile: ./catalyst_voices/utilities/uikit_example
flags: --allow-privileged
targets: local-build-web
target_flags:
Expand All @@ -50,4 +50,4 @@ jobs:
firebaseServiceAccount: "${{ secrets.UIKIT_FIREBASE_SERVICE_ACCOUNT }}"
projectId: "${{ secrets.UIKIT_FIREBASE_PROJECT_ID }}"
channelId: live
entryPoint: catalyst_voices/uikit_example
entryPoint: catalyst_voices/utilities/uikit_example
2 changes: 1 addition & 1 deletion .github/workflows/nightly-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
if: always()
continue-on-error: true
with:
earthfile: ./catalyst_voices_packages/catalyst_cardano/catalyst_cardano/wallet-automation/
earthfile: ./catalyst_voices/packages/libs/catalyst_cardano/catalyst_cardano/wallet-automation/
flags: --allow-privileged
targets: nightly-test
target_flags:
Expand Down
6 changes: 3 additions & 3 deletions .markdownlint-cli2.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
".config/dictionaries/**",
"catalyst-gateway/target/**",
"CHANGELOG.md",
"catalyst_voices_packages/**/CHANGELOG.md",
"catalyst_voices_packages/**/cargokit/**",
"catalyst_voices/macos/Pods/**",
"catalyst_voices/packages/libs/**/CHANGELOG.md",
"catalyst_voices/packages/libs/**/cargokit/**",
"catalyst_voices/apps/voices/macos/Pods/**",
"**/node_modules/**",
"**/.dart_tool/**"
],
Expand Down
95 changes: 67 additions & 28 deletions .vscode/launch.recommended.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,124 +7,163 @@
"configurations": [
{
"name": "Catalyst Voices [macOS]",
"cwd": "catalyst_voices",
"cwd": "catalyst_voices/apps/voices",
"request": "launch",
"type": "dart",
"flutterMode": "debug",
"program": "lib/configs/main_web.dart"
},
{
"name": "Catalyst Voices [Web]",
"cwd": "catalyst_voices",
"cwd": "catalyst_voices/apps/voices",
"request": "launch",
"type": "dart",
"flutterMode": "debug",
"program": "lib/configs/main_web.dart",
"args": ["--dart-define", "SENTRY_DSN=REPLACE_WITH_SENTRY_DSN_URL"]
"args": [
"--dart-define",
"SENTRY_DSN=REPLACE_WITH_SENTRY_DSN_URL"
]
},
{
"name": "Catalyst Voices [DEV][Debug]",
"cwd": "catalyst_voices",
"cwd": "catalyst_voices/apps/voices",
"request": "launch",
"type": "dart",
"program": "lib/configs/main_dev.dart",
"args": ["--flavor", "dev"]
"args": [
"--flavor",
"dev"
]
},
{
"name": "Catalyst Voices [DEV][Profile]",
"cwd": "catalyst_voices",
"cwd": "catalyst_voices/apps/voices",
"request": "launch",
"type": "dart",
"flutterMode": "profile",
"program": "lib/configs/main_dev.dart",
"args": ["--flavor", "dev"]
"args": [
"--flavor",
"dev"
]
},
{
"name": "Catalyst Voices [DEV][Release]",
"cwd": "catalyst_voices",
"cwd": "catalyst_voices/apps/voices",
"request": "launch",
"type": "dart",
"flutterMode": "release",
"program": "lib/configs/main_dev.dart",
"args": ["--flavor", "dev"]
"args": [
"--flavor",
"dev"
]
},
{
"name": "Catalyst Voices [QA][Debug]",
"cwd": "catalyst_voices",
"cwd": "catalyst_voices/apps/voices",
"request": "launch",
"type": "dart",
"program": "lib/configs/main_qa.dart",
"args": ["--flavor", "qa"]
"args": [
"--flavor",
"qa"
]
},
{
"name": "Catalyst Voices [QA][Profile]",
"cwd": "catalyst_voices",
"cwd": "catalyst_voices/apps/voices",
"request": "launch",
"type": "dart",
"flutterMode": "profile",
"program": "lib/configs/main_qa.dart",
"args": ["--flavor", "qa"]
"args": [
"--flavor",
"qa"
]
},
{
"name": "Catalyst Voices [QA][Release]",
"cwd": "catalyst_voices",
"cwd": "catalyst_voices/apps/voices",
"request": "launch",
"type": "dart",
"flutterMode": "release",
"program": "lib/configs/main_qa.dart",
"args": ["--flavor", "qa"]
"args": [
"--flavor",
"qa"
]
},
{
"name": "Catalyst Voices [PROD][Debug]",
"cwd": "catalyst_voices",
"cwd": "catalyst_voices/apps/voices",
"request": "launch",
"type": "dart",
"program": "lib/configs/main_prod.dart",
"args": ["--flavor", "prod"]
"args": [
"--flavor",
"prod"
]
},
{
"name": "Catalyst Voices [PROD][Profile]",
"cwd": "catalyst_voices",
"cwd": "catalyst_voices/apps/voices",
"request": "launch",
"type": "dart",
"flutterMode": "profile",
"program": "lib/configs/main_prod.dart",
"args": ["--flavor", "prod"]
"args": [
"--flavor",
"prod"
]
},
{
"name": "Catalyst Voices [PROD][Release]",
"cwd": "catalyst_voices",
"cwd": "catalyst_voices/apps/voices",
"request": "launch",
"type": "dart",
"flutterMode": "release",
"program": "lib/configs/main_prod.dart",
"args": ["--flavor", "prod"]
"args": [
"--flavor",
"prod"
]
},
{
"name": "Catalyst Voices [PRE:PROD][Debug]",
"cwd": "catalyst_voices",
"cwd": "catalyst_voices/apps/voices",
"request": "launch",
"type": "dart",
"program": "lib/configs/main_preprod.dart",
"args": ["--flavor", "preprod"]
"args": [
"--flavor",
"preprod"
]
},
{
"name": "Catalyst Voices [PRE:PROD][Profile]",
"cwd": "catalyst_voices",
"cwd": "catalyst_voices/apps/voices",
"request": "launch",
"type": "dart",
"flutterMode": "profile",
"program": "lib/configs/main_preprod.dart",
"args": ["--flavor", "preprod"]
"args": [
"--flavor",
"preprod"
]
},
{
"name": "Catalyst Voices [PRE:PROD][Release]",
"cwd": "catalyst_voices",
"cwd": "catalyst_voices/apps/voices",
"request": "launch",
"type": "dart",
"flutterMode": "release",
"program": "lib/configs/main_preprod.dart",
"args": ["--flavor", "preprod"]
"args": [
"--flavor",
"preprod"
]
}
]
}
}
20 changes: 0 additions & 20 deletions Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,24 +41,4 @@ repo-docs:
WORKDIR /repo
COPY --dir *.md LICENSE-APACHE LICENSE-MIT .

SAVE ARTIFACT /repo repo

# repo-catalyst-voices-packages - Create artifacts of catalyst_voices_packages
# we need to refer to in other earthly targets.
repo-catalyst-voices-packages:
FROM scratch

WORKDIR /repo
COPY --dir catalyst_voices_packages .

SAVE ARTIFACT /repo repo

# repo-catalyst-voices-all - Creates artifacts of all configuration files,
# packages and folders related to catalyst_voices frontend.
repo-catalyst-voices-all:
FROM scratch

WORKDIR /repo
COPY --dir catalyst_voices catalyst_voices_packages utilities melos.yaml pubspec.yaml .

SAVE ARTIFACT /repo repo
Loading
Loading