diff --git a/README.md b/README.md index 962f6db..64a6632 100644 --- a/README.md +++ b/README.md @@ -20,16 +20,6 @@ ` env/bin/pip install -e ".[testing]" ` -- Initialize and upgrade the database using Alembic. - - - Generate your first revision. - - `env/bin/alembic -c development.ini revision --autogenerate -m "init" ` - - - Upgrade to that revision. - - `env/bin/alembic -c development.ini upgrade head ` - - Load default data into the database using a script. ` env/bin/initialize_cao_blogr_db development.ini ` diff --git a/cao_sunyata.sqlite b/cao_sunyata.sqlite old mode 100755 new mode 100644 index 480d3b5..36be6b5 Binary files a/cao_sunyata.sqlite and b/cao_sunyata.sqlite differ diff --git a/cao_sunyata/alembic/env.py b/cao_sunyata/alembic/env.py deleted file mode 100644 index 75c5334..0000000 --- a/cao_sunyata/alembic/env.py +++ /dev/null @@ -1,58 +0,0 @@ -"""Pyramid bootstrap environment. """ -from alembic import context -from pyramid.paster import get_appsettings, setup_logging -from sqlalchemy import engine_from_config - -from cao_sunyata.models.meta import Base - -config = context.config - -setup_logging(config.config_file_name) - -settings = get_appsettings(config.config_file_name) -target_metadata = Base.metadata - - -def run_migrations_offline(): - """Run migrations in 'offline' mode. - - This configures the context with just a URL - and not an Engine, though an Engine is acceptable - here as well. By skipping the Engine creation - we don't even need a DBAPI to be available. - - Calls to context.execute() here emit the given string to the - script output. - - """ - context.configure(url=settings['sqlalchemy.url']) - with context.begin_transaction(): - context.run_migrations() - - -def run_migrations_online(): - """Run migrations in 'online' mode. - - In this scenario we need to create an Engine - and associate a connection with the context. - - """ - engine = engine_from_config(settings, prefix='sqlalchemy.') - - connection = engine.connect() - context.configure( - connection=connection, - target_metadata=target_metadata - ) - - try: - with context.begin_transaction(): - context.run_migrations() - finally: - connection.close() - - -if context.is_offline_mode(): - run_migrations_offline() -else: - run_migrations_online() diff --git a/cao_sunyata/alembic/script.py.mako b/cao_sunyata/alembic/script.py.mako deleted file mode 100644 index 535780d..0000000 --- a/cao_sunyata/alembic/script.py.mako +++ /dev/null @@ -1,22 +0,0 @@ -"""${message} - -Revision ID: ${up_revision} -Revises: ${down_revision | comma,n} -Create Date: ${create_date} - -""" -from alembic import op -import sqlalchemy as sa -${imports if imports else ""} - -# revision identifiers, used by Alembic. -revision = ${repr(up_revision)} -down_revision = ${repr(down_revision)} -branch_labels = ${repr(branch_labels)} -depends_on = ${repr(depends_on)} - -def upgrade(): - ${upgrades if upgrades else "pass"} - -def downgrade(): - ${downgrades if downgrades else "pass"} diff --git a/cao_sunyata/alembic/versions/20220510_a35fa375a82f.py b/cao_sunyata/alembic/versions/20220510_a35fa375a82f.py deleted file mode 100644 index 76edf9e..0000000 --- a/cao_sunyata/alembic/versions/20220510_a35fa375a82f.py +++ /dev/null @@ -1,26 +0,0 @@ -"""init - -Revision ID: a35fa375a82f -Revises: -Create Date: 2022-05-10 08:28:42.146580 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = 'a35fa375a82f' -down_revision = None -branch_labels = None -depends_on = None - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.add_column('topics', sa.Column('topic_quote', sa.Unicode(length=255), nullable=True)) - # ### end Alembic commands ### - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.drop_column('topics', 'topic_quote') - # ### end Alembic commands ### diff --git a/cao_sunyata/alembic/versions/20220518_6da5ee6785ff.py b/cao_sunyata/alembic/versions/20220518_6da5ee6785ff.py deleted file mode 100644 index c1ede17..0000000 --- a/cao_sunyata/alembic/versions/20220518_6da5ee6785ff.py +++ /dev/null @@ -1,26 +0,0 @@ -"""init - -Revision ID: 6da5ee6785ff -Revises: a35fa375a82f -Create Date: 2022-05-18 10:33:38.599975 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = '6da5ee6785ff' -down_revision = 'a35fa375a82f' -branch_labels = None -depends_on = None - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.add_column('entries', sa.Column('status', sa.Unicode(length=50), nullable=True)) - # ### end Alembic commands ### - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.drop_column('entries', 'status') - # ### end Alembic commands ### diff --git a/cao_sunyata/alembic/versions/20220929_91bc91a0dfc5.py b/cao_sunyata/alembic/versions/20220929_91bc91a0dfc5.py deleted file mode 100644 index 599e45c..0000000 --- a/cao_sunyata/alembic/versions/20220929_91bc91a0dfc5.py +++ /dev/null @@ -1,28 +0,0 @@ -"""init - -Revision ID: 91bc91a0dfc5 -Revises: 6da5ee6785ff -Create Date: 2022-09-29 13:47:36.479683 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = '91bc91a0dfc5' -down_revision = '6da5ee6785ff' -branch_labels = None -depends_on = None - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.add_column('entries', sa.Column('creator', sa.Unicode(length=50), nullable=True)) - op.add_column('entries', sa.Column('editor', sa.Unicode(length=50), nullable=True)) - # ### end Alembic commands ### - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.drop_column('entries', 'editor') - op.drop_column('entries', 'creator') - # ### end Alembic commands ### diff --git a/cao_sunyata/alembic/versions/README.txt b/cao_sunyata/alembic/versions/README.txt deleted file mode 100644 index b0d704d..0000000 --- a/cao_sunyata/alembic/versions/README.txt +++ /dev/null @@ -1 +0,0 @@ -Placeholder for alembic versions diff --git a/cao_sunyata/models/entries.py b/cao_sunyata/models/entries.py index f92786d..0638247 100644 --- a/cao_sunyata/models/entries.py +++ b/cao_sunyata/models/entries.py @@ -11,7 +11,7 @@ def get_entries_by_topic(request, topic, tag): else: if request.authenticated_userid != 'admin': # if user is not 'admin', hide admin posts - query = query + " AND tag =! '_admin'" + query = query + " AND tag != '_admin'" if tag != '': query = query + " AND tag = '{0}'".format(tag) @@ -66,14 +66,14 @@ def get_last_edited(request): # if user is anonym, display only published posts query = query + " AND status='publié'" - query = query + " ORDER BY edited LIMIT 10;" + query = query + " ORDER BY edited DESC LIMIT 10;" results = request.dbsession.execute(query).fetchall() return results def get_activities(request): # gest the Activities section - query = "SELECT * FROM entries WHERE topic_id = '_admin' AND tag = 'activities' AND status = 'publié' ORDER BY created;" - results = request.dbsession.execute(query,).first() + query = "SELECT * FROM entries WHERE topic_id = '_admin' AND title like 'Activities - column%' ORDER BY title;" + results = request.dbsession.execute(query,).all() return results def get_tags_byTopic(request, topic): diff --git a/cao_sunyata/static/img/IMG_0029.jpeg b/cao_sunyata/static/img/IMG_0029.jpeg deleted file mode 100644 index f99ccf2..0000000 Binary files a/cao_sunyata/static/img/IMG_0029.jpeg and /dev/null differ diff --git a/cao_sunyata/static/images/blog/blog-img1.jpg b/cao_sunyata/static/img/home/blog-img1.jpg similarity index 100% rename from cao_sunyata/static/images/blog/blog-img1.jpg rename to cao_sunyata/static/img/home/blog-img1.jpg diff --git a/cao_sunyata/static/images/blog/blog-img2.jpg b/cao_sunyata/static/img/home/blog-img2.jpg similarity index 100% rename from cao_sunyata/static/images/blog/blog-img2.jpg rename to cao_sunyata/static/img/home/blog-img2.jpg diff --git a/cao_sunyata/static/images/blog/blog-img3.jpg b/cao_sunyata/static/img/home/blog-img3.jpg similarity index 100% rename from cao_sunyata/static/images/blog/blog-img3.jpg rename to cao_sunyata/static/img/home/blog-img3.jpg diff --git a/cao_sunyata/static/img/home/home_activity1.jpeg b/cao_sunyata/static/img/home/home_activity1.jpeg new file mode 100644 index 0000000..6bbafd2 Binary files /dev/null and b/cao_sunyata/static/img/home/home_activity1.jpeg differ diff --git a/cao_sunyata/static/img/home/home_activity2.jpg b/cao_sunyata/static/img/home/home_activity2.jpg new file mode 100644 index 0000000..932b82f Binary files /dev/null and b/cao_sunyata/static/img/home/home_activity2.jpg differ diff --git a/cao_sunyata/static/img/home/home_activity3.jpg b/cao_sunyata/static/img/home/home_activity3.jpg new file mode 100644 index 0000000..2ed2c7c Binary files /dev/null and b/cao_sunyata/static/img/home/home_activity3.jpg differ diff --git a/cao_sunyata/templates/blog_edit.jinja2 b/cao_sunyata/templates/blog_edit.jinja2 index bf681af..8df905a 100644 --- a/cao_sunyata/templates/blog_edit.jinja2 +++ b/cao_sunyata/templates/blog_edit.jinja2 @@ -5,7 +5,7 @@
-
+
@@ -62,7 +62,7 @@ Retour {% if blog_id != '0' %} - + {% endif %}
@@ -72,26 +72,23 @@
- diff --git a/cao_sunyata/templates/home.jinja2 b/cao_sunyata/templates/home.jinja2 index d256b43..a29ef1d 100644 --- a/cao_sunyata/templates/home.jinja2 +++ b/cao_sunyata/templates/home.jinja2 @@ -4,7 +4,7 @@
-
+
+
+
-
-
- {{ activities | safe }} - {% if request.authenticated_userid %} -
Modifier "Nos activités"
- {% endif %} +
+
+
+ + + à Noisy-le-Grand +
+ +
+ {{ activity_col1 | safe }} + {% if request.authenticated_userid %} +

