Skip to content

Commit

Permalink
Merge pull request #520 from danskernesdigitalebibliotek/release/2024…
Browse files Browse the repository at this point in the history
…-8-0

Merge Release/2024 8 0
  • Loading branch information
Adamik10 committed Feb 22, 2024
2 parents 9bdda9c + 75273ef commit 6256939
Show file tree
Hide file tree
Showing 66 changed files with 706 additions and 215 deletions.
11 changes: 7 additions & 4 deletions .github/workflows/create-release-on-branch-changes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,13 @@ jobs:
- uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
registry-url: "https://npm.pkg.github.com"
scope: "@${{ github.repository_owner }}"
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

- name: Create NPMRC
run: |
echo "//npm.pkg.github.com/:_authToken=${{ secrets.GITHUB_TOKEN }}" >> ~/.npmrc
echo "[@${{ github.repository_owner }}]:registry=https://npm.pkg.github.com" >> ~/.npmrc
echo "always-auth=true" >> ~/.npmrc
echo 'registry "https://registry.yarnpkg.com"' >> ~/.yarnrc
- run: yarn install --frozen-lockfile

Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/create-release-on-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,13 @@ jobs:
- uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
registry-url: "https://npm.pkg.github.com"
scope: "@${{ github.repository_owner }}"

- name: Create NPMRC
run: |
echo "//npm.pkg.github.com/:_authToken=${{ secrets.GITHUB_TOKEN }}" >> ~/.npmrc
echo "@${{ github.repository_owner }}]:registry=https://npm.pkg.github.com" >> ~/.npmrc
echo "always-auth=true" >> ~/.npmrc
echo 'registry "https://registry.yarnpkg.com"' >> ~/.yarnrc
- run: yarn install --frozen-lockfile

Expand Down
3 changes: 3 additions & 0 deletions base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,8 @@
@import "./src/stories/Library/video-embed/video-embed";
@import "./src/stories/Library/card-grid/card-grid";
@import "./src/stories/Library/promo-title/promo-title";
@import "./src/stories/Library/Modals/group-modal-item-skeleton";
@import "./src/stories/Library/Lists/list-dashboard/list-dashboard-skeleton";
@import "./src/stories/Library/recommended-material/recommended-material";
@import "./src/stories/Library/recommendation/recommendation";
@import "./src/stories/Library/recommended-material/recommended-material-skeleton";
Expand Down Expand Up @@ -147,6 +149,7 @@
@import "./src/stories/Blocks/event-list-page/event-list-page";
@import "./src/stories/Blocks/page/page";
@import "./src/stories/Blocks/reservation-page/reservation-page-skeleton";
@import "./src/stories/Blocks/loan-page/loan-page-skeleton";

@import "./src/styles/scss/shared";
@import "./src/styles/scss/internal";
Expand Down
1 change: 1 addition & 0 deletions src/public
34 changes: 23 additions & 11 deletions src/stories/Blocks/advanced-search/AdvancedSearch.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ import { InputWithDropdown } from "../../Library/input-with-dropdown/InputWithDr
import { Multiselect } from "../../Library/multiselect/Multiselect";
import { Button } from "../../Library/Buttons/button/Button";
import InputPreview from "../../Library/input-preview/InputPreview";
import data from "../../Library/card-list-page/CardListPageData";
import data from "../../Library/card-list-page/SearchResultPageData";
import { CardListItem } from "../../Library/card-list-item/CardListItem";
import ResultPager from "../../Library/card-list-page/ResultPager";
import { ReactComponent as PlusButtonIcon } from "../../../public/icons/collection/PlusButton.svg";

