Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ds 193/experiment footer #34

Merged
merged 5 commits into from
Nov 19, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,9 @@
"parserOptions": {
"sourceType": "module",
"ecmaVersion": "2015"
},
// unneed rule causing errors with eslint/jest
"rules": {
"jest/valid-describe": "off"
}
}
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
- Static Footer html/css
- Static Header html/css
- Pre-release Github Workflow
- Example Footer test/stories/react.js
- Locked eslint version to 7.32.0 due to an error with jest

Caterina-vanHerpt marked this conversation as resolved.
Show resolved Hide resolved
## [v1.0.0] - 2021-06-15

Expand Down
2,431 changes: 1,272 additions & 1,159 deletions package-lock.json

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@
"dist/**/*"
],
"dependencies": {
"@rollup/plugin-json": "^4.1.0",
"@testing-library/jest-dom": "^5.14.1",
"@testing-library/react": "^11.2.7",
"@testing-library/user-event": "^12.8.3",
"eslint-plugin-jest": "^25.2.4",
"fetch-mock": "^9.11.0",
"joi": "^17.4.2",
"react-scripts": "4.0.3"
Expand Down Expand Up @@ -88,7 +90,7 @@
"babel-plugin-polyfill-corejs2": "^0.2.2",
"babel-plugin-polyfill-corejs3": "^0.2.2",
"babel-plugin-polyfill-regenerator": "^0.2.2",
"eslint": "^8.2.0",
"eslint": "7.32.0",
"eslint-plugin-jsx-a11y": "^6.4.1",
"husky": "^6.0.0",
"jest-axe": "^5.0.1",
Expand All @@ -105,4 +107,4 @@
"rollup-plugin-uglify": "^6.0.4",
"tailwindcss": "npm:@tailwindcss/postcss7-compat@^2.1.4"
}
}
}
2 changes: 2 additions & 0 deletions rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import del from "rollup-plugin-delete";
import { uglify } from "rollup-plugin-uglify";
import postcss from "rollup-plugin-postcss";
import pkg from "./package.json";
import json from "@rollup/plugin-json";

export default {
input: pkg.source,
Expand All @@ -12,6 +13,7 @@ export default {
{ file: pkg.module, format: "esm" },
],
plugins: [
json(),
external(),
babel({
exclude: "node_modules/**",
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
53 changes: 32 additions & 21 deletions src/components/ActionButton/ActionButton.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
/**
* Note issues with using icon when importing this component to other components.
* Must be fixed before officially releasing this component.
*/
import PropTypes from "prop-types";
import React from "react";

Expand Down Expand Up @@ -35,18 +39,22 @@ export function ActionButton(props) {
<a
href={props.href}
className={`${basicStyle}
${
!props.secondary &&
!props.tertiary &&
!props.disabled &&
!props.custom
? defaultStyle
: props.className
}
${props.secondary && !props.disabled ? secondaryStyle : props.className}
${props.tertiary && !props.disabled ? tertiaryStyle : props.className}
${props.custom && !props.tertiary ? props.custom : ""}
${props.disabled ? disabledStyle : props.className}`}
${
!props.secondary &&
!props.tertiary &&
!props.disabled &&
!props.custom
? defaultStyle
: props.className
}
${
props.secondary && !props.disabled
? secondaryStyle
: props.className
}
${props.tertiary && !props.disabled ? tertiaryStyle : props.className}
${props.custom && !props.tertiary ? props.custom : ""}
${props.disabled ? disabledStyle : props.className}`}
onClick={props.onClick}
id={props.id}
data-testid={props.dataTestId}
Expand All @@ -69,15 +77,18 @@ export function ActionButton(props) {
) : (
<button
className={`${basicStyle}
${
!props.secondary && !props.tertiary && !props.disabled && !props.custom
? defaultStyle
: props.className
}
${props.secondary && !props.disabled ? secondaryStyle : props.className}
${props.tertiary && !props.disabled ? tertiaryStyle : props.className}
${props.custom && !props.tertiary ? props.custom : ""}
${props.disabled ? disabledStyle : props.className}`}
${
!props.secondary &&
!props.tertiary &&
!props.disabled &&
!props.custom
? defaultStyle
: props.className
}
${props.secondary && !props.disabled ? secondaryStyle : props.className}
${props.tertiary && !props.disabled ? tertiaryStyle : props.className}
${props.custom && !props.tertiary ? props.custom : ""}
${props.disabled ? disabledStyle : props.className}`}
onClick={props.onClick}
type={props.type}
id={props.id}
Expand Down
1 change: 1 addition & 0 deletions src/components/DateModified/DateModified.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import PropTypes from "prop-types";
import React from "react";

export function DateModified(props) {
// TeamCity build dates are received in the format yyyyMMdd
Expand Down
1 change: 1 addition & 0 deletions src/components/Details/Details.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import PropTypes from "prop-types";
import React from "react";

/**
* Drop Down Element
Expand Down
2 changes: 1 addition & 1 deletion src/components/Experiment/Experiment.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export const Experiment = (props) => {
{props.href.substring(0, 8) === "https://" ? (
<img
alt="external link"
src="/external-link.svg"
src="../../assets/external-link.svg"
className="px-1 py-2"
/>
) : undefined}
Expand Down
Loading