Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

English showcase #1273

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

English showcase #1273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
15c1d1b
html update
TheodoreCouz Nov 14, 2023
44323f8
revert to basic html version
TheodoreCouz Nov 14, 2023
6741d5f
adding the english version of the comics, including the modifications…
TheodoreCouz Nov 20, 2023
ff4b653
resolving added files issue
TheodoreCouz Nov 21, 2023
df7eb6b
Change the way the showcase JS works.
almet Nov 23, 2023
4db6ef8
Fix isort
almet Nov 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .isort.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ include_trailing_comma=True
force_grid_wrap=0
line_length=88
combine_as_imports=True
profile = "black"

# If set, imports will be sorted within their section independent to the import_type.
force_sort_within_sections=True
Expand Down
1 change: 1 addition & 0 deletions ihatemoney/default_settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,4 @@
"uk",
"zh_Hans",
]
SHOWCASE_LANGUAGES = ["en", "fr"]
Binary file added ihatemoney/static/showcase/en/1.webp
View file
Open in desktop
Binary file not shown.
Binary file added ihatemoney/static/showcase/en/2.webp
View file
Open in desktop
Binary file not shown.
Binary file added ihatemoney/static/showcase/en/3.webp
View file
Open in desktop
Binary file not shown.
Binary file added ihatemoney/static/showcase/en/4.webp
View file
Open in desktop
Binary file not shown.
Binary file added ihatemoney/static/showcase/en/5.webp
View file
Open in desktop
Binary file not shown.
Binary file added ihatemoney/static/showcase/en/6.webp
View file
Open in desktop
Binary file not shown.
Binary file added ihatemoney/static/showcase/en/7.webp
View file
Open in desktop
Binary file not shown.
Binary file added ihatemoney/static/showcase/en/8.webp
View file
Open in desktop
Binary file not shown.
Binary file added ihatemoney/static/showcase/en/9.webp
View file
Open in desktop
Binary file not shown.
0 ihatemoney/static/showcase/1.webp → ihatemoney/static/showcase/fr/1.webp
View file
Open in desktop
File renamed without changes.
0 ihatemoney/static/showcase/2.webp → ihatemoney/static/showcase/fr/2.webp
View file
Open in desktop
File renamed without changes.
0 ihatemoney/static/showcase/3.webp → ihatemoney/static/showcase/fr/3.webp
View file
Open in desktop
File renamed without changes.
0 ihatemoney/static/showcase/4.webp → ihatemoney/static/showcase/fr/4.webp
View file
Open in desktop
File renamed without changes.
0 ihatemoney/static/showcase/5.webp → ihatemoney/static/showcase/fr/5.webp
View file
Open in desktop
File renamed without changes.
0 ihatemoney/static/showcase/6.webp → ihatemoney/static/showcase/fr/6.webp
View file
Open in desktop
File renamed without changes.
0 ihatemoney/static/showcase/7.webp → ihatemoney/static/showcase/fr/7.webp
View file
Open in desktop
File renamed without changes.
0 ihatemoney/static/showcase/8.webp → ihatemoney/static/showcase/fr/8.webp
View file
Open in desktop
File renamed without changes.
0 ihatemoney/static/showcase/9.webp → ihatemoney/static/showcase/fr/9.webp
View file
Open in desktop
File renamed without changes.
161 changes: 76 additions & 85 deletions ihatemoney/templates/home.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,100 +1,91 @@
{% extends "layout.html" %}

