From be97a1be587f42a4688825244b025b06172c442a Mon Sep 17 00:00:00 2001
From: Quentin Dufour <quentin@deuxfleurs.fr>
Date: Mon, 25 Sep 2023 15:57:59 +0200
Subject: fix some templates

---
 templates/garage_key.html | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'templates/garage_key.html')

diff --git a/templates/garage_key.html b/templates/garage_key.html
index b839fcb..e1a9019 100644
--- a/templates/garage_key.html
+++ b/templates/garage_key.html
@@ -21,12 +21,12 @@
         <table class="table mt-4">
             <tbody>
                 <tr>
-                    <th scope="row">Identifiant de clé</th>
-                    <td>{{ .Key.AccessKeyId }}</td>
+                    <th scope="row" class="col-md-2">Identifiant de clé</th>
+                    <td>{{ .S3KeyInfo.AccessKeyId }}</td>
                 </tr>
                 <tr>
                     <th scope="row">Clé secrète</th>
-                    <td>{{ .Key.SecretAccessKey }}</td>
+		    <td><a href="#" onclick="document.getElementById('secret_key').style.display='inline'; this.style.display='none'">Cliquer pour afficher la clé secrète</a><span id="secret_key" style="display: none">{{ .S3KeyInfo.SecretAccessKey }}</span></td>
                 </tr>
                 <tr>
                     <th scope="row">Région</th>
@@ -58,12 +58,12 @@
                         </button>
                     </h2>
                 </div>
-                <div id="awscli" class="collapse show" aria-labelledby="awscli-title" data-parent="#softconfig">
+                <div id="awscli" class="collapse" aria-labelledby="awscli-title" data-parent="#softconfig">
                     <div class="card-body">
                         <p>Créez un fichier nommé <code>~/.awsrc</code> :</p>
                         <pre>
-export AWS_ACCESS_KEY_ID={{ .Key.AccessKeyId }}
-export AWS_SECRET_ACCESS_KEY={{ .Key.SecretAccessKey }}
+export AWS_ACCESS_KEY_ID={{ .S3KeyInfo.AccessKeyId }}
+export AWS_SECRET_ACCESS_KEY={{ .S3KeyInfo.SecretAccessKey }}
 export AWS_DEFAULT_REGION='garage'
 
 function aws { command aws --endpoint-url https://garage.deuxfleurs.fr $@ ; }
@@ -97,8 +97,8 @@ aws s3 cp /tmp/a.txt s3://my-bucket
 mc alias set \
   garage \
   https://garage.deuxfleurs.fr \
-  {{ .Key.AccessKeyId }} \
-  {{ .Key.SecretAccessKey }} \
+  {{ .S3KeyInfo.AccessKeyId }} \
+  {{ .S3KeyInfo.SecretAccessKey }} \
   --api S3v4
                         </pre>
                         <p>Et ensuite pour utiliser Minio CLI avec :</p>
@@ -176,7 +176,7 @@ hugo deploy
             <tbody>
                 <tr>
                     <th scope="row">Nom d'utilisateur-ice</th>
-                    <td>{{ .Status.Info.Username }}</td>
+                    <td>{{ .Login.Info.Username }}</td>
                 </tr>
                 <tr>
                     <th scope="row">Mot de passe</th>
@@ -207,7 +207,7 @@ hugo deploy
                     <div class="card-body">
                         <p>Un exemple avec SCP :</p>
                         <pre>
-scp -oHostKeyAlgorithms=+ssh-rsa -P2222 -r ./public {{ .Status.Info.Username }}@bagage.deuxfleurs.fr:mon_bucket/
+scp -oHostKeyAlgorithms=+ssh-rsa -P2222 -r ./public {{ .Login.Info.Username }}@bagage.deuxfleurs.fr:mon_bucket/
                         </pre>
                     </div>
                 </div>
-- 
cgit v1.2.3


From bc368943a4c0853718b8a53b1caadc297412ef32 Mon Sep 17 00:00:00 2001
From: Quentin Dufour <quentin@deuxfleurs.fr>
Date: Mon, 25 Sep 2023 19:07:07 +0200
Subject: heavy refactor in progress

---
 templates/garage_key.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'templates/garage_key.html')

diff --git a/templates/garage_key.html b/templates/garage_key.html
index e1a9019..cf56822 100644
--- a/templates/garage_key.html
+++ b/templates/garage_key.html
@@ -3,7 +3,7 @@
 {{define "body"}}
 <div class="d-flex">
     <h4>Mes identifiants</h4>
-    <a class="ml-auto btn btn-link" href="/garage/website">Mes sites webs</a>
+    <a class="ml-auto btn btn-link" href="/website">Mes sites webs</a>
     <a class="ml-4 btn btn-info" href="/">Menu principal</a>
 </div>
 
-- 
cgit v1.2.3