@ndla/ui 13.2.2 → 15.1.0

package/src/Breadcrumb/ActionBreadcrumb.tsx

@@ -0,0 +1,68 @@
+/**
+ * Copyright (c) 2022-present, NDLA.
+ *
+ * This source code is licensed under the GPLv3 license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import styled from '@emotion/styled';
+import { colors, fonts, spacing } from '@ndla/core';
+import { ChevronRight } from '@ndla/icons/common';
+import SafeLink from '@ndla/safelink';
+import React from 'react';
+import { MenuButton } from '@ndla/button';
+import { MenuItemProps } from '@ndla/button';
+import Breadcrumb from './Breadcrumb';
+import { IndexedBreadcrumbItem, SimpleBreadcrumbItem } from './BreadcrumbItem';
+
+const StyledRightChevron = styled(ChevronRight)`
+  color: ${colors.text.primary};
+  margin: ${spacing.xxsmall};
+  height: 24px;
+  width: 24px;
+`;
+
+const StyledSpan = styled.span`
+  color: ${colors.text.primary};
+  font-weight: ${fonts.weight.bold};
+`;
+
+const StyledSafeLink = styled(SafeLink)`
+  color: ${colors.text.primary};
+  box-shadow: none;
+  font-weight: ${fonts.weight.bold};
+  :hover {
+    color: ${colors.brand.primary};
+  }
+`;
+
+interface Props {
+  items: SimpleBreadcrumbItem[];
+  actionItems: MenuItemProps[];
+}
+
+const ActionBreadcrumb = ({ items, actionItems }: Props) => {
+  const renderItem = (item: IndexedBreadcrumbItem, totalCount: number) => {
+    if (item.index === totalCount - 1) {
+      return (
+        <MenuButton menuItems={actionItems} size="small">
+          <StyledSpan>{item.name}</StyledSpan>
+        </MenuButton>
+      );
+    }
+    return <StyledSafeLink to={item.to}>{item.name}</StyledSafeLink>;
+  };
+
+  const renderSeparator = (item: IndexedBreadcrumbItem, totalCount: number) => {
+    if (item.index === totalCount - 1) {
+      return null;
+    }
+
+    return <StyledRightChevron />;
+  };
+
+  return <Breadcrumb items={items} renderItem={renderItem} renderSeparator={renderSeparator} />;
+};
+
+export default ActionBreadcrumb;

package/src/Breadcrumb/index.ts

@@ -14,4 +14,6 @@ export { default as HeaderBreadcrumb } from './HeaderBreadcrumb';
 
 export { default as HomeBreadcrumb } from './HomeBreadcrumb';
 
+export { default as ActionBreadcrumb } from './ActionBreadcrumb';
+
 export default Breadcrumb;

package/src/Footer/FooterAuth.tsx

@@ -6,15 +6,13 @@
  *
  */
 
-import React from 'react';
-import { useTranslation } from 'react-i18next';
 import styled from '@emotion/styled';
+import Button from '@ndla/button';
 import { animations, colors, fonts, spacing } from '@ndla/core';
 import { ChevronDown, FeideText, LogIn, LogOut } from '@ndla/icons/common';
