Skip to content

Commit

Permalink
Move theme to gouvfr (#244)
Browse files Browse the repository at this point in the history
* refactor: 🚧 move theme to gouvfr
* refactor: 🚚 rename theme to assets
  • Loading branch information
nicolaskempf57 committed May 11, 2023
1 parent e3ded92 commit 89eef51
Show file tree
Hide file tree
Showing 150 changed files with 810 additions and 369 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Expand Up @@ -36,7 +36,7 @@ bower
/instance/
/static/
node_modules
/udata_front/theme/gouvfr/static/
/udata_front/theme/*/static/

# Installer logs
pip-log.txt
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
@@ -1 +1 @@
v16.13.0
v16.20.0
5 changes: 5 additions & 0 deletions CHANGELOG.md
Expand Up @@ -2,6 +2,11 @@

## Current (in progress)

> **Note** <br>
> This renames the `theme` root folder to `assets` and moves it inside gouvfr theme.
> This also updates most references of `udata_front/theme/gouvfr` theme to `*` to ease the usage of other themes.
- Move `theme` to `udata_front/theme/gouvfr`[#244](https://github.com/etalab/udata-front/pull/244)
- MonComptePro SSO integration [#237](https://github.com/etalab/udata-front/pull/237):
- New button on login and register page
- When loging in, the datastore will seek for a coresponding user on udata. If such user does not exist, she will be created.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -173,7 +173,7 @@ Additionally, you can run javascript-related commands through `npm run`.
- `start`: Get to coding with live reload and things. Same as `npm run dev`
- `test`: Runs the Cypress tests. More on that in the [Tests section](#-tests) of this README.

If you encounter any merge conflic with your package-lock.json, you can fix it with NPM:
If you encounter any merge conflict with your package-lock.json, you can fix it with NPM:

```shell
npm install --package-lock-only
Expand Down
2 changes: 1 addition & 1 deletion babel.cfg
Expand Up @@ -2,7 +2,7 @@

[python: **.py]

[jinja2: **/theme/gouvfr/templates/**.html]
[jinja2: **/theme/*/templates/**.html]
encoding = utf-8
silent = false
extensions = flask_caching.jinja2ext.CacheExtension
4 changes: 2 additions & 2 deletions crowdin.yml
Expand Up @@ -2,5 +2,5 @@ files:
- source: /udata_front/theme/gouvfr/translations/gouvfr.pot
translation: >-
/udata_front/theme/gouvfr/translations/%two_letters_code%/LC_MESSAGES/%file_name%.po
- source: /theme/js/locales/en.json
translation: /theme/js/locales/%two_letters_code%.json
- source: /udata_front/theme/gouvfr/assets/js/locales/en.json
translation: /udata_front/theme/gouvfr/assets/js/locales/%two_letters_code%.json

0 comments on commit 89eef51

Please sign in to comment.