Skip to content

Commit

Permalink
Merge pull request #267 from HaveAGitGat/dev2
Browse files Browse the repository at this point in the history
1.1093
  • Loading branch information
HaveAGitGat authored Aug 8, 2020
2 parents 0db6b5c + 8dfbeec commit 01c55e1
Show file tree
Hide file tree
Showing 10 changed files with 144 additions and 47 deletions.
1 change: 1 addition & 0 deletions .meteor/.finished-upgraders
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ notices-for-facebook-graph-api-2
1.4.3-split-account-service-packages
1.5-add-dynamic-import-package
1.7-split-underscore-from-meteor-base
1.8.3-split-jquery-from-blaze
12 changes: 6 additions & 6 deletions .meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
# but you can also edit it by hand.

[email protected] # Packages every Meteor app needs to have
mobile-experience@1.0.5 # Packages for a great mobile UX
mongo@1.6.2 # The database Meteor supports right now
mobile-experience@1.1.0 # Packages for a great mobile UX
mongo@1.10.0 # The database Meteor supports right now
[email protected] # Reactive variable for tracker

standard-minifier-css@1.5.3 # CSS minifier run for production mode
standard-minifier-js@2.4.1 # JS minifier run for production mode
standard-minifier-css@1.6.0 # CSS minifier run for production mode
standard-minifier-js@2.6.0 # JS minifier run for production mode
[email protected] # ECMAScript 5 compatibility for older browsers
ecmascript@0.12.4 # Enable ECMAScript2015+ syntax in app code
shell-server@0.4.0 # Server-side component of the `meteor shell` command
ecmascript@0.14.3 # Enable ECMAScript2015+ syntax in app code
shell-server@0.5.0 # Server-side component of the `meteor shell` command

[email protected] # Allow all DB writes from clients (for prototyping)
static-html # Define static page content in .html files
Expand Down
2 changes: 1 addition & 1 deletion .meteor/release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
METEOR@1.8.1
METEOR@1.10.2
66 changes: 33 additions & 33 deletions .meteor/versions
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
[email protected]
[email protected]
babel-compiler@7.3.4
babel-runtime@1.3.0
babel-compiler@7.5.3
babel-runtime@1.5.0
[email protected]
[email protected]
[email protected]
boilerplate-generator@1.6.0
[email protected].1
boilerplate-generator@1.7.0
[email protected].2
[email protected]
callback-hook@1.1.0
callback-hook@1.3.0
[email protected]
[email protected]
[email protected]
[email protected]
[email protected].0
[email protected].2
[email protected]
[email protected]
[email protected].1
ecmascript@0.12.7
[email protected].2
ecmascript@0.14.3
[email protected]
ecmascript-runtime-client@0.8.0
ecmascript-runtime-server@0.7.1
[email protected].0
ecmascript-runtime-client@0.10.0
ecmascript-runtime-server@0.9.0
[email protected].1
[email protected]
[email protected]
fourseven:[email protected]
Expand All @@ -32,49 +32,49 @@ [email protected]
[email protected]
[email protected]
[email protected]
[email protected].0
launch-screen@1.1.1
[email protected].1
launch-screen@1.2.0
[email protected]
[email protected]
[email protected]
[email protected]
meteorhacks:[email protected]
meteortesting:[email protected].3
meteortesting:[email protected].0
meteortesting:mocha-core@7.0.1
minifier-css@1.4.2
minifier-js@2.4.1
minimongo@1.4.5
mobile-experience@1.0.5
mobile-status-bar@1.0.14
[email protected].4
modules@0.13.0
modules-runtime@0.10.3
mongo@1.6.3
meteortesting:[email protected].4
meteortesting:[email protected].1
meteortesting:mocha-core@8.0.1
minifier-css@1.5.2
minifier-js@2.6.0
minimongo@1.6.0
mobile-experience@1.1.0
mobile-status-bar@1.1.0
[email protected].5
modules@0.15.0
modules-runtime@0.12.0
mongo@1.10.0
[email protected]
[email protected]
[email protected]
npm-mongo@3.1.2
npm-mongo@3.7.1
omega:[email protected]
omega:[email protected]
[email protected]
[email protected]
random@1.1.0
random@1.2.0
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
shell-server@0.4.0
socket-stream-client@0.2.2
shell-server@0.5.0
socket-stream-client@0.3.1
[email protected]
standard-minifier-css@1.5.3
standard-minifier-js@2.4.1
standard-minifier-css@1.6.0
standard-minifier-js@2.6.0
[email protected]
[email protected]
tmeasday:[email protected]
[email protected]
[email protected]
url@1.2.0
webapp@1.7.4
url@1.3.1
webapp@1.9.1
[email protected]
3 changes: 2 additions & 1 deletion client/main.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ import {Meteor} from 'meteor/meteor';
import React from 'react';
import {render} from 'react-dom';

