merge from develop to staging

backend/example.env

@@ -31,13 +31,15 @@ EMAIL_FROM=example@email.from
 NAME_FROM=Example Name From
 
 #minio 
-MINIO_ENDPOINT=minio
+MINIO_ENDPOINT=localhost
 MINIO_PORT=9000
 MINIO_ACCESS_KEY=minio
 MINIO_SECRET_KEY=minio123
 MINIO_USE_SSL=false
 MINIO_BUCKET=cc-portal
 
+S3_BASE_URL=http://localhost:9000
+
 # IPFS Service
 IPFS_SERVICE_URL=http://ipfs-service:3001
 

backend/migrations/1726048356332-governance-title-abstrant-len-removal.ts

@@ -0,0 +1,29 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class GovTitleAbstractLenRemoval1726048356332
+  implements MigrationInterface
+{
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `begin;
+            ALTER TABLE gov_action_proposals 
+            ALTER COLUMN title TYPE VARCHAR;
+
+            ALTER TABLE gov_action_proposals 
+            alter COLUMN abstract type VARCHAR;
+        commit;`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `begin;
+              ALTER TABLE gov_action_proposals 
+              ALTER COLUMN title TYPE VARCHAR(80);
+  
+              ALTER TABLE gov_action_proposals 
+              alter COLUMN abstract type VARCHAR(2500);
+          commit;`,
+    );
+  }
+}

backend/src/constitution/facade/constitution.facade.ts

@@ -3,7 +3,6 @@ import { ConstitutionRedisService } from 'src/redis/service/constitution-redis.s
 import { ConstitutionResponse } from '../api/response/constitution.response';
 import { ConstitutionMapper } from '../mapper/constitution.mapper';
 import { ConstitutionDto } from 'src/redis/dto/constitution.dto';
-import { ConstitutionService } from '../services/constitution.service';
 import { IpfsService } from 'src/ipfs/services/ipfs.service';
 import { ConstitutionMetadataResponse } from '../api/response/constitution-metadata.response';
 import { ConstitutionIpnsUrlResponse } from '../api/response/constitutio-ipns-url.response';
