Skip to content

Commit 3e43816

Browse files
author
Volokasse
committed
Merge main project into FS one. (3)
Signed-off-by: Volokasse <stephen@fat.sh>
1 parent 94fc837 commit 3e43816

343 files changed

Lines changed: 11046 additions & 939 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎client/.eslintignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-
**/*

‎client/public/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<head>
44
<meta charset="utf-8" />
55
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
6-
<meta name="viewport" content="width=device-width, initial-scale=1" />
6+
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
77
<meta name="theme-color" content="#000000" />
88
<meta
99
name="description"
1010
content="Planka is an open source project management software"
1111
/>
12-
<link rel="apple-touch-icon" href="logo192.png" />
12+
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
1313
<!--
1414
manifest.json provides metadata used when your web app is installed on a
1515
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/

‎client/src/actions/cards.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,15 @@ updateCard.failure = (id, error) => ({
5757
},
5858
});
5959

60-
const handleCardUpdate = (card) => ({
60+
const handleCardUpdate = (card, isFetched, cardMemberships, cardLabels, tasks, attachments) => ({
6161
type: ActionTypes.CARD_UPDATE_HANDLE,
6262
payload: {
6363
card,
64+
isFetched,
65+
cardMemberships,
66+
cardLabels,
67+
tasks,
68+
attachments,
6469
},
6570
});
6671

‎client/src/api/access-tokens.js‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
import http from './http';
2-
import socket from './socket';
32

43
/* Actions */
54

6-
const createAccessToken = (data, headers) => http.post('/access-tokens', data, headers);
5+
const createAccessToken = (data, headers) =>
6+
http.post('/access-tokens?withHttpOnlyToken=true', data, headers);
77

88
const exchangeForAccessTokenUsingOidc = (data, headers) =>
9-
http.post('/access-tokens/exchange-using-oidc', data, headers);
9+
http.post('/access-tokens/exchange-using-oidc?withHttpOnlyToken=true', data, headers);
1010

11-
const deleteCurrentAccessToken = (headers) =>
12-
socket.delete('/access-tokens/me', undefined, headers);
11+
const deleteCurrentAccessToken = (headers) => http.delete('/access-tokens/me', undefined, headers);
1312

1413
export default {
1514
createAccessToken,

‎client/src/api/http.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import Config from '../constants/Config';
55
const http = {};
66

77
// TODO: add all methods
8-
['GET', 'POST'].forEach((method) => {
8+
['GET', 'POST', 'DELETE'].forEach((method) => {
99
http[method.toLowerCase()] = (url, data, headers) => {
1010
const formData =
1111
data &&
@@ -19,6 +19,7 @@ const http = {};
1919
method,
2020
headers,
2121
body: formData,
22+
credentials: 'include',
2223
})
2324
.then((response) =>
2425
response.json().then((body) => ({

‎client/src/api/socket.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ io.sails.environment = process.env.NODE_ENV;
1313

1414
const { socket } = io;
1515

16-
socket.path = `${Config.BASE_PATH}/socket.io`;
16+
socket.path = `${Config.SERVER_BASE_PATH}/socket.io`;
1717
socket.connect = socket._connect; // eslint-disable-line no-underscore-dangle
1818

1919
['GET', 'POST', 'PUT', 'PATCH', 'DELETE'].forEach((method) => {

0 commit comments

Comments
 (0)