-import Button from '@ndla/button';
-
-import { AuthModalProps } from '../User/AuthModal';
-import AuthModal from '../User';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import AuthModal, { AuthModalProps } from '../User/AuthModal';
 
 const Wrapper = styled.div`
   display: flex;
@@ -66,7 +64,7 @@ const AuthedButton = styled(Button)`
   }
 `;
 
-const FooterAuth = ({ isAuthenticated, onAuthenticateClick, authorizedRole, ...rest }: AuthModalProps) => {
+const FooterAuth = ({ isAuthenticated, user, onAuthenticateClick, ...rest }: AuthModalProps) => {
   const { t } = useTranslation();
   return (
     <Wrapper>
@@ -78,11 +76,11 @@ const FooterAuth = ({ isAuthenticated, onAuthenticateClick, authorizedRole, ...r
           <AuthModal
             {...rest}
             isAuthenticated={isAuthenticated}
+            user={user}
             onAuthenticateClick={onAuthenticateClick}
-            authorizedRole={authorizedRole}
             activateButton={
               <AuthedButton ghostPill size="medium">
-                {t('user.loggedInAsButton', { role: authorizedRole })}
+                {t('user.loggedInAsButton', { role: user?.eduPersonPrimaryAffiliation })}
                 <ChevronDown />
               </AuthedButton>
             }

package/src/InfoBlock/InfoBlock.tsx

@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2022-present, NDLA.
+ *
+ * This source code is licensed under the GPLv3 license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import React, { ReactNode } from 'react';
+import styled from '@emotion/styled';
+import { spacing, fonts, colors } from '@ndla/core';
+
+const InfoBlockWrapper = styled.div`
+  border-bottom: 1px solid ${colors.brand.neutral7};
+  padding: ${spacing.small} 0;
+`;
+
+const IconWrapper = styled.div`
+  align-items: flex-start;
+  display: flex;
+
+  svg {
+    height: 25px;
+    width: 25px;
+  }
+`;
+
+const StyledTextWrapper = styled.div`
+  ${fonts.sizes(18)}
+`;
+
+const TitleWrapper = styled.div`
+  display: flex;
+
+  gap: ${spacing.small};
+`;
+
+const StyledTitle = styled.h2`
+  ${fonts.sizes('18')}
+  font-weight: 700;
+  margin: 0;
+`;
+
+interface InfoBlockProps {
+  icon?: ReactNode;
+  title?: string;
+  children?: ReactNode;
+}
+export const InfoBlock = ({ icon, title, children }: InfoBlockProps) => {
+  return (
+    <InfoBlockWrapper>
+      <TitleWrapper>
+        <IconWrapper>{icon}</IconWrapper>
+        <StyledTitle>{title}</StyledTitle>
+      </TitleWrapper>
+      <StyledTextWrapper>{children}</StyledTextWrapper>
+    </InfoBlockWrapper>
+  );
+};
+
+export default InfoBlock;

package/src/InfoBlock/index.ts

@@ -0,0 +1 @@
+export { InfoBlock } from './InfoBlock';

package/src/LearningPaths/LearningPathMenu.tsx

@@ -123,7 +123,7 @@ const LearningPathMenu = ({
               css={css`
                 padding-left: ${spacing.small};
               `}>
-              <Tooltip align="right" tooltip={t('learningPath.openMenuTooltip')}>
+              <Tooltip tooltip={t('learningPath.openMenuTooltip')}>
                 <StyledToggleMenubutton type="button" onClick={() => toggleOpenState(!isOpen)}>
                   {!isOpen ? <ArrowExpandRight /> : <ArrowExpandLeft />}
                 </StyledToggleMenubutton>

package/src/Masthead/MastheadAuthModal.tsx

@@ -11,8 +11,7 @@ import styled from '@emotion/styled';
 import Button from '@ndla/button';
 import { Feide } from '@ndla/icons/common';
 
-import AuthModal from '../User';
-import { AuthModalProps } from '../User/AuthModal';
+import AuthModal, { AuthModalProps } from '../User/AuthModal';
 
 type FeideWrapperProps = {
   inverted?: boolean;
@@ -31,11 +30,11 @@ const StyledButton = styled(Button)<FeideWrapperProps>`
   }
 `;
 
-type Props = {
+interface Props extends AuthModalProps {
   inverted?: boolean;
-};
+}
 
-const MastheadAuthModal = ({ inverted, ...rest }: Props & AuthModalProps) => {
+const MastheadAuthModal = ({ inverted, ...rest }: Props) => {
   return (
     <AuthModal
       {...rest}

package/src/MyNdla/Navigation/VerticalNavigation.tsx

@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2022-present, NDLA.
+ *
+ * This source code is licensed under the GPLv3 license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import React, { ReactNode } from 'react';
+import styled from '@emotion/styled';
+import { colors, spacing } from '@ndla/core';
+import SafeLinkButton from '@ndla/safelink';
+import { mq, breakpoints } from '@ndla/core';
+
+const NavigationWrapper = styled.div`
+  display: flex;
+  justify-content: flex-start;
+  margin: 0;
+  max-width: 20vw;
+  border-right: 1px solid ${colors.brand.greyLighter};
+  height: 100%;
+  ${mq.range({ until: breakpoints.tabletWide })} {
+    display: none;
+  }
+`;
+
+const Navigation = styled.div`
+  padding: ${spacing.large};
+`;
+
+const NavigationElementText = styled.div`
+  color: ${colors.text.primary};
+`;
+
+const NavigationElement = styled(SafeLinkButton)`
+  display: flex;
+  align-items: center;
+  gap: 11px;
+  height: 30px;
+  box-shadow: none;
+  &:hover {
+    background-color: ${colors.brand.lighter};
+    border-radius: 5%;
+    svg {
+      fill: ${colors.brand.primary};
+    }
+    ${NavigationElementText} {
+      color: ${colors.brand.primary};
+    }
+  }
+  &:focus {
+    svg {
+      fill: ${colors.brand.primary};
+    }
+    ${NavigationElementText} {
+      color: ${colors.brand.primary};
+    }
+  }
+`;
+
+const IconWrapper = styled.div`
+  svg {
+    fill: ${colors.text.primary};
+    height: 20px;
+    width: 20px;
+  }
+`;
+
+interface NavProps {
+  navElements?: {
+    icon: ReactNode;
+    url: string;
+    name: string;
+  }[];
+}
+export const VerticalNavigation = ({ navElements }: NavProps) => {
+  return (
+    <NavigationWrapper>
+      <Navigation>
+        {navElements?.map((element) => {
+          return (
+            <NavigationElement to={element.url}>
+              <IconWrapper>{element.icon}</IconWrapper>
+              <NavigationElementText>{element.name}</NavigationElementText>
+            </NavigationElement>
+          );
+        })}
+      </Navigation>
+    </NavigationWrapper>
+  );
+};
+
+export default VerticalNavigation;

package/src/MyNdla/Navigation/index.ts

@@ -0,0 +1,2 @@
+import VerticalNavigation from './VerticalNavigation';
+export { VerticalNavigation };

package/src/MyNdla/Resource/Folder.tsx

@@ -0,0 +1,145 @@
+/**
+ * Copyright (c) 2022-present, NDLA.
+ *
+ * This source code is licensed under the GPLv3 license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import styled from '@emotion/styled';
+import React, { ReactNode } from 'react';
+import { FolderOutlined } from '@ndla/icons/contentType';
+import { FileDocumentOutline } from '@ndla/icons/common';
+import { fonts, spacing, colors } from '@ndla/core';
+import { css } from '@emotion/core';
+import { useTranslation } from 'react-i18next';
+import SafeLink from '@ndla/safelink';
+import { MenuButton } from '@ndla/button';
+
+interface FolderIconWrapperProps {
+  type?: LayoutType;
+}
+
+const FolderIconWrapper = styled.div<FolderIconWrapperProps>`
+  display: flex;
+  border-radius: 100%;
+  padding: ${spacing.small};
+  background-color: ${colors.brand.greyLighter};
+  svg {
+    width: 18px;
+    height: 18px;
+  }
+  ${(p) =>
+    p.type === 'block' &&
+    css`
+    background-color: transparent;
+    ${FolderWrapper}:hover & {
+      background-color: ${colors.brand.light};
+      transition-duration 0.5s;
+    }
+  `};
+`;
+
+const FolderTitle = styled.h2`
+  ${fonts.sizes(18)};
+  font-weight: ${fonts.weight.normal};
+  margin: 0;
+  flex: 1;
+
+  overflow: hidden;
+  text-overflow: ellipsis;
+  // Unfortunate css needed for multi-line text overflow ellipsis.
+  display: -webkit-box;
+  -webkit-line-clamp: 1;
+  line-clamp: 1;
+  -webkit-box-orient: vertical;
+`;
+
+const FolderWrapper = styled(SafeLink)`
+  display: flex;
+  align-items: center;
+  padding: ${spacing.small};
+  border: 1px solid ${colors.brand.light};
+  border-radius: 2px;
+  box-shadow: none;
+  text-decoration: none;
+  color: ${colors.brand.greyDark};
+  font-family: ${fonts.sans};
+  transition-duration: 0.2s;
+  gap: ${spacing.small};
+  &:hover {
+    box-shadow: 1px 1px 6px 2px rgba(9, 55, 101, 0.08);
+    transition-duration: 0.2s;
+    ${FolderTitle} {
+      color: ${colors.brand.primary};
+      text-decoration: underline;
+    }
+  }
+`;
+
+interface Props {
+  title: string;
+  subFolders?: number;
+  subResources?: number;
+  description?: string;
+  link: string;
+  type: LayoutType;
+  actionMenu?: ReactNode;
+}
+
+interface IconCountProps {
+  type: 'resource' | 'folder';
+  count?: number;
+  layoutType: LayoutType;
+}
+
+interface IconCountWrapperProps {
+  type: LayoutType;
+}
+
+const IconCountWrapper = styled.div<IconCountWrapperProps>`
+  display: flex;
+  align-items: center;
+  gap: 2px;
+  ${fonts.sizes(16)};
+  ${(p) =>
+    p.type === 'block' &&
+    css`
+      opacity: 0;
+      ${FolderWrapper}:hover & {
+        opacity: 1;
+      }
+    `};
+`;
+
+const IconCount = ({ type, count, layoutType }: IconCountProps) => {
+  const Icon = type === 'resource' ? FileDocumentOutline : FolderOutlined;
+  const { t } = useTranslation();
+  if (!count) return null;
+
+  return (
+    <IconCountWrapper type={layoutType}>
+      <Icon aria-label={t(`myNdla.${type}s`)} />
+      <span>{layoutType === 'block' ? count : t(`myNdla.${type}s`, { count: 3 })}</span>
+    </IconCountWrapper>
+  );
+};
+
+type LayoutType = 'list' | 'block';
+
+const Folder = ({ link, title, subFolders, subResources, type = 'list', actionMenu }: Props) => {
+  const { t } = useTranslation();
+  return (
+    <FolderWrapper to={link}>
+      <FolderIconWrapper type={type}>
+        <FolderOutlined aria-label={t('myNdla.folder')} />
+      </FolderIconWrapper>
+      <FolderTitle>{title}</FolderTitle>
+      <IconCount layoutType={type} type={'folder'} count={subFolders} />
+      <IconCount layoutType={type} type={'resource'} count={subResources} />
+      <MenuButton size="small" />
+    </FolderWrapper>
+  );
+};
+
+export default Folder;

package/src/MyNdla/Resource/FolderInput.tsx

@@ -0,0 +1,104 @@
+/**
+ * Copyright (c) 2022-present, NDLA.
+ *
+ * This source code is licensed under the GPLv3 license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import styled from '@emotion/styled';
+import { IconButton } from '@ndla/button/src';
+import { FolderOutlined } from '@ndla/icons/contentType';
+import { Cross } from '@ndla/icons/action';
+import React, { ChangeEvent, KeyboardEvent, useEffect, useRef, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { colors, spacing } from '@ndla/core';
+
+// Source: https://kovart.github.io/dashed-border-generator/
+const borderStyle = `url("data:image/svg+xml,%3csvg width='100%25' height='100%25' xmlns='http://www.w3.org/2000/svg'%3e%3crect width='100%25' height='100%25' fill='none' stroke='${encodeURIComponent(
+  colors.brand.tertiary,
+)}' stroke-width='2' stroke-dasharray='8%2c8' stroke-dashoffset='4' stroke-linecap='square'/%3e%3c/svg%3e")`;
+
+const FolderInputWrapper = styled.div`
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  padding: ${spacing.small};
+
+  background-image: ${borderStyle};
+`;
+
+const StyledFolderIcon = styled.span`
+  display: flex;
+  padding: ${spacing.small};
+  svg {
+    color: ${colors.brand.primary};
+    height: 20px;
+    width: 20px;
+  }
+`;
+
+const StyledInput = styled.input`
+  color: ${colors.brand.primary};
+  outline: none;
+  border: none;
+  margin-right: auto;
+  line-height: 1.75em;
+
+  ::selection {
+    background: ${colors.brand.lighter};
+  }
+`;
+
+interface Props {
+  onAddFolder: (name: string) => void;
+  onClose: () => void;
+  autoFocus?: boolean;
+}
+
+const FolderInput = ({ onAddFolder, onClose, autoFocus }: Props) => {
+  const { t } = useTranslation();
+  const newFolderText = t('treeStructure.newFolder.defaultName');
+  const [input, setInput] = useState<string>(newFolderText);
+  const [mounted, setMounted] = useState(false);
+  const inputRef = useRef<HTMLInputElement>(null);
+
+  const handleInputChange = (e: ChangeEvent<HTMLInputElement>) => {
+    setInput(e.target.value);
+  };
+
+  const onKeydown = (e: KeyboardEvent<HTMLInputElement>) => {
+    if (e.key === 'Enter' && input) {
+      e.preventDefault();
+      onAddFolder(input);
+    }
+  };
+
+  useEffect(() => {
+    if (mounted && autoFocus) {
+      inputRef.current?.select();
+    } else {
+      setMounted(true);
+    }
+  }, [mounted, autoFocus]);
+
+  return (
+    <FolderInputWrapper>
+      <StyledFolderIcon>
+        <FolderOutlined />
+      </StyledFolderIcon>
+      <StyledInput
+        ref={inputRef}
+        value={input}
+        onChange={handleInputChange}
+        onKeyDown={onKeydown}
+        aria-label={newFolderText}
+      />
+      <IconButton aria-label={t('close')} size="small" ghostPill onClick={onClose}>
+        <Cross />
+      </IconButton>
+    </FolderInputWrapper>
+  );
+};
+
+export default FolderInput;

