Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dev v1.1.18 #47

Merged
merged 96 commits into from
Jul 2, 2024
Merged
Changes from 1 commit
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
65a8d15
created sign up screen
doljko Feb 23, 2024
47691ad
update ui
doljko Feb 23, 2024
00e658e
translation
doljko Feb 23, 2024
a52c0d3
updated icon
doljko Feb 26, 2024
cd617ac
added search screen
doljko Feb 27, 2024
49df29e
available search org, fix some bug
doljko Mar 5, 2024
7e6bd1c
fix request
doljko Mar 6, 2024
635cf4e
updated
doljko Mar 7, 2024
f515a22
create entity settings screen, db
doljko Mar 15, 2024
63cb3ab
update detail after refreshed entity
doljko Mar 15, 2024
564775f
fix
doljko Mar 15, 2024
5c024a5
if toggle is active, the button is displayed
doljko Mar 18, 2024
e8774a1
Merge branch 'main' of https://github.com/fleetbase/navigator-app int…
doljko Mar 21, 2024
aec2c7a
add fetch setting api
doljko Mar 21, 2024
e0c6823
added image upload
doljko Mar 22, 2024
355687c
Added launchImageLibrary uploader
doljko Mar 22, 2024
815a54f
button changed
doljko Mar 25, 2024
c28c7c3
called settings list
doljko Mar 29, 2024
f0e9f67
checked driver onboarding
doljko Mar 29, 2024
46ff10f
signup db completed
doljko Mar 29, 2024
bd8a351
Merge branch 'main' of https://github.com/fleetbase/navigator-app int…
doljko Apr 1, 2024
6602f38
Changed title
doljko Apr 1, 2024
c513c31
created chat ui
doljko Apr 9, 2024
5b91cea
fixed chat ui
doljko Apr 9, 2024
2b59f20
improved chat ui
doljko Apr 10, 2024
f4926db
fixed messenger container
doljko Apr 10, 2024
1acd762
changed colour
doljko Apr 11, 2024
2678336
implemented fe db
doljko Apr 12, 2024
45d26b5
added swipe
doljko Apr 12, 2024
88a811f
list updated
doljko Apr 12, 2024
34ada7a
added users function
doljko Apr 15, 2024
fb54d5c
fix delete button ui
doljko Apr 16, 2024
dadf6c8
Showed user list
doljko Apr 16, 2024
8206954
added edit button
doljko Apr 16, 2024
1ef9e1e
fixed update, create func
doljko Apr 16, 2024
960606a
add load, file upload
doljko Apr 16, 2024
610eae8
fixed add participant
doljko Apr 18, 2024
a4408d1
Added delete function
doljko Apr 18, 2024
e5f8412
fixed remove function
doljko Apr 18, 2024
5be97f5
fixed name
doljko Apr 18, 2024
857da6c
user ui fix
doljko Apr 18, 2024
985081b
showed particient by modal
doljko Apr 18, 2024
86dcfda
checked if participant already added
doljko Apr 18, 2024
1e022c5
added indicator
doljko Apr 18, 2024
b058c44
fixed bug navigation, button
doljko Apr 18, 2024
638d4c2
fix border
doljko Apr 18, 2024
5d9c4a8
change file upload
doljko Apr 18, 2024
4d60a3f
added send func
doljko Apr 19, 2024
a9ac399
fixed send fnc
doljko Apr 19, 2024
860edae
added socket fnc
doljko Apr 19, 2024
ff562ff
fix some issues
doljko Apr 21, 2024
f43fae0
added chat history
doljko Apr 21, 2024
17a0bb8
fixed issues for add and remove participants
doljko Apr 21, 2024
6765373
remove duplicate adapter instances
doljko Apr 21, 2024
2598d84
remove unused state
doljko Apr 21, 2024
b84dba5
checked name length
doljko Apr 22, 2024
7ea77c6
removed unused file
doljko Apr 22, 2024
6f0527e
removed unused line
doljko Apr 23, 2024
1ac810c
fix chat id
doljko Apr 24, 2024
1c446b4
fixed socket data
doljko Apr 25, 2024
f292267
fix android ui
doljko Apr 26, 2024
c158394
added file upload
doljko Apr 29, 2024
742b0a9
fix uploadFile body.
doljko Apr 29, 2024
375ad83
added axiosClient
doljko Apr 29, 2024
28296a8
fixed auth token
doljko Apr 29, 2024
1ac6639
removed unused line
doljko Apr 30, 2024
9f452c1
If no image is selected, the condition is checked
doljko Apr 30, 2024
4ecf2c8
added attach pic
doljko Apr 30, 2024
5308d75
fix api
doljko May 1, 2024
d64efa9
added open, download action
doljko May 1, 2024
45d40f3
removed axioas
doljko May 3, 2024
682ed31
fixed image download
doljko May 3, 2024
526932b
changed chat position
doljko May 3, 2024
7afb0dd
fixed participent, attachment
doljko May 6, 2024
d5e011b
changed name
doljko May 7, 2024
96003f0
fixed base64, image viewer.
doljko May 7, 2024
bf59bd3
removed log
doljko May 7, 2024
e97bc50
fixed image download, viewer
doljko May 8, 2024
06afe4b
fixed chat text moving
doljko May 9, 2024
25492f7
Merge branch 'feature/entity-settings' into dev-v1.1.18
doljko Jun 6, 2024
a3fdf0e
Merge branch 'feature-sign-up' into dev-v1.1.18
doljko Jun 6, 2024
934258d
upgraded version
doljko Jun 6, 2024
bc69353
upgrade reanimated version
doljko Jun 6, 2024
a549544
added clean command in cli
doljko Jun 6, 2024
08fe5ee
fix dependency
doljko Jun 6, 2024
7cb8ed7
showed message, image together
doljko Jun 7, 2024
a38142e
fixed file name
doljko Jun 10, 2024
a2a2a0c
changed id
doljko Jun 10, 2024
a0dea2b
fixed too many req error
doljko Jun 24, 2024
4c7a00f
fixed status, showed last message
doljko Jun 25, 2024
13e73b9
fixed priority things
doljko Jun 25, 2024
e01a47e
removed package-lock.json
roncodes Jul 1, 2024
4fcaf85
checked undefine
doljko Jul 1, 2024
c23b0ac
Merge branch 'dev-v1.1.18' of https://github.com/fleetbase/navigator-…
doljko Jul 1, 2024
5d89da5
checked settings
doljko Jul 1, 2024
db1af39
fix loading
doljko Jul 2, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixed auth token
doljko committed Apr 29, 2024
commit 28296a8db1c3be7d106a962f482b0cc6af72ef2c
33 changes: 21 additions & 12 deletions src/features/Core/screens/ChatScreen.js
Original file line number Diff line number Diff line change
@@ -12,6 +12,8 @@ import { launchImageLibrary } from 'react-native-image-picker';
import Modal from 'react-native-modal';
import { tailwind } from 'tailwind';
import { createSocketAndListen, translate } from 'utils';
import { isObject } from 'utils';
import { get } from 'utils/Storage';

