{
- const reports = data
- .filter(
- (article) =>
- article.tags &&
- article.tags.indexOf(`country-${countryCode.toLowerCase()}`) > -1,
- )
- .map((article) => article)
- return reports
-}
+import { getReports } from '../../lib/api'
export async function getServerSideProps({ res, query }) {
const { countryCode } = query
@@ -40,12 +30,13 @@ export async function getServerSideProps({ res, query }) {
client.get('/api/_/country_overview', {
params: { probe_cc: countryCode },
}),
- client.get('https://ooni.org/pageindex.json'),
])
+
const testCoverage = results[0].data.test_coverage
const networkCoverage = results[0].data.network_coverage
const overviewStats = results[1].data
- const reports = getCountryReports(countryCode, results[2].data)
+
+ const reports = await getReports(`country-${countryCode.toLowerCase()}`)
return {
props: {
diff --git a/pages/domain/[domain].js b/pages/domain/[domain].js
index e49102e4..6333b90f 100644
--- a/pages/domain/[domain].js
+++ b/pages/domain/[domain].js
@@ -32,7 +32,7 @@ const CountryList = ({ countries }) => {
-
+
{getLocalisedRegionName(key, intl.locale)}
@@ -51,7 +51,6 @@ const swrOptions = {
}
const ChartContainer = ({ domain, ...props }) => {
- const intl = useIntl()
const {
query: { since, until, probe_cc },
} = useRouter()
diff --git a/pages/findings/index.js b/pages/findings/index.js
index 5830f6a3..ecfefc8d 100644
--- a/pages/findings/index.js
+++ b/pages/findings/index.js
@@ -1,15 +1,12 @@
+import { FindingBox } from 'components/landing/HighlightBox'
import { StickySubMenu } from 'components/SharedStyledComponents'
-import HighlightBox from 'components/landing/HighlightBox'
import SpinLoader from 'components/vendor/SpinLoader'
import useFilterWithSort from 'hooks/useFilterWithSort'
+import useFindings from 'hooks/useFindings'
import useUser from 'hooks/useUser'
import Link from 'next/link'
import { Input, Select } from 'ooni-components'
-import { useMemo } from 'react'
import { useIntl } from 'react-intl'
-import useSWR from 'swr'
-import { formatLongDate } from 'utils'
-import { apiEndpoints, fetcher } from '/lib/api'
const sortOptions = [
{ key: 'start_asc', intlKey: 'Sort.StartAsc' },
@@ -22,68 +19,16 @@ const Index = () => {
const intl = useIntl()
const { user } = useUser()
- const { data, isLoading, error } = useSWR(
- apiEndpoints.SEARCH_INCIDENTS,
- fetcher,
- )
-
const { searchValue, sortValue, setSortValue, debouncedSearchHandler } =
useFilterWithSort({ initialSortValue: 'end_desc' })
- const displayData = useMemo(() => {
- if (data) {
- return data.incidents
- .filter((incident) => incident.published)
- .map((incident) => ({
- ...incident,
- start_time: new Date(incident.start_time),
- ...(incident.end_time && { end_time: new Date(incident.end_time) }),
- sort_end_time: incident.end_time
- ? new Date(incident.end_time)
- : new Date(),
- }))
- }
- return []
- }, [data])
-
- const sortedAndFilteredData = useMemo(() => {
- const sortedData = displayData
- .sort((a, b) => b.start_time - a.start_time) // make sure ongoing events are always chronologically sorted
- .sort((a, b) => {
- if (sortValue === 'start_asc') {
- return a.start_time - b.start_time
- }
- if (sortValue === 'start_desc') {
- return b.start_time - a.start_time
- }
- if (sortValue === 'end_asc') {
- return a.sort_end_time - b.sort_end_time
- }
- // default to 'end_desc' sort
- return b.sort_end_time - a.sort_end_time
- })
-
- const filteredData = searchValue.length
- ? sortedData.filter((incident) =>
- searchValue
- ? incident.title
- .toLowerCase()
- .includes(searchValue.toLowerCase()) ||
- incident.short_description
- .toLowerCase()
- .includes(searchValue.toLowerCase())
- : true,
- )
- : sortedData
-
- return filteredData
- }, [displayData, sortValue, searchValue])
+ const { sortedAndFilteredData, isLoading, error } = useFindings({
+ sortValue,
+ searchValue,
+ })
return (
<>
- {/*
-
- */}
{user?.role === 'admin' && (
@@ -139,48 +84,7 @@ const Index = () => {
{!!sortedAndFilteredData?.length && (
{sortedAndFilteredData.map((incident) => (
-
-
- {incident.start_time &&
- formatLongDate(incident.start_time, intl.locale)}{' '}
- -{' '}
- {incident.end_time
- ? formatLongDate(incident.end_time, intl.locale)
- : 'ongoing'}
-
-
- {intl.formatMessage(
- { id: 'Findings.Index.HighLightBox.CreatedOn' },
- {
- date:
- incident?.create_time &&
- formatLongDate(incident?.create_time, intl.locale),
- },
- )}
-
-
- }
- footer={
-
-
-
-
-
- }
- />
+
))}
)}
diff --git a/pages/human-rights.js b/pages/human-rights.js
new file mode 100644
index 00000000..29e5e268
--- /dev/null
+++ b/pages/human-rights.js
@@ -0,0 +1,107 @@
+import ChartWrapper from 'components/ChartWrapper'
+import Form from 'components/domain/Form'
+import FindingsSection from 'components/FindingsSection'
+import ReportsSection from 'components/ReportsSection'
+import {
+ StickySubMenuUpdated,
+ StyledStickySubMenu,
+} from 'components/SharedStyledComponents'
+import { getCountries, getReports } from 'lib/api'
+import { useRouter } from 'next/router'
+import { useIntl } from 'react-intl'
+
+export const getServerSideProps = async () => {
+ try {
+ const reports = await getReports('theme-human_rights')
+ const countries = await getCountries()
+
+ return {
+ props: {
+ reports,
+ countries,
+ },
+ }
+ } catch (error) {
+ return {
+ props: {
+ error: JSON.stringify(error?.message),
+ },
+ }
+ }
+}
+
+const HUMAN_RIGHTS_DOMAINS = [
+ 'www.amnesty.org',
+ 'www.hrw.org',
+ 'freedomhouse.org',
+ 'www.omct.org',
+ 'www.awid.org',
+ 'www.fidh.org',
+]
+
+const HumanRights = ({ countries, reports }) => {
+ const intl = useIntl()
+ const router = useRouter()
+ const { query } = router
+
+ // Sync page URL params with changes from form values
+ const onSubmit = (data) => {
+ const params = {}
+ for (const p of Object.keys(data)) {
+ if (data[p]) {
+ params[p] = data[p]
+ }
+ }
+ // since: "2022-01-02",
+ // until: "2022-02-01",
+
+ const { since, until, probe_cc } = params
+
+ if (
+ query.since !== since ||
+ query.until !== until ||
+ query.probe_cc !== probe_cc
+ ) {
+ router.push({ query: params }, undefined, { shallow: true })
+ }
+ }
+
+ return (
+
+ )
+}
+
+export default HumanRights
diff --git a/pages/login.js b/pages/login.js
index cba440c5..c00b3880 100644
--- a/pages/login.js
+++ b/pages/login.js
@@ -20,7 +20,7 @@ const Login = () => {
// If user is already logged in, redirect to home page
useEffect(() => {
- if (!loading && user && !token) {
+ if (!loading && user?.logged_in && !token) {
router.replace('/')
}
}, [user, loading, router, token])
@@ -40,7 +40,7 @@ const Login = () => {
{/* Before logging In */}
{!token && !submitted && (
<>
-
+
diff --git a/pages/news-media.js b/pages/news-media.js
new file mode 100644
index 00000000..13cdc26a
--- /dev/null
+++ b/pages/news-media.js
@@ -0,0 +1,97 @@
+import { useIntl } from 'react-intl'
+
+import FormattedMarkdown from 'components/FormattedMarkdown'
+import ThematicPage from 'components/ThematicPage'
+import { getCountries, getFindings, getReports } from 'lib/api'
+
+const NEWS_MEDIA_DOMAINS = [
+ 'www.bbc.com',
+ 'www.nytimes.com',
+ 'www.wsj.com',
+ 'www.dw.com',
+ 'www.aljazeera.com',
+ 'www.washingtonpost.com',
+ 'www.forbes.com',
+ 'edition.cnn.com',
+ 'news.google.com',
+ 'www.indiatimes.com',
+ 'www.theguardian.com',
+ 'news.yahoo.com',
+ 'www.cnbc.com',
+ 'www.voanews.com',
+ 'www.reuters.com',
+ 'www.rt.com',
+ 'www.nbcnews.com',
+ 'abcnews.go.com',
+ 'www.cbsnews.com',
+ 'www.aljazeera.net',
+ 'www.lemonde.fr',
+ 'www.theatlantic.com',
+ 'www.alarabiya.net',
+ 'www.alhurra.com',
+ 'www.euronews.com',
+ 'sputnikglobe.com',
+ 'www.rferl.org',
+ 'theintercept.com',
+]
+
+export async function getStaticProps() {
+ try {
+ const reports = await getReports('theme-news_media')
+ const findings = await getFindings({ theme: 'news_media' })
+ const countries = await getCountries()
+ const selectedCountries = findings?.flatMap((f) => f.CCs).slice(0, 3)
+
+ return {
+ props: {
+ reports,
+ findings,
+ countries,
+ selectedCountries,
+ },
+ }
+ } catch (e) {
+ console.error(e)
+ // Sentry.captureException(e)
+ }
+}
+
+const Page = (props) => {
+ const intl = useIntl()
+ const domains = NEWS_MEDIA_DOMAINS.sort((a, b) => {
+ return a.replace('www.', '').localeCompare(b.replace('www.', ''))
+ })
+
+ return (
+
+
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec
+ tristique pharetra lectus a malesuada. Proin blandit justo eu porta
+ aliquam. Curabitur sed aliquam nunc. Nam non justo at arcu
+ condimentum ultrices. Donec at cursus sapien. Suspendisse
+ condimentum ex eu imperdiet pretium. Nulla blandit ex dui, id
+ ullamcorper tellus ultrices a. Suspendisse eleifend nisl dui, in
+ viverra ex blandit ullamcorper. Fusce consectetur nunc vel posuere
+ vehicula. Quisque vel magna nibh.
+
+
+ {domains.map((d) => (
+ -
+ {d}
+
+ ))}
+
+
+ }
+ />
+ )
+}
+
+export default Page
diff --git a/pages/social-media.js b/pages/social-media.js
new file mode 100644
index 00000000..f9b7dd46
--- /dev/null
+++ b/pages/social-media.js
@@ -0,0 +1,144 @@
+import { getCountries, getFindings, getReports } from 'lib/api'
+import { useIntl } from 'react-intl'
+import ThematicPage from '../components/ThematicPage'
+
+const SOCIAL_MEDIA_IM_DOMAINS = [
+ 'www.facebook.com',
+ 'www.instagram.com',
+ 'www.whatsapp.com',
+ 'twitter.com',
+ 'www.youtube.com',
+ 'www.tiktok.com',
+ 'www.wechat.com',
+ 'www.snapchat.com',
+ 'telegram.org',
+ 'www.viber.com',
+ 'signal.org',
+ 'www.reddit.com',
+]
+
+const SOCIAL_MEDIA_IM_TESTS = [
+ 'telegram',
+ 'whatsapp',
+ 'signal',
+ 'facebook_messenger',
+]
+
+export const getServerSideProps = async () => {
+ try {
+ const reports = await getReports(['theme-social_media', 'theme-im'])
+ const findings = await getFindings({ theme: 'social_media' })
+ const countries = await getCountries()
+ const selectedCountries = findings?.flatMap((f) => f.CCs).slice(0, 3)
+
+ return {
+ props: {
+ reports,
+ countries,
+ findings,
+ selectedCountries,
+ },
+ }
+ } catch (error) {
+ // console.log('=====', error)
+ return {
+ props: {
+ error: JSON.stringify(error?.message),
+ },
+ }
+ }
+}
+
+const Page = (props) => {
+ const intl = useIntl()
+ const domains = SOCIAL_MEDIA_IM_DOMAINS.sort((a, b) => {
+ return a.replace('www.', '').localeCompare(b.replace('www.', ''))
+ })
+
+ return (
+
+ <>
+
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec
+ tristique pharetra lectus a malesuada. Proin blandit justo eu porta
+ aliquam. Curabitur sed aliquam nunc. Nam non justo at arcu
+ condimentum ultrices. Donec at cursus sapien. Suspendisse
+ condimentum ex eu imperdiet pretium. Nulla blandit ex dui, id
+ ullamcorper tellus ultrices a. Suspendisse eleifend nisl dui, in
+ viverra ex blandit ullamcorper. Fusce consectetur nunc vel posuere
+ vehicula. Quisque vel magna nibh.
+
+
+ {domains.map((d) => (
+ -
+ {d}
+
+ ))}
+
+
+ In porta lorem neque. Nam tincidunt iaculis pretium. Fusce massa
+ urna, lobortis ut velit in, bibendum maximus felis. Integer sed
+ pretium metus, in rhoncus elit. Maecenas placerat turpis at odio
+ congue, vitae sagittis elit pharetra. Mauris vehicula nisl lectus,
+ non suscipit sem consequat eget. Maecenas vitae mi mi.
+
+
+ {SOCIAL_MEDIA_IM_TESTS.map((d) => (
+ - {d}
+ ))}
+
+
+ }
+ />
+ )
+}
+
+export default Page
+
+// const SocialMedia = ({ reports, findings, countries }) => {
+// const intl = useIntl()
+// // console.log('findings', findings)
+// return (
+//
+//
+// Findings
+// Reports
+// Websites
+//
+// }
+// />
+//
+//
+//
+//
+//
+//
+// {SOCIAL_MEDIA_DOMAINS.map((domain) => (
+//
+//
+//
+// ))}
+//