diff --git a/gather_tags_in_json.py b/gather_tags_in_json.py index 108f25f5..dbbb9fdb 100644 --- a/gather_tags_in_json.py +++ b/gather_tags_in_json.py @@ -60,13 +60,11 @@ def group_files_by_tags(org_files, excluded_tags): # slug = find_slug_in_file_basename(file_path) date_str, annee, slug = find_year_and_slug_on_filename(file_path) - print(file_path) boom = file_path.split('/') dernière_partie = boom[-1] boom = dernière_partie.split('__') slug = boom[0][:4]+'/'+slug - # print( slug ) for tag in tags: tag_to_files[tag].add(slug) return tag_to_files diff --git a/linking_articles_prev_next.py b/linking_articles_prev_next.py index c8f2ae55..90802baf 100644 --- a/linking_articles_prev_next.py +++ b/linking_articles_prev_next.py @@ -228,11 +228,12 @@ count_articles_updated = 0 for basename, info in files_dict.items(): date_str = info['date'] - - if date_str > '20240101': + current_year = datetime.now().year + + if date_str > f'{current_year}0101': count_articles_updated += 1 -print(f"Nombre d'articles mis à jour après le 01 01 2024 : {count_articles_updated}") +print(f"Nombre d'articles mis à jour après le 01 01 {current_year} : {count_articles_updated}") def generate_blog_index(json_file, template_file, output_file): diff --git a/sass_styles.sh b/sass_styles.sh index d80e5656..1a409344 100644 --- a/sass_styles.sh +++ b/sass_styles.sh @@ -5,8 +5,9 @@ sass templates/styles_src/style_general.scss templates/styles/style_general.css # sass templates/styles_src/truc.scss templates/styles/style_general.css +echo "copier le style général et le js principal vers html-websites pour chaque site" + for i in $(ls html-websites); do - echo "copier le style général et le js principal vers html-websites/$i/" cp templates/styles/style_general.css html-websites/$i/style.css cp templates/js/main_script.js html-websites/$i/main_script.js done diff --git a/templates/styles/style_general.css b/templates/styles/style_general.css index 36c23ca2..0f800b53 100644 --- a/templates/styles/style_general.css +++ b/templates/styles/style_general.css @@ -89,10 +89,14 @@ a { border-radius: 1rem; color: rgb(0, 123, 255); text-decoration: none; + padding: 1rem; } main a:hover { background: #303030; - color: #dedede; + color: rgb(0, 123, 255); +} +main a:hover h2 { + color: rgb(0, 123, 255); } .nav a, .page__index a { padding: 0.55rem 2rem; diff --git a/templates/styles/style_general.css.map b/templates/styles/style_general.css.map index fa7cc1cb..68d2c2f7 100644 --- a/templates/styles/style_general.css.map +++ b/templates/styles/style_general.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["../styles_src/style_general.scss"],"names":[],"mappings":";AAAA;AACA;EACE;EACA;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;;;AAGF;AAAA;AAAA;AAAA;EAIE;EACA;;;AAGF;AAAA;AAAA;AAAA;AAAA;AAAA;EAME;EACA;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;AAEA;EACE;;AAEA;EAEE;;;AAIJ;EACE;EACA;EACA;EACA;;;AAGF;AACA;EACE;;AAEA;AAAA;AAAA;AAAA;AAAA;EAKE;EACA;EACA;EACA;EACA;;;AAIJ;AAAA;EAEE;;;AAIF;EACE;EAEA;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EAGE;EACA;EACA;EACA;;AAGF;EACE;EACA;;;AAKJ;EACE;;AAEA;EAEE;EACA;;;AAIJ;AAAA;AAAA;AAAA;EAIE;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;AAAA;AAAA;AAAA;AAAA;AAAA;EAME;EACA;EACA;;;AAGF;AAAA;EAEE;;;AAGF;AAAA;AAAA;AAAA;EAIE;;;AAGF;EACE;EACA;;;AAGF;EACE;;AAEA;EACE;;AAGF;EACE;EACA;;;AAKJ;EACE;;;AAGF;EACE;EACA;;;AAIA;EACE;;;AAKF;EACE;EACA;EACA;;AAGF;EACE;EACA;;;AAIJ;EAEE;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;;;AAIJ;EACE;;AAEA;EACE;EACA;EACA;EACA;EACA;;;AAIJ;EACE;EACA;EACA;EACA;;;AAGF;AAAA;EAEE;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;;;AAIF;EACE;EACA;;;AAIF;EACE;EACA;EACA;EACA;;;AAIA;EACE;;;AAIJ;EACE;EACA;;AAEA;EACE;;;AAIJ;EACE;EACA;;AAEA;EACE;EACA;;;AAMF;AAAA;EACE;;AAGF;AAAA;EACE;EACA;;AAGA;AAAA;EACE;EACA;;;AAMN;AAAA;EAEE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;;;AAIA;EACE;;AAEA;EACE;;AAIJ;EACE;EACA;EACA;;;AAIJ;EACE;IACE;;EAGF;IACE","file":"style_general.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["../styles_src/style_general.scss"],"names":[],"mappings":";AAAA;AACA;EACE;EACA;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;;;AAGF;AAAA;AAAA;AAAA;EAIE;EACA;;;AAGF;AAAA;AAAA;AAAA;AAAA;AAAA;EAME;EACA;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;AAEA;EACE;;AAEA;EAEE;;;AAIJ;EACE;EACA;EACA;EACA;;;AAGF;AACA;EACE;;AAEA;AAAA;AAAA;AAAA;AAAA;EAKE;EACA;EACA;EACA;EACA;;;AAIJ;AAAA;EAEE;;;AAIF;EACE;EAEA;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAEA;EACE;;AAKJ;EAGE;EACA;EACA;EACA;;AAGF;EACE;EACA;;;AAKJ;EACE;;AAEA;EAEE;EACA;;;AAIJ;AAAA;AAAA;AAAA;EAIE;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;AAAA;AAAA;AAAA;AAAA;AAAA;EAME;EACA;EACA;;;AAGF;AAAA;EAEE;;;AAGF;AAAA;AAAA;AAAA;EAIE;;;AAGF;EACE;EACA;;;AAGF;EACE;;AAEA;EACE;;AAGF;EACE;EACA;;;AAKJ;EACE;;;AAGF;EACE;EACA;;;AAIA;EACE;;;AAKF;EACE;EACA;EACA;;AAGF;EACE;EACA;;;AAIJ;EAEE;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;;;AAIJ;EACE;;AAEA;EACE;EACA;EACA;EACA;EACA;;;AAIJ;EACE;EACA;EACA;EACA;;;AAGF;AAAA;EAEE;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;;;AAIF;EACE;EACA;;;AAIF;EACE;EACA;EACA;EACA;;;AAIA;EACE;;;AAIJ;EACE;EACA;;AAEA;EACE;;;AAIJ;EACE;EACA;;AAEA;EACE;EACA;;;AAMF;AAAA;EACE;;AAGF;AAAA;EACE;EACA;;AAGA;AAAA;EACE;EACA;;;AAMN;AAAA;EAEE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;;;AAIA;EACE;;AAEA;EACE;;AAIJ;EACE;EACA;EACA;;;AAIJ;EACE;IACE;;EAGF;IACE","file":"style_general.css"} \ No newline at end of file diff --git a/templates/styles_src/style_general.scss b/templates/styles_src/style_general.scss index 0c1e5208..871cbd8b 100644 --- a/templates/styles_src/style_general.scss +++ b/templates/styles_src/style_general.scss @@ -94,10 +94,16 @@ a { border-radius: 1rem; color: rgb(0, 123, 255); text-decoration: none; + padding: 1rem; main &:hover { background: #303030; - color: #dedede; + color: rgb(0, 123, 255); + + h2 { + color: rgb(0, 123, 255); + } + } .nav &, diff --git a/website_config.py b/website_config.py index 25f888e2..11897d25 100644 --- a/website_config.py +++ b/website_config.py @@ -8,7 +8,7 @@ global_config = { "rebuild_files_filter": 2024, "posts_per_page": 10, "source_files_extension": "org", - "excluded_tags": ['PROPERTIES', 'CREATED', 'ID', 'END','CUSTOM_ID'], + "excluded_tags": ['PROPERTIES', 'CREATED', 'ID', 'END','CUSTOM_ID','CLASS'], # controlled vocabulary to find tags automatically "auto_tag_terms": ["illustration", "tuto", "NSFW", "BD", "récit", "science", "wtf", "yaoi", "yuri", "sondage", "entreprise", "AI", "photos",