Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Convert IFTTT env vars to public runtime config #325

Merged
merged 1 commit into from Aug 30, 2020
Merged

Convert IFTTT env vars to public runtime config #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions .env.sample
View file
Open in desktop
Expand Up @@ -48,10 +48,10 @@ WEB_CONCURRENCY=1
PUBLIC_SHOW_ADD_CATEGORY=

# IFTTT applet for rss subscription
LINE_IFTTT_APPLET_URL=
TELEGRAM_IFTTT_APPLET_URL=
SLACK_IFTTT_APPLET_URL=
PUBLIC_LINE_IFTTT_APPLET_URL=
PUBLIC_TELEGRAM_IFTTT_APPLET_URL=
PUBLIC_SLACK_IFTTT_APPLET_URL=

LINE_IFTTT_TUTORIAL_YOUTUBEID=
TELEGRAM_IFTTT_TUTORIAL_YOUTUBEID=
SLACK_IFTTT_TUTORIAL_YOUTUBEID=
PUBLIC_LINE_IFTTT_TUTORIAL_YOUTUBEID=
PUBLIC_TELEGRAM_IFTTT_TUTORIAL_YOUTUBEID=
PUBLIC_SLACK_IFTTT_TUTORIAL_YOUTUBEID=
24 changes: 16 additions & 8 deletions components/Subscribe/FeedDisplay.js
View file
Open in desktop
@@ -1,5 +1,6 @@
import { useState, useEffect, memo } from 'react';
import { t } from 'ttag';
import getConfig from 'next/config';
import Button from '@material-ui/core/Button';
import Popover from '@material-ui/core/Popover';
import RssFeedIcon from '@material-ui/icons/RssFeed';
Expand All @@ -25,10 +26,17 @@ import telegramIcon from './images/telegram.svg';
import slackIcon from './images/slack.svg';

import JsonUrl from 'json-url';
import getConfig from 'next/config';

const {
publicRuntimeConfig: { PUBLIC_URL },
publicRuntimeConfig: {
PUBLIC_URL,
PUBLIC_LINE_IFTTT_APPLET_URL,
PUBLIC_LINE_IFTTT_TUTORIAL_YOUTUBEID,
PUBLICTELEGRAM_IFTTT_APPLET_URL,
PUBLIC_TELEGRAM_IFTTT_TUTORIAL_YOUTUBEID,
PUBLIC_SLACK_IFTTT_APPLET_URL,
PUBLIC_SLACK_IFTTT_TUTORIAL_YOUTUBEID,
},
} = getConfig();

const useStyles = makeStyles(theme => ({
Expand Down Expand Up @@ -137,25 +145,25 @@ function FeedDisplay({ listQueryVars }) {
>
<IFTTTItem
icon={lineIcon}
IFTTTAppletUrl={process.env.LINE_IFTTT_APPLET_URL}
IFTTTAppletUrl={PUBLIC_LINE_IFTTT_APPLET_URL}
feedUrl={feedUrl}
tutorialYoutubeId={process.env.LINE_IFTTT_TUTORIAL_YOUTUBEID}
tutorialYoutubeId={PUBLIC_LINE_IFTTT_TUTORIAL_YOUTUBEID}
>
{'Line'}
</IFTTTItem>
<IFTTTItem
icon={telegramIcon}
IFTTTAppletUrl={process.env.TELEGRAM_IFTTT_APPLET_URL}
IFTTTAppletUrl={PUBLICTELEGRAM_IFTTT_APPLET_URL}
feedUrl={feedUrl}
tutorialYoutubeId={process.env.TELEGRAM_IFTTT_TUTORIAL_YOUTUBEID}
tutorialYoutubeId={PUBLIC_TELEGRAM_IFTTT_TUTORIAL_YOUTUBEID}
>
{'Telegram'}
</IFTTTItem>
<IFTTTItem
icon={slackIcon}
IFTTTAppletUrl={process.env.SLACK_IFTTT_APPLET_URL}
IFTTTAppletUrl={PUBLIC_SLACK_IFTTT_APPLET_URL}
feedUrl={feedUrl}
tutorialYoutubeId={process.env.SLACK_IFTTT_TUTORIAL_YOUTUBEID}
tutorialYoutubeId={PUBLIC_SLACK_IFTTT_TUTORIAL_YOUTUBEID}
>
{'Slack'}
</IFTTTItem>
Expand Down