Skip to content

Main -> Staging Backport #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kennethsn merged 4 commits into from
Jul 6, 2023
Merged

Main -> Staging Backport #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0b0527b
Merge pull request #142 from ScienceStories/staging
kennethsn Jul 2, 2023
cc1e275
(#143) FIX: Fixed typo and added year stamp on homepage
vsealsnutt Jul 6, 2023
329fbe1
cleaned up year stamp code
vsealsnutt Jul 6, 2023
7b8f449
Merge pull request #144 from ScienceStories/143_homepage-fixes
vsealsnutt Jul 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions manifests/2338337HarvardPaperTape.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@
"@type": "oa:Annotation",
"motivation": "sc:painting",
"resource": {
"@id": "http://iiif.ss.ksn.io/iiif/2/2339337HarvardPaperTape.jpg/full/full/0/default.jpg",
"@id": "https://iiif.ss.ksn.io/iiif/2/2339337HarvardPaperTape.jpg/full/full/0/default.jpg",
"@type": "dctypes:Image",
"format": "image/jpeg",
"service": {
"@context": "http://iiif.io/api/image/2/context.json",
"@id": "http://iiif.ss.ksn.io/iiif/2/2339337HarvardPaperTape.jpg",
"@context": "https://iiif.io/api/image/2/context.json",
"@id": "https://iiif.ss.ksn.io/iiif/2/2339337HarvardPaperTape.jpg",
"profile": [
"http://iiif.io/api/image/2/level2.json",
"https://iiif.io/api/image/2/level2.json",
{
"formats": [
"jpg",
Expand Down
4 changes: 2 additions & 2 deletions server/constants/faq.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[
{
"question": "How do you decide who gets a science story?",
"answer": "We work from print materials such as biographical dictionaries and biographical sketches. We also consult archival material. "
"answer": "We work from print materials such as biographical dictionaries and biographical sketches. We also consult archival material. "
},
{
"question": "Why are their more historical figures than living people in Science Stories?",
"question": "Why are there more historical figures than living people in Science Stories?",
"answer": "Currently there are more historical figures than living people in Science Stories because we ask for consent from living people before creating a new story. If you would like us to tell your story, please email us at info@sciencestories.io. "
},
{
Expand Down
2 changes: 1 addition & 1 deletion server/stories_api/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const axios = require('axios');
const STORIES_API_ENDPOINT = process.env.STORIES_API_ENDPOINT;
const STORIES_API_COLLECTION_ID = process.env.STORIES_API_COLLECTION_ID;
const STORIES_API_PUBLIC_KEY = process.env.STORIES_API_PUBLIC_KEY;
const PUBLIC_URL = process.env.PUBLIC_URL || "http://sciencestories.io";
const PUBLIC_URL = process.env.PUBLIC_URL || "https://sciencestories.io";
const RETRY_STATUS_CODE = 206;
const RETRY_WAIT_TIME = 1000;
const STORIES_API_ENDPOINT_ALLOW_RETRY = process.env.STORIES_API_ENDPOINT_ALLOW_RETRY;
Expand Down
6 changes: 3 additions & 3 deletions views/partials/donate_scripts.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script src='http://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js'></script>
<script src='http://ajax.googleapis.com/ajax/libs/jqueryui/1.11.2/jquery-ui.min.js'></script>
<script src='https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js'></script>
<script src='https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.2/jquery-ui.min.js'></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/slick-carousel@1.8.1/slick/slick.min.js"></script>
<script type="text/javascript" src="http://malsup.github.io/jquery.cycle.lite.js"></script>
<script type="text/javascript" src="https://malsup.github.io/jquery.cycle.lite.js"></script>
<script src="/static/js/home.js"></script>
<script src="/static/js/donate.js"></script>
7 changes: 6 additions & 1 deletion views/partials/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,13 @@

<br>

© Science Stories 2018 <br>
© Science Stories <span id="year-stamp"></span> <br>
<a href="https://www.seals-nutt.com">Developed By Seals-Nutt</a><br>
<a href="/sitemap">sitemap</a>
</p>
</section>

<script>
const yearStamp = document.getElementById('year-stamp');
yearStamp.innerHTML = new Date().getFullYear();
</script>
2 changes: 1 addition & 1 deletion views/partials/home.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ <h2 class="section-header">Frequently Asked Questions</h2>
{{> footer}}
<script>
var addthis_share = {
url: "http://www.sciencestories.io",
url: "https://www.sciencestories.io",
title: "Welcome to Science Stories",
description: "Science Stories brings scientific work into social spaces. Communicating scientific \
information in spaces where people can discover it in-context creates a \
Expand Down
4 changes: 2 additions & 2 deletions views/partials/home_scripts.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script src='http://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js'></script>
<script src='http://ajax.googleapis.com/ajax/libs/jqueryui/1.11.2/jquery-ui.min.js'></script>
<script src='https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js'></script>
<script src='https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.2/jquery-ui.min.js'></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/slick-carousel@1.8.1/slick/slick.min.js"></script>
<script src="https://unpkg.com/imagesloaded@4/imagesloaded.pkgd.min.js"></script>
<script src="https://unpkg.com/masonry-layout@4/dist/masonry.pkgd.min.js"></script>
Expand Down
Loading