Skip to content

Commit 01c55e1

Browse files
authored
Merge pull request #267 from HaveAGitGat/dev2
1.1093
2 parents 0db6b5c + 8dfbeec commit 01c55e1

File tree

10 files changed

+144
-47
lines changed

10 files changed

+144
-47
lines changed

.meteor/.finished-upgraders

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ notices-for-facebook-graph-api-2
1616
1.4.3-split-account-service-packages
1717
1.5-add-dynamic-import-package
1818
1.7-split-underscore-from-meteor-base
19+
1.8.3-split-jquery-from-blaze

.meteor/packages

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
# but you can also edit it by hand.
66

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

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

1818
[email protected] # Allow all DB writes from clients (for prototyping)
1919
static-html # Define static page content in .html files

.meteor/release

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
METEOR@1.8.1
1+
METEOR@1.10.2

.meteor/versions

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
22
3-
babel-compiler@7.3.4
4-
babel-runtime@1.3.0
3+
babel-compiler@7.5.3
4+
babel-runtime@1.5.0
55
66
77
8-
boilerplate-generator@1.6.0
9-
8+
boilerplate-generator@1.7.0
9+
1010
11-
callback-hook@1.1.0
11+
callback-hook@1.3.0
1212
1313
1414
1515
16-
16+
1717
1818
19-
20-
ecmascript@0.12.7
19+
20+
ecmascript@0.14.3
2121
22-
ecmascript-runtime-client@0.8.0
23-
ecmascript-runtime-server@0.7.1
24-
22+
ecmascript-runtime-client@0.10.0
23+
ecmascript-runtime-server@0.9.0
24+
2525
2626
2727
@@ -32,49 +32,49 @@ [email protected]
3232
3333
3434
35-
36-
launch-screen@1.1.1
35+
36+
launch-screen@1.2.0
3737
3838
3939
4040
4141
meteorhacks:[email protected]
42-
meteortesting:[email protected].3
43-
meteortesting:[email protected].0
44-
meteortesting:mocha-core@7.0.1
45-
minifier-css@1.4.2
46-
minifier-js@2.4.1
47-
minimongo@1.4.5
48-
mobile-experience@1.0.5
49-
mobile-status-bar@1.0.14
50-
51-
modules@0.13.0
52-
modules-runtime@0.10.3
53-
mongo@1.6.3
42+
meteortesting:[email protected].4
43+
meteortesting:[email protected].1
44+
meteortesting:mocha-core@8.0.1
45+
minifier-css@1.5.2
46+
minifier-js@2.6.0
47+
minimongo@1.6.0
48+
mobile-experience@1.1.0
49+
mobile-status-bar@1.1.0
50+
51+
modules@0.15.0
52+
modules-runtime@0.12.0
53+
mongo@1.10.0
5454
5555
5656
57-
npm-mongo@3.1.2
57+
npm-mongo@3.7.1
5858
5959
6060
6161
62-
random@1.1.0
62+
random@1.2.0
6363
6464
6565
6666
6767
68-
shell-server@0.4.0
69-
socket-stream-client@0.2.2
68+
shell-server@0.5.0
69+
socket-stream-client@0.3.1
7070
71-
standard-minifier-css@1.5.3
72-
standard-minifier-js@2.4.1
71+
standard-minifier-css@1.6.0
72+
standard-minifier-js@2.6.0
7373
7474
7575
7676
7777
78-
url@1.2.0
79-
webapp@1.7.4
78+
url@1.3.1
79+
webapp@1.9.1
8080

client/main.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ import {Meteor} from 'meteor/meteor';
22
import React from 'react';
33
import {render} from 'react-dom';
44

5+
import Notification from '../imports/ui/ANotification.jsx';
56
import App from '../imports/ui/App.jsx';
67

78
Meteor.startup(() => {
8-
render(<App />, document.getElementById('react-target'));
9+
render(<><Notification/><App /></>, document.getElementById('react-target'));
910
});

