Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/efdevcon/monorepo into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
lassejaco committed Oct 28, 2024
2 parents 0cb3254 + 040d342 commit 372b0c7
Show file tree
Hide file tree
Showing 38 changed files with 85 additions and 45 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,6 @@
"eventId": "devcon-7",
"slot_start": "2024-11-13T08:30:00.000Z",
"slot_end": "2024-11-13T11:30:00.000Z",
"slot_roomId": "classroom-e"
"slot_roomId": "classroom-e",
"resources_presentation": "https://docs.google.com/presentation/d/1gO904DKuSqj1sNQuLtbP57gbG3NphApmqMl4sI6azOs"
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@
"eventId": "devcon-7",
"slot_start": "2024-11-12T08:00:00.000Z",
"slot_end": "2024-11-12T08:30:00.000Z",
"slot_roomId": "stage-3"
"slot_roomId": "stage-3",
"resources_presentation": "https://docs.google.com/presentation/d/1dJRUdeeSAm3IMKjIUvUMfYutPBeDhcB5ai34k_UGutY"
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@
"eventId": "devcon-7",
"slot_start": "2024-11-13T08:50:00.000Z",
"slot_end": "2024-11-13T09:00:00.000Z",
"slot_roomId": "stage-4"
"slot_roomId": "stage-4",
"resources_presentation": "https://docs.google.com/presentation/d/1I12hDyQcy5XvNa2BYACXq82Cc7f1_Kw_-YiA4Yo9Lkw"
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,6 @@
"eventId": "devcon-7",
"slot_start": "2024-11-12T09:30:00.000Z",
"slot_end": "2024-11-12T10:00:00.000Z",
"slot_roomId": "stage-6"
"slot_roomId": "stage-6",
"resources_presentation": "https://docs.google.com/presentation/d/1nL-c7JYqWnQddW0BtHR56cUv9hNYnZFOgm3Ce4DvdEQ"
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,6 @@
"eventId": "devcon-7",
"slot_start": "2024-11-15T02:45:00.000Z",
"slot_end": "2024-11-15T02:55:00.000Z",
"slot_roomId": "stage-4"
"slot_roomId": "stage-4",
"resources_presentation": "https://docs.google.com/presentation/d/1Qq5x2EWSZ2rS2muLZB5exp9AEesPxIA-JBqnKej4-LQ"
}
3 changes: 2 additions & 1 deletion devcon-api/data/sessions/devcon-7/bringing-ai-on-chain.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@
"eventId": "devcon-7",
"slot_start": "2024-11-14T09:30:00.000Z",
"slot_end": "2024-11-14T11:00:00.000Z",
"slot_roomId": "classroom-b"
"slot_roomId": "classroom-b",
"resources_presentation": "https://docs.google.com/presentation/d/1u3q_4IFfuXzZDfanHnjTsWcClgoN_wAS6_wEi2qSxiU"
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@
"eventId": "devcon-7",
"slot_start": "2024-11-14T08:00:00.000Z",
"slot_end": "2024-11-14T08:10:00.000Z",
"slot_roomId": "stage-4"
"slot_roomId": "stage-4",
"resources_presentation": "https://docs.google.com/presentation/d/1UfdavDRYTsOiq_2t15-4vh9KLrcltw6zpHsdrX2d8DA"
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,6 @@
"eventId": "devcon-7",
"slot_start": "2024-11-15T04:00:00.000Z",
"slot_end": "2024-11-15T05:00:00.000Z",
"slot_roomId": "stage-6"
"slot_roomId": "stage-6",
"resources_presentation": "https://docs.google.com/presentation/d/1MVujY9JzCpdqRtOCYp2LMS83iZxI8agQ_40Y6msZg4I"
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,6 @@
"eventId": "devcon-7",
"slot_start": "2024-11-12T08:50:00.000Z",
"slot_end": "2024-11-12T09:00:00.000Z",
"slot_roomId": "stage-4"
"slot_roomId": "stage-4",
"resources_presentation": "https://docs.google.com/presentation/d/1Z6KNA8npIjlvXcTWwPrFhWHFQ9A2gd2wkiaNRb-bwuQ"
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@
"eventId": "devcon-7",
"slot_start": "2024-11-13T09:00:00.000Z",
"slot_end": "2024-11-13T09:30:00.000Z",
"slot_roomId": "classroom-c"
"slot_roomId": "classroom-c",
"resources_presentation": "https://docs.google.com/presentation/d/1hKCNu1k-EbMC3GsA0i_-SO8vLwgPTyED9D91FSwTjoU"
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@
"eventId": "devcon-7",
"slot_start": "2024-11-15T05:00:00.000Z",
"slot_end": "2024-11-15T06:00:00.000Z",
"slot_roomId": "stage-6"
"slot_roomId": "stage-6",
"resources_presentation": "https://docs.google.com/presentation/d/1SpHoMINj55MzEUWqqO7ToaiDbowMedsSM9tKnMWMaSY"
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@
"eventId": "devcon-7",
"slot_start": "2024-11-13T04:00:00.000Z",
"slot_end": "2024-11-13T04:30:00.000Z",
"slot_roomId": "stage-2"
"slot_roomId": "stage-2",
"resources_presentation": "https://docs.google.com/presentation/d/1B7KXH5uVHB04jWwnsYtQMYYbRlXaYPjx6HTM5n2vYhk"
}
3 changes: 2 additions & 1 deletion devcon-api/data/sessions/devcon-7/evolution-of-scams.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,6 @@
"eventId": "devcon-7",
"slot_start": "2024-11-12T10:50:00.000Z",
"slot_end": "2024-11-12T11:00:00.000Z",
"slot_roomId": "stage-4"
"slot_roomId": "stage-4",
"resources_presentation": "https://docs.google.com/presentation/d/1fLuDyHluumURppoq7gyTD9d7Z-wKLdy5qsCg-Tytso0"
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,6 @@
"eventId": "devcon-7",
"slot_start": "2024-11-14T07:40:00.000Z",
"slot_end": "2024-11-14T08:10:00.000Z",
"slot_roomId": "stage-1"
"slot_roomId": "stage-1",
"resources_presentation": "https://docs.google.com/presentation/d/1MowR6E3eFzSs1jXPUxgTBxReXgDFk6pgjqMA7hnC7t8"
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,6 @@
"eventId": "devcon-7",
"slot_start": "2024-11-14T09:10:00.000Z",
"slot_end": "2024-11-14T09:40:00.000Z",
"slot_roomId": "stage-1"
"slot_roomId": "stage-1",
"resources_presentation": "https://docs.google.com/presentation/d/1lz7gYMVKQCLb5914Y9OWEh4uWk8dcQ8g132fAtGQIuQ"
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@
"eventId": "devcon-7",
"slot_start": "2024-11-14T08:10:00.000Z",
"slot_end": "2024-11-14T08:20:00.000Z",
"slot_roomId": "stage-2"
"slot_roomId": "stage-2",
"resources_presentation": "https://docs.google.com/presentation/d/1DOTMyJmIPI5tdLiG_5PoOmjA44ieroq22BSvZjFN9no"
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@
"eventId": "devcon-7",
"slot_start": "2024-11-14T06:10:00.000Z",
"slot_end": "2024-11-14T06:20:00.000Z",
"slot_roomId": "stage-4"
"slot_roomId": "stage-4",
"resources_presentation": "https://docs.google.com/presentation/d/1aXt8K7kJm7xJ0limjmVm0ZVioUUzgILAGxnm6NBfVoU"
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@
"eventId": "devcon-7",
"slot_start": "2024-11-14T02:55:00.000Z",
"slot_end": "2024-11-14T03:05:00.000Z",
"slot_roomId": "stage-4"
"slot_roomId": "stage-4",
"resources_presentation": "https://docs.google.com/presentation/d/1aMtbpw97Q1DjqYA3pKLPTVpJ9vWOJoduN-rGCXYlHck"
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@
"eventId": "devcon-7",
"slot_start": "2024-11-15T04:00:00.000Z",
"slot_end": "2024-11-15T04:30:00.000Z",
"slot_roomId": "mainstage"
"slot_roomId": "mainstage",
"resources_presentation": "https://docs.google.com/presentation/d/1Xn-t83UrHqZiD2z9Y1uuRL-w6SCGvLF-dX6-cK0TwYM"
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@
"eventId": "devcon-7",
"slot_start": "2024-11-13T10:30:00.000Z",
"slot_end": "2024-11-13T11:00:00.000Z",
"slot_roomId": "stage-6"
"slot_roomId": "stage-6",
"resources_presentation": "https://docs.google.com/presentation/d/1iPCFSCb5vpiqtzwoYxszBwbVcjQ5iI86jv7FH1Uo3E8"
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@
"eventId": "devcon-7",
"slot_start": "2024-11-13T11:00:00.000Z",
"slot_end": "2024-11-13T11:30:00.000Z",
"slot_roomId": "stage-6"
"slot_roomId": "stage-6",
"resources_presentation": "https://docs.google.com/presentation/d/1f-XpVYzA-AiFID7laGqTa-L6kAXqGezXQRCWQw-a-L4"
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@
"eventId": "devcon-7",
"slot_start": "2024-11-13T04:30:00.000Z",
"slot_end": "2024-11-13T05:00:00.000Z",
"slot_roomId": "stage-5"
"slot_roomId": "stage-5",
"resources_presentation": "https://docs.google.com/presentation/d/1GhOQePXCr0xuShvpJcgSNAMhIC_wT2B34JYiogZJB7s"
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@
"eventId": "devcon-7",
"slot_start": "2024-11-15T03:30:00.000Z",
"slot_end": "2024-11-15T03:40:00.000Z",
"slot_roomId": "stage-5"
"slot_roomId": "stage-5",
"resources_presentation": "https://docs.google.com/presentation/d/1kRi6qfFHeK8txYMq58KLUaOTV4stHccKNP0m-WyZWWg"
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,6 @@
"eventId": "devcon-7",
"slot_start": "2024-11-14T10:30:00.000Z",
"slot_end": "2024-11-14T11:00:00.000Z",
"slot_roomId": "stage-3"
"slot_roomId": "stage-3",
"resources_presentation": "https://docs.google.com/presentation/d/1xFEtAafqxxm1b1UAUHGb8bnoWg9x6qZQdGRk_3lPM8Y"
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,6 @@
"eventId": "devcon-7",
"slot_start": "2024-11-13T10:20:00.000Z",
"slot_end": "2024-11-13T10:30:00.000Z",
"slot_roomId": "classroom-a"
"slot_roomId": "classroom-a",
"resources_presentation": "https://docs.google.com/presentation/d/1_ATKYtQF_Q_hjc85bqwcab990AdWWjiO8FiSDVR2BMg"
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,6 @@
"eventId": "devcon-7",
"slot_start": "2024-11-12T07:30:00.000Z",
"slot_end": "2024-11-12T08:00:00.000Z",
"slot_roomId": "stage-1"
"slot_roomId": "stage-1",
"resources_presentation": "https://docs.google.com/presentation/d/13NjraDw6-VLGwVGpYUmZprFK68Rq7uVHZ7yVIgSx7Q0"
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@
"eventId": "devcon-7",
"slot_start": "2024-11-13T11:00:00.000Z",
"slot_end": "2024-11-13T11:30:00.000Z",
"slot_roomId": "stage-2"
"slot_roomId": "stage-2",
"resources_presentation": "https://docs.google.com/presentation/d/1CkoCHWyFJ_4IDI_puC1cfrAXBQJADtCY7bYExgXn3xQ"
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,6 @@
"eventId": "devcon-7",
"slot_start": "2024-11-13T03:30:00.000Z",
"slot_end": "2024-11-13T04:30:00.000Z",
"slot_roomId": "stage-1"
"slot_roomId": "stage-1",
"resources_presentation": "https://docs.google.com/presentation/d/1ADQtojPz5zGpvoa8L2aH0vcyddEYsowQH6-jcNkUIMU"
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,6 @@
"eventId": "devcon-7",
"slot_start": "2024-11-15T04:00:00.000Z",
"slot_end": "2024-11-15T04:30:00.000Z",
"slot_roomId": "stage-3"
"slot_roomId": "stage-3",
"resources_presentation": "https://docs.google.com/presentation/d/1b-4F9L2PRDflpHb2iAzeGwsuH6cvqfh3FMJsnOPZOtc"
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,6 @@
"eventId": "devcon-7",
"slot_start": "2024-11-13T04:30:00.000Z",
"slot_end": "2024-11-13T05:00:00.000Z",
"slot_roomId": "stage-2"
"slot_roomId": "stage-2",
"resources_presentation": "https://docs.google.com/presentation/d/1hihFfnTMBS1Mmp0aS3oHwzA-PX43SVRFqlRfNkbtOwU"
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,6 @@
"eventId": "devcon-7",
"slot_start": "2024-11-12T06:00:00.000Z",
"slot_end": "2024-11-12T06:30:00.000Z",
"slot_roomId": "stage-1"
"slot_roomId": "stage-1",
"resources_presentation": "https://docs.google.com/presentation/d/1aEeDer7GTTFvo4hdDKqx3zqCVAtFdk2XqVNuiRomMTc"
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,6 @@
"eventId": "devcon-7",
"slot_start": "2024-11-14T04:30:00.000Z",
"slot_end": "2024-11-14T05:00:00.000Z",
"slot_roomId": "stage-5"
"slot_roomId": "stage-5",
"resources_presentation": "https://docs.google.com/presentation/d/1sCbCcL_kcX8oEU3I_BJLpuFgt1wzgpYDENnympxQ7iI"
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@
"eventId": "devcon-7",
"slot_start": "2024-11-13T08:50:00.000Z",
"slot_end": "2024-11-13T09:00:00.000Z",
"slot_roomId": "classroom-a"
"slot_roomId": "classroom-a",
"resources_presentation": "https://docs.google.com/presentation/d/1gUdSnWcxJdTYFT1JrkVP_VWgSxrlBCcEuwRk8pzgBSA"
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,6 @@
"eventId": "devcon-7",
"slot_start": "2024-11-13T05:00:00.000Z",
"slot_end": "2024-11-13T05:30:00.000Z",
"slot_roomId": "stage-2"
"slot_roomId": "stage-2",
"resources_presentation": "https://docs.google.com/presentation/d/1p0VlUcR1aOi--jA4hFb8aBF8mAWBuf-2vwun38CXBtI"
}
4 changes: 2 additions & 2 deletions devcon-api/data/speakers/abhishek-bhattacharya.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"sourceId": "UQR8TJ",
"name": "Abhishek Bhattacharya",
"description": "Abhishek is a Co-founder at Whrrl - India's only blockchain native fintech platform. He's a Forbes 30 under 30 honoree and a 3-times Entrepreneur, Author, and a regular Speaker of Blockchain Tech. At Whrrl, he's bringing Blockchain to farmers to save their income, covering 1,400 warehouses & 18,000+ farmers and US $300 Million in committed TVL and now connecting them to global DeFi lenders, supported by United Nations Development Programme, IIM Ahmedabad and MassC",
"twitter": "https:/www.twitter.com/abhib3012",
"twitter": "abhib3012",
"avatar": "http://speak.devcon.org/media/avatars/4C189F53-A6C7-42B6-84C5-BB3DC8569EE0_tdDNCY9.JPG"
}
}
4 changes: 2 additions & 2 deletions devcon-api/src/clients/slides.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ const SCOPES = ['https://www.googleapis.com/auth/presentations', 'https://www.go
const DRIVE_ID = '0AJsI-Zeg-2IbUk9PVA'
const FOLDER_ID = '1IXkffNcDyycQe5Cxrc9Dtirgw1WitV1j'
const TEMPLATE_ID = '1pDxePJwWHpzIxIjl3OZVnkS9N_tBQKRfg57PeEkTqeU'
const sendEmail = false
const emailMessage = ''
const sendEmail = true
const emailMessage = 'Your Devcon 7 presentation'

let client: GoogleApis | null = null

Expand Down
8 changes: 7 additions & 1 deletion devcon-api/src/scripts/sync-pretalx.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,13 @@ async function createPresentations() {
if (session) {
const speakerEmails = session.speakers.map((speaker: any) => speaker.email).filter(Boolean)

await CreatePresentationFromTemplate(session.title, session.sourceId, speakerEmails)
const id = await CreatePresentationFromTemplate(session.title, session.sourceId, speakerEmails)
if (id) {
fs.writeFileSync(
`./data/sessions/devcon-7/${sessionFs.id}.json`,
JSON.stringify({ ...sessionFs, resources_presentation: `https://docs.google.com/presentation/d/${id}` }, null, 2)
)
}
} else {
console.log(`Session ${sessionFs.id} not found in Pretalx data`)
}
Expand Down
12 changes: 6 additions & 6 deletions devcon-app/src/components/domain/app/account/settings/Wallet.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,6 @@ export default function WalletSettings() {
const [loginWeb3, setLoginWeb3] = useState(false)
const { signMessageAsync } = useSignMessage()

if (!accountContext.account) {
return <></>
}

const canDelete = accountContext.account?.addresses?.length > 0 && !!accountContext.account.email

const addWallet = async () => {
if (!address) {
await open()
Expand Down Expand Up @@ -88,6 +82,12 @@ export default function WalletSettings() {
setPromptRemove('')
}

if (!accountContext.account) {
return <></>
}

const canDelete = accountContext.account?.addresses?.length > 0 && !!accountContext.account.email

return (
<>
<div data-type="settings-layout" className={cn('flex flex-row lg:gap-3 relative')}>
Expand Down

0 comments on commit 372b0c7

Please sign in to comment.