From 287bceb63adc162407556093ee143a767e2dd270 Mon Sep 17 00:00:00 2001 From: Eric Wheeler Date: Sun, 3 Jul 2016 22:17:58 -0700 Subject: [PATCH] Template/fixed --- .idea/resume.iml | 2 - .idea/workspace.xml | 584 +++++++++++++--------------- Gruntfile.js | 18 +- app/config/config.yml | 4 +- app/views/base.html.twig | 1 - app/views/resume.html.twig | 66 ++++ app/views/uikit.html.twig | 34 ++ bower.json | 3 +- composer.lock | 2 +- package.json | 2 + src/Sikofitt/Config/ConfigTrait.php | 3 + src/Sikofitt/less/resume.less | 8 +- web/index.php | 10 +- 13 files changed, 402 insertions(+), 335 deletions(-) delete mode 100644 app/views/base.html.twig create mode 100644 app/views/uikit.html.twig diff --git a/.idea/resume.iml b/.idea/resume.iml index 3bb906b..a2129e1 100644 --- a/.idea/resume.iml +++ b/.idea/resume.iml @@ -43,11 +43,9 @@ - - diff --git a/.idea/workspace.xml b/.idea/workspace.xml index e0d660d..2e9c41a 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,88 +2,18 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + + + + + + @@ -96,6 +26,7 @@ + @@ -108,11 +39,19 @@ - - - - - + + + + + + + + + + + + + @@ -120,10 +59,10 @@ - + - + @@ -141,36 +80,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + @@ -178,6 +92,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -192,19 +136,24 @@ @@ -216,10 +165,10 @@ - @@ -246,7 +195,7 @@ - + @@ -265,20 +214,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -391,9 +282,45 @@ - + @@ -404,6 +331,22 @@ + + - - + - - - - - - - - - - + + + + + + + + + + @@ -549,108 +493,69 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -659,10 +564,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -675,52 +634,41 @@ - - - - - + + + - + - - - - - + + + - + - - - - - + + + - + - - - - - - + + + - + - - - - - + + + diff --git a/Gruntfile.js b/Gruntfile.js index 670d092..a4ebf64 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -2,7 +2,7 @@ module.exports = function (grunt) { grunt.initConfig({ bower: { - dist: { + js: { dest: 'web/js/vendor', options: { checkExistence: false, @@ -15,6 +15,20 @@ module.exports = function (grunt) { } } }, + copy: { + dist: { + files: [ + { + expand: true, + cwd: 'vendor/bower/uikit/fonts', + src: ['*'], + dest: 'web/fonts', + filter: 'isFile' + } + + ] + } + }, less: { build: { options: { @@ -39,7 +53,7 @@ module.exports = function (grunt) { grunt.loadNpmTasks('grunt-contrib-less'); grunt.loadNpmTasks('main-bower-files'); grunt.loadNpmTasks('grunt-phpunit'); - + grunt.loadNpmTasks('grunt-contrib-copy'); grunt.registerTask('dist', ['bower', 'less']); grunt.registerTask('default', 'dist'); diff --git a/app/config/config.yml b/app/config/config.yml index 2807e66..af15a37 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -1,7 +1,9 @@ app: debug: true environment: dev - resume_title: My Resume + title: R. Eric Wheeler twig: paths: - views + template: uikit.html.twig + diff --git a/app/views/base.html.twig b/app/views/base.html.twig deleted file mode 100644 index 4d3816f..0000000 --- a/app/views/base.html.twig +++ /dev/null @@ -1 +0,0 @@ -{{ 'Hello!' }} \ No newline at end of file diff --git a/app/views/resume.html.twig b/app/views/resume.html.twig index e69de29..af1d04e 100644 --- a/app/views/resume.html.twig +++ b/app/views/resume.html.twig @@ -0,0 +1,66 @@ +{% extends app.config.twig.template %} +{% block title %} + {{ app.config.app.title | default('Resume') }} + {% endblock %} +{% block body %} +
+
+

{{ app.config.app.title|default('Resume') }}

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut.

+
+
+ +
+
+ +

Get Started

+ +

Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim.

+ + +
+
+ +
+ +

Testing This Title

+
+ +
+
+ + +
+
+ +
+{% endblock %} \ No newline at end of file diff --git a/app/views/uikit.html.twig b/app/views/uikit.html.twig new file mode 100644 index 0000000..2543cd2 --- /dev/null +++ b/app/views/uikit.html.twig @@ -0,0 +1,34 @@ + + + + + + + + {% block meta %}{% endblock %} + {% block title %}Resume{% endblock %} + {% block shortcut_icon %} + + {% endblock %} + {% block apple_meta %} + + {% endblock %} + + {% block stylesheets %}{% endblock %} + {% block inline_styles %}{% endblock %} + + + + {% block javascripts %}{% endblock %} + {% block inline_js %}{% endblock %} + + + + +
+{% block body %} +{% endblock %} +
+ + + \ No newline at end of file diff --git a/bower.json b/bower.json index 0ef215f..1177b88 100644 --- a/bower.json +++ b/bower.json @@ -30,7 +30,8 @@ "**/smooth-scroll.min.js", "**/scrollspy.min.js", "**/parallax.min.js", - "**/offcanvas.min.js" + "**/offcanvas.min.js", + "**/sticky.min.js" ] }, "jquery": { diff --git a/composer.lock b/composer.lock index 888396e..23e4ef3 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "bff507b41d23db26ac64f22c144abe58", + "hash": "32d114eedd6f34d0a8de316e291f4a69", "content-hash": "fca3e43ff787d71afd6f495624a8bf9c", "packages": [ { diff --git a/package.json b/package.json index 29125c3..e1e1787 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,8 @@ "homepage": "https://code.reric.me", "devDependencies": { "grunt": "^1.0.1", + "grunt-contrib-clean": "^1.0.0", + "grunt-contrib-copy": "^1.0.0", "grunt-contrib-less": "^1.3.0", "grunt-contrib-watch": "^1.0.0", "grunt-phpunit": "^0.3.6", diff --git a/src/Sikofitt/Config/ConfigTrait.php b/src/Sikofitt/Config/ConfigTrait.php index 1b7b48d..4675d19 100644 --- a/src/Sikofitt/Config/ConfigTrait.php +++ b/src/Sikofitt/Config/ConfigTrait.php @@ -13,6 +13,9 @@ trait ConfigTrait * @return mixed */ public function config($name, $value = null) { + if(strcasecmp($name, 'all') === 0) { + return $this['config']->all(); + } if(null === $value) { return $this['config']->get ($name); } else { diff --git a/src/Sikofitt/less/resume.less b/src/Sikofitt/less/resume.less index 6851c36..b3d3f01 100644 --- a/src/Sikofitt/less/resume.less +++ b/src/Sikofitt/less/resume.less @@ -1 +1,7 @@ -@import 'uikit.less'; \ No newline at end of file +@import 'uikit.less'; +@import 'https://fonts.googleapis.com/css?family=Lato:300|Oswald:300'; + +@base-body-font-family : 'Lato'; +@base-body-font-size : 26px; +@base-heading-font-family : 'Oswald'; +@base-body-line-height : 1.2em; \ No newline at end of file diff --git a/web/index.php b/web/index.php index e4c78b4..7217599 100644 --- a/web/index.php +++ b/web/index.php @@ -43,15 +43,9 @@ $app['json.validator'] = function ($app) { }; $app->get ('/', function () use ($app) { - $jsonErrors = []; - $resume = new ResumeBuilder($app); - $json = $resume->toJson(['array' => 'neat'], ['app' => $app, 'file' => 'resume.json']); - //$app['config']->set ('app.name', 'Groovey'); - $decoded = []; - $app->config('app.value', 'myvalue'); - dump($app->config('app')); - return $app['twig']->render ('base.html.twig', ['resume' => $decoded, 'errors' => $jsonErrors]); + + return $app['twig']->render('resume.html.twig'); }); $app->run ();