diff --git a/README.md b/README.md index 24bd23f..ac48568 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,9 @@ - [ ] __IMPORTANT__ なんか chat session expiry の判定あやしいかも - [ ] 幕間 hls pull のディレイへらす -## Setup +## Development + +## AWS Setup IVS and Chime SDK for Messaging are uncovered by Terraform :/ diff --git a/app/javascript/SubScreenAnnouncementsView.tsx b/app/javascript/SubScreenAnnouncementsView.tsx index 127fd29..22bc219 100644 --- a/app/javascript/SubScreenAnnouncementsView.tsx +++ b/app/javascript/SubScreenAnnouncementsView.tsx @@ -4,9 +4,10 @@ import loadable, { lazy } from "@loadable/component"; import { Track } from "./Api"; import { Api } from "./Api"; -import { Box, Skeleton } from "@chakra-ui/react"; +import { Box, Flex, Skeleton } from "@chakra-ui/react"; import dayjs from "dayjs"; +import { QRCodeSVG } from "qrcode.react"; const TICK_INTERVAL = 1; const ROTATE_INTERVAL = 12; @@ -36,9 +37,18 @@ export const SubScreenAnnouncementsView: React.FC<{ track: Track }> = ({ track } console.log("ann", ann); return ( }> - - {returnToBr(ann.content)} - + + + {returnToBr(ann.content)} + + {ann.url ? ( + <> + + + + + ) : null} + ); }; diff --git a/app/jobs/sync_conference_data_job.rb b/app/jobs/sync_conference_data_job.rb index 5e8b5ff..172f190 100644 --- a/app/jobs/sync_conference_data_job.rb +++ b/app/jobs/sync_conference_data_job.rb @@ -2,8 +2,8 @@ require 'open-uri' class SyncConferenceDataJob < ApplicationJob - DEFAULT_SPEAKERS_URL = 'https://rubykaigi.org/2022/data/speakers.yml' - DEFAULT_PRESENTATIONS_URL = 'https://rubykaigi.org/2022/data/presentations.yml' + DEFAULT_SPEAKERS_URL = 'https://rubykaigi.org/2023/data/speakers.yml' + DEFAULT_PRESENTATIONS_URL = 'https://rubykaigi.org/2023/data/presentations.yml' def perform(speakers_url_add: [], presentations_url_add: []) ApplicationRecord.transaction do @@ -79,6 +79,9 @@ def upload_speaker_avatars body: io, ) end + rescue OpenURI::HTTPError + p $! + end end end diff --git a/tf/aws.tf b/tf/aws.tf index 5134a8c..58fdf58 100644 --- a/tf/aws.tf +++ b/tf/aws.tf @@ -3,12 +3,12 @@ locals { } provider "aws" { - alias = "apne1" region = "ap-northeast-1" allowed_account_ids = [local.aws_account_id] default_tags { tags = { - Project = "takeout-app" + Project = "takeout-app" + Component = "takeout-app" } } } @@ -19,7 +19,8 @@ provider "aws" { allowed_account_ids = [local.aws_account_id] default_tags { tags = { - Project = "takeout-app" + Project = "takeout-app" + Component = "takeout-app" } } } @@ -30,7 +31,8 @@ provider "aws" { allowed_account_ids = [local.aws_account_id] default_tags { tags = { - Project = "takeout-app" + Project = "takeout-app" + Component = "takeout-app" } } } diff --git a/tf/s3.tf b/tf/s3.tf index 9466306..ec60cf2 100644 --- a/tf/s3.tf +++ b/tf/s3.tf @@ -47,8 +47,7 @@ resource "aws_s3_bucket_policy" "rk-takeout-app" { ########## resource "aws_s3_bucket" "rk-takeout-app-apne1" { - provider = aws.apne1 - bucket = "rk-takeout-app" + bucket = "rk-takeout-app" } data "aws_iam_policy_document" "s3-rk-takeout-app-apne1" { @@ -87,7 +86,6 @@ data "aws_iam_policy_document" "s3-rk-takeout-app-apne1" { } resource "aws_s3_bucket_policy" "rk-takeout-app-apne1" { - provider = aws.apne1 - bucket = aws_s3_bucket.rk-takeout-app-apne1.id - policy = data.aws_iam_policy_document.s3-rk-takeout-app-apne1.json + bucket = aws_s3_bucket.rk-takeout-app-apne1.id + policy = data.aws_iam_policy_document.s3-rk-takeout-app-apne1.json }