Skip to content
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.

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

Feature request: Adding advertisement screen #994

Merged
merged 50 commits into from
Nov 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
326c166
Add/ test for OrgPost.tsx
SiddheshKukade Feb 21, 2023
401b830
Merge branch 'develop' of https://github.com/SiddheshKukade/talawa-ad…
SiddheshKukade Apr 13, 2023
242d84c
fix: org post back to default
SiddheshKukade Apr 13, 2023
1d39563
Merge branch 'PalisadoesFoundation:develop' into develop
SiddheshKukade May 2, 2023
64110c9
Merge branch 'PalisadoesFoundation:develop' into develop
SiddheshKukade Jun 16, 2023
618edfc
Merge branch 'PalisadoesFoundation:develop' into develop
SiddheshKukade Jul 30, 2023
e4ee0a9
Added Dialog 2
SiddheshKukade Aug 4, 2023
38ce087
Updated Dialog UI
SiddheshKukade Aug 8, 2023
626d594
Removed Extra code
SiddheshKukade Aug 8, 2023
023c3ba
Updated Plugin store
SiddheshKukade Aug 8, 2023
24133fb
fix: warnings and solves #951 & #948
SiddheshKukade Aug 8, 2023
0dbc5c5
fix: warnings and solves #951 & #948
SiddheshKukade Aug 8, 2023
6856a13
fix: warnings and solves #951 & #948
SiddheshKukade Aug 8, 2023
8bb727f
Merge branch 'develop' into develop
SiddheshKukade Aug 19, 2023
419be97
Fix: UI Redesign
SiddheshKukade Aug 25, 2023
21427a3
fix: merge
SiddheshKukade Aug 25, 2023
5ed7867
fix
SiddheshKukade Aug 25, 2023
634bb94
Merge branch 'develop' into develop
SiddheshKukade Aug 30, 2023
6149b8b
Update AddOnStore.tsx
SiddheshKukade Aug 30, 2023
0661247
Fixed Merge Errors
SiddheshKukade Aug 30, 2023
4577c1d
Add test: for OrgEntry
SiddheshKukade Aug 30, 2023
2338ef3
Test 3
SiddheshKukade Aug 30, 2023
49fed8b
fix test 4
SiddheshKukade Aug 30, 2023
97dd714
Merge branch 'PalisadoesFoundation:develop' into develop
SiddheshKukade Sep 10, 2023
2496c02
Merge branch 'PalisadoesFoundation:develop' into develop
SiddheshKukade Sep 21, 2023
a8a73a9
chores: version changes
SiddheshKukade Sep 21, 2023
cdbe00d
Merge branch 'develop' of https://github.com/SiddheshKukade/talawa-ad…
SiddheshKukade Sep 21, 2023
3adab15
Add: Initial Websocket setup on talawa mobile web
SiddheshKukade Sep 21, 2023
e44817c
Add: plugin logic
SiddheshKukade Sep 23, 2023
b76db4d
Add: plugin logic
SiddheshKukade Sep 23, 2023
fca3778
removed extra
SiddheshKukade Sep 23, 2023
8d8bb56
removed extra
SiddheshKukade Sep 23, 2023
7c8a2dd
Added: Tests
SiddheshKukade Sep 24, 2023
e1fe027
Merge branch 'develop' into develop
SiddheshKukade Oct 8, 2023
00360d6
fix
SiddheshKukade Oct 8, 2023
eb57eb1
Merge branch 'PalisadoesFoundation:develop' into develop
SiddheshKukade Oct 9, 2023
eedc7ab
Added WEBSOCKET_URL in .env.example
SiddheshKukade Oct 16, 2023
d197af0
Advertisement Management Screen
SiddheshKukade Oct 19, 2023
140ff4a
Feature: Create and Delete advertisement
SiddheshKukade Oct 22, 2023
d8b25e1
Only current OrgIDs are visible to admin
SiddheshKukade Oct 22, 2023
6b79112
Showing advertisements in the User end app
SiddheshKukade Oct 22, 2023
51841bd
Message: fix
SiddheshKukade Oct 26, 2023
fc9de71
Merge branch 'develop' into develop
SiddheshKukade Oct 26, 2023
4054803
formatting
SiddheshKukade Oct 26, 2023
f7dfe9d
update test
SiddheshKukade Oct 26, 2023
f91b130
Fix # 1071
SiddheshKukade Nov 17, 2023
acc9067
Added test for entry file
SiddheshKukade Nov 17, 2023
6a67e7d
Added test for entry file2
SiddheshKukade Nov 17, 2023
e32b45b
Added test for entry file2
SiddheshKukade Nov 17, 2023
e1566b6
Merge branch 'PalisadoesFoundation:develop' into develop
SiddheshKukade Nov 17, 2023
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
5 changes: 4 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,7 @@ REACT_APP_USE_RECAPTCHA=
# from here for reCAPTCHA v2 and "I'm not a robot" Checkbox, and paste the key here.
# Note: In domains, fill localhost

