Skip to content

Commit 62e5f43

Browse files
refactor(cat-voices): self contained frontend dir (#1082)
* refactor: move uikit_example into utilities dir * fix: exclude example packages from melos bootstrap * refactor: move poc_local_storage into catalyst_voices/utilities * refactor: move catalyst_voices_remote_widgets package to catalyst_voices/utilities dir * refactor: move scripts into catalyst_voices dir * refactor: move catalyst_voices/packages into catalyst_voices/packages/internal * refactor: move catalyst_voices_packages into catalyst_voices/packages/external * refactor: move melos.yaml into catalyst_voices * refactor: move app into apps/voices dir * refactor: rename packages/external to packages/libs * docs: update README * fix: builder target * fix: update paths in Earthfile * fix: uikit_example pubspec + libs examples deps override * chore: test * fix: update cspell and check markdown rules * fix: README formatting * fix: build-web target path * fix: remove build-web target suffix separator * fix: wallet-automation tests target path * fix: wallet-automation builder target * fix: voices automation tests target * fix: code-generator target path * fix: vscode launch.recommended paths * feat: catalyst_voices justfile * refactor: rename catalyst_voices_remote_widgets to remote_widgets * fix: remote_widget spelling and licence checks * fix: remote_widget analyzer * refactor: move repo-catalyst-voices from root Earthfile to catalyst_voices/Earthfile * fix: file drop * fix: force downgraded version of flutter_dropzone * chore: update repository links + codeowners paths * fix: deploy uikit workflow * fix: uikit_example earthly build target * fix: uikit deploy workflow path * chore: integration tests docs readme paths * chore: remote widget readme path * chore: markdown ignore macos pods path fix * chore: integration test scripts * chore: build_runner assets * chore: document flutter_dropzone issue --------- Co-authored-by: Dominik Toton <[email protected]>
1 parent ad71131 commit 62e5f43

File tree

1,745 files changed

+465
-381
lines changed

Some content is hidden

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

1,745 files changed

+465
-381
lines changed

.config/dictionaries/project.dic

+12-14
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ aapt
22
aarch
33
abnf
44
addr
5+
addrof
56
addrr
67
adminer
78
afinet
@@ -10,6 +11,7 @@ anypolicy
1011
appbar
1112
appspot
1213
Arbritrary
14+
ARCHS
1315
ARGB
1416
Arissara
1517
asmjs
@@ -28,8 +30,10 @@ bluefireteam
2830
BROTLI
2931
canvaskit
3032
cardano
33+
cargokit
3134
carryforward
3235
Catalyst
36+
cbindgen
3337
CBOR
3438
cborg
3539
cborseq
@@ -78,6 +82,7 @@ earthfile
7882
Easterling
7983
eddsa
8084
Edgedriver
85+
Embedder
8186
emurgo
8287
encryptor
8388
endfunction
@@ -115,6 +120,7 @@ interps
115120
inversed
116121
iohk
117122
iphoneos
123+
iphonesimulator
118124
jdbc
119125
jetbrains
120126
Joaquín
@@ -140,12 +146,14 @@ libasound
140146
libatk
141147
libatspi
142148
libavcodec
149+
libcatalyst
143150
libdrm
144151
libflutter
145152
libgbm
146153
libnss
147154
libxkbcommon
148155
libxshmfence
156+
Lifetimeable
149157
lintfix
150158
localizable
151159
loguru
@@ -161,6 +169,7 @@ miniaturizable
161169
minicbor
162170
mithril
163171
mitigations
172+
mocktail
164173
moderations
165174
moka
166175
msedgedriver
@@ -191,6 +200,7 @@ pinenacl
191200
plpgsql
192201
podfile
193202
podhelper
203+
Podspec
194204
postcss
195205
Pozhylenkov
196206
Precache
@@ -239,8 +249,10 @@ servernum
239249
serviceworker
240250
slotno
241251
sqlfluff
252+
SRCROOT
242253
sslmode
243254
sstableinfo
255+
staticlib
244256
Stefano
245257
stevenj
246258
stringzilla
@@ -306,17 +318,3 @@ xctestrun
306318
xcworkspace
307319
xvfb
308320
yoroi
309-
Pbkdf2
310-
Embedder
311-
Podspec
312-
podspec
313-
ARCHS
314-
iphonesimulator
315-
cargokit
316-
SRCROOT
317-
libcatalyst
318-
staticlib
319-
addrof
320-
Lifetimeable
321-
cbindgen
322-
mocktail

.github/CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
/catalyst_voices/ @minikin
44

5-
/catalyst_voices_packages/ @minikin @stevenj
5+
/catalyst_voices/packages/libs/ @minikin @stevenj
66

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

.github/dependabot.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ updates:
2121
- "minikin"
2222

2323
- package-ecosystem: "pub"
24-
directory: "/catalyst_voices_packages"
24+
directory: "/catalyst_voices/packages/libs"
2525
schedule:
2626
interval: "monthly"
2727
assignees:

.github/workflows/flutter-mobile-integration-test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ jobs:
4848
run: melos build:pub_get:all
4949

5050
- name: 🤖 Run Android Integration Tests
51-
run: ./scripts/flutter_android_integration_test.sh
51+
run: ./catalyst_voices/scripts/flutter_android_integration_test.sh
5252

5353
# TODO: https://github.com/input-output-hk/catalyst-voices/issues/135
5454
# - name: 📱 Run iOS Integration Tests
55-
# run: ./scripts/flutter_ios_integration_test.sh
55+
# run: ./catalyst_voices/scripts/flutter_ios_integration_test.sh

.github/workflows/flutter-uikit-example-firebase-deploy.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
if: always()
3939
continue-on-error: true
4040
with:
41-
earthfile: ./catalyst_voices/uikit_example
41+
earthfile: ./catalyst_voices/utilities/uikit_example
4242
flags: --allow-privileged
4343
targets: local-build-web
4444
target_flags:
@@ -50,4 +50,4 @@ jobs:
5050
firebaseServiceAccount: "${{ secrets.UIKIT_FIREBASE_SERVICE_ACCOUNT }}"
5151
projectId: "${{ secrets.UIKIT_FIREBASE_PROJECT_ID }}"
5252
channelId: live
53-
entryPoint: catalyst_voices/uikit_example
53+
entryPoint: catalyst_voices/utilities/uikit_example

.github/workflows/nightly-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
if: always()
6868
continue-on-error: true
6969
with:
70-
earthfile: ./catalyst_voices_packages/catalyst_cardano/catalyst_cardano/wallet-automation/
70+
earthfile: ./catalyst_voices/packages/libs/catalyst_cardano/catalyst_cardano/wallet-automation/
7171
flags: --allow-privileged
7272
targets: nightly-test
7373
target_flags:

.markdownlint-cli2.jsonc

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
".config/dictionaries/**",
1212
"catalyst-gateway/target/**",
1313
"CHANGELOG.md",
14-
"catalyst_voices_packages/**/CHANGELOG.md",
15-
"catalyst_voices_packages/**/cargokit/**",
16-
"catalyst_voices/macos/Pods/**",
14+
"catalyst_voices/packages/libs/**/CHANGELOG.md",
15+
"catalyst_voices/packages/libs/**/cargokit/**",
16+
"catalyst_voices/apps/voices/macos/Pods/**",
1717
"**/node_modules/**",
1818
"**/.dart_tool/**"
1919
],

