Skip to content

Commit a9a8379

Browse files
richtjarichtja
authored
Merge pull request #32 from harvey0100/new_website
Urgent Website Fixes
2 parents bef71a7 + 955700a commit a9a8379

File tree

2 files changed

+125
-4
lines changed

2 files changed

+125
-4
lines changed

‎index.html

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
---
2+
layout: null
3+
---
4+
5+
<!DOCTYPE html>
6+
<html lang="en">
7+
<head>
8+
<meta charset="UTF-8">
9+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
10+
<link rel="icon" type="image/x-icon" href="/resources/icons/avocado.ico">
11+
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Red+Hat+Display:wght@400;500;600;700;800;900&display=swap">
12+
<link rel="stylesheet" href="/resources/css/home.css"> <!-- Link to the external CSS file -->
13+
<script src="/resources/js/typing.js"></script>
14+
<title>Avocado Testing Framework</title>
15+
</head>
16+
<body>
17+
18+
<header>
19+
<div class="left-header">
20+
<a href="/">
21+
<img src="/resources/logo/PNGs/full-colour.png" alt="Avocado Logo">
22+
</a>
23+
<h1 class="header-avocado">
24+
<a href="/">Avocado</a>
25+
</h1>
26+
</div>
27+
<div class="right-header">
28+
<a href="https://github.com/avocado-framework/avocado/issues/new?assignees=&labels=bug&projects=&template=bug_report.md&title=">Report a bug</a>
29+
<a href="https://forms.gle/sW1jMGaMLpwzn6nLA">Mailing list</a>
30+
<a href="https://github.com/avocado-framework/">
31+
<img src="/resources/icons/github.svg" alt="GitHub">
32+
</a>
33+
</div>
34+
35+
36+
</header>
37+
38+
<div class="subheader">
39+
<h1 class="sub-avocado">Avocado Testing Framework</h1>
40+
<br>
41+
<div class="typing animate"></div>
42+
<br>
43+
<br>
44+
</div>
45+
46+
<div class="components">
47+
<div class="card">
48+
<img src="/resources/icons/suitcase.svg" alt="Suitcase Icon">
49+
<h3 class="card-header">Avocado-Framework</h3>
50+
<p class="card-text">A set of tools and libraries to help with automated testing.</p>
51+
<a href="/framework.html" class="com-button">Learn more</a>
52+
</div>
53+
54+
<div class="card">
55+
<img src="/resources/icons/computer.svg" alt="Computer Icon">
56+
<h3 class="card-header">Avocado VT</h3>
57+
<p class="card-text">A compatibility plugin that lets you execute virtualization related tests.</p>
58+
<a href="https://github.com/avocado-framework/avocado-vt" class="com-button">Learn more</a>
59+
</div>
60+
61+
<div class="card">
62+
<img src="/resources/icons/wheel.svg" alt="Wheel Icon">
63+
<h3 class="card-header">Aexpect</h3>
64+
<p class="card-text">A Python library used to spawn and control interactive programs.</p>
65+
<a href="https://github.com/avocado-framework/aexpect" class="com-button">Learn more</a>
66+
</div>
67+
68+
<div class="card">
69+
<img src="/resources/icons/book.svg" alt="Book Icon">
70+
<h3 class="card-header">Autils</h3>
71+
<p class="card-text">Utility libraries to power your tests and general applications.</p>
72+
<a href="/autils.html" class="com-button">Learn more</a>
73+
</div>
74+
</div>
75+
76+
77+
<h1 class="news-header">Latest News</h1>
78+
79+
<div class="news">
80+
81+
<div class="news-container">
82+
{% for version in site.data.releases.versions %}
83+
<div class="news-card">
84+
<div>
85+
<h3 class="card-header">
86+
<a href="{{ version.href }}" class="news-link">{{ version.name }}</a>
87+
</h3>
88+
<p class="card-text">{{ version.date }}</p>
89+
</div>
90+
</div>
91+
{% endfor %}
92+
</div>
93+
94+
95+
</div>
96+
97+
<footer>
98+
<div class="footer-header">Contact</div>
99+
<div class="footer-text">
100+
<a href="https://forms.gle/sW1jMGaMLpwzn6nLA">
101+
<img src="/resources/icons/mail.svg" alt="Mail Icon">
102+
Mailing List
103+
</a>
104+
</div>
105+
<div class="footer-text">
106+
<a href="https://github.com/avocado-framework/avocado/issues/new?assignees=&labels=bug&projects=&template=bug_report.md&title=">
107+
<img src="/resources/icons/bug.svg" alt="Bug Icon">
108+
Report a Bug
109+
</a>
110+
</div>
111+
<div class="footer-text">
112+
<a href="https://avocado-framework.readthedocs.io/en/latest/">
113+
<img src="/resources/icons/documentation.svg" alt="Doc Icon">
114+
Documentation
115+
</a>
116+
</div>
117+
<div class="footer-copyright">Copyright © 2024 Red Hat Inc. and Avocado Community Contributors</div>
118+
</footer>
119+
120+
</body>
121+
</html>

‎scripts/mergefiles.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ def merge_yaml_files(directory, output_file):
1414
# Load the YAML data while preserving order
1515
data = yaml.load(file, Loader=yaml.SafeLoader) # Use SafeLoader
1616

17-
# Check if the loaded data is a list
18-
if isinstance(data, list):
19-
merged_data.extend(data) # Merge the list into merged_data
17+
# Check if the loaded data is a dictionary
18+
if isinstance(data, dict):
19+
merged_data.append(data) # Append the dictionary to merged_data
2020
else:
2121
print(
22-
f"Warning: The content of {filename} is not a list. Skipping."
22+
f"Warning: The content of {filename} is not a dictionary. Skipping."
2323
)
2424

2525
# Write the merged data to the output YAML file

0 commit comments

Comments
 (0)