merge with develop branch

scm-ui/ui-components/src/layout/CustomQueryFlexWrappedColumns.tsx

@@ -0,0 +1,43 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020-present Cloudogu GmbH and Contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+import React, { ReactNode } from "react";
+import styled from "styled-components";
+
+type Props = {
+  children?: ReactNode;
+};
+
+const FlexWrapped = styled.div`
+  /* Do not wrap before using the media query, 
+  otherwise long content will always break the navigation. */
+  @media (max-width: 785px) {
+    flex-wrap: wrap;
+  }
+`;
+
+export default class CustomQueryFlexWrappedColumns extends React.Component<Props> {
+  render() {
+    return <FlexWrapped className="columns">{this.props.children}</FlexWrapped>;
+  }
+}

scm-ui/ui-components/src/layout/PrimaryContentColumn.tsx

@@ -0,0 +1,56 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020-present Cloudogu GmbH and Contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+import React, { ReactNode } from "react";
+import styled from "styled-components";
+
+type Props = {
+  children?: ReactNode;
+  collapsed: boolean;
+};
+
+const PrimaryColumn = styled.div<{ collapsed: boolean }>`
+  /* This is the counterpart to the specific column in SecondaryNavigationColumn. */
+  flex: none;
+  width: ${(props: { collapsed: boolean }) => (props.collapsed ? "89.7%" : "75%")};
+  /* Render this column to full size if column construct breaks (page size too small). */
+  @media (max-width: 785px) {
+    width: 100%;
+  }
+`;
+
+export default class PrimaryContentColumn extends React.Component<Props> {
+  static defaultProps = {
+    collapsed: false
+  };
+
+  render() {
+    const { children, collapsed } = this.props;
+
+    return (
+      <PrimaryColumn className="column" collapsed={collapsed}>
+        {children}
+      </PrimaryColumn>
+    );
+  }
+}

scm-ui/ui-components/src/layout/SecondaryNavigationColumn.tsx

@@ -0,0 +1,59 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020-present Cloudogu GmbH and Contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+import React, { ReactNode } from "react";
+import styled from "styled-components";
+
+type Props = {
+  children?: ReactNode;
+  collapsed: boolean;
+};
+
+const SecondaryColumn = styled.div<{ collapsed: boolean }>`
+  /* In Bulma there is unfortunately no intermediate step between .is-1 and .is-2, hence the size. 
+  Navigation size should be as constant as possible. */
+  flex: none;
+  width: ${props => (props.collapsed ? "5.5rem" : "20.5rem")};
+  max-width: ${(props: { collapsed: boolean }) => (props.collapsed ? "11.3%" : "25%")};
+  /* Render this column to full size if column construct breaks (page size too small). */
+  @media (max-width: 785px) {
+    width: 100%;
+    max-width: 100%;
+  }
+`;
+
+export default class SecondaryNavigationColumn extends React.Component<Props> {
+  static defaultProps = {
+    collapsed: false
+  };
+
+  render() {
+    const { children, collapsed } = this.props;
+
+    return (
+      <SecondaryColumn className="column" collapsed={collapsed}>
+        {children}
+      </SecondaryColumn>
+    );
+  }
+}

scm-ui/ui-components/src/layout/index.ts

@@ -31,3 +31,7 @@ export { default as Page } from "./Page";
 export { default as PageActions } from "./PageActions";
 export { default as Subtitle } from "./Subtitle";
 export { default as Title } from "./Title";
+export { default as CustomQueryFlexWrappedColumns } from "./CustomQueryFlexWrappedColumns";
+export { default as PrimaryContentColumn } from "./PrimaryContentColumn";
+export { default as SecondaryNavigationColumn } from "./SecondaryNavigationColumn";
+