{% block body %}
<header id="header" class="row">
<div class="col-xs-12 col-sm-5 offset-md-2">
<h2>{{ _("Manage your shared <br />expenses, easily") }}</h2>
{% if is_demo_project_activated %}
<a href="{{ url_for('.demo') }}" class="tryout btn">
{{ _("Try out the demo") }}
</a>
{% endif %}
{% if g.lang == 'fr' %}
ou
<header id="header" class="row">
<div class="col-xs-12 col-sm-5 offset-md-2">
<h2>
{{ _("Manage your shared <br />expenses, easily") }}
</h2>
{% if is_demo_project_activated %}
<a href="{{ url_for(".demo") }}" class="tryout btn">{{ _("Try out the demo") }}</a>
{% endif %}
{% if g.lang == 'fr' or g.lang == 'en' %}
{{ _("or") }}
<span class="side-to-side">
<a class="showcase btn" onclick="javascript:showGallery(); return false;">Voir la BD explicative</a>
<img class="showcaseimg" src="{{ url_for("static", filename='images/indicate.svg') }}" />
<a class="showcase btn"
onclick="javascript:showGallery(); return false;">{{ _("See the explicative comics") }}</a>
<img class="showcaseimg"
src="{{ url_for("static", filename='images/indicate.svg') }}" />
</span>
{% endif %}
</div>
<div class="col-xs-12 col-sm-4">
<table class="additional-content"><tr>
<td>
{{ _("You're sharing a house?") }}<br />
{{ _("Going on holidays with friends?") }}<br />
{{ _("Simply sharing money with others?") }} <br />
<strong>{{ _("We can help!") }}</strong>
</td>
<td>
<img class="shareimg" src="{{ url_for("static", filename='images/share.svg') }}" />
</td>
</tr></table>
</div>
</header>
<main class="row home">
<div class="card-deck ml-auto mr-auto">
<div class="card">
<div class="card-header">
{{ _("Log in to an existing project") }}
</div>
<div class="card-body">
<form
id="authentication-form"
class="form-horizontal"
action="{{ url_for('.authenticate') }}"
method="post">
<fieldset class="form-group">
<legend></legend>
{{ forms.authenticate(auth_form, home=True) }}
</fieldset>
<div class="controls">
<button class="btn btn-primary btn-block" type="submit">
{{ _("Log in") }}
</button>
<a
class="password-reminder btn btn-link"
href="{{ url_for('.remind_password') }}"
>{{ _("can't remember your password?") }}</a
>
</div>
</form>
</div>
{% endif %}
</div>
<div class="card">
<div class="card-header">
{{ _("Create a new project") }}
</div>
<div class="card-body">
{% if is_public_project_creation_allowed %}
<form
id="creation-form"
class="form-horizontal"
action="{{ url_for('.create_project') }}"
method="post"
>
<div class="col-xs-12 col-sm-4">
<table class="additional-content">
<tr>
<td>
{{ _("You're sharing a house?") }}
<br />
{{ _("Going on holidays with friends?") }}
<br />
{{ _("Simply sharing money with others?") }}
<br />
<strong>{{ _("We can help!") }}</strong>
</td>
<td>
<img class="shareimg"
src="{{ url_for("static", filename='images/share.svg') }}" />
</td>
</tr>
</table>
</div>
</header>
<main class="row home">
<div class="card-deck ml-auto mr-auto">
<div class="card">
<div class="card-header">{{ _("Log in to an existing project") }}</div>
<div class="card-body">
<form id="authentication-form"
class="form-horizontal"
action="{{ url_for(".authenticate") }}"
method="post">
<fieldset class="form-group">
{{ forms.create_project(project_form, home=True) }}
<legend></legend>
{{ forms.authenticate(auth_form, home=True) }}
</fieldset>
<div class="controls">
<button class="btn btn-primary btn-block" type="submit">
{{ _("Create") }}
</button>
<button class="btn btn-primary btn-block" type="submit">{{ _("Log in") }}</button>
<a class="password-reminder btn btn-link"
href="{{ url_for(".remind_password") }}">{{ _("can't remember your password?") }}</a>
</div>
</form>
</div>
</div>
<div class="card">
<div class="card-header">{{ _("Create a new project") }}</div>
<div class="card-body">
{% if is_public_project_creation_allowed %}
<form id="creation-form"
class="form-horizontal"
action="{{ url_for(".create_project") }}"
method="post">
<fieldset class="form-group">
{{ forms.create_project(project_form, home=True) }}
</fieldset>
<div class="controls">
<button class="btn btn-primary btn-block" type="submit">{{ _("Create") }}</button>
</div>
</form>
{% else %}
<a href="{{ url_for('.create_project') }}">
{{ _("Create a new project") }}
</a>
{% endif %}
{% else %}
<a href="{{ url_for(".create_project") }}">{{ _("Create a new project") }}</a>
{% endif %}
</div>
</div>
</div>
</div>
</main>
</main>
{% endblock %}
{% block js %}
$('#creation-form #password').tooltip({
title: "{{ _("Don\\'t reuse a personal password. Choose a private code and send it to your friends") }}",
trigger: 'focus',
placement: 'right'
});
$('#creation-form #password').tooltip({
title: "{{ _("Don\\'t reuse a personal password. Choose a private code and send it to your friends") }}",
trigger: 'focus',
placement: 'right'
});
{% endblock %}
2 changes: 1 addition & 1 deletion ihatemoney/templates/layout.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
</script>
</head>
<body class="d-flex flex-column h-100">
{% if g.lang == 'fr' %}{% include "showcase.html" %}{% endif %}
{% if display_showcase %}{% include "showcase.html" %}{% endif %}
<nav class="navbar navbar-expand-lg fixed-top navbar-dark bg-dark">
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarToggler" aria-controls="navbarToggler" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
Expand Down
112 changes: 60 additions & 52 deletions ihatemoney/templates/showcase.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,67 +1,75 @@
<div id="pswp" class="hiddenpswp" tabindex="-1" role="dialog" aria-hidden="true">
<div class="pswp__bg"></div>
<div class="pswp__scroll-wrap">
<div class="pswp__container">
<div class="pswp__item"></div>
<div class="pswp__item"></div>
<div class="pswp__item"></div>
</div>
<div class="pswp__ui pswp__ui--hidden">
<div class="pswp__top-bar">
<div class="pswp__counter"></div>
<button class="pswp__button pswp__button--close" title="Fermer (Esc)"></button>
<div class="pswp__preloader">
<div class="pswp__preloader__icn">
<div class="pswp__preloader__cut">
<div class="pswp__preloader__donut"></div>
</div>
</div>
</div>
</div>

