diff --git a/.forgejo/workflows/README.md b/.forgejo/workflows/README.md new file mode 100644 index 0000000..105510f --- /dev/null +++ b/.forgejo/workflows/README.md @@ -0,0 +1,43 @@ +# CI/CD avec Forgejo + +## Vue d'ensemble + +Le workflow `deploy.yml` automatise le build de l'application Vue et le déploiement sur le serveur de production. + +## Workflow + +À chaque push sur la branche `main` : + +1. **Checkout** : Clone le dépôt +2. **Setup Node.js** : Installe Node.js 20 +3. **Install dependencies** : Installe les dépendances npm +4. **Build Vue app** : Compile l'application Vue vers `public/assets/dist/` +5. **Deploy via FTP** : Synchronise les fichiers vers le serveur de production + +## Configuration des secrets + +Dans Forgejo, configurez les secrets suivants (Settings > Secrets and Variables > Actions) : + +- `USERNAME` : Nom d'utilisateur FTP +- `PASSWORD` : Mot de passe FTP +- `PRODUCTION_HOST` : Hôte FTP (format : `ftp://host.example.com`) + +## Fichiers déployés + +Le workflow déploie depuis le dossier `public/` : + +- `public/assets/` → `assets/` (incluant le build Vue dans `assets/dist/`) +- `public/site/` → `site/` (excluant accounts/, cache/, sessions/) +- `public/kirby/` → `kirby/` +- `public/vendor/` → `vendor/` +- `public/index.php` → `index.php` + +## Build local + +Pour tester le build localement : + +```bash +npm run build +``` + +Les fichiers seront générés dans `public/assets/dist/` (ignorés par git). diff --git a/.forgejo/workflows/deploy.yml b/.forgejo/workflows/deploy.yml new file mode 100644 index 0000000..09f5735 --- /dev/null +++ b/.forgejo/workflows/deploy.yml @@ -0,0 +1,65 @@ +name: Deploy + +on: + push: + branches: + - main + +jobs: + deploy: + name: Build and Deploy to Production + runs-on: docker + steps: + - name: Checkout code + run: | + git clone --depth 1 --branch main https://forge.studio-variable.com/${{ github.repository }}.git . + ls -la + + - name: Setup Node.js + run: | + apt-get update -qq && apt-get install -y -qq curl + curl -fsSL https://deb.nodesource.com/setup_20.x | bash - + apt-get install -y -qq nodejs + node --version + npm --version + + - name: Install dependencies + run: | + npm ci + + - name: Prepare dist directory + run: | + rm -rf dist + cp -r public dist + ls -la dist/ + + - name: Build Vue app + run: | + npm run build + ls -la dist/assets/dist/ + + - name: Deploy via FTP + env: + USERNAME: ${{ secrets.USERNAME }} + PASSWORD: ${{ secrets.PASSWORD }} + PRODUCTION_HOST: ${{ secrets.PRODUCTION_HOST }} + run: | + apt-get install -y -qq lftp + cd dist + lftp -c " + set ftp:ssl-allow no; + open -u $USERNAME,$PASSWORD $PRODUCTION_HOST; + mirror --reverse --verbose --ignore-time --parallel=10 \ + -x 'local/' \ + assets assets; + mirror --reverse --verbose --ignore-time --parallel=10 \ + -x 'accounts/' \ + -x 'cache/' \ + -x 'sessions/' \ + site site; + mirror --reverse --verbose --ignore-time --parallel=10 \ + kirby kirby; + mirror --reverse --verbose --ignore-time --parallel=10 \ + vendor vendor; + put index.php -o index.php; + quit" diff --git a/public/assets/css/src/_forms-section.scss b/public/assets/css/src/_forms-section.scss index dd2a996..56bb44a 100644 --- a/public/assets/css/src/_forms-section.scss +++ b/public/assets/css/src/_forms-section.scss @@ -1,11 +1,5 @@ .settings-section { - - margin-top: 3em; - - - // .cons - - + margin: var(--space-m) 0; h2 { margin-bottom: var(--space); @@ -14,30 +8,25 @@ font-size: 1.4rem; border-bottom: 1px solid var(--color-200); color: var(--color-800); - } - .infos{ + .infos { font-size: 0.8rem; color: var(--color-interface-400); } - - .settings-subsection:not(:last-child) { - border-bottom: 1px solid var(--color-interface-100); - } - - .settings-subsection { - padding: var(--space-xs) 0; - - h3 { - margin-top: calc(var(--space-xs)*1.5); - margin-bottom: calc(var(--space-xs)*2); - font-size: 1rem; - font-weight: 600; - - } - } } - - \ No newline at end of file +.settings-subsection:not(:last-child) { + border-bottom: 1px solid var(--color-interface-100); +} + +.settings-subsection { + padding: var(--space-xs) 0; + + h3 { + margin-top: calc(var(--space-xs) * 1.5); + margin-bottom: calc(var(--space-xs) * 2); + font-size: 1rem; + font-weight: 600; + } +} diff --git a/public/assets/css/src/_forms.scss b/public/assets/css/src/_forms.scss index 5dede7e..d80ad59 100644 --- a/public/assets/css/src/_forms.scss +++ b/public/assets/css/src/_forms.scss @@ -5,7 +5,9 @@ input[type="number"] { border: 1px solid var(--color-interface-200); background-color: var(--color-interface-100); font-family: var(--sans-serif); + color: var(--color-txt); font-size: 1rem; + padding-left: 0.5ch; // min-width: var(--input-w); // width: 100%; // padding: 0 1ch; @@ -76,14 +78,27 @@ input[type="number"] { width: 100%; } .field-checkbox{ + grid-column: 2; padding-top: var(--space-xs); label{ font-weight: 400; margin-left: 0.75ch; + color: var(--color-txt); } } } +.field-text-size{ + input[type="number"]{ + width: var(--input-w-small); + padding-left: 0.75ch; + } + input[type="range"]{ + flex-grow: 2; + flex-shrink: 2; + } +} + .field-margin, .field-size{ display: inline-grid; width: calc(50% - 1ch); @@ -188,9 +203,13 @@ input[type="number"] { top: 0; button{ - height: calc(var(--input-h)*0.6); + height: calc(var(--input-h)*0.5); cursor: pointer; padding: 0; + svg{ + width: 10px; + height: auto; + } svg path{ fill: var(--color-interface-600); } @@ -202,8 +221,9 @@ input[type="number"] { } .spinner-down{ svg{ - position: relative; - top: -2px; + + // position: relative; + // top: -2px; } } diff --git a/public/assets/css/src/_settings-popup.scss b/public/assets/css/src/_settings-popup.scss index fcb8294..27e01e4 100644 --- a/public/assets/css/src/_settings-popup.scss +++ b/public/assets/css/src/_settings-popup.scss @@ -47,10 +47,7 @@ flex: 1; padding: 1rem; overflow-y: auto; - background: white; - display: flex; - flex-direction: column; - gap: 1rem; + background-color: var(--color-panel-bg); } .settings-subsection h4 { diff --git a/public/assets/css/src/_variables.scss b/public/assets/css/src/_variables.scss index c550470..a9667b8 100644 --- a/public/assets/css/src/_variables.scss +++ b/public/assets/css/src/_variables.scss @@ -9,7 +9,7 @@ - --color-txt: var(--color-interface-800); + --color-txt: var(--color-interface-900); --color-panel-bg: var(--color-interface-050); --color-page-highlight: #ff8a50; @@ -20,6 +20,8 @@ --space-xs: 0.5rem; --space-s: 1rem; --space: 1.5rem; + --space-m: 2rem; + --space-big: 3em; --curve: cubic-bezier(0.86, 0, 0.07, 1); @@ -34,4 +36,5 @@ font-size: 14px; --panel-w: 540px; + --panel-nav-h: 60px; } diff --git a/public/assets/css/style.css b/public/assets/css/style.css index 21e8d89..5fe2f80 100644 --- a/public/assets/css/style.css +++ b/public/assets/css/style.css @@ -223,7 +223,7 @@ img { :root { --color-browngray-050: #f5f3f0; --color-browngray-200: #d0c4ba; - --color-txt: var(--color-interface-800); + --color-txt: var(--color-interface-900); --color-panel-bg: var(--color-interface-050); --color-page-highlight: #ff8a50; --color-purple: #7136ff; @@ -231,6 +231,8 @@ img { --space-xs: 0.5rem; --space-s: 1rem; --space: 1.5rem; + --space-m: 2rem; + --space-big: 3em; --curve: cubic-bezier(0.86, 0, 0.07, 1); --sans-serif: "DM Sans", sans-serif; --mono: "Inconsolata", monospace; @@ -240,6 +242,7 @@ img { --label-w: 18ch; font-size: 14px; --panel-w: 540px; + --panel-nav-h: 60px; } body { @@ -273,7 +276,9 @@ input[type=number] { border: 1px solid var(--color-interface-200); background-color: var(--color-interface-100); font-family: var(--sans-serif); + color: var(--color-txt); font-size: 1rem; + padding-left: 0.5ch; } .field { @@ -328,11 +333,22 @@ input[type=number] { width: 100%; } .field-font .field-checkbox { + grid-column: 2; padding-top: var(--space-xs); } .field-font .field-checkbox label { font-weight: 400; margin-left: 0.75ch; + color: var(--color-txt); +} + +.field-text-size input[type=number] { + width: var(--input-w-small); + padding-left: 0.75ch; +} +.field-text-size input[type=range] { + flex-grow: 2; + flex-shrink: 2; } .field-margin, .field-size { @@ -421,23 +437,22 @@ input[type=number] { top: 0; } .number-input .spinner-buttons button { - height: calc(var(--input-h) * 0.6); + height: calc(var(--input-h) * 0.5); cursor: pointer; padding: 0; } +.number-input .spinner-buttons button svg { + width: 10px; + height: auto; +} .number-input .spinner-buttons button svg path { fill: var(--color-interface-600); } .number-input .spinner-buttons button:hover svg path { fill: var(--color-interface-900); } -.number-input .spinner-buttons .spinner-down svg { - position: relative; - top: -2px; -} - .settings-section { - margin-top: 3em; + margin: var(--space-m) 0; } .settings-section h2 { margin-bottom: var(--space); @@ -450,13 +465,15 @@ input[type=number] { font-size: 0.8rem; color: var(--color-interface-400); } -.settings-section .settings-subsection:not(:last-child) { + +.settings-subsection:not(:last-child) { border-bottom: 1px solid var(--color-interface-100); } -.settings-section .settings-subsection { + +.settings-subsection { padding: var(--space-xs) 0; } -.settings-section .settings-subsection h3 { +.settings-subsection h3 { margin-top: calc(var(--space-xs) * 1.5); margin-bottom: calc(var(--space-xs) * 2); font-size: 1rem; @@ -549,10 +566,7 @@ input[type=number] { flex: 1; padding: 1rem; overflow-y: auto; - background: white; - display: flex; - flex-direction: column; - gap: 1rem; + background-color: var(--color-panel-bg); } .settings-subsection h4 { diff --git a/public/assets/css/style.css.map b/public/assets/css/style.css.map index d5ddc57..093ff26 100644 --- a/public/assets/css/style.css.map +++ b/public/assets/css/style.css.map @@ -1 +1 @@ -{"version":3,"sources":["src/_fonts.scss","style.css","src/_colors.scss","src/_reset.scss","src/_variables.scss","src/_text.scss","src/_print-styles.scss","src/_forms.scss","src/_forms-section.scss","src/_buttons.scss","src/_settings-popup.scss"],"names":[],"mappings":"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","file":"style.css"} +{"version":3,"sources":["src/_fonts.scss","style.css","src/_colors.scss","src/_reset.scss","src/_variables.scss","src/_text.scss","src/_print-styles.scss","src/_forms.scss","src/_forms-section.scss","src/_buttons.scss","src/_settings-popup.scss"],"names":[],"mappings":"AACA;EACE,sBAAA;EACA,mFAAA;EACA,qBAAA;EACA,kBAAA;EACA,kBAAA;ACAF;ADGA;EACE,sBAAA;EACA,0FAAA;EACA,qBAAA;EACA,kBAAA;EACA,kBAAA;ACDF;ADKA;EACE,sBAAA;EACA,kEAAA;EACA,gBAAA;EACA,kBAAA;EACA,kBAAA;ACHF;ADMA;EACE,sBAAA;EACA,wEAAA;EACA,gBAAA;EACA,kBAAA;EACA,kBAAA;ACJF;ADOA;EACE,sBAAA;EACA,mEAAA;EACA,gBAAA;EACA,kBAAA;EACA,kBAAA;ACLF;ADQA;EACE,sBAAA;EACA,qEAAA;EACA,gBAAA;EACA,kBAAA;EACA,kBAAA;ACNF;ADSA;EACE,sBAAA;EACA,oEAAA;EACA,gBAAA;EACA,kBAAA;EACA,kBAAA;ACPF;ADUA;EACE,sBAAA;EACA,sEAAA;EACA,gBAAA;EACA,kBAAA;EACA,kBAAA;ACRF;ADWA;EACE,sBAAA;EACA,kEAAA;EACA,gBAAA;EACA,kBAAA;EACA,kBAAA;ACTF;ADYA;EACE,sBAAA;EACA,uEAAA;EACA,gBAAA;EACA,kBAAA;EACA,kBAAA;ACVF;ADaA;EACE,sBAAA;EACA,mEAAA;EACA,gBAAA;EACA,kBAAA;EACA,kBAAA;ACXF;ADeA;EACE,0BAAA;EACA,4EAAA;EACA,gBAAA;EACA,kBAAA;EACA,kBAAA;ACbF;ADgBA;EACE,0BAAA;EACA,kFAAA;EACA,gBAAA;EACA,kBAAA;EACA,kBAAA;ACdF;ADiBA;EACE,0BAAA;EACA,6EAAA;EACA,gBAAA;EACA,kBAAA;EACA,kBAAA;ACfF;ADkBA;EACE,0BAAA;EACA,+EAAA;EACA,gBAAA;EACA,kBAAA;EACA,kBAAA;AChBF;ADmBA;EACE,0BAAA;EACA,8EAAA;EACA,gBAAA;EACA,kBAAA;EACA,kBAAA;ACjBF;ADoBA;EACE,0BAAA;EACA,gFAAA;EACA,gBAAA;EACA,kBAAA;EACA,kBAAA;AClBF;ADqBA;EACE,0BAAA;EACA,4EAAA;EACA,gBAAA;EACA,kBAAA;EACA,kBAAA;ACnBF;ADsBA;EACE,0BAAA;EACA,iFAAA;EACA,gBAAA;EACA,kBAAA;EACA,kBAAA;ACpBF;ADuBA;EACE,0BAAA;EACA,6EAAA;EACA,gBAAA;EACA,kBAAA;EACA,kBAAA;ACrBF;AC3IA;EAMI,8BAAA;EACA,8BAAA;EACA,8BAAA;EACA,8BAAA;EACA,8BAAA;EACA,8BAAA;EACA,8BAAA;EACA,8BAAA;EACA,8BAAA;EACA,8BAAA;EACA,8BAAA;EAGA,oBAAA;EACA,oBAAA;EACA,oBAAA;EACA,oBAAA;EACA,oBAAA;EACA,oBAAA;EACA,oBAAA;EACA,oBAAA;EACA,oBAAA;EACA,oBAAA;EACA,oBAAA;ADsIJ;;ACpFA;EACE,oBAAA;EACA,oBAAA;EACA,oBAAA;EACA,oBAAA;EACA,oBAAA;EACA,oBAAA;EACA,oBAAA;EACA,oBAAA;EACA,oBAAA;EACA,oBAAA;ADuFF;;ACnFA;EACE,oBAAA;EACA,oBAAA;EACA,oBAAA;EACA,oBAAA;EACA,oBAAA;EACA,oBAAA;EACA,oBAAA;EACA,oBAAA;EACA,oBAAA;EACA,oBAAA;ADsFF;;AE7LA;;EAEE,UAAA;EACA,SAAA;AFgMF;;AE7LA;;;;;;EAME,SAAA;AFgMF;;AE7LA;;EAEE,YAAA;EACA,aAAA;EAEA,mCAAA;AF+LF;;AE5LA;EACE,6BAAA;EACA,YAAA;AF+LF;;AE5LA;EACE,WAAA;AF+LF;;AG5NA;EAIE,8BAAA;EACA,8BAAA;EAMA,uCAAA;EACA,4CAAA;EAEA,+BAAA;EACA,uBAAA;EAEA,uBAAA;EAEA,kBAAA;EACA,eAAA;EACA,eAAA;EACA,eAAA;EACA,gBAAA;EAEA,uCAAA;EAEA,mCAAA;EACA,gCAAA;EAGA,eAAA;EACA,gBAAA;EACA,qBAAA;EACA,eAAA;EACA,eAAA;EAEA,gBAAA;EACA,mBAAA;AH+MF;;AIrPA;EACE,8BAAA;EACA,uBAAA;AJwPF;;AK1PA,yBAAA;AACA;EACE,QAAA;EACA,2BAAA;AL6PF;AK3PA;EACE,8BAAA;OAAA,kBAAA;AL6PF;;AK1PA;EACE;IACE,sBAAA;EL6PF;AACF;AK3PA;EACE,+BAAA;AL6PF;;AM5QA;;;EAGE,sBAAA;EACA,4CAAA;EACA,4CAAA;EACA,8BAAA;EACA,uBAAA;EACA,eAAA;EACA,mBAAA;AN+QF;;AMxQA;EACE,aAAA;AN2QF;AMxQE;EACE,gBAAA;EACA,uBAAA;AN0QJ;AMrQE;EACE,aAAA;EACA,WAAA;ANuQJ;AMlQE;EACE,sBAAA;EACA,aAAA;EACA,WAAA;EACA,mBAAA;ANoQJ;AMjQE;EACE,WAAA;ANmQJ;AMlQI;EACE,WAAA;EACA,aAAA;EACA,qCAAA;EACA,aAAA;ANoQN;AMnQM;EACE,cAAA;EACA,kBAAA;EACA,mCAAA;ANqQR;AMlQM;EACE,cAAA;ANoQR;;AM5PA;EACE,aAAA;EACA,yCAAA;AN+PF;AM9PE;EACE,kBAAA;ANgQJ;;AM5PA;EACE,aAAA;EACA,yCAAA;EACA,iDAAA;AN+PF;AM7PE;EACE,WAAA;AN+PJ;AM7PE;EACE,cAAA;EACA,4BAAA;AN+PJ;AM9PI;EACE,gBAAA;EACA,mBAAA;EACA,uBAAA;ANgQN;;AM1PE;EACE,2BAAA;EACA,oBAAA;AN6PJ;AM3PE;EACE,YAAA;EACA,cAAA;AN6PJ;;AMzPA;EACE,oBAAA;EACA,sBAAA;EACA,qDAAA;EACA,8BAAA;AN4PF;AM3PE;EACE,2BAAA;EACA,oBAAA;AN6PJ;AM3PE;EACE,iBAAA;AN6PJ;;AMvPA;EACE,mCAAA;EACA,8BAAA;AN0PF;AMzPE;EACE,kBAAA;EACA,SAAA;AN2PJ;;AMpPA;EACE,YAAA;ANuPF;;AMpPA,2BAAA;AACA;EACE,8DAAA;UAAA,sDAAA;EACA,0BAAA;EACA,YAAA;EACA,kBAAA;ANuPF;AMrPE;EACE,uBAAA;EACA,kBAAA;EACA,YAAA;EACA,OAAA;EACA,kBAAA;EACA,uBAAA;EACA,sCAAA;EACA,iCAAA;EACA,wBAAA;EACA,kBAAA;EACA,kBAAA;EACA,mBAAA;EACA,UAAA;EACA,kBAAA;EACA,qDACE;EAEF,WAAA;ANqPJ;AMlPE;EACE,UAAA;EACA,mBAAA;ANoPJ;;AMvOA;;EAEE,wBAAA;EACA,gBAAA;EACA,SAAA;AN0OF;;AMvOA;EACE,0BAAA;AN0OF;;AMtOA;EACE,kBAAA;ANyOF;AMvOE;EACE,cAAA;EACA,iBAAA;ANyOJ;AMvOE;EACE,sBAAA;EACA,qBAAA;EACA,aAAA;EACA,sBAAA;EACA,kBAAA;EACA,QAAA;EACA,MAAA;ANyOJ;AMvOI;EACE,kCAAA;EACA,eAAA;EACA,UAAA;ANyON;AMxOM;EACE,WAAA;EACA,YAAA;AN0OR;AMxOM;EACI,gCAAA;AN0OV;AMvOQ;EACE,gCAAA;ANyOV;AOlcA;EACE,wBAAA;APocF;AOlcE;EACE,2BAAA;EAEA,gBAAA;EACA,iBAAA;EACA,yCAAA;EACA,uBAAA;APmcJ;AOhcE;EACE,iBAAA;EACA,iCAAA;APkcJ;;AO9bA;EACE,mDAAA;APicF;;AO9bA;EACE,0BAAA;APicF;AO/bE;EACE,uCAAA;EACA,wCAAA;EACA,eAAA;EACA,gBAAA;APicJ;;AQ5dE;EACE,eAAA;EAEA,4CAAA;EACA,iCAAA;EACA,uCAAA;EACA,mCAAA;EACA,sBAAA;EACA,mCAAA;AR8dJ;AQ3dI;EACE,4CAAA;AR6dN;AQ1dI;EAEE,iCAAA;EACA,4CAAA;EACA,YAAA;AR2dN;;AQldE;EACE,iCAAA;EACA,eAAA;EACA,8BAAA;EACA,sBAAA;EACA,cAAA;EACA,8BAAA;EACA,mCAAA;EACA,gBAAA;EACA,uCAAA;ARqdJ;AQndI;EACE,4CAAA;EACA,wCAAA;EACA,4BAAA;ARqdN;AQldI;EACE,eAAA;EACA,4CAAA;ARodN;;ASngBA;EACE,eAAA;EACA,iBAAA;EACA,kBAAA;EACA,yCAAA;EACA,cAAA;EACA,YAAA;EACA,iBAAA;EACA,aAAA;EACA,sBAAA;ATsgBF;;ASngBA;EACE,aAAA;EACA,8BAAA;EACA,mBAAA;EACA,qBAAA;EACA,gCAAA;EACA,mBAAA;ATsgBF;;ASngBA;EACE,aAAA;EACA,mBAAA;EACA,WAAA;ATsgBF;;ASngBA;EACE,gBAAA;EACA,YAAA;EACA,eAAA;EACA,iBAAA;EACA,cAAA;EACA,UAAA;EACA,WAAA;ATsgBF;;ASngBA;EACE,aAAA;EACA,OAAA;EACA,gBAAA;ATsgBF;;ASngBA;EACE,OAAA;EACA,aAAA;EACA,gBAAA;EACA,uCAAA;ATsgBF;;ASngBA;EACE,oBAAA;EACA,mBAAA;EACA,gBAAA;ATsgBF;;ASheA;EACE,aAAA;EACA,mBAAA;EACA,WAAA;EACA,UAAA;EACA,uBAAA;EACA,YAAA;EACA,eAAA;EACA,mBAAA;EACA,WAAA;EACA,sBAAA;ATmeF;ASjeE;EACE,WAAA;ATmeJ;ASheE;EACE,cAAA;EACA,eAAA;ATkeJ;;AS7dA;EACE,OAAA;EACA,mBAAA;EACA,aAAA;EACA,sBAAA;EACA,8BAAA;ATgeF;;AS7dA;EACE,aAAA;EACA,8BAAA;EACA,mBAAA;EACA,uBAAA;EACA,mBAAA;EACA,gCAAA;EACA,mBAAA;EACA,gBAAA;ATgeF;;AS5dA;EACE,aAAA;EACA,mBAAA;EACA,WAAA;EACA,eAAA;EACA,kBAAA;EACA,mBAAA;EACA,WAAA;AT+dF;AS7dE;EACE,kBAAA;EACA,UAAA;EACA,QAAA;EACA,SAAA;AT+dJ;;AS3dA;EACE,kBAAA;EACA,qBAAA;EACA,WAAA;EACA,YAAA;EACA,gBAAA;EACA,mBAAA;EACA,gCAAA;AT8dF;AS5dE;EACE,WAAA;EACA,kBAAA;EACA,QAAA;EACA,SAAA;EACA,WAAA;EACA,YAAA;EACA,iBAAA;EACA,kBAAA;EACA,+BAAA;AT8dJ;;AS1dA;EACE,mBAAA;AT6dF;AS3dE;EACE,2BAAA;AT6dJ;;ASxdA;EACE,OAAA;EACA,SAAA;EACA,gBAAA;EACA,mBAAA;EACA,cAAA;EACA,8CAAA;EACA,kBAAA;EACA,gBAAA;EACA,gBAAA;EACA,qBAAA;AT2dF;;ASvdA;EACE,OAAA;EACA,WAAA;EACA,mBAAA;EACA,cAAA;EACA,YAAA;EACA,gBAAA;EACA,8CAAA;EACA,kBAAA;EACA,gBAAA;EACA,YAAA;EACA,aAAA;AT0dF","file":"style.css"} \ No newline at end of file diff --git a/public/vendor/composer/autoload_psr4.php b/public/vendor/composer/autoload_psr4.php index b44265d..c9abc16 100644 --- a/public/vendor/composer/autoload_psr4.php +++ b/public/vendor/composer/autoload_psr4.php @@ -16,7 +16,7 @@ return array( 'PHPMailer\\PHPMailer\\' => array($vendorDir . '/phpmailer/phpmailer/src'), 'League\\ColorExtractor\\' => array($vendorDir . '/league/color-extractor/src'), 'Laminas\\Escaper\\' => array($vendorDir . '/laminas/laminas-escaper/src'), - 'Kirby\\' => array($vendorDir . '/getkirby/composer-installer/src', $baseDir . '/kirby/src'), + 'Kirby\\' => array($baseDir . '/kirby/src', $vendorDir . '/getkirby/composer-installer/src'), 'Composer\\Semver\\' => array($vendorDir . '/composer/semver/src'), 'Base32\\' => array($vendorDir . '/christian-riesen/base32/src'), ); diff --git a/public/vendor/composer/autoload_static.php b/public/vendor/composer/autoload_static.php index 9ee9663..50a3b38 100644 --- a/public/vendor/composer/autoload_static.php +++ b/public/vendor/composer/autoload_static.php @@ -96,8 +96,8 @@ class ComposerStaticInit0b7fb803e22a45eb87e24172337208aa ), 'Kirby\\' => array ( - 0 => __DIR__ . '/..' . '/getkirby/composer-installer/src', - 1 => __DIR__ . '/../..' . '/kirby/src', + 0 => __DIR__ . '/../..' . '/kirby/src', + 1 => __DIR__ . '/..' . '/getkirby/composer-installer/src', ), 'Composer\\Semver\\' => array ( diff --git a/public/vendor/composer/installed.php b/public/vendor/composer/installed.php index b182cad..22de123 100644 --- a/public/vendor/composer/installed.php +++ b/public/vendor/composer/installed.php @@ -1,9 +1,9 @@ array( 'name' => 'getkirby/plainkit', - 'pretty_version' => '5.1.4', - 'version' => '5.1.4.0', - 'reference' => null, + 'pretty_version' => 'dev-main', + 'version' => 'dev-main', + 'reference' => '76274fff04c54514230ad2bb0aca362139618411', 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -65,9 +65,9 @@ 'dev_requirement' => false, ), 'getkirby/plainkit' => array( - 'pretty_version' => '5.1.4', - 'version' => '5.1.4.0', - 'reference' => null, + 'pretty_version' => 'dev-main', + 'version' => 'dev-main', + 'reference' => '76274fff04c54514230ad2bb0aca362139618411', 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), diff --git a/src/components/ElementPopup.vue b/src/components/ElementPopup.vue index 21764fa..f9e7e5f 100644 --- a/src/components/ElementPopup.vue +++ b/src/components/ElementPopup.vue @@ -18,19 +18,17 @@
-
+
- - +
+ +
+ + +
+
@@ -38,18 +36,7 @@
-
- -
+
@@ -276,6 +263,7 @@ import { useStylesheetStore } from '../stores/stylesheet'; import { usePopupPosition } from '../composables/usePopupPosition'; import { useDebounce } from '../composables/useDebounce'; import NumberInput from './ui/NumberInput.vue'; +import UnitToggle from './ui/UnitToggle.vue'; import Coloris from '@melloware/coloris'; import '@melloware/coloris/dist/coloris.css'; import hljs from 'highlight.js/lib/core'; @@ -321,6 +309,18 @@ const background = ref({ value: 'transparent' }); const marginOuter = ref({ value: 0, unit: 'mm' }); const paddingInner = ref({ value: 0, unit: 'mm' }); +// Constants +const fonts = ['Alegreya Sans', 'Alegreya', 'Arial', 'Georgia', 'Times New Roman']; +const weights = ['200', '300', '400', '600', '800']; + +// Computed to adapt fontWeight for UnitToggle +const fontWeightString = computed({ + get: () => String(fontWeight.value.value), + set: (val) => { + fontWeight.value.value = parseInt(val); + } +}); + const immediateUpdate = (callback) => { callback(); }; @@ -794,43 +794,4 @@ defineExpose({ handleIframeClick, close, visible }); color: var(--color-purple); font-size: 0.875rem; } - -.button-group { - display: flex; - gap: 0.25rem; -} - -.button-group button { - padding: 0.25rem 0.5rem; - font-size: 0.75rem; - border: 1px solid #ddd; - background: white; - cursor: pointer; - transition: all 0.2s; -} - -.button-group button.active { - background: #61afef; - color: white; - border-color: #61afef; -} - -.button-group button:disabled { - opacity: 0.5; - cursor: not-allowed; -} - -.checkbox-inline { - display: inline-flex; - align-items: center; - gap: 0.25rem; - margin-left: 1rem; - font-size: 0.875rem; - cursor: pointer; -} - -.checkbox-inline input[type="checkbox"] { - margin: 0; - cursor: pointer; -} diff --git a/src/components/editor/EditorPanel.vue b/src/components/editor/EditorPanel.vue index 35dc03a..771818e 100644 --- a/src/components/editor/EditorPanel.vue +++ b/src/components/editor/EditorPanel.vue @@ -128,11 +128,11 @@ nav { position: relative; left: calc(var(--panel-w) * -1); - padding: 4rem 0; background-color: var(--color-panel-bg); box-shadow: -5px 0px 12px; + transition: left 0.3s var(--curve); pointer-events: all; } @@ -142,10 +142,10 @@ nav { } .tab-panel { - height: 100%; + height: calc(100% - var(--panel-nav-h)*2); overflow-y: auto; overflow-x: hidden; padding: 0 2em; - // padding-left: 1em; + margin-top: var(--panel-nav-h); } diff --git a/src/components/editor/TextSettings.vue b/src/components/editor/TextSettings.vue index 95973bd..c762a04 100644 --- a/src/components/editor/TextSettings.vue +++ b/src/components/editor/TextSettings.vue @@ -34,7 +34,7 @@
-
+
-
- +
+
+