[Modifier ce bloc]

+ {% endif %} +
+
+
+
+
+
+ matdash-img + + sur Zoom +
+ +
+ {{ activity_col2 | safe }} + {% if request.authenticated_userid %} +

[Modifier ce bloc]

+ {% endif %} +
+
+
+
+
+
+ matdash-img + + Evènement +
+ +
+ {{ activity_col3 | safe }} + {% if request.authenticated_userid %} +

[Modifier ce bloc]

+ {% endif %} + +
+
@@ -105,11 +149,15 @@
-

Le centre de Méditation SUNYATA Paris est une branche du SUNYATA Méditation Center dont le siège est à Perris, CA, Etats-Unis. +

+ +

Méditation SUNYATA Paris est une branche du SUNYATA Méditation Center dont le siège est à Perris, CA, Etats-Unis.
Notre but est de promouvoir la pratique de la méditation et du QiGong SUNYATA à Paris. -

+

+ +
-
+
La Méditation SUNYATA

-
+
La technique « PARLE PAS »

Retour -

@@ -35,7 +35,6 @@
-

Supprimer une IMAGES

@@ -44,14 +43,11 @@ {{ filename }} ?

-
-
-
- -
-
-
-
+
+ + +
+
diff --git a/cao_sunyata/templates/images.jinja2 b/cao_sunyata/templates/images.jinja2 index 10b0b31..2fe9b64 100644 --- a/cao_sunyata/templates/images.jinja2 +++ b/cao_sunyata/templates/images.jinja2 @@ -45,7 +45,7 @@
- +
diff --git a/cao_sunyata/templates/layout.jinja2 b/cao_sunyata/templates/layout.jinja2 index 8d11ab9..78fe0a9 100644 --- a/cao_sunyata/templates/layout.jinja2 +++ b/cao_sunyata/templates/layout.jinja2 @@ -101,10 +101,38 @@ Contact +
  • + + SUNYATA sur le Web +
  • - +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • +
    • diff --git a/cao_sunyata/templates/tag_edit.jinja2 b/cao_sunyata/templates/tag_edit.jinja2 index 0034226..02087b7 100644 --- a/cao_sunyata/templates/tag_edit.jinja2 +++ b/cao_sunyata/templates/tag_edit.jinja2 @@ -1,27 +1,29 @@ {% extends "layout.jinja2" %} {% block content %} +
    +
    -
    + -
    - +
    +
    -
    - +
    +
    -
    - - Retour +
    + + Retour + Enregistrer {% if entry.tag != '0' %} - + {% endif %}
    @@ -29,11 +31,10 @@ - +
    {% endblock %} diff --git a/cao_sunyata/templates/topic_edit.jinja2 b/cao_sunyata/templates/topic_edit.jinja2 index 1edfe48..327ca76 100644 --- a/cao_sunyata/templates/topic_edit.jinja2 +++ b/cao_sunyata/templates/topic_edit.jinja2 @@ -4,7 +4,7 @@
    -
    +
    @@ -29,7 +29,7 @@ {% if entry.topic != '0' %} - {% endif %}
    @@ -67,7 +67,6 @@
    -

    Supprimer le Topic

    @@ -75,11 +74,10 @@

    Etes-vous certain(e) de vouloir supprimer le Topic {{ entry.topic_name }} ?

    -
    -
    - - - +
    + + +
    diff --git a/cao_sunyata/views/default.py b/cao_sunyata/views/default.py index f03f6df..ed84929 100644 --- a/cao_sunyata/views/default.py +++ b/cao_sunyata/views/default.py @@ -41,16 +41,20 @@ def home(request): dir + '/S25.jpg'] # get the Activities section - activ = get_activities(request) + activities = get_activities(request) # insèrer le path de static/img - activities = activ.body.replace('static/', "%s/static/" % request.application_url) + activity_col1 = activities[0].body.replace('static/', "%s/static/" % request.application_url) + activity_col2 = activities[1].body.replace('static/', "%s/static/" % request.application_url) + activity_col3 = activities[2].body.replace('static/', "%s/static/" % request.application_url) # get the last created posts last_ten = get_last_created(request) return { 'page_title': "", 'last_ten': last_ten, - 'activities': activities, + 'activity_col1': activity_col1, + 'activity_col2': activity_col2, + 'activity_col3': activity_col3, 'car_images': car_images, } diff --git a/development.ini b/development.ini index b95c5ce..ae48b83 100644 --- a/development.ini +++ b/development.ini @@ -47,12 +47,6 @@ setup = cao_sunyata.pshell.setup # wsgi server configuration ### -[alembic] -# path to migration scripts -script_location = cao_sunyata/alembic -file_template = %%(year)d%%(month).2d%%(day).2d_%%(rev)s -# file_template = %%(rev)s_%%(slug)s - [server:main] use = egg:waitress#main listen = localhost:9180 diff --git a/production.ini b/production.ini index e62208d..6ea7573 100644 --- a/production.ini +++ b/production.ini @@ -37,12 +37,6 @@ setup = cao_sunyata.pshell.setup # wsgi server configuration ### -[alembic] -# path to migration scripts -script_location = cao_sunyata/alembic -file_template = %%(year)d%%(month).2d%%(day).2d_%%(rev)s -# file_template = %%(rev)s_%%(slug)s - [server:main] use = egg:waitress#main listen = *:9180 diff --git a/setup.py b/setup.py index 6f58646..cd84860 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,6 @@ requires = [ 'pyramid_jinja2', 'pyramid_debugtoolbar', 'waitress', - 'alembic==1.4.2', 'pyramid_mailer', 'pyramid_retry', 'pyramid_tm',