Skip to content

Commit 6cc0dbe

Browse files
AdaInTheLabAdaInTheLab
committed
Merge remote-tracking branch 'origin/main' into scms/admin-auth-and-tests
2 parents a38f7eb + 23d3f2d commit 6cc0dbe

28 files changed

Lines changed: 143 additions & 0 deletions

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,4 @@ ecosystem.config.cjs
3737
/passenger-start.cjs
3838
/cloudflared.yml
3939
/config.yml
40+
/coverage/

‎coverage/clover.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2+
<<<<<<< HEAD
23
<coverage generated="1767718145902" clover="3.2.0">
34
<project timestamp="1767718145902" name="All files">
45
<metrics statements="400" coveredstatements="207" conditionals="432" coveredconditionals="162" methods="90" coveredmethods="45" elements="922" coveredelements="414" complexity="0" loc="400" ncloc="400" packages="9" files="15" classes="15"/>
@@ -474,5 +475,10 @@
474475
<line num="35" count="19" type="stmt"/>
475476
</file>
476477
</package>
478+
=======
479+
<coverage generated="1767717505103" clover="3.2.0">
480+
<project timestamp="1767717505103" name="All files">
481+
<metrics statements="0" coveredstatements="0" conditionals="0" coveredconditionals="0" methods="0" coveredmethods="0" elements="0" coveredelements="0" complexity="0" loc="0" ncloc="0" packages="0" files="0" classes="0"/>
482+
>>>>>>> origin/main
477483
</project>
478484
</coverage>

‎coverage/coverage-final.json‎

Lines changed: 4 additions & 0 deletions
Large diffs are not rendered by default.

‎coverage/lcov-report/index.html‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,30 +23,54 @@ <h1>All files</h1>
2323
<div class='clearfix'>
2424

2525
<div class='fl pad1y space-right2'>
26+
<<<<<<< HEAD
2627
<span class="strong">48.77% </span>
2728
<span class="quiet">Statements</span>
2829
<span class='fraction'>219/449</span>
30+
=======
31+
<span class="strong">Unknown% </span>
32+
<span class="quiet">Statements</span>
33+
<span class='fraction'>0/0</span>
34+
>>>>>>> origin/main
2935
</div>
3036

3137

3238
<div class='fl pad1y space-right2'>
39+
<<<<<<< HEAD
3340
<span class="strong">37.5% </span>
3441
<span class="quiet">Branches</span>
3542
<span class='fraction'>162/432</span>
43+
=======
44+
<span class="strong">Unknown% </span>
45+
<span class="quiet">Branches</span>
46+
<span class='fraction'>0/0</span>
47+
>>>>>>> origin/main
3648
</div>
3749

3850

3951
<div class='fl pad1y space-right2'>
52+
<<<<<<< HEAD
4053
<span class="strong">50% </span>
4154
<span class="quiet">Functions</span>
4255
<span class='fraction'>45/90</span>
56+
=======
57+
<span class="strong">Unknown% </span>
58+
<span class="quiet">Functions</span>
59+
<span class='fraction'>0/0</span>
60+
>>>>>>> origin/main
4361
</div>
4462

4563

4664
<div class='fl pad1y space-right2'>
65+
<<<<<<< HEAD
4766
<span class="strong">51.75% </span>
4867
<span class="quiet">Lines</span>
4968
<span class='fraction'>207/400</span>
69+
=======
70+
<span class="strong">Unknown% </span>
71+
<span class="quiet">Lines</span>
72+
<span class='fraction'>0/0</span>
73+
>>>>>>> origin/main
5074
</div>
5175

5276

@@ -61,7 +85,11 @@ <h1>All files</h1>
6185
</div>
6286
</template>
6387
</div>
88+
<<<<<<< HEAD
6489
<div class='status-line low'></div>
90+
=======
91+
<div class='status-line medium'></div>
92+
>>>>>>> origin/main
6593
<div class="pad1">
6694
<table class="coverage-summary">
6795
<thead>
@@ -78,6 +106,7 @@ <h1>All files</h1>
78106
<th data-col="lines_raw" data-type="number" data-fmt="html" class="abs"></th>
79107
</tr>
80108
</thead>
109+
<<<<<<< HEAD
81110
<tbody><tr>
82111
<td class="file low" data-value="src"><a href="src/index.html">src</a></td>
83112
<td data-value="49.16" class="pic low">
@@ -214,14 +243,21 @@ <h1>All files</h1>
214243
</tr>
215244

