Pour tout problème contactez-nous par mail : support@froggit.fr | La FAQ :grey_question: | Rejoignez-nous sur le Chat :speech_balloon:

Skip to content
Snippets Groups Projects
Commit c0c3b40a authored by Pierre Jarriges's avatar Pierre Jarriges
Browse files

Merge branch 'master' of lab.frogg.it:kuadrado-software/kuadrado-website

parents 2fa057b6 2b10d571
No related branches found
No related tags found
1 merge request!13Dev
Showing
with 19 additions and 31 deletions
#!/bin/sh
git checkout .
git pull origin master
git pull froggit master
cd admin-frontend
npm install
......@@ -12,4 +12,4 @@ npm install
npm run build
cd ..
docker-compose up --build
docker compose up --build
......@@ -9,10 +9,10 @@
"build": "node build.js && sass ./src/style.scss ../public/style/style.css",
"build-prod": "node build.js prod && sass ./src/style.scss ../public/style/style.css --style=compressed"
},
"repository": "https://gitlab.com/peter_rabbit/kuadrado-website",
"repository": "https://lab.frogg.it/kuadrado-software/kuadrado-website",
"author": "Kuadrado",
"license": "MIT",
"homepage": "https://gitlab.com/peter_rabbit/kuadrado-website#readme",
"homepage": "https://lab.frogg.it/kuadrado-software/kuadrado-website#readme",
"dependencies": {
"ks-cheap-translator": "^0.1.0",
"mentalo-engine": "^0.2.4",
......
......@@ -4,9 +4,7 @@ const ImageCarousel = require("../generic-components/image-carousel");
const { getArticleBody } = require("../lib/article-utils");
const { fetch_json_or_error_text } = require("../lib/fetch");
const { MentaloEngine } = require("mentalo-engine");
const translator = require("ks-cheap-translator");
const { images_url, data_url } = require("../../constants");
const t = translator.trad.bind(translator);
class GameArticle {
......
"use strict";
const ImageCarousel = require("../generic-components/image-carousel");
const translator = require("ks-cheap-translator");
const { images_url } = require("../../constants");
const { getArticleBody } = require("../lib/article-utils");
const t = translator.trad.bind(translator);
class SoftwareArticle {
......
......@@ -3,8 +3,6 @@
const { images_url } = require("../constants");
const ThemeCard = require("./home-page-components/theme-card");
const WebPage = require("./lib/web-page");
const translator = require("ks-cheap-translator");
const t = translator.trad.bind(translator);
class HomePage extends WebPage {
constructor() {
......
......@@ -12,6 +12,9 @@ class WebPage {
this.translations_ready = false;
window.t = translator.trad.bind(translator);
window.translator = translator;
translator.init({
translations_url,
supported_languages: ["fr", "en"],
......
"use strict";
const { loadArticles, sortArticles, renderPlaceholders } = require("../../../lib/article-utils");
const translator = require("ks-cheap-translator");
const t = translator.trad.bind(translator);
const EduArticle = require("./edu-article");
class EduArticles {
......
......@@ -2,9 +2,7 @@
const { images_url } = require("../../../constants");
const WebPage = require("../../lib/web-page");
const translator = require("ks-cheap-translator");
const EduArticles = require("./components/edu-articles");
const t = translator.trad.bind(translator);
const EDU_THEMES = [
{
......
......@@ -6,7 +6,6 @@ const {
renderPlaceholders
} = require("../../../lib/article-utils");
const GameThumb = require("./game-thumb");
const translator = require("ks-cheap-translator");
class GameArticles {
constructor(props) {
......
......@@ -3,8 +3,6 @@
const { images_url } = require("../../../constants");
const WebPage = require("../../lib/web-page");
const GameArticles = require("./components/game-articles");
const translator = require("ks-cheap-translator");
const t = translator.trad.bind(translator);
class GamesPage extends WebPage {
render() {
......
......@@ -2,7 +2,6 @@
const { loadArticles, sortArticles, renderPlaceholders } = require("../../../lib/article-utils");
const SoftwareThumb = require("./software-thumb");
const translator = require("ks-cheap-translator");
class SoftwareArticles {
constructor(props) {
......
......@@ -3,8 +3,6 @@
const { images_url } = require("../../../constants");
const WebPage = require("../../lib/web-page");
const SoftwareArticles = require("./components/software-articles");
const translator = require("ks-cheap-translator");
const t = translator.trad.bind(translator);
class SoftwareDevelopment extends WebPage {
render() {
......
"use strict";
const { images_url } = require("../../../constants");
const translator = require("ks-cheap-translator");
const t = translator.trad.bind(translator);
const NAV_MENU_ITEMS = [
{ url: "/games/", text: "Jeux" },
......@@ -34,10 +32,15 @@ class NavBar {
});
}
handle_chang_lang(lang) {
translator.update_translations(lang).then(() => {
obj2htm.renderCycle();
}).catch(err => console.log(err));
handle_change_lang(lang) {
const url_path_chunks = location.pathname.split("/");
const location_contains_locale = translator.supported_languages.find(locale => url_path_chunks.includes(locale));
const callback = location_contains_locale
? function () {
location.pathname = url_path_chunks.map(chunk => chunk === location_contains_locale ? lang : chunk).join("/");
}
: obj2htm.renderCycle.bind(obj2htm);
translator.update_translations(lang).then(callback).catch(err => console.log(err));
}
renderHome() {
......@@ -92,7 +95,7 @@ class NavBar {
return {
tag: "img", src: `${images_url}/flag-${lang}.svg`,
class: translator.locale === lang ? "selected" : "",
onclick: this.handle_chang_lang.bind(this, lang)
onclick: this.handle_change_lang.bind(this, lang)
}
})
}),
......
......@@ -3,8 +3,6 @@
const { in_construction } = require("../../config");
const { images_url } = require("../../constants");
const NavBar = require("./components/navbar");
const translator = require("ks-cheap-translator");
const t = translator.trad.bind(translator)
class Template {
constructor(props) {
......@@ -79,7 +77,7 @@ class Template {
},
{
tag: "a",
href: "https://www.linkedin.com/company/kuadrado-software",
href: "https://linkedin.com/company/kuadrado-software",
target: "_blank",
contents: "in",
title: "Linkedin",
......@@ -105,7 +103,7 @@ class Template {
{
tag: "a", target: "_blank",
style_rules: { fontWeight: "bold" },
href: "https://gitlab.com/kuadrado-software/kuadrado-website/-/blob/master/README.md",
href: "https://lab.frogg.it/kuadrado-software/kuadrado-website/-/blob/master/README.md",
contents: "OPEN SOURCE"
}
]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment