diff --git a/.tmp/.git-keep b/.tmp/.git-keep new file mode 100644 index 0000000..e69de29 diff --git a/Gruntfile.js b/Gruntfile.js index 6f8b010..d3fc1b0 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -56,18 +56,31 @@ module.exports = function (grunt) { }, dev: { files: ['src/Sikofitt/less/*', 'src/Sikofitt/js/*'], - tasks: ['dev'] + tasks: ['dev'], + options: { + atBegin: true + } + }, + options: { + dateFormat: function(time) { + d = new Date(); + grunt.log.ok('Grunt tasks finished in ' + time + 'ms on ' + d.toDateString() + ' at ' + d.toTimeString()); + grunt.log.ok('Watching ...'); + } } }, uglify: { options: { mangle: true, + report: 'gzip', compress: { drop_console: true }, - banner: '/*! Resume.PHP - v<%= pkg.version %> - ' + - '<%= grunt.template.today("dddd, mmmm dS, yyyy, h:MM:ss tt") %> */', - nameCache: '.tmp/grunt-uglify-cache.json' + banner: '/*! \n * Resume.PHP - v<%= pkg.version %> @license MIT (http://resume.reric.me)\n' + + ' * <%= grunt.template.today("dddd, mmmm dS, yyyy, h:MM:ss tt") %> \n */\n', + footer: '\n/*! Resume.PHP end */', + nameCache: '.tmp/grunt-uglify-cache.json', + preserveComments: 'some', }, dist: { files: {'web/js/resume.min.js': ['src/Sikofitt/js/resume.js']} diff --git a/app/config/config.yml b/app/config/config.yml index ceedbfe..4d0e412 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -9,6 +9,7 @@ app: captcha_sitekey: 6LcvmSQTAAAAAMmf9w6mhCbpdLvknuD9SGVHT0q- captcha_secret: 6LcvmSQTAAAAAITkvYJjgLar1LqGGLz-ic0ZMiXo twig: + theme: default paths: - views template: uikit.html.twig diff --git a/app/views/resume.html.twig b/app/views/resume.html.twig index ebc040f..550d17e 100644 --- a/app/views/resume.html.twig +++ b/app/views/resume.html.twig @@ -1,267 +1,265 @@ {% extends app.config.twig.template %} {% block title %} - {{ app.config.app.title | default('Resume') }} + {{ app.config.app.title | default('Resume') }} {% endblock %} {% block body %} -
-
-

- {% if basics.name is not empty %} - {{ basics.name }} - {% else %} - {{ app.config.app.title|default('Resume') }} - {% endif %} - {% if basics.label is not empty %} - {{ basics.label }} - {% endif %} -

-
- {% if basics.summary is not empty %} -

{{ basics.summary }}

- {% endif %} - -
-
- -
-
-

Experience

-
- -
- {% for position in work %} -

- {{ position.company }} - - {{ position.startDate|date('M, Y') }} - - {% if position.endDate is not defined %} - Current +
+
+

+ {% if basics.name is not empty %} + {{ basics.name }} {% else %} - {{ position.endDate|date('M, Y') }} + {{ app.config.app.title|default('Resume') }} {% endif %} - - (~ - {% if position.endDate is not defined %} - {{ position.startDate|date_diff }} - {% else %} - {{ position.startDate|date_diff(position.endDate) }} + {% if basics.label is not empty %} + {{ basics.label }} {% endif %} - ) - -

-
{{ position.position }}
-

- {{ position.summary|raw }} -

- {% if position.highlights is defined and position.highlights is not empty %} -
-
Highlights
- {% for highlight in position.highlights %} -
{{ highlight|raw }} {# raw is deprecated in 2.0 #}
- {% endfor %} -
+

+
+ {% if basics.summary is not empty %} +

{{ basics.summary }}

{% endif %} -
- {% endfor %}
-
-
-
+
+
+

Experience

+
-
+
+ {% for position in work %} +

+ {{ position.company }} + + {{ position.startDate|date('M, Y') }} - + {% if position.endDate is not defined %} + Current + {% else %} + {{ position.endDate|date('M, Y') }} + {% endif %} + (~ + {% if position.endDate is not defined %} + {{ position.startDate|date_diff }} + {% else %} + {{ position.startDate|date_diff(position.endDate) }} + {% endif %} + ) + +

+
{{ position.position }}
+

+ {{ position.summary|raw }} +

+ {% if position.highlights is defined and position.highlights is not empty %} +
+
Highlights
+ {% for highlight in position.highlights %} +
{{ highlight|raw }} {# raw is deprecated in 2.0 #}
+ {% endfor %} +
+ {% endif %} +
+ {% endfor %} + +
+
-
-
-

Contact

-
    +
    - {% if app.config.app.phone is not empty %} +
    -
  • Phone
    • - {% endif %} -
  • - {% if basics.email is not empty %} - {{ basics.email }} - {% endif %} +
    + +
    +

    Contact

    -
    • +
      - {% if basics.website is not empty %} -
    • {{ basics.website }}
      • - {% endif %} - {% if basics.location|length > 0 and basics.location is not empty %} -
    • -
      - {% set location = basics.location %} + {% if app.config.app.phone is not empty %} + +
    • Phone
      • + {% endif %} + +
    • + {% if basics.email is not empty %} + {{ basics.email }} + {% endif %} + +
      • + + {% if basics.website is not empty %} +
    • {{ basics.website }}
      • + {% endif %} + {% if basics.location|length > 0 and basics.location is not empty %} +
    • +
      + {% set location = basics.location %} + + {% if location.address is not empty %} + {{ location.address }}
      + {% endif %} + {% if location.city is not empty %} + {{ location.city }}, + {% endif %} + {% if location.region is not empty %} +  {{ location.region }}, + {% endif %} + {% if location.countryCode is not empty %} +  {{ location.countryCode }} + {% endif %}
      + +
      +
      • + {% endif %} +
    • + {% for profile in basics.profiles %} + {{ render_profile(profile)|raw }} + {% endfor %} + +
      • +
    • +
    + {% if skills is defined and skills is not empty %} + +

    Skills

    + +
    + {% for skill in skills %} +
    {{ skill.name }}
    +
    {{ skill.keywords|join(', ')|raw }}
    + {% endfor %} +
    - {% if location.address is not empty %} - {{ location.address }}
    {% endif %} - {% if location.city is not empty %} - {{ location.city }}, - {% endif %} - {% if location.region is not empty %} -  {{ location.region }}, - {% endif %} - {% if location.countryCode is not empty %} -  {{ location.countryCode }} - {% endif %}
    - - - {% endif %} -
  • - {% for profile in basics.profiles %} - {{ render_profile(profile)|raw }} - {% endfor %} - -
    • -
  • -
- {% if skills is defined and skills is not empty %} - -

Skills

- -
- {% for skill in skills %} -
{{ skill.name }}
-
{{ skill.keywords|join(', ')|raw }}
- {% endfor %} -
- - {% endif %} - - -
- - -
- -
-
-
- - -
- -
-
- {{ form_start(contact_form) }} - -
- Contact {% if basics.email is not empty %}{{ basics.email }}{% endif %} -
- {{ form_label(contact_form.name) }} -
- {{ form_widget(contact_form.name) }} -
-
-
- {{ form_label(contact_form.email) }} -
- {{ form_widget(contact_form.email) }} -
-
-
- {{ form_label(contact_form.message) }} -
- {{ form_widget(contact_form.message, {'attr':{'placeholder': "Please leave me a message. I will get back to you as soon as possible."}}) }}
-
- {{ form_label(contact_form.submit) }} -
- {{ form_widget(contact_form.submit) }} -
+ + +
+ +
+
+
+ + +
+ +
+
+ {{ form_start(contact_form) }} + +
+ Contact {% if basics.email is not empty %} + {{ basics.email }}{% endif %} +
+ {{ form_label(contact_form.name) }} +
+ {{ form_widget(contact_form.name) }} +
+
+
+ {{ form_label(contact_form.email) }} +
+ {{ form_widget(contact_form.email) }} +
+
+
+ {{ form_label(contact_form.message) }} +
+ {{ form_widget(contact_form.message, {'attr':{'placeholder': "Please leave me a message. I will get back to you as soon as possible."}}) }}
+ +
+
+ {{ form_label(contact_form.submit) }} +
+ {{ form_widget(contact_form.submit) }} +
+
+ {{ form_rest(contact_form) }} +
+ {{ form_end(contact_form) }} +
+
- {{ form_rest(contact_form) }} - - {{ form_end(contact_form) }}
-
-
-
- -
-
- + +
+
+ -
+
-
-

Verify

-
-

Verify that you are a human please.

-
-
-
-
-
- -
-
+
+

Verify

+
+

Verify that you are a human please.

+
+
+
+
+
+ +
+
-
+
+
+
-
-
-
-
-
    - {% if basics.email is not empty %} -
  • {{ basics.email }}
    • - {% endif %} - {% if basics.phone is not empty %} -
  • {{ basics.phone }}
    • - {% endif %} - {% if basics.location|length > 0 and basics.location is not empty %} -
  • -
    - {% for location in basics.location %} - {% if location.address is not empty %} - {{ location.address }}
    +
    +
    +
      + {% if basics.email is not empty %} +
    • {{ basics.email }}
      • {% endif %} - {% if location.city is not empty %} - {{ location.city }} - {% if location.postalCode is not empty %} -  {{ location.postalCode }} - {% endif %} - {% if location.countryCode is not empty %} -  {{ location.countryCode }} - {% endif %}
      + {% if basics.phone is not empty %} +
    • {{ basics.phone }}
      • {% endif %} - {% endfor %} -
    -
    • - {% endif %} -
  • + {% if basics.location|length > 0 and basics.location is not empty %} +
  • +
    + {% for location in basics.location %} + {% if location.address is not empty %} + {{ location.address }}
    + {% endif %} + {% if location.city is not empty %} + {{ location.city }} + {% if location.postalCode is not empty %} +  {{ location.postalCode }} + {% endif %} + {% if location.countryCode is not empty %} +  {{ location.countryCode }} + {% endif %}
    + {% endif %} + {% endfor %} +
    +
    • + {% endif %} +
  • -
    • -
+ + +
-
{% endblock %} {% block javascripts_foot %} - + {% endblock %} diff --git a/app/views/uikit.html.twig b/app/views/uikit.html.twig index bea3f1a..295ff0a 100644 --- a/app/views/uikit.html.twig +++ b/app/views/uikit.html.twig @@ -2,32 +2,32 @@ - - - {% block meta %}{% endblock %} - {% block title %}Resume{% endblock %} - {% block shortcut_icon %} - {# #} - {% endblock %} - {% block apple_meta %} - {# #} - {% endblock %} - - {% block stylesheets %}{% endblock %} - {% block inline_styles %}{% endblock %} - - - - - {% block javascripts_head %}{% endblock %} - {% block inline_js_head %}{% endblock %} + + + {% block meta %}{% endblock %} + {% block title %}Resume{% endblock %} + {% block shortcut_icon %} + {# #} + {% endblock %} + {% block apple_meta %} + {# #} + {% endblock %} + + {% block stylesheets %}{% endblock %} + {% block inline_styles %}{% endblock %} + + + + + {% block javascripts_head %}{% endblock %} + {% block inline_js_head %}{% endblock %}
- {% block body %} - {% endblock %} + {% block body %} + {% endblock %}
{% block javascripts_foot %}{% endblock %} diff --git a/src/Sikofitt/images/r.png b/src/Sikofitt/images/r.png new file mode 100644 index 0000000..9a23fb5 Binary files /dev/null and b/src/Sikofitt/images/r.png differ diff --git a/src/Sikofitt/js/resume.js b/src/Sikofitt/js/resume.js index 71437fc..8feef42 100644 --- a/src/Sikofitt/js/resume.js +++ b/src/Sikofitt/js/resume.js @@ -1,8 +1,10 @@ -jQuery(document).ready(function ($) { - $('form#recaptcha').on('submit', function (event) { +jq = jQuery.noConflict(); + +jq(document).ready(function (jq) { + jq('form#recaptcha').on('submit', function (event) { event.stopImmediatePropagation(); event.stopPropagation(); - jQuery.post(jQuery(this).attr('action'), jQuery(this).serialize(), function (response) { + jq.post(jq(this).attr('action'), jq(this).serialize(), function (response) { data = JSON.parse(response); if (false === data.valid) { @@ -11,12 +13,12 @@ jQuery(document).ready(function ($) { pos: 'bottom-center', status: 'danger' }); - }) + }); } else if (true === data.valid) { - var divRoot = jQuery('
'), - h1 = jQuery('

'), - href = jQuery(''), - phone = jQuery('.hidden-phone'); + var divRoot = jq('