diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml new file mode 100644 index 0000000..db76c70 --- /dev/null +++ b/.github/workflows/firebase-hosting-merge.yml @@ -0,0 +1,19 @@ +# This file was auto-generated by the Firebase CLI +# https://github.com/firebase/firebase-tools + +name: Deploy to Firebase Hosting on merge +on: + push: + branches: + - main +jobs: + build_and_deploy: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: FirebaseExtended/action-hosting-deploy@v0 + with: + repoToken: ${{ secrets.GITHUB_TOKEN }} + firebaseServiceAccount: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_UNISONREACT }} + channelId: live + projectId: unisonreact diff --git a/.github/workflows/firebase-hosting-pull-request.yml b/.github/workflows/firebase-hosting-pull-request.yml new file mode 100644 index 0000000..afd6641 --- /dev/null +++ b/.github/workflows/firebase-hosting-pull-request.yml @@ -0,0 +1,20 @@ +# This file was auto-generated by the Firebase CLI +# https://github.com/firebase/firebase-tools + +name: Deploy to Firebase Hosting on PR +on: pull_request +permissions: + checks: write + contents: read + pull-requests: write +jobs: + build_and_preview: + if: ${{ github.event.pull_request.head.repo.full_name == github.repository }} + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: FirebaseExtended/action-hosting-deploy@v0 + with: + repoToken: ${{ secrets.GITHUB_TOKEN }} + firebaseServiceAccount: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_UNISONREACT }} + projectId: unisonreact diff --git a/public/index.html b/public/index.html deleted file mode 100644 index 2ed289d..0000000 --- a/public/index.html +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - Welcome to Firebase Hosting - - - - - - - - - - - - - - - - - - - -
-

Welcome

-

Firebase Hosting Setup Complete

-

You're seeing this because you've successfully setup Firebase Hosting. Now it's time to go build something extraordinary!

- Open Hosting Documentation -
-

Firebase SDK Loading…

- - - - diff --git a/yin/.firebaserc b/yin/.firebaserc new file mode 100644 index 0000000..2fb6094 --- /dev/null +++ b/yin/.firebaserc @@ -0,0 +1,5 @@ +{ + "projects": { + "default": "unisonreactjs" + } +} diff --git a/yin/firebase.json b/yin/firebase.json new file mode 100644 index 0000000..f475554 --- /dev/null +++ b/yin/firebase.json @@ -0,0 +1,10 @@ +{ + "hosting": { + "public": "build", + "ignore": [ + "firebase.json", + "**/.*", + "**/node_modules/**" + ] + } +} diff --git a/yin/src/components/AboutPage.js b/yin/src/components/AboutPage.js index c0033c2..3b9a3d0 100644 --- a/yin/src/components/AboutPage.js +++ b/yin/src/components/AboutPage.js @@ -79,7 +79,7 @@ const AboutPage = () => { together - + ); diff --git a/yin/src/components/Main.js b/yin/src/components/Main.js index 06c59c1..8577750 100644 --- a/yin/src/components/Main.js +++ b/yin/src/components/Main.js @@ -163,7 +163,7 @@ const Main = () => { whileHover={{ scale: 1.1 }} whileTap={{ scale: 0.9 }} > - Dev + Mgr