imports/ui/ANotification.jsx

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
import React from "react";
2+
import { Button } from "react-bootstrap";
3+
4+
export default class Notification extends React.Component {
5+
constructor(props) {
6+
super(props);
7+
this.state = {
8+
};
9+
}
10+
11+
12+
render() {
13+
return (
14+
<div className="log-out">
15+
<div className="log-out2">
16+
<Button
17+
variant="outline-light"
18+
onClick={() => {
19+
window.open('https://www.reddit.com/r/Tdarr/comments/i63ou3/tdarr_pro_containers_for_patreon_supporters/', "_blank")
20+
}
21+
}
22+
>
23+
Get Tdarr Pro
24+
</Button>
25+
</div>
26+
</div>
27+
)
28+
}
29+
}
30+

imports/ui/App.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ const tabs = [
3939
export default AppRouter = () => {
4040
const [basePath, setBasePath] = React.useState("");
4141
const [currentVersion, setVersion] = React.useState("");
42-
const [newVersion, setNewVersion] = React.useState(1.1092);
42+
const [newVersion, setNewVersion] = React.useState(1.1093);
4343
const [showUpdateScreen, setShowUpdateScreen] = React.useState(false);
4444

4545
toggleConsole = () => {

imports/ui/styles/main.scss

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1552,3 +1552,23 @@ table.streamsTable tr {
15521552
background-color: #373737;
15531553

15541554
}
1555+
1556+
.log-out{
1557+
position:relative;
1558+
right:20em;
1559+
top:1.2em;
1560+
z-index: 999;
1561+
float:right;
1562+
width:0;
1563+
}
1564+
1565+
.log-out2{
1566+
1567+
width:10em;
1568+
}
1569+
1570+
.release-notes-latest p{
1571+
margin:0;
1572+
color:#9cffff;
1573+
}
1574+

imports/ui/tab_Dev.jsx

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,16 @@ export default class App extends Component {
8989
<p></p>
9090
<p>Change log</p>
9191
<LatestDevNotes />
92+
93+
<p>
94+
<br />
95+
<br />
96+
Beta v1.1092 release [25th May 2020]:
97+
<br />
98+
<br />
99+
Small fix for local plugin creator (plugins not saving)
100+
</p>
101+
92102
<p>
93103
Beta v1.1091 release [24th May 2020]:
94104
<br />

imports/ui/tab_Dev_latest.jsx

Lines changed: 40 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,49 @@ export default class App extends Component {
77
super(props);
88
}
99

10+
patreon = () => {
11+
12+
let patrons = [
13+
'Jeffrey',
14+
'Chris',
15+
'Jegler',
16+
'Lordbob75',
17+
'Vodka',
18+
'Ryan',
19+
'Slemons',
20+
'Stéphane',
21+
'Victor',
22+
'Peter',
23+
'Blackdixxa',
24+
'Zach',
25+
'Bryan',
26+
'Steven',
27+
'Simon',
28+
'binary',
29+
'Henrik',
30+
'Michael',
31+
'George'
32+
]
33+
34+
35+
patrons = patrons.map(row => row + ', ')
36+
37+
return <p>{patrons}</p>
38+
39+
40+
}
41+
1042
render() {
1143
return (
12-
<div>
44+
<div className='release-notes-latest'>
45+
<p>Special thanks to those supporting on Patreon: </p>{this.patreon()}
46+
<br />
47+
<br />
1348
<p>
14-
Beta v1.1092 release [25th May 2020]:
15-
<br />
16-
<br />
17-
Small fix for local plugin creator (plugins not saving)
49+
Beta v1.1093 release [8th August 2020]:
50+
<br />Health check option with nvdec
51+
<br />Some UI changes (Logout button, release notes, plugins, workers)
52+
<br />Tdarr pro notifier
1853
</p>
1954
</div>
2055
);

0 commit comments

Comments
 (0)