<button class="pswp__button pswp__button--arrow--left" title="Suivant (flèche droite)">
</button>

<button class="pswp__button pswp__button--arrow--right" title="Précédent (flèche gauche)">
</button>

<div class="pswp__caption">
<div class="pswp__caption__center"></div>
<div id="pswp"
class="hiddenpswp"
tabindex="-1"
role="dialog"
aria-hidden="true">
<div class="pswp__bg"></div>
<div class="pswp__scroll-wrap">
<div class="pswp__container">
<div class="pswp__item"></div>
<div class="pswp__item"></div>
<div class="pswp__item"></div>
</div>
<div class="pswp__ui pswp__ui--hidden">
<div class="pswp__top-bar">
<div class="pswp__counter"></div>
<button class="pswp__button pswp__button--close" title="Fermer (Esc)"></button>
<div class="pswp__preloader">
<div class="pswp__preloader__icn">
<div class="pswp__preloader__cut">
<div class="pswp__preloader__donut"></div>
</div>
</div>
</div>
</div>
<button class="pswp__button pswp__button--arrow--left"
title="Suivant (flèche droite)"></button>
<button class="pswp__button pswp__button--arrow--right"
title="Précédent (flèche gauche)"></button>
<div class="pswp__caption">
<div class="pswp__caption__center"></div>
</div>
</div>
</div>
</div>
<script type="text/javascript">
var pswpElement = document.getElementById('pswp');
var items = JSON.parse('[{"h": 2450, "src": "{{ url_for("static", filename="showcase/1.webp") }}", "w": 2450}, {"h": 2509, "src": "{{ url_for("static", filename="showcase/2.webp") }}", "w": 2221}, {"h": 2536, "src": "{{ url_for("static", filename="showcase/3.webp") }}", "w": 2101}, {"h": 2722, "src": "{{ url_for("static", filename="showcase/4.webp") }}", "w": 2348}, {"h": 2745, "src": "{{ url_for("static", filename="showcase/5.webp") }}", "w": 1804}, {"h": 3307, "src": "{{ url_for("static", filename="showcase/6.webp") }}", "w": 2897}, {"h": 2321, "src": "{{ url_for("static", filename="showcase/7.webp") }}", "w": 2239}, {"h": 2470, "src": "{{ url_for("static", filename="showcase/8.webp") }}", "w": 2419}, {"h": 3307, "src": "{{ url_for("static", filename="showcase/9.webp") }}", "w": 2602}]');
var pswpElement = document.getElementById("pswp");
var options = {
index: 0,
loop: false,
};

