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

Trim session 2023 #470

Merged
merged 4 commits into from
Jul 26, 2023
Merged

Trim session 2023 #470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b47ae28
remove hotline mentions
janikga Jul 26, 2023
746dc28
lower MAX_RESULTS to 50
janikga Jul 26, 2023
eaa96ca
remove email-related cloud functions
janikga Jul 26, 2023
2a49093
ci: lock node version to 10
janikga Jul 26, 2023
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
7 changes: 5 additions & 2 deletions .github/workflows/deploy-firebase.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,11 @@ jobs:
run:
working-directory: firebase/functions
steps:
- name: Checkout
uses: actions/checkout@master
- uses: actions/checkout@v3
- name: Use Node.js 10.x
uses: actions/setup-node@v3
with:
node-version: 10.x
- name: Install Dependencies
run: npm install
- name: Deploy
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/deploy-frontend.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@ jobs:
deploy-frontend:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@master
- uses: actions/checkout@v3
- name: Use Node.js 10.x
uses: actions/setup-node@v3
with:
node-version: 10.x
- name: Install dependencies
run: yarn install --frozen-lockfile
- name: Build
Expand Down
35 changes: 25 additions & 10 deletions .github/workflows/pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,23 @@ jobs:
lint-frontend:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@master
- uses: actions/checkout@v3
- name: Use Node.js 10.x
uses: actions/setup-node@v3
with:
node-version: 10.x
- name: Install dependencies
run: yarn install
- name: Lint
run: yarn lint
build-frontend:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@master
- uses: actions/checkout@v3
- name: Use Node.js 10.x
uses: actions/setup-node@v3
with:
node-version: 10.x
- name: Install Dependencies
run: yarn install
- name: Build
Expand All @@ -28,8 +34,11 @@ jobs:
test-frontend-mobile:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@master
- uses: actions/checkout@v3
- name: Use Node.js 10.x
uses: actions/setup-node@v3
with:
node-version: 10.x
- name: Install dependencies
run: yarn install
- name: Test frontend mobile
Expand All @@ -42,8 +51,11 @@ jobs:
test-frontend-desktop:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@master
- uses: actions/checkout@v3
- name: Use Node.js 10.x
uses: actions/setup-node@v3
with:
node-version: 10.x
- name: Install dependencies
run: yarn install
- name: Test frontend desktop
Expand All @@ -60,8 +72,11 @@ jobs:
run:
working-directory: firebase/functions
steps:
- name: Checkout
uses: actions/checkout@master
- uses: actions/checkout@v3
- name: Use Node.js 10.x
uses: actions/setup-node@v3
with:
node-version: 10.x
- name: Install Dependencies
run: npm install
- name: Lint
Expand Down
2 changes: 1 addition & 1 deletion firebase/functions/src/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const SMTP_PASSWORD = envVariables?.smtp?.password;
const SENDER_EMAIL = '[email protected]';

const REGION_EUROPE_WEST_1 = 'europe-west1';
const MAX_RESULTS = 200;
const MAX_RESULTS = 50;
const MAPS_ENABLED = true;
// How long we wait before we send email notifications after a person posted a help request
const MINIMUM_NOTIFICATION_DELAY_MINUTES = 30;
Expand Down
22 changes: 0 additions & 22 deletions firebase/functions/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import * as admin from 'firebase-admin';

import { REGION_EUROPE_WEST_1 } from './config';

import { handleAskForMoreHelp as handleAskForMoreHelpFunction } from './domain/handleAskForMoreHelp';
import { onAskForHelpCreate } from './domain/onAskForHelpCreate';
import { onDeletedCreate } from './domain/onDeletedCreate';
import { onUserDelete } from './domain/onUserDelete';
Expand All @@ -14,8 +13,6 @@ import { onSubscribeToBeNotifiedCreate } from './domain/onSubscribeToBeNotifiedC
import { searchAndSendNotificationEmails } from './domain/searchAndSendNotificationEmails';
import { updateGeoDB } from './domain/geoData';
import { onContentUpdate } from './domain/onContentUpdate';
import { sendEmailsForOpenOffersWithAnswers } from './domain/sendEmailsForOpenOffersWithAnswers';
import { sendEmailsForOpenOffersWithoutAnswers } from './domain/sendEmailsForOpenOffersWithoutAnswers';
import { sendNotificationsForHotlineRequests } from './domain/sendNotificationsForHotlineRequests';
import { sendEmails } from './domain/sendEmails';
import { onSlackInteraction } from './utilities/slack';
Expand All @@ -38,20 +35,6 @@ export const sendNotificationEmails = functions
.timeZone('Europe/Berlin')
.onRun(searchAndSendNotificationEmails);

