diff --git a/.firebaserc b/.firebaserc new file mode 100644 index 0000000..d5b713f --- /dev/null +++ b/.firebaserc @@ -0,0 +1,5 @@ +{ + "projects": { + "default": "debbie-store" + } +} diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml new file mode 100644 index 0000000..9e501cb --- /dev/null +++ b/.github/workflows/firebase-hosting-merge.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 merge +'on': + push: + branches: + - main +jobs: + build_and_deploy: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - run: npm run app + - uses: FirebaseExtended/action-hosting-deploy@v0 + with: + repoToken: '${{ secrets.GITHUB_TOKEN }}' + firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_DEBBIE_STORE }}' + channelId: live + projectId: debbie-store diff --git a/.github/workflows/firebase-hosting-pull-request.yml b/.github/workflows/firebase-hosting-pull-request.yml new file mode 100644 index 0000000..247c572 --- /dev/null +++ b/.github/workflows/firebase-hosting-pull-request.yml @@ -0,0 +1,17 @@ +# 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 +jobs: + build_and_preview: + if: '${{ github.event.pull_request.head.repo.full_name == github.repository }}' + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - run: npm run app + - uses: FirebaseExtended/action-hosting-deploy@v0 + with: + repoToken: '${{ secrets.GITHUB_TOKEN }}' + firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_DEBBIE_STORE }}' + projectId: debbie-store diff --git a/client/public/images/rabbits.png b/client/public/images/rabbits.png new file mode 100644 index 0000000..7541eaf Binary files /dev/null and b/client/public/images/rabbits.png differ diff --git a/client/public/images/yellow_rabbits.png b/client/public/images/yellow_rabbits.png new file mode 100644 index 0000000..6033e75 Binary files /dev/null and b/client/public/images/yellow_rabbits.png differ diff --git a/client/src/App.js b/client/src/App.js index b01fcaa..e69098c 100644 --- a/client/src/App.js +++ b/client/src/App.js @@ -21,6 +21,8 @@ import CancelScreen from "./screens/CancelScreen"; import YourOrdersScreen from "./screens/YourOrdersScreen"; import SuccessScreen from "./screens/SuccessScreen"; import AdminConsoleScreen from "./screens/AdminConsoleScreen"; +import IdeasScreen from "./screens/IdeasScreen"; +import IdeaScreen from "./screens/IdeaScreen"; function App() { const theme2 = extendTheme({ @@ -65,7 +67,9 @@ function App() { } /> } /> } /> - } /> + } /> + } /> + } />