diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml new file mode 100644 index 0000000..2368bdc --- /dev/null +++ b/.github/workflows/codeql-analysis.yml @@ -0,0 +1,70 @@ +# For most projects, this workflow file will not need changing; you simply need +# to commit it to your repository. +# +# You may wish to alter this file to override the set of languages analyzed, +# or to provide custom queries or build logic. +# +# ******** NOTE ******** +# We have attempted to detect the languages in your repository. Please check +# the `language` matrix defined below to confirm you have the correct set of +# supported CodeQL languages. +# +name: "CodeQL" + +on: + push: + branches: [ main ] + pull_request: + # The branches below must be a subset of the branches above + branches: [ main ] + schedule: + - cron: '17 11 * * 4' + +jobs: + analyze: + name: Analyze + runs-on: ubuntu-latest + permissions: + actions: read + contents: read + security-events: write + + strategy: + fail-fast: false + matrix: + language: [ 'javascript' ] + # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ] + # Learn more about CodeQL language support at https://git.io/codeql-language-support + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v2 + with: + languages: ${{ matrix.language }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + # queries: ./path/to/local/query, your-org/your-repo/queries@main + + # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). + # If this step fails, then you should remove it and run the build manually (see below) + - name: Autobuild + uses: github/codeql-action/autobuild@v2 + + # ℹ️ Command-line programs to run using the OS shell. + # 📚 https://git.io/JvXDl + + # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines + # and modify them (or add more) to build your code if your project + # uses a compiled language + + #- run: | + # make bootstrap + # make release + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v2 diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 0000000..034e848 --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,21 @@ +# Security Policy + +## Supported Versions + +Use this section to tell people about which versions of your project are +currently being supported with security updates. + +| Version | Supported | +| ------- | ------------------ | +| 5.1.x | :white_check_mark: | +| 5.0.x | :x: | +| 4.0.x | :white_check_mark: | +| < 4.0 | :x: | + +## Reporting a Vulnerability + +Use this section to tell people how to report a vulnerability. + +Tell them where to go, how often they can expect to get an update on a +reported vulnerability, what to expect if the vulnerability is accepted or +declined, etc. diff --git a/public/favicons/android-chrome-192x192.png b/public/favicons/android-chrome-192x192.png index 50fe3ba..05b332c 100644 Binary files a/public/favicons/android-chrome-192x192.png and b/public/favicons/android-chrome-192x192.png differ diff --git a/public/favicons/android-chrome-512x512.png b/public/favicons/android-chrome-512x512.png new file mode 100644 index 0000000..8661006 Binary files /dev/null and b/public/favicons/android-chrome-512x512.png differ diff --git a/public/favicons/apple-touch-icon.png b/public/favicons/apple-touch-icon.png index 882b6e0..a7b08e1 100644 Binary files a/public/favicons/apple-touch-icon.png and b/public/favicons/apple-touch-icon.png differ diff --git a/public/favicons/favicon-16x16.png b/public/favicons/favicon-16x16.png index 9039362..c6fb8c6 100644 Binary files a/public/favicons/favicon-16x16.png and b/public/favicons/favicon-16x16.png differ diff --git a/public/favicons/favicon-32x32.png b/public/favicons/favicon-32x32.png index b5c658e..95c4a1c 100644 Binary files a/public/favicons/favicon-32x32.png and b/public/favicons/favicon-32x32.png differ diff --git a/public/favicons/favicon.ico b/public/favicons/favicon.ico index cd8c5d7..e0b7d2a 100644 Binary files a/public/favicons/favicon.ico and b/public/favicons/favicon.ico differ diff --git a/public/favicons/manifest.json b/public/favicons/manifest.json index 0e217b0..74136b0 100644 --- a/public/favicons/manifest.json +++ b/public/favicons/manifest.json @@ -1,50 +1,50 @@ { - "name": "TrombiFab - Digifab", - "short_name": "TrombiFab", - "icons": [ - { - "src": "/android-chrome-36x36.png?v=1", - "sizes": "36x36", - "type": "image/png" - }, - { - "src": "/android-chrome-48x48.png?v=1", - "sizes": "48x48", - "type": "image/png" - }, - { - "src": "/android-chrome-72x72.png?v=1", - "sizes": "72x72", - "type": "image/png" - }, - { - "src": "/android-chrome-96x96.png?v=1", - "sizes": "96x96", - "type": "image/png" - }, - { - "src": "/android-chrome-144x144.png?v=1", - "sizes": "144x144", - "type": "image/png" - }, - { - "src": "/android-chrome-192x192.png?v=1", - "sizes": "192x192", - "type": "image/png" - }, - { - "src": "/android-chrome-256x256.png?v=1", - "sizes": "256x256", - "type": "image/png" - }, - { - "src": "/android-chrome-384x384.png?v=1", - "sizes": "384x384", - "type": "image/png" - } - ], - "theme_color": "#212121", - "background_color": "#EEEEEE", - "start_url": "https://digifab-dev.github.io/TrombiFab/", - "display": "browser" + "name": "TrombiFab - Digifab", + "short_name": "TrombiFab", + "icons": [ + { + "src": "/android-chrome-36x36.png?v=1", + "sizes": "36x36", + "type": "image/png" + }, + { + "src": "/android-chrome-48x48.png?v=1", + "sizes": "48x48", + "type": "image/png" + }, + { + "src": "/android-chrome-72x72.png?v=1", + "sizes": "72x72", + "type": "image/png" + }, + { + "src": "/android-chrome-96x96.png?v=1", + "sizes": "96x96", + "type": "image/png" + }, + { + "src": "/android-chrome-144x144.png?v=1", + "sizes": "144x144", + "type": "image/png" + }, + { + "src": "/android-chrome-192x192.png?v=1", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "/android-chrome-256x256.png?v=1", + "sizes": "256x256", + "type": "image/png" + }, + { + "src": "/android-chrome-384x384.png?v=1", + "sizes": "384x384", + "type": "image/png" + } + ], + "theme_color": "#212121", + "background_color": "#FFFFFF", + "start_url": "https://digifab-dev.github.io/TrombiFab/", + "display": "browser" } diff --git a/public/favicons/site.webmanifest b/public/favicons/site.webmanifest index 0e217b0..b19a986 100644 --- a/public/favicons/site.webmanifest +++ b/public/favicons/site.webmanifest @@ -1,50 +1,19 @@ { - "name": "TrombiFab - Digifab", - "short_name": "TrombiFab", - "icons": [ - { - "src": "/android-chrome-36x36.png?v=1", - "sizes": "36x36", - "type": "image/png" - }, - { - "src": "/android-chrome-48x48.png?v=1", - "sizes": "48x48", - "type": "image/png" - }, - { - "src": "/android-chrome-72x72.png?v=1", - "sizes": "72x72", - "type": "image/png" - }, - { - "src": "/android-chrome-96x96.png?v=1", - "sizes": "96x96", - "type": "image/png" - }, - { - "src": "/android-chrome-144x144.png?v=1", - "sizes": "144x144", - "type": "image/png" - }, - { - "src": "/android-chrome-192x192.png?v=1", - "sizes": "192x192", - "type": "image/png" - }, - { - "src": "/android-chrome-256x256.png?v=1", - "sizes": "256x256", - "type": "image/png" - }, - { - "src": "/android-chrome-384x384.png?v=1", - "sizes": "384x384", - "type": "image/png" - } - ], - "theme_color": "#212121", - "background_color": "#EEEEEE", - "start_url": "https://digifab-dev.github.io/TrombiFab/", - "display": "browser" + "name": "TrombiFab - Digifab", + "short_name": "TrombiFab", + "icons": [ + { + "src": "/android-chrome-192x192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "/android-chrome-512x512.png", + "sizes": "512x512", + "type": "image/png" + } + ], + "theme_color": "#212121", + "background_color": "#FFFFFF", + "display": "browser" } diff --git a/public/index.html b/public/index.html index 1980b4d..b02f28c 100644 --- a/public/index.html +++ b/public/index.html @@ -43,7 +43,7 @@ diff --git a/public/sketch-particles.js b/public/sketch-particles.js index 60fd976..3e6f129 100644 --- a/public/sketch-particles.js +++ b/public/sketch-particles.js @@ -16,7 +16,7 @@ Particle.prototype = { this.wander = 0.15; this.theta = random(TWO_PI); this.drag = 0.92; - this.color = '#EEEEEE'; + this.color = '#FFFFFF'; this.x = x || 0.0; this.y = y || 0.0; @@ -62,8 +62,8 @@ var particles = []; var pool = []; var COLOURS = [ - '#E3F2FD', '#BBDEFB', '#90CAF9', '#64B5F6', '#42A5F5', '#2196F3', '#1E88E5', '#1976D2', '#1565C0', '#0D47A1', // Blue 50->900 - '#FFF8E1', '#FFECB3', '#FFE082', '#FFD54F', '#FFCA28', '#FFC107', '#FFB300', '#FFA000', '#FF8F00', '#FF6F00' // Amber 50->900 + '#E3F2FD', '#BBDEFB', '#90CAF9', '#64B5F6', '#F7777A', '#6F91AD', '#285A84', '#1976D2', '#1565C0', '#0D47A1', // Blue 50->900 + '#FFF8E1', '#FFECB3', '#FFE082', '#FFD54F', '#FFCA28', '#F7777A', '#FFB300', '#FFA000', '#FF8F00', '#FF6F00' // Amber 50->900 ]; var CONTAINER = document.getElementById('sketch-particles'); diff --git a/src/components/BatchCards.tsx b/src/components/BatchCards.tsx index ffe3f46..ee1f7b5 100644 --- a/src/components/BatchCards.tsx +++ b/src/components/BatchCards.tsx @@ -17,7 +17,7 @@ const BatchCards = ({ persons, numberPerBatch = 16 }: any) => { const infoCardContainer: object = { padding: 20, - backgroundColor: "#42a5f5", + backgroundColor: "#F7777A", borderRadius: 10, flexDirection: "row", display: "flex", diff --git a/src/index.scss b/src/index.scss index c8e8cad..1575492 100644 --- a/src/index.scss +++ b/src/index.scss @@ -1,13 +1,13 @@ // https://sass-lang.com/guide /* Blue 400-500-600 */ -$color--primary-light: #42a5f5; -$color--primary: #2196f3; -$color--primary-dark: #1e88e5; +$color--primary-light: #f7777a; +$color--primary: #6f91ad; +$color--primary-dark: #285a84; /* Amber 400-500-600 */ $color--secondary-light: #ffca28; -$color--secondary: #ffc107; +$color--secondary: #f7777a; $color--secondary-dark: #ffb300; /* Gray 100-500-900 */ @@ -24,7 +24,7 @@ $colors: ( secondary-dark: $color--secondary-dark, additional1: $color--additional1, additional2: $color--additional2, - additional3: $color--additional3 + additional3: $color--additional3, ); .leaflet-container { @@ -74,7 +74,7 @@ svg { body { min-width: 22.25rem; - font-family: "Roboto Condensed", sans-serif; + font-family: "Comfortaa", sans-serif; cursor: default; } @@ -311,7 +311,7 @@ main { max-height: 4.5rem; min-height: 5rem; width: auto; - padding: 1.5rem 1rem 2rem !important; + padding: 1.5rem 1rem 2rem !important; margin: 0; white-space: nowrap; overflow: hidden; @@ -325,7 +325,7 @@ main { max-height: 4.5rem; min-height: 5rem; width: auto; - padding: 1.2rem 1rem 2rem !important; + padding: 1.2rem 1rem 2rem !important; font-size: 18px; margin: 0; white-space: nowrap; diff --git a/src/index.tsx b/src/index.tsx index 86d7ae4..e258aab 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -8,9 +8,9 @@ import "./index.scss" WebFont.load({ google: { - // families: ["Roboto Condensed:300,400,700", "sans-serif"] - // families: ["Roboto Condensed:300,400,700&display=swap"] - families: ["Roboto Condensed:300,400,700&display=swap&subset=latin-ext"], + // families: ["Comfortaa:300,400,700", "sans-serif"] + // families: ["Comfortaa:300,400,700&display=swap"] + families: ["Comfortaa:300,400,700&display=swap&subset=latin-ext"], }, }) diff --git a/src/util/UsersDataCleanup.tsx b/src/util/UsersDataCleanup.tsx index a31bda8..cc81258 100644 --- a/src/util/UsersDataCleanup.tsx +++ b/src/util/UsersDataCleanup.tsx @@ -28,7 +28,7 @@ const allCountryNamesCleaned = people.map((person: Person) => { // remplace 2 ou plusieurs espaces par un seul. .replace(/ +/g, " ") .trim() - // .toLowerCase() + .toLowerCase() ) })