diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 31cddd1ba3..4f21fd19a6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -171,11 +171,11 @@ Please copy and paste the following quotes for the languages: ## Docker – More Closely -### Apple M1 Platform +### Apple Silicon Platform -***Attention:** For using Docker commands in Apple M1 environments!* +***ATTENTION:** For using Docker commands in Apple Silicon environments!* -#### Environment Variable For Apple M1 Platform +#### Environment Variable For Apple Silicon Platform (M1, M2 Chips) If you encounter trouble building the docker containers on an Apple M1 chip you can try to explicitly define the target platform docker builds and pulls images for: diff --git a/README.md b/README.md index 1cffbf027c..7ce14dd536 100644 --- a/README.md +++ b/README.md @@ -172,7 +172,9 @@ Check the correct Docker installation by checking the version before proceeding. $ docker --version ``` -##### Start Ocelot-Social via Docker-Compose +##### Start Ocelot-Social via Docker Compose + +***ATTENTION:** For using Docker commands in Apple Silicon environments see [here](https://github.com/Ocelot-Social-Community/Ocelot-Social/blob/master/CONTRIBUTING.md#apple-silicon-platform).* Prepare ENVs once beforehand: @@ -233,7 +235,7 @@ We are happy if you fork our repository, but we don't recommend it for developme Clone this repository locally as [described above](#clone-the-repository), create your branch named `-`, add your code and push your branch direct to this repository. Then create a PR by comparing it to our `master`. -**_!!! Be aware:_** Please don't compare from a fork, because the tests are breaking caused by credential problems. +***!!! Be aware:*** Please don't compare from a fork, because the tests are breaking caused by credential problems. Please run the following commands before you push: diff --git a/deployment/TODO-next-update.md b/deployment/TODO-next-update.md index 76b7ab56c5..ae1cae4dc8 100644 --- a/deployment/TODO-next-update.md +++ b/deployment/TODO-next-update.md @@ -2,7 +2,9 @@ When you introduce a new version and branding and deploy it on your network, you need to consider the following changes and actions: -## Version >= 3.1.3 with 'ocelotDockerVersionTag' 3.1.3-XXX +## Version >= 3.2.0 with 'ocelotDockerVersionTag' 3.2.0-XXX + +### Backend and Kubernetes Config `DBMS_DEFAULT_DATABASE` - We have the new option to configure the default name of the Neo4j database to be used for operations and commands in environment variables (`.env`, `docker-compose.yml` or `values.yaml`). For more details see [deployment-values.md](deployment-values.md): @@ -13,6 +15,10 @@ DBMS_DEFAULT_DATABASE: "graph.db" The default value is `neo4j` if it is not set. +### Webapp Config `dateTime` + +- You can set `RELATIVE_DATETIME` and `ABSOLUT_DATETIME_FORMAT` in `branding/constants/dateTime.js` originally in main code file `webapp/constants/dateTime.js` to your preferred values. + ## Version >= 3.1.0 with 'ocelotDockerVersionTag' 3.1.0-555 - We have the new option to configure DKIM for sent e-mails in environment variables (`.env`, `docker-compose.yml` or `values.yaml`), see [deployment-values.md](deployment-values.md): @@ -26,7 +32,7 @@ The default value is `neo4j` if it is not set. ## Version >= 2.4.0 with 'ocelotDockerVersionTag' 2.4.0-298 -- You have to set `SHOW_CONTENT_FILTER_HEADER_MENU` and `SHOW_CONTENT_FILTER_MASONRY_GRID` in `branding/constants/filter.js` originally in main code file `webapp/constants/filter.js` to your preferred value. +- You have to set `SHOW_CONTENT_FILTER_HEADER_MENU` and `SHOW_CONTENT_FILTER_MASONRY_GRID` in `branding/constants/filter.js` originally in main code file `webapp/constants/filter.js` to your preferred values. ### Main Code PR – feat(webapp): map #5843 diff --git a/deployment/deployment-values.md b/deployment/deployment-values.md index 0354ca8bb2..d1eae1822c 100644 --- a/deployment/deployment-values.md +++ b/deployment/deployment-values.md @@ -3,6 +3,21 @@ For each deployment, you need to set the environment variables and configurations. Here is some specific information on how to set the values. +## Webapp + +We have several configuration possibilities just in the frontend. + +### Date Time + +In file `branding/constants/dateTime.js`. + +- `RELATIVE_DATETIME` + - `true` (default) or `false` +- `ABSOLUT_DATETIME_FORMAT` + - definition see [date-fns, format](https://date-fns.org/v3.3.1/docs/format): + - `P`: just localized date + - `Pp`: just localized date and time + ## E-Mails You need to set environment variables to send registration and invitation information or notifications to users, for example. diff --git a/webapp/components/RelativeDateTime/Readme.md b/webapp/components/DateTime/Readme.md similarity index 51% rename from webapp/components/RelativeDateTime/Readme.md rename to webapp/components/DateTime/Readme.md index 5e04466f91..fa18a2c9d0 100644 --- a/webapp/components/RelativeDateTime/Readme.md +++ b/webapp/components/DateTime/Readme.md @@ -3,5 +3,5 @@ Relative time from 08.03.2017 ``` - + ``` \ No newline at end of file diff --git a/webapp/components/DateTime/index.vue b/webapp/components/DateTime/index.vue new file mode 100644 index 0000000000..aaf39905b0 --- /dev/null +++ b/webapp/components/DateTime/index.vue @@ -0,0 +1,33 @@ + + + diff --git a/webapp/components/RelativeDateTime/spec.js b/webapp/components/DateTime/spec.js similarity index 92% rename from webapp/components/RelativeDateTime/spec.js rename to webapp/components/DateTime/spec.js index b0dd687b25..5c8bf8678c 100644 --- a/webapp/components/RelativeDateTime/spec.js +++ b/webapp/components/DateTime/spec.js @@ -1,9 +1,9 @@ import { shallowMount } from '@vue/test-utils' -import RelativeDateTime from './' +import DateTime from '.' const localVue = global.localVue -describe('RelativeDateTime', () => { +describe('DateTime', () => { let mocks let locale let dateTime @@ -17,7 +17,7 @@ describe('RelativeDateTime', () => { }) const Wrapper = () => { - return shallowMount(RelativeDateTime, { + return shallowMount(DateTime, { mocks, localVue, propsData: { diff --git a/webapp/components/Modal/DeleteUserModal.vue b/webapp/components/Modal/DeleteUserModal.vue index 8618582ee0..cdef4ac5f1 100644 --- a/webapp/components/Modal/DeleteUserModal.vue +++ b/webapp/components/Modal/DeleteUserModal.vue @@ -15,7 +15,7 @@ {{ $t('modals.deleteUser.created') }}
- +
@@ -49,7 +49,7 @@ import gql from 'graphql-tag' import { mapMutations } from 'vuex' import { SweetalertIcon } from 'vue-sweetalert-icons' -import RelativeDateTime from '~/components/RelativeDateTime' +import DateTime from '~/components/DateTime' import UserTeaser from '~/components/UserTeaser/UserTeaser' export default { @@ -57,7 +57,7 @@ export default { components: { UserTeaser, SweetalertIcon, - RelativeDateTime, + DateTime, }, props: { userdata: { type: Object, required: true }, diff --git a/webapp/components/PostTeaser/PostTeaser.vue b/webapp/components/PostTeaser/PostTeaser.vue index 68e3dae197..3c7d23c032 100644 --- a/webapp/components/PostTeaser/PostTeaser.vue +++ b/webapp/components/PostTeaser/PostTeaser.vue @@ -103,7 +103,7 @@
- +
@@ -119,7 +119,7 @@ import CounterIcon from '~/components/_new/generic/CounterIcon/CounterIcon' import DateTimeRange from '~/components/DateTimeRange/DateTimeRange' import HcRibbon from '~/components/Ribbon' import LocationTeaser from '~/components/LocationTeaser/LocationTeaser' -import RelativeDateTime from '~/components/RelativeDateTime' +import DateTime from '~/components/DateTime' import UserTeaser from '~/components/UserTeaser/UserTeaser' import { mapGetters } from 'vuex' import PostMutations from '~/graphql/PostMutations' @@ -134,7 +134,7 @@ export default { DateTimeRange, HcRibbon, LocationTeaser, - RelativeDateTime, + DateTime, UserTeaser, }, props: { diff --git a/webapp/components/RelativeDateTime/index.vue b/webapp/components/RelativeDateTime/index.vue deleted file mode 100644 index 19018c24bf..0000000000 --- a/webapp/components/RelativeDateTime/index.vue +++ /dev/null @@ -1,23 +0,0 @@ - - - diff --git a/webapp/components/UserTeaser/UserTeaser.vue b/webapp/components/UserTeaser/UserTeaser.vue index d4e70b6536..a9e556bf46 100644 --- a/webapp/components/UserTeaser/UserTeaser.vue +++ b/webapp/components/UserTeaser/UserTeaser.vue @@ -36,7 +36,7 @@ - + @@ -47,13 +47,13 @@