diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 154fc5c..3626e2f 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,10 +2,11 @@ - - + + + @@ -30,20 +31,28 @@ - - - - - + + + - + + + + + + + + + + + - - + + @@ -52,8 +61,8 @@ - - + + @@ -64,7 +73,10 @@ - + + + + @@ -73,8 +85,26 @@ - - + + + + + + + + + + + + + + + + + + + + @@ -84,7 +114,9 @@ - + + + @@ -92,9 +124,11 @@ - - - + + + + + @@ -102,8 +136,8 @@ - - + + @@ -145,12 +179,13 @@ @@ -165,8 +200,8 @@ - @@ -254,6 +289,20 @@ - - + - + @@ -497,12 +547,107 @@ + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -523,7 +668,10 @@ - + + + + @@ -531,7 +679,25 @@ - + + + + + + + + + + + + + + + + + + + @@ -539,7 +705,9 @@ - + + + @@ -547,7 +715,9 @@ - + + + @@ -571,9 +741,7 @@ - - - + @@ -581,7 +749,10 @@ - + + + + @@ -589,7 +760,25 @@ - + + + + + + + + + + + + + + + + + + + @@ -604,9 +793,7 @@ - - - + @@ -652,7 +839,9 @@ - + + + @@ -673,33 +862,33 @@ - - - - - - - - - + - + + + + + + + + + + + + + + + + + - - - - - - - - - - + + @@ -712,26 +901,55 @@ - - - - - - - - + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/views/uikit.html.twig b/app/views/uikit.html.twig index 2543cd2..0d175df 100644 --- a/app/views/uikit.html.twig +++ b/app/views/uikit.html.twig @@ -1,4 +1,3 @@ - @@ -8,10 +7,10 @@ {% block meta %}{% endblock %} {% block title %}Resume{% endblock %} {% block shortcut_icon %} - + {% endblock %} {% block apple_meta %} - + {% endblock %} {% block stylesheets %}{% endblock %} @@ -19,16 +18,17 @@ - {% block javascripts %}{% endblock %} - {% block inline_js %}{% endblock %} + {% block javascripts_head %}{% endblock %} + {% block inline_js_head %}{% endblock %} -
-{% block body %} -{% endblock %} +
+ {% block body %} + {% endblock %}
- +{% block javascripts_foot %}{% endblock %} +{% block inline_js_foot %}{% endblock %} \ No newline at end of file diff --git a/composer.lock b/composer.lock index 23478f8..4cd9c73 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": "d47e1d8d6470d4d29deb55649ecc969b", + "hash": "2e202af761710c5e2279e9f5b83a5192", "content-hash": "3c41da3f56c72d6c1bc86d0a1889d6d9", "packages": [ { diff --git a/data/resume.json b/data/resume.json index 23d7f63..abe5d0e 100644 --- a/data/resume.json +++ b/data/resume.json @@ -45,7 +45,7 @@ "startDate": "2007-05-27", "summary": "I have done many different things during my employment at Stanford University.
A few of things things have been : Desktop Support, Computer cluster administration for the NSF and NNIN using Scyld Clusterware, General programing/debugging and frontend as well as backend web development using a number of different technologies.", "highlights": [ - "Upgraded and Maintained a 64 node research computing cluster for the NNIN funded by the NSF.", + "Repaired and Maintained a 64 node research computing cluster for the NNIN funded by the NSF.", "Converted Electrical Engineering's static web site to Drupal 7.", "Created many Drupal 7 modules for the EE website including a custom events, lecture and committe minutes content type, a CDN module for uploading and recieving images/videos/documents, an Orglist module for displaying Faculty, Students, and Staff from a custom API.", "Created a custom Drupal 7 site for the SystemX organization with integrated login for affiliates as well as Stanford staff." diff --git a/web/index.php b/web/index.php index 001497d..4301a9c 100644 --- a/web/index.php +++ b/web/index.php @@ -15,13 +15,13 @@ define('SCHEMA_URL', 'https://raw.githubusercontent.com/jsonresume/resume-schema $app = new App(); $app['debug'] = true; $app->register(new Sikofitt\Config\ConfigServiceProvider(), [ - 'config.path' => $app->getConfDirectory(), + 'config.path' => $app->getConfDirectory(), ]); $app->register(new TwigServiceProvider(), [ - 'twig.path' => [ - APP_ROOT . 'app/views', - APP_ROOT . 'vendor/symfony/web-profiler-bundle/Resources/views/Profiler' - ], + 'twig.path' => [ + APP_ROOT . 'app/views', + APP_ROOT . 'vendor/symfony/web-profiler-bundle/Resources/views/Profiler' + ], ]); $app->register(new WhoopsServiceProvider()); @@ -35,72 +35,72 @@ $app->register(new \Silex\Provider\HttpFragmentServiceProvider()); $app->register(new \Silex\Provider\ServiceControllerServiceProvider()); $app->register(new \Silex\Provider\RoutingServiceProvider()); $app->register(new \Silex\Provider\VarDumperServiceProvider(), array( - 'var_dumper.dump_destination' => new \Symfony\Component\VarDumper\Cloner\VarCloner(), + 'var_dumper.dump_destination' => new \Symfony\Component\VarDumper\Cloner\VarCloner(), )); $app->register(new \Silex\Provider\MonologServiceProvider(), array( - 'monolog.logfile' => $app->getDataDirectory() . '/logs/' . (null !== $app->config('app.environment') ? $app->config('app.environment') . '.log' : 'dev.log'), + 'monolog.logfile' => $app->getDataDirectory() . '/logs/' . (null !== $app->config('app.environment') ? $app->config('app.environment') . '.log' : 'dev.log'), )); $app->register(new \Silex\Provider\SessionServiceProvider()); $app->register(new \Silex\Provider\WebProfilerServiceProvider(), array( - 'profiler.cache_dir' => $app->getDataDirectory() . '/cache/profiler', + 'profiler.cache_dir' => $app->getDataDirectory() . '/cache/profiler', )); $app->extend('twig', function (\Twig_Environment $twig, $app) { - $twig->enableDebug(); - $twig->addExtension(new Twig_Extensions_Extension_Date()); - $twig->addExtension(new Sikofitt\Twig\Date()); - $twig->addExtension(new Sikofitt\Twig\RenderProfile()); - $twig->addGlobal('config', $app['config']->all()); - return $twig; + $twig->enableDebug(); + $twig->addExtension(new Twig_Extensions_Extension_Date()); + $twig->addExtension(new Sikofitt\Twig\Date()); + $twig->addExtension(new Sikofitt\Twig\RenderProfile()); + $twig->addGlobal('config', $app['config']->all()); + return $twig; }); $app->error(function (\Exception $e, $code) use ($app) { - switch ($code) { - case 404: - $message = $app['twig']->render('error404.html.twig'); - break; - default: - $message = $app['twig']->render('error500.html.twig'); - } - return new Response($message, $code); + switch ($code) { + case 404: + $message = $app['twig']->render('error404.html.twig'); + break; + default: + $message = $app['twig']->render('error500.html.twig'); + } + return new Response($message, $code); }); + $app['json.decoder'] = function ($app) { - return new Webmozart\Json\JsonDecoder(); + return new Webmozart\Json\JsonDecoder(); }; $app['json.encoder'] = function ($app) { - return new Webmozart\Json\JsonEncoder(); + return new Webmozart\Json\JsonEncoder(); }; $app['json.validator'] = function ($app) { - return new Webmozart\Json\JsonValidator(); + return new Webmozart\Json\JsonValidator(); }; -$app->registerIcon(new \Sikofitt\Image\Profile\TwitterProfileIcon()); $app->get('/', function () use ($app) { - $resumeData = $app['json.decoder']->decodeFile($app->getDataDirectory() . '/resume.json', $app->getDataDirectory() . '/resume.schema.json'); - $basics = (isset($resumeData->basics) && count($resumeData->basics) > 0) ? $resumeData->basics : null; - $work = (isset($resumeData->work) && count($resumeData->work) > 0) ? $resumeData->work : null; - $volunteer = (isset($resumeData->volunteer) && count($resumeData->volunteer) > 0) ? $resumeData->volunteer : null; - $education = (isset($resumeData->education) && count($resumeData->education) > 0) ? $resumeData->education : null; - $awards = (isset($resumeData->awards) && count($resumeData->awards) > 0) ? $resumeData->awards : null; - $publications = (isset($resumeData->publications) && count($resumeData->publications) > 0) ? $resumeData->publications : null; - $skills = (isset($resumeData->skills) && count($resumeData->skills) > 0) ? $resumeData->skills : null; - $languages = (isset($resumeData->languages) && count($resumeData->languages) > 0) ? $resumeData->languages : null; - $interests = (isset($resumeData->interests) && count($resumeData->interests) > 0) ? $resumeData->interests : null; - $references = (isset($resumeData->references) && count($resumeData->references) > 0) ? $resumeData->references : null; + $resumeData = $app['json.decoder']->decodeFile($app->getDataDirectory() . '/resume.json', $app->getDataDirectory() . '/resume.schema.json'); + $basics = (isset($resumeData->basics) && count($resumeData->basics) > 0) ? $resumeData->basics : null; + $work = (isset($resumeData->work) && count($resumeData->work) > 0) ? $resumeData->work : null; + $volunteer = (isset($resumeData->volunteer) && count($resumeData->volunteer) > 0) ? $resumeData->volunteer : null; + $education = (isset($resumeData->education) && count($resumeData->education) > 0) ? $resumeData->education : null; + $awards = (isset($resumeData->awards) && count($resumeData->awards) > 0) ? $resumeData->awards : null; + $publications = (isset($resumeData->publications) && count($resumeData->publications) > 0) ? $resumeData->publications : null; + $skills = (isset($resumeData->skills) && count($resumeData->skills) > 0) ? $resumeData->skills : null; + $languages = (isset($resumeData->languages) && count($resumeData->languages) > 0) ? $resumeData->languages : null; + $interests = (isset($resumeData->interests) && count($resumeData->interests) > 0) ? $resumeData->interests : null; + $references = (isset($resumeData->references) && count($resumeData->references) > 0) ? $resumeData->references : null; - return $app['twig']->render('resume.html.twig', [ - 'basics' => $basics, - 'work' => $work, - 'volunteer' => $volunteer, - 'education' => $education, - 'awards' => $awards, - 'publications' => $publications, - 'skills' => $skills, - 'languages' => $languages, - 'interests' => $interests, - 'references' => $references, - ]); + return $app['twig']->render('resume.html.twig', [ + 'basics' => $basics, + 'work' => $work, + 'volunteer' => $volunteer, + 'education' => $education, + 'awards' => $awards, + 'publications' => $publications, + 'skills' => $skills, + 'languages' => $languages, + 'interests' => $interests, + 'references' => $references, + ]); }); $app->run();