Skip to content

Commit

Permalink
Merge branch 'master' into talk-rails-5.1-canary-test-
Browse files Browse the repository at this point in the history
  • Loading branch information
yuenmichelle1 committed Oct 31, 2024
2 parents dd8cfb3 + f506e90 commit 52912df
Show file tree
Hide file tree
Showing 54 changed files with 1,602 additions and 959 deletions.
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,11 @@ Make sure you have Node 8 and `npm` 5 or greater. It's recommended you manage yo

### Viewing the Website

Open your web browser of choice and go to `https://localhost:3735/`
The root `/` is redirected to www.zooniverse.org because this frontend app is no longer used for the homepage. Point your browser to a subpath to view this app run locally.

If you want to _login_ via the Panoptes API and _view authenticated pages,_ then you'll need to set up and use `https://local.zooniverse.org:3735` instead of using localhost:3735. Otherwise, you'll run into CORS errors. (You need to add the hostname to your hosts file, pointing to local. Instructions are on [our Stackoverflow](https://stackoverflow.com/c/zooniverse/questions/109).)
Open your web browser of choice and go to `https://localhost:3735/lab`

If you want to _login_ via the Panoptes API and _view authenticated pages,_ then you'll need to set up and use `https://local.zooniverse.org:3735/lab` instead of using localhost:3735. Otherwise, you'll run into CORS errors. (You need to add the hostname to your hosts file, pointing to local. Instructions are on [our Stackoverflow](https://stackoverflow.com/c/zooniverse/questions/109).)

**Troubleshooting: web browser blocks local website**

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ export default function ExternalLink({ className, isExternalLink, isSocialLink,

if (isSocialLink && !!socialIcons[site]) {
const icon = socialIcons[site].icon;
const isMastodonLink = socialIcons[site].label === "Mastodon"
const isBlueSkyLink = socialIcons[site].label === "BlueSky"

iconClasses = `fa ${icon} fa-fw`;
linkLabel = path;
linkProps['aria-label'] = socialIcons[site].ariaLabel;
Expand All @@ -46,7 +49,11 @@ export default function ExternalLink({ className, isExternalLink, isSocialLink,
</span>
{socialLabel && <span className="social-label">{socialIcons[site].label}</span>}
</div>
{iconClasses && <i className={iconClasses} />}
{/** Mastodon and BlueSky icons are not available in this repo's current versino of font-awesome libraries, so we manually add svgs here */}
{isMastodonLink ? <i className='fa fa-fw'><svg viewBox="0 0 448 512" height="14px" width="14px"><path fill="#43bbfd" d="M433 179.1c0-97.2-63.7-125.7-63.7-125.7-62.5-28.7-228.6-28.4-290.5 0 0 0-63.7 28.5-63.7 125.7 0 115.7-6.6 259.4 105.6 289.1 40.5 10.7 75.3 13 103.3 11.4 50.8-2.8 79.3-18.1 79.3-18.1l-1.7-36.9s-36.3 11.4-77.1 10.1c-40.4-1.4-83-4.4-89.6-54a102.5 102.5 0 0 1 -.9-13.9c85.6 20.9 158.7 9.1 178.8 6.7 56.1-6.7 105-41.3 111.2-72.9 9.8-49.8 9-121.5 9-121.5zm-75.1 125.2h-46.6v-114.2c0-49.7-64-51.6-64 6.9v62.5h-46.3V197c0-58.5-64-56.6-64-6.9v114.2H90.2c0-122.1-5.2-147.9 18.4-175 25.9-28.9 79.8-30.8 103.8 6.1l11.6 19.5 11.6-19.5c24.1-37.1 78.1-34.8 103.8-6.1 23.7 27.3 18.4 53 18.4 175z"/></svg></i>
: isBlueSkyLink ? <i className='fa fa-fw'><svg viewBox="0 0 576 512" height="14px" width="14px"><path fill="#43bbfd" d="M407.8 294.7c-3.3-.4-6.7-.8-10-1.3c3.4 .4 6.7 .9 10 1.3zM288 227.1C261.9 176.4 190.9 81.9 124.9 35.3C61.6-9.4 37.5-1.7 21.6 5.5C3.3 13.8 0 41.9 0 58.4S9.1 194 15 213.9c19.5 65.7 89.1 87.9 153.2 80.7c3.3-.5 6.6-.9 10-1.4c-3.3 .5-6.6 1-10 1.4C74.3 308.6-9.1 342.8 100.3 464.5C220.6 589.1 265.1 437.8 288 361.1c22.9 76.7 49.2 222.5 185.6 103.4c102.4-103.4 28.1-156-65.8-169.9c-3.3-.4-6.7-.8-10-1.3c3.4 .4 6.7 .9 10 1.3c64.1 7.1 133.6-15.1 153.2-80.7C566.9 194 576 75 576 58.4s-3.3-44.7-21.6-52.9c-15.8-7.1-40-14.9-103.2 29.8C385.1 81.9 314.1 176.4 288 227.1z"/></svg></i>
: iconClasses ? <i className={iconClasses} /> : null
}
</a>
);
}
Expand Down
2 changes: 2 additions & 0 deletions app/constants/languageMenu.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ export default {
he: 'עברית',
hi: 'हिन्दी',
hr: 'Hrvatski',
hu: 'Magyar',
hy: 'հայերեն',
xh: 'isiXhosa',
zu: 'isiZulu',
id: 'Bahasa Indonesia',
Expand Down
9 changes: 4 additions & 5 deletions app/layout/account-bar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -143,14 +143,13 @@ export default class AccountBar extends React.Component {
<Translate content="accountMenu.profile" />
</Link>
<br />
<Link
<a
role="menuitem"
to="/"
href="https://www.zooniverse.org"
className="site-nav__link"
onClick={this.logClick ? this.logClick.bind(this, 'accountMenu.home') : null}
>
<Translate content="accountMenu.home" />
</Link>
</a>
<br />
<Link
role="menuitem"
Expand Down Expand Up @@ -207,4 +206,4 @@ AccountBar.contextTypes = {
AccountBar.propTypes = {
params: PropTypes.object,
isMobile: PropTypes.bool
};
};
29 changes: 12 additions & 17 deletions app/layout/site-footer.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,9 @@ class AppFooter extends React.Component {
</a>, 'footer.discover.projectBuilderPolicies')}
</li>
<li>
{this.loggableLink(<Link to="/about/faq">
<a href='https://www.zooniverse.org/about/faq'>
<Translate content="footer.discover.faq" />
</Link>, 'footer.discover.faq')}
</a>
</li>
{process.env.NODE_ENV !== 'production' &&
<li>
Expand All @@ -118,34 +118,29 @@ class AppFooter extends React.Component {

<ul className="app-footer__nav-list">
<li>
{this.loggableLink(<Link to="/about">
<a href='https://www.zooniverse.org/about'>
<Translate content="footer.about.aboutUs" />
</Link>, 'footer.about.aboutUs')}
</a>
</li>
<li>
{this.loggableLink(<Link to="/get-involved/education">
<a href='https://www.zooniverse.org/get-involved/educate'>
<Translate content="footer.about.education" />
</Link>, 'footer.about.education')}
</a>
</li>
<li>
{this.loggableLink(<Link to="/about/team">
<a href='https://www.zooniverse.org/about/team'>
<Translate content="footer.about.ourTeam" />
</Link>, 'footer.about.ourTeam')}
</a>
</li>
<li>
{this.loggableLink(<Link to="/about/publications">
<a href='https://www.zooniverse.org/about/publications'>
<Translate content="footer.about.publications" />
</Link>, 'footer.about.publications')}
</li>
<li>
{this.loggableLink(<Link to="/about/acknowledgements">
<Translate content="footer.about.acknowledgements" />
</Link>, 'footer.about.acknowledgements')}
</a>
</li>
<li>
{this.loggableLink(<Link to="/about/contact">
<a href='https://www.zooniverse.org/about#contact'>
<Translate content="footer.boilerplate.contact" />
</Link>, 'footer.boilerplate.contact')}
</a>
</li>
</ul>

Expand Down
37 changes: 11 additions & 26 deletions app/layout/site-nav.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -87,15 +87,12 @@ const SiteNav = createReactClass({
})}
>
{!!this.state.isMobile &&
<Link
to="/"
<a
href="https://www.zooniverse.org"
className="site-nav__link"
activeClassName="site-nav__link--active"
onlyActiveOnIndex={true}
onClick={!!this.logClick ? this.logClick.bind(this, 'mainNav.home') : null}
>
<Translate content="siteNav.home" />
</Link>
</a>
}
<Link
to="/projects"
Expand All @@ -105,22 +102,12 @@ const SiteNav = createReactClass({
>
<Translate content="siteNav.projects" />
</Link>{' '}
<Link
to="/about"
className="site-nav__link"
activeClassName="site-nav__link--active"
onClick={!!this.logClick ? this.logClick.bind(this, 'mainNav.about') : null}
>
<a href='https://www.zooniverse.org/about' className="site-nav__link">
<Translate content="siteNav.about" />
</Link>{' '}
<Link
to="/get-involved"
className="site-nav__link"
activeClassName="site-nav__link--active"
onClick={!!this.logClick ? this.logClick.bind(this, 'mainNav.getInvolved') : null}
>
</a>{' '}
<a href='https://www.zooniverse.org/get-involved' className="site-nav__link">
<Translate content="siteNav.getInvolved" />
</Link>{' '}
</a>{' '}
<Link
to="/talk"
className="site-nav__link"
Expand Down Expand Up @@ -201,14 +188,12 @@ const SiteNav = createReactClass({
render() {
return (
<nav className="site-nav">
<IndexLink
to="/"
<a
href="https://www.zooniverse.org"
className="site-nav__link"
activeClassName="site-nav__link--active"
onClick={!!this.logClick ? this.logClick.bind(this, 'logo') : null}
>
{ZOO_LOGO}
</IndexLink>
</a>

{!this.state.isMobile && this.renderLinks()}

Expand All @@ -225,4 +210,4 @@ const SiteNav = createReactClass({
},
});

export default SiteNav;
export default SiteNav;
12 changes: 12 additions & 0 deletions app/lib/nav-helpers/socialIcons.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,17 @@
"ariaLabel": "Link to Medium article",
"label": "Medium",
"pathBeforeSite": false
},
"bsky.app/": {
"icon": "fa-external-link",
"ariaLabel": "Link to BlueSky page",
"label": "BlueSky",
"pathBeforeSite": false
},
"mastodon.social/": {
"icon": "fa-external-link",
"ariaLabel": "Link to Mastodon page",
"label": "Mastodon",
"pathBeforeSite": false
}
}
4 changes: 3 additions & 1 deletion app/lib/social-icons.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ const SOCIAL_ICONS = {
'wordpress.com/': 'wordpress',
'youtube.com/': 'youtube',
'instagram.com/': 'instagram',
'medium.com/': 'medium'
'medium.com/': 'medium',
'bsky.app/': 'bluesky',
'mastodon.social/': 'mastodon'
};

export default SOCIAL_ICONS;
2 changes: 1 addition & 1 deletion app/locales/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -1059,7 +1059,7 @@ export default {
},
furtherHelp: {
title: '## Further Help',
body: 'If you\'d like some further information, check out the [documentation behind building Kitteh Zoo](https://help.zooniverse.org/getting-started/example), that talks you through building this project in the Project Builder.\n\nIf this doesn\'t help, get in contact with the Zooniverse team via the [contact page](/about/contact).',
body: 'If you\'d like some further information, check out the [documentation behind building Kitteh Zoo](https://help.zooniverse.org/getting-started/example), that talks you through building this project in the Project Builder.\n\nIf this doesn\'t help, get in contact with the Zooniverse team via the [contact page](https://www.zooniverse.org/about#contact).',
backToTop: '[Back to top](#how-to-create-a-project-with-our-project-builder)'
}
}
Expand Down
159 changes: 159 additions & 0 deletions app/locales/hu.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,159 @@
export default {
loading: '(Betöltés alatt)',
aboutPages: {
missingContent: {
education: 'Ehhez a projekthez nem adtak meg oktatási anyagokat.',
faq: 'Ehhez a projekthez nem adtak meg gyakran ismételt kérdéseket.',
research: 'Ehhez a projekthez nem adtak meg tudományos hátteret.',
results: 'Ehhez a projekthez nem adtak meg tudományos eredményeket.',
team: 'Ehhez a projekthez nem adtak meg információt a csapattagokról.'
}
},
projectRoles: {
title: 'Csapattag',
owner: 'Projektgazda',
collaborator: 'Kollaborátor',
translator: 'Fordító',
scientist: 'Kutató',
moderator: 'Moderátor',
tester: 'Tesztelő',
expert: 'Szakértő',
museum: 'Múzeum'
},
classifier: {
back: 'Vissza',
backButtonWarning: 'Ha visszalépsz, törlődik a jelen feladathoz adott válaszod.',
close: 'Bezár',
continue: 'Folytatás',
detailsSubTaskFormSubmitButton: 'OK',
done: 'Kész',
doneAndTalk: 'Kész & komment',
dontShowMinicourse: 'Ne mutasd a mini kurzust a jövőben',
letsGo: 'Kezdjük!',
next: 'Következő',
optOut: 'Kihagy',
taskTabs: {
taskTab: 'Feladat',
tutorialTab: 'Útmutató'
},
recents: 'Legutóbbi osztályozásaid',
talk: 'Komment',
taskHelpButton: 'Segítségre van szükséged ehhez a feladathoz?',
miniCourseButton: 'Projekt bevezető kurzus újrakezdése',
workflowAssignmentDialog: {
promotionMessage: 'Gratulálunk!',
acceptButton: 'Vigyél a következő szintre!',
declineButton: 'Nem, köszönöm'
},
interventions: {
optOut: 'Ne mutasson további üzeneteket.',
studyInfo: 'Nem szeretnék részt venni ebbben a [kutatásban](+tab+https://docs.google.com/document/d/1gLyN6Dgff8dOCOC88f47OD6TtFrfSJltsLgJMKkYMso/preview).'
}
},
projects: {
welcome: {
heading: 'Üdvözlünk! Örülönk, hogy itt vagy',
thanks: 'Köszönjük érdeklődésedet a valódi kutatás segítése iránt. Összegyűjtöttünk néhány olyan projektet, amelyekhez most valóban szükségünk van a segítségedre. További lehetőségekért görgess le, és böngéssz az összes aktív projekt között.',
talk: 'Ne felejtsd el megnézni a [Talk fórum](/talk) oldalt is, ahol cseveghetsz más hasonló gondolkodású önkéntesekkel.',
scrollDown: 'Görgess lejjebb a további információért'
}
},
project: {
language: 'Nyelv',
loading: 'Projekt betöltése',
disclaimer: 'Ez a projekt a Zooniverse Project Builder segítségével készült, de még nem hivatalos Zooniverse projekt. Előfordulhat, hogy a Zooniverse csapatához intézett, a projekttel kapcsolatos kérdések és kérdések nem kapnak választ.',
fieldGuide: 'Útmutató',
about: {
header: 'Rólunk',
nav: {
research: 'Kutatás',
results: 'Eredmények',
faq: 'GyIK',
education: 'Oktatás',
team: 'Csapatunk'
}
},
nav: {
about: 'Rólunk',
adminPage: 'Admin oldal',
classify: 'Osztályozás',
collections: 'Gyűjtemény',
exploreProject: 'Projekt felfedezése',
lab: 'Labor',
recents: 'Legutóbbiak',
talk: 'Talk fórum',
underReview: 'Ellenőrzés alatt',
zooniverseApproved: 'Zooniverse jóváhagyta'
},
classifyPage: {
dark: 'Sötét',
light: 'Világos',
title: 'Osztályozás',
themeToggle: '%(theme)s témára váltás'
},
home: {
organization: 'Szervezet',
researcher: 'Üzenet a kutatóktól',
about: '%(title)s bemutatása',
metadata: {
statistics: '%(title)s statisztikája',
classifications: 'Osztályozások',
volunteers: 'Önkéntesek',
completedSubjects: 'Befejezett alanyok',
subjects: 'Alanyok'
},
talk: {
zero: 'Most éppen senki nem beszél a/az **%(title)s** projektről.',
one: 'Most éppen **1** ember beszél a/az **%(title)s** projektről.',
other: 'Most éppen **%(count)s** ember beszél a/az **%(title)s** projektről.'
},
joinIn: 'Csatlakozz',
learnMore: 'Tudj meg többet',
getStarted: 'Kezdj bele',
workflowAssignment: 'Mostmár beléphetsz a %(workflowDisplayName)s projektbe',
visitLink: 'Projekt meglátogatása',
links: 'Külső projekt linkek'
}
},
tasks: {
hidePreviousMarks: 'Előző %(count)s jelölés elrejtése',
less: 'Kevesebb',
more: 'Több',
shortcut: {
noAnswer: 'Nincs válasz'
},
survey: {
clear: 'Törlés',
clearFilters: 'Szűrők törlése',
makeSelection: 'Kiválasztás',
showing: '%(max)s -ból/ből %(count)s darab megjelenítése',
confused: 'Gyakran összetéveszthető ezzel:',
dismiss: 'Elutasít',
itsThis: 'Szerintem ez az',
cancel: 'Mégsem',
identify: 'Beazonosít',
surveyOf: '%(count)s darab felmérése',
identifications: {
zero: 'Nincs még beazonosítás',
one: '1 beazonosítás',
other: '%(count)s beazonosítás'
}
}
},
workflowToggle: {
label: 'Aktív'
},
collections: {
createForm: {
private: 'Privát',
submit: 'Gyűjteményhez ad'
}
},
feedback: {
categories: {
correct: 'Találatok',
incorrect: 'Tévesztések',
falsepos: 'Hamis pozitívok'
}
}
}
Loading

0 comments on commit 52912df

Please sign in to comment.