Skip to content

Commit

Permalink
Merge pull request #1796 from IntersectMBO/develop
Browse files Browse the repository at this point in the history
GovTool-v1.0.13-test
  • Loading branch information
MSzalowski authored Aug 22, 2024
2 parents 6063a71 + 4112253 commit ca41404
Show file tree
Hide file tree
Showing 35 changed files with 5,696 additions and 1,006 deletions.
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,20 @@ changes.

### Added

-

### Fixed

-

### Changed

-

## [sancho-v1.0.13](https://github.com/IntersectMBO/govtool/releases/tag/sancho-v1.0.13) 2024-08-22

### Added

- Unsancho GovTool [Issue 1637](https://github.com/IntersectMBO/govtool/issues/1637)
- Add network metrics model to frontend service
- Added workflows to add labels to issues
Expand All @@ -32,6 +46,7 @@ changes.
- Changed stake key registration to use the newer Conway type of certificate
- Changed and improved issue templates
- Changed wording and image in base README
- Change link to docs

## [sancho-v1.0.12](https://github.com/IntersectMBO/govtool/releases/tag/sancho-v1.0.12) 2024-08-01

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ The Voltaire GovTool enables ada holders to experience the governance features d

#### Mainnet

- *Coming soon*
- _Coming soon_

#### SanchoNet

Expand Down
2 changes: 1 addition & 1 deletion docs/architecture/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ utility backend that serves validation of the governance actions metadata.

# Description

Frontend is a React application using Vite as a built tool to enhance development speed and optimize production builds. Frontend interacts with the backend service via REST API and with the Cardano blockchain via cardano-serialization-lib and connected supported wallets (for the list of compatible wallets go [here](https://docs.sanchogov.tools/how-to-use-the-govtool/getting-started/get-a-compatible-wallet)).
Frontend is a React application using Vite as a built tool to enhance development speed and optimize production builds. Frontend interacts with the backend service via REST API and with the Cardano blockchain via cardano-serialization-lib and connected supported wallets (for the list of compatible wallets go [here](https://docs.gov.tools/how-to-use-the-govtool/getting-started/get-a-compatible-wallet)).

# Components

Expand Down
2 changes: 1 addition & 1 deletion govtool/backend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ FROM $BASE_IMAGE_REPO:$BASE_IMAGE_TAG
WORKDIR /src
COPY . .
RUN cabal build
RUN cp dist-newstyle/build/x86_64-linux/ghc-9.2.7/vva-be-1.0.12/x/vva-be/build/vva-be/vva-be /usr/local/bin
RUN cp dist-newstyle/build/x86_64-linux/ghc-9.2.7/vva-be-1.0.13/x/vva-be/build/vva-be/vva-be /usr/local/bin
2 changes: 1 addition & 1 deletion govtool/backend/Dockerfile.qovery
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FROM $BASE_IMAGE_REPO:$BASE_IMAGE_TAG
WORKDIR /src
COPY . .
RUN cabal build
RUN cp dist-newstyle/build/x86_64-linux/ghc-9.2.7/vva-be-1.0.12/x/vva-be/build/vva-be/vva-be /usr/local/bin
RUN cp dist-newstyle/build/x86_64-linux/ghc-9.2.7/vva-be-1.0.13/x/vva-be/build/vva-be/vva-be /usr/local/bin

# Expose the necessary port
EXPOSE 9876
Expand Down
2 changes: 1 addition & 1 deletion govtool/backend/vva-be.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 3.6
name: vva-be
version: 1.0.12
version: 1.0.13

-- A short (one-line) description of the package.
-- synopsis:
Expand Down
4 changes: 2 additions & 2 deletions govtool/frontend/package-lock.json

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

2 changes: 1 addition & 1 deletion govtool/frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@govtool/frontend",
"private": true,
"version": "1.0.12",
"version": "1.0.13",
"type": "module",
"scripts": {
"build": "vite build",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export const DataMissingInfoBox = ({
onClick={() =>
// TODO: Add the correct link
openInNewTab(
"https://docs.sanchogov.tools/how-to-use-the-govtool/getting-started/get-a-compatible-wallet",
"https://docs.gov.tools/how-to-use-the-govtool/getting-started/get-a-compatible-wallet",
)
}
sx={{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ export const AutomatedVotingOptions = ({
}
onClickInfo={() =>
openInNewTab(
"https://docs.sanchogov.tools/how-to-use-the-govtool/using-govtool/delegating-overview/abstain-from-every-vote",
"https://docs.gov.tools/how-to-use-the-govtool/using-govtool/delegating-overview/abstain-from-every-vote",
)
}
title={
Expand Down Expand Up @@ -163,7 +163,7 @@ export const AutomatedVotingOptions = ({
}
onClickInfo={() =>
openInNewTab(
"https://docs.sanchogov.tools/how-to-use-the-govtool/using-govtool/delegating-overview/signal-no-confidence-on-every-vote",
"https://docs.gov.tools/how-to-use-the-govtool/using-govtool/delegating-overview/signal-no-confidence-on-every-vote",
)
}
title={
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,7 @@ export const StorageInformation = ({ setStep }: StorageInformationProps) => {
const fileName = getValues("governance_action_type") as string;

const openGuideAboutStoringInformation = () =>
openInNewTab(
"https://docs.sanchogov.tools/faqs/how-to-create-a-metadata-anchor",
);
openInNewTab("https://docs.gov.tools/faqs/how-to-create-a-metadata-anchor");

const isActionButtonDisabled = !watch("storingURL") || !!errors.storingURL;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export const StoreDataInfo = ({ setStep }: StoreDataInfoProps) => {
const { isMobile } = useScreenDimension();

// TODO: change link when available
const openLink = () => openInNewTab("https://docs.sanchogov.tools");
const openLink = () => openInNewTab("https://docs.gov.tools");

const isContinueDisabled = !watch("storeData");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export const DRepDashboardCard = ({
dataTestId: "d-rep-learn-more-button",
onClick: () =>
openInNewTab(
"https://docs.sanchogov.tools/how-to-use-the-govtool/using-govtool/dreps",
"https://docs.gov.tools/how-to-use-the-govtool/using-govtool/dreps",
),
};

Expand Down Expand Up @@ -120,7 +120,7 @@ export const DRepDashboardCard = ({
dataTestId: "register-learn-more-button",
onClick: () =>
openInNewTab(
"https://docs.sanchogov.tools/how-to-use-the-govtool/using-govtool/dreps/retire-as-a-drep",
"https://docs.gov.tools/how-to-use-the-govtool/using-govtool/dreps/retire-as-a-drep",
),
}
: learnMoreButton,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export const DelegateDashboardCard = ({
dataTestId: "delegate-learn-more-button",
onClick: () =>
openInNewTab(
"https://docs.sanchogov.tools/how-to-use-the-govtool/using-govtool/delegating",
"https://docs.gov.tools/how-to-use-the-govtool/using-govtool/delegating",
),
sx: { backgroundColor: "arcticWhite" },
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export const DirectVoterDashboardCard = ({
dataTestId: "direct-voter-learn-more-button",
onClick: () =>
openInNewTab(
"https://docs.sanchogov.tools/how-to-use-the-govtool/using-govtool/direct-voting",
"https://docs.gov.tools/how-to-use-the-govtool/using-govtool/direct-voting",
),
};

Expand Down Expand Up @@ -98,7 +98,7 @@ export const DirectVoterDashboardCard = ({
dataTestId: "learn-more-button",
onClick: () =>
openInNewTab(
"https://docs.sanchogov.tools/how-to-use-the-govtool/using-govtool/dreps/retire-as-a-drep",
"https://docs.gov.tools/how-to-use-the-govtool/using-govtool/dreps/retire-as-a-drep",
),
},
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export const ListGovActionsDashboardCards = () => {
dataTestId: "list-gov-actions-learn-more-button",
onClick: () =>
openInNewTab(
"https://docs.sanchogov.tools/how-to-use-the-govtool/using-govtool/governance-actions",
"https://docs.gov.tools/how-to-use-the-govtool/using-govtool/governance-actions",
),
variant: "outlined",
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export const ProposeGovActionDashboardCard = ({
dataTestId: "propose-gov-action-learn-more-button",
onClick: () =>
openInNewTab(
"https://docs.sanchogov.tools/how-to-use-the-govtool/using-govtool/governance-actions/propose-a-governance-action",
"https://docs.gov.tools/how-to-use-the-govtool/using-govtool/governance-actions/propose-a-governance-action",
),
},
]}
Expand Down
2 changes: 1 addition & 1 deletion govtool/frontend/src/components/organisms/DrawerMobile.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export const DrawerMobile = ({
const { t } = useTranslation();

const onClickHelp = () =>
openInNewTab("https://docs.sanchogov.tools/support/get-help-in-discord");
openInNewTab("https://docs.gov.tools/support/get-help-in-discord");

return (
<SwipeableDrawer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,7 @@ export const EditDRepStorageInformation = ({
const fileName = getValues("dRepName");

const openGuideAboutStoringInformation = () =>
openInNewTab(
"https://docs.sanchogov.tools/faqs/how-to-create-a-metadata-anchor",
);
openInNewTab("https://docs.gov.tools/faqs/how-to-create-a-metadata-anchor");

const isActionButtonDisabled = !watch("storingURL") || !!errors.storingURL;

Expand Down
6 changes: 3 additions & 3 deletions govtool/frontend/src/components/organisms/Footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ export const Footer = () => {
const { openFeedbackWindow } = useUsersnapApi();

const onClickHelp = () =>
openInNewTab("https://docs.sanchogov.tools/support/get-help-in-discord");
openInNewTab("https://docs.gov.tools/support/get-help-in-discord");

const onClickPrivacyPolicy = () =>
openInNewTab("https://docs.sanchogov.tools/legal/privacy-policy");
openInNewTab("https://docs.gov.tools/legal/privacy-policy");

// TODO: change term of service link
const onClickTermOfService = () =>
openInNewTab("https://docs.sanchogov.tools/legal/terms-and-conditions");
openInNewTab("https://docs.gov.tools/legal/terms-and-conditions");

const onClickFeedback = () => openFeedbackWindow();

Expand Down
2 changes: 1 addition & 1 deletion govtool/frontend/src/components/organisms/Hero.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export const Hero = () => {
}, [screenWidth]);

const onClickVotingPower = () =>
openInNewTab("https://docs.sanchogov.tools/faqs/what-is-voting-power");
openInNewTab("https://docs.gov.tools/faqs/what-is-voting-power");

return (
<Box
Expand Down
8 changes: 4 additions & 4 deletions govtool/frontend/src/components/organisms/HomeCards.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,22 +29,22 @@ export const HomeCards = () => {

const onClickLearnMoreAboutDelegation = () =>
openInNewTab(
"https://docs.sanchogov.tools/how-to-use-the-govtool/using-govtool/delegating",
"https://docs.gov.tools/how-to-use-the-govtool/using-govtool/delegating",
);

const onClickLearnMoreAboutDRepRegistration = () =>
openInNewTab(
"https://docs.sanchogov.tools/how-to-use-the-govtool/using-govtool/dreps",
"https://docs.gov.tools/how-to-use-the-govtool/using-govtool/dreps",
);

const onClickLearnMoreAboutDirectVoterRegistration = () =>
openInNewTab(
"https://docs.sanchogov.tools/how-to-use-the-govtool/using-govtool/direct-voting",
"https://docs.gov.tools/how-to-use-the-govtool/using-govtool/direct-voting",
);

const onClickLearnMoreAboutProposingGovAction = () =>
openInNewTab(
"https://docs.sanchogov.tools/how-to-use-the-govtool/using-govtool/governance-actions/propose-a-governance-action",
"https://docs.gov.tools/how-to-use-the-govtool/using-govtool/governance-actions/propose-a-governance-action",
);

const navigateToGovActions = useCallback(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ export const ChooseWalletModal = forwardRef<HTMLDivElement>((_, ref) => {
fontWeight={500}
onClick={() =>
openInNewTab(
"https://docs.sanchogov.tools/how-to-use-the-govtool/getting-started/get-a-compatible-wallet",
"https://docs.gov.tools/how-to-use-the-govtool/getting-started/get-a-compatible-wallet",
)
}
sx={{ cursor: "pointer" }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,7 @@ export const DRepStorageInformation = ({
const fileName = getValues("dRepName");

const openGuideAboutStoringInformation = () =>
openInNewTab(
"https://docs.sanchogov.tools/faqs/how-to-create-a-metadata-anchor",
);
openInNewTab("https://docs.gov.tools/faqs/how-to-create-a-metadata-anchor");

const isActionButtonDisabled = !watch("storingURL") || !!errors.storingURL;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@ export const VoteContextStoringInformation = ({
} = useVoteContextForm(setSavedHash, setStep, setErrorMessage);

const openGuideAboutStoringInformation = () =>
openInNewTab(
"https://docs.sanchogov.tools/faqs/how-to-create-a-metadata-anchor",
);
openInNewTab("https://docs.gov.tools/faqs/how-to-create-a-metadata-anchor");

const isContinueDisabled = !watch("storingURL");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const VoteContextTerms = ({ setStep, onCancel }: StoreDataInfoProps) => {
const { isMobile } = useScreenDimension();

// TODO: change link when available
const openLink = () => openInNewTab("https://docs.sanchogov.tools");
const openLink = () => openInNewTab("https://docs.gov.tools");

const isContinueDisabled = !watch("terms");

Expand Down
2 changes: 1 addition & 1 deletion govtool/frontend/src/consts/externalDataModalConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const urlCannotBeFound = {
status: "warning",
title: I18n.t("modals.urlCannotBeFound.title"),
message: I18n.t("modals.urlCannotBeFound.message"),
link: "https://docs.sanchogov.tools",
link: "https://docs.gov.tools",
linkText: I18n.t("modals.urlCannotBeFound.linkText"),
buttonText: I18n.t("modals.urlCannotBeFound.buttonText"),
cancelText: I18n.t("modals.urlCannotBeFound.cancelRegistrationText"),
Expand Down
8 changes: 4 additions & 4 deletions govtool/frontend/src/consts/navItems.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ export const NAV_ITEMS = [
dataTestId: "guides-link",
navTo: "",
label: i18n.t("menu.guides"),
newTabLink: "https://docs.sanchogov.tools/about/what-is-sanchonet-govtool",
newTabLink: "https://docs.gov.tools/about/what-is-sanchonet-govtool",
},
{
dataTestId: "faqs-link",
navTo: "",
label: i18n.t("menu.faqs"),
newTabLink: "https://docs.sanchogov.tools/faqs",
newTabLink: "https://docs.gov.tools/faqs",
},
];

Expand Down Expand Up @@ -95,14 +95,14 @@ export const CONNECTED_NAV_ITEMS = [
navTo: "",
activeIcon: ICONS.guidesActiveIcon,
icon: ICONS.guidesIcon,
newTabLink: "https://docs.sanchogov.tools/about/what-is-sanchonet-govtool",
newTabLink: "https://docs.gov.tools/about/what-is-sanchonet-govtool",
},
{
dataTestId: "faqs-link",
label: i18n.t("menu.faqs"),
navTo: "",
activeIcon: ICONS.faqsActiveIcon,
icon: ICONS.faqsIcon,
newTabLink: "https://docs.sanchogov.tools/faqs",
newTabLink: "https://docs.gov.tools/faqs",
},
];
Loading

0 comments on commit ca41404

Please sign in to comment.