diff --git a/assets/images/coopgo-logo-whitegreen.svg b/assets/images/coopgo-logo-whitegreen.svg new file mode 100644 index 00000000..0ad3fc84 --- /dev/null +++ b/assets/images/coopgo-logo-whitegreen.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + diff --git a/assets/images/womancup-cut.svg b/assets/images/womancup-cut.svg new file mode 100644 index 00000000..1c4b8199 --- /dev/null +++ b/assets/images/womancup-cut.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/config.yaml b/config.yaml index 7e266390..4aebf995 100644 --- a/config.yaml +++ b/config.yaml @@ -10,9 +10,9 @@ params: images: - images/slide-coopgo.png - featuredimage: "images/womancup.png" + featuredimage: "images/womancup-cut.svg" social: - facebook: https://facebook.com/ridygo.fr + facebook: https://www.facebook.com/COOPGO/ twitter: https://twitter.com/ridygo linkedin: https://www.linkedin.com/company/11145362 youtube: https://www.youtube.com/channel/UCcWIOlcyz99T3cH83JYlUVQ diff --git a/content/mentions-legales.md b/content/mentions-legales.md index c9801c27..08f47c5b 100644 --- a/content/mentions-legales.md +++ b/content/mentions-legales.md @@ -5,7 +5,7 @@ date: 2021-05-31T20:51:54+02:00 # Mentions légales -Site(ci-après « le Site ») : www.ridygo.fr +Site(ci-après « le Site ») : coopgo.fr L'Editeur (ci-après « Scity») : Scity, Société Coopérative à Responsabilité Limitée (SCOP ARL) au capital variable dont le siège social est situé au 1240 route des Dolines, 06560 VALBONNE immatriculée au Registre du Commerce et des Sociétés de GRASSE sous le numéro RCS GRASSE 812641314, numéro SIRET 81264131400024 représentée par Monsieur Arnaud DELCASSE (Gérant) diff --git a/content/opensource.md b/content/opensource.md new file mode 100644 index 00000000..0ec0c2e7 --- /dev/null +++ b/content/opensource.md @@ -0,0 +1,39 @@ +--- +title: "Open source et données ouvertes" +date: 2021-06-11T13:51:09+02:00 +--- + +# COOPGO ❤️ l'open source et les données ouvertes + +Chez COOPGO, nous aimons et privilégions le logiciel libre. Nos systèmes s'appuient sur des données ouvertes et nous contribuons à des projets existants, notamment liés à l'écosystème OpenStreetMap. + +Au cours de l'année 2021, nous publierons de nouveaux composants de nos systèmes internes sous licence libre. + +## Nos propres projets open source + +{{< flex-row >}} +{{% column %}} +![coopgo/gtfs](/content/images/coopgo-gtfs.svg) + +**coopgo/gtfs** est une librairie GTFS pour le langage de programmation Go. Elle permet de lire et d'exploiter des fichiers de données de transports en commun au format GTFS. Elle a été conçue pour être la plus performante possible en termes de rapidité d'exécution et de lecture de fichiers. + +**coopgo/gtfs** est publié sous licence Apache 2.0. + +[Voir sur Github](https://github.com/coopgo/gtfs) +{{% /column %}}{{% column %}} +![coopgo/gtfs](/content/images/coopgo-rdex.svg) + +**coopgo/rdex** est une librairie permettant de mettre en place un serveur RDEX pour l'interopérabilité des trajets en covoiturage. + +**coopgo/rdex** est publié sous licence Apache 2.0. + +[Voir sur Github](https://github.com/coopgo/rdex) +{{% /column %}} +{{% column %}} + +{{% /column %}} +{{< /flex-row >}} + + +## Nous nous appuyons et contribuons à ... + diff --git a/resources/_gen/assets/scss/sass/main.scss_f300667da4f5b5f84e1a9e0702b2fdde.content b/resources/_gen/assets/scss/sass/main.scss_f300667da4f5b5f84e1a9e0702b2fdde.content index 3fc6187d..d6320aba 100644 --- a/resources/_gen/assets/scss/sass/main.scss_f300667da4f5b5f84e1a9e0702b2fdde.content +++ b/resources/_gen/assets/scss/sass/main.scss_f300667da4f5b5f84e1a9e0702b2fdde.content @@ -409,6 +409,24 @@ a { .min-h-200 { min-height: 200px; } +.w-250 { + width: 250px; } + +.max-w-250 { + max-width: 250px; } + +.min-w-250 { + min-width: 250px; } + +.h-250 { + height: 250px; } + +.max-h-250 { + max-height: 250px; } + +.min-h-250 { + min-height: 250px; } + .w-300 { width: 300px; } @@ -427,6 +445,24 @@ a { .min-h-300 { min-height: 300px; } +.w-350 { + width: 350px; } + +.max-w-350 { + max-width: 350px; } + +.min-w-350 { + min-width: 350px; } + +.h-350 { + height: 350px; } + +.max-h-350 { + max-height: 350px; } + +.min-h-350 { + min-height: 350px; } + .w-400 { width: 400px; } @@ -445,6 +481,24 @@ a { .min-h-400 { min-height: 400px; } +.w-450 { + width: 450px; } + +.max-w-450 { + max-width: 450px; } + +.min-w-450 { + min-width: 450px; } + +.h-450 { + height: 450px; } + +.max-h-450 { + max-height: 450px; } + +.min-h-450 { + min-height: 450px; } + .w-500 { width: 500px; } @@ -1076,7 +1130,6 @@ a { nav#navbar { z-index: 100; - height: 3em; display: flex; justify-content: flex-between; align-items: center; @@ -1135,50 +1188,46 @@ nav#navbar { margin: auto; width: 65%; } -nav#navbar .left { - flex: 0; - text-align: left; - background-color: #ffffff; } - nav#navbar .left img { - margin: 1em; - height: 1.3em; } - -nav#navbar .center { - flex: 1; - color: #243887; - font-size: 1em; - background-color: #ffffff; } - -nav#navbar .right { - font-family: Manometer; - color: #ffffff; } - -nav#navbar #menutoggle { - display: none; } - -@media (max-width: 600px) { - nav#navbar #menutoggle { - display: block; } +nav { + height: 52px; } + nav#navbar .left { + flex: 0; + text-align: left; + background-color: #ffffff; } + nav#navbar .left img { + margin: 1em; + height: 1.3em; } nav#navbar .center { - display: none; } } - -@media (max-width: 992px) { + flex: 1; + color: #243887; + font-size: 1em; + background-color: #ffffff; } nav#navbar .right { - display: none; } } - -nav#sidebar { - position: fixed; - top: 0; - left: -300px; - width: 300px; - height: 100%; - z-index: 200; - box-shadow: 0 6px 12px rgba(107, 82, 82, 0.3); - background-color: #ffffff; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - transition: ease 0.2s all; } + font-family: Manometer; + color: #ffffff; } + nav#navbar #menutoggle { + display: none; } + @media (max-width: 600px) { + nav#navbar #menutoggle { + display: block; } + nav#navbar .center { + display: none; } } + @media (max-width: 992px) { + nav#navbar .right { + display: none; } } + nav#sidebar { + position: fixed; + top: 0; + left: -300px; + width: 300px; + height: 100%; + z-index: 200; + box-shadow: 0 6px 12px rgba(107, 82, 82, 0.3); + background-color: #ffffff; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + transition: ease 0.2s all; } @media (max-width: 600px) { nav#navbar { diff --git a/static/admin/config.yml b/static/admin/config.yml new file mode 100644 index 00000000..f1c91fbc --- /dev/null +++ b/static/admin/config.yml @@ -0,0 +1,7 @@ +backend: + name: git-gateway + branch: master # Branch to update (optional; defaults to master) + +publish_mode: editorial_workflow +media_folder: "static/images/uploads" # Media files will be stored in the repo under static/images/uploads +public_folder: "/images/uploads" # The src attribute for uploaded media will begin with /images/uploads \ No newline at end of file diff --git a/static/admin/index.html b/static/admin/index.html new file mode 100644 index 00000000..aaed95ac --- /dev/null +++ b/static/admin/index.html @@ -0,0 +1,12 @@ + + + + + + Content Manager + + + + + + \ No newline at end of file diff --git a/static/content/images/coopgo-gtfs.svg b/static/content/images/coopgo-gtfs.svg new file mode 100644 index 00000000..6f956311 --- /dev/null +++ b/static/content/images/coopgo-gtfs.svg @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/static/content/images/coopgo-rdex.svg b/static/content/images/coopgo-rdex.svg new file mode 100644 index 00000000..ebb4d5ca --- /dev/null +++ b/static/content/images/coopgo-rdex.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/themes/coopgo-theme/assets/sass/coopgo-web-ui-kit/_helpers.scss b/themes/coopgo-theme/assets/sass/coopgo-web-ui-kit/_helpers.scss index d1443dee..19ac740a 100644 --- a/themes/coopgo-theme/assets/sass/coopgo-web-ui-kit/_helpers.scss +++ b/themes/coopgo-theme/assets/sass/coopgo-web-ui-kit/_helpers.scss @@ -1,6 +1,6 @@ /* WIDTH */ -$widthvalues: (0, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 75, 100, 125, 150, 200, 300, 400, 500, 600, 700, 800, 900, 1000, 1024); +$widthvalues: (0, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 75, 100, 125, 150, 200, 250, 300, 350, 400, 450, 500, 600, 700, 800, 900, 1000, 1024); @each $width in $widthvalues { .w-#{$width} { diff --git a/themes/coopgo-theme/assets/sass/coopgo-web-ui-kit/_nav.scss b/themes/coopgo-theme/assets/sass/coopgo-web-ui-kit/_nav.scss index c19e9abc..abe9daa4 100644 --- a/themes/coopgo-theme/assets/sass/coopgo-web-ui-kit/_nav.scss +++ b/themes/coopgo-theme/assets/sass/coopgo-web-ui-kit/_nav.scss @@ -1,7 +1,6 @@ nav { &#navbar { z-index: 100; - height: 3em; display: flex; justify-content: flex-between; align-items: center; diff --git a/themes/coopgo-theme/assets/sass/main.scss b/themes/coopgo-theme/assets/sass/main.scss index aa3b1aaf..4a366905 100644 --- a/themes/coopgo-theme/assets/sass/main.scss +++ b/themes/coopgo-theme/assets/sass/main.scss @@ -1,7 +1,9 @@ @import 'coopgo-web-ui-kit/styles'; // @import 'colors' <- we use the library's default values for colors, we don't need this -nav{ +nav{ + height: 52px; + &#navbar { .left { flex:0; diff --git a/themes/coopgo-theme/layouts/index.html b/themes/coopgo-theme/layouts/index.html index b604b590..b6f40b49 100644 --- a/themes/coopgo-theme/layouts/index.html +++ b/themes/coopgo-theme/layouts/index.html @@ -15,7 +15,7 @@
{{ $img := resources.Get .Site.Params.FeaturedImage }} - +
@@ -35,18 +35,20 @@

{{ .Site.Params.Section3.Title }}

+
{{ range .Site.Params.Section3.List }} -
+
{{ $icon := resources.Get ( print "images/icons/" .icon ".svg") }}
-
-

{{.title}}

+
+

{{.title}}

{{.description}}

{{ end }} +

{{ .Site.Params.Section4.Title }}

diff --git a/themes/coopgo-theme/layouts/partials/footer.html b/themes/coopgo-theme/layouts/partials/footer.html index 2037a906..c10ac00e 100644 --- a/themes/coopgo-theme/layouts/partials/footer.html +++ b/themes/coopgo-theme/layouts/partials/footer.html @@ -51,6 +51,7 @@

La coopérative :

diff --git a/themes/coopgo-theme/layouts/partials/header.html b/themes/coopgo-theme/layouts/partials/header.html index f7d65990..9ffe5b94 100644 --- a/themes/coopgo-theme/layouts/partials/header.html +++ b/themes/coopgo-theme/layouts/partials/header.html @@ -4,9 +4,9 @@ {{$icon := resources.Get "images/icons/menu.svg"}}
-
+
{{ $logo := resources.Get .Site.Params.Logo }} - COOPGO + COOPGO