@ndla/ui 14.0.0 → 15.0.0

package/lib/locale/messages-sma.d.ts

@@ -54,14 +54,59 @@ declare const messages: {
     };
     myNdla: {
         resources: string;
+        resources_plural: string;
         folders: string;
+        folders_plural: string;
         folder: string;
         myFolders: string;
         myTags: string;
         newFolder: string;
+        newFolderUnder: string;
         myAccount: string;
         favourites: string;
         help: string;
+        more: string;
+        listView: string;
+        detailView: string;
+        shortView: string;
+        myPage: {
+            myPage: string;
+            deleteAccount: string;
+            logout: string;
+            welcome: string;
+            read: {
+                our: string;
+                ours: string;
+            };
+            privacy: string;
+            questions: {
+                question: string;
+                ask: string;
+            };
+            wishToDelete: string;
+            terms: string;
+            newFavourite: string;
+            feide: string;
+            resource: {
+                addToMyNdla: string;
+                addedToMyNdla: string;
+            };
+            storageInfo: {
+                title: string;
+                text: string;
+            };
+            folderInfo: {
+                title: string;
+                text: string;
+            };
+            tagInfo: {
+                title: string;
+                text: string;
+            };
+        };
+    };
+    snackbar: {
+        close: string;
     };
     labels: {
         category: string;
@@ -78,6 +123,19 @@ declare const messages: {
         contact: string;
         help: string;
     };
+    treeStructure: {
+        createFolder: string;
+        newFolder: {
+            placeholder: string;
+            defaultName: string;
+        };
+    };
+    tagSelector: {
+        placeholder: string;
+        removeTag: string;
+        hideAllTags: string;
+        showAllTags: string;
+    };
     htmlTitles: {
         titleTemplate: string;
         welcomePage: string;

package/lib/locale/messages-sma.js

@@ -28,6 +28,19 @@ exports.contentTypes = contentTypes;
 var titleTemplate = ' - NDLA';
 
 var messages = _objectSpread(_objectSpread({
+  treeStructure: {
+    createFolder: 'Lag mappe',
+    newFolder: {
+      placeholder: 'Skriv navn på mappe',
+      defaultName: 'Ny mappe'
+    }
+  },
+  tagSelector: {
+    placeholder: 'Tilknytt tag',
+    removeTag: 'Ta vekk tilknytning til {{name}}',
+    hideAllTags: 'Skjul alle tagger',
+    showAllTags: 'Vis alle tagger'
+  },
   htmlTitles: {
     titleTemplate: titleTemplate,
     welcomePage: "Forsiden".concat(titleTemplate),
@@ -927,15 +940,60 @@ var messages = _objectSpread(_objectSpread({
     close: 'Lukk faktaboks'
   },
   myNdla: {
-    resources: 'Ressurser',
-    folders: 'Mapper',
+    resources: '{{count}} ressurs',
+    resources_plural: '{{count}} ressurser',
+    folders: '{{count}} mappe',
+    folders_plural: '{{count}} mapper',
     folder: 'Mappe',
     myFolders: 'Mine mapper',
     myTags: 'Mine tags',
     newFolder: 'Ny mappe',
+    newFolderUnder: 'Lag ny mappe under {{folderName}}',
     myAccount: 'Min konto',
     favourites: 'Favoritter',
-    help: 'Hjelp'
+    help: 'Hjelp',
+    more: 'Flere valg',
+    listView: 'Listevisning',
+    detailView: 'Detaljrik listevisning',
+    shortView: 'Kort visning',
+    myPage: {
+      myPage: 'Min side',
+      deleteAccount: 'Slett Min NDLA',
+      logout: 'Logg ut av Min NDLA',
+      welcome: 'Velkommen til Min NDLA! Nå kan du lagre dine favorittressurser fra NDLA og organisere dem slik du ønsker i mapper og med tags.',
+      read: {
+        our: 'Les våre',
+        ours: 'Les vår'
+      },
+      privacy: 'personvernerklæring her',
+      questions: {
+        question: 'Lurer du på noe?',
+        ask: 'Spør oss i chatten'
+      },
+      wishToDelete: 'Ønsker du ikke ha brukerprofil hos oss lengre?',
+      terms: 'vilkår for bruk',
+      newFavourite: 'Nylig lagt til',
+      feide: 'Dette henter vi om deg fra Feide',
+      resource: {
+        addToMyNdla: 'Legg i Min NDLA',
+        addedToMyNdla: 'Lagt i Min NDLA'
+      },
+      storageInfo: {
+        title: 'Slik lagrer du dine favorittressurser fra NDLA',
+        text: 'Når du ønsker å lagre en ressurs, kan du gjøre dette ved å klikke på hjertet øverst til høyre på siden. Du vil da få mulighet til å lagre ressursen i en mappe.'
+      },
+      folderInfo: {
+        title: 'Slik organiserer du dine favorittressurser i mapper',
+        text: 'Du kommer til mappeoversikten din ved å klikke på mine mapper i menyen til venstre. Her kan du opprette nye mapper og undermapper. Du kan også opprette en ny mappe i dialogvinduet som kommer når du klikker på et hjerte i en ressurs.'
+      },
+      tagInfo: {
+        title: 'Slik tagger du dine favorittressurser',
+        text: 'Når du lagrer en ressurs får du mulighet til å tagge ressursen med et nøkkelord. Du kan senere bruke taggene til å finne tilbake til ressurser på tvers av mapper.  Ved å velge mine tagger i venstremenyen får du oversikt over alle taggene du har brukt og du kan også her se hvilke ressurser som du har tagget med det bestemte nøkkelordet.'
+      }
+    }
+  },
+  snackbar: {
+    close: 'Lukk melding'
   },
   labels: {
     category: 'Kategori',

package/lib/types.d.ts

@@ -19,7 +19,7 @@ declare type ResourceTypes = {
     name: string;
 };
 export declare type Resource = {
-    id: string | number;
+    id: string;
     name: string;
     contentUri?: string;
     path: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ndla/ui",
-  "version": "14.0.0",
+  "version": "15.0.0",
   "description": "UI component library for NDLA.",
   "license": "GPL-3.0",
   "main": "lib/index.js",
@@ -31,18 +31,18 @@
     "types"
   ],
   "dependencies": {
-    "@ndla/button": "^2.2.1",
-    "@ndla/carousel": "^1.2.7",
+    "@ndla/button": "^2.3.0",
+    "@ndla/carousel": "^1.2.8",
     "@ndla/core": "^2.1.1",
     "@ndla/hooks": "^1.1.4",
-    "@ndla/icons": "^1.7.1",
-    "@ndla/licenses": "^4.1.3",
-    "@ndla/modal": "^1.2.8",
-    "@ndla/notion": "^3.1.10",
-    "@ndla/safelink": "^2.0.2",
+    "@ndla/icons": "^1.8.0",
+    "@ndla/licenses": "^4.1.4",
+    "@ndla/modal": "^1.2.9",
+    "@ndla/notion": "^3.1.11",
+    "@ndla/safelink": "^2.0.3",
     "@ndla/switch": "^0.1.5",
-    "@ndla/tabs": "^1.1.6",
-    "@ndla/tooltip": "^1.0.0",
+    "@ndla/tabs": "^1.1.7",
+    "@ndla/tooltip": "^2.0.0",
     "@ndla/util": "^3.0.0",
     "@reach/menu-button": "^0.16.2",
     "@reach/slider": "^0.16.0",
@@ -81,5 +81,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "79850025a1ab61d341fc5a507bed6fde7d7f4f84"
+  "gitHead": "dba041a7d8ccfcb4fb60f68625e2dfde162aa6fa"
 }

package/src/Article/Article.tsx

@@ -14,10 +14,12 @@ import styled from '@emotion/styled';
 
 import { useIntersectionObserver } from '@ndla/hooks';
 import { resizeObserver } from '@ndla/util';
+import { spacing, spacingUnit, mq, breakpoints } from '@ndla/core';
 import { Article as ArticleType, Locale } from '../types';
 import ArticleFootNotes from './ArticleFootNotes';
 import ArticleContent from './ArticleContent';
 import ArticleByline from './ArticleByline';
+import ArticleFavoritesButton from './ArticleFavoritesButton';
 import LayoutItem from '../Layout';
 import ArticleHeaderWrapper from './ArticleHeaderWrapper';
 import ArticleNotions, { NotionRelatedContent } from './ArticleNotions';
@@ -97,6 +99,22 @@ const MSGboxWrapper = styled.div`
   margin-bottom: 50px;
 `;
 
+const ArticleFavoritesButtonWrapper = styled.div`
+  display: flex;
+  justify-content: flex-end;
+  transform: translate(${spacing.xsmall}, -${spacing.normal});
+  height: 0;
+  ${mq.range({ from: breakpoints.tablet })} {
+    transform: translate(${spacing.normal}, -${spacing.medium});
+  }
+  ${mq.range({ from: breakpoints.tabletWide })} {
+    transform: translate(${spacing.large}, -${spacing.medium});
+  }
+  ${mq.range({ from: breakpoints.desktop })} {
+    transform: translate(${spacingUnit * 5.5}px, -${spacing.medium});
+  }
+`;
+
 type Props = {
   article: ArticleType;
   icon?: ReactNode;
@@ -117,6 +135,8 @@ type Props = {
   printUrl?: string;
   notions?: { list: ConceptNotionType[]; related: NotionRelatedContent[] };
   accessMessage?: string;
+  isFavorite?: boolean;
+  onToggleAddToFavorites?: (id: string, add: boolean) => void;
 };
 
 const getArticleContent = (content: any, locale: Locale) => {
@@ -147,6 +167,8 @@ export const Article = ({
   printUrl,
   renderMarkdown,
   accessMessage,
+  onToggleAddToFavorites,
+  isFavorite,
 }: Props) => {
   const [articleRef, { entry }] = useIntersectionObserver({
     root: null,
@@ -196,6 +218,15 @@ export const Article = ({
             </MSGboxWrapper>
           )}
           <ArticleHeaderWrapper competenceGoals={competenceGoals} competenceGoalTypes={competenceGoalTypes}>
+            {onToggleAddToFavorites && (
+              <ArticleFavoritesButtonWrapper>
+                <ArticleFavoritesButton
+                  articleId={id}
+                  isFavorite={isFavorite}
+                  onToggleAddToFavorites={onToggleAddToFavorites}
+                />
+              </ArticleFavoritesButtonWrapper>
+            )}
             <ArticleTitle icon={icon} label={messages.label}>
               {title}
             </ArticleTitle>

package/src/Article/ArticleFavoritesButton.tsx

@@ -0,0 +1,40 @@
+/**
+ * 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 from 'react';
+import { IconButtonDualStates } from '@ndla/button';
+import { Heart, HeartOutline } from '@ndla/icons/action';
+import Tooltip from '@ndla/tooltip';
+import { useTranslation } from 'react-i18next';
+
+export interface Props {
+  isFavorite?: boolean;
+  onToggleAddToFavorites: (id: string, add: boolean) => void;
+  articleId: string;
+}
+
+export const ArticleFavoritesButton = ({ isFavorite, onToggleAddToFavorites, articleId }: Props) => {
+  const { t } = useTranslation();
+  const removeFromFavoritesLabel = t('myNdla.resource.addToMyNdla');
+  const addToFavoritesLabel = t('myNdla.resource.addedToMyNdla');
+  return (
+    <Tooltip tooltip={isFavorite ? removeFromFavoritesLabel : addToFavoritesLabel}>
+      <IconButtonDualStates
+        ariaLabelActive={addToFavoritesLabel}
+        ariaLabelInActive={removeFromFavoritesLabel}
+        activeIcon={<Heart />}
+        inactiveIcon={<HeartOutline />}
+        active={isFavorite}
+        size="small"
+        onClick={() => onToggleAddToFavorites(articleId, !isFavorite)}
+      />
+    </Tooltip>
+  );
+};
+
+export default ArticleFavoritesButton;

package/src/Article/index.ts

@@ -12,6 +12,7 @@ import ArticleContent from './ArticleContent';
 import ArticleFootNotes from './ArticleFootNotes';
 import ArticleHeaderWrapper from './ArticleHeaderWrapper';
 import ArticleSideBar from './ArticleSideBar';
+import ArticleFavoritesButton from './ArticleFavoritesButton';
 
 export {
   ArticleByline,
@@ -22,5 +23,6 @@ export {
   ArticleTitle,
   ArticleIntroduction,
   ArticleWrapper,
+  ArticleFavoritesButton,
 };
 export default Article;

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/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/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 };