export interface AdvancedSearchProps {
inputPlaceholder: string;
Expand Down Expand Up @@ -36,26 +37,34 @@ export const AdvancedSearch: React.FC<AdvancedSearchProps> = ({
return (
<>
<div className="advanced-search__clauses">
<button className="advanced-search__clause focus-styling">
<button
className="advanced-search__clause focus-styling"
aria-label="og"
>
OG
</button>
<button className="advanced-search__clause advanced-search__clause--grey focus-styling">
<button
className="advanced-search__clause advanced-search__clause--grey focus-styling"
aria-label="eller"
>
ELLER
</button>
<button className="advanced-search__clause advanced-search__clause--grey focus-styling">
<button
className="advanced-search__clause advanced-search__clause--grey focus-styling"
aria-label="ikke"
>
IKKE
</button>
</div>
<InputWithDropdown inputPlaceholder={inputPlaceholder} />
</>
);
})}
<button className="advanced-search__clauses">
<img
className="mr-8"
src="icons/collection/PlusButton.svg"
alt="Plus button icon"
/>
<button
className="advanced-search__clauses"
aria-label="tilføj ny linje"
>
<PlusButtonIcon className="mr-8" />
Tilføj ny linje
</button>
</div>
Expand Down Expand Up @@ -92,7 +101,10 @@ export const AdvancedSearch: React.FC<AdvancedSearchProps> = ({
)}
<footer className="advanced-search__footer">
{isCqlSearch && (
<button className="link-tag advanced-search__back-button">
<button
className="link-tag advanced-search__back-button"
aria-label="til avanceret søgning"
>
Til avanceret søgning
</button>
)}
Expand Down
2 changes: 1 addition & 1 deletion src/stories/Blocks/footer/Footer.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { FC } from "react";
import Pagefold from "../../Library/pagefold/Pagefold";
import { DropdownItem } from "../../Library/dropdown/Dropdown";
import FooterAccordions from "../../Library/footer-accordions/FooterAccordions";
import FooterColumns from "../../Library/footer-colums/FooterColumns";
import FooterInfo, {
Expand All @@ -8,7 +9,6 @@ import FooterInfo, {
} from "../../Library/footer-info/FooterInfo";
import FooterSeparator from "../../Library/footer-separator/FooterSeparator";
import FooterWidgets from "../../Library/footer-widgets/FooterWidgets";
import { DropdownItem } from "../../Library/dropdown/Dropdown";
import { FooterColumnType } from "../../Library/footer-colums/FooterColumn";

export type FooterType = {
Expand Down
29 changes: 12 additions & 17 deletions src/stories/Blocks/header/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@ import { useEffect, useState } from "react";
import Logo from "../../Library/logo/Logo";
import MenuItemList from "../../Library/header-menu-list/HeaderMenuList";
import { menuItems } from "../../Library/header-menu-list/HeaderMenuListData";

import { ReactComponent as SearchIcon } from "../../../public/icons/basic/icon-search.svg";
import { ReactComponent as ExpandMoreIcon } from "../../../public/icons/collection/ExpandMore.svg";
import { ReactComponent as MenuIcon } from "../../../public/icons/basic/icon-menu.svg";
import { ReactComponent as ProfileIcon } from "../../../public/icons/basic/icon-profile.svg";
import { ReactComponent as HeartIcon } from "../../../public/icons/basic/icon-heart.svg";
import { ReactComponent as WatchStaticIcon } from "../../../public/icons/basic/icon-watch-static.svg";
import Pagefold from "../../Library/pagefold/Pagefold";
import HeaderSidebarNav from "../../Library/header-sidebar-nav/header-sidebar-nav";

Expand Down Expand Up @@ -62,7 +67,7 @@ export const Header = (props: HeaderProps) => {
tabIndex: 0,
}}
>
<img src="icons/basic/icon-menu.svg" alt="Open menu" />
<MenuIcon />
</Pagefold>
<div className="header__menu-navigation-logo">
<Logo
Expand All @@ -79,15 +84,15 @@ export const Header = (props: HeaderProps) => {
{signedIn && haveNotification && (
<div className="header__notification bg-signal-alert" />
)}
<img src="icons/basic/icon-profile.svg" alt="Profile" />
<ProfileIcon aria-label="go to user profile" />
{signedIn && (
<span className="text-small-caption">{username}</span>
)}
</a>
</div>
<div className="header__menu-bookmarked header__button">
<a href="/">
<img src="icons/basic/icon-heart.svg" alt="List of bookmarks" />
<HeartIcon aria-label="go to favorites list" />
</a>
</div>
</nav>
Expand All @@ -99,17 +104,11 @@ export const Header = (props: HeaderProps) => {
type="text"
placeholder={inputPlaceholder}
/>
<img
className="header__menu-search-icon"
src="icons/basic/icon-search.svg"
alt="search icon"
/>
<SearchIcon className="header__menu-search-icon" />
</form>
<img
<ExpandMoreIcon
className="header__menu-dropdown-icon"
onClick={() => setIsDropdownOpen(!isDropdownOpen)}
src="icons/collection/ExpandMore.svg"
alt="expand dropdown icon"
/>
{isDropdownOpen && (
<div className="header__menu-dropdown">
Expand All @@ -127,11 +126,7 @@ export const Header = (props: HeaderProps) => {
<div className="header__clock">
<Pagefold isInheriting={false} isAContainer={false} size="medium" />
<div className="header__clock-items">
<img
src="icons/basic/icon-watch-static.svg"
className="mb-8"
alt="clock icon"
/>
<WatchStaticIcon className="mb-8" />
<span className="text-small-caption">Fredag</span>
<span className="text-small-caption">28 Maj</span>
</div>
Expand Down
1 change: 1 addition & 0 deletions src/stories/Blocks/header/header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@
display: flex;
justify-content: center;
align-items: center;
color: $color__text-primary-black;

@include media-query__small {
height: 70px;
Expand Down
69 changes: 69 additions & 0 deletions src/stories/Blocks/loan-page/LoanPage.stories.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
import { ComponentStory } from "@storybook/react";
import { withDesign } from "storybook-addon-designs";
import LoanPage, { LoanPageProps } from "./LoanPage";

export default {
title: "Blocks / Loan Page",
component: LoanPage,
decorators: [withDesign],
argTypes: {
headline: {
name: "Headline",
defaultValue: "Your loans",
control: { type: "text" },
},
isStacked: {
name: "Is stacked?",
defaultValue: false,
control: { type: "boolean" },
},
physicalLoans: {
name: "Physical loans amount",
defaultValue: 2,
control: { type: "number" },
},
digitalLoans: {
name: "Digital loans amount",
defaultValue: 2,
control: { type: "number" },
},
skeletonVersion: {
name: "Is skeleton version?",
defaultValue: false,
control: { type: "boolean" },
},
},
parameters: {
design: {
type: "figma",
url: "https://www.figma.com/file/Zx9GrkFA3l4ISvyZD2q0Qi/Designsystem?type=design&node-id=8513%3A85522&mode=design&t=Ms5I0A8fq9bNeuSJ-1",
},
},
};

const Template: ComponentStory<typeof LoanPage> = (args: LoanPageProps) => (
<LoanPage {...args} />
);

export const Default = Template.bind({});
export const Stacked = Template.bind({});
Stacked.args = {
isStacked: true,
};
export const NoPhysicalLoans = Template.bind({});
NoPhysicalLoans.args = {
physicalLoans: 0,
};
export const NoDigitalLoans = Template.bind({});
NoDigitalLoans.args = {
digitalLoans: 0,
};
export const NoLoansAtAll = Template.bind({});
NoLoansAtAll.args = {
physicalLoans: 0,
digitalLoans: 0,
};
export const SkeletonVersion = Template.bind({});
SkeletonVersion.args = {
skeletonVersion: true,
};
Loading

0 comments on commit 6256939

Please sign in to comment.