@@ -14,7 +13,6 @@ export class ConstitutionFacade {
 
   constructor(
     private readonly constitutionRedisService: ConstitutionRedisService,
-    private readonly constitutionService: ConstitutionService,
     private readonly ipfsService: IpfsService,
   ) {}
 

backend/src/governance/facade/governance.facade.ts

@@ -45,7 +45,11 @@ export class GovernanceFacade {
     const response = await this.governanceService.addRationale(rationaleDto);
     return GovernanceMapper.rationaleDtoToResponse(response);
   }
-
+  /**
+   * Creates a CIP 100 compatible JSON object.
+   * CIP 100 example:
+   *  https://github.com/cardano-foundation/CIPs/blob/master/CIP-0100/example.body.json
+   **/
   private async createRationaleJsonCip100(
     rationaleRequest: RationaleRequest,
   ): Promise<string> {
@@ -97,7 +101,6 @@ export class GovernanceFacade {
       hashAlgorithm: CIP100.hashAlgorithm,
       authors: [],
       body: {
-        references: [],
         comment: rationaleRequest.content,
       },
     };

backend/src/governance/interfaces/icip100.interface.ts

@@ -69,6 +69,5 @@ interface WitnessContext {
 }
 
 interface BodyContent {
-  references: any[];
   comment: string;
 }

backend/src/ipfs/services/ipfs.service.ts

@@ -52,7 +52,8 @@ export class IpfsService {
     const formData = new FormData();
     formData.append('file', blob, file.originalname);
 
-    const apiLink = this.configService.getOrThrow('IPFS_SERVICE_URL') + '/ipfs';
+    const apiLink =
+      this.configService.getOrThrow('IPFS_SERVICE_URL') + '/ipfs/file';
     const requestConfig = {
       headers: {
         'Content-Type': 'multipart/form-data',

backend/src/s3/service/s3.service.ts

@@ -23,7 +23,9 @@ export class S3Service {
     const buffer = Buffer.from(bufferArray);
 
     const fullName = this.getFullFileName(context, fileName);
-    await this.client.putObject(this.bucketName, fullName, buffer, file.size);
+    await this.client.putObject(this.bucketName, fullName, buffer, file.size, {
+      'Content-Type': file.mimetype,
+    });
 
     const fileUrl = await this.getFileUrl(context, fileName);
     return fileUrl;
@@ -34,7 +36,8 @@ export class S3Service {
     fileName: string,
   ): Promise<string> {
     const fullName = this.getFullFileName(context, fileName);
-    return await this.client.presignedUrl('GET', this.bucketName, fullName);
+    const fileUrl = `${this.configService.get('S3_BASE_URL')}/${this.bucketName}/${fullName}`;
+    return fileUrl;
   }
 
   async deleteFile(fileName: string) {

docker-compose.yaml

@@ -37,7 +37,7 @@ services:
       - "5001:5001"
       - "8080:8080"
     volumes:
-      - ipfs_data:/app/
+      - ipfs_data:/ipfs/datastore
     networks:
       - bloxico_local
     extra_hosts:
@@ -75,6 +75,9 @@ services:
     image: redis/redis-stack:latest
     container_name: cache
     restart: always
+    environment:
+      - REDIS_PASSWORD=your-redis-password
+    command: redis-server --requirepass ${REDIS_PASSWORD}
     ports:
       - "6379:6379"
     volumes:

frontend/example.env

@@ -1 +1,7 @@
-NEXT_PUBLIC_API_URL=http://backend:1337 # Container name goes here
+NEXT_PUBLIC_API_URL=http://backend:1337 # Container name goes here
+NEXT_PUBLIC_USERSNAP_SPACE_API_KEY=
+NEXT_PUBLIC_USERSNAP_PROJECT_API_KEY =
+NEXT_PUBLIC_HIDDEN_USERSNAP_PROJECT_IDS=
+NEXT_PUBLIC_IS_MAINNET=false
+
+

frontend/messages/de.json

@@ -243,27 +243,27 @@
     },
     "members": {
       "title": "No members found",
-      "description": "There is currently no members. Please check back later for updates"
+      "description": "There are currently no members. Please check back later for updates"
     },
     "latestUpdates": {
       "title": "No votes found",
-      "description": "There is currently no votes. Please check back later for updates"
+      "description": "There are currently no votes. Please check back later for updates"
     },
     "myActions": {
       "title": "No votes found",
-      "description": "There is currently no votes. Please check back later for updates"
+      "description": "There are currently no votes. Please check back later for updates"
     },
     "constitution": {
       "title": "No Constitution available",
       "description": "There is currently no Constitution uploaded. Please check back later for updates"
     },
     "constitutionMetadata": {
       "title": "No revisions available",
-      "description": "There is currently no revisions available. Please check back later for updates"
+      "description": "There are currently no revisions available. Please check back later for updates"
     },
     "governanceAction": {
       "title": "No governance actions available",
-      "description": "There is currently no governance actions. Please check back later for updates"
+      "description": "There are currently no governance actions. Please check back later for updates"
     }
   },
   "Snackbar": {

frontend/messages/en.json

@@ -243,27 +243,27 @@
     },
     "members": {
       "title": "No members found",
-      "description": "There is currently no members. Please check back later for updates"
+      "description": "There are currently no members. Please check back later for updates"
     },
     "latestUpdates": {
       "title": "No votes found",
-      "description": "There is currently no votes. Please check back later for updates"
+      "description": "There are currently no votes. Please check back later for updates"
     },
     "myActions": {
       "title": "No votes found",
-      "description": "There is currently no votes. Please check back later for updates"
+      "description": "There are currently no votes. Please check back later for updates"
     },
     "constitution": {
       "title": "No Constitution available",
       "description": "There is currently no Constitution uploaded. Please check back later for updates"
     },
     "constitutionMetadata": {
       "title": "No revisions available",
-      "description": "There is currently no revisions available. Please check back later for updates"
+      "description": "There are currently no revisions available. Please check back later for updates"
     },
     "governanceAction": {
       "title": "No governance actions available",
-      "description": "There is currently no governance actions. Please check back later for updates"
+      "description": "There are currently no governance actions. Please check back later for updates"
     }
   },
   "Snackbar": {

frontend/src/app/[locale]/my-actions/page.tsx

@@ -1,15 +1,15 @@
-import React, { Suspense } from "react";
+import { Suspense } from "react";
 
-import { unstable_setRequestLocale } from "next-intl/server"; // Import function to set the request-specific locale (unstable API).
-import { Footer, TopNav, MyActions } from "@organisms";
-import { Loading } from "@molecules";
 import { decodeUserToken, getUserVotes } from "@/lib/api";
 import { ContentWrapper } from "@atoms";
+import { Loading } from "@molecules";
+import { Footer, MyActions, TopNav } from "@organisms";
 import { isResponseErrorI } from "@utils";
+import { unstable_setRequestLocale } from "next-intl/server"; // Import function to set the request-specific locale (unstable API).
 
 export default async function MyActionsPage({
   params: { locale },
-  searchParams,
+  searchParams
 }) {
   unstable_setRequestLocale(locale); // Sets the locale for the request. Use cautiously due to its unstable nature.
   const user = await decodeUserToken();
@@ -19,10 +19,9 @@ export default async function MyActionsPage({
     govActionType: searchParams?.govActionType,
     vote: searchParams?.vote,
     sortBy: searchParams?.sortBy,
-    userId: user?.userId,
+    userId: user?.userId
   });
   const hasError = isResponseErrorI(userActions);
-
   return (
     <>
       <TopNav />
@@ -32,6 +31,7 @@ export default async function MyActionsPage({
             actions={!hasError && userActions?.data}
             paginationMeta={!hasError && userActions?.meta}
             error={hasError && userActions.error}
+            userId={user?.userId}
           />
           ;
         </Suspense>

frontend/src/components/atoms/OutlinedLightButton.tsx

@@ -1,8 +1,7 @@
 "use client";
 
-import React from "react";
-import { Button, SxProps, Theme } from "@mui/material";
 import { customPalette } from "@consts";
+import { Button, SxProps, Theme } from "@mui/material";
 import { ButtonProps } from "@mui/material/Button";
 
 interface Props extends ButtonProps {
@@ -23,11 +22,13 @@ export const OutlinedLightButton = ({
     color: customPalette.textBlack,
     fontWeight: 400,
     fontSize: 12,
-    whiteSpace: "nowrap",
+    lineHeight: "18px",
+    wordBreak: "break-word",
+
     "&": {
-      pointerEvents: nonInteractive ? "none" : "all",
-    },
-  };
+      pointerEvents: nonInteractive ? "none" : "all"
+    }
+  } as React.CSSProperties;
 
   return (
     <Button
@@ -36,7 +37,7 @@ export const OutlinedLightButton = ({
       onClick={nonInteractive ? undefined : onClick}
       sx={{
         ...defaultSxProps,
-        ...sx,
+        ...sx
       }}
       {...props}
     >

frontend/src/components/molecules/TableDivider.tsx

@@ -1,5 +1,5 @@
 import { customPalette } from "@/constants";
-import { Divider as MUIDivider, DividerProps, SxProps } from "@mui/material";
+import { DividerProps, Divider as MUIDivider, SxProps } from "@mui/material";
 
 interface Props extends DividerProps {
   sx?: SxProps;
@@ -16,10 +16,10 @@ export const TableDivider = ({
     orientation={orientation}
     flexItem={flexItem}
     sx={{
-      display: { xxs: "none", lg: "flex" },
+      display: { xxs: "none", md: "flex" },
       height: 38,
       alignSelf: "center",
-      ...sx,
+      ...sx
     }}
     {...props}
   />