const isAndroid = Platform.OS === 'android';
let { FLEETBASE_KEY } = config;
@@ -83,29 +85,36 @@ const ChatScreen = ({ route }) => {
});

const uploadFile = async url => {
let _DRIVER = get('driver');

const axiosClient = axios.create({
baseURL: `${adapterInt.host}/${adapterInt.namespace}`,
headers: {
Authorization: isObject(_DRIVER) && typeof _DRIVER.token === 'string' ? `Bearer ${_DRIVER.token}` : `Bearer ${FLEETBASE_KEY}`,
'User-Agent': '@fleetbase/sdk;node',
'Content-Type': 'multipart/form-data',
Accept: 'multipart/form-data',
},
});

try {
const axiosClient = axios.create({
baseURL: `${adapterInt.host}/${adapterInt.namespace}`,
headers: {
Authorization: `Bearer ${FLEETBASE_KEY}`,
'User-Agent': '@fleetbase/sdk;node',
},
});
console.log('url::::::', JSON.stringify(url));
console.log('adapter::::', adapter);

if (!url || !url.uri || !url.type || !url.fileName) {
throw new Error('Invalid file URL');
}

const formData = new FormData();
formData.append('file', {
uri: url.uri,
type: url.type,
name: url.name,
name: url.fileName,
});

const res = await axiosClient.post('files/upload', formData);

console.log('File upload successful:', res);
console.log('Upload response:', res.data);
} catch (error) {
console.error('File upload failed:', error);
console.error('Error uploading file:', error);
}
};