From cc728e829f40efa50bbd0217ede47061242e64fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 17 May 2021 13:31:06 +0200 Subject: [PATCH 1/6] Revert apps default DockerHub image names --- docker/backend.Dockerfile | 2 +- docker/maintenance.Dockerfile | 2 +- docker/neo4j.Dockerfile | 2 +- docker/webapp.Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/backend.Dockerfile b/docker/backend.Dockerfile index ef39c14..3a1618d 100644 --- a/docker/backend.Dockerfile +++ b/docker/backend.Dockerfile @@ -1,7 +1,7 @@ ################################################################################## # BRANDED ######################################################################## ################################################################################## -ARG APP_IMAGE=ocelotsocialnetwork/backend-branded:latest +ARG APP_IMAGE=ocelotsocialnetwork/backend:latest FROM $APP_IMAGE as branded # copy public constants into the Docker image to brand it diff --git a/docker/maintenance.Dockerfile b/docker/maintenance.Dockerfile index 0f273b0..1da296d 100644 --- a/docker/maintenance.Dockerfile +++ b/docker/maintenance.Dockerfile @@ -1,7 +1,7 @@ ################################################################################## # BRANDED ######################################################################## ################################################################################## -ARG APP_IMAGE=ocelotsocialnetwork/maintenance-branded:latest +ARG APP_IMAGE=ocelotsocialnetwork/maintenance:latest FROM $APP_IMAGE as branded # copy public constants into the Docker image to brand it diff --git a/docker/neo4j.Dockerfile b/docker/neo4j.Dockerfile index 2220b6b..dff5209 100644 --- a/docker/neo4j.Dockerfile +++ b/docker/neo4j.Dockerfile @@ -1,4 +1,4 @@ -ARG APP_IMAGE=ocelotsocialnetwork/neo4j-community-branded:latest +ARG APP_IMAGE=ocelotsocialnetwork/neo4j:latest ################################################################################## # COMMUNITY ###################################################################### diff --git a/docker/webapp.Dockerfile b/docker/webapp.Dockerfile index c530a1f..157072b 100644 --- a/docker/webapp.Dockerfile +++ b/docker/webapp.Dockerfile @@ -1,7 +1,7 @@ ################################################################################## # BRANDED ######################################################################## ################################################################################## -ARG APP_IMAGE=ocelotsocialnetwork/webapp-branded:latest +ARG APP_IMAGE=ocelotsocialnetwork/webapp:latest FROM $APP_IMAGE as branded # copy public constants into the Docker image to brand it From eafc02c8693a30adc110bf4d0d228ef2398b6698 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 17 May 2021 13:31:36 +0200 Subject: [PATCH 2/6] Refine organization description --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e73be6c..a2b6100 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "1.0.2", "ocelotDockerVersionTag": "1.0.2-79", "dockerOrganisation": "ocelotsocialnetwork", - "description": "Ocelot Social Branded", + "description": "ocelot.social Branded", "author": "ocelot.social Community", "license": "MIT", "private": false, From 9d370c19217cd2cf8d0d169d5f791bde0fc0a4c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Wed, 19 May 2021 11:07:07 +0200 Subject: [PATCH 3/6] Adjust to new logo structure - Rename logo 'logo-horizontal--dummy' to dummy to get small caps in the next step. --- branding/constants/links.js | 1 + branding/constants/logos.js | 10 +++ branding/constants/metadata.js | 1 + .../img/custom/Logo-Horizontal-Dark.svg | 48 ----------- ...izontal.svg => logo-horizontal--dummy.svg} | 2 +- .../custom/{sign-up.svg => logo-squared.svg} | 2 +- branding/static/img/custom/logout.svg | 82 ------------------- branding/static/img/custom/password-reset.svg | 82 ------------------- .../static/img/custom/under-maintenance.svg | 82 ------------------- branding/static/img/custom/welcome.svg | 82 ------------------- docker/backend.Dockerfile | 1 + 11 files changed, 15 insertions(+), 378 deletions(-) create mode 100644 branding/constants/logos.js delete mode 100644 branding/static/img/custom/Logo-Horizontal-Dark.svg rename branding/static/img/custom/{Logo-Horizontal.svg => logo-horizontal--dummy.svg} (99%) rename branding/static/img/custom/{sign-up.svg => logo-squared.svg} (99%) delete mode 100644 branding/static/img/custom/logout.svg delete mode 100644 branding/static/img/custom/password-reset.svg delete mode 100644 branding/static/img/custom/under-maintenance.svg delete mode 100644 branding/static/img/custom/welcome.svg diff --git a/branding/constants/links.js b/branding/constants/links.js index 070ffa1..cdccbae 100644 --- a/branding/constants/links.js +++ b/branding/constants/links.js @@ -1,3 +1,4 @@ +// this file is duplicated in `backend/src/config/links.js` and `webapp/constants/links.js` and replaced on rebranding export default { ORGANIZATION: 'https://ocelot.social', DONATE: 'https://ocelot-social.herokuapp.com/donations', diff --git a/branding/constants/logos.js b/branding/constants/logos.js new file mode 100644 index 0000000..d093c7b --- /dev/null +++ b/branding/constants/logos.js @@ -0,0 +1,10 @@ +// this file is duplicated in `backend/src/config/logos.js` and `webapp/constants/logos.js` and replaced on rebranding +// this are the paths in the webapp +export default { + LOGO_HEADER_PATH: '/img/custom/logo-horizontal.svg', + LOGO_SIGNUP_PATH: '/img/custom/logo-squared.svg', + LOGO_WELCOME_PATH: '/img/custom/logo-squared.svg', + LOGO_LOGOUT_PATH: '/img/custom/logo-squared.svg', + LOGO_PASSWORD_RESET_PATH: '/img/custom/logo-squared.svg', + LOGO_MAINTENACE_RESET_PATH: '/img/custom/logo-squared.svg', +} diff --git a/branding/constants/metadata.js b/branding/constants/metadata.js index 55dfe23..e5f32c7 100644 --- a/branding/constants/metadata.js +++ b/branding/constants/metadata.js @@ -1,3 +1,4 @@ +// this file is duplicated in `backend/src/config/metadata.js` and `webapp/constants/metadata.js` and replaced on rebranding export default { APPLICATION_NAME: 'ocelot.social', APPLICATION_SHORT_NAME: 'ocelot', diff --git a/branding/static/img/custom/Logo-Horizontal-Dark.svg b/branding/static/img/custom/Logo-Horizontal-Dark.svg deleted file mode 100644 index deba991..0000000 --- a/branding/static/img/custom/Logo-Horizontal-Dark.svg +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branding/static/img/custom/Logo-Horizontal.svg b/branding/static/img/custom/logo-horizontal--dummy.svg similarity index 99% rename from branding/static/img/custom/Logo-Horizontal.svg rename to branding/static/img/custom/logo-horizontal--dummy.svg index 27b522b..d821c83 100644 --- a/branding/static/img/custom/Logo-Horizontal.svg +++ b/branding/static/img/custom/logo-horizontal--dummy.svg @@ -1,6 +1,6 @@ - + diff --git a/branding/static/img/custom/sign-up.svg b/branding/static/img/custom/logo-squared.svg similarity index 99% rename from branding/static/img/custom/sign-up.svg rename to branding/static/img/custom/logo-squared.svg index b130e75..15f420c 100644 --- a/branding/static/img/custom/sign-up.svg +++ b/branding/static/img/custom/logo-squared.svg @@ -1,6 +1,6 @@ - + diff --git a/branding/static/img/custom/logout.svg b/branding/static/img/custom/logout.svg deleted file mode 100644 index b130e75..0000000 --- a/branding/static/img/custom/logout.svg +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branding/static/img/custom/password-reset.svg b/branding/static/img/custom/password-reset.svg deleted file mode 100644 index b130e75..0000000 --- a/branding/static/img/custom/password-reset.svg +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branding/static/img/custom/under-maintenance.svg b/branding/static/img/custom/under-maintenance.svg deleted file mode 100644 index b130e75..0000000 --- a/branding/static/img/custom/under-maintenance.svg +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branding/static/img/custom/welcome.svg b/branding/static/img/custom/welcome.svg deleted file mode 100644 index b130e75..0000000 --- a/branding/static/img/custom/welcome.svg +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docker/backend.Dockerfile b/docker/backend.Dockerfile index 3a1618d..8851242 100644 --- a/docker/backend.Dockerfile +++ b/docker/backend.Dockerfile @@ -6,4 +6,5 @@ FROM $APP_IMAGE as branded # copy public constants into the Docker image to brand it COPY branding/constants/links.js src/config/ +COPY branding/constants/logos.js src/config/ COPY branding/constants/metadata.js src/config/ From ac85a971919a7ac9448043a102e1008b34c6e890 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Wed, 19 May 2021 11:10:01 +0200 Subject: [PATCH 4/6] Rename logo 'logo-horizontal.svg' to small caps, remove dummy --- .../custom/{logo-horizontal--dummy.svg => logo-horizontal.svg} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename branding/static/img/custom/{logo-horizontal--dummy.svg => logo-horizontal.svg} (100%) diff --git a/branding/static/img/custom/logo-horizontal--dummy.svg b/branding/static/img/custom/logo-horizontal.svg similarity index 100% rename from branding/static/img/custom/logo-horizontal--dummy.svg rename to branding/static/img/custom/logo-horizontal.svg From 981c48a782889e93a65254783a5dd7409e0723de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Wed, 19 May 2021 11:10:33 +0200 Subject: [PATCH 5/6] Release v1.0.3 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index a2b6100..5931cf7 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ocelot-social-branded", - "version": "1.0.2", - "ocelotDockerVersionTag": "1.0.2-79", + "version": "1.0.3", + "ocelotDockerVersionTag": "1.0.3-81", "dockerOrganisation": "ocelotsocialnetwork", "description": "ocelot.social Branded", "author": "ocelot.social Community", From 71f250ceb65e024297bea21c72ca1bc0fde71e99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Wed, 19 May 2021 17:12:48 +0200 Subject: [PATCH 6/6] Upgrade ocelot.social build number to 1.0.3-82 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5931cf7..1ad10ae 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ocelot-social-branded", "version": "1.0.3", - "ocelotDockerVersionTag": "1.0.3-81", + "ocelotDockerVersionTag": "1.0.3-82", "dockerOrganisation": "ocelotsocialnetwork", "description": "ocelot.social Branded", "author": "ocelot.social Community",