diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml deleted file mode 100644 index fa11ac5..0000000 --- a/.forgejo/workflows/build.yaml +++ /dev/null @@ -1,36 +0,0 @@ -name: publish - -on: - push: - branches: - - main - -jobs: - publish: - runs-on: ubuntu-24.04 - env: - SSH_USER: ${{ secrets.PUBLISHER_USER }} - SSH_PRIVATE_KEY: ${{ secrets.PUBLISHER_PRIVATE_KEY }} - SSH_HOST: ${{ secrets.PUBLISHER_HOST }} - SSH_PORT: ${{ secrets.PUBLISHER_PORT }} - steps: - - uses: actions/checkout@v4 - with: - submodules: recursive - fetch-depth: 0 # all history for all branches and tags\ - - - name: Install Hugo - run: | - apt update && apt install -y hugo - - - name: Build - run: | - hugo --minify - - - name: Deploy - run: | - eval $(ssh-agent -s) - echo "$SSH_PRIVATE_KEY" | ssh-add - - apt update && apt install -y rsync - ssh-keyscan -p $SSH_PORT $SSH_HOST > ~/.ssh/known_hosts - rsync -atv --progress --delete -e "ssh -p $SSH_PORT" ./public/ $SSH_USER@$SSH_HOST:/app diff --git a/.gitignore b/.gitignore deleted file mode 100644 index a48cf0d..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -public diff --git a/config.toml b/config.toml index a5bd117..9b0941b 100644 --- a/config.toml +++ b/config.toml @@ -1,19 +1,29 @@ baseURL = "https://mrtraduccions.cat/" -title = "Marc Riera Irigoyen" +title = "MRTraduccions" theme = "marcriera" DefaultContentLanguage = "ca" removePathAccents = true -enableRobotsTXT = true -disableKinds = ["taxonomy", "taxonomyTerm"] + +[blackfriday] + fractions = false [params] name = "Marc Riera Irigoyen" copyright = "Marc Riera Irigoyen" logoimage = "images/logo.png" - description = "Translator and localizer" - description2 = "EN,RO > CA,ES" -[markup] - [markup.goldmark] - [markup.goldmark.renderer] - unsafe = true +[languages] +[languages.ca] +languageName = "Català" +weight = 1 +description = "Traducció i localització" + +[languages.es] +languageName = "Castellano" +weight = 2 +description = "Traducción y localización" + +[languages.en] +languageName = "English" +weight = 3 +description = "Translation and localisation" diff --git a/content/_index.ca.md b/content/_index.ca.md new file mode 100644 index 0000000..c92ef34 --- /dev/null +++ b/content/_index.ca.md @@ -0,0 +1,9 @@ +--- +menu: + main: + name: "Inici" + weight: 1 + url: "/" +--- + +Hola, em dic Marc i sóc traductor professional. diff --git a/content/_index.en.md b/content/_index.en.md new file mode 100644 index 0000000..e1bc6ae --- /dev/null +++ b/content/_index.en.md @@ -0,0 +1,7 @@ +--- +menu: + main: + name: "Home" + weight: 1 + url: "/" +--- diff --git a/content/_index.es.md b/content/_index.es.md new file mode 100644 index 0000000..ac8a6aa --- /dev/null +++ b/content/_index.es.md @@ -0,0 +1,7 @@ +--- +menu: + main: + name: "Inicio" + weight: 1 + url: "/" +--- diff --git a/content/_index.md b/content/_index.md deleted file mode 100644 index defbeea..0000000 --- a/content/_index.md +++ /dev/null @@ -1,14 +0,0 @@ ---- ---- - -**Contact:** - -![E-mail](/images/icon-mail.png) [contacte@mrtraduccions.cat](mailto:contacte@mrtraduccions.cat) - -![Phone:](/images/icon-phone.png) (+34) 652 492 008 - -  - -![Mastodon:](/images/icon-mastodon.svg) [@marc@marcriera.cat](https://micro.marcriera.cat/@marc) - -![LinkedIn:](/images/icon-linkedin.png) [Marc Riera Irigoyen](https://www.linkedin.com/in/marc-riera-irigoyen/) diff --git a/content/localitzacio/_index.md b/content/localitzacio/_index.md new file mode 100644 index 0000000..c65c8cd --- /dev/null +++ b/content/localitzacio/_index.md @@ -0,0 +1,9 @@ +--- +title: "Localització" +menu: + main: + name: "Localització" + weight: 3 + url: "/localitzacio/" +--- + diff --git a/content/localitzacio/programari/_index.md b/content/localitzacio/programari/_index.md new file mode 100644 index 0000000..8ec3366 --- /dev/null +++ b/content/localitzacio/programari/_index.md @@ -0,0 +1,10 @@ +--- +title: "Localització de programari" +menu: + main: + name: "Programari" + weight: 2 + url: "/localitzacio/programari/" + parent: "Localització" +--- + diff --git a/content/localitzacio/videojocs/_index.md b/content/localitzacio/videojocs/_index.md new file mode 100644 index 0000000..10107d9 --- /dev/null +++ b/content/localitzacio/videojocs/_index.md @@ -0,0 +1,10 @@ +--- +title: "Localització de videojocs" +menu: + main: + name: "Videojocs" + weight: 3 + url: "/localitzacio/videojocs/" + parent: "Localització" +--- + diff --git a/content/localitzacio/web/_index.md b/content/localitzacio/web/_index.md new file mode 100644 index 0000000..9629268 --- /dev/null +++ b/content/localitzacio/web/_index.md @@ -0,0 +1,10 @@ +--- +title: "Localització de pàgines web" +menu: + main: + name: "Pàgines web" + weight: 1 + url: "/localitzacio/web/" + parent: "Localització" +--- + diff --git a/content/marcriera/_index.ca.md b/content/marcriera/_index.ca.md new file mode 100644 index 0000000..25a51bc --- /dev/null +++ b/content/marcriera/_index.ca.md @@ -0,0 +1,28 @@ +--- +title: "Marc Riera" +menu: + main: + name: "Marc Riera" + weight: 6 + url: "/marcriera/" +--- + +
+ +Puc fer alguna cosa per tu? Contacta amb mi i parlem-ne, sense compromisos. + +  + +E-mail: contacte@mrtraduccions.cat + +Phone: (+34) 652 492 008 + +  + + + +Twitter: @marcrierai + +LinkedIn: Marc Riera Irigoyen + +
diff --git a/content/traduccio/_index.ca.md b/content/traduccio/_index.ca.md new file mode 100644 index 0000000..3b41492 --- /dev/null +++ b/content/traduccio/_index.ca.md @@ -0,0 +1,10 @@ +--- +title: "Traducció" +menu: + main: + name: "Traducció" + weight: 2 + url: "/traduccio/" +--- + +Aquesta és la pàgina sobre traducció diff --git a/content/traduccio/editorial/_index.md b/content/traduccio/editorial/_index.md new file mode 100644 index 0000000..da5ac96 --- /dev/null +++ b/content/traduccio/editorial/_index.md @@ -0,0 +1,10 @@ +--- +title: "Traducció de textos editorials" +menu: + main: + name: "Textos editorials" + weight: 2 + url: "/traduccio/editorial/" + parent: "Traducció" +--- + diff --git a/content/traduccio/general/_index.md b/content/traduccio/general/_index.md new file mode 100644 index 0000000..4cc7dc6 --- /dev/null +++ b/content/traduccio/general/_index.md @@ -0,0 +1,10 @@ +--- +title: "Traducció de textos generals" +menu: + main: + name: "Textos generals" + weight: 1 + url: "/traduccio/general/" + parent: "Traducció" +--- + diff --git a/layouts/_default/_markup/render-image.html b/layouts/_default/_markup/render-image.html deleted file mode 100644 index 9a222e0..0000000 --- a/layouts/_default/_markup/render-image.html +++ /dev/null @@ -1 +0,0 @@ -{{ .Text }} diff --git a/layouts/_default/_markup/render-link.html b/layouts/_default/_markup/render-link.html deleted file mode 100644 index f04b2e3..0000000 --- a/layouts/_default/_markup/render-link.html +++ /dev/null @@ -1 +0,0 @@ -{{ .Text | safeHTML }} diff --git a/layouts/robots.txt b/layouts/robots.txt deleted file mode 100644 index 512ab5e..0000000 --- a/layouts/robots.txt +++ /dev/null @@ -1,2 +0,0 @@ -User-agent: * -Disallow: /files diff --git a/static/files/CV_ca.pdf b/static/files/CV_ca.pdf deleted file mode 100644 index 2f31a1f..0000000 Binary files a/static/files/CV_ca.pdf and /dev/null differ diff --git a/static/files/CV_en.pdf b/static/files/CV_en.pdf deleted file mode 100644 index 0ec6cf7..0000000 Binary files a/static/files/CV_en.pdf and /dev/null differ diff --git a/static/files/CV_es.pdf b/static/files/CV_es.pdf deleted file mode 100644 index 3215eaf..0000000 Binary files a/static/files/CV_es.pdf and /dev/null differ diff --git a/static/images/icon-mastodon.svg b/static/images/icon-mastodon.svg deleted file mode 100644 index 39a116b..0000000 --- a/static/images/icon-mastodon.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/static/images/icon-twitter.png b/static/images/icon-twitter.png new file mode 100644 index 0000000..d52f1d4 Binary files /dev/null and b/static/images/icon-twitter.png differ diff --git a/themes/marcriera/i18n/ca.toml b/themes/marcriera/i18n/ca.toml new file mode 100644 index 0000000..98b28f2 --- /dev/null +++ b/themes/marcriera/i18n/ca.toml @@ -0,0 +1,14 @@ +[menu] +other = "Menú" + +[readMore] +other = "Llegeix més" + +[newer] +other = "Més recent" + +[older] +other = "Més antic" + +[latestUpdates] +other = "Últimes actualitzacions" diff --git a/themes/marcriera/i18n/en.toml b/themes/marcriera/i18n/en.toml new file mode 100644 index 0000000..5fbde5a --- /dev/null +++ b/themes/marcriera/i18n/en.toml @@ -0,0 +1,14 @@ +[menu] +other = "Menu" + +[readMore] +other = "Read more" + +[newer] +other = "Newer" + +[older] +other = "Older" + +[latestUpdates] +other = "Latest updates" diff --git a/themes/marcriera/i18n/es.toml b/themes/marcriera/i18n/es.toml new file mode 100644 index 0000000..0a07be7 --- /dev/null +++ b/themes/marcriera/i18n/es.toml @@ -0,0 +1,14 @@ +[menu] +other = "Menú" + +[readMore] +other = "Leer más" + +[newer] +other = "Más reciente" + +[older] +other = "Más antiguo" + +[latestUpdates] +other = "Últimas actualizaciones" diff --git a/themes/marcriera/layouts/_default/list.html b/themes/marcriera/layouts/_default/list.html new file mode 100644 index 0000000..fda8482 --- /dev/null +++ b/themes/marcriera/layouts/_default/list.html @@ -0,0 +1,29 @@ +{{ partial "header.html" . }} + +
+ + {{ range sort .Paginator.Pages }} +
+

