diff options
author | Eddie Webb <ollitech@gmail.com> | 2021-07-30 19:29:24 +0300 |
---|---|---|
committer | Eddie Webb <ollitech@gmail.com> | 2021-07-30 19:29:24 +0300 |
commit | 4f860905765df1b4272947c0113c8c6ae7ef3dcf (patch) | |
tree | 76dd4080587dc683b08e6d0374f26b288efa3dfa | |
parent | 173ff8025e6dfd7a69f290de465cd80637abb8fa (diff) | |
parent | cd8970ab61c579215f78f50319aea8493627db94 (diff) |
merge fixwtf
-rw-r--r-- | Jenkinsfile | 57 | ||||
-rw-r--r-- | README.md | 10 | ||||
-rw-r--r-- | layouts/_default/baseof.html | 21 | ||||
-rw-r--r-- | layouts/partials/about.html | 2 | ||||
-rw-r--r-- | layouts/partials/projectsSummary.html | 2 |
5 files changed, 74 insertions, 18 deletions
diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..fc09577 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,57 @@ +pipeline { + agent any + + stages { + stage('Hello') { + steps { + echo 'Hello World' + } + post { + always { + jiraSendBuildInfo site: 'se-demo.atlassian.net' + } + } + } + stage('Deploy - Dev') { + + steps { + echo 'Deploying to US East Dev 1' + } + post { + always { + jiraSendDeploymentInfo site: 'se-demo.atlassian.net', serviceIds: ['b:YXJpOmNsb3VkOmdyYXBoOjpzZXJ2aWNlLzJlNjQ1Y2Q0LTc4ZmEtMTFlYS04ZjMyLTBhNzdmM2Y0NTMwNC8xNWM3YmZjYy1lZWI2LTExZWEtOWFmZC0xMjhiNDI4MTk0MjQ='], environmentId: 'us-dev-1', environmentName: 'us-dev-1', environmentType: 'development' + } + } + } + /* waiting on plugin update + stage('Deploy - prod') { + steps { + echo 'Queueing...' + jiraSendDeploymentInfo(site:'se-demo.atlassian.net', + environmentId:'us-prd-1', + environmentName:'us-prd-1', + environmentType:'production', + // now we can define a state of build explicitly + state:"pending", + enableGate:true, + serviceIds: [ + "b:YXJpOmNsb3VkOmdyYXBoOjpzZXJ2aWNlLzJlNjQ1Y2Q0LTc4ZmEtMTFlYS04ZjMyLTBhNzdmM2Y0NTMwNC8xNWM3YmZjYy1lZWI2LTExZWEtOWFmZC0xMjhiNDI4MTk0MjQ="] + ) + } + } + stage("check gate") { + steps { + waitUntil { + input message: "Check for approval?" + checkGateStatus(site:'se-demo.atlassian.net', environmentId:'us-prd-1') + } + } + } + stage("deploy") { + steps { + echo "Deploying!" + } + } + */ + } +} @@ -1,20 +1,19 @@ # hugo Resume -[![CircleCI](https://circleci.com/gh/eddiewebb/hugo-resume/tree/master.svg?style=svg)](https://circleci.com/gh/eddiewebb/hugo-resume/tree/master) Created from [Start Bootstrap - Resume](https://startbootstrap.com/template-overviews/resume/). - This is basically a single-page website with auto-scrolling based on left-hand nav. Dedicated project/publications pages allow more detail. Includes a client-side search powered by fuse.js at '/search' but currently theme does not link to that anywhere. Includes an `/admin` endpoint that can allow authorized users to use a WYSIWYG editor and commit files back to markdown, but with a Wordpress/CMS like experience. <!-- MarkdownTOC autolink="true" --> -- [Examples](#examples) +- [Examples](#examples)] + - [Setup & Use](#setup--use) - [Summary](#summary) - [Data files](#data-files) - [Projects](#projects) - [Publications](#publications) - [Blog / Posts](#blog--posts) - - [Template params](#template-params) + - [Template params](#template-params)tgggtgc - [CMS Editor with Netlify CMS](#cms-editor-with-netlify-cms) - [Credits](#credits) - [Contributions](#contributions) @@ -22,7 +21,6 @@ This is basically a single-page website with auto-scrolling based on left-hand n <!-- /MarkdownTOC --> - ## Examples ![About You](https://raw.githubusercontent.com/eddiewebb/hugo-resume/master/images/about.png) @@ -54,6 +52,7 @@ Data files are used for simple content presented on the homepage. - [data/experience.json](https://github.com/eddiewebb/hugo-resume/blob/master/exampleSite/data/experience.json) - [data/education.json](https://github.com/eddiewebb/hugo-resume/blob/master/exampleSite/data/education.json) + ### Projects Initially projects were in their own JSON file too, but I decided I wanted to allow more detail and custom formatting. Projects are added to one of 2 subfolders of `creations` or `contributions`. The difference indicates your role as originator or colaborator. Use `hugo add projects/TYPE/name-of-project.md` to leverage the proper archetype. @@ -101,3 +100,4 @@ Start Bootstrap was created by and is maintained by **[David Miller](http://davi * https://github.com/davidtmiller Start Bootstrap is based on the [Bootstrap](http://getbootstrap.com/) framework created by [Mark Otto](https://twitter.com/mdo) and [Jacob Thorton](https://twitter.com/fat). + diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 8a5aba9..710d8cc 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -10,19 +10,18 @@ <meta property="og:description" content="{{ if .IsHome }}{{ .Site.Params.description }}{{else}}{{ .Description }}{{ end }}" /> <meta name="author" content="{{ .Site.Params.firstName }} {{ .Site.Params.lastName }}"> <!-- Bootstrap core CSS --> - <link rel="preload" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0/css/bootstrap.min.css" as="style" onload="this.onload=null;this.rel='stylesheet'"> - <noscript><link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0/css/bootstrap.min.css"></noscript> + <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/css/bootstrap.min.css" integrity="sha384-TX8t27EcRE3e/ihU7zmQxVncDAy5uIKz4rEkgIXeMed4M0jlfIDPvg6uqKI2xXr2" crossorigin="anonymous"> <!-- Custom fonts for this template --> <link rel="preload" href="https://fonts.googleapis.com/css?family=Saira+Extra+Condensed:100,200,300,400,500,600,700,800,900&display=swap" as="style" onload="this.onload=null;this.rel='stylesheet'"> <noscript><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Saira+Extra+Condensed:100,200,300,400,500,600,700,800,900&display=swap"></noscript> <link rel="preload" href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i,700,700i,800,800i&display=swap" as="style" onload="this.onload=null;this.rel='stylesheet'"> <noscript><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i,700,700i,800,800i&display=swap"></noscript> - <link rel="preload" href="https://use.fontawesome.com/releases/v5.5.0/css/all.css" as="style" onload="this.onload=null;this.rel='stylesheet'"> - <noscript><link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.5.0/css/all.css"></noscript> - <link rel="preload" href="https://cdnjs.cloudflare.com/ajax/libs/devicons/1.8.0/css/devicons.min.css" as="style" onload="this.onload=null;this.rel='stylesheet'"> - <noscript><link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/devicons/1.8.0/css/devicons.min.css"></noscript> - <link rel="preload" href="https://cdnjs.cloudflare.com/ajax/libs/simple-line-icons/2.4.1/css/simple-line-icons.min.css" as="style" onload="this.onload=null;this.rel='stylesheet'"> - <noscript><link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/simple-line-icons/2.4.1/css/simple-line-icons.min.css"></noscript> + <link rel="preload" href="https://use.fontawesome.com/releases/v5.12.1/css/all.css" as="style" onload="this.onload=null;this.rel='stylesheet'"> + <noscript><link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.12.1/css/all.css"></noscript> + <link rel="preload" href="https://cdnjs.cloudflare.com/ajax/libs/devicons/1.8.0/css/devicons.min.css" integrity="sha512-JW3fT0YTK7pT7w437SoX6GcW76jOZ6E0jGmrqBAcloC4GKT+njHOY4fX5KxJ9WfIXTkNrAF994525fAHp+KCxg==" crossorigin="anonymous" as="style" onload="this.onload=null;this.rel='stylesheet'"> + <noscript><link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/devicons/1.8.0/css/devicons.min.css" integrity="sha512-JW3fT0YTK7pT7w437SoX6GcW76jOZ6E0jGmrqBAcloC4GKT+njHOY4fX5KxJ9WfIXTkNrAF994525fAHp+KCxg==" crossorigin="anonymous"></noscript> + <link rel="preload" href="https://cdnjs.cloudflare.com/ajax/libs/simple-line-icons/2.5.5/css/simple-line-icons.min.css" integrity="sha512-QKC1UZ/ZHNgFzVKSAhV5v5j73eeL9EEN289eKAEFaAjgAiobVAnVv/AGuPbXsKl1dNoel3kNr6PYnSiTzVVBCw==" crossorigin="anonymous" as="style" onload="this.onload=null;this.rel='stylesheet'"> + <noscript><link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/simple-line-icons/2.5.5/css/simple-line-icons.min.css" integrity="sha512-QKC1UZ/ZHNgFzVKSAhV5v5j73eeL9EEN289eKAEFaAjgAiobVAnVv/AGuPbXsKl1dNoel3kNr6PYnSiTzVVBCw==" crossorigin="anonymous"></noscript> <!-- Custom styles for this template --> <link rel="preload" href="{{ "css/resume.css" | absURL }}" as="style" onload="this.onload=null;this.rel='stylesheet'"> <noscript><link rel="stylesheet" href="{{ "css/resume.css" | absURL }}"></noscript> @@ -46,11 +45,11 @@ {{ with $.GitInfo }}{{ with $.Site.Params.gitCommitPrefix }} | <span style="color: #999999; font-size: 60%;">Page content generated from commit: <a href="{{ . }}/{{ $.GitInfo.AbbreviatedHash }}" title="log: {{ $.GitInfo.Subject }}">{{ $.GitInfo.AbbreviatedHash }}</a>{{ end }}{{end}} </div> <!-- Bootstrap core JavaScript --> - <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script> - <script async src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0/js/bootstrap.bundle.min.js"></script> + <script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script> + <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ho+j7jyWK8fNQe+A12Hb8AhRq26LrZ/JpcUGGOn+Y7RsweNrtN/tE3MoK7ZeZDyx" crossorigin="anonymous"></script> <!-- Plugin JavaScript --> - <script async src="https://cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.4.1/jquery.easing.min.js"></script> + <script async src="https://cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.4.1/jquery.easing.min.js" integrity="sha512-0QbL0ph8Tc8g5bLhfVzSqxe9GERORsKhIn1IrpxDAgUsbBGz/V7iSav2zzW325XGd1OMLdL4UiqRJj702IeqnQ==" crossorigin="anonymous"></script> <!-- Custom scripts for this template --> <script async src="/js/resume.js"></script> <script async src="https://www.googletagmanager.com/gtag/js?id={{ .Site.Params.google.analytics.trackerID }}"></script> diff --git a/layouts/partials/about.html b/layouts/partials/about.html index 10dc539..43df85c 100644 --- a/layouts/partials/about.html +++ b/layouts/partials/about.html @@ -35,7 +35,7 @@ <ul class="list-inline list-social-icons mb-0"> {{ range .Site.Params.handles }} <li class="list-inline-item"> - <a href="{{ .proof }}" data-toggle="tooltip" title="{{ .name }}" data-offset="0 10" rel="me"> + <a href="{{ .link }}" data-toggle="tooltip" title="{{ .name }}" data-offset="0,10" rel="me"> <span class="fa-stack fa-lg"> <i class="fa fa-circle fa-stack-2x"></i> <i class="fab {{ if .icon}}fa-{{ .icon }}{{ else }}fa-{{ lower .name }}{{ end }} fa-stack-1x fa-inverse"></i> diff --git a/layouts/partials/projectsSummary.html b/layouts/partials/projectsSummary.html index 1dbdf11..26c539d 100644 --- a/layouts/partials/projectsSummary.html +++ b/layouts/partials/projectsSummary.html @@ -2,7 +2,7 @@ <h3 class="mb-3"><a href="{{ .Permalink }}">{{ .Title }}</a></h3> <div class="resume-item d-flex flex-column flex-md-row mb-3"> - <div class="resume-content " style="width:200px;!important;"> + <div class="resume-content" style="width:200px;"> {{with .Params.image }} <img src="{{ . }}" style="max-height:150px;max-width:150px;"/> {{ end }} |