wpetit
/
gengitkan
1
0
Fork 0
Code Issues 17 Pull Requests 1 Releases Wiki Activity

Merge branch 'develop' into dist/ubuntu/bionic/develop

This commit is contained in:
wpetit 2019-12-05 16:15:49 +01:00
parent ca7b8aac47 b29e48dc68
commit 4d3175a25e
9 changed files with 78 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
client/src/components/BoardPage/BoardPage.jsx
View File

@ -5,6 +5,7 @@ import Board from '@lourenci/react-kanban';
import { fetchIssues } from '../../store/actions/issues'; import { fetchIssues } from '../../store/actions/issues';
import { fetchBoards } from '../../store/actions/boards'; import { fetchBoards } from '../../store/actions/boards';
import { buildKanboard, moveCard } from '../../store/actions/kanboards'; import { buildKanboard, moveCard } from '../../store/actions/kanboards';
import { Loader } from '../Loader';
export class BoardPage extends React.Component { export class BoardPage extends React.Component {
@ -12,26 +13,28 @@ export class BoardPage extends React.Component {
return ( return (
<Page> <Page>
<div className="container is-fluid"> <div className="container is-fluid">
<div className="kanboard-container is-fullheight">
{this.renderBoard()} {this.renderBoard()}
</div> </div>
</div>
</Page> </Page>
); );
} }
renderBoard() { renderBoard() {
const { kanboard } = this.props; const { kanboard } = this.props;
if (!kanboard) { if (!kanboard) {
return <p>Loading</p> return <Loader></Loader>
} }
return ( return (
<div className="kanboard-container is-fullheight">
<Board disableLaneDrag={true} <Board disableLaneDrag={true}
renderCard={this.renderCard} renderCard={this.renderCard}
renderLaneHeader={this.renderLaneHeader} renderLaneHeader={this.renderLaneHeader}
onCardDragEnd={this.onCardDragEnd.bind(this)}> onCardDragEnd={this.onCardDragEnd.bind(this)}>
{kanboard} {kanboard}
</Board> </Board>
</div>
); );
} }

14
client/src/components/Loader.jsx Normal file
View File

@ -0,0 +1,14 @@
import React from 'react';
export class Loader extends React.Component {
render() {
return (
<div className="loader-container">
<div className="lds-ripple">
<div></div>
<div></div>
</div>
</div>
)
}
}

3
client/src/components/Navbar.jsx
View File

@ -7,7 +7,8 @@ export class Navbar extends React.Component {
<div className="container is-fluid"> <div className="container is-fluid">
<div className="navbar-brand"> <div className="navbar-brand">
<a className="navbar-item" href="#/"> <a className="navbar-item" href="#/">
<h1 className="is-size-4">GiteaKan</h1> <img src="resources/logo.svg" style={{marginRight:'5px'}} />
<h1 className="is-size-4">GenGitKan</h1>
</a> </a>
<a role="button" className="navbar-burger" aria-label="menu" aria-expanded="false"> <a role="button" className="navbar-burger" aria-label="menu" aria-expanded="false">
<span aria-hidden="true"></span> <span aria-hidden="true"></span>

2
client/src/index.html
View File

@ -3,7 +3,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<title>GiteaKan</title> <title>GenGitKan</title>
<link rel="stylesheet" href="css/main.css"> <link rel="stylesheet" href="css/main.css">
</head> </head>
<body> <body>

1
client/src/index.js
View File

@ -8,6 +8,7 @@ import '@fortawesome/fontawesome-free/js/fontawesome'
import '@fortawesome/fontawesome-free/js/solid' import '@fortawesome/fontawesome-free/js/solid'
import '@fortawesome/fontawesome-free/js/regular' import '@fortawesome/fontawesome-free/js/regular'
import '@fortawesome/fontawesome-free/js/brands' import '@fortawesome/fontawesome-free/js/brands'
import './resources/logo.svg';
ReactDOM.render( ReactDOM.render(
<App />, <App />,

1
client/src/resources/logo.svg Normal file
View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 512px; width: 512px;"><g class="" transform="translate(0,0)" style="touch-action: none;"><path d="M69.313 18.75c-1.574 2.353-3.376 4.513-4.813 7C29.19 86.9 50.184 165.194 111.344 200.5c.822.475 1.64.92 2.47 1.375 6.942-20.223 16.297-38.746 27.592-54.844-46.972-27.407-73.09-77.42-72.094-128.28zm366.218 0c1 51.074-25.34 101.293-72.686 128.625-.06.035-.128.06-.188.094 11.25 16.126 20.54 34.673 27.438 54.905 1.143-.615 2.275-1.222 3.406-1.875 61.16-35.306 82.154-113.6 46.844-174.75-1.437-2.487-3.24-4.647-4.813-7zm-183.655 83.063c-49.747 0-94.34 38.94-117.188 97.687 34.868-8.738 76.5-12.77 118.282-12.78 40.775-.013 81.443 3.814 115.843 12.124-22.932-58.378-67.38-97.03-116.938-97.03zm1.094 103.593c-61.1.017-122.17 10.173-156.44 27.875v59.69c38.836-8.845 89.384-13.424 140.626-14.158L219.28 395h59.97l-17.875-116.22c55.228.506 109.26 5.38 148.25 14.158V233.28c-34.38-17.77-95.545-27.89-156.656-27.874zm-61.064 94.78c-11.582.002-20.094 8.333-20.094 18.002 0 9.668 8.512 18 20.094 18 11.583 0 20.125-8.332 20.125-18 0-9.67-8.54-18-20.124-18zm114.688.002c-11.583 0-20.094 8.33-20.094 18 0 9.668 8.51 18 20.094 18 11.582 0 20.125-8.332 20.125-18 0-9.67-8.544-18-20.126-18zm44.625 2.625L300.06 493.938l81.844-21.25V306.75c-9.6-1.504-19.885-2.81-30.687-3.938zm-203.25.593c-10.817 1.254-21.174 2.733-30.845 4.438v164.844l81.844 21.25-51-190.532z" fill="#4a4a4a" fill-opacity="1"></path></g></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

1
client/src/sass/_all.scss
View File

@ -1,3 +1,4 @@
@import 'bulma/bulma.sass'; @import 'bulma/bulma.sass';
@import '_base.scss'; @import '_base.scss';
@import '_loader.scss';
@import '_kanboard.scss'; @import '_kanboard.scss';

44
client/src/sass/_loader.scss Normal file
View File

@ -0,0 +1,44 @@
.loader-container {
display: flex;
width: 100%;
justify-content: center;
height: 100%;
align-items: center;
}
.lds-ripple {
display: inline-block;
position: relative;
width: 80px;
height: 80px;
transform: scale(2);
}
.lds-ripple div {
position: absolute;
border: 4px solid $info;
opacity: 1;
border-radius: 50%;
animation: lds-ripple 1s cubic-bezier(0, 0.2, 0.8, 1) infinite;
}
.lds-ripple div:nth-child(2) {
animation-delay: -0.5s;
}
@keyframes lds-ripple {
0% {
top: 36px;
left: 36px;
width: 0;
height: 0;
opacity: 1;
}
100% {
top: 0px;
left: 0px;
width: 72px;
height: 72px;
opacity: 0;
}
}

2
client/webpack.config.js
View File

@ -42,7 +42,7 @@ module.exports = {
loader: 'file-loader', loader: 'file-loader',
options: { options: {
name: '[name].[ext]', name: '[name].[ext]',
outputPath: '/fonts/' outputPath: '/resources/'
} }
}] }]
},{ },{