export const sendNotificationEmailsForOpenOffersWithoutAnswers = functions
.region(REGION_EUROPE_WEST_1)
.pubsub
.schedule('00 9-22/6 * * *') // Every day at 9:00, 15:00 & 21:00. https://crontab.guru/#0_9-22/6_*_*_*
.timeZone('Europe/Berlin')
.onRun(sendEmailsForOpenOffersWithoutAnswers);

export const sendNotificationEmailsForOpenOffersWithAnswers = functions
.region(REGION_EUROPE_WEST_1)
.pubsub
.schedule('00 9-22/6 * * *') // Every day at 9:00, 15:00 & 21:00. https://crontab.guru/#0_9-22/6_*_*_*
.timeZone('Europe/Berlin')
.onRun(sendEmailsForOpenOffersWithAnswers);

export const sendSlackNotificationsForHotlineRequests = functions
.region(REGION_EUROPE_WEST_1)
.pubsub
Expand Down Expand Up @@ -95,11 +78,6 @@ export const offerHelpCreate = functions
.document(`/${CollectionName.AskForHelp}/{requestId}/offer-help/{offerId}`)
.onCreate(onOfferHelpCreate);

export const handleAskForMoreHelp = functions
.region(REGION_EUROPE_WEST_1)
.https
.onCall(handleAskForMoreHelpFunction);

export const deleteUserData = functions
.region(REGION_EUROPE_WEST_1)
.auth
Expand Down
6 changes: 2 additions & 4 deletions public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
benötigt wird.
Viele Menschen sind motiviert zu helfen und isolierte Personen in ihrem Umfeld zu unterstützen. Nur wissen sie
nicht, wo die Hilfe benötigt wird. Auf der Webseite können sich Personen in Quarantäne registrieren und
angeben, wo sie wohnen und welche Hilfe benötigt wird. Alternativ können sie Hilfe über die Telefonhotline anfragen.
angeben, wo sie wohnen und welche Hilfe benötigt wird.
Helfende werden nach ihrer Registrierung mit Angabe der Postleitzahl und Email-Adresse automatisch
benachrichtigt, wenn es Anfragen in ihrer Umgebung gibt. Die Anfragen können sich beispielsweise um Lebensmitteleinkäufe,
Erledigungen oder um Botengänge handeln. Nach der initialen Kontaktaufnahme werden alle weiteren Details
Expand All @@ -79,9 +79,7 @@
zurückgreifen können, haben über www.quarantaenehelden.org die Chance, sich mit allem Nötigen versorgen zu
lassen.

Da insbesondere ältere Menschen vielleicht keinen Zugang zum Internet haben, können ebenso über die kostenlose
Telefonhotline Anfragen gestellt werden: 0800 80 50 850 (kostenlos aus dem deutschen Netz, alternativ +4989
143770224). Außerdem besteht ebenso die Möglichkeit, stellvertretend Hilfsanfragen zu stellen. Beispielsweise erstellen
Es besteht ebenso die Möglichkeit, stellvertretend Hilfsanfragen zu stellen. Beispielsweise erstellen
häufig Kinder oder Enkelkinder für ihre (Groß-)Eltern eine Hilfsanfrage und finden so Helfende für ihre Lieben.

In kurzer Zeit konnten wir bereits über 38.000 Menschen dazu anregen, sich auf der Plattform zu registrieren.
Expand Down
25 changes: 0 additions & 25 deletions src/views/Main.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,31 +143,6 @@ export default function Main() {
</p>
</div>

{/* Hotline */}
<div className="w-full flex justify-center mt-4">
<div className="bg-primary -mb-8 rounded-full w-48 text-center text-xs text-white font-bold py-2 font-open-sans">
{t('views.main.hotline.ourHotline')}
</div>
</div>
<div className="bg-kaki p-4 mt-3 pt-8 mx-4 md:mx-0 flex items-center justify-center flex-col">
<a
className="text-3xl text-primary font-bold font-open-sans"
href={`tel:${t('views.main.hotline.number')}`}
>
{t('views.main.hotline.number')}
</a>
<div className="font-open-sans">{t('views.main.hotline.serviceHours')}</div>
<div className="text-xs">
{t('views.main.hotline.notGermany')}
{': '}
<a
href={`tel:${t('views.main.hotline.externalNumber')}`}
>
{t('views.main.hotline.externalNumber')}
</a>
</div>
</div>

{/* Rules */}
<div className="w-full flex justify-center mt-8">
<div className="bg-primary -mb-8 rounded-full w-48 text-center text-xs text-white font-bold py-2 font-open-sans">
Expand Down
Loading