Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion platforms/blabsy-w3ds-auth-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
"typeorm": "^0.3.20",
"uuid": "^9.0.1",
"graphql": "^16.8.1",
"graphql-request": "^6.1.0"
"graphql-request": "^6.1.0",
"web3-adapter": "workspace:*"
},
"devDependencies": {
"@types/cors": "^2.8.17",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Request, Response } from "express";
import { Web3Adapter } from "../../../../infrastructure/web3-adapter/src/index";
import { Web3Adapter } from "web3-adapter";
import path from "path";
import dotenv from "dotenv";
import { getFirestore } from "firebase-admin/firestore";
Expand Down
4 changes: 2 additions & 2 deletions platforms/eVoting/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@
"lucide-react": "^0.453.0",
"next": "15.4.2",
"next-qrcode": "^2.5.1",
"qrcode.react": "^3.1.0",
"qrcode.react": "^4.2.0",
"react": "19.1.0",
"react-day-picker": "^8.10.1",
"react-day-picker": "^9.11.1",
"react-dom": "19.1.0",
"react-hook-form": "^7.55.0",
"react-resizable-panels": "^2.1.9",
Expand Down
4 changes: 2 additions & 2 deletions platforms/eVoting/src/app/(auth)/login/page.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"use client";
import { useState, useEffect } from "react";
import { Card, CardHeader } from "@/components/ui/card";
import QRCode from "qrcode.react";
import { QRCodeSVG } from "qrcode.react";
import { useAuth } from "@/lib/auth-context";
import { setAuthToken, setAuthId } from "@/lib/authUtils";
import { isMobileDevice, getDeepLinkUrl } from "@/lib/utils/mobile-detection";
Expand Down Expand Up @@ -135,7 +135,7 @@ export default function LoginPage() {
</div>
) : (
<div className="p-4 bg-white rounded-lg">
<QRCode
<QRCodeSVG
value={qrData}
size={200}
level="M"
Expand Down
4 changes: 2 additions & 2 deletions platforms/eVoting/src/components/auth/login-screen.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"use client";

import React, { useEffect, useState } from "react";
import QRCode from "qrcode.react";
import { QRCodeSVG } from "qrcode.react";
import { useAuth } from "@/lib/auth-context";
import { apiClient } from "@/lib/apiClient";

Expand Down Expand Up @@ -73,7 +73,7 @@ export function LoginScreen() {
<div className="flex flex-col items-center space-y-6">
{qrCode ? (
<div className="p-4 bg-white border-2 border-gray-200 rounded-lg">
<QRCode
<QRCodeSVG
value={qrCode}
size={200}
level="M"
Expand Down
14 changes: 6 additions & 8 deletions platforms/eVoting/src/components/ui/calendar.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import * as React from "react"
import { ChevronLeft, ChevronRight } from "lucide-react"
import { DayPicker } from "react-day-picker"
import { DayPicker, Chevron } from "react-day-picker"

import { cn } from "@/lib/utils"
import { buttonVariants } from "@/components/ui/button"

export type CalendarProps = React.ComponentProps<typeof DayPicker>
export type CalendarProps = React.ComponentPropsWithoutRef<typeof DayPicker>

function Calendar({
className,
Expand Down Expand Up @@ -52,12 +52,10 @@ function Calendar({
...classNames,
}}
components={{
IconLeft: ({ className, ...props }) => (
<ChevronLeft className={cn("h-4 w-4", className)} {...props} />
),
IconRight: ({ className, ...props }) => (
<ChevronRight className={cn("h-4 w-4", className)} {...props} />
),
Chevron: ({ orientation, ...props }) => {
const Icon = orientation === "left" ? ChevronLeft : ChevronRight
return <Icon className="h-4 w-4" {...props} />
},
}}
{...props}
/>
Expand Down
3 changes: 2 additions & 1 deletion platforms/evoting-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
"pg": "^8.11.3",
"reflect-metadata": "^0.2.1",
"typeorm": "^0.3.24",
"uuid": "^9.0.1"
"uuid": "^9.0.1",
"web3-adapter": "workspace:*"
},
"devDependencies": {
"@types/cors": "^2.8.17",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
RemoveEvent,
ObjectLiteral,
} from "typeorm";
import { Web3Adapter } from "../../../../../infrastructure/web3-adapter/src/index";
import { Web3Adapter } from "web3-adapter";
import path from "path";
import dotenv from "dotenv";
import { AppDataSource } from "../../database/data-source";
Expand Down
3 changes: 2 additions & 1 deletion platforms/group-charter-manager-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
"pg": "^8.11.3",
"reflect-metadata": "^0.2.1",
"typeorm": "^0.3.24",
"uuid": "^9.0.1"
"uuid": "^9.0.1",
"web3-adapter": "workspace:*"
},
"devDependencies": {
"@types/cors": "^2.8.17",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Request, Response } from "express";
import { UserService } from "../services/UserService";
import { GroupService } from "../services/GroupService";
import { Web3Adapter } from "../../../../infrastructure/web3-adapter/src";
import { Web3Adapter } from "web3-adapter";
import { User } from "../database/entities/User";
import { Group } from "../database/entities/Group";
import axios from "axios";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import { AppDataSource } from "../database/data-source";
import { Group } from "../database/entities/Group";
import { createGroupEVault } from "../../../../infrastructure/web3-adapter/src/index";
import { createGroupEVault } from "web3-adapter";
import path from "path";
import dotenv from "dotenv";
import { IsNull } from "typeorm";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import {
RemoveEvent,
ObjectLiteral,
} from "typeorm";
import { Web3Adapter } from "../../../../../infrastructure/web3-adapter/src/index";
import { createGroupEVault } from "../../../../../infrastructure/web3-adapter/src/index";
import { Web3Adapter } from "web3-adapter";
import { createGroupEVault } from "web3-adapter";
import path from "path";
import dotenv from "dotenv";
import { AppDataSource } from "../../database/data-source";
Expand Down
2 changes: 1 addition & 1 deletion platforms/group-charter-manager/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@radix-ui/react-dropdown-menu": "^2.1.7",
"@radix-ui/react-label": "^2.1.3",
"@radix-ui/react-popover": "^1.1.7",
"@radix-ui/react-separator": "^1.1.0",
"@radix-ui/react-separator": "^1.1.7",
"@radix-ui/react-slot": "^1.2.0",
"@radix-ui/react-switch": "^1.1.4",
"@radix-ui/react-toast": "^1.2.14",
Expand Down
3 changes: 2 additions & 1 deletion platforms/pictique-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
"pg": "^8.11.3",
"reflect-metadata": "^0.2.1",
"typeorm": "^0.3.24",
"uuid": "^9.0.1"
"uuid": "^9.0.1",
"web3-adapter": "workspace:*"
},
"devDependencies": {
"@types/cors": "^2.8.17",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { UserService } from "../services/UserService";
import { ChatService } from "../services/ChatService";
import { PostService } from "../services/PostService";
import { CommentService } from "../services/CommentService";
import { Web3Adapter } from "../../../../infrastructure/web3-adapter/src";
import { Web3Adapter } from "web3-adapter";
import { User } from "database/entities/User";
import { Chat } from "database/entities/Chat";
import { Message } from "database/entities/Message";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
RemoveEvent,
ObjectLiteral,
} from "typeorm";
import { Web3Adapter } from "../../../../../infrastructure/web3-adapter/src/index";
import { Web3Adapter } from "web3-adapter";
import path from "path";
import dotenv from "dotenv";
import { AppDataSource } from "../../database/data-source";
Expand Down
Loading
Loading