package/src/MyNdla/Resource/index.ts

@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) 2022-present, NDLA.
+ *
+ * This source code is licensed under the GPLv3 license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import Folder from './Folder';
+import FolderInput from './FolderInput';
+export { Folder, FolderInput };

package/src/MyNdla/index.ts

@@ -1,5 +1,4 @@
-import { ResourceElement } from './ResourceDash';
-import { ResourcesView } from './ResourceDash';
-import { Breadcrumbs } from './ResourceDash';
-
-export { ResourceElement, ResourcesView, Breadcrumbs };
+import Folder from './Resource/Folder';
+import FolderInput from './Resource/FolderInput';
+import { VerticalNavigation } from './Navigation';
+export { VerticalNavigation, Folder, FolderInput };

package/src/Resource/BlockResource.tsx

@@ -0,0 +1,101 @@
+/**
+ * Copyright (c) 2022-present, NDLA.
+ *
+ * This source code is licensed under the GPLv3 license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import styled from '@emotion/styled';
+import React, { ReactNode } from 'react';
+import SafeLink from '@ndla/safelink';
+import { colors, fonts, spacing } from '@ndla/core';
+import Image from '../Image';
+import { CompressTagsLength, ResourceImageProps, ResourceTitle, Row, TopicList } from './resourceComponents';
+
+interface BlockResourceProps {
+  link: string;
+  title: string;
+  resourceImage: ResourceImageProps;
+  topics: string[];
+  tags?: string[];
+  description?: string;
+  actionMenu?: ReactNode;
+}
+
+const BlockElementWrapper = styled(SafeLink)`
+  display: flex;
+  text-decoration: none;
+  box-shadow: none;
+  flex-direction: column;
+  max-width: 300px;
+  max-height: 240px;
+  border: 1px solid ${colors.brand.light};
+  border-radius: 2px;
+  color: ${colors.brand.greyDark};
+`;
+
+const BlockDescription = styled.p`
+  display: -webkit-box;
+  line-clamp: 2;
+  ${fonts.sizes(16)};
+  height: 0em;
+  margin: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  transition: height 0.2s ease-out;
+  ${() => BlockElementWrapper}:hover & {
+    // Unfortunate css needed for multi-line text overflow ellipsis.
+    height: 3.1em;
+    -webkit-line-clamp: 2;
+    line-clamp: 2;
+    -webkit-box-orient: vertical;
+  }
+`;
+
+const RightRow = styled(Row)`
+  justify-content: flex-end;
+`;
+
+const BlockInfoWrapper = styled.div`
+  display: flex;
+  flex-direction: column;
+  padding: ${spacing.small};
+  gap: ${spacing.xxsmall};
+`;
+
+const ImageWrapper = styled.div`
+  display: flex;
+  width: 100%;
+  overflow: hidden;
+  align-items: center;
+  div {
+    min-width: 100%;
+  }
+  img {
+    min-width: 100%;
+  }
+`;
+
+const BlockResource = ({ link, title, tags, resourceImage, topics, description, actionMenu }: BlockResourceProps) => {
+  return (
+    <BlockElementWrapper to={link}>
+      <ImageWrapper>
+        <Image alt={resourceImage.alt} src={resourceImage.src} />
+      </ImageWrapper>
+      <BlockInfoWrapper>
+        <div>
+          <ResourceTitle>{title}</ResourceTitle>
+        </div>
+        <TopicList topics={topics} />
+        <BlockDescription>{description}</BlockDescription>
+        <RightRow>
+          {tags && CompressTagsLength(tags)}
+          {actionMenu}
+        </RightRow>
+      </BlockInfoWrapper>
+    </BlockElementWrapper>
+  );
+};
+
+export default BlockResource;