Skip to content

Commit

Permalink
Feature request: Adding advertisement screen (#994)
Browse files Browse the repository at this point in the history
* Add/ test for OrgPost.tsx

* fix:  org post back to default

* Added Dialog 2

* Updated Dialog UI

* Removed Extra code

* Updated Plugin store

* fix: warnings and solves #951  & #948

* fix: warnings and solves #951  & #948

* fix: warnings and solves #951  & #948

* Fix: UI Redesign

* fix: merge

* fix

* Update AddOnStore.tsx

* Fixed Merge Errors

* Add test: for OrgEntry

* Test 3

* fix test 4

* chores: version changes

* Add: Initial Websocket setup on talawa mobile web

* Add: plugin logic

* Add: plugin logic

* removed extra

* removed extra

* Added: Tests

* fix

* Added WEBSOCKET_URL in .env.example

* Advertisement Management Screen

* Feature: Create and Delete advertisement

* Only current OrgIDs are visible to admin

* Showing advertisements in the User end app

* Message: fix

* formatting

* update test

* Fix # 1071

* Added test for entry file

* Added test for entry file2

* Added test for entry file2
  • Loading branch information
SiddheshKukade authored Nov 23, 2023
1 parent 61cd635 commit 6023584
Show file tree
Hide file tree
Showing 26 changed files with 2,120 additions and 7 deletions.
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

0 comments on commit 6023584

Please sign in to comment.