From b9ebf29711047e5bcf61ad645ef5fb8bebb9e22f Mon Sep 17 00:00:00 2001 From: William Petit Date: Thu, 5 Dec 2019 16:23:20 +0100 Subject: [PATCH 1/2] Add favicon --- client/src/index.html | 1 + client/src/index.js | 1 + client/src/resources/favicon.png | Bin 0 -> 887 bytes client/webpack.config.js | 2 +- 4 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 client/src/resources/favicon.png diff --git a/client/src/index.html b/client/src/index.html index 6b3ef3c..b8a1309 100644 --- a/client/src/index.html +++ b/client/src/index.html @@ -5,6 +5,7 @@ GenGitKan +
diff --git a/client/src/index.js b/client/src/index.js index 3497502..3580fa3 100644 --- a/client/src/index.js +++ b/client/src/index.js @@ -9,6 +9,7 @@ import '@fortawesome/fontawesome-free/js/solid' import '@fortawesome/fontawesome-free/js/regular' import '@fortawesome/fontawesome-free/js/brands' import './resources/logo.svg'; +import './resources/favicon.png'; ReactDOM.render( , diff --git a/client/src/resources/favicon.png b/client/src/resources/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..0f76b6c7f83b96a3322dce9d37cab5c36d324264 GIT binary patch literal 887 zcmV--1Bm>IP)hyn$7~$Lh2;X!sNe!2d%0T!1KWe1(k}q&h?JU^eRL@u+f2*78`20})H`}+dk$_zV zr$4F-lWmE5vxGdyp3L7?bv&~@RA)63Fi*W*aClUmqyF9kc@5ju0rhEN{p(WlOvFZG zxu}k*Z>fhWkk?MyuO7_Sepb7Re4#|dPT&A=7&r)ABUa3PV1$@R4}dYCgP6EI#0>8T zrUS=--M|gtSKy-%!bnR3l8Dv7Jzy5l3tS5!+)}3|vL0Y++CC0E3L%UcJKa)XaR}kG zx()cQtU^i!BoW=fI^ca`0~yFpSPu_?KY-tWi@*ioatOgjJZ0qHsG}8QUk|^ipG`!- zKa)US!=W;s;#=_2(aNK9kC?@`h*dC3%>G{BOW-8%6EK^YuwB4BVj?c0JYO0^U8DA< zaY(=Y>f33&DP8ZLH1AcH*7mE@)oJQtb=gEk>{suqJCdU(>SJS<+nofQP&?ZIhF${xg&mi!W7^XYGU%+}|co$6M;Lo9+N~gSSeA9E= zm1KKZ3sGh}pKRBgakN?m^MRp^AOK6!va!gJ zDxsNxABYX6hWFGrS`;t>oUJOTF4R7Cn|fSbSF&eeO4=_b-1}bz{sYSSRKyVRQpf-R N002ovPDHLkV1j?rmrMWv literal 0 HcmV?d00001 diff --git a/client/webpack.config.js b/client/webpack.config.js index 7dc5642..c5075d4 100644 --- a/client/webpack.config.js +++ b/client/webpack.config.js @@ -37,7 +37,7 @@ module.exports = { } ] },{ - test: /\.(woff(2)?|ttf|eot|svg)(\?v=\d+\.\d+\.\d+)?$/, + test: /\.(woff(2)?|ttf|eot|svg|png)(\?v=\d+\.\d+\.\d+)?$/, use: [{ loader: 'file-loader', options: { From d510116c4b9b8a979b125bcf432584e5eacb7e6d Mon Sep 17 00:00:00 2001 From: William Petit Date: Thu, 5 Dec 2019 17:09:11 +0100 Subject: [PATCH 2/2] Better card informations display --- client/src/components/BoardPage/BoardPage.jsx | 27 ++++++++++++++++++- client/src/components/HomePage/BoardCard.jsx | 10 ++++--- client/src/components/Navbar.jsx | 2 +- client/src/sass/_base.scss | 1 + client/src/store/sagas/kanboards.js | 7 ++--- 5 files changed, 37 insertions(+), 10 deletions(-) diff --git a/client/src/components/BoardPage/BoardPage.jsx b/client/src/components/BoardPage/BoardPage.jsx index e820d6b..31c64b1 100644 --- a/client/src/components/BoardPage/BoardPage.jsx +++ b/client/src/components/BoardPage/BoardPage.jsx @@ -43,9 +43,34 @@ export class BoardPage extends React.Component {
+ { + card.issue.assignee ? +
+
+ Image + {`@${card.issue.assignee.login}`} +
+
+ : null + }
-
{card.title}
+

+ {`#${card.issue.number}`}  + { card.issue.milestone ? {`- ${card.issue.milestone.title}`} : null } +
+ {card.issue.title} +

+
+
+ +
diff --git a/client/src/components/HomePage/BoardCard.jsx b/client/src/components/HomePage/BoardCard.jsx index ee0cfeb..24b016d 100644 --- a/client/src/components/HomePage/BoardCard.jsx +++ b/client/src/components/HomePage/BoardCard.jsx @@ -8,9 +8,13 @@ export class BoardCard extends React.PureComponent {
- -

{board.title}

- +

+ + {board.title} + +
+ {board.description} +

diff --git a/client/src/components/Navbar.jsx b/client/src/components/Navbar.jsx index c61bcab..bd3caa7 100644 --- a/client/src/components/Navbar.jsx +++ b/client/src/components/Navbar.jsx @@ -3,7 +3,7 @@ import React from 'react'; export class Navbar extends React.Component { render() { return ( -