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.

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

Fixes#3178 : Organisation Settings Page UI according to Figma #3268

Closed
wants to merge 16 commits into from
Closed

Fixes#3178 : Organisation Settings Page UI according to Figma #3268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
ffd14e5
Refactored css styles into app.modules.css
AceHunterr Jan 9, 2025
ed27afd
Removed Conflicts
AceHunterr Jan 9, 2025
4c416a1
Updated Settings UI
AceHunterr Jan 13, 2025
b4e85f7
Updated Settings UI
AceHunterr Jan 13, 2025
a4ee3c7
Updated Settings UI
AceHunterr Jan 13, 2025
44daf3a
Fixed bugs
AceHunterr Jan 13, 2025
4ec647b
Fixed conflicts
AceHunterr Jan 15, 2025
eb98a23
fixed ui changes
AceHunterr Jan 15, 2025
2b2e5ed
Fixed test issue
AceHunterr Jan 15, 2025
7e7bab2
Fixed UI changes for Org Settings Page
AceHunterr Jan 18, 2025
3944ced
Merge branch 'develop-postgres' of https://github.com/AceHunterr/tala…
AceHunterr Jan 18, 2025
975c0eb
Fixed bugs and suggestions
AceHunterr Jan 18, 2025
75b5929
fixed code rabit suggestions
AceHunterr Jan 18, 2025
a65444d
fixed code rabit suggestions
AceHunterr Jan 18, 2025
b9e52d7
Added code rabbit suggestions
AceHunterr Jan 19, 2025
82d39fa
Added code rabbit suggestions
AceHunterr Jan 19, 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
8 changes: 5 additions & 3 deletions public/locales/en/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -852,7 +852,7 @@
"title": "Settings",
"general": "General",
"actionItemCategories": "Action Item Categories",
"updateOrganization": "Update Organization",
"updateOrganization": "Edit Organization",
AceHunterr marked this conversation as resolved.
Show resolved Hide resolved
"seeRequest": "See Request",
"noData": "No data",
"otherSettings": "Other Settings",
Expand All @@ -861,8 +861,8 @@
"agendaItemCategories": "Agenda Item Categories"
},
"deleteOrg": {
"deleteOrganization": "Delete Organization",
"deleteSampleOrganization": "Delete Sample Organization",
"deleteOrganization": "Delete",
"deleteSampleOrganization": "Delete",
"deleteMsg": "Do you want to delete this organization?",
"confirmDelete": "Confirm Delete",
"longDelOrgMsg": "By clicking on Delete Organization button the organization will be permanently deleted along with its events, tags and all related data.",
Expand Down Expand Up @@ -914,11 +914,13 @@
"isVisibleInSearch": "Visible in Search",
"enterNameOrganization": "Enter Organization Name",
"successfulUpdated": "Organization updated successfully",
"changesReset": "Form Reset Successfully",
"name": "name",
"description": "description",
"location": "location",
"address": "address",
"displayImage": "displayImage",
"resetChanges": "resetChanges",
"saveChanges": "saveChanges",
"cancel": "cancel",
"talawaApiUnavailable": "talawaApiUnavailable"
Expand Down
4 changes: 3 additions & 1 deletion public/locales/fr/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -812,7 +812,7 @@
"title": "Paramètres",
"general": "Général",
"actionItemCategories": "Catégories d'éléments d'action",
"updateOrganization": "Mettre à jour l'organisation",
"updateOrganization": "Modifier l'organisation",
"seeRequest": "Voir la demande",
"noData": "Aucune donnée",
"otherSettings": "Autres paramètres",
Expand Down Expand Up @@ -874,6 +874,8 @@
"isVisibleInSearch": "Visible dans la recherche",
"enterNameOrganization": "Entrez le nom de l'organisation",
"successfulUpdated": "Organisation mise à jour avec succès",
"changesReset": "Formulaire réinitialisé avec succès",
AceHunterr marked this conversation as resolved.
Show resolved Hide resolved
"resetChanges": "réinitialiserLesModifications",
"name": "Nom",
"description": "Description",
"location": "Lieu",
Expand Down
4 changes: 3 additions & 1 deletion public/locales/hi/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -812,7 +812,7 @@
"title": "सेटिंग्स",
"general": "सामान्य",
"actionItemCategories": "कार्य आइटम श्रेणियाँ",
"updateOrganization": "संगठन अपडेट करें",
"updateOrganization": "संगठन संपादित करें",
"seeRequest": "अनुरोध देखें",
"noData": "कोई डेटा नहीं",
"otherSettings": "अन्य सेटिंग्स",
Expand Down Expand Up @@ -874,6 +874,8 @@
"isVisibleInSearch": "खोज में दृश्यमान",
"enterNameOrganization": "संगठन का नाम दर्ज करें",
"successfulUpdated": "संगठन सफलतापूर्वक अद्यतन किया गया",
"changesReset": "फ़ॉर्म सफलतापूर्वक रीसेट किया गया",
AceHunterr marked this conversation as resolved.
Show resolved Hide resolved
"resetChanges": "परिवर्तनरीसेटकरें",
"name": "नाम",
"description": "विवरण",
"location": "स्थान",
Expand Down
4 changes: 3 additions & 1 deletion public/locales/sp/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -813,7 +813,7 @@
"title": "Configuración",
"general": "General",
"actionItemCategories": "Categorías de elementos de acción",
"updateOrganization": "Actualizar organización",
"updateOrganization": "Editar organización",
"seeRequest": "Ver solicitud",
"noData": "Sin datos",
"otherSettings": "Otras configuraciones",
Expand Down Expand Up @@ -879,9 +879,11 @@
"userRegistrationRequired": "Registro de usuario requerido",
"isVisibleInSearch": "Visible en la búsqueda",
"saveChanges": "Guardar cambios",
"resetChanges": "restablecerCambios",
"cancel": "Cancelar",
"enterNameOrganization": "Ingrese el nombre de la organización",
"successfulUpdated": "Exitoso actualizado",
"changesReset": "Formulario restablecido con éxito",
AceHunterr marked this conversation as resolved.
Show resolved Hide resolved
"talawaApiUnavailable": "El servicio Talawa-API no está disponible. ¿Está funcionando? Compruebe también la conectividad de su red."
},
"addOnRegister": {
Expand Down
4 changes: 3 additions & 1 deletion public/locales/zh/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -812,7 +812,7 @@
"title": "设置",
"general": "一般的",
"actionItemCategories": "行动项目类别",
"updateOrganization": "更新组织",
"updateOrganization": "编辑组织",
"seeRequest": "查看请求",
"noData": "没有数据",
"otherSettings": "其他设置",
Expand Down Expand Up @@ -874,6 +874,8 @@
"isVisibleInSearch": "在搜索中可见",
"enterNameOrganization": "输入组织名称",
"successfulUpdated": "组织更新成功",
"changesReset": "表单重置成功",
AceHunterr marked this conversation as resolved.
Show resolved Hide resolved
"resetChanges": "重置更改",
"name": "名称",
"description": "描述",
"location": "位置",
Expand Down
Loading
Loading