Skip to content

Commit

Permalink
Test CI
Browse files Browse the repository at this point in the history
  • Loading branch information
davidMcneil committed Jan 20, 2019
1 parent 3613b35 commit 9a64923
Show file tree
Hide file tree
Showing 15 changed files with 2,392 additions and 1,053 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ matrix:
# - env: TARGET=x86_64-unknown-netbsd DISABLE_TESTS=1

# Windows
- env: TARGET=x86_64-pc-windows-gnu
# - env: TARGET=x86_64-pc-windows-gnu

# Bare metal
# These targets don't support std and as such are likely not suitable for
Expand Down
93 changes: 0 additions & 93 deletions appveyor.yml

This file was deleted.

10 changes: 5 additions & 5 deletions clients/rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ edition = "2018"

[dependencies]
chrono = {version = "0.4.6",features = ["serde"]}
reqwest = "0.9.5"
serde = "1.0.82"
serde_derive = "1.0.82"
serde_json = "1.0.33"
reqwest = "0.9.8"
serde = "1.0.85"
serde_derive = "1.0.85"
serde_json = "1.0.36"
url = "1.7.2"
uuid = {version = "0.7.1",features = ["serde","v4"]}

[dev-dependencies]
rand = "0.6.1"
rand = "0.6.4"
16 changes: 8 additions & 8 deletions service/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,21 @@ edition = "2018"

[dependencies]
actix = "0.7.9"
actix-web = "0.7.16"
actix-web = "0.7.18"
chrono = {version = "0.4.6",features = ["serde"]}
env_logger = "0.6.0"
futures = "0.1.25"
include_dir = "0.2.1"
log = "0.4.6"
mime_guess = "2.0.0-alpha.6"
open = "1.2.2"
parking_lot = "0.7.0"
psutil = "1.1.1"
rand = "0.6.1"
reqwest = "0.9.5"
serde = "1.0.82"
serde_derive = "1.0.82"
serde_json = "1.0.33"
parking_lot = "0.7.1"
psutil = "1.2.0"
rand = "0.6.4"
reqwest = "0.9.8"
serde = "1.0.85"
serde_derive = "1.0.85"
serde_json = "1.0.36"
structopt = "0.2.14"
uuid = {version = "0.7.1",features = ["serde","v4"]}

Expand Down
3 changes: 0 additions & 3 deletions service/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
use actix;
use chrono::Duration;
use env_logger::fmt::WriteStyle;
use env_logger::Builder;
use log::LevelFilter;
use log::{error, info};
use open;
use serde_derive;
use serde_json;
use structopt;
use structopt::StructOpt;

Expand Down
2 changes: 1 addition & 1 deletion web/dist/index.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html> <head> <meta charset="utf-8"> <meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta name="viewport" content="width=device-width, initial-scale=1"> <title>Courier</title> <link rel="stylesheet" href="/ui/src.94679763.css"></head> <body class="has-navbar-fixed-top has-sticky-footer"> <main id="root" class="has-sticky-footer-content"></main> <footer class="footer"> <div class="container"> <div class="content has-text-centered"> <p> <strong>Courier v1.0.0</strong> by <a href="mailto:[email protected]">David McNeil</a> </p> </div> </div> </footer> <script src="/ui/src.f815d08f.js"></script> </body> </html>
<!DOCTYPE html><html> <head> <meta charset="utf-8"> <meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta name="viewport" content="width=device-width, initial-scale=1"> <title>Courier</title> <link rel="stylesheet" href="/ui/src.2e69cdc9.css"></head> <body class="has-navbar-fixed-top has-sticky-footer"> <main id="root" class="has-sticky-footer-content"></main> <footer class="footer"> <div class="container"> <div class="content has-text-centered"> <p> <strong>Courier v1.0.0</strong> by <a href="mailto:[email protected]">David McNeil</a> </p> </div> </div> </footer> <script src="/ui/src.dde5a996.js"></script> </body> </html>
3 changes: 3 additions & 0 deletions web/dist/src.2e69cdc9.css

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions web/dist/src.94679763.css

This file was deleted.

84 changes: 84 additions & 0 deletions web/dist/src.dde5a996.js

Large diffs are not rendered by default.

84 changes: 0 additions & 84 deletions web/dist/src.f815d08f.js

This file was deleted.

32 changes: 15 additions & 17 deletions web/index.html
Original file line number Diff line number Diff line change
@@ -1,28 +1,26 @@
<!DOCTYPE html>
<html>

<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<head>
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title>Courier</title>
</head>
</head>

<body class="has-navbar-fixed-top has-sticky-footer">
<body class="has-navbar-fixed-top has-sticky-footer">
<main id="root" class="has-sticky-footer-content"></main>

<footer class="footer">
<div class="container">
<div class="content has-text-centered">
<p>
<strong>Courier v1.0.0</strong> by
<a href="mailto:[email protected]">David McNeil</a>
</p>
</div>
<div class="container">
<div class="content has-text-centered">
<p>
<strong>Courier v1.0.0</strong> by
<a href="mailto:[email protected]">David McNeil</a>
</p>
</div>
</div>
</footer>

<script src="./src/index.tsx"></script>
</body>

</html>
</body>
</html>
22 changes: 12 additions & 10 deletions web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,23 @@
"size": "du -sh dist/* && du -sh dist/"
},
"dependencies": {
"bulma": "^0.7.1",
"bulma": "^0.7.2",
"classnames": "^2.2.6",
"history": "^4.7.2",
"hoist-non-inferno-statics": "^1.1.3",
"inferno": "^5",
"inferno-router": "^5.6.1",
"inferno-shared": "^5",
"inferno": "^7.0.5",
"inferno-router": "^7.0.5",
"inferno-shared": "^7.0.5",
"path-to-regexp-es6": "1.7.0"
},
"devDependencies": {
"@types/classnames": "^2.2.6",
"babel-plugin-inferno": "^5.1.0",
"node-sass": "^4.9.3",
"parcel-bundler": "^1.9.7",
"tslint": "^5.11.0",
"typescript": "^3.0.1"
"@babel/core": "^7.2.2",
"@types/classnames": "^2.2.7",
"babel-plugin-inferno": "^6.0.4",
"babel-preset-env": "^1.7.0",
"node-sass": "^4.11.0",
"parcel-bundler": "^1.11.0",
"tslint": "^5.12.0",
"typescript": "^3.2.4"
}
}
2 changes: 1 addition & 1 deletion web/src/components/top_navbar.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import classNames from "classnames";

import { Link, withRouter } from "inferno-router";
import { RouteComponentProps } from "inferno-router/Route";
import { RouteComponentProps } from "inferno-router/dist/Route";
import { ICON, numberAsTimeStr, str2number } from "../utils/util";

interface Props {
Expand Down
2 changes: 1 addition & 1 deletion web/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ class App extends Component<{}, State> {
const courierState = newCourierState();
return {
courierState,
previousCourierState: newCourierState,
previousCourierState: newCourierState(),
};
}, helper);
const message = fetchError2message(error);
Expand Down
Loading

0 comments on commit 9a64923

Please sign in to comment.