Marges extérieures

+ +
+ +
+ +
+ +
+ + + +
+
+
+ +
+ +
+ +
+ + + +
+
+
+ +
+ +
+ +
+ + + +
+
+
+ +
+ +
+ +
+ + + +
+
+
-
- +
+
+

Marges intérieures

+ +
+ +
+ +
+ +
+ + + +
+
+
+ +
+ +
+ +
+ + + +
+
+
+ +
+ +
+ +
+ + + +
+
+
+ +
+ +
+ +
+ + + +
+
+
@@ -127,7 +365,7 @@ import { ref, watch, onMounted } from 'vue'; import Coloris from '@melloware/coloris'; import UnitToggle from '../ui/UnitToggle.vue'; import InputWithUnit from '../ui/InputWithUnit.vue'; -import MarginEditor from '../ui/MarginEditor.vue'; +import NumberInput from '../ui/NumberInput.vue'; import { useCssUpdater } from '../../composables/useCssUpdater'; import { useCssSync } from '../../composables/useCssSync'; import { useDebounce } from '../../composables/useDebounce'; @@ -155,7 +393,6 @@ const alignment = ref('left'); const color = ref('rgb(0, 0, 0)'); const background = ref('transparent'); -const marginOuter = ref({ value: 0, unit: 'mm' }); const marginOuterDetailed = ref({ top: { value: 0, unit: 'mm' }, right: { value: 0, unit: 'mm' }, @@ -163,7 +400,6 @@ const marginOuterDetailed = ref({ left: { value: 0, unit: 'mm' } }); -const marginInner = ref({ value: 0, unit: 'mm' }); const marginInnerDetailed = ref({ top: { value: 0, unit: 'mm' }, right: { value: 0, unit: 'mm' }, @@ -171,11 +407,27 @@ const marginInnerDetailed = ref({ left: { value: 0, unit: 'mm' } }); -const marginOuterEditor = ref(null); -const marginInnerEditor = ref(null); +const marginOuterLinked = ref(false); +const marginInnerLinked = ref(false); let isUpdatingFromStore = false; +// Update margin outer unit for all sides +const updateMarginOuterUnit = (unit) => { + marginOuterDetailed.value.top.unit = unit; + marginOuterDetailed.value.right.unit = unit; + marginOuterDetailed.value.bottom.unit = unit; + marginOuterDetailed.value.left.unit = unit; +}; + +// Update margin inner unit for all sides +const updateMarginInnerUnit = (unit) => { + marginInnerDetailed.value.top.unit = unit; + marginInnerDetailed.value.right.unit = unit; + marginInnerDetailed.value.bottom.unit = unit; + marginInnerDetailed.value.left.unit = unit; +}; + // Watchers for body styles watch(italic, (val) => { if (isUpdatingFromStore) return; @@ -210,28 +462,77 @@ watch(fontSize, (val) => { }); }, { deep: true }); -// Margin/Padding handlers -const handleMarginOuterChange = ({ type, simple, detailed }) => { +// Watch margin outer values +watch(() => [ + marginOuterDetailed.value.top.value, + marginOuterDetailed.value.bottom.value, + marginOuterDetailed.value.left.value, + marginOuterDetailed.value.right.value, +], () => { if (isUpdatingFromStore) return; - debouncedUpdate(() => { - if (type === 'simple') { - setMargin('p', simple.value, simple.unit); - } else { - setDetailedMargins('p', detailed.top, detailed.right, detailed.bottom, detailed.left); - } - }); -}; -const handleMarginInnerChange = ({ type, simple, detailed }) => { - if (isUpdatingFromStore) return; + // If linked, sync all values to the one that changed + if (marginOuterLinked.value) { + // Find which value changed and sync others to it + const top = marginOuterDetailed.value.top.value; + const bottom = marginOuterDetailed.value.bottom.value; + const left = marginOuterDetailed.value.left.value; + const right = marginOuterDetailed.value.right.value; + + // Use the max value to determine which one changed (simple heuristic) + const maxValue = Math.max(top, bottom, left, right); + isUpdatingFromStore = true; + marginOuterDetailed.value.top.value = maxValue; + marginOuterDetailed.value.bottom.value = maxValue; + marginOuterDetailed.value.left.value = maxValue; + marginOuterDetailed.value.right.value = maxValue; + isUpdatingFromStore = false; + } + debouncedUpdate(() => { - if (type === 'simple') { - setPadding('p', simple.value, simple.unit); - } else { - setDetailedPadding('p', detailed.top, detailed.right, detailed.bottom, detailed.left); - } + setDetailedMargins('p', + marginOuterDetailed.value.top, + marginOuterDetailed.value.right, + marginOuterDetailed.value.bottom, + marginOuterDetailed.value.left + ); }); -}; +}); + +// Watch margin inner values +watch(() => [ + marginInnerDetailed.value.top.value, + marginInnerDetailed.value.bottom.value, + marginInnerDetailed.value.left.value, + marginInnerDetailed.value.right.value, +], () => { + if (isUpdatingFromStore) return; + + // If linked, sync all values to the one that changed + if (marginInnerLinked.value) { + const top = marginInnerDetailed.value.top.value; + const bottom = marginInnerDetailed.value.bottom.value; + const left = marginInnerDetailed.value.left.value; + const right = marginInnerDetailed.value.right.value; + + const maxValue = Math.max(top, bottom, left, right); + isUpdatingFromStore = true; + marginInnerDetailed.value.top.value = maxValue; + marginInnerDetailed.value.bottom.value = maxValue; + marginInnerDetailed.value.left.value = maxValue; + marginInnerDetailed.value.right.value = maxValue; + isUpdatingFromStore = false; + } + + debouncedUpdate(() => { + setDetailedPadding('p', + marginInnerDetailed.value.top, + marginInnerDetailed.value.right, + marginInnerDetailed.value.bottom, + marginInnerDetailed.value.left + ); + }); +}); // Sync from store const syncFromStore = () => { @@ -261,17 +562,17 @@ const syncFromStore = () => { const margins = extractSpacing('p', 'margin'); if (margins) { if (margins.simple) { - marginOuter.value = margins.simple; - // Sync detailed from simple + // All margins are the same marginOuterDetailed.value = { top: { ...margins.simple }, right: { ...margins.simple }, bottom: { ...margins.simple }, left: { ...margins.simple } }; + marginOuterLinked.value = true; } else if (margins.detailed) { marginOuterDetailed.value = margins.detailed; - // Check if all values are the same to set simple value + // Check if all values are the same const allSame = margins.detailed.top.value === margins.detailed.right.value && margins.detailed.top.value === margins.detailed.bottom.value && @@ -279,19 +580,7 @@ const syncFromStore = () => { margins.detailed.top.unit === margins.detailed.right.unit && margins.detailed.top.unit === margins.detailed.bottom.unit && margins.detailed.top.unit === margins.detailed.left.unit; - - if (allSame) { - marginOuter.value = margins.detailed.top; - } else { - // Values are different, open the detailed editor and use first value for simple - marginOuter.value = margins.detailed.top; - // Open detailed view after mount - setTimeout(() => { - if (marginOuterEditor.value) { - marginOuterEditor.value.expanded = true; - } - }, 0); - } + marginOuterLinked.value = allSame; } } @@ -299,17 +588,17 @@ const syncFromStore = () => { const padding = extractSpacing('p', 'padding'); if (padding) { if (padding.simple) { - marginInner.value = padding.simple; - // Sync detailed from simple + // All paddings are the same marginInnerDetailed.value = { top: { ...padding.simple }, right: { ...padding.simple }, bottom: { ...padding.simple }, left: { ...padding.simple } }; + marginInnerLinked.value = true; } else if (padding.detailed) { marginInnerDetailed.value = padding.detailed; - // Check if all values are the same to set simple value + // Check if all values are the same const allSame = padding.detailed.top.value === padding.detailed.right.value && padding.detailed.top.value === padding.detailed.bottom.value && @@ -317,19 +606,7 @@ const syncFromStore = () => { padding.detailed.top.unit === padding.detailed.right.unit && padding.detailed.top.unit === padding.detailed.bottom.unit && padding.detailed.top.unit === padding.detailed.left.unit; - - if (allSame) { - marginInner.value = padding.detailed.top; - } else { - // Values are different, open the detailed editor and use first value for simple - marginInner.value = padding.detailed.top; - // Open detailed view after mount - setTimeout(() => { - if (marginInnerEditor.value) { - marginInnerEditor.value.expanded = true; - } - }, 0); - } + marginInnerLinked.value = allSame; } } @@ -348,3 +625,49 @@ onMounted(() => { syncFromStore(); }); + + diff --git a/src/components/ui/UnitToggle.vue b/src/components/ui/UnitToggle.vue index 17228cc..6b0d571 100644 --- a/src/components/ui/UnitToggle.vue +++ b/src/components/ui/UnitToggle.vue @@ -5,6 +5,7 @@ :key="unit" type="button" :class="{ active: modelValue === unit }" + :disabled="disabled" @click="$emit('update:modelValue', unit)" > {{ unit }} @@ -21,6 +22,10 @@ defineProps({ units: { type: Array, default: () => ['mm', 'px'] + }, + disabled: { + type: Boolean, + default: false } }); diff --git a/vite.config.js b/vite.config.js index bbcf80c..4e0093c 100644 --- a/vite.config.js +++ b/vite.config.js @@ -4,4 +4,23 @@ import vue from '@vitejs/plugin-vue' // https://vite.dev/config/ export default defineConfig({ plugins: [vue()], + publicDir: false, // Les assets statiques sont gérés par Kirby dans public/ + build: { + outDir: 'dist/assets/dist', + emptyOutDir: true, + manifest: false, + rollupOptions: { + output: { + entryFileNames: 'index.js', + chunkFileNames: '[name].js', + assetFileNames: (assetInfo) => { + // Le CSS principal doit s'appeler index.css pour correspondre à header.php + if (assetInfo.name && assetInfo.name.endsWith('.css')) { + return 'index.css' + } + return '[name].[ext]' + } + } + } + } })