diff --git a/backend/src/config/logos.ts b/backend/src/config/logos.ts index 78b66d124..d512f64b4 100644 --- a/backend/src/config/logos.ts +++ b/backend/src/config/logos.ts @@ -2,7 +2,9 @@ // this are the paths in the webapp export default { LOGO_HEADER_PATH: '/img/custom/logo-horizontal.svg', + LOGO_HEADER_MOBILE_PATH: '/img/custom/logo-horizontal.svg', LOGO_HEADER_WIDTH: '260px', + LOGO_HEADER_MOBILE_WIDTH: '260px', LOGO_HEADER_CLICK: { // externalLink: { // url: 'https://ocelot.social', diff --git a/backend/src/constants/categories.ts b/backend/src/constants/categories.ts index b6fce03ca..a0ec41265 100644 --- a/backend/src/constants/categories.ts +++ b/backend/src/constants/categories.ts @@ -4,117 +4,87 @@ export const CATEGORIES_MAX = 3 export const categories = [ { - icon: 'networking', - id: 'cat0', - slug: 'networking', - name: 'networking', + id: 'corona', + slug: 'corona', + name: 'corona', + icon: 'reformer-corona', }, { - icon: 'home', - id: 'cat1', - slug: 'home', - name: 'home', + id: 'digital-euro', + slug: 'digital-euro', + name: 'digital-euro', + icon: 'reformer-digital-euro', }, { - icon: 'energy', - id: 'cat2', - slug: 'energy', - name: 'energy', + id: 'who', + slug: 'who', + name: 'who', + icon: 'reformer-who', }, { - icon: 'psyche', - id: 'cat3', - slug: 'psyche', - name: 'psyche', + id: 'monetary-system', + slug: 'monetary-system', + name: 'monetary-system', + icon: 'reformer-monetary-system', }, { - icon: 'movement', - id: 'cat4', - slug: 'body-and-excercise', - name: 'body-and-excercise', + id: 'basic-rights', + slug: 'basic-rights', + name: 'basic-rights', + icon: 'reformer-basic-rights', }, { - icon: 'balance-scale', - id: 'cat5', - slug: 'law', - name: 'law', + id: 'justice', + slug: 'justice', + name: 'justice', + icon: 'reformer-justice', }, { - icon: 'finance', - id: 'cat6', - slug: 'finance', - name: 'finance', + id: 'demonstrations', + slug: 'demonstrations', + name: 'demonstrations', + icon: 'reformer-demonstrations', }, { - icon: 'child', - id: 'cat7', - slug: 'children', - name: 'children', + id: 'child-protection', + slug: 'child-protection', + name: 'child-protection', + icon: 'reformer-child-protection', }, { - icon: 'mobility', - id: 'cat8', - slug: 'mobility', - name: 'mobility', + id: 'transhumanism', + slug: 'transhumanism', + name: 'transhumanism', + icon: 'reformer-transhumanism', }, { - icon: 'shopping-cart', - id: 'cat9', - slug: 'economy', - name: 'economy', + id: 'surveillance', + slug: 'surveillance', + name: 'surveillance', + icon: 'reformer-surveillance', }, { - icon: 'peace', - id: 'cat10', - slug: 'peace', - name: 'peace', + id: 'education', + slug: 'education', + name: 'education', + icon: 'reformer-education', }, { - icon: 'politics', - id: 'cat11', - slug: 'politics', - name: 'politics', + id: 'media', + slug: 'media', + name: 'media', + icon: 'reformer-media', }, { - icon: 'nature', - id: 'cat12', - slug: 'nature', - name: 'nature', + id: 'ngos', + slug: 'ngos', + name: 'ngos', + icon: 'reformer-ngos', }, { - icon: 'science', - id: 'cat13', - slug: 'science', - name: 'science', - }, - { - icon: 'health', - id: 'cat14', - slug: 'health', - name: 'health', - }, - { - icon: 'media', - id: 'cat15', - slug: 'it-and-media', - name: 'it-and-media', - }, - { - icon: 'spirituality', - id: 'cat16', - slug: 'spirituality', - name: 'spirituality', - }, - { - icon: 'culture', - id: 'cat17', - slug: 'culture', - name: 'culture', - }, - { - icon: 'miscellaneous', - id: 'cat18', + id: 'miscellaneous', slug: 'miscellaneous', name: 'miscellaneous', + icon: 'reformer-miscellaneous', }, ] diff --git a/webapp/assets/_new/icons/svgs/reformer-basic-rights.svg b/webapp/assets/_new/icons/svgs/reformer-basic-rights.svg new file mode 100644 index 000000000..305e367ac --- /dev/null +++ b/webapp/assets/_new/icons/svgs/reformer-basic-rights.svg @@ -0,0 +1,5 @@ + + +book + + diff --git a/webapp/assets/_new/icons/svgs/reformer-child-protection.svg b/webapp/assets/_new/icons/svgs/reformer-child-protection.svg new file mode 100644 index 000000000..fcb5651f0 --- /dev/null +++ b/webapp/assets/_new/icons/svgs/reformer-child-protection.svg @@ -0,0 +1,5 @@ + + +child + + diff --git a/webapp/assets/_new/icons/svgs/reformer-corona.svg b/webapp/assets/_new/icons/svgs/reformer-corona.svg new file mode 100755 index 000000000..bddbcebcc --- /dev/null +++ b/webapp/assets/_new/icons/svgs/reformer-corona.svg @@ -0,0 +1,5 @@ + + +sun-o + + diff --git a/webapp/assets/_new/icons/svgs/reformer-demonstrations.svg b/webapp/assets/_new/icons/svgs/reformer-demonstrations.svg new file mode 100755 index 000000000..95e0d21d3 --- /dev/null +++ b/webapp/assets/_new/icons/svgs/reformer-demonstrations.svg @@ -0,0 +1,5 @@ + + +bullhorn + + diff --git a/webapp/assets/_new/icons/svgs/reformer-digital-euro.svg b/webapp/assets/_new/icons/svgs/reformer-digital-euro.svg new file mode 100755 index 000000000..cddb5775a --- /dev/null +++ b/webapp/assets/_new/icons/svgs/reformer-digital-euro.svg @@ -0,0 +1,5 @@ + + +university + + diff --git a/webapp/assets/_new/icons/svgs/reformer-education.svg b/webapp/assets/_new/icons/svgs/reformer-education.svg new file mode 100755 index 000000000..5d35226d3 --- /dev/null +++ b/webapp/assets/_new/icons/svgs/reformer-education.svg @@ -0,0 +1,5 @@ + + +graduation-cap + + diff --git a/webapp/assets/_new/icons/svgs/reformer-justice.svg b/webapp/assets/_new/icons/svgs/reformer-justice.svg new file mode 100755 index 000000000..f5e446fd2 --- /dev/null +++ b/webapp/assets/_new/icons/svgs/reformer-justice.svg @@ -0,0 +1,5 @@ + + +balance-scale + + diff --git a/webapp/assets/_new/icons/svgs/reformer-media.svg b/webapp/assets/_new/icons/svgs/reformer-media.svg new file mode 100755 index 000000000..7572021ba --- /dev/null +++ b/webapp/assets/_new/icons/svgs/reformer-media.svg @@ -0,0 +1,5 @@ + + +users + + diff --git a/webapp/assets/_new/icons/svgs/reformer-miscellaneous.svg b/webapp/assets/_new/icons/svgs/reformer-miscellaneous.svg new file mode 100644 index 000000000..07f8dbe3f --- /dev/null +++ b/webapp/assets/_new/icons/svgs/reformer-miscellaneous.svg @@ -0,0 +1,13 @@ + + + + diff --git a/webapp/assets/_new/icons/svgs/reformer-monetary-system.svg b/webapp/assets/_new/icons/svgs/reformer-monetary-system.svg new file mode 100755 index 000000000..04a116d2a --- /dev/null +++ b/webapp/assets/_new/icons/svgs/reformer-monetary-system.svg @@ -0,0 +1,5 @@ + + +money + + diff --git a/webapp/assets/_new/icons/svgs/reformer-ngos.svg b/webapp/assets/_new/icons/svgs/reformer-ngos.svg new file mode 100755 index 000000000..9d390e126 --- /dev/null +++ b/webapp/assets/_new/icons/svgs/reformer-ngos.svg @@ -0,0 +1,5 @@ + + +chain + + diff --git a/webapp/assets/_new/icons/svgs/reformer-surveillance.svg b/webapp/assets/_new/icons/svgs/reformer-surveillance.svg new file mode 100755 index 000000000..793620544 --- /dev/null +++ b/webapp/assets/_new/icons/svgs/reformer-surveillance.svg @@ -0,0 +1,5 @@ + + +camera + + diff --git a/webapp/assets/_new/icons/svgs/reformer-transhumanism.svg b/webapp/assets/_new/icons/svgs/reformer-transhumanism.svg new file mode 100755 index 000000000..e1ca6bde6 --- /dev/null +++ b/webapp/assets/_new/icons/svgs/reformer-transhumanism.svg @@ -0,0 +1,5 @@ + + +flask + + diff --git a/webapp/assets/_new/icons/svgs/reformer-who.svg b/webapp/assets/_new/icons/svgs/reformer-who.svg new file mode 100755 index 000000000..91bf9bf2b --- /dev/null +++ b/webapp/assets/_new/icons/svgs/reformer-who.svg @@ -0,0 +1,5 @@ + + +globe + + diff --git a/webapp/assets/styles/imports/_branding.scss b/webapp/assets/styles/imports/_branding.scss index 81926a5b9..629d0d597 100644 --- a/webapp/assets/styles/imports/_branding.scss +++ b/webapp/assets/styles/imports/_branding.scss @@ -55,6 +55,7 @@ $color-ribbon-event-shadow: color.adjust($color-ribbon-event, $lightness: -20%); $chat-sidemenu-background-over: color.adjust($color-tertiary-light, $lightness: -10%); $chat-sidemenu-background-active: $color-tertiary-light; +$chat-message-color: $color-secondary-dark; $chat-message-bg-me: $color-tertiary-light; $chat-message-bg-others: $color-secondary-light; $chat-message-checkmark-seen: $color-primary; @@ -65,6 +66,10 @@ $chat-icon-add: $color-primary-light; $chat-icon-send: $color-primary-light; $chat-icon-emoji: $color-primary-light; +.vac-avatar { + background-color: $color-secondary !important; +} + body, .ds-button, .ds-chip, .ds-copy-field, .ds-list, .ds-select-search, .ds-tag, .ds-text { font-family: $font-family-text !important; } @@ -91,14 +96,14 @@ a:hover > .base-button.--circle.post-add-button-top { /* ds-menu-item link colors */ a.ds-menu-item-link { - color: $color-primary; + color: $color-secondary; } a:hover.ds-menu-item-link { - color: $color-primary-light; + color: black; } .ds-menu-item-link.router-link-exact-active { - color: $color-primary; - border-left-color: $color-primary; + color: $color-secondary; + border-left-color: $color-secondary; } .v-popover.open .trigger a { @@ -127,8 +132,13 @@ a:hover.ds-menu-item-link { color: $color-primary-light; } -.user-teaser:hover .slug { - color: $color-primary-light; +.user-teaser .info { + a .slug { + color: $color-secondary; + } + a:hover .slug { + color: black; + } } .profile-avatar.--no-image { background-color: $color-secondary; @@ -147,10 +157,11 @@ a:hover.ds-menu-item-link { background-color: $color-secondary-active; } #footer a { - color: $color-secondary-inverse; + color: white; + font-weight: 500; } #footer a:hover { - color: color.adjust($color-primary-light, $lightness: -10%); + color: color.adjust(white, $lightness: -10%); } .avatar-menu .profile-avatar { @@ -161,10 +172,6 @@ a:hover.ds-menu-item-link { color: $color-primary; } -.ds-footer { - font-weight: 600; -} - /* chips with primary color */ .ds-chip-primary { background-color: $color-tertiary; @@ -183,6 +190,10 @@ div.tab-navigation li.Tabs__tab { /* ds-button with primary color */ .ds-button-primary { background-color: $color-primary; + + &:hover { + background-color: $color-tertiary; + } } /* color of active filter tags in post teaser */ @@ -194,6 +205,17 @@ span.category-tag.filterActive { div.ds-input-wrap > input:focus-within.ds-input { border-color: $color-primary; } +.ds-input:focus { + border-color: $color-primary; +} +.ds-form-item.ds-input-has-focus { + .ds-select, + .ds-select-dropdown { + border-color: $color-primary; + } +} + + // div .ds-form-item .ds-input-has-focus { // border-color: $color-primary; // } @@ -209,6 +231,17 @@ div.ds-input-wrap > input:focus-within.ds-input { accent-color: $color-primary-light; } +.editor .base-button { + color: $color-secondary; + border-color: $color-secondary; + + &:hover { + color: white; + background-color: black; + border-color: black; + } +} + body.page-name-login, body.page-name-registration, body.page-name-password-reset-request { diff --git a/webapp/constants/categories.js b/webapp/constants/categories.js index 64ceb9021..a0ec41265 100644 --- a/webapp/constants/categories.js +++ b/webapp/constants/categories.js @@ -1,3 +1,90 @@ -// this file is duplicated in `backend/src/constants/metadata.js` and `webapp/constants/metadata.js` +// this file is duplicated in `backend/src/constants/metadata` and `webapp/constants/metadata.js` export const CATEGORIES_MIN = 1 export const CATEGORIES_MAX = 3 + +export const categories = [ + { + id: 'corona', + slug: 'corona', + name: 'corona', + icon: 'reformer-corona', + }, + { + id: 'digital-euro', + slug: 'digital-euro', + name: 'digital-euro', + icon: 'reformer-digital-euro', + }, + { + id: 'who', + slug: 'who', + name: 'who', + icon: 'reformer-who', + }, + { + id: 'monetary-system', + slug: 'monetary-system', + name: 'monetary-system', + icon: 'reformer-monetary-system', + }, + { + id: 'basic-rights', + slug: 'basic-rights', + name: 'basic-rights', + icon: 'reformer-basic-rights', + }, + { + id: 'justice', + slug: 'justice', + name: 'justice', + icon: 'reformer-justice', + }, + { + id: 'demonstrations', + slug: 'demonstrations', + name: 'demonstrations', + icon: 'reformer-demonstrations', + }, + { + id: 'child-protection', + slug: 'child-protection', + name: 'child-protection', + icon: 'reformer-child-protection', + }, + { + id: 'transhumanism', + slug: 'transhumanism', + name: 'transhumanism', + icon: 'reformer-transhumanism', + }, + { + id: 'surveillance', + slug: 'surveillance', + name: 'surveillance', + icon: 'reformer-surveillance', + }, + { + id: 'education', + slug: 'education', + name: 'education', + icon: 'reformer-education', + }, + { + id: 'media', + slug: 'media', + name: 'media', + icon: 'reformer-media', + }, + { + id: 'ngos', + slug: 'ngos', + name: 'ngos', + icon: 'reformer-ngos', + }, + { + id: 'miscellaneous', + slug: 'miscellaneous', + name: 'miscellaneous', + icon: 'reformer-miscellaneous', + }, +] diff --git a/webapp/constants/logos.js b/webapp/constants/logos.js index 78b66d124..d512f64b4 100644 --- a/webapp/constants/logos.js +++ b/webapp/constants/logos.js @@ -2,7 +2,9 @@ // this are the paths in the webapp export default { LOGO_HEADER_PATH: '/img/custom/logo-horizontal.svg', + LOGO_HEADER_MOBILE_PATH: '/img/custom/logo-horizontal.svg', LOGO_HEADER_WIDTH: '260px', + LOGO_HEADER_MOBILE_WIDTH: '260px', LOGO_HEADER_CLICK: { // externalLink: { // url: 'https://ocelot.social', diff --git a/webapp/locales/de.json b/webapp/locales/de.json index 2cd81412c..654303102 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -288,7 +288,6 @@ "home": "Bauen, Lebensgemeinschaften, Tiny Houses, Gemüsegarten", "it-and-media": "Nachrichten, Manipulation, Datenschutz, Überwachung, Datenkraken, KI, Software, Apps", "law": "Menschenrechte, Gesetze, Verordnungen", - "miscellaneous": "Sonstiges", "mobility": "Reise, Verkehr, Elektromobilität", "nature": "Tiere, Pflanzen, Landwirtschaft, Ökologie, Artenvielfalt", "networking": "Kooperation, Aktionsbündnisse, Solidarität, Hilfe", @@ -296,7 +295,21 @@ "politics": "Demokratie, Mitbestimmung, Wahlen, Korruption, Parteien", "psyche": "Seele, Gefühle, Glück", "science": "Bildung, Hochschule, Publikationen", - "spirituality": "Religion, Werte, Ethik" + "spirituality": "Religion, Werte, Ethik", + "corona": "Zeitstrahl, rechtliche Hintergründe, Studien, Maßnahmenkritik", + "digital-euro": "EZB-Pläne, Social-Credit-Systeme, Quellen zu EU & BIZ", + "who": "Internationale Gesundheitsvorschriften (IHR), WHO-Reform, Impfpflicht-Debatten", + "monetary-system": "Inflationsschutz, Enteignungsverfahren, historische Beispiele", + "basic-rights": "GG-Analyse, Meinungsferiheit, Versammlungsrecht", + "justice": "Politische Verfahren, Verfassungsrecht, Verteidigung gegen Repression", + "demonstrations": "Rechte bei Demos, Verhalten bei Polizeikontrolle, Infoblätter", + "child-protection": "Aufklärung zu Missbrauch, Pädokriminalität, juristische und gesellschaftliche Aufarbeitung", + "transhumanism": "Bioethik, KI-Kontrollgesetze, Einfluss globaler Player", + "surveillance": "DSGVO, Vorratsdatenspeicherung, Biometrie & Tracking", + "education": "Bildungssystem, Ideologie, Netzwerke, Einflussnahme", + "media": "Propagandatechniken, Nudging, Gruppenpsychologie", + "ngos": "Netzwerke wie AAS, Open Society, NetzDG, etc. — Akteure, Strukturen, Finanzierung", + "miscellaneous": "Sonstiges" }, "name": { "body-and-excercise": "Körper & Bewegung", @@ -309,7 +322,6 @@ "home": "Wohnen", "it-and-media": "IT & Medien", "law": "Recht", - "miscellaneous": "Sonstiges", "mobility": "Mobilität", "nature": "Natur", "networking": "Vernetzung", @@ -317,7 +329,21 @@ "politics": "Politik", "psyche": "Psyche", "science": "Wissenschaft", - "spirituality": "Spiritualität" + "spirituality": "Spiritualität", + "corona": "Corona-Aufarbeitung", + "digital-euro": "Digitaler Euro (CBDC)", + "who": "WHO & Pandemie-Verträge", + "monetary-system": "Geldsystem & Vermögensschutz", + "basic-rights": "Grundrechte & Demokratie", + "justice": "Justiz & Grundsatzurteile", + "demonstrations": "Demorecht & Polizei-Kontakt", + "child-protection": "Kinderschutz & sexualisierte Gewalt", + "transhumanism": "Transhumanismus & KI-Regulierung", + "surveillance": "Überwachung & Datenschutz", + "education": "Bildung & Indoktrination", + "media": "Psychologoe der Massen & Medienkritik", + "ngos": "NGOs & Machtstrukturen", + "miscellaneous": "Sonstiges" } }, "emotions-label": { diff --git a/webapp/locales/en.json b/webapp/locales/en.json index b370efd38..6c344c17a 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -288,7 +288,6 @@ "home": "Construction, communities, tiny houses, kitchen garden", "it-and-media": "News, manipulation, privacy, control, data leeches, AI, software, apps", "law": "Human rights, laws, decrees", - "miscellaneous": "Miscellaneous", "mobility": "Travel, traffic, electric mobility", "nature": "Animals, plants, agriculture, ecologu, biodiversity", "networking": "Cooperation, action alliances, solidarity, help", @@ -296,7 +295,21 @@ "politics": "Democracy, participation, elections, corruption, parties", "psyche": "Soul, feelings, happiness", "science": "Education, university, publications", - "spirituality": "Religion, values, ethics" + "spirituality": "Religion, values, ethics", + "corona": "Timeline, legal background, studies, criticism of measures", + "digital-euro": "ECB Plans, Social Credit Systems, EU & BIS Sources", + "who": "International Health Regulations (IHR), WHO reform, compulsory vaccination debates", + "monetary-system": "Inflation protection, expropriation proceedings, historical examples", + "basic-rights": "GG (German constitution) analysis, freedom of opinion, right of assembly", + "justice": "Political proceedings, constitutional law, defence against repression", + "demonstrations": "Rights at demonstrations, behaviour during police checks, information sheets", + "child-protection": "Education on abuse, paedophilia, legal and social reappraisal", + "transhumanism": "Bioethics, AI control laws, influence of global players", + "surveillance": "GDPR, Data Retention, Biometrics & Tracking", + "education": "Education system, ideology, networks, influence", + "media": "Propaganda techniques, nudging, group psychology", + "ngos": "Networks such as AAS, Open Society, NetzDG, etc. — actors, structures, financing", + "miscellaneous": "Miscellaneous" }, "name": { "body-and-excercise": "Body & Excercise", @@ -309,7 +322,6 @@ "home": "Home", "it-and-media": "IT & Media", "law": "Law", - "miscellaneous": "Miscellaneous", "mobility": "Mobility", "nature": "Nature", "networking": "Networking", @@ -317,7 +329,21 @@ "politics": "Politics", "psyche": "Psyche", "science": "Science", - "spirituality": "Spirituality" + "spirituality": "Spirituality", + "corona": "Corona reappraisal", + "digital-euro": "Digital Euro (CBDC)", + "who": "WHO & Pandemic Contracts", + "monetary-system": "Monetary System & Asset Protection", + "basic-rights": "Fundamental Rights & Democracy", + "justice": "Justice & Landmark Judgments", + "demonstrations": "Right to demonstrate & police contact", + "child-protection": "Child Protection & Sexualised Violence", + "transhumanism": "Transhumanism & AI Regulation", + "surveillance": "Monitoring & Data Protection", + "education": "Education & Indoctrination", + "media": "Psychology of the Masses & Media Criticism", + "ngos": "NGOs & Power Structures", + "miscellaneous": "Miscellaneous" } }, "emotions-label": { diff --git a/webapp/locales/html/de/organization.html b/webapp/locales/html/de/organization.html index 30c6e22cc..35487b450 100644 --- a/webapp/locales/html/de/organization.html +++ b/webapp/locales/html/de/organization.html @@ -57,7 +57,7 @@

Reformer.network wird technisch und organisatorisch betrieben von Redcap B.V. im Auftrag der Stichting Rudulin in - Amsterdam. Dahinter steht ein wachsendes Team von Entwickler:innen, Moderator:innen, Visionär:innen, Journalist:innen + Amsterdam. Dahinter steht ein wachsendes Team von Entwicklern, Moderatoren, Visionären, Journalisten und Aktiven aus dem ganzen deutschsprachigen Raum.

diff --git a/webapp/static/favicon.ico b/webapp/static/favicon.ico index b535a3db8..b189bbbe2 100644 Binary files a/webapp/static/favicon.ico and b/webapp/static/favicon.ico differ diff --git a/webapp/static/icon.png b/webapp/static/icon.png index eca541332..f841be300 100644 Binary files a/webapp/static/icon.png and b/webapp/static/icon.png differ diff --git a/webapp/static/img/custom/logo-r-circle.svg b/webapp/static/img/custom/logo-r-circle.svg new file mode 100644 index 000000000..7abe00144 --- /dev/null +++ b/webapp/static/img/custom/logo-r-circle.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + +