Skip to content

Commit

Permalink
Merge pull request #164 from HaveAGitGat/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
HaveAGitGat committed Feb 20, 2020
2 parents 09cfe34 + 8d988df commit d403448
Show file tree
Hide file tree
Showing 38 changed files with 3,674 additions and 3,279 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
node_modules
.meteor/local

.idea
.idea
version.desktop
1 change: 1 addition & 0 deletions .meteor/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
local
desktop-build
2 changes: 2 additions & 0 deletions .meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,5 @@ insecure@1.0.7 # Allow all DB writes from clients (for prototypin
static-html # Define static page content in .html files
react-meteor-data # React higher-order component for reactively tracking Meteor data
fourseven:scss
omega:meteor-desktop-watcher@=2.2.5
omega:meteor-desktop-bundler@=2.2.5
2 changes: 2 additions & 0 deletions .meteor/versions
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ mongo-decimal@0.1.1
mongo-dev-server@1.1.0
mongo-id@1.0.7
npm-mongo@3.1.2
omega:meteor-desktop-bundler@2.2.5
omega:meteor-desktop-watcher@2.2.5
ordered-dict@1.1.0
promise@0.11.2
random@1.1.0
Expand Down
4 changes: 2 additions & 2 deletions imports/api/pluginCreatorMethods.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import { Meteor } from 'meteor/meteor';
const shortid = require('shortid');

//Globals
var fs = require('fs');
var path = require('path');
const fs = require('fs');
const path = require('path');



Expand Down
5 changes: 2 additions & 3 deletions imports/ui/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ const tabs = [
{path: '/', text: 'Dev', component: TabDev},
];

const AppRouter = () => {
export default AppRouter = () => {



const [basePath, setBasePath] = React.useState('');

const [currentVersion, setVersion] = React.useState('');

const [newVersion, setNewVersion] = React.useState(1.104);
const [newVersion, setNewVersion] = React.useState(1.105);



Expand Down Expand Up @@ -171,4 +171,3 @@ const AppRouter = () => {
);
};

export default AppRouter;
118 changes: 118 additions & 0 deletions imports/ui/ButtonLibrary/Buttons.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@

import React, { Component } from 'react';
import ItemButton from '../item_Button.jsx'


export class BumpButton extends Component {

render() {
var obj = {
bumped: new Date(),
}
return <ItemButton file={this.props.file} obj={obj} symbol={'↑'} type="updateDBAction" time={this.props.lastQueueUpdateTime} />

}
}



export class SkipButton extends Component {
render() {

var obj = {
TranscodeDecisionMaker:"Transcode success",
lastTranscodeDate: new Date(),
}
return <ItemButton file={this.props.file} obj={obj} symbol={'⤳'} type="updateDBAction" time={this.props.lastQueueUpdateTime} />

}
}


export class SkipHealthCheckButton extends Component {
render() {

var obj = {
HealthCheck: "Success",
lastHealthCheckDate: new Date(),
}
return <ItemButton file={this.props.file} obj={obj} symbol={'⤳'} type="updateDBAction" time={this.props.lastQueueUpdateTime} />

}
}


export class CancelBumpButton extends Component {
render() {

var obj = {
bumped: false,
}
return <ItemButton file={this.props.file} obj={obj} symbol={'X'} type="updateDBAction" time={this.props.lastQueueUpdateTime} />

}
}




export class RedoButton extends Component {

render() {

var obj = {
[this.props.mode]: "Queued",
processingStatus: false,
createdAt: new Date(),
}


return <ItemButton file={this.props.file} obj={obj} symbol={'↻'} type="updateDBAction" time={this.props.lastQueueUpdateTime} />
}
}

export class ForceProcessingButton extends Component {

render() {
var obj = {
forceProcessing: true,
}
return <ItemButton file={this.props.file} obj={obj} symbol={'No'} type="updateDBAction" time={this.props.lastQueueUpdateTime} />
}
}

export class CancelForceProcessingButton extends Component {

render() {
var obj = {
forceProcessing: false,
}
return <ItemButton file={this.props.file} obj={obj} symbol={'Yes'} type="updateDBAction" time={this.props.lastQueueUpdateTime} />
}
}



export class IgnoreButton extends Component {

render() {
var obj = {
[this.props.mode]: "Ignored",
processingStatus: false,
createdAt: new Date(),
}
return <ItemButton file={this.props.file} obj={obj} symbol={'Ignore'} type="updateDBAction" time={this.props.lastQueueUpdateTime} />
}
}





export class CreateSampleButton extends Component {
render() {

return <ItemButton file={this.props.file} symbol={'✄'} type="createSample" time={this.props.lastQueueUpdateTime} />
}
}

1 change: 1 addition & 0 deletions imports/ui/ErrorBoundary.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export class ErrorBoundary extends React.Component {

componentDidCatch(error, errorInfo) {
console.error(error);
console.error(error.stack);
console.log(errorInfo);
}

Expand Down
57 changes: 57 additions & 0 deletions imports/ui/Local_Image.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@


import React, { Component } from 'react';
import { GlobalSettingsDB } from '../api/tasks.js';


export default class LocalImage extends Component {

constructor(props) {
super(props);

this.state = {
link: '',

}


}

componentDidMount() {

Meteor.subscribe('GlobalSettingsDB', () => {

this.setImgLink()

})


}


setImgLink = () => {

var basePath = GlobalSettingsDB.find({}).fetch()[0].basePath;

if (basePath != undefined) {
var updatedLink = basePath + this.props.link
} else {
var updatedLink = this.props.link
}


this.setState({
link: updatedLink
})

console.log(updatedLink)

}

render() {

return <img src={this.state.link ? this.state.link : this.props.link} height={this.props.height ? this.props.height : null} width={this.props.width ? this.props.width : null} alt={this.props.alt ? this.props.alt : null}></img>
}
}


0 comments on commit d403448

Please sign in to comment.