Skip to content

Merge pull request #7 from Click4News/mapBox_secrets_fix #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ujwalkpl wants to merge 48 commits into
base: mapBox_secrets_fix
Choose a base branch
from
Open

Merge pull request #7 from Click4News/mapBox_secrets_fix #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
fa349f5
Merge pull request #7 from Click4News/mapBox_secrets_fix
ujwalkpl Apr 14, 2025
daf3f7c
Merge pull request #9 from Click4News/mapBox_secrets_fix
ujwalkpl Apr 14, 2025
76d77e9
Merge pull request #10 from Click4News/mapBox_secrets_fix
ujwalkpl Apr 14, 2025
f21e443
Added google sign in
ujwalkpl Apr 17, 2025
a4b7b5d
Added google sign in
ujwalkpl Apr 17, 2025
af56402
Added google sign in
ujwalkpl Apr 17, 2025
34ec191
Added google sign in
ujwalkpl Apr 17, 2025
744d15f
Added google sign in
ujwalkpl Apr 17, 2025
1dc5a0a
Merge pull request #12 from Click4News/feature/authentication
ujwalkpl Apr 17, 2025
4780136
Added google sign in
ujwalkpl Apr 17, 2025
8058e4c
Merge pull request #13 from Click4News/feature/authentication
ujwalkpl Apr 17, 2025
ea13138
Modified initial layout App.js
Hima-Varshith Apr 17, 2025
0a9dfe9
Pulled changes from main for email auth
Hima-Varshith Apr 17, 2025
c0c891f
Deleted old files for refactoring
Hima-Varshith Apr 17, 2025
cdf585a
Modified index and styles for css
Hima-Varshith Apr 17, 2025
496a5b3
Refactored the main Map Components
Hima-Varshith Apr 17, 2025
036163d
Added display controls and news filters
Hima-Varshith Apr 17, 2025
b00500d
Craeted button for adding news
Hima-Varshith Apr 17, 2025
98ff6bd
Merge pull request #14 from Click4News/feature/C4N-6-final-ui-modific…
ujwalkpl Apr 17, 2025
cc7b056
Added google sign in
ujwalkpl Apr 18, 2025
2d056e2
integrate create/like/fakeflag
ujwalkpl Apr 18, 2025
9d1a6a2
integrate create/like/fakeflag
ujwalkpl Apr 18, 2025
6a21dc7
integrate create/like/fakeflag
ujwalkpl Apr 18, 2025
11581de
Merge pull request #15 from Click4News/feature/integratesubmit
VarunSH-15-11-2001 Apr 18, 2025
b9b2d5d
Moved styles to common dir
Hima-Varshith Apr 19, 2025
061c854
Minor changes to left side panels
Hima-Varshith Apr 19, 2025
655d853
Modified the main component
Hima-Varshith Apr 19, 2025
1eb6fd5
Resolved popup card bug
Hima-Varshith Apr 19, 2025
2782a48
Added news button and submit modal
Hima-Varshith Apr 19, 2025
6363813
Added user stats panel to the right
Hima-Varshith Apr 19, 2025
7345334
Merge pull request #16 from Click4News/feature/C4N-6-final-ui-modific…
Hima-Varshith Apr 19, 2025
b5c855e
integrate create/like/fakeflag
ujwalkpl Apr 19, 2025
aaac3d8
UI fixes
ujwalkpl Apr 19, 2025
6d8f177
Merge pull request #17 from Click4News/feature/fixesUI
ujwalkpl Apr 19, 2025
0cfd207
Added User-Generated filter
Hima-Varshith Apr 19, 2025
9f2f19e
Closing modal on click of submit
Hima-Varshith Apr 19, 2025
270c4f5
Merge pull request #18 from Click4News/feature/C4N-6-final-ui-modific…
ujwalkpl Apr 19, 2025
31c0095
Background images added for sign-in page
Hima-Varshith Apr 20, 2025
fbbd14b
Modified App and EmailAuth for styling purpose
Hima-Varshith Apr 20, 2025
d28ba87
Modified App.js for retreivng user stats
Hima-Varshith Apr 21, 2025
9ebed89
Updated userstats prop
Hima-Varshith Apr 21, 2025
e123291
Modified the tier ranges
Hima-Varshith Apr 21, 2025
08e3941
Sending default link when its empty
Hima-Varshith Apr 21, 2025
edeed1b
Src, Trust and Date details added on Popupcard
Hima-Varshith Apr 21, 2025
36df772
Merge pull request #19 from Click4News/feature/C4N-6-final-ui-modific…
Hima-Varshith Apr 21, 2025
633315a
UI fixes
ujwalkpl Apr 21, 2025
724a87f
UI fixes
ujwalkpl Apr 21, 2025
6f8ba93
Merge pull request #20 from Click4News/feature/fixesUI
ujwalkpl Apr 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion .github/workflows/firebase-hosting-merge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,18 @@ jobs:
steps:
- uses: actions/checkout@v4

