diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml index 637b803..9b2c413 100644 --- a/.github/workflows/firebase-hosting-merge.yml +++ b/.github/workflows/firebase-hosting-merge.yml @@ -18,8 +18,6 @@ jobs: - uses: FirebaseExtended/action-hosting-deploy@v0 with: repoToken: '${{ secrets.GITHUB_TOKEN }}' - firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_TCL_23_SHOPPING_LIST }}' + firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_TCL_23_SMART_SHOPPING_LIST }}' channelId: live - projectId: tcl-23-shopping-list - env: - FIREBASE_CLI_PREVIEWS: hostingchannels + projectId: tcl-23-smart-shopping-list diff --git a/.github/workflows/firebase-hosting-pull-request.yml b/.github/workflows/firebase-hosting-pull-request.yml index 20ea1aa..4fde3c3 100644 --- a/.github/workflows/firebase-hosting-pull-request.yml +++ b/.github/workflows/firebase-hosting-pull-request.yml @@ -5,6 +5,7 @@ name: Deploy to Firebase Hosting on PR 'on': pull_request jobs: build_and_preview: + if: '${{ github.event.pull_request.head.repo.full_name == github.repository }}' runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -15,7 +16,5 @@ jobs: - uses: FirebaseExtended/action-hosting-deploy@v0 with: repoToken: '${{ secrets.GITHUB_TOKEN }}' - firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_TCL_23_SHOPPING_LIST }}' - projectId: tcl-23-shopping-list - env: - FIREBASE_CLI_PREVIEWS: hostingchannels + firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_TCL_23_SMART_SHOPPING_LIST }}' + projectId: tcl-23-smart-shopping-list diff --git a/src/lib/firebase.js b/src/lib/firebase.js index fb335d3..a0c89ba 100644 --- a/src/lib/firebase.js +++ b/src/lib/firebase.js @@ -5,13 +5,12 @@ import 'firebase/firestore'; // Your web app's Firebase configuration const firebaseConfig = { - apiKey: 'AIzaSyB-RVe8Icisr03G002oOc9Un7GXFjIKe-M', - authDomain: 'tcl-23-shopping-list.firebaseapp.com', - databaseURL: 'https://tcl-23-shopping-list-default-rtdb.firebaseio.com', - projectId: 'tcl-23-shopping-list', - storageBucket: 'tcl-23-shopping-list.appspot.com', - messagingSenderId: '17231198664', - appId: '1:17231198664:web:180626daef3992d3cfe8fd', + apiKey: 'AIzaSyDSkQvP2IbPPeIcCw9SfsYPWa80HH7Ee7Q', + authDomain: 'tcl-23-smart-shopping-list.firebaseapp.com', + projectId: 'tcl-23-smart-shopping-list', + storageBucket: 'tcl-23-smart-shopping-list.appspot.com', + messagingSenderId: '52323845240', + appId: '1:52323845240:web:d46ea8eabee282dbc5998d', }; // Firebase configuration for the App