From bcd822c161f33903ad707cd4f9adbf81ab3249a8 Mon Sep 17 00:00:00 2001 From: Tyler Schicke Date: Sat, 16 Mar 2019 16:55:05 -0400 Subject: Added code to pull --- src/server/index.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/server') diff --git a/src/server/index.ts b/src/server/index.ts index 83fa84746..f63b6fa74 100644 --- a/src/server/index.ts +++ b/src/server/index.ts @@ -34,6 +34,7 @@ const bluebird = require('bluebird'); import { performance } from 'perf_hooks' import * as fs from 'fs'; import * as request from 'request' +import { exec } from 'child_process' const download = (url: string, dest: fs.PathLike) => { request.get(url).pipe(fs.createWriteStream(dest)); @@ -103,6 +104,16 @@ app.get("/", (req, res) => { res.sendFile(path.join(__dirname, '../../deploy/index.html')); }); +app.get("/pull", (req, res) => { + exec('git pull', (err, stdout, stderr) => { + if (err) { + res.send(err.message); + return; + } + res.redirect("/"); + }) +}); + app.get("/hello", (req, res) => { res.send("

Hello

"); }) -- cgit v1.2.3-70-g09d2 From 73f2e69d26e443f2379a1912b15bd18ed3f659de Mon Sep 17 00:00:00 2001 From: Tyler Schicke Date: Sat, 16 Mar 2019 17:04:04 -0400 Subject: Fixed exec command --- src/server/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/server') diff --git a/src/server/index.ts b/src/server/index.ts index f63b6fa74..fcf74c08a 100644 --- a/src/server/index.ts +++ b/src/server/index.ts @@ -105,7 +105,7 @@ app.get("/", (req, res) => { }); app.get("/pull", (req, res) => { - exec('git pull', (err, stdout, stderr) => { + exec('"C:\\Program Files\\Git\\git-bash.exe" -c "git pull"', (err, stdout, stderr) => { if (err) { res.send(err.message); return; -- cgit v1.2.3-70-g09d2 From f8a2744ea03ec03236284939d14787b04b9c8aa6 Mon Sep 17 00:00:00 2001 From: Andrew Kim Date: Sat, 16 Mar 2019 18:19:08 -0400 Subject: asdfasfd --- deploy/mobile/image_upload.html | 13 +++++++++++++ deploy/mobile/ink_controls.html | 13 +++++++++++++ package-lock.json | 5 +++++ package.json | 1 + src/mobile/ImageUpload.tsx | 11 +++++++++++ src/mobile/InkControls.tsx | 0 src/server/index.ts | 10 ++++++++-- webpack.config.js | 2 ++ 8 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 deploy/mobile/image_upload.html create mode 100644 deploy/mobile/ink_controls.html create mode 100644 src/mobile/ImageUpload.tsx create mode 100644 src/mobile/InkControls.tsx (limited to 'src/server') diff --git a/deploy/mobile/image_upload.html b/deploy/mobile/image_upload.html new file mode 100644 index 000000000..4cfd931ac --- /dev/null +++ b/deploy/mobile/image_upload.html @@ -0,0 +1,13 @@ + + + + Test view + + + + +
+ + + + \ No newline at end of file diff --git a/deploy/mobile/ink_controls.html b/deploy/mobile/ink_controls.html new file mode 100644 index 000000000..725ed3685 --- /dev/null +++ b/deploy/mobile/ink_controls.html @@ -0,0 +1,13 @@ + + + + Test view + + + + +
+ + + + \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index dd5d44bd9..9169ae4e9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5982,6 +5982,11 @@ } } }, + "mobile-detect": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/mobile-detect/-/mobile-detect-1.4.3.tgz", + "integrity": "sha512-UaahPNLllQsstHOEHAmVnTHCMQrAS9eL5Qgdi50QrYz6UgGk+Xziz2udz2GN6NYcyODcPLnasC7a7s6R2DjiaQ==" + }, "mobx": { "version": "5.9.0", "resolved": "https://registry.npmjs.org/mobx/-/mobx-5.9.0.tgz", diff --git a/package.json b/package.json index 219efb5f7..ed593898d 100644 --- a/package.json +++ b/package.json @@ -92,6 +92,7 @@ "jsonwebtoken": "^8.5.0", "jsx-to-string": "^1.4.0", "lodash": "^4.17.11", + "mobile-detect": "^1.4.3", "mobx": "^5.9.0", "mobx-react": "^5.3.5", "mobx-react-devtools": "^6.1.1", diff --git a/src/mobile/ImageUpload.tsx b/src/mobile/ImageUpload.tsx new file mode 100644 index 000000000..566fe9d6c --- /dev/null +++ b/src/mobile/ImageUpload.tsx @@ -0,0 +1,11 @@ +ReactDOM.render(( +
), + document.getElementById('root') +); \ No newline at end of file diff --git a/src/mobile/InkControls.tsx b/src/mobile/InkControls.tsx new file mode 100644 index 000000000..e69de29bb diff --git a/src/server/index.ts b/src/server/index.ts index fcf74c08a..f83532a2f 100644 --- a/src/server/index.ts +++ b/src/server/index.ts @@ -27,6 +27,7 @@ import * as expressValidator from 'express-validator'; import expressFlash = require('express-flash'); import * as bodyParser from 'body-parser'; import * as session from 'express-session'; +import * as mobileDetect from 'mobile-detect'; import c = require("crypto"); const MongoStore = require('connect-mongo')(session); const mongoose = require('mongoose'); @@ -100,8 +101,13 @@ app.use('/images', express.static(__dirname + '/public')) let FieldStore: ObservableMap = new ObservableMap(); // define a route handler for the default home page -app.get("/", (req, res) => { - res.sendFile(path.join(__dirname, '../../deploy/index.html')); +app.get("/", (req: express.Request, res: express.Response) => { + let detector = new mobileDetect(req.headers['user-agent'] || ""); + if (detector.mobile() != null) { + res.sendFile(path.join(__dirname, '../../deploy/mobile/image_upload.html')); + } else { + res.sendFile(path.join(__dirname, '../../deploy/index.html')); + } }); app.get("/pull", (req, res) => { diff --git a/webpack.config.js b/webpack.config.js index 815e2b477..52ad2c653 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -8,6 +8,8 @@ module.exports = { bundle: ["./src/client/views/Main.tsx", 'webpack-hot-middleware/client?reload=true'], viewer: ["./src/debug/Viewer.tsx", 'webpack-hot-middleware/client?reload=true'], test: ["./src/debug/Test.tsx", 'webpack-hot-middleware/client?reload=true'], + image_upload: ["./src/debug/mobile/ImageUpload.tsx", 'webpack-hot-middleware/client?reload=true'], + ink_control: ["./src/debug/mobile/InkControl.tsx", 'webpack-hot-middleware/client?reload=true'], }, devtool: "source-map", node: { -- cgit v1.2.3-70-g09d2 From e44c59c228c11d8b6f539f557a987efda67bb275 Mon Sep 17 00:00:00 2001 From: Andrew Kim Date: Sat, 16 Mar 2019 18:34:26 -0400 Subject: test2 --- src/server/index.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/server') diff --git a/src/server/index.ts b/src/server/index.ts index f83532a2f..a8ac652fb 100644 --- a/src/server/index.ts +++ b/src/server/index.ts @@ -102,12 +102,12 @@ let FieldStore: ObservableMap = new ObservableMap(); // define a route handler for the default home page app.get("/", (req: express.Request, res: express.Response) => { - let detector = new mobileDetect(req.headers['user-agent'] || ""); - if (detector.mobile() != null) { - res.sendFile(path.join(__dirname, '../../deploy/mobile/image_upload.html')); - } else { + //let detector = new mobileDetect(req.headers['user-agent'] || ""); + //if (detector.mobile() != null) { + // res.sendFile(path.join(__dirname, '../../deploy/mobile/image_upload.html')); + // } else { res.sendFile(path.join(__dirname, '../../deploy/index.html')); - } + // } }); app.get("/pull", (req, res) => { -- cgit v1.2.3-70-g09d2 From fc792ec31662a38cc3acc58000df6844e22689bd Mon Sep 17 00:00:00 2001 From: Andrew Kim Date: Sat, 16 Mar 2019 18:36:08 -0400 Subject: test3 --- src/server/index.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/server') diff --git a/src/server/index.ts b/src/server/index.ts index a8ac652fb..86cef77f4 100644 --- a/src/server/index.ts +++ b/src/server/index.ts @@ -102,12 +102,12 @@ let FieldStore: ObservableMap = new ObservableMap(); // define a route handler for the default home page app.get("/", (req: express.Request, res: express.Response) => { - //let detector = new mobileDetect(req.headers['user-agent'] || ""); - //if (detector.mobile() != null) { - // res.sendFile(path.join(__dirname, '../../deploy/mobile/image_upload.html')); - // } else { + let detector = new mobileDetect(req.headers['user-agent'] || ""); + if (detector.mobile() != null) { + res.sendFile(path.join(__dirname, '../../deploy/mobile/image.html')); + } else { res.sendFile(path.join(__dirname, '../../deploy/index.html')); - // } + } }); app.get("/pull", (req, res) => { -- cgit v1.2.3-70-g09d2 From 1328b125d2b414380d037206ab6f39b9d12f1ff1 Mon Sep 17 00:00:00 2001 From: yipstanley Date: Sun, 17 Mar 2019 21:16:17 -0400 Subject: nacho fries --- .gitignore | 1 - src/client/views/Main.tsx | 2 +- src/mobile/ImageUpload.scss | 7 ++---- src/mobile/ImageUpload.tsx | 55 ++++++++++++++++++++++++++++++++++----------- src/server/index.ts | 2 +- 5 files changed, 46 insertions(+), 21 deletions(-) (limited to 'src/server') diff --git a/.gitignore b/.gitignore index 7b9483f69..2f9680a59 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ node_modules dist/ .DS_Store -src/server/public/files/* diff --git a/src/client/views/Main.tsx b/src/client/views/Main.tsx index 89ef16cc9..437d025ef 100644 --- a/src/client/views/Main.tsx +++ b/src/client/views/Main.tsx @@ -98,7 +98,7 @@ Documents.initProtos(mainDocId, (res?: Document) => { }) } }) - }, 50) + }, 100) let imgurl = "https://upload.wikimedia.org/wikipedia/commons/thumb/3/3a/Cat03.jpg/1200px-Cat03.jpg"; let pdfurl = "http://www.adobe.com/support/products/enterprise/knowledgecenter/media/c4611_sample_explain.pdf" diff --git a/src/mobile/ImageUpload.scss b/src/mobile/ImageUpload.scss index 2d8966be1..d0b7d4e41 100644 --- a/src/mobile/ImageUpload.scss +++ b/src/mobile/ImageUpload.scss @@ -1,6 +1,6 @@ .imgupload_cont { - height: 100%; - width: 100%; + height: 100vh; + width: 100vw; align-content: center; .button_file { text-align: center; @@ -10,7 +10,4 @@ color: grey; font-size: 3em; } - .input_file { - background-color: transparent; // display: none; - } } \ No newline at end of file diff --git a/src/mobile/ImageUpload.tsx b/src/mobile/ImageUpload.tsx index 8ad781990..935f5b5c1 100644 --- a/src/mobile/ImageUpload.tsx +++ b/src/mobile/ImageUpload.tsx @@ -2,29 +2,58 @@ import * as ReactDOM from 'react-dom'; import React = require('react'); import "./ImageUpload.scss" import { action, runInAction } from "mobx"; +import { type } from 'os'; +import { Documents } from '../client/documents/Documents'; +import { Document } from '../fields/Document'; +import { Server } from '../client/Server'; +import { Opt, Field } from '../fields/Field'; +import { ListField } from '../fields/ListField'; +import { KeyStore } from '../fields/KeyStore'; -const onPointerDown = (e: React.TouchEvent) => { - let imgInput = document.getElementById("input_image_file"); - if (imgInput) { - imgInput.click(); - } -} +// const onPointerDown = (e: React.TouchEvent) => { +// let imgInput = document.getElementById("input_image_file"); +// if (imgInput) { +// imgInput.click(); +// } +// } +const pendingDocId = "pending-doc" const onFileLoad = (file: any) => { - let img = new Image(); let imgPrev = document.getElementById("img_preview") if (imgPrev) { - let files = file.target.files; + let files: File[] = file.target.files; if (files.length != 0) { console.log(files[0]); - console.log(window.location.origin) - const upload = window.location.origin + "/upload"; let formData = new FormData(); formData.append("file", files[0]); - console.log(window.location.origin + file[0]) + + const upload = window.location.origin + "/upload" + fetch(upload, { + method: 'POST', + body: formData + }).then((res: Response) => { + return res.json() + }).then(json => { + json.map((file: any) => { + let path = window.location.origin + file + runInAction(() => { + var doc: Document = Documents.ImageDocument(path, { nativeWidth: 200, width: 200 }) + Server.GetField(pendingDocId, (res: Opt) => { + if (res) { + if (res instanceof Document) { + res.GetOrCreateAsync(KeyStore.Data, ListField, (f: ListField) => { + f.Data.push(doc) + }) + } + } + }) + }) + }) + }) + // console.log(window.location.origin + file[0]) //imgPrev.setAttribute("src", window.location.origin + files[0].name) } @@ -35,8 +64,8 @@ const onFileLoad = (file: any) => { ReactDOM.render((
- {/* */} - + {/* */} +
), document.getElementById('root') diff --git a/src/server/index.ts b/src/server/index.ts index 0a89c61bd..4be35b7b7 100644 --- a/src/server/index.ts +++ b/src/server/index.ts @@ -106,7 +106,7 @@ app.get("/", (req: express.Request, res: express.Response) => { if (detector.mobile() != null) { res.sendFile(path.join(__dirname, '../../deploy/mobile/image.html')); } else { - res.sendFile(path.join(__dirname, '../../deploy/index.html')); + res.redirect("/doc/mainDoc"); } }); -- cgit v1.2.3-70-g09d2