From 63670050ff2a98096c94b950d40638644ad42358 Mon Sep 17 00:00:00 2001 From: Mickael KERJEAN Date: Fri, 15 Mar 2019 13:43:13 +1100 Subject: [PATCH] maintain (code): cleanup dependencies and other dead things --- Makefile | 21 +++++---------------- client/pages/connectpage/form.js | 2 -- client/pages/viewerpage.js | 7 ++++++- client/pages/viewerpage/index.js | 4 ++-- docker/prod/Dockerfile | 5 +---- package.json | 7 ------- 6 files changed, 14 insertions(+), 32 deletions(-) diff --git a/Makefile b/Makefile index 589215de..80f4e16c 100644 --- a/Makefile +++ b/Makefile @@ -1,22 +1,11 @@ -docker_dev: - @docker rm -f filestash_dev || true 2> /dev/null - @docker run -ti --net=host -v /home/mickael/Documents/projects/go/src/github.com/mickael-kerjean/filestash:/tmp/go/src/github.com/mickael-kerjean/filestash filestash_dev sh - -docker_prd: - docker build --no-cache -t machines/filestash docker/prod/ - docker push machines/filestash - build_frontend: NODE_ENV=production npm run build build_backend: PKG_CONFIG_PATH=/usr/local/lib/pkgconfig/ CGO_CFLAGS_ALLOW='-fopenmp' go build -ldflags "-X github.com/mickael-kerjean/filestash/server/common.BUILD_NUMBER=`date -u +%Y%m%d`" -o dist/filestash server/main.go -package: - rm -rf dist/ - make build_backend - make build_frontend - cp -R config dist/data/config - mv dist filestash - tar -zcvf filestash.tar.gz filestash - rm -rf filestash +build_plugins: + go build -buildmode=plugin -o ./dist/data/plugin/image.so server/plugin/plg_image_light/index.go + go build -buildmode=plugin -o ./dist/data/plugin/backend_dav.so server/plugin/plg_backend_dav/index.go + go build -buildmode=plugin -o ./dist/data/plugin/backend_ldap.so server/plugin/plg_backend_ldap/index.go + go build -buildmode=plugin -o dist/data/plugin/backend_backblaze.so server/plugin/plg_backend_backblaze/index.go diff --git a/client/pages/connectpage/form.js b/client/pages/connectpage/form.js index 60936b95..2c74d469 100644 --- a/client/pages/connectpage/form.js +++ b/client/pages/connectpage/form.js @@ -3,8 +3,6 @@ import { Container, Card, NgIf, Input, Button, Textarea, FormBuilder } from "../ import { gid, settings_get, settings_put, createFormBackend, FormObjToJSON } from "../../helpers/"; import { Session, Backend } from "../../model/"; import "./form.scss"; -import img_drive from "../../assets/img/google-drive.png"; -import img_dropbox from "../../assets/img/dropbox.png"; export class Form extends React.Component { constructor(props){ diff --git a/client/pages/viewerpage.js b/client/pages/viewerpage.js index 339dcbaf..6b669e46 100644 --- a/client/pages/viewerpage.js +++ b/client/pages/viewerpage.js @@ -6,7 +6,7 @@ import './error.scss'; import { Files } from '../model/'; import { BreadCrumb, Bundle, NgIf, Loader, Container, EventReceiver, EventEmitter, LoggedInOnly , ErrorPage } from '../components/'; import { debounce, opener, notify } from '../helpers/'; -import { AudioPlayer, FileDownloader, ImageViewer, PDFViewer, FormViewer } from './viewerpage/'; +import { FileDownloader, ImageViewer, PDFViewer, FormViewer } from './viewerpage/'; const VideoPlayer = (props) => ( @@ -18,6 +18,11 @@ const IDE = (props) => ( {(Comp) => } ); +const AudioPlayer = (props) => ( + + {(Comp) => } + +); @ErrorPage @LoggedInOnly diff --git a/client/pages/viewerpage/index.js b/client/pages/viewerpage/index.js index 7c7bbb99..9bdc88ba 100644 --- a/client/pages/viewerpage/index.js +++ b/client/pages/viewerpage/index.js @@ -1,8 +1,8 @@ -export { AudioPlayer } from './audioplayer'; export { FileDownloader } from './filedownloader'; export { ImageViewer } from './imageviewer'; export { PDFViewer } from './pdfviewer'; -export { IDE } from './ide'; export { FormViewer } from './formviewer'; // Those are commented because they will be delivered as a separate chunk //export { VideoPlayer } from './videoplayer'; +//export { IDE } from './ide'; +//export { AudioPlayer } from './audioplayer'; diff --git a/docker/prod/Dockerfile b/docker/prod/Dockerfile index deeeb7cf..12c29ac0 100644 --- a/docker/prod/Dockerfile +++ b/docker/prod/Dockerfile @@ -48,10 +48,7 @@ RUN mkdir -p $GOPATH/src/github.com/mickael-kerjean/ && \ # Compile Plugins mkdir -p ./dist/data/plugin && \ go get -v ./server/plugin/... > /dev/null 2>&1 || true && \ - go build -buildmode=plugin -o ./dist/data/plugin/image.so server/plugin/plg_image_light/index.go && \ - go build -buildmode=plugin -o ./dist/data/plugin/backend_dav.so server/plugin/plg_backend_dav/index.go && \ - go build -buildmode=plugin -o ./dist/data/plugin/backend_ldap.so server/plugin/plg_backend_ldap/index.go && \ - go build -buildmode=plugin -o dist/data/plugin/backend_backblaze.so server/plugin/plg_backend_backblaze/index.go && \ + make build_plugins && \ ################# # External dependencies: emacs and pdflatex apk --no-cache add curl emacs texlive zip && \ diff --git a/package.json b/package.json index de830467..ba1cd589 100644 --- a/package.json +++ b/package.json @@ -15,9 +15,7 @@ "bcryptjs": "^2.4.3" }, "devDependencies": { - "babel-cli": "^6.11.4", "babel-core": "^6.13.2", - "babel-jest": "^23.6.0", "babel-loader": "^6.2.10", "babel-plugin-syntax-dynamic-import": "^6.18.0", "babel-plugin-transform-decorators-legacy": "^1.3.4", @@ -26,7 +24,6 @@ "babel-preset-react": "^6.11.1", "babel-preset-stage-2": "^6.24.1", "babelify": "^8.0.0", - "browserify": "^16.1.1", "codemirror": "^5.26.0", "compression-webpack-plugin": "^1.1.11", "copy-webpack-plugin": "^4.5.2", @@ -34,9 +31,7 @@ "exif-js": "^2.3.0", "html-loader": "^0.4.5", "html-webpack-plugin": "^2.28.0", - "jest": "^23.6.0", "node-sass": "^4.10.0", - "nodemon": "^1.17.1", "prop-types": "^15.5.10", "react": "^16.8.0", "react-dom": "^16.8.0", @@ -49,7 +44,6 @@ "react-router-dom": "^4.1.1", "react-sticky": "^6.0.2", "requirejs": "^2.3.5", - "rx-lite": "^4.0.8", "rxjs": "^5.4.0", "sass-loader": "^6.0.6", "sass-variable-loader": "^0.1.2", @@ -62,7 +56,6 @@ "wavesurfer.js": "^1.4.0", "webpack": "^2.7.0", "webpack-bundle-analyzer": "^2.8.2", - "webpack-dev-server": "^3.1.0", "worker-loader": "^2.0.0" } }