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

client/src/components/BoardPage/BoardPage.tsx

@@ -195,17 +195,17 @@ export class BoardPage extends React.Component<BoardPageProps> {
             <div className="level-item">
               <span className="tag is-primary is-light is-normal">{lane.cards.length}</span>
             </div>
-            <h3 className="level-item is-size-5">
-              {lane.title}
-            </h3>
             <button className="button is-light level-item is-small expand"
               onClick={this.onMinimizeColumn}>
               <span className="icon">
                 <i className="fas fa-chevron-right" aria-hidden="true"></i>
               </span>
             </button>
+            <h3 className="level-item is-size-5">
+              {lane.title}
+            </h3>
           </div>
-          <div className="level-right">
+          <div className="level-right is-show-expand">
             <button className="button is-light level-item is-small"
               onClick={this.onNewCardClick.bind(this, lane.id)}>
               <span className="icon">
@@ -228,7 +228,7 @@ export class BoardPage extends React.Component<BoardPageProps> {
     e.currentTarget.closest('.react-kanban-column').classList.toggle('minimized');
   }
 
-  onCardDragEnd(b: any, card: any, source: any, dest: any) {
+  onCardDragEnd(card: any, source: any, dest: any) {
     const { board } = this.props;
     this.props.dispatch(moveCard(
       board.id,

client/src/sass/_kanboard.scss

@@ -101,23 +101,41 @@
     scrollbar-color: $grey-lighter, #f1f1f1;
     scrollbar-width: 5px;
 
+    .kanboard-card {
+        display: block;
+    }
+
     &.minimized {
-        max-width: 40px;
-        min-width: 40px;
+        max-width: 70px;
+        min-width: 70px;
         
         writing-mode: vertical-rl;
         text-orientation: sideways-right;
 
+        
+
+        .level-item {
+            margin-right: 0;
+        }
+
+        .level-left {
+            margin-right: 0;
+        }
+
+        .level-right.is-show-expand {
+            display: none;
+        }
+
         .kanboard-lane {
-            margin-right: -1em;
+            /*margin-right: -1em;*/
 
             h3 {
                 margin-top: .5em;
-                margin-right: -.5em;
+                /*margin-right: -.5em;*/
             }
 
             .tag {
-                margin-right: -1em;
+                writing-mode: horizontal-tb;
             }
 
             .expand {
@@ -125,8 +143,13 @@
                 margin-top: .5em;
             }
         }
+
+        .kanboard-card {
+            display: none;
+        }
         
     }
+    
 
     &::-webkit-scrollbar {
         width: 5px;

client/src/store/reducers/kanboards.ts

@@ -37,22 +37,22 @@ function handleMoveCard(state: any, action: any) {
 
   const kanboard = state.byID[boardID];
 
-  const lanes = [ ...kanboard.columns ];
-  const fromLane = lanes[fromLaneID];
-  const toLane = lanes[toLaneID];
+  const columns = [ ...kanboard.columns ];
+  const fromLane = columns[fromLaneID];
+  const toLane = columns[toLaneID];
   const card = fromLane.cards[fromPosition];
 
   const fromCards = [ ...fromLane.cards ];
   if (fromLaneID !== toLaneID) {
     fromCards.splice(fromPosition, 1);
-    lanes[fromLaneID] = {
+    columns[fromLaneID] = {
       ...fromLane,
       cards: fromCards,
     };
   
     const toCards = [ ...toLane.cards ];
     toCards.splice(toPosition, 0, card);
-    lanes[toLaneID] = {
+    columns[toLaneID] = {
       ...toLane,
       cards: toCards,
     };
@@ -67,7 +67,7 @@ function handleMoveCard(state: any, action: any) {
       ...state.byID,
       [boardID]: {
         ...state.byID[boardID],
-        lanes,
+        columns,
       },
     }
   };

client/src/store/sagas/kanboards.ts

@@ -22,7 +22,7 @@ export function* moveCardSaga(action: any) {
     }
   });
 
-  const toLane = kanboard.lanes[toLaneID];
+  const toLane = kanboard.columns[toLaneID];
   const card = toLane.cards[toPosition];
 
   if (!card) return;

debian/compat

@@ -0,0 +1 @@
+9

debian/control

@@ -0,0 +1,14 @@
+Source: gengitkan
+Section: unknown
+Priority: optional
+Maintainer: William Petit <wpetit@cadoles.com>
+Build-Depends: debhelper (>= 8.0.0), wget, ca-certificates, tar
+Standards-Version: 3.9.4
+Homepage: http://forge.cadoles.com/wpetit/gengitkan
+Vcs-Git: http://forge.cadoles.com/wpetit/gengitkan.git
+Vcs-Browser: http://forge.cadoles.com/wpetit/gengitkan
+
+Package: gengitkan
+Architecture: amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Application type "Kanboard" connectée à Gitea

debian/gengitkan.dirs

@@ -0,0 +1 @@
+var/lib/gengitkan

debian/gengitkan.service

@@ -0,0 +1,13 @@
+[Unit]
+Description=Application type "Kanboard" connectée à Gitea
+After=network-online.target
+
+[Service]
+Type=simple
+Environment=GENGITKAN_HTTP_PUBDIR=/usr/share/gengitkan/public
+Environment=GENGITKAN_DATA_DBPATH=/var/lib/gengitkan/data.db
+ExecStart=/usr/bin/gengitkan -workdir /usr/share/gengitkan -config /etc/gengitkan/server.conf
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target

debian/rules

@@ -0,0 +1,54 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
+
+GO_VERSION := 1.13.5
+OS := linux
+ARCH := amd64
+GOPATH=$(HOME)/go
+
+ifeq (, $(shell which go 2>/dev/null))
+override_dh_auto_build: install-go
+endif
+
+ifeq (, $(shell which node 2>/dev/null))
+override_dh_auto_build: install-nodejs
+endif
+
+%:
+	dh $@ --with systemd
+
+override_dh_auto_build: $(GOPATH)
+	cd client && npm install
+	GOPATH=$(GOPATH) PATH="$(PATH):/usr/local/go/bin:$(GOPATH)/bin" go mod vendor
+	GOPATH=$(GOPATH) PATH="$(PATH):/usr/local/go/bin:$(GOPATH)/bin" ARCH_TARGETS=$(ARCH) make release
+
+$(GOPATH):
+	mkdir -p $(GOPATH)
+	
+install-go:
+	wget https://dl.google.com/go/go$(GO_VERSION).$(OS)-$(ARCH).tar.gz
+	tar -C /usr/local -xzf go$(GO_VERSION).$(OS)-$(ARCH).tar.gz
+
+install-nodejs:
+	wget -O- https://deb.nodesource.com/setup_12.x | bash -
+	apt-get install -y nodejs
+
+override_dh_auto_install:
+
+	mkdir -p debian/gengitkan/usr/share/gengitkan
+	mkdir -p debian/gengitkan/etc/gengitkan
+	mkdir -p debian/gengitkan/usr/bin
+
+	cp -r release/server-$(OS)-$(ARCH)/* debian/gengitkan/usr/share/gengitkan/
+	
+	mv debian/gengitkan/usr/share/gengitkan/bin/server debian/gengitkan/usr/bin/gengitkan
+	mv debian/gengitkan/usr/share/gengitkan/server.conf debian/gengitkan/etc/gengitkan/server.conf
+
+	install -d debian/gengitkan
+
+override_dh_strip:
+
+override_dh_auto_test:

debian/source/format

@@ -0,0 +1 @@
+3.0 (native)