diff --git a/client/README.md b/client/README.md index d1ee58f..4f51781 100755 --- a/client/README.md +++ b/client/README.md @@ -1 +1 @@ -# Planka client +# TeamBoard client diff --git a/client/package-lock.json b/client/package-lock.json index 0a51ac3..88117b8 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -1,10 +1,10 @@ { - "name": "planka-client", + "name": "teamboard-client", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "planka-client", + "name": "teamboard-client", "dependencies": { "@juggle/resize-observer": "^3.4.0", "classnames": "^2.3.2", @@ -51,6 +51,8 @@ "zxcvbn": "^4.4.2" }, "devDependencies": { + "@fortawesome/free-brands-svg-icons": "^6.4.0", + "@fortawesome/react-fontawesome": "^0.2.0", "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^13.4.0", "@testing-library/user-event": "^13.5.0", @@ -2239,6 +2241,56 @@ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" }, + "node_modules/@fortawesome/fontawesome-common-types": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.4.0.tgz", + "integrity": "sha512-HNii132xfomg5QVZw0HwXXpN22s7VBHQBv9CeOu9tfJnhsWQNd2lmTNi8CSrnw5B+5YOmzu1UoPAyxaXsJ6RgQ==", + "dev": true, + "hasInstallScript": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/@fortawesome/fontawesome-svg-core": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.4.0.tgz", + "integrity": "sha512-Bertv8xOiVELz5raB2FlXDPKt+m94MQ3JgDfsVbrqNpLU9+UE2E18GKjLKw+d3XbeYPqg1pzyQKGsrzbw+pPaw==", + "dev": true, + "hasInstallScript": true, + "peer": true, + "dependencies": { + "@fortawesome/fontawesome-common-types": "6.4.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@fortawesome/free-brands-svg-icons": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.4.0.tgz", + "integrity": "sha512-qvxTCo0FQ5k2N+VCXb/PZQ+QMhqRVM4OORiO6MXdG6bKolIojGU/srQ1ptvKk0JTbRgaJOfL2qMqGvBEZG7Z6g==", + "dev": true, + "hasInstallScript": true, + "dependencies": { + "@fortawesome/fontawesome-common-types": "6.4.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@fortawesome/react-fontawesome": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.2.0.tgz", + "integrity": "sha512-uHg75Rb/XORTtVt7OS9WoK8uM276Ufi7gCzshVWkUJbHhh3svsUUeqXerrM96Wm7fRiDzfKRwSoahhMIkGAYHw==", + "dev": true, + "dependencies": { + "prop-types": "^15.8.1" + }, + "peerDependencies": { + "@fortawesome/fontawesome-svg-core": "~1 || ~6", + "react": ">=16.3" + } + }, "node_modules/@gar/promisify": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", @@ -24999,6 +25051,40 @@ } } }, + "@fortawesome/fontawesome-common-types": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.4.0.tgz", + "integrity": "sha512-HNii132xfomg5QVZw0HwXXpN22s7VBHQBv9CeOu9tfJnhsWQNd2lmTNi8CSrnw5B+5YOmzu1UoPAyxaXsJ6RgQ==", + "dev": true + }, + "@fortawesome/fontawesome-svg-core": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.4.0.tgz", + "integrity": "sha512-Bertv8xOiVELz5raB2FlXDPKt+m94MQ3JgDfsVbrqNpLU9+UE2E18GKjLKw+d3XbeYPqg1pzyQKGsrzbw+pPaw==", + "dev": true, + "peer": true, + "requires": { + "@fortawesome/fontawesome-common-types": "6.4.0" + } + }, + "@fortawesome/free-brands-svg-icons": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.4.0.tgz", + "integrity": "sha512-qvxTCo0FQ5k2N+VCXb/PZQ+QMhqRVM4OORiO6MXdG6bKolIojGU/srQ1ptvKk0JTbRgaJOfL2qMqGvBEZG7Z6g==", + "dev": true, + "requires": { + "@fortawesome/fontawesome-common-types": "6.4.0" + } + }, + "@fortawesome/react-fontawesome": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.2.0.tgz", + "integrity": "sha512-uHg75Rb/XORTtVt7OS9WoK8uM276Ufi7gCzshVWkUJbHhh3svsUUeqXerrM96Wm7fRiDzfKRwSoahhMIkGAYHw==", + "dev": true, + "requires": { + "prop-types": "^15.8.1" + } + }, "@gar/promisify": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", diff --git a/client/package.json b/client/package.json index f3eac91..3daa05b 100755 --- a/client/package.json +++ b/client/package.json @@ -1,11 +1,11 @@ { - "name": "planka-client", + "name": "teamboard-client", "private": true, "scripts": { "build": "react-app-rewired build", "eject": "react-scripts eject", "lint": "eslint --ext js,jsx src config-overrides.js", - "start": "DISABLE_ESLINT_PLUGIN=trues react-app-rewired start", + "start": "DISABLE_ESLINT_PLUGIN=true react-app-rewired start", "test": "react-app-rewired test" }, "browserslist": { @@ -98,6 +98,8 @@ "zxcvbn": "^4.4.2" }, "devDependencies": { + "@fortawesome/free-brands-svg-icons": "^6.4.0", + "@fortawesome/react-fontawesome": "^0.2.0", "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^13.4.0", "@testing-library/user-event": "^13.5.0", diff --git a/client/public/android-chrome-192x192.png b/client/public/android-chrome-192x192.png new file mode 100644 index 0000000..6bb6af8 Binary files /dev/null and b/client/public/android-chrome-192x192.png differ diff --git a/client/public/apple-touch-icon.png b/client/public/apple-touch-icon.png new file mode 100644 index 0000000..8cb4969 Binary files /dev/null and b/client/public/apple-touch-icon.png differ diff --git a/client/public/browserconfig.xml b/client/public/browserconfig.xml new file mode 100644 index 0000000..b3930d0 --- /dev/null +++ b/client/public/browserconfig.xml @@ -0,0 +1,9 @@ + + + + + + #da532c + + + diff --git a/client/public/favicon-16x16.png b/client/public/favicon-16x16.png new file mode 100644 index 0000000..d26352c Binary files /dev/null and b/client/public/favicon-16x16.png differ diff --git a/client/public/favicon-32x32.png b/client/public/favicon-32x32.png new file mode 100644 index 0000000..d4aa9fc Binary files /dev/null and b/client/public/favicon-32x32.png differ diff --git a/client/public/favicon.ico b/client/public/favicon.ico index a04182f..fb9cbd9 100644 Binary files a/client/public/favicon.ico and b/client/public/favicon.ico differ diff --git a/client/public/index.html b/client/public/index.html index fc7327a..72a3198 100755 --- a/client/public/index.html +++ b/client/public/index.html @@ -2,19 +2,24 @@ - + + + + + + + + + + - - + - Planka + TeamBoard diff --git a/client/public/logo.png b/client/public/logo.png new file mode 100644 index 0000000..3ee3804 Binary files /dev/null and b/client/public/logo.png differ diff --git a/client/public/logo42-git.png b/client/public/logo42-git.png new file mode 100644 index 0000000..2d15f8e Binary files /dev/null and b/client/public/logo42-git.png differ diff --git a/client/public/manifest.json b/client/public/manifest.json index 04addef..3cbb629 100644 --- a/client/public/manifest.json +++ b/client/public/manifest.json @@ -1,5 +1,5 @@ { - "name": "Planka", + "name": "42pub TeamBoard", "icons": [ { "src": "favicon.ico", diff --git a/client/public/mstile-150x150.png b/client/public/mstile-150x150.png new file mode 100644 index 0000000..0bfdf7d Binary files /dev/null and b/client/public/mstile-150x150.png differ diff --git a/client/public/safari-pinned-tab.svg b/client/public/safari-pinned-tab.svg new file mode 100644 index 0000000..3f8a351 --- /dev/null +++ b/client/public/safari-pinned-tab.svg @@ -0,0 +1,33 @@ + + + + +Created by potrace 1.14, written by Peter Selinger 2001-2017 + + + + + + diff --git a/client/public/site.webmanifest b/client/public/site.webmanifest new file mode 100644 index 0000000..0e0e858 --- /dev/null +++ b/client/public/site.webmanifest @@ -0,0 +1,14 @@ +{ + "name": "", + "short_name": "", + "icons": [ + { + "src": "/android-chrome-192x192.png", + "sizes": "192x192", + "type": "image/png" + } + ], + "theme_color": "#ffffff", + "background_color": "#ffffff", + "display": "standalone" +} diff --git a/client/src/assets/images/cover.jpg b/client/src/assets/images/cover.jpg index 5151324..33a2a94 100644 Binary files a/client/src/assets/images/cover.jpg and b/client/src/assets/images/cover.jpg differ diff --git a/client/src/components/Header/Header.jsx b/client/src/components/Header/Header.jsx index cc376ce..60cc7c6 100755 --- a/client/src/components/Header/Header.jsx +++ b/client/src/components/Header/Header.jsx @@ -42,7 +42,7 @@ const Header = React.memo(
{!project && ( - Board + TeamBoard )} diff --git a/client/src/components/Login/Login.jsx b/client/src/components/Login/Login.jsx index a7e67a1..6a91764 100755 --- a/client/src/components/Login/Login.jsx +++ b/client/src/components/Login/Login.jsx @@ -4,12 +4,16 @@ import PropTypes from 'prop-types'; import classNames from 'classnames'; import { useTranslation } from 'react-i18next'; import { Form, Grid, Header, Message } from 'semantic-ui-react'; +import { FontAwesomeIcon } from '@fortawesome/react-fontawesome' +import { fa42Group, faGitlab, faGoogle } from '@fortawesome/free-brands-svg-icons' import { useDidUpdate, usePrevious, useToggle } from '../../lib/hooks'; import { Input } from '../../lib/custom-ui'; - +import { Button } from 'semantic-ui-react'; import { useForm } from '../../hooks'; import { isUsername } from '../../utils/validator'; +import Config from "../../constants/Config" + import styles from './Login.module.scss'; const createMessage = (error) => { @@ -171,6 +175,22 @@ const Login = React.memo( disabled={isSubmitting} /> +
+
+ + + +
+
@@ -185,7 +205,7 @@ const Login = React.memo( >
-
+