ariasat/agecem-org
2
1
Fork 0
forked from agecem/agecem-org
Code Issues 27 Pull requests 4 Packages Activity Actions

Refactor: colocalisation des ficher pour mieux gerer les ficher et leur fonctionalitées #60

Open
dnova wants to merge 5 commits from front_cleanup into main
pull from: front_cleanup
merge into: ariasat:main
Conversation 3 Commits 5 Files changed 60 +68 -46
dnova commented 2026-07-10 19:27:24 -04:00
Collaborator
Copy link

Closes #46

Closes #46
refactor: colocalisation des fichers UI
All checks were successful
/ build (pull_request) Successful in 1m34s
Details
/ help (pull_request) Successful in -6s
Details
40a25c3d8b
ariasat commented 2026-07-16 17:50:55 -04:00
Owner
Copy link

Ca look good, je pense qu'on deverait ajouter un dossier de plus pour les icones, live c'est dans layout. Aussi creer un fichier css pour chaque html pour rester conssistant et pourquoi il y a general.html dans components? genre c'est quoi difference entre components et templates

Ca look good, je pense qu'on deverait ajouter un dossier de plus pour les icones, live c'est dans layout. Aussi creer un fichier css pour chaque html pour rester conssistant et pourquoi il y a general.html dans components? genre c'est quoi difference entre components et templates
deplacement vers le bon endroits de components et renommage de blogues css
All checks were successful
/ build (pull_request) Successful in 1m33s
Details
/ help (pull_request) Successful in -7s
Details
8295b5ef54
merge main
All checks were successful
/ build (pull_request) Successful in 1m14s
Details
/ help (pull_request) Successful in -8s
Details
5819955fd2
ariasat commented 2026-07-27 15:31:27 -04:00
Owner
Copy link

le dossier 'Poppins' deverait etre 'poppins' a cause des conventions en go

le dossier 'Poppins' deverait etre 'poppins' a cause des conventions en go
ariasat commented 2026-07-27 15:33:08 -04:00
Owner
Copy link

On mets tu arrow-icon.html dans le dossier icones?

On mets tu arrow-icon.html dans le dossier icones?
All checks were successful
/ build (pull_request) Successful in 1m14s
Details
/ help (pull_request) Successful in -8s
Details
This pull request has changes conflicting with the target branch.
  • frontend/templates/pages/accompagnement.css
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin front_cleanup:front_cleanup
git switch front_cleanup

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff front_cleanup
git switch front_cleanup
git rebase main
git switch main
git merge --ff-only front_cleanup
git switch front_cleanup
git rebase main
git switch main
git merge --no-ff front_cleanup
git switch main
git merge --squash front_cleanup
git switch main
git merge --ff-only front_cleanup
git switch main
git merge front_cleanup
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
ariasat/agecem-org!60
No description provided.