# 👇 Inject secret into build env
# ✅ Inject secrets into build environment
- name: Install and Build
run: npm ci && npm run build
env:
REACT_APP_MAPBOX_ACCESS_TOKEN: ${{ secrets.REACT_APP_MAPBOX_ACCESS_TOKEN }}
REACT_APP_FIREBASE_API_KEY: ${{ secrets.REACT_APP_FIREBASE_API_KEY }}
REACT_APP_FIREBASE_AUTH_DOMAIN: ${{ secrets.REACT_APP_FIREBASE_AUTH_DOMAIN }}
REACT_APP_FIREBASE_PROJECT_ID: ${{ secrets.REACT_APP_FIREBASE_PROJECT_ID }}
REACT_APP_FIREBASE_STORAGE_BUCKET: ${{ secrets.REACT_APP_FIREBASE_STORAGE_BUCKET }}
REACT_APP_FIREBASE_MESSAGING_SENDER_ID: ${{ secrets.REACT_APP_FIREBASE_MESSAGING_SENDER_ID }}
REACT_APP_FIREBASE_APP_ID: ${{ secrets.REACT_APP_FIREBASE_APP_ID }}
REACT_APP_FIREBASE_MEASUREMENT_ID: ${{ secrets.REACT_APP_FIREBASE_MEASUREMENT_ID }}

- uses: FirebaseExtended/action-hosting-deploy@v0
with:
Expand Down
9 changes: 8 additions & 1 deletion .github/workflows/firebase-hosting-pull-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,18 @@ jobs:
steps:
- uses: actions/checkout@v4

# 👇 Inject secret for PR build
# ✅ Inject secrets for PR build
- name: Install and Build
run: npm ci && npm run build
env:
REACT_APP_MAPBOX_ACCESS_TOKEN: ${{ secrets.REACT_APP_MAPBOX_ACCESS_TOKEN }}
REACT_APP_FIREBASE_API_KEY: ${{ secrets.REACT_APP_FIREBASE_API_KEY }}
REACT_APP_FIREBASE_AUTH_DOMAIN: ${{ secrets.REACT_APP_FIREBASE_AUTH_DOMAIN }}
REACT_APP_FIREBASE_PROJECT_ID: ${{ secrets.REACT_APP_FIREBASE_PROJECT_ID }}
REACT_APP_FIREBASE_STORAGE_BUCKET: ${{ secrets.REACT_APP_FIREBASE_STORAGE_BUCKET }}
REACT_APP_FIREBASE_MESSAGING_SENDER_ID: ${{ secrets.REACT_APP_FIREBASE_MESSAGING_SENDER_ID }}
REACT_APP_FIREBASE_APP_ID: ${{ secrets.REACT_APP_FIREBASE_APP_ID }}
REACT_APP_FIREBASE_MEASUREMENT_ID: ${{ secrets.REACT_APP_FIREBASE_MEASUREMENT_ID }}

- uses: FirebaseExtended/action-hosting-deploy@v0
with:
Expand Down
Loading