From 46964dcc1807fe2583641bc24e28c1a48937c9dd Mon Sep 17 00:00:00 2001 From: Greg Boone Date: Mon, 28 Dec 2015 11:59:31 -0600 Subject: [PATCH 1/3] Adjusts the permalink for C2 --- Gemfile | 4 +++- _plugins/dashboard.rb | 3 +-- assets/js/preview-bundle.js | 9 ++++----- go | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index b79494e..ed6299f 100644 --- a/Gemfile +++ b/Gemfile @@ -8,4 +8,6 @@ gem 'safe_yaml' group :jekyll_plugins do gem 'jekyll-redirect-from', '~> 0.9' end - +group :dev do + gem 'pry' +end diff --git a/_plugins/dashboard.rb b/_plugins/dashboard.rb index 4fa3e73..5afb666 100644 --- a/_plugins/dashboard.rb +++ b/_plugins/dashboard.rb @@ -46,10 +46,9 @@ def self.munge_project_data(project_data) original_name = project_data['name'] if original_name.scan(/[A-Z]/).size > 0 project_data['redirect_from'] = Array.new - project_data['redirect_from'].push("project/#{original_name}") + project_data['redirect_from'].push("dashboard/project/#{original_name}") end project_data['name'] = original_name.downcase - munge_licenses project_data munge_github project_data end diff --git a/assets/js/preview-bundle.js b/assets/js/preview-bundle.js index 5f8ba7f..24a622a 100644 --- a/assets/js/preview-bundle.js +++ b/assets/js/preview-bundle.js @@ -77,7 +77,7 @@ function insertYmlInHtml (yml) { } function compileLiquidTemplate () { - var templateSrc = "---\nlayout: bare\n---\n\n\n{% assign project = page.project %}
\n \n

{{ project.full_name }} {% if project.stage %}{{ project.stage }}{% else %}unknown{% endif %}

\n

{% if project.description %}{{ project.description }}{% else %}Project description coming soon.{% endif %}

\n

Contact:\n {% capture contact %}{{ project.contact }}{% endcapture %}\n {% assign contact = project.contact %}\n {% for c in contact %}\n {% if c.url && c.text %}\n {{ c.text }}\n {% else %}\n {% if c contains '@' %}\n {% assign mail = c | remove_first: 'mailto:' %}\n {{mail}}\n {% else %}\n {% assign url = c | remove_first: 'https://www.github.com/' | remove_first: 'https://github.com/' %}\n {{url}}\n {% endif %}\n {% endif %}\n {% endfor %}\n

\n {% capture blog %}{{ project.blog }}{% endcapture %}\n {% assign tags = blog | split: ',' %}\n {% if tags.size > 0 %}\n

\n /\n \n {% for t in tags %}\n News\n /\n {% endfor %}\n \n

\n {% endif %}\n
\n\n
\n
\n \n {% if project.impact %}\n
\n

impact

\n

{{ project.impact }}

\n
\n {% endif %}\n\n \n {% if project.partners %}\n
\n {% if project.partners.size > 1 %}\n

partners

\n {% else %}\n

partner

\n {% endif %}\n
    \n {% include list-partners.html style=\"list\" %}\n
\n
\n {% endif %}\n\n \n {% if project.milestones %}\n
\n

milestones

\n
    \n {% for item in project.milestones %}\n
  • {{ item }}
    • \n {% endfor %}\n
\n
\n {% endif %}\n\n \n {% if project.github %}\n
\n

code

\n {% for url in project.github %}\n {% if url.name && url.description %}\n {% assign full_repo_name = url.name %}\n {% assign repo_name = url.name | split: \"/\" | last %}\n {% assign repo_desc = url.description %}\n {% else %}\n {% assign full_repo_name = url %}\n {% assign repo_name = url | split: \"/\" | last %}\n {% endif %}\n
\n

\n {% if project.github | first %}\n {{ full_repo_name }}\n {% else %}\n {{ full_repo_name }}\n {% endif %}\n

\n {% if repo_desc %}\n

{{ repo_desc }}

\n {% endif %}\n
    \n
  • Issues:
    • \n
  • Stars:
    • \n
  • Forks:
    • \n {% for license in project.licenses %}{% if license[0] == repo_name %}\n {% capture branch %}{% if project.licenseBranch %}{{ project.licenseBranch | map: repo_name }}{% else %}master{%endif%}{% endcapture %}\n
  • License: {{ license[1] }}
    • \n {% endif %}\n {% endfor %}\n
\n
\n {% endfor %}\n
\n {% endif %}\n\n\n {% if project.links %}\n\n {% assign has_api = false %}\n {% assign has_process = false %}\n {% for item in project.links %}\n {% if item.category == 'api' %}\n {% assign has_api = true %}\n {% endif %}\n {% if item.category == 'process' %}\n {% assign has_process = true %}\n {% endif %}\n {% endfor %}\n\n \n {% if has_api == true %}\n
\n

api links

\n
    {% for item in project.links %}\n {% if item.category == 'api' %}\n
  • {{ item.text }}
    • {% endif %}{% endfor %}\n
\n
\n {% endif %}\n\n \n {% if has_process == true %}\n
\n

process links

\n
    {% for item in project.links %}\n {% if item.category == 'process' %}\n
  • {{ item.text }}
    • {% endif %}{% endfor %}\n
\n
\n {% endif %}\n\n \n
\n

related links

\n
    {% for item in project.links %}\n {% if item.category != 'api' and item.category != 'process' %}\n
  • {% if item.url %}{{ item.text }}
    • {% else %}{{ item }}{% endif %}\n {% endif %}{% endfor %}\n
\n
\n\n \n {% endif %}\n\n \n\n
\n
\n\n\n\n\n\n\n{{ content }}\n"; + var templateSrc = "---\nlayout: bare\n---\n\n\n{% assign project = page.project %}
\n \n

{{ project.full_name }} {% if project.stage %}{{ project.stage }}{% else %}unknown{% endif %}

\n

{% if project.description %}{{ project.description }}{% else %}Project description coming soon.{% endif %}

\n

Contact:\n {% capture contact %}{{ project.contact }}{% endcapture %}\n {% assign contact = project.contact %}\n {% for c in contact %}\n {% if c.url && c.text %}\n {{ c.text }}\n {% else %}\n {% if c contains '@' %}\n {% assign mail = c | remove_first: 'mailto:' %}\n {{mail}}\n {% else %}\n {% assign url = c | remove_first: 'https://www.github.com/' | remove_first: 'https://github.com/' %}\n {{url}}\n {% endif %}\n {% endif %}\n {% endfor %}\n

\n {% capture blog %}{{ project.blogTag | default: project.blog }}{% endcapture %}\n {% assign tags = blog | split: ',' %}\n {% if tags.size > 0 %}\n

\n /\n \n {% for t in tags %}\n News\n /\n {% endfor %}\n \n

\n {% endif %}\n
\n\n
\n
\n \n {% if project.impact %}\n
\n

impact

\n

{{ project.impact }}

\n
\n {% endif %}\n\n \n {% if project.partners %}\n
\n {% if project.partners.size > 1 %}\n

partners

\n {% else %}\n

partner

\n {% endif %}\n
    \n {% include list-partners.html style=\"list\" %}\n
\n
\n {% endif %}\n\n \n {% if project.milestones %}\n
\n

milestones

\n
    \n {% for item in project.milestones %}\n
  • {{ item }}
    • \n {% endfor %}\n
\n
\n {% endif %}\n\n \n {% if project.github %}\n
\n

code

\n {% for url in project.github %}\n {% if url.name && url.description %}\n {% assign full_repo_name = url.name %}\n {% assign repo_name = url.name | split: \"/\" | last %}\n {% assign repo_desc = url.description %}\n {% else %}\n {% assign full_repo_name = url %}\n {% assign repo_name = url | split: \"/\" | last %}\n {% endif %}\n
\n

\n {% if project.github | first %}\n {{ full_repo_name }}\n {% else %}\n {{ full_repo_name }}\n {% endif %}\n

\n {% if repo_desc %}\n

{{ repo_desc }}

\n {% endif %}\n
    \n
  • Issues:
    • \n
  • Stars:
    • \n
  • Forks:
    • \n {% for license in project.licenses %}{% if license[0] == repo_name %}\n {% capture branch %}{% if project.licenseBranch %}{{ project.licenseBranch | map: repo_name }}{% else %}master{%endif%}{% endcapture %}\n
  • License: {{ license[1] }}
    • \n {% endif %}\n {% endfor %}\n
\n
\n {% endfor %}\n
\n {% endif %}\n\n\n {% if project.links %}\n\n {% assign has_api = false %}\n {% assign has_process = false %}\n {% for item in project.links %}\n {% if item.category == 'api' %}\n {% assign has_api = true %}\n {% endif %}\n {% if item.category == 'process' %}\n {% assign has_process = true %}\n {% endif %}\n {% endfor %}\n\n \n {% if has_api == true %}\n
\n

api links

\n
    {% for item in project.links %}\n {% if item.category == 'api' %}\n
  • {{ item.text }}
    • {% endif %}{% endfor %}\n
\n
\n {% endif %}\n\n \n {% if has_process == true %}\n
\n

process links

\n
    {% for item in project.links %}\n {% if item.category == 'process' %}\n
  • {{ item.text }}
    • {% endif %}{% endfor %}\n
\n
\n {% endif %}\n\n \n
\n

related links

\n
    {% for item in project.links %}\n {% if item.category != 'api' and item.category != 'process' %}\n
  • {% if item.url %}{{ item.text }}
    • {% else %}{{ item }}{% endif %}\n {% endif %}{% endfor %}\n
\n
\n\n \n {% endif %}\n\n \n\n
\n
\n\n\n\n\n\n\n{{ content }}\n"; templateSrc = templateSrc.replace(/---[\s\S]*---/, ''); templateSrc = templateSrc.replace(/include (.*?) /g, "include '$1' "); @@ -870,13 +870,12 @@ module.exports={ "json-schema": "^0.2.2", "yamljs": "^0.2.4" }, - "gitHead": "2b42ad69bec7b12a2a66e541a24885e827b32479", "readme": "# `.about.yml` schema and tools\n\nThe `.about.yml` mechanism allows a project to publish and maintain metadata\nthat can be easily maintained by project owners, that is visible and\naccessible to interested parties, and that can be harvested and processed by\ntools and automated systems. It is implemented using the\n[YAML](https://en.wikipedia.org/wiki/YAML) format.\n\nThe [18F Team API](https://team-api.18f.gov/public/api/) is the original,\nprimary consumer of this information, which in turn provides data for:\n\n- [18F Hub](https://github.com/18F/hub)\n- [18F Dashboard](https://github.com/18F/dashboard)\n- [18F.gsa.gov](https://github.com/18F/18f.gsa.gov)\n\nWe hope that every active 18F project, [working\ngroup](https://pages.18f.gov/grouplet-playbook/working-groups/), and\n[guild](https://pages.18f.gov/grouplet-playbook/guilds/) will publish\n`.about.yml` files in their respective repositories. By feeding this\ninformation through the Team API server and into our Hub, Dashboard, and main\nweb site, cultivation of `.about.yml` files will help make our activity more\neasily transparent to our teammates, and to anyone outside our team who wishes\nto discover what we're working on (and how we work).\n\n## Public domain\n\nThis project is in the worldwide [public domain](LICENSE.md). As stated in [CONTRIBUTING](CONTRIBUTING.md):\n\n> This project is in the public domain within the United States, and copyright and related rights in the work worldwide are waived through the [CC0 1.0 Universal public domain dedication](https://creativecommons.org/publicdomain/zero/1.0/).\n>\n> All contributions to this project will be released under the CC0\n>dedication. By submitting a pull request, you are agreeing to comply\n>with this waiver of copyright interest.\n", "readmeFilename": "README.md", "_id": "about-yml-validator@0.1.0", - "_shasum": "1d659021c46b3887d0198f6e5b59e8159fbb129c", - "_from": "git+https://github.com/18F/about-yml-npm.git", - "_resolved": "git+https://github.com/18F/about-yml-npm.git#2b42ad69bec7b12a2a66e541a24885e827b32479" + "_shasum": "5e38544ef51846be63b1ff2d3524e3446831f486", + "_resolved": "git+https://github.com/18F/about-yml-npm.git#2b42ad69bec7b12a2a66e541a24885e827b32479", + "_from": "about-yml-validator@git+https://github.com/18F/about-yml-npm.git" } },{}],7:[function(require,module,exports){ diff --git a/go b/go index 0653b6f..b15f35f 100755 --- a/go +++ b/go @@ -43,7 +43,7 @@ def init end def install_gems - exec_cmd 'bundle install' + exec_cmd 'bundle install --without development' exec_cmd 'git add Gemfile.lock' end From 595da42383c912380bd32ae7a4573d7fa3bf02bd Mon Sep 17 00:00:00 2001 From: Greg Boone Date: Wed, 6 Jan 2016 17:28:48 -0600 Subject: [PATCH 2/3] Preps Dashboard for cloud.gov deployment --- Staticfile | 1 + _config-no-cloud.yml | 2 ++ _config.yml | 2 -- manifest.yml | 9 +++++++++ 4 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 Staticfile create mode 100644 _config-no-cloud.yml create mode 100644 manifest.yml diff --git a/Staticfile b/Staticfile new file mode 100644 index 0000000..36b40f0 --- /dev/null +++ b/Staticfile @@ -0,0 +1 @@ +root: _site diff --git a/_config-no-cloud.yml b/_config-no-cloud.yml new file mode 100644 index 0000000..c981e12 --- /dev/null +++ b/_config-no-cloud.yml @@ -0,0 +1,2 @@ +destination: _site/dashboard +baseurl: /dashboard diff --git a/_config.yml b/_config.yml index bdf730f..e05346f 100644 --- a/_config.yml +++ b/_config.yml @@ -6,8 +6,6 @@ description: "18F builds effective, user-centric digital services focused on the sass: sass_dir: assets/_sass -destination: _site/dashboard -baseurl: /dashboard #baseurl: localhost:4000 exclude: - CONTRIBUTING.md diff --git a/manifest.yml b/manifest.yml new file mode 100644 index 0000000..79aab28 --- /dev/null +++ b/manifest.yml @@ -0,0 +1,9 @@ +--- +memory: 64M +instances: 1 +applications: +- name: dashboard +buildpack: https://github.com/cloudfoundry-incubator/staticfile-buildpack.git +env: + FORCE_HTTPS: true +domain: 18f.gov From ab69440fdfe558bd05903bffdef138124529d03b Mon Sep 17 00:00:00 2001 From: Greg Boone Date: Wed, 6 Jan 2016 17:44:44 -0600 Subject: [PATCH 3/3] Fixes the logo --- assets/css/fonts.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/assets/css/fonts.css b/assets/css/fonts.css index b8fb763..f2291a3 100644 --- a/assets/css/fonts.css +++ b/assets/css/fonts.css @@ -3,11 +3,11 @@ /* comment out when working locally */ @font-face { font-family: "18f"; - src:url("/dashboard/assets/fonts/18f-font.eot"); - src:url("/dashboard/assets/fonts/18f-font.eot?#iefix") format("embedded-opentype"), - url("/dashboard/assets/fonts/18f-font.woff") format("woff"), - url("/dashboard/assets/fonts/18f-font.ttf") format("truetype"), - url("/dashboard/assets/fonts/18f-font.svg#untitled-font-1") format("svg"); + src:url("/assets/fonts/18f-font.eot"); + src:url("/assets/fonts/18f-font.eot?#iefix") format("embedded-opentype"), + url("/assets/fonts/18f-font.woff") format("woff"), + url("/assets/fonts/18f-font.ttf") format("truetype"), + url("/assets/fonts/18f-font.svg#untitled-font-1") format("svg"); font-weight: normal; font-style: normal;