Skip to content

Commit 844478b

Browse files
Merge branch 'feat/campaign_total_ask' into chore/remove_old_daos
2 parents 673d4f1 + 21e7fdd commit 844478b

File tree

657 files changed

+1375
-250
lines changed

Some content is hidden

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

657 files changed

+1375
-250
lines changed

.config/dictionaries/project.dic

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,7 @@ postcss
278278
Pozhylenkov
279279
Precache
280280
Precertificate
281+
precompressed
281282
preprod
282283
proguard
283284
projectcatalyst

Earthfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
VERSION 0.8
22

3-
IMPORT github.com/input-output-hk/catalyst-ci/earthly/mdlint:v3.6.2 AS mdlint-ci
4-
IMPORT github.com/input-output-hk/catalyst-ci/earthly/cspell:v3.6.2 AS cspell-ci
5-
IMPORT github.com/input-output-hk/catalyst-ci/earthly/postgresql:v3.6.2 AS postgresql-ci
3+
IMPORT github.com/input-output-hk/catalyst-ci/earthly/mdlint:v3.6.3 AS mdlint-ci
4+
IMPORT github.com/input-output-hk/catalyst-ci/earthly/cspell:v3.6.3 AS cspell-ci
5+
IMPORT github.com/input-output-hk/catalyst-ci/earthly/postgresql:v3.6.3 AS postgresql-ci
66

77
ARG --global REGISTRY="harbor.shared-services.projectcatalyst.io/dockerhub/library"
88
FROM ${REGISTRY}/debian:stable-slim

catalyst-gateway/Earthfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
VERSION 0.8
22

3-
IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust:v3.6.2 AS rust-ci
3+
IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust:v3.6.3 AS rust-ci
44
IMPORT ../ AS repo-ci
55
IMPORT github.com/input-output-hk/catalyst-voices/catalyst-gateway:main AS cat-gateway-main
66

catalyst-gateway/event-db/Earthfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# the database and its associated software.
44
VERSION 0.8
55

6-
IMPORT github.com/input-output-hk/catalyst-ci/earthly/postgresql:v3.6.2 AS postgresql-ci
6+
IMPORT github.com/input-output-hk/catalyst-ci/earthly/postgresql:v3.6.3 AS postgresql-ci
77

88
# cspell: words
99

catalyst-gateway/tests/Earthfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# cspell: words unittests socat
22

33
VERSION 0.8
4-
IMPORT github.com/input-output-hk/catalyst-ci/earthly/spectral:v3.6.2 AS spectral-ci
4+
IMPORT github.com/input-output-hk/catalyst-ci/earthly/spectral:v3.6.3 AS spectral-ci
55
IMPORT .. AS gateway
66

77
# build all necessary docker images required to run `docker-compose.yml` services

catalyst-gateway/tests/api_tests/Earthfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
VERSION 0.8
22

3-
IMPORT github.com/input-output-hk/catalyst-ci/earthly/python:v3.6.2 AS python-ci
3+
IMPORT github.com/input-output-hk/catalyst-ci/earthly/python:v3.6.3 AS python-ci
44
IMPORT github.com/input-output-hk/catalyst-libs/rust:catalyst-signed-doc/v0.0.8 AS cat-libs-rust
55
IMPORT github.com/input-output-hk/catalyst-libs/rust:catalyst-signed-doc/v.0.0.4-fix-earthly-build AS dep-cat-libs-rust
66
IMPORT github.com/input-output-hk/catalyst-storage AS cat-storage

catalyst_voices/Caddyfile

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,20 @@
55
http://:8080 {
66
root * /app
77

8-
handle /healthz {
9-
respond `{"status":"ok"}` 200
10-
}
11-
12-
handle {
13-
try_files {path} /index.html
14-
file_server
15-
}
8+
# Compress on-the-fly if not precompressed
9+
encode
10+
11+
handle /healthz {
12+
respond `{"status":"ok"}` 200
13+
}
14+
15+
handle {
16+
try_files {path} /index.html
17+
file_server {
18+
# default order br zstd gzip
19+
precompressed
20+
}
21+
}
1622

1723
header {
1824
Cross-Origin-Opener-Policy "same-origin"

catalyst_voices/Earthfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ VERSION 0.8
22

33
IMPORT ../ AS repo-ci
44
IMPORT ../catalyst-gateway AS catalyst-gateway
5-
IMPORT github.com/input-output-hk/catalyst-ci/earthly/flutter:v3.6.2 AS flutter-ci
5+
IMPORT github.com/input-output-hk/catalyst-ci/earthly/flutter:v3.6.3 AS flutter-ci
66

77
# repo-catalyst-voices - Creates artifacts of all configuration files,
88
# packages and folders related to catalyst_voices frontend.
@@ -135,10 +135,12 @@ build-web:
135135
--SENTRY_ORG='iohk-j4' \
136136
--SENTRY_PROJECT='catalyst-voices' \
137137
--WASM=true
138-
138+
139139
# Version web assets with content-based MD5 hashes for cache busting
140140
RUN dart run /frontend/scripts/version_web_assets/version_web_assets.dart --build-dir=$WORKDIR/build/web --wasm=true
141-
141+
142+
DO flutter-ci+COMPRESS_WEB_FILES
143+
142144
SAVE ARTIFACT --keep-ts web
143145

144146
package:

catalyst_voices/apps/voices/lib/common/ext/account_role_ext.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import 'package:flutter/material.dart';
66
extension AccountRoleExt on AccountRole {
77
SvgGenImage get icon {
88
return switch (this) {
9-
AccountRole.voter => VoicesAssets.images.roleVoter,
10-
AccountRole.drep => VoicesAssets.images.roleDrep,
11-
AccountRole.proposer => VoicesAssets.images.roleProposer,
9+
AccountRole.voter => VoicesAssets.images.svg.roleVoter,
10+
AccountRole.drep => VoicesAssets.images.svg.roleDrep,
11+
AccountRole.proposer => VoicesAssets.images.svg.roleProposer,
1212
};
1313
}
1414

catalyst_voices/apps/voices/lib/pages/registration/pictures/base_profile_picture.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class BaseProfilePicture extends StatelessWidget {
1515
return TaskPicture(
1616
child: TaskPictureIconBox(
1717
type: type,
18-
child: VoicesAssets.images.createBaseProfile.buildIcon(
18+
child: VoicesAssets.images.svg.createBaseProfile.buildIcon(
1919
allowSize: false,
2020
),
2121
),

0 commit comments

Comments
 (0)