diff --git a/.gitignore b/.gitignore index 40d7076c..f585f589 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ *.o *.a *.aux +.*.swp .DS_Store ._.DS_Store _build/ diff --git a/src/collects/seashell/backend/project.rkt b/src/collects/seashell/backend/project.rkt index 1a258fb9..3dc6fdf8 100644 --- a/src/collects/seashell/backend/project.rkt +++ b/src/collects/seashell/backend/project.rkt @@ -421,7 +421,7 @@ ;; ;; Args: ;; target - path of directory to export everything under -(: export-all (-> String Void)) +(: export-all (-> Path-String Void)) (define (export-all target) (unless (directory-exists? target) (make-directory target)) diff --git a/src/collects/seashell/backend/server.rkt b/src/collects/seashell/backend/server.rkt index b53a6f01..25392c72 100644 --- a/src/collects/seashell/backend/server.rkt +++ b/src/collects/seashell/backend/server.rkt @@ -177,11 +177,13 @@ (define (garbage-collection-loop) (define hour (* 60 60)) + (logf 'info "Compacting database.") (seashell-collect-garbage) - (sleep hour) + (logf 'info "Database compaction completed.") (logf 'info "Exporting all projects.") (export-all (read-config 'export-path)) (logf 'info "Export of all projects completed.") + (sleep hour) (garbage-collection-loop)) ;; make-udp-ping-listener our-port -> (values integer? custodian?) diff --git a/src/frontend/package.json b/src/frontend/package.json index 8c2d56a2..6e3a31c6 100644 --- a/src/frontend/package.json +++ b/src/frontend/package.json @@ -24,9 +24,9 @@ "dexie-syncable": "https://www.student.cs.uwaterloo.ca/~cs136/Dexie-Syncable-1.0.0-beta3.patched.tar.gz", "file-saver": "^1.3.3", "js-cookie": "^2.1.3", - "moment": "^2.18.1", "jszip": "^3.1.3", "md5": "^2.2.1", + "moment": "^2.18.1", "monaco-editor": "~0.10.0", "mousetrap": "^1.6.0", "node-webcrypto-ossl": "^1.0.20", @@ -48,6 +48,7 @@ "redux-socket.io": "^1.3.1", "redux-thunk": "^2.1.0", "seashell-clang-js": "https://bintray.com/cs136/seashell-clang-js/download_file?file_path=seashell-clang-js-B43.tar.gz", + "typeface-overpass": "0.0.35", "webcrypto-shim": "^0.1.1", "ws": "^2.2.1", "xterm": "^2.3.2" diff --git a/src/frontend/src/index.html b/src/frontend/src/index.html index 50f8b1de..224b7c5b 100644 --- a/src/frontend/src/index.html +++ b/src/frontend/src/index.html @@ -7,12 +7,11 @@ Seashell - - +
- + diff --git a/src/frontend/src/index.tsx b/src/frontend/src/index.tsx index 24983745..b9ecb4c2 100755 --- a/src/frontend/src/index.tsx +++ b/src/frontend/src/index.tsx @@ -16,7 +16,8 @@ import {getDispatch} from "./actions"; import {DebugLogs} from "./helpers/DebugLogs"; import {composeWithDevTools} from "redux-devtools-extension"; import * as Raven from "raven-js"; -require("imports-loader?this=>window!webcrypto-shim"); // inject webcrypto polyfill into window scope +require("typeface-overpass"); +require("imports-loader?this=>window!webcrypto-shim"); // Inject webcrypto polyfill into window scope DebugLogs.enable(); console.log(`Seashell ${VERSION} starting up in ${DEBUG ? "debug" : "release"} mode for ${DOMAIN}.`); diff --git a/src/frontend/src/views/Project/Files/Actions.tsx b/src/frontend/src/views/Project/Files/Actions.tsx index 5c8f8dc2..c954196b 100644 --- a/src/frontend/src/views/Project/Files/Actions.tsx +++ b/src/frontend/src/views/Project/Files/Actions.tsx @@ -57,7 +57,7 @@ class Actions extends React.Component + {this.versions.map((cnts: S.Contents) => ( { this.props.dispatch.file.revertFile( diff --git a/src/frontend/src/views/Project/Project.scss b/src/frontend/src/views/Project/Project.scss index eeb2b936..d540434f 100644 --- a/src/frontend/src/views/Project/Project.scss +++ b/src/frontend/src/views/Project/Project.scss @@ -249,3 +249,9 @@ from {transform:rotate(0deg);} to {transform:rotate(360deg);} } + +.scrollableSubmenu~* ul { + max-height: 40em; + overflow: auto; + overflow-x: hidden; +} diff --git a/src/frontend/src/views/SignIn.tsx b/src/frontend/src/views/SignIn.tsx index 63cb9bb3..537fe496 100644 --- a/src/frontend/src/views/SignIn.tsx +++ b/src/frontend/src/views/SignIn.tsx @@ -27,7 +27,10 @@ class SignIn extends React.Component render() { const projects = this.props.appState.projects; return (
-
Sign in to Seashell
+ +
Sign in to Seashell with your student.cs credentials using the + latest Google Chrome or Firefox. +