Skip to content

Commit

Permalink
updated workflow to match new project
Browse files Browse the repository at this point in the history
rvaidun committed Apr 23, 2023
1 parent 425764e commit 5627e09
Showing 5 changed files with 23 additions and 15 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/firebase-hosting-merge.yml
Original file line number Diff line number Diff line change
@@ -2,20 +2,20 @@
# https://github.com/firebase/firebase-tools

name: Deploy to Firebase Hosting on merge
"on":
'on':
push:
branches:
- main
jobs:
build_and_deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- run: npm install
- run: npm run build
- uses: FirebaseExtended/action-hosting-deploy@v0
with:
repoToken: "${{ secrets.GITHUB_TOKEN }}"
firebaseServiceAccount: "${{ secrets.FIREBASE_SERVICE_ACCOUNT_BEREALVIEWER }}"
repoToken: '${{ secrets.GITHUB_TOKEN }}'
firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_BEFAKE_623AF }}'
channelId: live
projectId: berealviewer
projectId: befake-623af
12 changes: 6 additions & 6 deletions .github/workflows/firebase-hosting-pull-request.yml
Original file line number Diff line number Diff line change
@@ -2,17 +2,17 @@
# https://github.com/firebase/firebase-tools

name: Deploy to Firebase Hosting on PR
"on": pull_request
'on': pull_request
jobs:
build_and_preview:
if: "${{ github.event.pull_request.head.repo.full_name == github.repository }}"
if: '${{ github.event.pull_request.head.repo.full_name == github.repository }}'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- run: npm install
- run: npm run build
- uses: FirebaseExtended/action-hosting-deploy@v0
with:
repoToken: "${{ secrets.GITHUB_TOKEN }}"
firebaseServiceAccount: "${{ secrets.FIREBASE_SERVICE_ACCOUNT_BEREALVIEWER }}"
projectId: berealviewer
repoToken: '${{ secrets.GITHUB_TOKEN }}'
firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_BEFAKE_623AF }}'
projectId: befake-623af
6 changes: 5 additions & 1 deletion firebase.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
{
"hosting": {
"public": "dist",
"ignore": ["firebase.json", "**/.*", "**/node_modules/**"],
"ignore": [
"firebase.json",
"**/.*",
"**/node_modules/**"
],
"rewrites": [
{
"source": "**",
2 changes: 1 addition & 1 deletion postcss.config.js
Original file line number Diff line number Diff line change
@@ -3,4 +3,4 @@ module.exports = {
tailwindcss: {},
autoprefixer: {},
},
}
};
8 changes: 6 additions & 2 deletions src/components/ui/reactToAll.vue
Original file line number Diff line number Diff line change
@@ -71,7 +71,7 @@ export default {
return "success";
});
};
const postRealmoji = (d,postOwnerID, postID ) => {
const postRealmoji = (d, postOwnerID, postID) => {
return fetch(
`${this.$store.state.proxyUrl}/https://mobile.bereal.com/api/content/realmojis/instant?postId=${postID}&postUserId=${postOwnerID}`,
{
@@ -125,7 +125,11 @@ export default {
for (const post in this.postsLoaded) {
if (this.user.id != this.postsLoaded[post].ownerID) {
promises.push(
postRealmoji(uud, this.postsLoaded[post].ownerID, this.postsLoaded[post].id)
postRealmoji(
uud,
this.postsLoaded[post].ownerID,
this.postsLoaded[post].id
)
);
}
}

0 comments on commit 5627e09

Please sign in to comment.