.vscode/launch.recommended.json

+67-28
Original file line numberDiff line numberDiff line change
@@ -7,124 +7,163 @@
77
"configurations": [
88
{
99
"name": "Catalyst Voices [macOS]",
10-
"cwd": "catalyst_voices",
10+
"cwd": "catalyst_voices/apps/voices",
1111
"request": "launch",
1212
"type": "dart",
1313
"flutterMode": "debug",
1414
"program": "lib/configs/main_web.dart"
1515
},
1616
{
1717
"name": "Catalyst Voices [Web]",
18-
"cwd": "catalyst_voices",
18+
"cwd": "catalyst_voices/apps/voices",
1919
"request": "launch",
2020
"type": "dart",
2121
"flutterMode": "debug",
2222
"program": "lib/configs/main_web.dart",
23-
"args": ["--dart-define", "SENTRY_DSN=REPLACE_WITH_SENTRY_DSN_URL"]
23+
"args": [
24+
"--dart-define",
25+
"SENTRY_DSN=REPLACE_WITH_SENTRY_DSN_URL"
26+
]
2427
},
2528
{
2629
"name": "Catalyst Voices [DEV][Debug]",
27-
"cwd": "catalyst_voices",
30+
"cwd": "catalyst_voices/apps/voices",
2831
"request": "launch",
2932
"type": "dart",
3033
"program": "lib/configs/main_dev.dart",
31-
"args": ["--flavor", "dev"]
34+
"args": [
35+
"--flavor",
36+
"dev"
37+
]
3238
},
3339
{
3440
"name": "Catalyst Voices [DEV][Profile]",
35-
"cwd": "catalyst_voices",
41+
"cwd": "catalyst_voices/apps/voices",
3642
"request": "launch",
3743
"type": "dart",
3844
"flutterMode": "profile",
3945
"program": "lib/configs/main_dev.dart",
40-
"args": ["--flavor", "dev"]
46+
"args": [
47+
"--flavor",
48+
"dev"
49+
]
4150
},
4251
{
4352
"name": "Catalyst Voices [DEV][Release]",
44-
"cwd": "catalyst_voices",
53+
"cwd": "catalyst_voices/apps/voices",
4554
"request": "launch",
4655
"type": "dart",
4756
"flutterMode": "release",
4857
"program": "lib/configs/main_dev.dart",
49-
"args": ["--flavor", "dev"]
58+
"args": [
59+
"--flavor",
60+
"dev"
61+
]
5062
},
5163
{
5264
"name": "Catalyst Voices [QA][Debug]",
53-
"cwd": "catalyst_voices",
65+
"cwd": "catalyst_voices/apps/voices",
5466
"request": "launch",
5567
"type": "dart",
5668
"program": "lib/configs/main_qa.dart",
57-
"args": ["--flavor", "qa"]
69+
"args": [
70+
"--flavor",
71+
"qa"
72+
]
5873
},
5974
{
6075
"name": "Catalyst Voices [QA][Profile]",
61-
"cwd": "catalyst_voices",
76+
"cwd": "catalyst_voices/apps/voices",
6277
"request": "launch",
6378
"type": "dart",
6479
"flutterMode": "profile",
6580
"program": "lib/configs/main_qa.dart",
66-
"args": ["--flavor", "qa"]
81+
"args": [
82+
"--flavor",
83+
"qa"
84+
]
6785
},
6886
{
6987
"name": "Catalyst Voices [QA][Release]",
70-
"cwd": "catalyst_voices",
88+
"cwd": "catalyst_voices/apps/voices",
7189
"request": "launch",
7290
"type": "dart",
7391
"flutterMode": "release",
7492
"program": "lib/configs/main_qa.dart",
75-
"args": ["--flavor", "qa"]
93+
"args": [
94+
"--flavor",
95+
"qa"
96+
]
7697
},
7798
{
7899
"name": "Catalyst Voices [PROD][Debug]",
79-
"cwd": "catalyst_voices",
100+
"cwd": "catalyst_voices/apps/voices",
80101
"request": "launch",
81102
"type": "dart",
82103
"program": "lib/configs/main_prod.dart",
83-
"args": ["--flavor", "prod"]
104+
"args": [
105+
"--flavor",
106+
"prod"
107+
]
84108
},
85109
{
86110
"name": "Catalyst Voices [PROD][Profile]",
87-
"cwd": "catalyst_voices",
111+
"cwd": "catalyst_voices/apps/voices",
88112
"request": "launch",
89113
"type": "dart",
90114
"flutterMode": "profile",
91115
"program": "lib/configs/main_prod.dart",
92-
"args": ["--flavor", "prod"]
116+
"args": [
117+
"--flavor",
118+
"prod"
119+
]
93120
},
94121
{
95122
"name": "Catalyst Voices [PROD][Release]",
96-
"cwd": "catalyst_voices",
123+
"cwd": "catalyst_voices/apps/voices",
97124
"request": "launch",
98125
"type": "dart",
99126
"flutterMode": "release",
100127
"program": "lib/configs/main_prod.dart",
101-
"args": ["--flavor", "prod"]
128+
"args": [
129+
"--flavor",
130+
"prod"
131+
]
102132
},
103133
{
104134
"name": "Catalyst Voices [PRE:PROD][Debug]",
105-
"cwd": "catalyst_voices",
135+
"cwd": "catalyst_voices/apps/voices",
106136
"request": "launch",
107137
"type": "dart",
108138
"program": "lib/configs/main_preprod.dart",
109-
"args": ["--flavor", "preprod"]
139+
"args": [
140+
"--flavor",
141+
"preprod"
142+
]
110143
},
111144
{
112145
"name": "Catalyst Voices [PRE:PROD][Profile]",
113-
"cwd": "catalyst_voices",
146+
"cwd": "catalyst_voices/apps/voices",
114147
"request": "launch",
115148
"type": "dart",
116149
"flutterMode": "profile",
117150
"program": "lib/configs/main_preprod.dart",
118-
"args": ["--flavor", "preprod"]
151+
"args": [
152+
"--flavor",
153+
"preprod"
154+
]
119155
},
120156
{
121157
"name": "Catalyst Voices [PRE:PROD][Release]",
122-
"cwd": "catalyst_voices",
158+
"cwd": "catalyst_voices/apps/voices",
123159
"request": "launch",
124160
"type": "dart",
125161
"flutterMode": "release",
126162
"program": "lib/configs/main_preprod.dart",
127-
"args": ["--flavor", "preprod"]
163+
"args": [
164+
"--flavor",
165+
"preprod"
166+
]
128167
}
129168
]
130-
}
169+
}

Earthfile

-20
Original file line numberDiff line numberDiff line change
@@ -41,24 +41,4 @@ repo-docs:
4141
WORKDIR /repo
4242
COPY --dir *.md LICENSE-APACHE LICENSE-MIT .
4343

44-
SAVE ARTIFACT /repo repo
45-
46-
# repo-catalyst-voices-packages - Create artifacts of catalyst_voices_packages
47-
# we need to refer to in other earthly targets.
48-
repo-catalyst-voices-packages:
49-
FROM scratch
50-
51-
WORKDIR /repo
52-
COPY --dir catalyst_voices_packages .
53-
54-
SAVE ARTIFACT /repo repo
55-
56-
# repo-catalyst-voices-all - Creates artifacts of all configuration files,
57-
# packages and folders related to catalyst_voices frontend.
58-
repo-catalyst-voices-all:
59-
FROM scratch
60-
61-
WORKDIR /repo
62-
COPY --dir catalyst_voices catalyst_voices_packages utilities melos.yaml pubspec.yaml .
63-
6444
SAVE ARTIFACT /repo repo

0 commit comments

Comments
 (0)