REACT_APP_RECAPTCHA_SITE_KEY=
REACT_APP_RECAPTCHA_SITE_KEY=

# has to be inserted in the env file to use plugins and other websocket based features.
REACT_APP_BACKEND_WEBSOCKET_URL=ws://localhost:4000/graphql
20 changes: 20 additions & 0 deletions public/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
"Block/Unblock": "Block/Unblock",
"Plugins": "Plugins",
"Plugin Store": "Plugin Store",
"Advertisement": "Advertisements",
"allOrganizations": "All Organizations",
"yourOrganization": "Your Organization",
"notification": "Notification",
Expand Down Expand Up @@ -656,6 +657,25 @@
"event": "Event",
"organization": "Organization"
},
"advertisement": {
"title": "Advertisements",
"pHeading": "Manage Ads",
"activeAds": "Active Campaigns",
"archievedAds": "Completed Campaigns",
"pMessage": "Ads not present for this campaign.",
"delete": "Delete",
"Rname": "Enter name of Advertisement",
"Rtype": "Select type of Advertisement",
"Rlink": "Provide a link for content to be displayed",
"RstartDate": "Select Start Date",
"RendDate": "Select End Date",
"RClose": "Close the window",
"addNew": "Create new advertisement",
"EXname": "Ex. Cookie Shop",
"EXlink": "Ex. http://yourwebsite.com/photo",
"register": "Create Advertisement",
"close": "Close "
},
"userChat": {
"chat": "Chat",
"search": "Search",
Expand Down
8 changes: 8 additions & 0 deletions public/locales/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,14 @@
"event": "Événement",
"organization": "Organisation"
},
"advertisement": {
"title": "Publicités",
"pHeading": "Gérer les publicités",
"activeAds": "Campagnes actives",
"archievedAds": "Campagnes terminées",
"pMessage": "Aucune publicité n'est présente pour cette campagne.",
"delete": "Supprimer"
},
"userChat": {
"chat": "Chat",
"search": "Recherche",
Expand Down
8 changes: 8 additions & 0 deletions public/locales/hi.json
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,14 @@
"event": "आयोजन",
"organization": "संगठन"
},
"advertisement": {
"title": "विज्ञापन",
"pHeading": "विज्ञापन प्रबंधन",
"activeAds": "सक्रिय अभियान",
"archievedAds": "संपन्न अभियान",
"pMessage": "इस अभियान के लिए कोई विज्ञापन नहीं हैं।",
"delete": "हटाएँ"
},
"userChat": {
"chat": "बात",
"search": "खोज",
Expand Down
8 changes: 8 additions & 0 deletions public/locales/sp.json
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,14 @@
"event": "Evento",
"organization": "Organización"
},
"advertisement": {
"title": "Anuncios",
"pHeading": "Gestionar anuncios",
"activeAds": "Campañas activas",
"archievedAds": "Campañas completadas",
"pMessage": "No hay anuncios disponibles para esta campaña.",
"delete": "Eliminar"
},
"userChat": {
"chat": "Charlar",
"search": "Buscar",
Expand Down
8 changes: 8 additions & 0 deletions public/locales/zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,14 @@
"event": "事件",
"organization": "組織"
},
"advertisement": {
"title": "广告",
"pHeading": "管理广告",
"activeAds": "活动广告",
"archievedAds": "已完成的广告活动",
"pMessage": "此广告活动没有相关广告。",
"delete": "删除"
},
"userChat": {
"chat": "聊天",
"search": "搜尋",
Expand Down
Loading
Loading