From 744b7426f26940abec7954ba148f87fcef58cfb5 Mon Sep 17 00:00:00 2001 From: mauvehed Date: Mon, 31 Jul 2023 18:27:09 -0500 Subject: [PATCH] chore: set prettier for pre-commit chore: run pre-commit scans against all files and keep changes chore: add CNAME, Gemfile and yaml/yml files to pre-commit exclude --- .../ISSUE_TEMPLATE/add-new-person-to-site.md | 46 +-- .github/ISSUE_TEMPLATE/bug_report.md | 22 +- .github/ISSUE_TEMPLATE/feature_request.md | 5 +- .pre-commit-config.yaml | 15 +- CONTRIBUTING.md | 30 +- README.md | 1 + index.html | 193 ++++++---- memorial.html | 362 ++++++++++-------- style.css | 158 ++++---- 9 files changed, 466 insertions(+), 366 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/add-new-person-to-site.md b/.github/ISSUE_TEMPLATE/add-new-person-to-site.md index b96b217..b8170ee 100644 --- a/.github/ISSUE_TEMPLATE/add-new-person-to-site.md +++ b/.github/ISSUE_TEMPLATE/add-new-person-to-site.md @@ -1,39 +1,41 @@ --- name: Add New Person to Site about: Request the addition of a person to this memorial site -title: '' +title: "" labels: Add Person, Needs Review, People -assignees: '' - +assignees: "" --- Please fill out as much information as you can. No fields are required, but the more you can provide the better. **General Info** -* First name: -* Last name: -* Handle: -* Birth Year: -* Death Year: -* Link to Obituary: -* Group Affiliations: -* URL to main photo (or attach to Issue): -* Description of person and/or activities: -* Facebook memorial group URL: + +- First name: +- Last name: +- Handle: +- Birth Year: +- Death Year: +- Link to Obituary: +- Group Affiliations: +- URL to main photo (or attach to Issue): +- Description of person and/or activities: +- Facebook memorial group URL: **Social Media Links** -* Twitter: -* Github: -* LinkedIn: -* Facebook: -* Other: + +- Twitter: +- Github: +- LinkedIn: +- Facebook: +- Other: **Contributions** Repeat as many times as needed -* Project name: -* Project URL: -* Project Description: +- Project name: +- Project URL: +- Project Description: **Photo Gallery** -* URL(s) to additional photos: + +- URL(s) to additional photos: diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 0f71fdf..a1b4af3 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -1,10 +1,9 @@ --- name: Bug report about: Create a report to help us improve -title: '' +title: "" labels: BUG, Needs Review -assignees: '' - +assignees: "" --- **Describe the bug** @@ -12,6 +11,7 @@ A clear and concise description of what the bug is. **To Reproduce** Steps to reproduce the behavior: + 1. Go to '...' 2. Click on '....' 3. Scroll down to '....' @@ -24,15 +24,17 @@ A clear and concise description of what you expected to happen. If applicable, add screenshots to help explain your problem. **Desktop (please complete the following information):** - - OS: [e.g. iOS] - - Browser [e.g. chrome, safari] - - Version [e.g. 22] + +- OS: [e.g. iOS] +- Browser [e.g. chrome, safari] +- Version [e.g. 22] **Smartphone (please complete the following information):** - - Device: [e.g. iPhone6] - - OS: [e.g. iOS8.1] - - Browser [e.g. stock browser, safari] - - Version [e.g. 22] + +- Device: [e.g. iPhone6] +- OS: [e.g. iOS8.1] +- Browser [e.g. stock browser, safari] +- Version [e.g. 22] **Additional context** Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 6f1f901..7e01c44 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -1,10 +1,9 @@ --- name: Feature request about: Suggest an idea for this project -title: 'PLEASE DO NOT SUBMIT A FEATURE REQUEST VIA ISSUES' +title: "PLEASE DO NOT SUBMIT A FEATURE REQUEST VIA ISSUES" labels: Ideas, Needs Review -assignees: '' - +assignees: "" --- ## Do not submit feature requests via Issues diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 1bcf46c..2811e1b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,28 +1,17 @@ # .pre-commit-config.yaml -exclude: 'CNAME' +exclude: '(CNAME|Gemfile|\..*\.y[a]?ml)' repos: - repo: https://github.com/pre-commit/pre-commit-hooks rev: v4.4.0 # use `pre-commit autoupdate` to get the latest rev hooks: - id: no-commit-to-branch args: ['--branch', 'main'] # prevent local commits to main branch - - id: check-yaml # check for proper yaml formatting - - id: check-json # check for proper json formatting -# - id: pretty-format-json - id: end-of-file-fixer - id: trailing-whitespace -#- repo: https://github.com/pre-commit/mirrors-csslint -# rev: v1.0.5 # use `pre-commit autoupdate` to get the latest rev -# hooks: -# - id: csslint -- repo: https://github.com/thibaudcolas/curlylint - rev: v0.13.1 # use `pre-commit autoupdate` to get the latest rev - hooks: - - id: curlylint - repo: https://github.com/pre-commit/mirrors-prettier rev: v3.0.0 hooks: - id: prettier - types: [json] + types_or: [json, html, css, javascript, yaml, markdown] ci: autofix_prs: true # set false to stop pull-request commits being added by pre-commit.ci diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a18b10e..3175f56 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -10,9 +10,9 @@ Contributors are the public community members who do not have specific access to Verify that an Issue [does not already exist](https://github.com/restincode/restincode/issues) for the individual you wish so submit. Once you've made sure, please use one of our existing templates to open an issue for the following: -* Add New Person to Site -* Bug report -* Feature request +- Add New Person to Site +- Bug report +- Feature request Alternatively you can open a regular issue or you can also choose to submit the json file (located in [people/](https://github.com/restincode/restincode/tree/master/people)) directly (via a pull request). If you wish to submit your own json, please utilize this [template](https://github.com/restincode/restincode/blob/master/people/_template.json) to get started. @@ -24,7 +24,7 @@ If you cannot find the person, you can add them using our Issue [template](https ### Testing your changes locally -Using the provided Gemfile you can test locally by running ```bundle install``` and executing ```bundle exec jekyll serve``` to run a local web server on http://localhost:4000. Please verify your changes before submitting a Pull Request. +Using the provided Gemfile you can test locally by running `bundle install` and executing `bundle exec jekyll serve` to run a local web server on http://localhost:4000. Please verify your changes before submitting a Pull Request. ## Maintainers @@ -48,14 +48,14 @@ The big thing to look for will be that the persons name is spelled correctly in ### Using Labels -* **Add Person** - This shows that the PR or Issue is to add a new person to the RiC project. Should be replaced by "Person Added" once the work is completed. -* **Add Data** - This shows that the PR or Issue is to add additional data, such as contributions or images to an existing person. -* **BUG** - A bug in the actual website/github config/or jsons. -* **Code** - A change to the actual code for this website. -* **Ideas** - A proposed idea or change to the project, website, templates, or other materials. -* **Needs Review** - This PR or Issue requires a Maintainer to review the changes and ensure that everything looks appropriate and up to standards. -* **People** - This represents a PR or Issue that is specifically about a person in the memorial. -* **Person Added** - This represents a person who's been added (a json created) to the memorial. Should be applied after the work is complete, and should replace the "Add Person" tag. -* **Project** - Used to identify PRs or Issues that relate to the RiC project and not any of the people within it. -* **Task** - A basic task being requested. This could fall within project, code, bug, or other non people focussed work. -* **Work in Progress** - This will be applied if the PR or Issue should **NOT** be accepted in its current state. This is for work-in progress PR's that require more work from the contributor. +- **Add Person** - This shows that the PR or Issue is to add a new person to the RiC project. Should be replaced by "Person Added" once the work is completed. +- **Add Data** - This shows that the PR or Issue is to add additional data, such as contributions or images to an existing person. +- **BUG** - A bug in the actual website/github config/or jsons. +- **Code** - A change to the actual code for this website. +- **Ideas** - A proposed idea or change to the project, website, templates, or other materials. +- **Needs Review** - This PR or Issue requires a Maintainer to review the changes and ensure that everything looks appropriate and up to standards. +- **People** - This represents a PR or Issue that is specifically about a person in the memorial. +- **Person Added** - This represents a person who's been added (a json created) to the memorial. Should be applied after the work is complete, and should replace the "Add Person" tag. +- **Project** - Used to identify PRs or Issues that relate to the RiC project and not any of the people within it. +- **Task** - A basic task being requested. This could fall within project, code, bug, or other non people focussed work. +- **Work in Progress** - This will be applied if the PR or Issue should **NOT** be accepted in its current state. This is for work-in progress PR's that require more work from the contributor. diff --git a/README.md b/README.md index 71daf67..60a6a7e 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,7 @@ This project is intended to be open to all and a true community effort. Everyone > **The most significant request we have for contributors** is to help us create the actual person.json file for every individual who has an open Issue ticket. Many people will open an Issue for the deceased, few will take the extra time to create the actual files to populate the site. > > Here are some other ways to contribute: +> > - Updating/improving our website, graphics, and logos (we suck) > - Writing code to [auto-publish entries](#174) on the anniversary of their passing > - Prioritize [adding people who are missing](https://github.com/restincode/restincode/issues?q=is%3Aissue+is%3Aopen+sort%3Acreated-asc+label%3A%22Add+Person%22) from the website, before prioritizing [people who are missing additional data](https://github.com/restincode/restincode/issues?q=is%3Aissue+is%3Aopen+sort%3Acreated-asc+label%3A%22Add+Data%22+label%3A%22Person+Added%22) to their bio diff --git a/index.html b/index.html index 67d1cf3..4858d26 100644 --- a/index.html +++ b/index.html @@ -1,78 +1,131 @@ - + - - Rest In Code - An InfoSec and Hacker Memorial Site - - - - - + + Rest In Code - An InfoSec and Hacker Memorial Site + + + + + - - - + + + - - + + // generate list of names, with links if available + for (p = 0; p < peoplelist.length; p++) { + var displayname = peoplelist[p]["displayname"]; + var file = peoplelist[p]["filename"]; + var link; + // only create links for json files that have been added to peoplelist.json + if (file == "") { + link = "
  • " + displayname + "
    • "; + } else { + link = + "
  • " + + displayname + + "
    • "; + } + $("#memorial-links-list").append(link); + } + }); + }); + + + +
    +

    + RestInCode Passed but not Forgotten +

    +

    + A memorial site for Hackers and InfoSec people who have passed. +

    +
    - - -
    -

    RestInCode Passed but not Forgotten

    -

    A memorial site for Hackers and InfoSec people who have passed.

    -
    +
    + -
    - +
    +

    RestInCode (RIC)

    +

    + RIC is a memorial site for Hackers and Information Security people who + have passed. In a community and industry that many of us see as + timeless, we are quickly learning that is not the reality, as our dear + friends and colleagues more frequently move on. Our ideals, our + research, and our spirit persists. Unfortunately, our human shells + can't keep up sometimes. We seek to honor those who have touched + security, technology, and our lives. +

    +

    + Lorem ipsum dolor sit amet. We leave this here for the thoughts we + want to convey, but can't find the words for it. +

    +

     

    +

    + background image +

    +

     

    +

    Contributing

    +

    + To contribute to this site by adding new people, additional content, + photos, or pointing out inaccuracies, please visit our Github and + follow our + Contributing guidelines. +

    +
    +
    -
    -

    RestInCode (RIC)

    -

    RIC is a memorial site for Hackers and Information Security people who have passed. In a community and industry that many of us see as timeless, we are quickly learning that is not the reality, as our dear friends and colleagues more frequently move on. Our ideals, our research, and our spirit persists. Unfortunately, our human shells can't keep up sometimes. We seek to honor those who have touched security, technology, and our lives.

    -

    Lorem ipsum dolor sit amet. We leave this here for the thoughts we want to convey, but can't find the words for it.

    -

     

    -

    background image

    -

     

    -

    Contributing

    -

    To contribute to this site by adding new people, additional content, photos, or pointing out inaccuracies, please visit our Github and follow our Contributing guidelines.

    -
    - -
    - - - - + + diff --git a/memorial.html b/memorial.html index 77d85c7..03ee6db 100644 --- a/memorial.html +++ b/memorial.html @@ -1,175 +1,225 @@ - + - - Rest In Code - In Memory of - - - + + Rest In Code - In Memory of + + + - - - + + + - - + + + +
    +

    + RestInCode - In Memory of +

    +
    +
    +
    +

    - }); - }); - + - - -
    -

    RestInCode - In Memory of

    -
    +

    + memorial image + +

    +
    +

    Contributions

    +
      -
      -
      -

      +
      +

      Gallery

      +
      + +
      +
      - - -

      memorial image -

      - -
      -

      Contributions

      -
        - -
      - -
      -

      Gallery

      -
      - - -
      - - -
      - -
      - << Back - Content and Images, unless otherwise specified, © Rest In Code || Website design by Sunfire 2019 -
      - -
      - + +
      + diff --git a/style.css b/style.css index e722d2c..08045c7 100644 --- a/style.css +++ b/style.css @@ -1,139 +1,143 @@ body { - font-family: Tahoma, sans-serif; - margin: 0; - padding: 0; - background: #efefef; + font-family: Tahoma, sans-serif; + margin: 0; + padding: 0; + background: #efefef; } hr { - clear: both; + clear: both; } -h1, h2, h3, h4 { - font-family: 'Share Tech Mono', monospace; +h1, +h2, +h3, +h4 { + font-family: "Share Tech Mono", monospace; } li { - list-style-type: none; + list-style-type: none; } a { - color: #071; + color: #071; } a:active { - text-decoration: none; - border: 1px dotted #071; - color: #0a2; + text-decoration: none; + border: 1px dotted #071; + color: #0a2; } a:visited { - color: #0a2; + color: #0a2; } a:hover { - background: #0f9; - color: #000; + background: #0f9; + color: #000; } - header { - padding: 20px; - background-color: #ededed; - background-image: url("/images/header-bg.jpg"); - text-shadow: #fff 3px 3px 20px; + padding: 20px; + background-color: #ededed; + background-image: url("/images/header-bg.jpg"); + text-shadow: #fff 3px 3px 20px; +} +header h1 { + color: #0f5; } -header h1 { color: #0f5; } #subtitle { - font-size: 0.7em; - font-style: italic; + font-size: 0.7em; + font-style: italic; } #tagline { - text-indent: 45px; - color: #0f0; + text-indent: 45px; + color: #0f0; } -main { margin: 30px; } +main { + margin: 30px; +} main#homepage-content { - display: grid; - grid-template-columns: 1fr 3fr; - min-height: 500px; + display: grid; + grid-template-columns: 1fr 3fr; + min-height: 500px; } nav { - grid-row: 1 / 3; - border: 1px solid #ededed; - margin-right: 25px; + grid-row: 1 / 3; + border: 1px solid #ededed; + margin-right: 25px; } - #contributions-list li { - padding-bottom:10px; + padding-bottom: 10px; } aside { - text-align: center; - border: 1px solid #ddd; - padding: 20px; - max-width: 250px; + text-align: center; + border: 1px solid #ddd; + padding: 20px; + max-width: 250px; } aside h4 { - text-decoration: underline; + text-decoration: underline; } -.memorial-main-image, .memorial-gallery { - border: 2px solid #000; - border-radius: 8px; - min-height: 200px; - min-width: 100px; +.memorial-main-image, +.memorial-gallery { + border: 2px solid #000; + border-radius: 8px; + min-height: 200px; + min-width: 100px; } .memorial-main-image { - display: block; - max-width: 100%; - margin-bottom: 10px; + display: block; + max-width: 100%; + margin-bottom: 10px; } #gallery { - display: flex; - flex-wrap: wrap; - justify-content: space-around; + display: flex; + flex-wrap: wrap; + justify-content: space-around; } .memorial-gallery img { - max-width: 500px; + max-width: 500px; } .memorial-gallery figcaption { - font-variant: small-caps; + font-variant: small-caps; } - footer { - padding: 10px; - background-color: #343434; - color: #cdcdcd; - font-style: italic; - font-size:0.7em; - text-align: right; + padding: 10px; + background-color: #343434; + color: #cdcdcd; + font-style: italic; + font-size: 0.7em; + text-align: right; } a.btn-main-back { - display: inline; - float: left; - color:#fff; - font-weight: bolder; + display: inline; + float: left; + color: #fff; + font-weight: bolder; } -a.btn-main-back:hover{ - color: #000; +a.btn-main-back:hover { + color: #000; } - /*** media queries for desktop view ***/ @media (min-width: 769px) { - aside { - float: right; - margin: 20px; - padding: 20px; - border: 1px solid #ddd; - } - .memorial-main-image { - float: left; - margin: 25px; - max-width: 350px; - } + aside { + float: right; + margin: 20px; + padding: 20px; + border: 1px solid #ddd; + } + .memorial-main-image { + float: left; + margin: 25px; + max-width: 350px; + } }