diff --git a/android/app/google-services.json b/android/app/google-services.json index 4db4c064..ad50093b 100644 --- a/android/app/google-services.json +++ b/android/app/google-services.json @@ -1,47 +1,29 @@ { "project_info": { - "project_number": "877524083399", - "project_id": "httpsms-86c51", - "storage_bucket": "httpsms-86c51.appspot.com" + "project_number": "15327853725", + "project_id": "trinit-httpsms", + "storage_bucket": "trinit-httpsms.appspot.com" }, "client": [ { "client_info": { - "mobilesdk_app_id": "1:877524083399:android:5ceb08a909fd24a96514e2", + "mobilesdk_app_id": "1:15327853725:android:5395538f56e81ea25ae874", "android_client_info": { - "package_name": "com.httpsms" + "package_name": "org.powderpuffpeople.trinitentry" } }, - "oauth_client": [ - { - "client_id": "877524083399-londfmd80qqlb2gebpbhctavlmqtla3b.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "com.httpsms", - "certificate_hash": "58df9f7489b8bb5e3cd57f01a03d5e0068d8c185" - } - }, - { - "client_id": "877524083399-7pn57hd8k2js6tc93i428ko1m51mj50r.apps.googleusercontent.com", - "client_type": 3 - } - ], + "oauth_client": [], "api_key": [ { - "current_key": "AIzaSyBKiokmk5qhE2Zc5F97KWzOvRe8FDDuxDg" + "current_key": "AIzaSyAJGk3noumJYyPC-2C38rrei8TPBRP1Ja0" } ], "services": { "appinvite_service": { - "other_platform_oauth_client": [ - { - "client_id": "877524083399-7pn57hd8k2js6tc93i428ko1m51mj50r.apps.googleusercontent.com", - "client_type": 3 - } - ] + "other_platform_oauth_client": [] } } } ], "configuration_version": "1" -} +} \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 16e885e9..1cfaa844 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,13 +7,14 @@ services: POSTGRES_DB: httpsms POSTGRES_PASSWORD: dbpassword POSTGRES_USER: dbusername + # PGUSER: dbusername volumes: - postgres:/var/lib/postgresql/data ports: - "5435:5432" restart: on-failure healthcheck: - test: ["CMD-SHELL", "pg_isready", "-U", "dbusername", "-d", "httpsms"] + test: ["CMD-SHELL", "pg_isready -d httpsms -U dbusername"] interval: 30s timeout: 60s retries: 5 diff --git a/firebase-credentials.json b/firebase-credentials.json new file mode 100644 index 00000000..8bd00a44 --- /dev/null +++ b/firebase-credentials.json @@ -0,0 +1,13 @@ +{ + "type": "service_account", + "project_id": "trinit-httpsms", + "private_key_id": "76b6d138bcb5ec6a486d8b00ee146f2b50afd266", + "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC0aySZ14wCVX7h\nJdQH9i+TcTYgfGjcgD5PfAVcgjXui6uJG69vclj4pIocCm84d9g/IhDYw1SyO7Tw\n9XKLBPsRrUb5rfHJ7Sc5C9JF8wJFDO3sYyDicHz6VlcvpDwYV4fkTKCqOkwDgOyx\nKdnODbQdtTmDcMTjw9H//peSVC8a7ax11R0kT8BBQUneyANKme05pQRxbrpBsI4+\nCOWd2NbmjbDTkVpQFSOY7glaIoULv3M7xRN4/2EgWFqXiTcsqMLMHoqF8ojhn0XA\nU0RAJCsWQ0OitaI5vjA9UU1fbCj1HxqVzoTBATK0WvOmgk5kpbM7s8Jc6XPOfcu9\n/FJv3espAgMBAAECggEACbiKJAKoNKOWbs6C3zW/BRYA+uNPieEcOlxUZ58ZnwA5\nUYcp2GEUKFV2BLvB/iXK6d/nTqth/8M8ZQ08fjJzzdVRvff6AppVPJTr+Y112yWV\nF8fH7xttFT0b40e/xMOWlIQib5MtIrUw5S/7+cblCpxUlhK4SqaNRPQOBtOjwOYW\n2qRb2poGrP4zxAJOVMViumNgOXECuZceZCybDC1qIQpLmXOGsAvwHsIWYk/eBHcr\nN/nIFg2rDxp0Y/wd6TWuchKYfBuwpb+v4lGQz2saVwUY/YwNWn90l7R387w9iye1\nzfXxI447nFVe9yhTu/jSdqbnuTT8SdcrgoybFozrRwKBgQDcDuindFJQ1uV00xJy\nQN1RmbiaO1qotyQIa+biNC5p9HhgSwZWvlC0MqdTXZfd3v6zcQjXVWUhe+nE4wUc\n/t5YKC/T8+XtFdaobT6he464Htrq3iEAiMvak5pyZvGcMAn1ZiwzUgVN9frlLMjd\nJ2KRenWmOT7LsM4GHZOA19ZKKwKBgQDR4tDQ91SB+yIEfPCQJAYHAR1qcwDz+8J4\nZt8PKoAZst6yzyXJ2u5dEJx7IdLumvk/oCZJ6Um1fa4yD2R+PzDf+btM2knqqhze\nvzVwegwGDqtxiZXZe4dqD0fMOzqQaNxEB3OxufbQVnT8qvG7G7aIW1kYf78b4UMS\nMsLnIQ8Z+wKBgGTWVBf/voSapJSO8AH45TGyPhw2nIl5OoK9ZxQ6kxYsV0jQuDvh\ng7u/Blu2JJQfzhjN8B40XF4mmO2Gld4+kAZXi+sU9URZ4H5XaP64TqLiSLCdTwQe\nq0MipgBMWeSXQsj3o8N0j0e1Mt33Uqe8l3dQZT7hNnxCLXYx8Vh2DxT3AoGAMQzk\n6DElGstqA8p/HfCNSA3Gph4CVwK7TBAeiRjRny/iQ7+NgUMc+brsFwqslP66yVfQ\nGu3eQAADOcfHIIn8Dhv63dcV9zWSUaw1/PdI4BGFl58j2hO4bdzsVppw8VbQQ0XK\nj/p55+6MoJACtkufuPZAOC2CqC1Y02PxkLp1IQkCgYBxJJ6dLLzAWxeYoxLX3yjr\nD+crwE/uOn0N5SJVIPkEHnkbJ79swXaSxyGMRnRZ4kzPksa6oUja0IPfjlLtO7yi\nm6el9QMKoxjL8368APoSYD4SsSbsLHImGHSgf7YLUkzGX20k1mE06tXr8+iHTYCe\nAS2ie7kwUkUetQTfKNgztA==\n-----END PRIVATE KEY-----\n", + "client_email": "firebase-adminsdk-sg1um@trinit-httpsms.iam.gserviceaccount.com", + "client_id": "103860286706555933422", + "auth_uri": "https://accounts.google.com/o/oauth2/auth", + "token_uri": "https://oauth2.googleapis.com/token", + "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs", + "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/firebase-adminsdk-sg1um%40trinit-httpsms.iam.gserviceaccount.com", + "universe_domain": "googleapis.com" +} diff --git a/web/Dockerfile b/web/Dockerfile index 5b35076c..acf0ebc8 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -4,7 +4,9 @@ FROM node:lts-alpine as build WORKDIR /app COPY package*.json ./ - +RUN apk add --update --no-cache python3 && ln -sf python3 /usr/bin/python +RUN apk add make +RUN apk add build-base # Install pnpm RUN npm install -g pnpm diff --git a/websdconfig.js b/websdconfig.js new file mode 100644 index 00000000..d9399186 --- /dev/null +++ b/websdconfig.js @@ -0,0 +1,21 @@ +// Import the functions you need from the SDKs you need +import { initializeApp } from "firebase/app"; +import { getAnalytics } from "firebase/analytics"; +// TODO: Add SDKs for Firebase products that you want to use +// https://firebase.google.com/docs/web/setup#available-libraries + +// Your web app's Firebase configuration +// For Firebase JS SDK v7.20.0 and later, measurementId is optional +const firebaseConfig = { + apiKey: "AIzaSyB7ipnjRbNv2xe-T_2WQDJxh0ffesb4MHs", + authDomain: "trinit-httpsms.firebaseapp.com", + projectId: "trinit-httpsms", + storageBucket: "trinit-httpsms.appspot.com", + messagingSenderId: "15327853725", + appId: "1:15327853725:web:98cf0940f136e3105ae874", + measurementId: "G-D261LNGRNT" +}; + +// Initialize Firebase +const app = initializeApp(firebaseConfig); +const analytics = getAnalytics(app); \ No newline at end of file