From 5a9d215432ced6bc53c00b625f8608ba7efe32c2 Mon Sep 17 00:00:00 2001 From: Patrick Mualaba Date: Sat, 28 Mar 2020 07:06:00 +0100 Subject: [PATCH 1/5] add Github Actions --- +/kubernetes/docs/01.Docker.md | 0 .github/workflows/workflow.yml | 2 ++ pages/_app.js | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 +/kubernetes/docs/01.Docker.md create mode 100644 .github/workflows/workflow.yml diff --git a/+/kubernetes/docs/01.Docker.md b/+/kubernetes/docs/01.Docker.md new file mode 100644 index 0000000..e69de29 diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml new file mode 100644 index 0000000..37babda --- /dev/null +++ b/.github/workflows/workflow.yml @@ -0,0 +1,2 @@ +name: workflow + diff --git a/pages/_app.js b/pages/_app.js index 22da9a4..2cc3118 100644 --- a/pages/_app.js +++ b/pages/_app.js @@ -29,7 +29,7 @@ export default withRedux( (initialState = {}) => { const composedEnhancer = composeWithDevTools({trace: false, traceLimit: 25}) return createStore( - rootReducer, + rootReducer,`` initialState, composedEnhancer(applyMiddleware(createLogicMiddleware(rootLogic, deps))) ) From 3734483d1a3c811d6428d8adb4035ea1fb9e1e7e Mon Sep 17 00:00:00 2001 From: pmualaba Date: Sat, 28 Mar 2020 07:12:04 +0100 Subject: [PATCH 2/5] Update workflow.yml --- .github/workflows/workflow.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 37babda..73010a1 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -1,2 +1,5 @@ name: workflow +on: [push] + + From 7150e6e83acf9bf9fa9a168d776d59d61870cc01 Mon Sep 17 00:00:00 2001 From: pmualaba Date: Sat, 28 Mar 2020 07:46:04 +0100 Subject: [PATCH 3/5] Update workflow.yml --- .github/workflows/workflow.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 73010a1..ff5521a 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -1,5 +1,20 @@ name: workflow + on: [push] +jobs: + run-echo: + runs-on: [ubuntu-latest] + steps: + - name: echo a string + run: echo "Hello World" + - name: multiline script + run: | + node -v + npm -v + + + + From 7760b9e48c68e433b6a6a2b0ea70dec07328f3c3 Mon Sep 17 00:00:00 2001 From: Patrick Mualaba Date: Sat, 28 Mar 2020 07:47:34 +0100 Subject: [PATCH 4/5] pre pull --- .github/workflows/workflow.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 73010a1..34eac65 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -1,5 +1,4 @@ name: workflow -on: [push] - +on: [push] From b9526a2f1769a4aa5f1322f02bfa7feed6873f17 Mon Sep 17 00:00:00 2001 From: Patrick Mualaba Date: Thu, 23 Jul 2020 22:02:47 +0200 Subject: [PATCH 5/5] update dna --- dna/db/semantics.json | 88 ++++ dna/master-v2.json | 537 +++++++++++++++++++++++ packages/package.core.cms/api/api-web.js | 2 +- pages/_app.js | 2 +- 4 files changed, 627 insertions(+), 2 deletions(-) create mode 100644 dna/db/semantics.json create mode 100644 dna/master-v2.json diff --git a/dna/db/semantics.json b/dna/db/semantics.json new file mode 100644 index 0000000..755cc62 --- /dev/null +++ b/dna/db/semantics.json @@ -0,0 +1,88 @@ +{ + "semantics": { + "description": "Document scoped component roles.", + "roles": { + "common": { + "page": { + "home": "common.page.home", + "link": "common.page.link" + }, + "content": { + "video": "common.content.video", + "text": "common.content.text", + "image": "common.content.image" + }, + "navigation": { + "main": "common.navigation.main", + "secondary": "common.navigation.secondary", + "doormat": "common.navigation.doormat", + "link": "common.navigation.link" + }, + "header": { + "top": "common.header.top", + "secondary": "common.hero.secondary" + }, + "hero": { + "primary": "common.hero.primary", + "cutout": "common.hero.cutout", + "overlay": "common.hero.overlay", + "secondary": "common.hero.secondary", + "slider": "common.hero.slider", + "image": "common.hero.image", + "link": "common.hero.link" + }, + "highlight": { + "topTopical": "common.highlight.topTopical", + "video": "highlight.video" + }, + "footer": { + "doormat": "common.footer.doormat", + "bottom": "common.footer.bottom" + }, + "legal": { + "gdpr": "common.legal.gdpr" + }, + "media": { + "photoGallery": "common.media.photoGallery", + "videoGallery": "common.media.videoGallery", + "mediaGallery": "common.media.mediaGallery", + "masonryGallery": "common.media.masonryGallery" + } + }, + "widget": { + "timer": { + "countdown": "widget.timer.countdown", + "clock": "widget.timer.clock" + } + }, + "presentation": {}, + "decoration": { + "logo": "decoration.logo" + }, + "engagement": { + "stories": { + "slider": "engagement.stories.slider", + "story": "engagement.stories.story" + }, + "cta": { + "newsletterSubscription": "engagement.cta.newsletterSubscription", + "button": "engagement.cta.button" + } + }, + "personalization": { + "recommended": { + "products": "personalization.recommended.products", + "videos": "personalization.recommended.videos", + "content": "personalization.recommended.content" + } + }, + "commercial": {}, + "interaction": {}, + "tracking": { + "google": { + "gtm": "tracking.google.gtm" + } + } + } + } +} \ No newline at end of file diff --git a/dna/master-v2.json b/dna/master-v2.json new file mode 100644 index 0000000..c6c78de --- /dev/null +++ b/dna/master-v2.json @@ -0,0 +1,537 @@ +{ + "1999": { + "description": "Application DNA - SITE 1999 - https://my-react-bio-app.org", + "package.core.global": { + "package": { + "meta": { + "@dna": "['package.core.global']", + "name": "package.core.global", + "kind": "package" + } + }, + "app": {}, + "web": { + "global": { + "meta": { + "@dna": "['package.core.global'].web.global", + "@component": "['package.core.global'].web.Global", + "@theme": "['package.core.global'].web.global.Global", + "name": "global", + "class": "Global", + "kind": "global" + }, + "dna": { + "['package.core.global'].web.global": { + "ui": { + "theme.style.css": { + } + + }, + "set": { + "defaultSkin": "bio", + "defaultSkinVariant": "default", + "backgroundImage": "/domains/my-react-bio-app.org/package.core.cms/img/bio.jpg", + "fonts": { + "google": [ + "Roboto:300,700", + "Space+Mono:400,700" + ], + "edge": null, + "link": null, + "script": null, + "family": { + "SpaceMono": "'Space Mono', monospace", + "Roboto": "'Roboto', sans-serif" + } + }, + "i18n": { + "dictionaries": ["cms", "commerce", "crm"], + "locales": ["nlNL", "frFR"] + } + } + } + } + } + } + }, + "package.core.auth": { + "package": { + "meta": { + "@dna": "['package.core.auth']", + "name": "package.core.auth", + "kind": "package" + } + }, + "api": {}, + "app": {}, + "web": { + "documents": { + "login": { + "meta": { + "@dna": "['package.core.auth'].web.documents.login", + "@component": "['package.core.ui'].web.documents.Document", + "@route": { + "match": "/login", + "params": {}, + "template": "web/package.core.auth.login", + "authenticated": false + }, + "name": "login", + "class": "Document", + "kind": "document" + }, + "layouts": [ + { + "meta": { + "@dna": "['package.core.auth'].web.documents.login.layouts[0:DocumentLayout]", + "@component": "['package.core.ui'].web.layouts.RenderLayout", + "@theme": "['package.core.ui'].web.layouts.PositionLayout", + "@layout": "PositionLayout", + "name": "DocumentLayout", + "class": "RenderLayout", + "kind": "layout" + }, + "regions": [ + { + "meta": { + "@dna": "['package.core.auth'].web.documents.login.layouts[0:DocumentLayout].regions[0:main]", + "name": "main", + "class": "Region", + "kind": "region" + }, + "blocks": [ + { + "meta": { + "@dna": "['package.core.auth'].web.documents.login.layouts[0:DocumentLayout].regions[0:main].blocks[0:LoginForm]", + "@component": "['package.core.auth'].web.blocks.LoginForm", + "name": "LoginForm", + "class": "LoginForm", + "kind": "block" + } + } + ] + } + ] + } + ], + "mutations": { + "static": {}, + "scheduled": { + "2020-08-28T06:55:21+00:00": { + "meta": { + "@component": "['package.core.ui'].web.documents.Document", + "@theme": "['package.core.cms'].web.documents.Document", + "kind": "document" + }, + "genes": { + "ui": { + "theme.model.variant": { + "param": "value" + }, + "theme.design.variant": "asImageSlider", + "theme.skin.variant": "themeVariantDefault", + "theme.skin.tone": "dimensionVariantDefault", + "theme.skin.typography": "sans", + "theme.skin.spacial": "compact", + "theme.skin.motion": "smooth" + } + }, + "layouts": [] + } + } + }, + "dna": { + "['package.core.auth'].web.documents.login": { + "actions": [ + { + "type": "GET_DOMAIN", + "payload": {}, + "error": false, + "meta": { + "package": "package.core.cms", + "endpoint": "/api/package.core.cms/web" + } + } + ], + "data": { + "accessors": { + "domain": "actions.GET_DOMAIN.response" + } + }, + "set": { + "viewport": "scroll", + "enable.stripe": true + }, + "ui": { + "theme.variant": "default", + "theme.model.variant": "scrollContainer", + "theme.design.variant": "login", + "theme.motion.variant": "login", + "theme.skin.variant": "themeVariantDefault", + "theme.skin.tone": "dimensionVariantDefault", + "theme.skin.typography": "sans", + "theme.skin.spacial": "compact", + "theme.skin.motion": "smooth", + "theme.style.variant": "home", + "theme.style.class": "home", + "theme.style.css": { + } + } + }, + "['package.core.auth'].web.documents.login.layouts[0:DocumentLayout]": { + "set": { + "collapse": false + }, + "ui": { + "theme.design.variant": "login" + } + }, + "['package.core.auth'].web.documents.login.layouts[0:DocumentLayout].regions[0:main]": { + "data": { + "accessors": { + "domain": "document.domain" + } + }, + "set": { + "position": "center", + "actions": {}, + "controls": {}, + "layout": { + "display": "flex" + } + }, + "ui": { + + }, + "a11y": { + "role": "region", + "label": "header" + } + }, + "['package.core.auth'].web.documents.login.layouts[0:DocumentLayout].regions[0:main].blocks[0:LoginForm]": { + "data": { + "accessors": { + "logo": "region.domain.hasFeaturedImage", + "title": "region.domain.title" + } + }, + "set": { + }, + "ui": { + "theme.context.variant": "material" + } + } + } + } + } + } + }, + "package.core.cms": { + "package": { + "meta": { + "@dna": "['package.core.cms']", + "name": "package.core.cms", + "kind": "package" + } + }, + "api": {}, + "app": {}, + "web": { + "documents": { + "home": { + "meta": { + "@dna": "['package.core.cms'].web.documents.home", + "@component": "['package.core.ui'].web.documents.Document", + "@theme": "['package.core.ui'].web.documents.Document", + "@route": { + "match": "/", + "params": {}, + "template": "web/package.core.cms.home", + "authenticated": false, + "cacheTime": 5 + }, + "kind": "document", + "class": "Document", + "name": "home" + }, + "layouts": [ + { + "meta": { + "@dna": "['package.core.cms'].web.documents.home.layouts[0:DocumentLayout]", + "@component": "['package.core.ui'].web.layouts.RenderLayout", + "@layout": "WebPageLayout", + "kind": "layout", + "class": "RenderLayout", + "name": "DocumentLayout" + }, + "regions": [ + { + "meta": { + "@dna": "['package.core.cms'].web.documents.home.layouts[0:DocumentLayout].regions[0:header]", + "name": "header", + "class": "Region", + "kind": "region" + }, + "blocks": [ + { + "meta": { + "@dna": "['package.core.cms'].web.documents.home.layouts[0:DocumentLayout].regions[0:header].blocks[0:PageHeader]", + "@component": "['package.core.ui'].web.blocks.PageHeader", + "name": "PageHeader", + "class": "PageHeader", + "kind": "block" + } + } + ] + }, + { + "meta": { + "@dna": "['package.core.cms'].web.documents.home.layouts[0:DocumentLayout].regions[1:body]", + "name": "body", + "class": "Region", + "kind": "region" + }, + "blocks": [ + { + "meta": { + "@dna": "['package.core.cms'].web.documents.home.layouts[0:DocumentLayout].regions[1:body].blocks[0:WebPageBody]", + "@component": "['package.core.ui'].web.blocks.WebPageBody", + "name": "WebPageBody", + "class": "WebPageBody", + "kind": "block" + } + } + ] + }, + { + "meta": { + "@dna": "['package.core.cms'].web.documents.home.layouts[0:DocumentLayout].regions[2:footer]", + "name": "footer", + "class": "Region", + "kind": "region" + }, + "blocks": [ + { + "meta": { + "@dna": "['package.core.cms'].web.documents.home.layouts[0:DocumentLayout].regions[2:main].blocks[0:PageFooter]", + "@component": "['package.core.ui'].web.blocks.PageFooter", + "name": "PageFooter", + "class": "PageFooter", + "kind": "block" + } + } + ] + } + ] + } + ], + "mutations": { + "static": {}, + "scheduled": { + "2020-08-28T06:55:21+00:00": { + "meta": { + "@component": "['package.core.ui'].web.documents.Document", + "@theme": "['package.core.cms'].web.documents.Document", + "kind": "document" + }, + "genes": { + "ui": { + "theme.model.variant": { + "param": "value" + }, + "theme.design.variant": "asImageSlider", + "theme.skin.variant": "themeVariantDefault", + "theme.skin.tone": "dimensionVariantDefault", + "theme.skin.typography": "sans", + "theme.skin.spacial": "compact", + "theme.skin.motion": "smooth" + } + }, + "layouts": [] + } + } + }, + "dna": { + "['package.core.cms'].web.documents.home": { + "actions": [ + { + "type": "GET_DOMAIN", + "payload": {}, + "error": false, + "meta": { + "package": "package.core.cms", + "endpoint": "/api/package.core.cms/web" + } + }, + { + "type": "GET_CONTENT_PAGE", + "payload": { + "params": { + "url": "ctx.query" + } + }, + "error": false, + "meta": { + "package": "package.core.cms", + "endpoint": "/api/package.core.cms/web" + } + }, + { + "type": "GET_ARTICLES", + "payload": { + "params": {} + }, + "error": false, + "meta": { + "package": "package.core.cms", + "endpoint": "/api/package.core.cms/web" + } + }, + { + "type": "GET_FACEBOOK_ALBUMS", + "payload": { + "params": { + "id": "1" + } + }, + "error": false, + "meta": { + "package": "package.apis.facebook", + "endpoint": "/api/package.apis.facebook/web" + } + } + ], + "data": { + "accessors": { + "body": "actions.GET_CONTENT_PAGE.response", + "articles": "actions.GET_ARTICLES.response", + "videos": "actions.GET_FACEBOOK_ALBUMS.response" + } + }, + "set": { + "viewport": "scroll", + "enable.stripe": true + }, + "ui": { + "theme.variant": "default", + "theme.model.variant": "scrollContainer", + "theme.design.variant": "default", + "theme.motion.variant": "default", + "theme.skin.variant": "themeVariantDefault", + "theme.skin.tone": "dimensionVariantDefault", + "theme.skin.typography": "sans", + "theme.skin.spacial": "compact", + "theme.skin.motion": "smooth", + "theme.style.variant": "home", + "theme.style.class": "home", + "theme.style.css": { + + } + } + }, + "['package.core.cms'].web.documents.home.layouts[0:DocumentLayout]": { + "set": { + "collapse": false + }, + "ui": { + } + }, + "['package.core.cms'].web.documents.home.layouts[0:DocumentLayout].regions[0:header]": { + "data": { + "accessors": { + "articles": "document.articles" + } + }, + "set": { + "position": "center", + "actions": {}, + "controls": {}, + "layout": { + "display": "flex" + } + }, + "ui": { + }, + "a11y": { + "role": "region", + "label": "header" + } + }, + "['package.core.cms'].web.documents.home.layouts[0:DocumentLayout].regions[0:header].blocks[0:PageHeader]": { + "data": { + "accessors": { + "header": "region.stories" + } + }, + "set": { + }, + "ui": { + } + }, + "['package.core.cms'].web.documents.home.layouts[0:DocumentLayout].regions[1:body]": { + "data": { + "accessors": { + "body": "document.body" + } + }, + "set": { + "position": "center", + "actions": {}, + "controls": {}, + "layout": { + "display": "flex" + } + }, + "a11y": { + "role": "main", + "label": "main" + } + }, + "['package.core.cms'].web.documents.home.layouts[0:DocumentLayout].regions[1:body].blocks[0:WebPageBody]": { + "data": { + "accessors": { + "body": "region.body" + } + }, + "set": { + }, + "ui": { + } + }, + "['package.core.cms'].web.documents.home.layouts[0:DocumentLayout].regions[2:footer]": { + "data": { + "selectors": "Links", + "accessors": { + "videos": "document.links" + } + }, + "set": { + "position": "center", + "actions": {}, + "controls": {}, + "layout": { + "display": "flex" + } + }, + "a11y": { + "role": "region", + "label": "footer" + } + }, + "['package.core.cms'].web.documents.home.layouts[0:DocumentLayout].regions[2:footer].blocks[0:PageFooter]": { + "data": { + "accessors": { + "videos": "region.links" + } + }, + "ui": {} + } + } + } + } + } + } + } +} + + diff --git a/packages/package.core.cms/api/api-web.js b/packages/package.core.cms/api/api-web.js index a8a8228..10e62b3 100644 --- a/packages/package.core.cms/api/api-web.js +++ b/packages/package.core.cms/api/api-web.js @@ -1,4 +1,4 @@ -const express = require('express') + const express = require('express') const axios = require('axios') const router = express.Router() diff --git a/pages/_app.js b/pages/_app.js index 2cc3118..22da9a4 100644 --- a/pages/_app.js +++ b/pages/_app.js @@ -29,7 +29,7 @@ export default withRedux( (initialState = {}) => { const composedEnhancer = composeWithDevTools({trace: false, traceLimit: 25}) return createStore( - rootReducer,`` + rootReducer, initialState, composedEnhancer(applyMiddleware(createLogicMiddleware(rootLogic, deps))) )