From bb0d6329e7e36ea03671318ea8dd128a6d5a5a7a Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Thu, 8 Sep 2022 16:25:18 +0200 Subject: [PATCH 1/3] add new yunite icons --- webapp/assets/_new/icons/svgs/culture.svg | 20 ++++++++++ webapp/assets/_new/icons/svgs/energy.svg | 14 +++++++ webapp/assets/_new/icons/svgs/finance.svg | 13 +++++++ webapp/assets/_new/icons/svgs/health.svg | 7 ++++ webapp/assets/_new/icons/svgs/media.svg | 7 ++++ .../assets/_new/icons/svgs/miscellaneous.svg | 13 +++++++ webapp/assets/_new/icons/svgs/mobility.svg | 11 ++++++ webapp/assets/_new/icons/svgs/movement.svg | 39 +++++++++---------- webapp/assets/_new/icons/svgs/nature.svg | 18 +++++++++ webapp/assets/_new/icons/svgs/networking.svg | 22 +++++++++++ webapp/assets/_new/icons/svgs/peace.svg | 8 ++++ webapp/assets/_new/icons/svgs/politics.svg | 12 ++++++ webapp/assets/_new/icons/svgs/psyche.svg | 8 ++++ webapp/assets/_new/icons/svgs/science.svg | 25 ++++++++++++ .../assets/_new/icons/svgs/spirituality.svg | 13 +++++++ 15 files changed, 210 insertions(+), 20 deletions(-) create mode 100644 webapp/assets/_new/icons/svgs/culture.svg create mode 100644 webapp/assets/_new/icons/svgs/energy.svg create mode 100644 webapp/assets/_new/icons/svgs/finance.svg create mode 100644 webapp/assets/_new/icons/svgs/health.svg create mode 100644 webapp/assets/_new/icons/svgs/media.svg create mode 100644 webapp/assets/_new/icons/svgs/miscellaneous.svg create mode 100644 webapp/assets/_new/icons/svgs/mobility.svg create mode 100644 webapp/assets/_new/icons/svgs/nature.svg create mode 100644 webapp/assets/_new/icons/svgs/networking.svg create mode 100644 webapp/assets/_new/icons/svgs/peace.svg create mode 100644 webapp/assets/_new/icons/svgs/politics.svg create mode 100644 webapp/assets/_new/icons/svgs/psyche.svg create mode 100644 webapp/assets/_new/icons/svgs/science.svg create mode 100644 webapp/assets/_new/icons/svgs/spirituality.svg diff --git a/webapp/assets/_new/icons/svgs/culture.svg b/webapp/assets/_new/icons/svgs/culture.svg new file mode 100644 index 000000000..d63e38cb4 --- /dev/null +++ b/webapp/assets/_new/icons/svgs/culture.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/webapp/assets/_new/icons/svgs/energy.svg b/webapp/assets/_new/icons/svgs/energy.svg new file mode 100644 index 000000000..5035a5586 --- /dev/null +++ b/webapp/assets/_new/icons/svgs/energy.svg @@ -0,0 +1,14 @@ + + + diff --git a/webapp/assets/_new/icons/svgs/finance.svg b/webapp/assets/_new/icons/svgs/finance.svg new file mode 100644 index 000000000..74081bc6a --- /dev/null +++ b/webapp/assets/_new/icons/svgs/finance.svg @@ -0,0 +1,13 @@ + + + + diff --git a/webapp/assets/_new/icons/svgs/health.svg b/webapp/assets/_new/icons/svgs/health.svg new file mode 100644 index 000000000..acf50d7c1 --- /dev/null +++ b/webapp/assets/_new/icons/svgs/health.svg @@ -0,0 +1,7 @@ + + + + diff --git a/webapp/assets/_new/icons/svgs/media.svg b/webapp/assets/_new/icons/svgs/media.svg new file mode 100644 index 000000000..d63c98610 --- /dev/null +++ b/webapp/assets/_new/icons/svgs/media.svg @@ -0,0 +1,7 @@ + + + + diff --git a/webapp/assets/_new/icons/svgs/miscellaneous.svg b/webapp/assets/_new/icons/svgs/miscellaneous.svg new file mode 100644 index 000000000..07f8dbe3f --- /dev/null +++ b/webapp/assets/_new/icons/svgs/miscellaneous.svg @@ -0,0 +1,13 @@ + + + + diff --git a/webapp/assets/_new/icons/svgs/mobility.svg b/webapp/assets/_new/icons/svgs/mobility.svg new file mode 100644 index 000000000..9e36ec21e --- /dev/null +++ b/webapp/assets/_new/icons/svgs/mobility.svg @@ -0,0 +1,11 @@ + + + diff --git a/webapp/assets/_new/icons/svgs/movement.svg b/webapp/assets/_new/icons/svgs/movement.svg index ac5cd9cc0..81052875d 100644 --- a/webapp/assets/_new/icons/svgs/movement.svg +++ b/webapp/assets/_new/icons/svgs/movement.svg @@ -1,20 +1,19 @@ - - - - - - - - - - - + + + + diff --git a/webapp/assets/_new/icons/svgs/nature.svg b/webapp/assets/_new/icons/svgs/nature.svg new file mode 100644 index 000000000..d40250af4 --- /dev/null +++ b/webapp/assets/_new/icons/svgs/nature.svg @@ -0,0 +1,18 @@ + + + + diff --git a/webapp/assets/_new/icons/svgs/networking.svg b/webapp/assets/_new/icons/svgs/networking.svg new file mode 100644 index 000000000..b8d35da69 --- /dev/null +++ b/webapp/assets/_new/icons/svgs/networking.svg @@ -0,0 +1,22 @@ + + + + + diff --git a/webapp/assets/_new/icons/svgs/peace.svg b/webapp/assets/_new/icons/svgs/peace.svg new file mode 100644 index 000000000..408601cae --- /dev/null +++ b/webapp/assets/_new/icons/svgs/peace.svg @@ -0,0 +1,8 @@ + + + diff --git a/webapp/assets/_new/icons/svgs/politics.svg b/webapp/assets/_new/icons/svgs/politics.svg new file mode 100644 index 000000000..35322097d --- /dev/null +++ b/webapp/assets/_new/icons/svgs/politics.svg @@ -0,0 +1,12 @@ + + + + + diff --git a/webapp/assets/_new/icons/svgs/psyche.svg b/webapp/assets/_new/icons/svgs/psyche.svg new file mode 100644 index 000000000..8c285d5ca --- /dev/null +++ b/webapp/assets/_new/icons/svgs/psyche.svg @@ -0,0 +1,8 @@ + + + diff --git a/webapp/assets/_new/icons/svgs/science.svg b/webapp/assets/_new/icons/svgs/science.svg new file mode 100644 index 000000000..9d3211223 --- /dev/null +++ b/webapp/assets/_new/icons/svgs/science.svg @@ -0,0 +1,25 @@ + + + + diff --git a/webapp/assets/_new/icons/svgs/spirituality.svg b/webapp/assets/_new/icons/svgs/spirituality.svg new file mode 100644 index 000000000..0c2757071 --- /dev/null +++ b/webapp/assets/_new/icons/svgs/spirituality.svg @@ -0,0 +1,13 @@ + + + + + + + + + From 3508b372247970cb1f02c815f44bf9c04760b246 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Thu, 8 Sep 2022 16:28:45 +0200 Subject: [PATCH 2/3] load new icons for categories --- backend/src/constants/categories.js | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/backend/src/constants/categories.js b/backend/src/constants/categories.js index 146131453..358afb852 100644 --- a/backend/src/constants/categories.js +++ b/backend/src/constants/categories.js @@ -1,6 +1,6 @@ export const categories = [ { - icon: 'users', + icon: 'networking', name: 'networking', description: 'Kooperation, Aktionsbündnisse, Solidarität, Hilfe', }, @@ -10,12 +10,12 @@ export const categories = [ description: 'Bauen, Lebensgemeinschaften, Tiny Houses, Gemüsegarten', }, { - icon: 'lightbulb', + icon: 'enrgy', name: 'energy', description: 'Öl, Gas, Kohle, Wind, Wasserkraft, Biogas, Atomenergie, ...', }, { - icon: 'smile', + icon: 'psyche', name: 'psyche', description: 'Seele, Gefühle, Glück', }, @@ -30,7 +30,7 @@ export const categories = [ description: 'Menschenrechte, Gesetze, Verordnungen', }, { - icon: 'money', + icon: 'finance', name: 'finance', description: 'Geld, Finanzsystem, Alternativwährungen, ...', }, @@ -40,7 +40,7 @@ export const categories = [ description: 'Familie, Pädagogik, Schule, Prägung', }, { - icon: 'suitcase', + icon: 'mobility', name: 'mobility', description: 'Reise, Verkehr, Elektromobilität', }, @@ -50,48 +50,48 @@ export const categories = [ description: 'Handel, Konsum, Marketing, Lebensmittel, Lieferketten, ...', }, { - icon: 'angellist', + icon: 'peace', name: 'peace', description: 'Krieg, Militär, soziale Verteidigung, Waffen, Cyberattacken', }, { - icon: 'university', + icon: 'politics', name: 'politics', description: 'Demokratie, Mitbestimmung, Wahlen, Korruption, Parteien', }, { - icon: 'tree', + icon: 'nature', name: 'nature', description: 'Tiere, Pflanzen, Landwirtschaft, Ökologie, Artenvielfalt', }, { - icon: 'graduation-cap', + icon: 'science', name: 'science', description: 'Bildung, Hochschule, Publikationen, ...', }, { - icon: 'medkit', + icon: 'health', name: 'health', description: 'Medizin, Ernährung, WHO, Impfungen, Schadstoffe, ...', }, { - icon: 'desktop', + icon: 'media', name: 'it-and-media', description: 'Nachrichten, Manipulation, Datenschutz, Überwachung, Datenkraken, AI, Software, Apps', }, { - icon: 'heart-o', + icon: 'spirituality', name: 'spirituality', description: 'Religion, Werte, Ethik', }, { - icon: 'music', + icon: 'culture', name: 'culture', description: 'Kunst, Theater, Musik, Fotografie, Film', }, { - icon: 'ellipsis-h', + icon: 'miscellaneous', name: 'miscellaneous', description: '', }, From 8e561711d0328cb4dc6d347bdab8c1a6d63650af Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Thu, 8 Sep 2022 16:37:41 +0200 Subject: [PATCH 3/3] fix typo --- backend/src/constants/categories.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/constants/categories.js b/backend/src/constants/categories.js index 358afb852..3676fed0b 100644 --- a/backend/src/constants/categories.js +++ b/backend/src/constants/categories.js @@ -10,7 +10,7 @@ export const categories = [ description: 'Bauen, Lebensgemeinschaften, Tiny Houses, Gemüsegarten', }, { - icon: 'enrgy', + icon: 'energy', name: 'energy', description: 'Öl, Gas, Kohle, Wind, Wasserkraft, Biogas, Atomenergie, ...', },