216245
</tbody>
246+
=======
247+
<tbody></tbody>
248+
>>>>>>> origin/main
217249
</table>
218250
</div>
219251
<div class='push'></div><!-- for sticky footer -->
220252
</div><!-- /wrapper -->
221253
<div class='footer quiet pad2 space-top1 center small'>
222254
Code coverage generated by
223255
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
256+
<<<<<<< HEAD
224257
at 2026-01-06T16:49:05.733Z
258+
=======
259+
at 2026-01-06T16:38:25.074Z
260+
>>>>>>> origin/main
225261
</div>
226262
<script src="prettify.js"></script>
227263
<script>

‎coverage/lcov-report/src/auth.ts.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,11 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> auth.ts
460460
<div class='footer quiet pad2 space-top1 center small'>
461461
Code coverage generated by
462462
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
463+
<<<<<<< HEAD
463464
at 2026-01-06T16:49:05.733Z
465+
=======
466+
at 2026-01-06T16:38:04.857Z
467+
>>>>>>> origin/main
464468
</div>
465469
<script src="../prettify.js"></script>
466470
<script>

‎coverage/lcov-report/src/auth/index.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,11 @@ <h1><a href="../../index.html">All files</a> src/auth</h1>
101101
<div class='footer quiet pad2 space-top1 center small'>
102102
Code coverage generated by
103103
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
104+
<<<<<<< HEAD
104105
at 2026-01-06T16:49:05.733Z
106+
=======
107+
at 2026-01-06T16:38:04.857Z
108+
>>>>>>> origin/main
105109
</div>
106110
<script src="../../prettify.js"></script>
107111
<script>

‎coverage/lcov-report/src/auth/tokens.ts.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,11 @@ <h1><a href="../../index.html">All files</a> / <a href="index.html">src/auth</a>
475475
<div class='footer quiet pad2 space-top1 center small'>
476476
Code coverage generated by
477477
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
478+
<<<<<<< HEAD
478479
at 2026-01-06T16:49:05.733Z
480+
=======
481+
at 2026-01-06T16:38:04.857Z
482+
>>>>>>> origin/main
479483
</div>
480484
<script src="../../prettify.js"></script>
481485
<script>

‎coverage/lcov-report/src/db.ts.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1018,7 +1018,11 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> db.ts</
10181018
<div class='footer quiet pad2 space-top1 center small'>
10191019
Code coverage generated by
10201020
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
1021+
<<<<<<< HEAD
10211022
at 2026-01-06T16:49:05.733Z
1023+
=======
1024+
at 2026-01-06T16:38:04.857Z
1025+
>>>>>>> origin/main
10221026
</div>
10231027
<script src="../prettify.js"></script>
10241028
<script>

‎coverage/lcov-report/src/db/index.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,11 @@ <h1><a href="../../index.html">All files</a> src/db</h1>
116116
<div class='footer quiet pad2 space-top1 center small'>
117117
Code coverage generated by
118118
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
119+
<<<<<<< HEAD
119120
at 2026-01-06T16:49:05.733Z
121+
=======
122+
at 2026-01-06T16:38:04.857Z
123+
>>>>>>> origin/main
120124
</div>
121125
<script src="../../prettify.js"></script>
122126
<script>

‎coverage/lcov-report/src/db/migrateApiTokens.ts.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,11 @@ <h1><a href="../../index.html">All files</a> / <a href="index.html">src/db</a> m
247247
<div class='footer quiet pad2 space-top1 center small'>
248248
Code coverage generated by
249249
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
250+
<<<<<<< HEAD
250251
at 2026-01-06T16:49:05.733Z
252+
=======
253+
at 2026-01-06T16:38:04.857Z
254+
>>>>>>> origin/main
251255
</div>
252256
<script src="../../prettify.js"></script>
253257
<script>

0 commit comments

Comments
 (0)