Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various updates to team, index, news, enterprise #27

Merged
merged 13 commits into from
Jul 7, 2024
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ logs
.DS_Store
.fleet
.idea
.eslintcache

# Local env files
.env
Expand Down
4 changes: 2 additions & 2 deletions assets/team/current.json
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@
"name": "Artem Grinev",
"role": "developer",
"image": "jpg",
"description": "Artem is a KDE head and prefers working with the QT toolkit. Works on development tools, software and infrastructure.",
"description": "Artem is a KDE head and prefers working with the Qt toolkit. Works on development tools, software and infrastructure.",
"social": {
"github": "",
"x": "",
Expand Down Expand Up @@ -198,7 +198,7 @@
"id": "philm",
"name": "Philip Müller",
"role": "project lead",
"image": "",
"image": "jpg",
"description": "Founded the project with Roland, Guillaume, Wlad and Allesandro back in 2011. Works on Kernels, Desktop and ARM, development tools and Devops.",
"social": {
"github": "https://github.com/philmmanjaro",
Expand Down
13 changes: 0 additions & 13 deletions assets/team/former.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,4 @@
[
{
"id": "",
"name": "Bogdan Covaciu",
"role": "",
"image": "",
"description": "Bogdan is the author of our friendly mascot, worked on all design related projects from wallpapers to media pamphlets, software testing and forum moderation.",
"social": {
"github": "",
"x": "",
"forum": ""
},
"pos": 7
},
{
"id": "",
"name": "Oğuz Kağan Eren",
Expand Down
6 changes: 3 additions & 3 deletions components/team-social.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<span class="inline-flex items-center gap-0.5">
<span class="inline-flex items-center space-x-2.5">
<NuxtLink
v-if="member.social.x"
:href="member.social.x"
Expand All @@ -21,7 +21,7 @@
v-if="member.social.github"
:href="member.social.github"
target="_blank"
class="ml-2 text-gray-500 h-5 w-5"
class="text-gray-500 h-5 w-5"
>
<svg
fill="currentColor"
Expand All @@ -38,7 +38,7 @@
v-if="member.social.forum"
:href="member.social.forum"
target="_blank"
class="ml-2 text-gray-500 h-[22px] w-[22px]"
class="text-gray-500 h-[22px] w-[22px]"
>
<svg
xmlns="http://www.w3.org/2000/svg"
Expand Down
6 changes: 3 additions & 3 deletions content/imprint.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ Email: [Direct contact](mailto:[email protected])<br>
VAT-Id.: DE 326352217

## Web Presence
Concept: Manjaro GmbH &amp; Co. KG, Contact: Philip Müller<br>
Design &amp; Programming: Roman Gilg, Vitor Lopes &amp; Web-Team<br>
Concept: Manjaro GmbH &amp; Co. KG, Contact: Roman Gilg<br>
Design &amp; Programming: Manjaro Web Team<br>
Email: [Direct contact](mailto:[email protected])<br>

## References &amp; external links
Expand All @@ -28,7 +28,7 @@ On our website you'll find links to external third party websites. The Manjaro G
The layout of this web presence, used images as well as publications and pictures are protected by copyright laws. Copying, distribution and use of the contents for other than the mentioned purposes is not allowed without a written permission of the Manjaro GmbH &amp; Co. KG or - if stated - the third party originator. The texts and images provided of this website may be used for commercial purposes within the scope of journalistic republication. However, the images remain protected property of the Manjaro GmbH &amp; Co. KG and require a respective label of origin. Alienation's not authorized or not noticeably carried out by the Manjaro GmbH &amp; Co. KG are prohibited.

## Responsible for the contents as per § 55 of the RStV (Interstate Broadcasting Agreement)
Name: Philip Müller<br>
Name: Roman Gilg<br>
Company: Manjaro GmbH &amp; Co. KG<br>
Street: Kolonnenstraße 8<br> City: Berlin<br>
State/Province: Berlin<br>
Expand Down
4 changes: 2 additions & 2 deletions content/terms-of-use.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ VAT-Id.: DE 326352217

### Web Presence

Concept: Manjaro GmbH &amp; Co. KG, Contact: Philip Müller<br>
Concept: Manjaro GmbH &amp; Co. KG, Contact: Roman Gilg<br>
Design &amp; Programming: Vitor Lopes &amp; Web-Team<br>
Email: <a href="https://manjaro.org/contact/">Direct contact</a>

### Responsible for the contents as per § 55 of the RStV (Interstate Broadcasting Agreement)

Name: Philip Müller<br>
Name: Roman Gilg<br>
Company: Manjaro GmbH &amp; Co. KG<br>
Street: Kolonnenstraße 8<br>
City: Berlin<br>State/Province: Berlin<br>
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
"@vueuse/core": "^10.10.0",
"@vueuse/nuxt": "^10.10.0",
"daisyui": "^4.12.2",
"eslint": "^9.3.0"
"eslint": "^9.3.0",
"vite-plugin-eslint2": "^4.4.0"
},
"pnpm": {
"overrides": {
Expand Down
20 changes: 10 additions & 10 deletions pages/enterprise.vue
Original file line number Diff line number Diff line change
Expand Up @@ -76,23 +76,23 @@
<div class="flex items-center justify-center -mx-4 lg:pl-8 lg:order-last">
<div class="flex flex-col items-end px-3">
<NuxtImg
class="object-scale-down mb-6 rounded shadow-lg dark:shadow-slate-800 h-28 sm:h-48 xl:h-56 w-28 sm:w-48 xl:w-56 p-4"
width="200px"
src="/enterprise/zscaler-logo.webp"
class="object-scale-down mb-6 rounded shadow-lg dark:shadow-slate-800 h-28 sm:h-36 xl:h-44 w-28 sm:w-36 xl:w-44 p-4"
width="400px"
src="/enterprise/gnome-calendar.webp"
alt="Zscaler logo"
/>
<NuxtImg
class="object-scale-down w-20 h-20 rounded shadow-lg dark:shadow-slate-800 sm:h-32 xl:h-40 sm:w-32 xl:w-40 p-4"
width="200px"
src="/enterprise/sentinel-one-logo.webp"
class="object-scale-down w-24 h-24 rounded shadow-lg dark:shadow-slate-800 sm:h-32 xl:h-40 sm:w-32 xl:w-40 p-4"
width="400px"
src="/enterprise/ollama-logo.webp"
alt="SentinelOne logo"
/>
</div>
<div class="px-3">
<NuxtImg
class="object-scale-down w-40 h-40 rounded shadow-lg dark:shadow-slate-800 sm:h-64 xl:h-80 sm:w-64 xl:w-80 p-8"
width="300px"
src="/enterprise/microsoft-365-logo.webp"
class="object-scale-down w-36 h-36 rounded shadow-lg dark:shadow-slate-800 sm:h-48 xl:h-60 sm:w-48 xl:w-60 p-8"
width="400px"
src="/enterprise/freeoffice-logo.webp"
alt="Microsoft 365 logo"
/>
</div>
Expand Down Expand Up @@ -123,7 +123,7 @@
<div class="px-4 py-8 lg:py-12 mx-auto sm:max-w-xl md:max-w-full lg:max-w-screen-xl md:px-24 lg:px-8">
<div class="max-w-xl mb-10 md:mx-auto sm:text-center lg:max-w-2xl md:mb-12">
<p class="inline-block px-3 py-px mb-4 text-xs font-semibold tracking-wider text-primary uppercase">
Our Solutions
Our Solution
</p>
<h2 class="text-2xl font-medium mb-4">
Types of Services
Expand Down
4 changes: 2 additions & 2 deletions pages/imprint.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div class="max-w-screen-sm mx-auto">
<div class="prose dark:prose-invert px-6">
<ContentRenderer :value="data" />
<div class="prose prose-a:prose-headings:no-underline dark:prose-invert px-6">
<ContentRenderer :value="data!" />
</div>
</div>
</template>
Expand Down
10 changes: 5 additions & 5 deletions pages/news/[year]/[title].vue
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<path d="m12.14 8.753-5.482 4.796c-.646.566-1.658.106-1.658-.753V3.204a1 1 0 0 1 1.659-.753l5.48 4.796a1 1 0 0 1 0 1.506z" />
</svg>
<li class="inline-flex items-center px-2 py-2 gap-1.5 text-center">
{{ data.title }}
{{ data!.title }}
</li>
</ol>
</nav>
Expand All @@ -47,7 +47,7 @@
width="600px"
/>
</div>
<h1 class="mb-6 text-3xl font-semibold tracking-tight">
<h1 class="mb-8 text-3xl font-semibold tracking-tight">
{{ data!.title }}
</h1>
<p class="mb-5 text-gray-800 dark:text-gray-300">
Expand All @@ -69,8 +69,8 @@
{{ author.name }}
</span>
</div>
<section class="text-gray-900 dark:text-gray-200 prose dark:prose-invert">
<ContentRenderer :value="data" />
<section class="pt-4 text-gray-900 dark:text-gray-200 prose prose-a:prose-headings:no-underline dark:prose-invert">
<ContentRenderer :value="data!" />
</section>
<dialog
id="author_modal"
Expand All @@ -80,7 +80,7 @@
<div class="flex items-center gap-10">
<NuxtImg
v-if="authorPicture"
class="rounded-full object-cover"
class="h-[150px] w-[150px] rounded-full object-cover"
:src="authorPicture"
width="150px"
alt="Author portrait"
Expand Down
4 changes: 2 additions & 2 deletions pages/privacy-policy.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div class="max-w-screen-sm mx-auto">
<div class="prose dark:prose-invert px-6">
<ContentRenderer :value="data" />
<div class="prose prose-a:prose-headings:no-underline dark:prose-invert px-6">
<ContentRenderer :value="data!" />
</div>
</div>
</template>
Expand Down
4 changes: 2 additions & 2 deletions pages/terms-of-use.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div class="max-w-screen-sm mx-auto">
<div class="prose dark:prose-invert px-6">
<ContentRenderer :value="data" />
<div class="prose prose-a:prose-headings:no-underline dark:prose-invert px-6">
<ContentRenderer :value="data!" />
</div>
</div>
</template>
Expand Down
36 changes: 34 additions & 2 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified public/desktops.webp
Binary file not shown.
Binary file added public/enterprise/freeoffice-logo.webp
Binary file not shown.
Binary file added public/enterprise/gnome-calendar.webp
Binary file not shown.
Binary file removed public/enterprise/microsoft-365-logo.webp
Binary file not shown.
Binary file added public/enterprise/ollama-logo.webp
Binary file not shown.
Binary file removed public/enterprise/sentinel-one-logo.webp
Binary file not shown.
Binary file removed public/enterprise/zscaler-logo.webp
Binary file not shown.
Binary file added public/team/philm.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.