From 2b8af950076960d5804623454c1a6063f801637d Mon Sep 17 00:00:00 2001 From: John Date: Mon, 3 Feb 2020 17:04:58 +0100 Subject: [PATCH] feat: Add collaborator component and fix links (#45) Closes #46 Closes #44 Closes #40 --- src/components/adopters.module.css.d.ts | 13 +++-- src/components/announcement.module.css.d.ts | 7 ++- src/components/blog-hero.module.css.d.ts | 15 ++--- src/components/blog-section.module.css.d.ts | 7 ++- src/components/codebox.module.css.d.ts | 25 +++++---- src/components/collaborator.module.css | 32 +++++++++++ src/components/collaborator.module.css.d.ts | 6 ++ src/components/collaborator.tsx | 43 +++++++++++++++ src/components/footer.module.css.d.ts | 21 +++---- src/components/header.module.css.d.ts | 21 +++---- src/components/hero.module.css.d.ts | 13 +++-- src/components/layout.tsx | 2 +- src/components/mobile-menu.module.css.d.ts | 17 +++--- src/components/newsletter.module.css.d.ts | 13 +++-- src/components/profile.module.css.d.ts | 7 ++- src/components/projects.module.css.d.ts | 19 ++++--- .../responsive-section.module.css.d.ts | 11 ++-- src/components/section.module.css.d.ts | 11 ++-- src/components/stats.module.css.d.ts | 18 +++--- .../vertical-divider.module.css.d.ts | 7 ++- src/pages/blog.module.css.d.ts | 19 ++++--- src/pages/hydra.tsx | 23 +------- src/pages/index.module.css.d.ts | 7 ++- src/pages/kratos.tsx | 25 +-------- src/styles/global.css.d.ts | 7 ++- src/styles/grid.css.d.ts | 55 ++++++++++--------- src/styles/typography.css.d.ts | 17 +++--- 27 files changed, 262 insertions(+), 199 deletions(-) create mode 100644 src/components/collaborator.module.css create mode 100644 src/components/collaborator.module.css.d.ts create mode 100644 src/components/collaborator.tsx diff --git a/src/components/adopters.module.css.d.ts b/src/components/adopters.module.css.d.ts index 47e2526c95..4765bb6a53 100644 --- a/src/components/adopters.module.css.d.ts +++ b/src/components/adopters.module.css.d.ts @@ -1,7 +1,8 @@ declare const styles: { - readonly adopters: string - readonly list: string - readonly logos: string - readonly logosInner: string -} -export = styles + readonly "adopters": string; + readonly "list": string; + readonly "logos": string; + readonly "logosInner": string; +}; +export = styles; + diff --git a/src/components/announcement.module.css.d.ts b/src/components/announcement.module.css.d.ts index 80b07a61db..b003d1dcfe 100644 --- a/src/components/announcement.module.css.d.ts +++ b/src/components/announcement.module.css.d.ts @@ -1,4 +1,5 @@ declare const styles: { - readonly announcement: string -} -export = styles + readonly "announcement": string; +}; +export = styles; + diff --git a/src/components/blog-hero.module.css.d.ts b/src/components/blog-hero.module.css.d.ts index f42afebabe..bc3575e675 100644 --- a/src/components/blog-hero.module.css.d.ts +++ b/src/components/blog-hero.module.css.d.ts @@ -1,8 +1,9 @@ declare const styles: { - readonly title: string - readonly meta: string - readonly author: string - readonly subtitle: string - readonly teaser: string -} -export = styles + readonly "title": string; + readonly "meta": string; + readonly "author": string; + readonly "subtitle": string; + readonly "teaser": string; +}; +export = styles; + diff --git a/src/components/blog-section.module.css.d.ts b/src/components/blog-section.module.css.d.ts index b0222e05fb..a09ec68fc5 100644 --- a/src/components/blog-section.module.css.d.ts +++ b/src/components/blog-section.module.css.d.ts @@ -1,4 +1,5 @@ declare const styles: { - readonly section: string -} -export = styles + readonly "section": string; +}; +export = styles; + diff --git a/src/components/codebox.module.css.d.ts b/src/components/codebox.module.css.d.ts index d334dcceda..f0a00b54cd 100644 --- a/src/components/codebox.module.css.d.ts +++ b/src/components/codebox.module.css.d.ts @@ -1,13 +1,14 @@ declare const styles: { - readonly box: string - readonly editorHeader: string - readonly tabs: string - readonly tab: string - readonly selected: string - readonly windowActions: string - readonly windowAction: string - readonly primary: string - readonly content: string - readonly active: string -} -export = styles + readonly "box": string; + readonly "editorHeader": string; + readonly "tabs": string; + readonly "tab": string; + readonly "selected": string; + readonly "windowActions": string; + readonly "windowAction": string; + readonly "primary": string; + readonly "content": string; + readonly "active": string; +}; +export = styles; + diff --git a/src/components/collaborator.module.css b/src/components/collaborator.module.css new file mode 100644 index 0000000000..61d51758a7 --- /dev/null +++ b/src/components/collaborator.module.css @@ -0,0 +1,32 @@ +.collaborator { + background-color: var(--colors-base-white); + padding: 96px 0; + position: relative; + + & h3, + & p { + color: var(--colors-ory-dark); + } +} + +.image { + width: 100%; + flex-wrap: wrap; + align-items: center; + flex-direction: row; + + & :global img { + display: block; + margin: 0 auto; + max-width: 540px; + } +} + +@media (--mobile-viewport) { + .collaborator { + padding: 64px 0; + } + .collaborator :global .container-fluid .row { + flex-direction: column-reverse; + } +} diff --git a/src/components/collaborator.module.css.d.ts b/src/components/collaborator.module.css.d.ts new file mode 100644 index 0000000000..ad6e7eb31e --- /dev/null +++ b/src/components/collaborator.module.css.d.ts @@ -0,0 +1,6 @@ +declare const styles: { + readonly "collaborator": string; + readonly "image": string; +}; +export = styles; + diff --git a/src/components/collaborator.tsx b/src/components/collaborator.tsx new file mode 100644 index 0000000000..e7c144b557 --- /dev/null +++ b/src/components/collaborator.tsx @@ -0,0 +1,43 @@ +import React from 'react' +import styles from './collaborator.module.css' + +const collaborator = [ + { + title: 'OpenCollective', + image: 'https://opencollective.com/ory/contributors.svg?avatarHeight=24&width=540&button=false', + url: 'https://github.com/ory', + } +] + +const Collaborator = () => ( +
+
+
+
+

Open Source Contributors

+

+ The ORY community stands on the shoulders of individuals, companies, + and maintainers. We thank everyone involved - from submitting bug + reports and feature requests, to contributing patches, to sponsoring + our work. Our small team would have never been able to achieve this + without each and everyone of you. +

+
+
+
+ {collaborator.map(({ title, image, url }) => ( + + {title} + + ))} +
+
+
+

Open Source Contributors

+
+
+
+
+) + +export default Collaborator diff --git a/src/components/footer.module.css.d.ts b/src/components/footer.module.css.d.ts index c455c87397..4543b2ef9e 100644 --- a/src/components/footer.module.css.d.ts +++ b/src/components/footer.module.css.d.ts @@ -1,11 +1,12 @@ declare const styles: { - readonly footer: string - readonly contact: string - readonly copyright: string - readonly listTitle: string - readonly list: string - readonly item: string - readonly menuRow: string - readonly menuItem: string -} -export = styles + readonly "footer": string; + readonly "contact": string; + readonly "copyright": string; + readonly "listTitle": string; + readonly "list": string; + readonly "item": string; + readonly "menuRow": string; + readonly "menuItem": string; +}; +export = styles; + diff --git a/src/components/header.module.css.d.ts b/src/components/header.module.css.d.ts index 39e5aeeda7..e6c6fd6877 100644 --- a/src/components/header.module.css.d.ts +++ b/src/components/header.module.css.d.ts @@ -1,11 +1,12 @@ declare const styles: { - readonly header: string - readonly logo: string - readonly projectName: string - readonly projectNameTiny: string - readonly menu: string - readonly leftMenu: string - readonly rightMenu: string - readonly iconMenu: string -} -export = styles + readonly "header": string; + readonly "logo": string; + readonly "projectName": string; + readonly "projectNameTiny": string; + readonly "menu": string; + readonly "leftMenu": string; + readonly "rightMenu": string; + readonly "iconMenu": string; +}; +export = styles; + diff --git a/src/components/hero.module.css.d.ts b/src/components/hero.module.css.d.ts index e17687eeb5..99114522ef 100644 --- a/src/components/hero.module.css.d.ts +++ b/src/components/hero.module.css.d.ts @@ -1,7 +1,8 @@ declare const styles: { - readonly hero: string - readonly primary: string - readonly secondary: string - readonly logo: string -} -export = styles + readonly "hero": string; + readonly "primary": string; + readonly "secondary": string; + readonly "logo": string; +}; +export = styles; + diff --git a/src/components/layout.tsx b/src/components/layout.tsx index a0c7222c24..3ca97057ea 100644 --- a/src/components/layout.tsx +++ b/src/components/layout.tsx @@ -27,7 +27,7 @@ const defaultMenu: Menu = [ const defaultIconMenu: IconMenu = [ { title: 'Chat', href: 'https://www.ory.sh/chat' }, { title: 'Forum', href: 'https://community.ory.sh/' }, - { title: 'GitHub', href: 'https://github.com/ory/hydra' }, + { title: 'GitHub', href: 'https://github.com/ory' }, ] const Layout = ({ diff --git a/src/components/mobile-menu.module.css.d.ts b/src/components/mobile-menu.module.css.d.ts index dac5bba3f6..b70bba7509 100644 --- a/src/components/mobile-menu.module.css.d.ts +++ b/src/components/mobile-menu.module.css.d.ts @@ -1,9 +1,10 @@ declare const styles: { - readonly navIcon: string - readonly divider: string - readonly show: string - readonly navContainer: string - readonly isActive: string - readonly navItems: string -} -export = styles + readonly "navIcon": string; + readonly "divider": string; + readonly "show": string; + readonly "navContainer": string; + readonly "isActive": string; + readonly "navItems": string; +}; +export = styles; + diff --git a/src/components/newsletter.module.css.d.ts b/src/components/newsletter.module.css.d.ts index 2b3e4265f7..bc9afaa88b 100644 --- a/src/components/newsletter.module.css.d.ts +++ b/src/components/newsletter.module.css.d.ts @@ -1,7 +1,8 @@ declare const styles: { - readonly newsletter: string - readonly right: string - readonly light: string - readonly form: string -} -export = styles + readonly "newsletter": string; + readonly "right": string; + readonly "light": string; + readonly "form": string; +}; +export = styles; + diff --git a/src/components/profile.module.css.d.ts b/src/components/profile.module.css.d.ts index 959ad35b28..97111b8dbc 100644 --- a/src/components/profile.module.css.d.ts +++ b/src/components/profile.module.css.d.ts @@ -1,4 +1,5 @@ declare const styles: { - readonly profile: string -} -export = styles + readonly "profile": string; +}; +export = styles; + diff --git a/src/components/projects.module.css.d.ts b/src/components/projects.module.css.d.ts index bdd43a421c..34fb19e39d 100644 --- a/src/components/projects.module.css.d.ts +++ b/src/components/projects.module.css.d.ts @@ -1,10 +1,11 @@ declare const styles: { - readonly description: string - readonly project: string - readonly kratos: string - readonly hydra: string - readonly oathkeeper: string - readonly keto: string - readonly section: string -} -export = styles + readonly "description": string; + readonly "project": string; + readonly "kratos": string; + readonly "hydra": string; + readonly "oathkeeper": string; + readonly "keto": string; + readonly "section": string; +}; +export = styles; + diff --git a/src/components/responsive-section.module.css.d.ts b/src/components/responsive-section.module.css.d.ts index ac7973b4eb..3fc00c6936 100644 --- a/src/components/responsive-section.module.css.d.ts +++ b/src/components/responsive-section.module.css.d.ts @@ -1,6 +1,7 @@ declare const styles: { - readonly section: string - readonly light: string - readonly dark: string -} -export = styles + readonly "section": string; + readonly "light": string; + readonly "dark": string; +}; +export = styles; + diff --git a/src/components/section.module.css.d.ts b/src/components/section.module.css.d.ts index ac7973b4eb..3fc00c6936 100644 --- a/src/components/section.module.css.d.ts +++ b/src/components/section.module.css.d.ts @@ -1,6 +1,7 @@ declare const styles: { - readonly section: string - readonly light: string - readonly dark: string -} -export = styles + readonly "section": string; + readonly "light": string; + readonly "dark": string; +}; +export = styles; + diff --git a/src/components/stats.module.css.d.ts b/src/components/stats.module.css.d.ts index 0a56c9acba..0be05f38d1 100644 --- a/src/components/stats.module.css.d.ts +++ b/src/components/stats.module.css.d.ts @@ -1,10 +1,10 @@ declare const styles: { - readonly stats: string - readonly items: string - readonly item: string - readonly amount: string - readonly title: string - readonly description: string - readonly divider: string -} -export = styles + readonly "stats": string; + readonly "items": string; + readonly "item": string; + readonly "amount": string; + readonly "title": string; + readonly "description": string; +}; +export = styles; + diff --git a/src/components/vertical-divider.module.css.d.ts b/src/components/vertical-divider.module.css.d.ts index cbc8f51f1c..f6dd603cfe 100644 --- a/src/components/vertical-divider.module.css.d.ts +++ b/src/components/vertical-divider.module.css.d.ts @@ -1,4 +1,5 @@ declare const styles: { - readonly divider: string -} -export = styles + readonly "divider": string; +}; +export = styles; + diff --git a/src/pages/blog.module.css.d.ts b/src/pages/blog.module.css.d.ts index 2345d0d3de..b1fbe28409 100644 --- a/src/pages/blog.module.css.d.ts +++ b/src/pages/blog.module.css.d.ts @@ -1,10 +1,11 @@ declare const styles: { - readonly pageTitle: string - readonly postList: string - readonly postItem: string - readonly postOverline: string - readonly postTitle: string - readonly postTeaser: string - readonly postLink: string -} -export = styles + readonly "pageTitle": string; + readonly "postList": string; + readonly "postItem": string; + readonly "postOverline": string; + readonly "postTitle": string; + readonly "postTeaser": string; + readonly "postLink": string; +}; +export = styles; + diff --git a/src/pages/hydra.tsx b/src/pages/hydra.tsx index 63b6a820fd..442471b44d 100644 --- a/src/pages/hydra.tsx +++ b/src/pages/hydra.tsx @@ -13,6 +13,7 @@ import integrationProcess from '../images/hydra/hydra_process.svg' import { brandPrefix } from '../config' import cn from 'classnames' import ResponsiveSection from '../components/responsive-section' +import Collaborator from '../components/collaborator' const IntegrationCodeBox = () => ( ( - Open Source Contributors} - left={ - <> -

- The ORY community stands on the shoulders of individuals, companies, - and maintainers. We thank everyone involved - from submitting bug - reports and feature requests, to contributing patches, to sponsoring - our work. Our small team would have never been able to achieve this - without each and everyone of you. -

- - } - right={ - ORY Open Source Contributors - } - /> + ) diff --git a/src/pages/index.module.css.d.ts b/src/pages/index.module.css.d.ts index 6e8bdb1b39..e57c06ee81 100644 --- a/src/pages/index.module.css.d.ts +++ b/src/pages/index.module.css.d.ts @@ -1,4 +1,5 @@ declare const styles: { - readonly avatar: string -} -export = styles + readonly "avatar": string; +}; +export = styles; + diff --git a/src/pages/kratos.tsx b/src/pages/kratos.tsx index 7aff17a82f..3570473c0b 100644 --- a/src/pages/kratos.tsx +++ b/src/pages/kratos.tsx @@ -13,6 +13,7 @@ import kratosProcess from '../images/kratos_process.svg' import { brandPrefix } from '../config' import cn from 'classnames' import ResponsiveSection from '../components/responsive-section' +import Collaborator from '../components/collaborator' const IntegrationCodeBox = () => ( ( - Open Source Contributors} - left={ - <> -

- The ORY community stands on the shoulders of individuals, companies, - and maintainers. We thank everyone involved - from submitting bug - reports and feature requests, to contributing patches, to sponsoring - our work. Our small team would have never been able to achieve this - without each and everyone of you. -

- - } - right={ - ORY Open Source Contributors - } - /> + ) -export default KratosPage +export default KratosPage \ No newline at end of file diff --git a/src/styles/global.css.d.ts b/src/styles/global.css.d.ts index f4fda61c1f..31296e3e44 100644 --- a/src/styles/global.css.d.ts +++ b/src/styles/global.css.d.ts @@ -1,4 +1,5 @@ declare const styles: { - readonly responsive: string -} -export = styles + readonly "responsive": string; +}; +export = styles; + diff --git a/src/styles/grid.css.d.ts b/src/styles/grid.css.d.ts index f439449a8e..3af13607d2 100644 --- a/src/styles/grid.css.d.ts +++ b/src/styles/grid.css.d.ts @@ -1,28 +1,29 @@ declare const styles: { - readonly containerFluid: string - readonly row: string - readonly topSm: string - readonly middleSm: string - readonly bottomSm: string - readonly mobileOffset64: string - readonly mobileOffset32: string - readonly mobileOffset16: string - readonly mobileOffset8: string - readonly centerMobile: string - readonly hiddenSm: string - readonly hiddenMd: string - readonly hiddenLg: string - readonly colSm: string - readonly colSmOffset: string - readonly topMd: string - readonly middleMd: string - readonly bottomMd: string - readonly colMd: string - readonly colMdOffset: string - readonly topLg: string - readonly middleLg: string - readonly bottomLg: string - readonly colLg: string - readonly colLgOffset: string -} -export = styles + readonly "containerFluid": string; + readonly "row": string; + readonly "topSm": string; + readonly "middleSm": string; + readonly "bottomSm": string; + readonly "mobileOffset64": string; + readonly "mobileOffset32": string; + readonly "mobileOffset16": string; + readonly "mobileOffset8": string; + readonly "centerMobile": string; + readonly "hiddenSm": string; + readonly "hiddenMd": string; + readonly "hiddenLg": string; + readonly "colSm": string; + readonly "colSmOffset": string; + readonly "topMd": string; + readonly "middleMd": string; + readonly "bottomMd": string; + readonly "colMd": string; + readonly "colMdOffset": string; + readonly "topLg": string; + readonly "middleLg": string; + readonly "bottomLg": string; + readonly "colLg": string; + readonly "colLgOffset": string; +}; +export = styles; + diff --git a/src/styles/typography.css.d.ts b/src/styles/typography.css.d.ts index b7bcc37205..588fa8963b 100644 --- a/src/styles/typography.css.d.ts +++ b/src/styles/typography.css.d.ts @@ -1,9 +1,10 @@ declare const styles: { - readonly secondary: string - readonly cta: string - readonly primary: string - readonly visited: string - readonly tertiary: string - readonly remarkEmoji: string -} -export = styles + readonly "secondary": string; + readonly "cta": string; + readonly "primary": string; + readonly "visited": string; + readonly "tertiary": string; + readonly "remarkEmoji": string; +}; +export = styles; +