import Notification from '../imports/ui/ANotification.jsx';
import App from '../imports/ui/App.jsx';

Meteor.startup(() => {
render(<App />, document.getElementById('react-target'));
render(<><Notification/><App /></>, document.getElementById('react-target'));
});
30 changes: 30 additions & 0 deletions imports/ui/ANotification.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import React from "react";
import { Button } from "react-bootstrap";

export default class Notification extends React.Component {
constructor(props) {
super(props);
this.state = {
};
}


render() {
return (
<div className="log-out">
<div className="log-out2">
<Button
variant="outline-light"
onClick={() => {
window.open('https://www.reddit.com/r/Tdarr/comments/i63ou3/tdarr_pro_containers_for_patreon_supporters/', "_blank")
}
}
>
Get Tdarr Pro
</Button>
</div>
</div>
)
}
}

2 changes: 1 addition & 1 deletion imports/ui/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const tabs = [
export default AppRouter = () => {
const [basePath, setBasePath] = React.useState("");
const [currentVersion, setVersion] = React.useState("");
const [newVersion, setNewVersion] = React.useState(1.1092);
const [newVersion, setNewVersion] = React.useState(1.1093);
const [showUpdateScreen, setShowUpdateScreen] = React.useState(false);

toggleConsole = () => {
Expand Down
20 changes: 20 additions & 0 deletions imports/ui/styles/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -1552,3 +1552,23 @@ table.streamsTable tr {
background-color: #373737;

}

.log-out{
position:relative;
right:20em;
top:1.2em;
z-index: 999;
float:right;
width:0;
}

.log-out2{

width:10em;
}

.release-notes-latest p{
margin:0;
color:#9cffff;
}

10 changes: 10 additions & 0 deletions imports/ui/tab_Dev.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,16 @@ export default class App extends Component {
<p></p>
<p>Change log</p>
<LatestDevNotes />

<p>
<br />
<br />
Beta v1.1092 release [25th May 2020]:
<br />
<br />
Small fix for local plugin creator (plugins not saving)
</p>

<p>
Beta v1.1091 release [24th May 2020]:
<br />
Expand Down
45 changes: 40 additions & 5 deletions imports/ui/tab_Dev_latest.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,49 @@ export default class App extends Component {
super(props);
}

patreon = () => {

let patrons = [
'Jeffrey',
'Chris',
'Jegler',
'Lordbob75',
'Vodka',
'Ryan',
'Slemons',
'Stéphane',
'Victor',
'Peter',
'Blackdixxa',
'Zach',
'Bryan',
'Steven',
'Simon',
'binary',
'Henrik',
'Michael',
'George'
]


patrons = patrons.map(row => row + ', ')

return <p>{patrons}</p>


}

render() {
return (
<div>
<div className='release-notes-latest'>
<p>Special thanks to those supporting on Patreon: </p>{this.patreon()}
<br />
<br />
<p>
Beta v1.1092 release [25th May 2020]:
<br />
<br />
Small fix for local plugin creator (plugins not saving)
Beta v1.1093 release [8th August 2020]:
<br />Health check option with nvdec
<br />Some UI changes (Logout button, release notes, plugins, workers)
<br />Tdarr pro notifier
</p>
</div>
);
Expand Down

0 comments on commit 01c55e1

Please sign in to comment.