Skip to content

Commit fce4728

Browse files
MSzalowskiMSzalowski
authored
Merge pull request #2564 from IntersectMBO/staging
2 parents 09ac311 + 6cb45f0 commit fce4728

File tree

29 files changed

+209
-137
lines changed

29 files changed

+209
-137
lines changed

‎CHANGELOG.md‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,26 @@ changes.
2626

2727
-
2828

29+
## [v2.0.2](https://github.com/IntersectMBO/govtool/releases/tag/v2.0.2) 2024-12-20
30+
31+
### Added
32+
33+
- Add preprod adjustments [Issue 2547](https://github.com/IntersectMBO/govtool/issues/2547)
34+
35+
### Fixed
36+
37+
- Move matomo initalization out of the react code
38+
- Fix some non-ipfs related errors while fetching the DRep images [Issue 2546](https://github.com/IntersectMBO/govtool/issues/2546)
39+
- Remaining mobile responsiveness issue [Issue 2493](https://github.com/IntersectMBO/govtool/issues/2493)
40+
41+
### Changed
42+
43+
-
44+
45+
### Removed
46+
47+
-
48+
2949
## [v2.0.1](https://github.com/IntersectMBO/govtool/releases/tag/v2.0.1) 2024-12-16
3050

3151
### Added

‎govtool/backend/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ FROM $BASE_IMAGE_REPO:$BASE_IMAGE_TAG
44
WORKDIR /src
55
COPY . .
66
RUN cabal build
7-
RUN cp dist-newstyle/build/x86_64-linux/ghc-9.2.7/vva-be-2.0.1/x/vva-be/build/vva-be/vva-be /usr/local/bin
7+
RUN cp dist-newstyle/build/x86_64-linux/ghc-9.2.7/vva-be-2.0.2/x/vva-be/build/vva-be/vva-be /usr/local/bin

‎govtool/backend/Dockerfile.qovery‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ FROM $BASE_IMAGE_REPO:$BASE_IMAGE_TAG
44
WORKDIR /src
55
COPY . .
66
RUN cabal build
7-
RUN cp dist-newstyle/build/x86_64-linux/ghc-9.2.7/vva-be-2.0.1/x/vva-be/build/vva-be/vva-be /usr/local/bin
7+
RUN cp dist-newstyle/build/x86_64-linux/ghc-9.2.7/vva-be-2.0.2/x/vva-be/build/vva-be/vva-be /usr/local/bin
88

99
# Expose the necessary port
1010
EXPOSE 9876

‎govtool/backend/vva-be.cabal‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 3.6
22
name: vva-be
3-
version: 2.0.1
3+
version: 2.0.2
44

55
-- A short (one-line) description of the package.
66
-- synopsis:

‎govtool/frontend/index.html‎

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,27 @@
2525
</head>
2626
<body>
2727
<script>
28-
var _paq = window._paq = window._paq || [];
28+
var isMainnet = window.location.hostname == "gov.tools";
29+
var isPreview = window.location.hostname == "preview.gov.tools";
30+
31+
var _paq = (window._paq = window._paq || []);
2932
/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
30-
_paq.push(['trackPageView']);
31-
_paq.push(['enableLinkTracking']);
32-
(function() {
33-
var u="//p80-zca17e2b0-z1743beba-gtw.z937eb260.rustrocks.fr/";
34-
_paq.push(['setTrackerUrl', u+'matomo.php']);
35-
_paq.push(['setSiteId', '1']);
36-
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
37-
g.async=true;
38-
g.src=u+'matomo.js';
39-
s.parentNode.insertBefore(g,s);
33+
_paq.push(["trackPageView"]);
34+
_paq.push(["enableLinkTracking"]);
35+
(function () {
36+
if (!isPreview && !isMainnet) {
37+
return;
38+
}
39+
40+
var u = "//analytics.gov.tools/";
41+
_paq.push(["setTrackerUrl", u + "matomo.php"]);
42+
_paq.push(["setSiteId", isMainnet ? "1" : "2"]);
43+
var d = document,
44+
g = d.createElement("script"),
45+
s = d.getElementsByTagName("script")[0];
46+
g.async = true;
47+
g.src = u + "matomo.js";
48+
s.parentNode.insertBefore(g, s);
4049
})();
4150
</script>
4251
<div id="root"></div>

‎govtool/frontend/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@govtool/frontend",
33
"private": true,
4-
"version": "2.0.1",
4+
"version": "2.0.2",
55
"type": "module",
66
"scripts": {
77
"build": "vite build",
@@ -113,5 +113,5 @@
113113
"nth-check": "^2.0.1",
114114
"postcss": "^8.4.31"
115115
},
116-
"_id": "[email protected].1"
116+
"_id": "[email protected].2"
117117
}

‎govtool/frontend/src/App.tsx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,8 @@ import {
3939
import { PublicRoute } from "./pages/PublicRoute";
4040
import { TopBanners } from "./components/organisms/TopBanners";
4141
import { DashboardHome } from "./pages/DashboardHome";
42-
import { useMatomo } from "./hooks/useMatomo";
4342

4443
export default () => {
45-
useMatomo();
4644
const { isProposalDiscussionForumEnabled } = useFeatureFlag();
4745
const { enable, isEnabled } = useCardano();
4846
const navigate = useNavigate();

‎govtool/frontend/src/components/molecules/DataActionsFilters.tsx‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export const DataActionsFilters = ({
4343
[chosenFilters, setChosenFilters],
4444
);
4545

46-
const { isMobile, screenWidth } = useScreenDimension();
46+
const { isMobile } = useScreenDimension();
4747

4848
const wrapperRef = useRef<HTMLDivElement>(null);
4949
useOnClickOutside(wrapperRef, closeFilters);
@@ -58,7 +58,10 @@ export const DataActionsFilters = ({
5858
boxShadow: "1px 2px 11px 0px #00123D5E",
5959
borderRadius: "10px",
6060
padding: "12px 0px",
61-
width: screenWidth < 850 ? "315px" : "415px",
61+
width: {
62+
xxs: "250px",
63+
md: "415px",
64+
},
6265
zIndex: "1",
6366
right: isMobile ? "59px" : "115px",
6467
top: "53px",

‎govtool/frontend/src/components/molecules/DataActionsSorting.tsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@ export const DataActionsSorting = ({
4141
boxShadow: "1px 2px 11px 0px #00123D5E",
4242
borderRadius: "10px",
4343
padding: "12px 0px",
44-
width: "315px",
44+
width: {
45+
xxs: "250px",
46+
md: "415px",
47+
},
4548
zIndex: "1",
4649
right: "3px",
4750
top: "53px",

‎govtool/frontend/src/components/molecules/DataMissingHeader.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ export const DataMissingHeader = ({
3333
<Box
3434
sx={{
3535
flexDirection: {
36-
sm: "column",
37-
lg: "row",
36+
xxs: "column",
37+
md: "row",
3838
},
3939
alignItems: {
40-
lg: "center",
40+
md: "center",
4141
},
4242
display: "flex",
4343
}}
@@ -52,8 +52,8 @@ export const DataMissingHeader = ({
5252
)}
5353
<Typography
5454
sx={{
55-
...(isDRep && { ml: { lg: 3 } }),
56-
...(isDRep && { mt: { sm: 2, lg: 0 } }),
55+
...(isDRep && { ml: { md: 3 } }),
56+
...(isDRep && { mt: { xxs: 2, md: 0 } }),
5757
textOverflow: "ellipsis",
5858
fontWeight: 600,
5959
...(isDataMissing && { color: "errorRed" }),

0 commit comments

Comments
 (0)