diff --git a/Gruntfile.js b/Gruntfile.js
index 3498c6f..bd473e3 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -35,6 +35,17 @@ module.exports = function (grunt) {
},
},
+ copy: {
+ images: {
+ files: [{
+ expand: true,
+ cwd: 'assets/img/',
+ src: '**/*',
+ dest: 'public/img/'
+ }]
+ }
+ },
+
watch: {
css: {
files: ["assets/styles/**/*.scss"],
@@ -52,6 +63,14 @@ module.exports = function (grunt) {
spawn: false,
},
},
+ img: {
+ files: ["assets/img/**/*"],
+ tasks: ["copy:images"],
+ options: {
+ atBegin: true,
+ spawn: false,
+ }
+ },
},
});
@@ -59,7 +78,8 @@ module.exports = function (grunt) {
grunt.loadNpmTasks("grunt-contrib-watch");
grunt.loadNpmTasks("grunt-contrib-sass");
grunt.loadNpmTasks("grunt-contrib-uglify");
+ grunt.loadNpmTasks("grunt-contrib-copy");
// CLI tasks.
- grunt.registerTask("default", ["sass", "uglify"]);
+ grunt.registerTask("default", ["sass", "uglify", "copy:images"]);
};
diff --git a/assets/img/leviathan-favicon-nobg.png b/assets/img/leviathan-favicon-nobg.png
new file mode 100755
index 0000000..ec88899
Binary files /dev/null and b/assets/img/leviathan-favicon-nobg.png differ
diff --git a/assets/img/leviathan-logo-nobg.png b/assets/img/leviathan-logo-nobg.png
new file mode 100755
index 0000000..9368439
Binary files /dev/null and b/assets/img/leviathan-logo-nobg.png differ
diff --git a/assets/styles/eye-old.sass b/assets/styles/eye-old.sass
deleted file mode 100644
index ae3089b..0000000
--- a/assets/styles/eye-old.sass
+++ /dev/null
@@ -1,71 +0,0 @@
-html,
-body
- width: 100%
- height: 100%
- margin: 0
- padding: 0
-body
- height: auto
- min-height: 100%
- box-sizing: border-box
- padding-top: 80px
- padding-bottom: 80px
- background: #eee
-a
- color: teal
- transition: all 200ms ease-in-out
- &:hover
- color: #007070
-textarea
- max-width: 100%
- min-width: 100%
- height: 100px
-.container
- max-width: 1024px
-select[multiple]
- min-height: 125px
-#main-nav
- position: fixed
- top: 0
- left: 0
- width: 100%
- height: 64px
- background: teal
- color: white
- z-index: 20
- ul
- list-style: none
- display: inline-block
- li
- display: inline-block
- margin-left: 15px
- h4
- display: inline-block
- margin-left: 25px
- line-height: 64px
- a
- color: white
- font-size: 2.25rem
- line-height: 64px
- transition: all 200ms ease-in-out
- &:hover
- color: #eee
- font-size: 2.5rem
-#main-content
- padding: 14px 20px
- background: white
- border-radius: 8px
- z-index: 10
-#main-footer
- position: fixed
- bottom: 0
- left: 0
- width: 100%
- height: 64px
- p
- margin-bottom: 5px
- text-align: center
-#result_form
- margin-bottom: 0
- *
- margin-bottom: 0
diff --git a/assets/styles/eye.scss b/assets/styles/eye.scss
index 46c16c3..b49d70d 100644
--- a/assets/styles/eye.scss
+++ b/assets/styles/eye.scss
@@ -1,5 +1,28 @@
$primary-color: teal;
-body {
- background: white;
+html{
+ width: 100%;
+ height: 100%;
+}
+
+body{
+ background: #666;
+}
+
+table{
+ border: 1px solid #666;
+}
+
+#main-nav{
+ img{
+ max-height: 40px;
+ margin-right: 15px;
+ }
+}
+
+#main-content{
+ padding: 1.5rem 2rem;
+ background: white;
+ border: 1px solid #bbb;
+ border-radius: 12px;
}
diff --git a/package-lock.json b/package-lock.json
index 4dde274..1a42736 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,6 +18,7 @@
"devDependencies": {
"grunt": "^1.6.1",
"grunt-cli": "^1.5.0",
+ "grunt-contrib-copy": "^1.0.0",
"grunt-contrib-sass": "^2.0.0",
"grunt-contrib-uglify": "^5.2.2",
"grunt-contrib-watch": "^1.1.0",
@@ -1408,6 +1409,13 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
+ "node_modules/file-sync-cmp": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/file-sync-cmp/-/file-sync-cmp-0.1.1.tgz",
+ "integrity": "sha512-0k45oWBokCqh2MOexeYKpyqmGKG+8mQ2Wd8iawx+uWd/weWJQAZ6SoPybagdCI4xFisag8iAR77WPm4h3pTfxA==",
+ "dev": true,
+ "license": "MIT"
+ },
"node_modules/file-uri-to-path": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
@@ -1844,6 +1852,80 @@
"node": ">=10"
}
},
+ "node_modules/grunt-contrib-copy": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/grunt-contrib-copy/-/grunt-contrib-copy-1.0.0.tgz",
+ "integrity": "sha512-gFRFUB0ZbLcjKb67Magz1yOHGBkyU6uL29hiEW1tdQ9gQt72NuMKIy/kS6dsCbV0cZ0maNCb0s6y+uT1FKU7jA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "chalk": "^1.1.1",
+ "file-sync-cmp": "^0.1.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/grunt-contrib-copy/node_modules/ansi-regex": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+ "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/grunt-contrib-copy/node_modules/ansi-styles": {
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+ "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/grunt-contrib-copy/node_modules/chalk": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+ "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/grunt-contrib-copy/node_modules/strip-ansi": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+ "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "ansi-regex": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/grunt-contrib-copy/node_modules/supports-color": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+ "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=0.8.0"
+ }
+ },
"node_modules/grunt-contrib-sass": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/grunt-contrib-sass/-/grunt-contrib-sass-2.0.0.tgz",
@@ -2204,6 +2286,29 @@
"node": ">=6"
}
},
+ "node_modules/has-ansi": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+ "integrity": "sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "ansi-regex": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/has-ansi/node_modules/ansi-regex": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+ "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
"node_modules/has-flag": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
diff --git a/package.json b/package.json
index a4c1b19..c4ba1a1 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,7 @@
"devDependencies": {
"grunt": "^1.6.1",
"grunt-cli": "^1.5.0",
+ "grunt-contrib-copy": "^1.0.0",
"grunt-contrib-sass": "^2.0.0",
"grunt-contrib-uglify": "^5.2.2",
"grunt-contrib-watch": "^1.1.0",
diff --git a/public/img/leviathan-favicon-nobg.png b/public/img/leviathan-favicon-nobg.png
new file mode 100644
index 0000000..ec88899
Binary files /dev/null and b/public/img/leviathan-favicon-nobg.png differ
diff --git a/public/img/leviathan-logo-nobg.png b/public/img/leviathan-logo-nobg.png
new file mode 100644
index 0000000..9368439
Binary files /dev/null and b/public/img/leviathan-logo-nobg.png differ
diff --git a/views/benchmark/list.twig b/views/benchmark/list.twig
index d091428..fa8df8e 100644
--- a/views/benchmark/list.twig
+++ b/views/benchmark/list.twig
@@ -7,25 +7,27 @@
Benchmarks
Add a benchmark
-
-
-
- Benchmark name |
- Scoring type |
- Created at |
- Last updated |
-
-
-
- {% for b in benchmarks %}
+
+
+
- {{ b.name }} |
- {{ b.scoring }} |
- {{ b.createdAt | date('m/d/Y g:ia') }} |
- {{ b.updatedAt | date('m/d/Y g:ia') }} |
+ Benchmark name |
+ Scoring type |
+ Created at |
+ Last updated |
- {% endfor %}
-
-
+
+
+ {% for b in benchmarks %}
+
+ {{ b.name }} |
+ {{ b.scoring }} |
+ {{ b.createdAt | date('m/d/Y g:ia') }} |
+ {{ b.updatedAt | date('m/d/Y g:ia') }} |
+
+ {% endfor %}
+
+
+
{% endblock %}
diff --git a/views/hardware/list.twig b/views/hardware/list.twig
index 0b319aa..bb9c5a9 100644
--- a/views/hardware/list.twig
+++ b/views/hardware/list.twig
@@ -7,25 +7,27 @@
Hardware
Add new hardware
-
-
-
- Name |
- Type |
- Created at |
- Last updated |
-
-
-
- {% for h in hardware %}
+
+
+
- {{ h.name }} |
- {{ h.type }} |
- {{ p.createdAt | date('m/d/Y g:ia') }} |
- {{ p.updatedAt | date('m/d/Y g:ia') }} |
+ Name |
+ Type |
+ Created at |
+ Last updated |
- {% endfor %}
-
-
+
+
+ {% for h in hardware %}
+
+ {{ h.name }} |
+ {{ h.type }} |
+ {{ p.createdAt | date('m/d/Y g:ia') }} |
+ {{ p.updatedAt | date('m/d/Y g:ia') }} |
+
+ {% endfor %}
+
+
+
{% endblock %}
diff --git a/views/index/dashboard.twig b/views/index/dashboard.twig
index eab8818..fc68b73 100644
--- a/views/index/dashboard.twig
+++ b/views/index/dashboard.twig
@@ -5,23 +5,26 @@
{% block content %}
Recently updated tests:
-
-
-
- Title |
- Last updated |
- Created at |
-
-
-
- {% for t in tests %}
+
+
+
+
- {{ t.title }} |
- {{ t.updatedAt | date('m/d/Y g:ia') }} |
- {{ t.createdAt | date('m/d/Y g:ia') }} |
+ Title |
+ Last updated |
+ Created at |
- {% endfor %}
-
-
+
+
+ {% for t in tests %}
+
+ {{ t.title }} |
+ {{ t.updatedAt | date('m/d/Y g:ia') }} |
+ {{ t.createdAt | date('m/d/Y g:ia') }} |
+
+ {% endfor %}
+
+
+
{% endblock %}
diff --git a/views/layouts/default.twig b/views/layouts/default.twig
index 75e28d4..b60161b 100644
--- a/views/layouts/default.twig
+++ b/views/layouts/default.twig
@@ -4,6 +4,7 @@
+
{% block title %}{% endblock %} | Leviathan
@@ -12,12 +13,14 @@
{% block scripts %}{% endblock %}
-
+
{% include 'partials/navbar.twig' %}
-
- {% block content %}{% endblock %}
-
+
+
+ {% block content %}{% endblock %}
+
+
{% include 'partials/footer.twig' %}
diff --git a/views/partials/footer.twig b/views/partials/footer.twig
index 217b698..17abea6 100644
--- a/views/partials/footer.twig
+++ b/views/partials/footer.twig
@@ -1,4 +1,10 @@
-
+
diff --git a/views/partials/navbar.twig b/views/partials/navbar.twig
index 3cb962a..0bc17dc 100644
--- a/views/partials/navbar.twig
+++ b/views/partials/navbar.twig
@@ -1,6 +1,8 @@
-