{{ .Title }}

+
+ {{ .Summary | plainify | safeHTML }} + ... +
+ {{ if not .Date.IsZero }} +

{{ .Date.Format "2006-01-02" }}

+ {{ end }} +
+ {{ i18n "readMore" }} +
+
+
+
+ {{ if .Params.tags }} + {{ partial "tags" .Params.tags }} + {{ end }} + {{ end }} + {{ partial "pagination.html" . }} + +
+ +{{ partial "footer.html" . }} diff --git a/themes/marcriera/layouts/_default/rss.xml b/themes/marcriera/layouts/_default/rss.xml new file mode 100644 index 0000000..beaf943 --- /dev/null +++ b/themes/marcriera/layouts/_default/rss.xml @@ -0,0 +1,26 @@ + + + {{ if eq .Title .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{.}} on {{ end }}{{ .Site.Title }}{{ end }} + {{ .Permalink }} + Recent content {{ if ne .Title .Site.Title }}{{ with .Title }}in {{.}} {{ end }}{{ end }}on {{ .Site.Title }} + Hugo -- gohugo.io{{ with .Site.LanguageCode }} + {{.}}{{end}}{{ with .Site.Author.email }} + {{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}{{end}}{{ with .Site.Author.email }} + {{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}{{end}}{{ with .Site.Copyright }} + {{.}}{{end}}{{ if not .Date.IsZero }} + {{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}{{ end }} + {{ with .OutputFormats.Get "RSS" }} + {{ printf "" .Permalink .MediaType | safeHTML }} + {{ end }} + {{ range .Pages }} + + {{ .Title }} + {{ .Permalink }} + {{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }} + {{ with .Site.Author.email }}{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}{{end}} + {{ .Permalink }} + {{ .Content | html }} + + {{ end }} + + diff --git a/themes/marcriera/layouts/_default/section.html b/themes/marcriera/layouts/_default/section.html new file mode 100644 index 0000000..0b88d4f --- /dev/null +++ b/themes/marcriera/layouts/_default/section.html @@ -0,0 +1,35 @@ +{{ partial "header.html" . }} + +{{ if ne (len .Content) 0 }} +
+ {{ .Content }} +
+{{ else }} +
+ + {{ range sort .Paginator.Pages }} +
+

{{ .Title }}

+
+ {{ .Summary | plainify | safeHTML }} + ... +
+ {{ if not .Date.IsZero }} +

{{ .Date.Format "2006-01-02" }}

+ {{ end }} +
+ {{ i18n "readMore" }} +
+
+
+
+ {{ if .Params.tags }} + {{ partial "tags" .Params.tags }} + {{ end }} + {{ end }} + {{ partial "pagination.html" . }} + +
+{{ end }} + +{{ partial "footer.html" . }} diff --git a/themes/marcriera/layouts/_default/single.html b/themes/marcriera/layouts/_default/single.html new file mode 100644 index 0000000..49fd212 --- /dev/null +++ b/themes/marcriera/layouts/_default/single.html @@ -0,0 +1,11 @@ +{{ partial "header.html" . }} +
+ {{- if not .Date.IsZero }} +

{{ .Date.Format "02-01-2006" }}

+ {{- end }} + {{ .Content }} + {{- if .Params.tags }} + {{ partial "tags" .Params.tags }} + {{- end }} +
+{{ partial "footer.html" . }} diff --git a/themes/marcriera/layouts/index.html b/themes/marcriera/layouts/index.html index c31edcc..c830700 100644 --- a/themes/marcriera/layouts/index.html +++ b/themes/marcriera/layouts/index.html @@ -1,44 +1,5 @@ - - - - - {{ .Site.Title }} - {{ .Site.Params.Description }} - - - {{ hugo.Generator }} - - - - -
- - - - -
-
- {{ .Content }} -
-
- - - -
- - - +{{ partial "header.html" . }} +
+ {{ .Content }} +
+{{ partial "footer.html" . }} diff --git a/themes/marcriera/layouts/partials/footer.html b/themes/marcriera/layouts/partials/footer.html new file mode 100644 index 0000000..bff5067 --- /dev/null +++ b/themes/marcriera/layouts/partials/footer.html @@ -0,0 +1,6 @@ + + + + diff --git a/themes/marcriera/layouts/partials/header.html b/themes/marcriera/layouts/partials/header.html new file mode 100644 index 0000000..f630b93 --- /dev/null +++ b/themes/marcriera/layouts/partials/header.html @@ -0,0 +1,42 @@ + + + + {{ .Title }} - {{ .Site.Title }} + + + {{ hugo.Generator }} + + +
+
+ {{- if isset .Site.Params "logoimage" }} + + {{- end }} + +
{{ .Site.Params.Description }}
+
+
+ {{- if .IsTranslated }} + + {{- end }} +
+ {{ partial "menu.html" . }} + {{- if isset .Params "image"}} + + {{- end }} +
+

{{ .Title }}

+
diff --git a/themes/marcriera/layouts/partials/menu.html b/themes/marcriera/layouts/partials/menu.html new file mode 100644 index 0000000..9578c6d --- /dev/null +++ b/themes/marcriera/layouts/partials/menu.html @@ -0,0 +1,36 @@ + diff --git a/themes/marcriera/layouts/partials/pagination.html b/themes/marcriera/layouts/partials/pagination.html new file mode 100644 index 0000000..9caef8d --- /dev/null +++ b/themes/marcriera/layouts/partials/pagination.html @@ -0,0 +1,16 @@ +{{ $pag := .Paginator }} +{{ if gt $pag.TotalPages 1 }} + +{{ end }} diff --git a/themes/marcriera/layouts/partials/tags.html b/themes/marcriera/layouts/partials/tags.html new file mode 100644 index 0000000..908c55e --- /dev/null +++ b/themes/marcriera/layouts/partials/tags.html @@ -0,0 +1,5 @@ +

+ Tags: {{ range . }} + {{ . }} + {{ end }} +

diff --git a/themes/marcriera/static/css/theme.css b/themes/marcriera/static/css/theme.css index d5fde54..dce0565 100644 --- a/themes/marcriera/static/css/theme.css +++ b/themes/marcriera/static/css/theme.css @@ -72,7 +72,7 @@ a:visited { a:hover, a.selected { - color: #BBBBBB; + color: #4C454F; } @@ -107,6 +107,60 @@ hr { +/* Main menu */ + +nav { + clear: both; + text-align: right; +} + +nav ul { + list-style-type: none; + padding: 0; + margin-bottom: 0px; + left: 0; +} + +nav ul.first > li { + display: block; + text-align: center; +} + +nav ul li a { + display: block; + font-size: 90%; +} + +nav ul.first > li a, +nav ul.second > li a { + padding: 10px 10px 10px 10px; + background: #7C454F; +} + +nav ul.first > li a:hover, +nav ul.second > li a:hover { + color: #DDDDDD; + background: #8C454F; +} + + + +/* Language selector */ + +.language-selector { + list-style-type: none; + font-size: 90%; + text-align: center; +} + +.language-selector li { + display: inline; + margin: .5em; + text-align: center; +} + + + /* Main container */ #container { @@ -118,42 +172,35 @@ hr { } + /* Header */ -#header { +#header-left, +#header-right { padding-top: 15px; - display: block; - float: none; - width: 100%; - text-align: center; } #site-logo { - max-width:100%; - max-height:100%; - display: block; - margin-left: 20px; - margin-right: 20px; + height: 100px; + width: 100px; + padding: 0 20px 15px 20px; } #site-title { padding: 10px 20px 0 20px; font-weight: 600; font-size: 220%; - display: block; - float: none; - margin: auto; } #site-slogan { - padding: 0px 5px; + padding: 0 20px 10px 20px; } /* Footer */ -#footer { +footer { text-align: center; padding: 10px 20px 10px 20px; clear: both; @@ -165,9 +212,7 @@ hr { #page-title { padding: 10px 20px 10px 20px; - background: #3E3E3E; - border-top: 1px solid #444444; - border-bottom: 1px solid #444444; + background: #9E4B5A; } #page-title h1 { @@ -178,7 +223,7 @@ hr { /* Page content */ -#content { +main { padding: 10px 20px 10px 20px; margin-bottom: 20px; margin-top: 20px; @@ -190,18 +235,189 @@ hr { color: #777; } -#content .timestamp { +main .timestamp { padding-bottom: 1em; } -#content a:link, -#content a:active, -#content a:visited { +main a:link, +main a:active, +main a:visited { color: #EEEEEE; } -#content a:hover, -#content a.selected { +main a:hover, +main a.selected { color: #CCCCCC; } + + +@media (min-width: 780px) { + +/* Main menu */ + +.burger-button { + display: none; +} + +nav { + padding-right: 1.25em; +} + +nav ul li a { + width: 140px; + +} + +nav ul.first > li { + display: inline-block; + position: relative; +} + +nav ul.second, +nav ul.third { + top: 40px; + display: none; + position: absolute; + background: #5C353F; +} + +nav ul.first li:hover ul.second, +nav ul.second li:hover ul.third { + display: block; +} + +nav ul.second { + z-index: 2; +} + +nav ul.third { + z-index: 3; +} + +nav ul.second li { + position: relative; +} + +nav ul.third { + left: 212px; + top: -1px; +} + + +/* Language selector */ + +.language-selector { + float: right; + margin-right: 30px; +} + + +/* Main container */ + +#container { + max-width: 1200px; +} + + +/* Header */ + +#header-left { + float: left; + width: 65%; +} + +#header-right { + float: right; + width: 35%; +} + +#site-logo { + float: left; +} + +} + + + +@media screen and (max-width: 779px) { + +/* Main menu */ + +.burger-button { + display: block; + background: #7C454F; + font-size: 100%; + padding: 5px 20px 5px 20px; + margin-top: 20px; + cursor: pointer; +} + +.burger-button:hover { + color: #DDDDDD; + background: #9E4B5A; +} + +#menu-entries { + display: none; +} + +.burger-toggle:checked ~ #menu-entries { + display: block; +} + +.burger-toggle:checked ~ .burger-button { + color: #DDDDDD; + background: #9E4B5A; +} + +nav { + text-align: center; + margin-bottom: 20px; +} + +nav ul.first { + margin-top: 0px; +} + +nav ul.second > li a { + padding-left: 40px; +} + +nav ul a { + text-align: left; +} + + +/* Language selector */ + +.language-selector { + float: none; + margin: auto; + padding: 0; +} + + +/* Header */ + +#header-left, +#header-right { + display: block; + float: none; + width: 100%; + text-align: center; +} + +#site-logo, +#site-title { + display: block; + float: none; + margin: auto; +} + +#site-title, +#site-slogan { + padding: 0px 5px; +} + +} diff --git a/themes/marcriera/theme.toml b/themes/marcriera/theme.toml index 06a048f..cfa2156 100644 --- a/themes/marcriera/theme.toml +++ b/themes/marcriera/theme.toml @@ -1,3 +1,3 @@ name = "Marc Riera" -license = "GPL" -min_version = 0.18 +license = "GPLv3" +min_version = 0.50