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.svg similarity index 99% rename from branding/static/img/custom/Logo-Horizontal.svg rename to branding/static/img/custom/logo-horizontal.svg index 27b522b..d821c83 100644 --- a/branding/static/img/custom/Logo-Horizontal.svg +++ b/branding/static/img/custom/logo-horizontal.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 ef39c14..8851242 100644 --- a/docker/backend.Dockerfile +++ b/docker/backend.Dockerfile @@ -1,9 +1,10 @@ ################################################################################## # 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 COPY branding/constants/links.js src/config/ +COPY branding/constants/logos.js src/config/ COPY branding/constants/metadata.js src/config/ 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 diff --git a/package.json b/package.json index e73be6c..1ad10ae 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,9 @@ { "name": "ocelot-social-branded", - "version": "1.0.2", - "ocelotDockerVersionTag": "1.0.2-79", + "version": "1.0.3", + "ocelotDockerVersionTag": "1.0.3-82", "dockerOrganisation": "ocelotsocialnetwork", - "description": "Ocelot Social Branded", + "description": "ocelot.social Branded", "author": "ocelot.social Community", "license": "MIT", "private": false,