Skip to content

Commit

Permalink
Merge pull request #470 from EcrituresNumeriques/feature/matomo
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomas Parisot authored Dec 1, 2021
2 parents 58b1eed + f90ce35 commit dbf81e0
Show file tree
Hide file tree
Showing 19 changed files with 12,070 additions and 8,675 deletions.
19 changes: 0 additions & 19 deletions apps.config.js

This file was deleted.

24 changes: 24 additions & 0 deletions ecosystem.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
const { parsed } = require('dotenv').config({ path: 'stylo.env'})

module.exports = {
apps: [
{
name: "front",
script: "vite",
cwd: "./front/gatsby",
env: parsed
},
{
name: "export",
script: "nodemon",
args: "./src/app.js",
cwd: "./export"
},
{
name: "graphql",
script: "nodemon",
args: "--config nodemon.json app.js",
cwd: "./graphql"
}
]
}
56 changes: 34 additions & 22 deletions front/gatsby/index.html
Original file line number Diff line number Diff line change
@@ -1,32 +1,44 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="./favicon.ico" />
<meta http-equiv="x-ua-compatible" content="ie=edge" />
<meta
name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no"
/>
<meta charset="utf-8">
<link rel="icon" href="./favicon.ico">
<link rel="preconnect" href="https://polyfill.io">
<link rel="preconnect" href="https://analyseweb.huma-num.fr">
<meta http-equiv="x-ua-compatible" content="ie=edge">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<title data-react-helmet="true">Stylo</title>
<link rel="icon" type="image/png" sizes="32x32" href="./favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="./favicon-16x16.png">
<meta name="description" content="Stylo, online text editor for scholars" />
<meta name="image" content="/favicon.ico" />
<meta property="og:title" content="Stylo" />
<meta
property="og:description"
content="Stylo, online text editor for scholars"
/>
<meta property="og:image" content="/favicon.ico" />
<meta name="twitter:card" content="summary_large_image" />
<meta name="twitter:title" content="Stylo" />
<meta
name="twitter:description"
content="Stylo, online text editor for scholars"
/>
<meta name="twitter:image" content="/favicon.ico" />
<meta name="description" content="Stylo, online text editor for scholars">
<meta name="image" content="/favicon.ico">
<meta property="og:title" content="Stylo">
<meta property="og:description" content="Stylo, online text editor for scholars">
<meta property="og:image" content="/favicon.ico">
<meta name="twitter:card" content="summary_large_image">
<meta name="twitter:title" content="Stylo">
<meta name="twitter:description" content="Stylo, online text editor for scholars">
<meta name="twitter:image" content="/favicon.ico">
<script src="https://polyfill.io/v3/polyfill.min.js"></script>
{{#if SNOWPACK_MATOMO}}
<!-- Matomo -->
<script>
var _paq = window._paq = window._paq || [];
/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
_paq.push(["setDoNotTrack", true]);
_paq.push(['requireConsent']);
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function() {
var u="{{ SNOWPACK_MATOMO_URL }}";
_paq.push(['setTrackerUrl', u+'piwik.php']);
_paq.push(['setSiteId', '{{ SNOWPACK_MATOMO_SITE_ID }}']);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
g.async=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
})();
</script>
<!-- End Matomo Code -->
{{/if}}
</head>
<body>
<div id="root" aria-live></div>
Expand Down
118 changes: 117 additions & 1 deletion front/gatsby/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion front/gatsby/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
"node-fetch": "^2.6.1",
"prettier": "^2.3.0",
"sass": "^1.43.4",
"vite": "^2.6.14"
"vite": "^2.6.14",
"vite-plugin-handlebars": "^1.6.0"
}
}
36 changes: 36 additions & 0 deletions front/gatsby/src/components/Footer.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
import React, { useCallback } from 'react'
import { useSelector, useDispatch } from 'react-redux'
import { Switch, Route, Link } from 'react-router-dom'

import styles from './header.module.scss'

function Footer () {
const dispatch = useDispatch()
const userHasConsent = useSelector(state => state.userPreferences.trackingConsent)
const toggleConsent = useCallback(() => dispatch({ type: 'USER_PREFERENCES_TOGGLE', key: 'trackingConsent' }), [])

return (<Switch>
<Route path="*/preview" />
<Route path="*">
<footer className={styles.footerContainer}>
<ul className={styles.footerList}>
<li>Stylo</li>
<li>
<a href="https://github.com/EcrituresNumeriques/stylo/releases" rel="noopener noreferrer" target="_blank">
Changelog
</a>
</li>
<li><Link to="/privacy">Privacy</Link></li>
{ import.meta.env.SNOWPACK_MATOMO_URL && (<li>
<label className={styles.consentLabel}>
<input type="checkbox" checked={userHasConsent} onChange={toggleConsent} disabled={true} />
I accept to share my navigation stats
</label>
</li>) }
</ul>
</footer>
</Route>
</Switch>)
}

export default Footer
3 changes: 1 addition & 2 deletions front/gatsby/src/components/Header.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ function Header () {
)

return (<Switch>
<Route path="*/preview">
</Route>
<Route path="*/preview" />
<Route path="*">
<header className={styles.headerContainer}>
<section className={styles.header}>
Expand Down
15 changes: 15 additions & 0 deletions front/gatsby/src/components/Privacy.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import React from 'react'

import styles from '../components/Write/write.module.scss'

export default function Privacy () {
return (
<section className={styles.container}>
<article className={styles.simplePage}>
<h2>Privacy Terms</h2>

<p>Coming soon…</p>
</article>
</section>
)
}
7 changes: 6 additions & 1 deletion front/gatsby/src/components/Write/write.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,16 @@
}
}

.error {
.simplePage {
background-color: $extra-background-color;
box-shadow: 1px 2px 4px rgba(0, 0, 0, .3);
margin: 5em auto;
padding: 10em 2em;
width: 50%;
}

.error {
@extend .simplePage;
color: $error-color;
}

Expand Down
Loading

0 comments on commit dbf81e0

Please sign in to comment.