function showGallery(){
let items = [
{"h": 2450, "src": "{{ url_for('static', filename='showcase/' + g.lang + '/1.webp') }}", "w": 2450},
{"h": 2509, "src": "{{ url_for('static', filename='showcase/' + g.lang + '/2.webp') }}", "w": 2221},
{"h": 2536, "src": "{{ url_for('static', filename='showcase/' + g.lang + '/3.webp') }}", "w": 2101},
{"h": 2722, "src": "{{ url_for('static', filename='showcase/' + g.lang + '/4.webp') }}", "w": 2348},
{"h": 2745, "src": "{{ url_for('static', filename='showcase/' + g.lang + '/5.webp') }}", "w": 1804},
{"h": 3307, "src": "{{ url_for('static', filename='showcase/' + g.lang + '/6.webp') }}", "w": 2897},
{"h": 2321, "src": "{{ url_for('static', filename='showcase/' + g.lang + '/7.webp') }}", "w": 2239},
{"h": 2470, "src": "{{ url_for('static', filename='showcase/' + g.lang + '/8.webp') }}", "w": 2419},
{"h": 3307, "src": "{{ url_for('static', filename='showcase/' + g.lang + '/9.webp') }}", "w": 2602}
];

/* the CSS and JS for photoswipe is loaded dynamically
* so that they are not loaded if the gallery is not open */
// CSS and JS are loaded dynamically when the gallery opens
$('head').append('<link rel="stylesheet" type="text/css" href="{{ url_for("static", filename="photoswipe/default-skin/default-skin.css") }}">');
$('head').append('<link rel="stylesheet" type="text/css" href="{{ url_for("static", filename="photoswipe/photoswipe.css") }}">');

$('head').append('<link rel="stylesheet" type="text/css" href="{{ url_for("static", filename="photoswipe/default-skin/default-skin.css") }}">');
$('head').append('<link rel="stylesheet" type="text/css" href="{{ url_for("static", filename="photoswipe/photoswipe.css") }}">');

var script = document.createElement("script");
script.type = "text/javascript";
script.src = "{{ url_for('static', filename='photoswipe/photoswipe.min.js')}}";
script.onload = function(){
var script2 = document.createElement("script");
script2.type = "text/javascript";
script2.src = "{{ url_for('static', filename='photoswipe/photoswipe-ui-default.min.js')}}";
script2.onload = function(){
pswpElement.className="pswp";
var gallery = new PhotoSwipe(pswpElement, PhotoSwipeUI_Default, items, options);
gallery.init();
};
document.body.appendChild(script2);
};
document.body.appendChild(script);
var script = document.createElement("script");
script.type = "text/javascript";
script.src = "{{ url_for('static', filename='photoswipe/photoswipe.min.js')}}";
script.onload = function(){
var script2 = document.createElement("script");
script2.type = "text/javascript";
script2.src = "{{ url_for('static', filename='photoswipe/photoswipe-ui-default.min.js')}}";
script2.onload = function(){
pswpElement.className="pswp";
var gallery = new PhotoSwipe(pswpElement, PhotoSwipeUI_Default, items, options);
gallery.init();
};
document.body.appendChild(script2);
};
document.body.appendChild(script);
}

</script>
4 changes: 1 addition & 3 deletions ihatemoney/tests/budget_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -964,9 +964,7 @@ def test_dashboard(self):
assert """<thead>
<tr>
<th>Project</th>
<th>Number of participants</th>""" in resp.data.decode(
"utf-8"
)
<th>Number of participants</th>""" in resp.data.decode("utf-8")

def test_dashboard_project_deletion(self):
self.post_project("raclette")
Expand Down
3 changes: 3 additions & 0 deletions ihatemoney/web.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,12 +295,14 @@ def home():
is_public_project_creation_allowed = current_app.config[
"ALLOW_PUBLIC_PROJECT_CREATION"
]
display_showcase = g.lang in current_app.config["SHOWCASE_LANGUAGES"]

return render_template(
"home.html",
project_form=project_form,
is_demo_project_activated=is_demo_project_activated,
is_public_project_creation_allowed=is_public_project_creation_allowed,
display_showcase=display_showcase,
auth_form=auth_form,
session=session,
)
Expand Down Expand Up @@ -676,6 +678,7 @@ def list_bills():
csrf_form=csrf_form,
add_bill=request.values.get("add_bill", False),
current_view="list_bills",
display_showcase=g.lang in current_app.config["SHOWCASE_LANGUAGES"],
)


Expand Down
Loading