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.

Sign up for GitHub

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

Support for QR codes #172

Merged
merged 12 commits into from
Feb 19, 2024
Merged

Support for QR codes #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
bb41636
Add `qrcode` as dependency
dersmon Jul 4, 2023
e5018f5
Add QR Code generator
GuzzoD Jul 11, 2023
a8c095b
Add qr code scanner button
GuzzoD Jul 13, 2023
71a6f34
Do not add identifier to qr code
GuzzoD Jul 13, 2023
61f0d15
use @ as separator
GuzzoD Jul 13, 2023
6c47ad3
Implement QRCode scanner
GuzzoD Jul 13, 2023
19d9517
Position change,scanner beep sound & code comments
GuzzoD Aug 30, 2023
fa2f26e
Move redirect out of QR scanner component
GuzzoD Aug 30, 2023
0215a03
support precreated QR-Code
GuzzoD Aug 30, 2023
2ceddfe
Add qrScanner dependency
GuzzoD Sep 26, 2023
c40c2d5
Code cleaning, modal layout and prevent modal from closing when click…
GuzzoD Dec 12, 2023
e93fe04
E2E QrCode scanner test
GuzzoD Jan 11, 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
11 changes: 7 additions & 4 deletions core/src/services/relations-manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,14 @@ export class RelationsManager {
private persistIt(document: Document|NewDocument,
squashRevisionIds: string[]): Promise<Document> {

return document.resource.id
? this.datastore.update(
if ('created' in document){
return this.datastore.update(
document as Document,
squashRevisionIds.length === 0 ? undefined : squashRevisionIds)
: this.datastore.create(document);
squashRevisionIds.length === 0 ? undefined : squashRevisionIds
)
}

return this.datastore.create(document);
}


Expand Down
9 changes: 9 additions & 0 deletions desktop/electron/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,15 @@ const createWindow = () => {
titleBarStyle: 'hiddenInset'
});

// electron.desktopCapturer.getSources({ types: ['window', 'screen'] }).then(async sources => {
// for (const source of sources) {
// if (source.name === 'Field Desktop') {
// mainWindow.webContents.send('SET_SOURCE', source.id)
// return
// }
// }
// })

remoteMain.enable(mainWindow.webContents);

if (require('os').platform() === 'linux' && global.mode === 'production') {
Expand Down
32 changes: 32 additions & 0 deletions desktop/electron/preload.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,35 @@ window.filesystem.extractZip = function(source, destination) {
window.filesystem.createCatalogZip = function(outputFilePath, filePath, fileName, imageDirPath, imageDirName) {
return ipcRenderer.invoke('createCatalogZip', outputFilePath, filePath, fileName, imageDirPath, imageDirName);
};

// ipcRenderer.on('SET_SOURCE', async (event, sourceId) => {
// try {
// const stream = await navigator.mediaDevices.getUserMedia({
// audio: false,
// video: {
// mandatory: {
// chromeMediaSource: 'desktop',
// chromeMediaSourceId: sourceId,
// minWidth: 1280,
// maxWidth: 1280,
// minHeight: 720,
// maxHeight: 720
// }
// }
// })
// handleStream(stream)
// } catch (e) {
// handleError(e)
// }
// })


// function handleStream (stream) {
// const video = document.querySelector('video')
// video.srcObject = stream
// video.onloadedmetadata = (e) => video.play()
// }

// function handleError (e) {
// console.log(e)
// }
Loading
Loading