From 4045628166fa78df7d5cf8344ffb76e268288a5d Mon Sep 17 00:00:00 2001
From: Walkx
Date: Sun, 15 May 2022 21:15:48 +0200
Subject: [PATCH 01/36] =?UTF-8?q?=F0=9F=94=A5=20Remove=20this=20random=20h?=
=?UTF-8?q?ref?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 2 --
1 file changed, 2 deletions(-)
diff --git a/README.md b/README.md
index 5433cbded..f92a99571 100644
--- a/README.md
+++ b/README.md
@@ -9,9 +9,7 @@
-
-
A homepage for your server.
From c5178ee288148482de0fb29ee1f9420d25bd895a Mon Sep 17 00:00:00 2001
From: Aj - Thomas
Date: Sun, 15 May 2022 22:55:02 +0200
Subject: [PATCH 02/36] =?UTF-8?q?=F0=9F=92=84=20Styling=20and=20responsive?=
=?UTF-8?q?ness?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-authored-by: Walkx
---
src/components/AppShelf/AppShelf.tsx | 72 ++++++++++++--------------
src/components/SearchBar/SearchBar.tsx | 5 +-
src/components/layout/Footer.tsx | 24 +++------
src/components/layout/Layout.tsx | 5 --
src/components/layout/Navbar.tsx | 2 +-
src/pages/index.tsx | 6 +--
6 files changed, 45 insertions(+), 69 deletions(-)
diff --git a/src/components/AppShelf/AppShelf.tsx b/src/components/AppShelf/AppShelf.tsx
index d76413811..2da45d5ea 100644
--- a/src/components/AppShelf/AppShelf.tsx
+++ b/src/components/AppShelf/AppShelf.tsx
@@ -1,6 +1,6 @@
import React, { useState } from 'react';
import { motion } from 'framer-motion';
-import { Text, AspectRatio, SimpleGrid, Card, Image, useMantineTheme } from '@mantine/core';
+import { Text, AspectRatio, Card, Image, useMantineTheme, Center, Grid } from '@mantine/core';
import { useConfig } from '../../tools/state';
import { serviceItem } from '../../tools/types';
import AppShelfMenu from './AppShelfMenu';
@@ -9,22 +9,13 @@ const AppShelf = () => {
const { config } = useConfig();
return (
-
+
{config.services.map((service) => (
-
+
+
+
))}
-
+
);
};
@@ -68,34 +59,35 @@ export function AppShelfItem(props: any) {
-
-
-
+
+
- {
- window.open(service.url);
- }}
- src={service.icon}
- />
-
-
-
+ >
+ {
+ window.open(service.url);
+ }}
+ />
+
+
+
+
);
diff --git a/src/components/SearchBar/SearchBar.tsx b/src/components/SearchBar/SearchBar.tsx
index 7a40ea4c0..7236b7d86 100644
--- a/src/components/SearchBar/SearchBar.tsx
+++ b/src/components/SearchBar/SearchBar.tsx
@@ -22,7 +22,7 @@ export default function SearchBar(props: any) {
return (
- tip: Use the prefixes !yt and !t in front of your query to search on YouTube or for a Torrent respectively.
+ tip: Use the prefixes !yt and !t in front of your query to search on
+ YouTube or for a Torrent respectively.
diff --git a/src/components/layout/Footer.tsx b/src/components/layout/Footer.tsx
index b89fb2fcb..697f02123 100644
--- a/src/components/layout/Footer.tsx
+++ b/src/components/layout/Footer.tsx
@@ -54,24 +54,12 @@ export function Footer({ links }: FooterCenteredProps) {
));
- return (
-
-
- {items}
-
- component="a" href="https://github.com/ajnart/homarr" size="lg">
-
-
-
+ return (
+
+
+ component="a" href="https://github.com/ajnart/homarr" size="lg">
+
+
({
main: {
- [theme.fn.largerThan('md')]: {
- maxWidth: 1500,
- },
},
}));
@@ -21,7 +18,6 @@ export default function Layout({ children, style }: any) {
header={}
footer={}
>
-
{children}
-
);
}
diff --git a/src/components/layout/Navbar.tsx b/src/components/layout/Navbar.tsx
index 7bb7a8410..fba3ecec1 100644
--- a/src/components/layout/Navbar.tsx
+++ b/src/components/layout/Navbar.tsx
@@ -14,7 +14,7 @@ export default function Navbar() {
base: 'auto',
}}
>
-
+
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index 8ec813ffb..8680adf07 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -53,12 +53,12 @@ export default function HomePage(props: any) {
setConfig(initialConfig);
}, [initialConfig]);
return (
- <>
-
+ <>
+
-
+
>
);
}
From 509873db5524d59d7e78e671e1ec84d4024ac0e4 Mon Sep 17 00:00:00 2001
From: Aj - Thomas
Date: Mon, 16 May 2022 12:37:38 +0200
Subject: [PATCH 03/36] =?UTF-8?q?=F0=9F=92=84=20App=20shell=20styling?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The modal now looks a little bit better
---
src/components/AppShelf/AddAppShelfItem.tsx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/components/AppShelf/AddAppShelfItem.tsx b/src/components/AppShelf/AddAppShelfItem.tsx
index 9a413ba5d..687c88b5b 100644
--- a/src/components/AppShelf/AddAppShelfItem.tsx
+++ b/src/components/AppShelf/AddAppShelfItem.tsx
@@ -12,6 +12,7 @@ import {
LoadingOverlay,
ActionIcon,
Tooltip,
+ Title,
} from '@mantine/core';
import { useForm } from '@mantine/form';
import { motion } from 'framer-motion';
@@ -26,11 +27,11 @@ export function AddItemShelfButton(props: any) {
return (
<>
Add service}
opened={props.opened || opened}
onClose={() => setOpened(false)}
- title="Add a service"
>
From e786b1e44fc4bc6915abd803a593964b0dd59f18 Mon Sep 17 00:00:00 2001
From: Aj - Thomas
Date: Mon, 16 May 2022 12:38:46 +0200
Subject: [PATCH 04/36] =?UTF-8?q?=E2=9C=8F=20Fix=20typos?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/SearchBar/SearchBar.tsx | 28 ++++++++++++------------
src/components/Settings/SettingsMenu.tsx | 7 +++---
2 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/src/components/SearchBar/SearchBar.tsx b/src/components/SearchBar/SearchBar.tsx
index 7236b7d86..6cd026784 100644
--- a/src/components/SearchBar/SearchBar.tsx
+++ b/src/components/SearchBar/SearchBar.tsx
@@ -8,11 +8,11 @@ export default function SearchBar(props: any) {
const { config, setConfig } = useConfig();
const [opened, setOpened] = useState(false);
const [icon, setIcon] = useState();
- const querryUrl = config.settings.searchUrl || 'https://www.google.com/search?q=';
+ const queryUrl = config.settings.searchUrl || 'https://www.google.com/search?q=';
const form = useForm({
initialValues: {
- querry: '',
+ query: '',
},
});
@@ -29,10 +29,10 @@ export default function SearchBar(props: any) {
>
+ }
+ >
+
+ tip: Use the prefixes !yt and !t in front of your query to search on YouTube
+ or for a Torrent respectively.
+
+
+
);
}
From d4c1148025e17cd22a8a602b25e4183f287e74ef Mon Sep 17 00:00:00 2001
From: Aj - Thomas
Date: Mon, 16 May 2022 13:51:14 +0200
Subject: [PATCH 06/36] =?UTF-8?q?=F0=9F=92=84=20Style=20the=20modal=20for?=
=?UTF-8?q?=20adding=20a=20service?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/AppShelf/AddAppShelfItem.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/AppShelf/AddAppShelfItem.tsx b/src/components/AppShelf/AddAppShelfItem.tsx
index 687c88b5b..cd6b7ff68 100644
--- a/src/components/AppShelf/AddAppShelfItem.tsx
+++ b/src/components/AppShelf/AddAppShelfItem.tsx
@@ -27,7 +27,7 @@ export function AddItemShelfButton(props: any) {
return (
<>
Add service}
opened={props.opened || opened}
From a71b50e33fa144b150498435bb72cdd3ac0f1470 Mon Sep 17 00:00:00 2001
From: Aj - Thomas
Date: Mon, 16 May 2022 13:51:46 +0200
Subject: [PATCH 07/36] =?UTF-8?q?=F0=9F=93=84=20Documenting=20keybinds=20f?=
=?UTF-8?q?or=20theme=20switch?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/ColorSchemeToggle/ColorSchemeSwitch.tsx | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/components/ColorSchemeToggle/ColorSchemeSwitch.tsx b/src/components/ColorSchemeToggle/ColorSchemeSwitch.tsx
index b8fb15488..fda70c4d8 100644
--- a/src/components/ColorSchemeToggle/ColorSchemeSwitch.tsx
+++ b/src/components/ColorSchemeToggle/ColorSchemeSwitch.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { createStyles, Switch, Group, useMantineColorScheme } from '@mantine/core';
+import { createStyles, Switch, Group, useMantineColorScheme, Kbd } from '@mantine/core';
import { Sun, MoonStars } from 'tabler-icons-react';
const useStyles = createStyles((theme) => ({
@@ -40,6 +40,9 @@ export function ColorSchemeSwitch() {
toggleColorScheme()} size="md" />
Switch to {colorScheme === 'dark' ? 'light' : 'dark'} mode
+
+ Ctrl+J
+
);
}
From 5c8b1c4fc4cea0e72602767aed37b2df31eedbda Mon Sep 17 00:00:00 2001
From: Aj - Thomas
Date: Mon, 16 May 2022 13:53:40 +0200
Subject: [PATCH 08/36] =?UTF-8?q?=E2=9C=A8=20Add=20all=20components=20in?=
=?UTF-8?q?=20Aside=20bar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/layout/Aside.tsx | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/components/layout/Aside.tsx b/src/components/layout/Aside.tsx
index d51055c0b..912b231ac 100644
--- a/src/components/layout/Aside.tsx
+++ b/src/components/layout/Aside.tsx
@@ -1,8 +1,9 @@
import { Aside as MantineAside, Group } from '@mantine/core';
+import { DateModule } from '../modules';
import { CalendarModule } from '../modules/calendar/CalendarModule';
import ModuleWrapper from '../modules/moduleWrapper';
-export default function Aside() {
+export default function Aside(props: any) {
return (
-
+
+
);
From 22cd5c8b9352d81f03b1487f8fddf98029fbeb72 Mon Sep 17 00:00:00 2001
From: Aj - Thomas
Date: Mon, 16 May 2022 13:54:08 +0200
Subject: [PATCH 09/36] =?UTF-8?q?=E2=9C=A8=20Add=20search=20bar=20in=20top?=
=?UTF-8?q?=20bar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/layout/Header.tsx | 27 ++++++++-------------------
1 file changed, 8 insertions(+), 19 deletions(-)
diff --git a/src/components/layout/Header.tsx b/src/components/layout/Header.tsx
index 44185e28e..2f3573872 100644
--- a/src/components/layout/Header.tsx
+++ b/src/components/layout/Header.tsx
@@ -1,11 +1,14 @@
import React from 'react';
-import { createStyles, Header as Head, Group, Drawer, Center } from '@mantine/core';
-import { useBooleanToggle } from '@mantine/hooks';
+import {
+ createStyles,
+ Header as Head,
+ Group,
+} from '@mantine/core';
import { NextLink } from '@mantine/next';
import { Logo } from './Logo';
-import CalendarComponent from '../modules/calendar/CalendarModule';
import { SettingsMenuButton } from '../Settings/SettingsMenu';
import { AddItemShelfButton } from '../AppShelf/AddAppShelfItem';
+import SearchBar from '../SearchBar/SearchBar';
const HEADER_HEIGHT = 60;
@@ -83,8 +86,7 @@ interface HeaderResponsiveProps {
links: { link: string; label: string }[];
}
-export function Header({ links }: HeaderResponsiveProps) {
- const [opened, toggleOpened] = useBooleanToggle(false);
+export function Header(props: any) {
const { classes, cx } = useStyles();
return (
@@ -94,24 +96,11 @@ export function Header({ links }: HeaderResponsiveProps) {
+
-
- toggleOpened()}
- position="right"
- >
- {opened ?? (
-
-
-
- )}
-
);
}
From ab1e2a32a03cf8d9ba4eb66ce1a3de67c5c55e7c Mon Sep 17 00:00:00 2001
From: Aj - Thomas
Date: Mon, 16 May 2022 13:54:29 +0200
Subject: [PATCH 10/36] =?UTF-8?q?=F0=9F=94=A5=20Remove=20Navbar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/layout/Layout.tsx | 25 +++++++++++--------------
1 file changed, 11 insertions(+), 14 deletions(-)
diff --git a/src/components/layout/Layout.tsx b/src/components/layout/Layout.tsx
index a6ad51a9a..8b82b4a74 100644
--- a/src/components/layout/Layout.tsx
+++ b/src/components/layout/Layout.tsx
@@ -1,31 +1,28 @@
-import { AppShell, Center, createStyles } from '@mantine/core';
+import { AppShell, createStyles } from '@mantine/core';
import { Header } from './Header';
import { Footer } from './Footer';
import Aside from './Aside';
-import Navbar from './Navbar';
const useStyles = createStyles((theme) => ({
- main: {
- },
+ main: {},
}));
export default function Layout({ children, style }: any) {
const { classes, cx } = useStyles();
return (
}
aside={}
- header={}
+ header={}
footer={}
>
-
- {children}
-
+
+ {children}
+
);
}
From e75ff14975431353d8dbf733368a00df20238ed2 Mon Sep 17 00:00:00 2001
From: Aj - Thomas
Date: Mon, 16 May 2022 13:54:54 +0200
Subject: [PATCH 11/36] =?UTF-8?q?=F0=9F=94=A5=20Remove=20search=20bar=20fr?=
=?UTF-8?q?om=20index?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/index.tsx | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index 8680adf07..6cf84b51d 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -6,7 +6,6 @@ import fs from 'fs';
import { useEffect } from 'react';
import AppShelf from '../components/AppShelf/AppShelf';
import LoadConfigComponent from '../components/Config/LoadConfig';
-import SearchBar from '../components/SearchBar/SearchBar';
import { Config } from '../tools/types';
import { useConfig } from '../tools/state';
@@ -53,12 +52,11 @@ export default function HomePage(props: any) {
setConfig(initialConfig);
}, [initialConfig]);
return (
- <>
-
+ <>
-
+
>
);
}
From d3bd894c2aededdaaee1a0c1c319a1d3719e0a53 Mon Sep 17 00:00:00 2001
From: Aj - Thomas
Date: Mon, 16 May 2022 13:56:34 +0200
Subject: [PATCH 12/36] =?UTF-8?q?=F0=9F=99=88=20Add=20configs=20to=20gitin?=
=?UTF-8?q?gore?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitignore | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.gitignore b/.gitignore
index 684a71ab7..97405ae66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,4 +35,5 @@ yarn-error.log*
*.tsbuildinfo
# storybook
-storybook-static
\ No newline at end of file
+storybook-static
+data/configs
\ No newline at end of file
From 20a37b678f8532314edf1eb0650e012ce7477bc4 Mon Sep 17 00:00:00 2001
From: Aj - Thomas
Date: Mon, 16 May 2022 14:34:01 +0200
Subject: [PATCH 13/36] Update header styling
---
src/components/layout/Header.tsx | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/src/components/layout/Header.tsx b/src/components/layout/Header.tsx
index 2f3573872..779921b8b 100644
--- a/src/components/layout/Header.tsx
+++ b/src/components/layout/Header.tsx
@@ -1,9 +1,5 @@
import React from 'react';
-import {
- createStyles,
- Header as Head,
- Group,
-} from '@mantine/core';
+import { createStyles, Header as Head, Group } from '@mantine/core';
import { NextLink } from '@mantine/next';
import { Logo } from './Logo';
import { SettingsMenuButton } from '../Settings/SettingsMenu';
@@ -40,7 +36,7 @@ const useStyles = createStyles((theme) => ({
},
links: {
- [theme.fn.smallerThan('md')]: {
+ [theme.fn.smallerThan('xs')]: {
display: 'none',
},
},
@@ -92,9 +88,7 @@ export function Header(props: any) {
return (
-
-
-
+
From 8392dcef20fa52bedde8e8f9e9baaaf894566f1c Mon Sep 17 00:00:00 2001
From: Aj - Thomas
Date: Mon, 16 May 2022 15:55:22 +0200
Subject: [PATCH 14/36] =?UTF-8?q?=EF=BF=BD=20Module=20styling?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
data/configs/config.json | 20 +++++++++++++++++---
src/components/AppShelf/AppShelf.tsx | 2 +-
src/components/SearchBar/SearchBar.tsx | 1 +
src/components/modules/moduleWrapper.tsx | 11 +----------
src/pages/index.tsx | 5 ++---
5 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/data/configs/config.json b/data/configs/config.json
index 060961492..b9c4ae388 100644
--- a/data/configs/config.json
+++ b/data/configs/config.json
@@ -1,12 +1,26 @@
{
"name": "config",
- "services": [],
+ "services": [
+ {
+ "type": "Other",
+ "name": "YouTube",
+ "icon": "https://cdn.jsdelivr.net/gh/walkxhub/dashboard-icons/png/youtube.png",
+ "url": "https://youtube.com/"
+ },
+ {
+ "type": "Other",
+ "name": "YouTube ",
+ "icon": "https://cdn.jsdelivr.net/gh/walkxhub/dashboard-icons/png/youtube.png",
+ "url": "https://youtube.com/"
+ }
+ ],
"settings": {
"searchBar": true,
- "searchUrl": "https://duckduckgo.com/?q=",
+ "searchUrl": "Custom",
"enabledModules": [
"Date",
- "Calendar"
+ "Calendar",
+ "Weather"
]
}
}
\ No newline at end of file
diff --git a/src/components/AppShelf/AppShelf.tsx b/src/components/AppShelf/AppShelf.tsx
index 2da45d5ea..54b373fd3 100644
--- a/src/components/AppShelf/AppShelf.tsx
+++ b/src/components/AppShelf/AppShelf.tsx
@@ -5,7 +5,7 @@ import { useConfig } from '../../tools/state';
import { serviceItem } from '../../tools/types';
import AppShelfMenu from './AppShelfMenu';
-const AppShelf = () => {
+const AppShelf = (props: any) => {
const { config } = useConfig();
return (
diff --git a/src/components/SearchBar/SearchBar.tsx b/src/components/SearchBar/SearchBar.tsx
index be853e67c..a058e76f2 100644
--- a/src/components/SearchBar/SearchBar.tsx
+++ b/src/components/SearchBar/SearchBar.tsx
@@ -73,6 +73,7 @@ export default function SearchBar(props: any) {
target={
+
);
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index 6cf84b51d..4568a1ca7 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -6,6 +6,7 @@ import fs from 'fs';
import { useEffect } from 'react';
import AppShelf from '../components/AppShelf/AppShelf';
import LoadConfigComponent from '../components/Config/LoadConfig';
+import SearchBar from '../components/SearchBar/SearchBar';
import { Config } from '../tools/types';
import { useConfig } from '../tools/state';
@@ -53,9 +54,7 @@ export default function HomePage(props: any) {
}, [initialConfig]);
return (
<>
-
-
-
+
>
);
From ebc7ba9684c02360a34f2ff2be804359e6551870 Mon Sep 17 00:00:00 2001
From: Aj - Thomas
Date: Mon, 16 May 2022 15:56:01 +0200
Subject: [PATCH 15/36] =?UTF-8?q?=EF=BF=BD=20Update=20search=20bar=20styli?=
=?UTF-8?q?ng?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/SearchBar/SearchBar.tsx | 45 +++++++++++++++-----------
1 file changed, 27 insertions(+), 18 deletions(-)
diff --git a/src/components/SearchBar/SearchBar.tsx b/src/components/SearchBar/SearchBar.tsx
index a058e76f2..e10c8b79b 100644
--- a/src/components/SearchBar/SearchBar.tsx
+++ b/src/components/SearchBar/SearchBar.tsx
@@ -1,9 +1,19 @@
-import { TextInput, Text, Popover, Kbd, Group } from '@mantine/core';
+import { TextInput, Kbd, createStyles, useMantineTheme, Text, Popover } from '@mantine/core';
import { useForm, useHotkeys } from '@mantine/hooks';
import { useRef, useState } from 'react';
import { Search, BrandYoutube, Download } from 'tabler-icons-react';
import { useConfig } from '../../tools/state';
+const useStyles = createStyles((theme) => ({
+ hide: {
+ [theme.fn.smallerThan('sm')]: {
+ display: 'none',
+ },
+ display: 'flex',
+ alignItems: 'center',
+ },
+}));
+
export default function SearchBar(props: any) {
const { config, setConfig } = useConfig();
const [opened, setOpened] = useState(false);
@@ -12,8 +22,10 @@ export default function SearchBar(props: any) {
const textInput: any = useRef(null);
useHotkeys([['ctrl+K', () => textInput.current.focus()]]);
+ const { classes, cx } = useStyles();
+ const theme = useMantineTheme();
const rightSection = (
-
+
Ctrl
+
K
@@ -71,22 +83,19 @@ export default function SearchBar(props: any) {
onFocusCapture={() => setOpened(true)}
onBlurCapture={() => setOpened(false)}
target={
-
-
-
+
}
>
From 08daeb87bc8e195e87cbeaf86b41c4710ed2f583 Mon Sep 17 00:00:00 2001
From: Aj - Thomas
Date: Mon, 16 May 2022 15:56:16 +0200
Subject: [PATCH 16/36] =?UTF-8?q?=EF=BF=BD=20Header=20styling?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/layout/Header.tsx | 85 ++++----------------------------
1 file changed, 10 insertions(+), 75 deletions(-)
diff --git a/src/components/layout/Header.tsx b/src/components/layout/Header.tsx
index 779921b8b..f319c4c0e 100644
--- a/src/components/layout/Header.tsx
+++ b/src/components/layout/Header.tsx
@@ -1,95 +1,30 @@
import React from 'react';
-import { createStyles, Header as Head, Group } from '@mantine/core';
-import { NextLink } from '@mantine/next';
+import { createStyles, Header as Head, Group, Box } from '@mantine/core';
import { Logo } from './Logo';
-import { SettingsMenuButton } from '../Settings/SettingsMenu';
-import { AddItemShelfButton } from '../AppShelf/AddAppShelfItem';
import SearchBar from '../SearchBar/SearchBar';
+import { AddItemShelfButton } from '../AppShelf/AddAppShelfItem';
+import { SettingsMenuButton } from '../Settings/SettingsMenu';
const HEADER_HEIGHT = 60;
const useStyles = createStyles((theme) => ({
- root: {
- position: 'relative',
- zIndex: 1,
- },
-
- dropdown: {
- position: 'absolute',
- top: HEADER_HEIGHT,
- left: 0,
- right: 0,
- zIndex: 0,
- borderTopRightRadius: 0,
- borderTopLeftRadius: 0,
- borderTopWidth: 0,
- overflow: 'hidden',
-
- [theme.fn.largerThan('md')]: {
- display: 'none',
- },
- },
-
- header: {
- display: 'flex',
- height: '100%',
- },
-
- links: {
+ hide: {
[theme.fn.smallerThan('xs')]: {
display: 'none',
},
},
-
- burger: {
- [theme.fn.largerThan('md')]: {
- display: 'none',
- },
- },
-
- link: {
- display: 'block',
- lineHeight: 1,
- padding: '8px 12px',
- borderRadius: theme.radius.sm,
- textDecoration: 'none',
- color: theme.colorScheme === 'dark' ? theme.colors.dark[0] : theme.colors.gray[7],
- fontSize: theme.fontSizes.sm,
- fontWeight: 500,
-
- '&:hover': {
- backgroundColor: theme.colorScheme === 'dark' ? theme.colors.dark[6] : theme.colors.gray[0],
- },
-
- [theme.fn.smallerThan('sm')]: {
- borderRadius: 0,
- padding: theme.spacing.md,
- },
- },
-
- linkActive: {
- '&, &:hover': {
- backgroundColor:
- theme.colorScheme === 'dark'
- ? theme.fn.rgba(theme.colors[theme.primaryColor][9], 0.25)
- : theme.colors[theme.primaryColor][0],
- color: theme.colors[theme.primaryColor][theme.colorScheme === 'dark' ? 3 : 7],
- },
- },
}));
-interface HeaderResponsiveProps {
- links: { link: string; label: string }[];
-}
-
export function Header(props: any) {
const { classes, cx } = useStyles();
return (
-
-
-
-
+
+
+
+
+
+
From a97c9b0c0fda9f806e11a3d20a78fdb321dfbdac Mon Sep 17 00:00:00 2001
From: Aj - Thomas
Date: Mon, 16 May 2022 15:56:50 +0200
Subject: [PATCH 17/36] =?UTF-8?q?=F0=9F=92=84=20Update=20styling?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/AppShelf/AppShelf.tsx | 2 +-
src/pages/index.tsx | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/components/AppShelf/AppShelf.tsx b/src/components/AppShelf/AppShelf.tsx
index 54b373fd3..d971144d1 100644
--- a/src/components/AppShelf/AppShelf.tsx
+++ b/src/components/AppShelf/AppShelf.tsx
@@ -37,7 +37,7 @@ export function AppShelfItem(props: any) {
style={{
boxShadow: hovering ? '0px 0px 3px rgba(0, 0, 0, 0.5)' : '0px 0px 1px rgba(0, 0, 0, 0.5)',
backgroundColor:
- theme.colorScheme === 'dark' ? theme.colors.dark[6] : theme.colors.gray[1],
+ theme.colorScheme === 'dark' ? theme.colors.dark[5] : theme.colors.gray[0],
}}
radius="md"
>
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index 4568a1ca7..272d367a2 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -1,4 +1,3 @@
-import { Group } from '@mantine/core';
import { getCookie, setCookies } from 'cookies-next';
import { GetServerSidePropsContext } from 'next';
import path from 'path';
@@ -6,7 +5,6 @@ import fs from 'fs';
import { useEffect } from 'react';
import AppShelf from '../components/AppShelf/AppShelf';
import LoadConfigComponent from '../components/Config/LoadConfig';
-import SearchBar from '../components/SearchBar/SearchBar';
import { Config } from '../tools/types';
import { useConfig } from '../tools/state';
From f5eb36ff0092730a8a5385b34595fafb5a00b816 Mon Sep 17 00:00:00 2001
From: ajnart
Date: Mon, 16 May 2022 22:48:29 +0200
Subject: [PATCH 18/36] =?UTF-8?q?=F0=9F=92=84=20Update=20styling=20of=20Ap?=
=?UTF-8?q?pShelf?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/AppShelf/AppShelf.tsx | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/src/components/AppShelf/AppShelf.tsx b/src/components/AppShelf/AppShelf.tsx
index d971144d1..1536cbfb5 100644
--- a/src/components/AppShelf/AppShelf.tsx
+++ b/src/components/AppShelf/AppShelf.tsx
@@ -11,7 +11,7 @@ const AppShelf = (props: any) => {
return (
{config.services.map((service) => (
-
+
))}
@@ -33,16 +33,9 @@ export function AppShelfItem(props: any) {
setHovering(false);
}}
>
-
+
-
+
{service.name}
Date: Mon, 16 May 2022 22:53:13 +0200
Subject: [PATCH 19/36] =?UTF-8?q?=F0=9F=92=84=20Update=20styling=20of=20Ap?=
=?UTF-8?q?pShelf?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/AppShelf/AppShelf.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/AppShelf/AppShelf.tsx b/src/components/AppShelf/AppShelf.tsx
index 1536cbfb5..76ec5df39 100644
--- a/src/components/AppShelf/AppShelf.tsx
+++ b/src/components/AppShelf/AppShelf.tsx
@@ -33,7 +33,7 @@ export function AppShelfItem(props: any) {
setHovering(false);
}}
>
-
+
{service.name}
From 3529e46b11f6f9bfac2a6a0d460ad180dc17738e Mon Sep 17 00:00:00 2001
From: Chris <15677803+c00ldude1oo@users.noreply.github.com>
Date: Sun, 15 May 2022 19:17:02 -0400
Subject: [PATCH 20/36] :fire: Remove unneeded lines
Removed adduser and addgroup since they aren't needed.
---
Dockerfile | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 95fbce619..98fe3bdbe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,19 +1,13 @@
FROM node:16-alpine
WORKDIR /app
ENV NODE_ENV production
-RUN addgroup --system --gid 1001 nodejs
-RUN adduser --system --uid 1001 nextjs
-
COPY /next.config.js ./
COPY /public ./public
COPY /package.json ./package.json
-
-# Automatically leverage output traces to reduce image size
-# https://nextjs.org/docs/advanced-features/output-file-tracing
+# Automatically leverage output traces to reduce image size. https://nextjs.org/docs/advanced-features/output-file-tracing
COPY /.next/standalone ./
COPY /.next/static ./.next/static
-
EXPOSE 7575
ENV PORT 7575
VOLUME /app/data/configs
-CMD ["node", "server.js"]
\ No newline at end of file
+CMD ["node", "server.js"]
From 1aaa575480b9b17705e50e05adee994f90d3bd39 Mon Sep 17 00:00:00 2001
From: Chris <15677803+c00ldude1oo@users.noreply.github.com>
Date: Sun, 15 May 2022 19:40:01 -0400
Subject: [PATCH 21/36] :green_heart: Stop running CI when ignored files are
updated
CI will now not run when some files are updated that are not related to building.
---
.github/workflows/docker.yml | 8 ++++++++
.github/workflows/docker_dev.yml | 14 ++++++++++++++
2 files changed, 22 insertions(+)
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 4bd399d2a..03b6cd279 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -4,8 +4,16 @@ name: Master docker CI
on:
push:
branches: [master]
+ paths-ignore:
+ - '.github/ISSUE_TEMPLATE/**'
+ - '.github/pull_request_template.md'
+ - 'CONDE_OF_CUNDUCT.md'
+ - 'CONTRIBUTING.md'
+ - 'LICENSE'
+ - 'README.md'
tags:
- v*
+
workflow_dispatch:
env:
diff --git a/.github/workflows/docker_dev.yml b/.github/workflows/docker_dev.yml
index cbf6b819f..cd89a54d0 100644
--- a/.github/workflows/docker_dev.yml
+++ b/.github/workflows/docker_dev.yml
@@ -6,7 +6,21 @@ name: Development CI
on:
push:
branches: [dev]
+ paths-ignore:
+ - '.github/ISSUE_TEMPLATE/**'
+ - '.github/pull_request_template.md'
+ - 'CONDE_OF_CUNDUCT.md'
+ - 'CONTRIBUTING.md'
+ - 'LICENSE'
+ - 'README.md'
pull_request:
+ paths-ignore:
+ - '.github/ISSUE_TEMPLATE/**'
+ - '.github/pull_request_template.md'
+ - 'CONDE_OF_CUNDUCT.md'
+ - 'CONTRIBUTING.md'
+ - 'LICENSE'
+ - 'README.md'
workflow_dispatch:
inputs:
tags:
From 7662c11bb5e13e24e794f2fa12dc120b303b3a7b Mon Sep 17 00:00:00 2001
From: Chris <15677803+c00ldude1oo@users.noreply.github.com>
Date: Sun, 15 May 2022 21:35:23 -0400
Subject: [PATCH 22/36] :green_heart: CI won't push to docker on PRs from forks
If not from fork it still will. Since that's how it was set by ajnart.
---
.github/workflows/docker.yml | 2 +-
.github/workflows/docker_dev.yml | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 03b6cd279..61f1e5c88 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -7,7 +7,7 @@ on:
paths-ignore:
- '.github/ISSUE_TEMPLATE/**'
- '.github/pull_request_template.md'
- - 'CONDE_OF_CUNDUCT.md'
+ - 'CODE_OF_CONDUCT.md'
- 'CONTRIBUTING.md'
- 'LICENSE'
- 'README.md'
diff --git a/.github/workflows/docker_dev.yml b/.github/workflows/docker_dev.yml
index cd89a54d0..37efbd6fa 100644
--- a/.github/workflows/docker_dev.yml
+++ b/.github/workflows/docker_dev.yml
@@ -9,7 +9,7 @@ on:
paths-ignore:
- '.github/ISSUE_TEMPLATE/**'
- '.github/pull_request_template.md'
- - 'CONDE_OF_CUNDUCT.md'
+ - 'CODE_OF_CONDUCT.md'
- 'CONTRIBUTING.md'
- 'LICENSE'
- 'README.md'
@@ -17,7 +17,7 @@ on:
paths-ignore:
- '.github/ISSUE_TEMPLATE/**'
- '.github/pull_request_template.md'
- - 'CONDE_OF_CUNDUCT.md'
+ - 'CODE_OF_CONDUCT.md'
- 'CONTRIBUTING.md'
- 'LICENSE'
- 'README.md'
@@ -114,6 +114,7 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Login to GHCR
+ if: github.event_name != 'pull_request' || github.base_ref == github.head_ref
uses: docker/login-action@v2
with:
registry: ghcr.io
@@ -125,6 +126,6 @@ jobs:
with:
platforms: linux/amd64,linux/arm64,linux/arm/v7
context: .
- push: true
+ push: ${{ github.event_name != 'pull_request' || github.base_ref == github.head_ref }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
From 68111616fe1f35306083f83c392d86849e215564 Mon Sep 17 00:00:00 2001
From: Chris <15677803+c00ldude1oo@users.noreply.github.com>
Date: Sun, 15 May 2022 21:48:05 -0400
Subject: [PATCH 23/36] test CI fix
---
.github/workflows/docker_dev.yml | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/docker_dev.yml b/.github/workflows/docker_dev.yml
index 37efbd6fa..900856f05 100644
--- a/.github/workflows/docker_dev.yml
+++ b/.github/workflows/docker_dev.yml
@@ -32,6 +32,9 @@ env:
REGISTRY: ghcr.io
# github.repository as /
IMAGE_NAME: ${{ github.repository }}
+ # temp
+ e1: ${{ github.event_name }}
+ e2: ${{ github.base_ref }}-${{github.head_ref }}
jobs:
# Push image to GitHub Packages.
@@ -114,7 +117,7 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Login to GHCR
- if: github.event_name != 'pull_request' || github.base_ref == github.head_ref
+ if: github.base_ref == github.head_ref
uses: docker/login-action@v2
with:
registry: ghcr.io
@@ -126,6 +129,6 @@ jobs:
with:
platforms: linux/amd64,linux/arm64,linux/arm/v7
context: .
- push: ${{ github.event_name != 'pull_request' || github.base_ref == github.head_ref }}
+ push: ${{ github.base_ref == github.head_ref }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
From 1145ee39b6ca217d6488353657de71bb16742d0b Mon Sep 17 00:00:00 2001
From: Chris <15677803+c00ldude1oo@users.noreply.github.com>
Date: Sun, 15 May 2022 22:09:28 -0400
Subject: [PATCH 24/36] test CI fix 2
---
.github/workflows/docker_dev.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/docker_dev.yml b/.github/workflows/docker_dev.yml
index 900856f05..97d99bc46 100644
--- a/.github/workflows/docker_dev.yml
+++ b/.github/workflows/docker_dev.yml
@@ -35,6 +35,7 @@ env:
# temp
e1: ${{ github.event_name }}
e2: ${{ github.base_ref }}-${{github.head_ref }}
+ e2: " ${{github}} "
jobs:
# Push image to GitHub Packages.
@@ -129,6 +130,6 @@ jobs:
with:
platforms: linux/amd64,linux/arm64,linux/arm/v7
context: .
- push: ${{ github.base_ref == github.head_ref }}
+ push: ${{ github.base_ref == github.head_ref && github.event_name != 'pull_request'}}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
From 06caa2ca5ed4ef8733a0d165969f457c9d58e22d Mon Sep 17 00:00:00 2001
From: Chris <15677803+c00ldude1oo@users.noreply.github.com>
Date: Sun, 15 May 2022 22:12:06 -0400
Subject: [PATCH 25/36] test CI fix 3
---
.github/workflows/docker_dev.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/docker_dev.yml b/.github/workflows/docker_dev.yml
index 97d99bc46..0e9f63eec 100644
--- a/.github/workflows/docker_dev.yml
+++ b/.github/workflows/docker_dev.yml
@@ -35,7 +35,8 @@ env:
# temp
e1: ${{ github.event_name }}
e2: ${{ github.base_ref }}-${{github.head_ref }}
- e2: " ${{github}} "
+ e3: " ${{github}} "
+ e4: ${{github}}
jobs:
# Push image to GitHub Packages.
From 9bf8b337f692bf4b24c774a804f15a0424dce7ea Mon Sep 17 00:00:00 2001
From: Chris <15677803+c00ldude1oo@users.noreply.github.com>
Date: Sun, 15 May 2022 22:16:04 -0400
Subject: [PATCH 26/36] test CI fix 4
---
.github/workflows/docker_dev.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.github/workflows/docker_dev.yml b/.github/workflows/docker_dev.yml
index 0e9f63eec..d2eafbe3f 100644
--- a/.github/workflows/docker_dev.yml
+++ b/.github/workflows/docker_dev.yml
@@ -36,7 +36,6 @@ env:
e1: ${{ github.event_name }}
e2: ${{ github.base_ref }}-${{github.head_ref }}
e3: " ${{github}} "
- e4: ${{github}}
jobs:
# Push image to GitHub Packages.
From fe5fa99b4acf81ac045192222454f6c0f8d3ecee Mon Sep 17 00:00:00 2001
From: Chris <15677803+c00ldude1oo@users.noreply.github.com>
Date: Sun, 15 May 2022 23:29:01 -0400
Subject: [PATCH 27/36] :green_heart: Fixed CI fail on PR from fork
Fixed CI failing when a PR is made from a fork due to user from fork not having the permission packages: write. CI will now check if it has write perms before push built docker image.
---
.github/workflows/docker_dev.yml | 27 +++++++++++++++++++++------
1 file changed, 21 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/docker_dev.yml b/.github/workflows/docker_dev.yml
index d2eafbe3f..6091e9687 100644
--- a/.github/workflows/docker_dev.yml
+++ b/.github/workflows/docker_dev.yml
@@ -32,10 +32,6 @@ env:
REGISTRY: ghcr.io
# github.repository as /
IMAGE_NAME: ${{ github.repository }}
- # temp
- e1: ${{ github.event_name }}
- e2: ${{ github.base_ref }}-${{github.head_ref }}
- e3: " ${{github}} "
jobs:
# Push image to GitHub Packages.
@@ -43,13 +39,17 @@ jobs:
yarn_install_and_build:
runs-on: ubuntu-latest
steps:
+
- name: Setup
uses: actions/setup-node@v3
+
- name: Checkout
uses: actions/checkout@v3
+
- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
+
- name: Yarn cache
uses: actions/cache@v3
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
@@ -57,6 +57,7 @@ jobs:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: ${{ runner.os }}-yarn-
+
- name: Nextjs cache
uses: actions/cache@v2
with:
@@ -68,8 +69,10 @@ jobs:
key: ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**.[jt]s', '**.[jt]sx') }}
# If source files changed but packages didn't, rebuild from a prior cache.
restore-keys: ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-
+
- run: yarn install --frozen-lockfile
- run: yarn build
+
- name: Cache build output
uses: actions/cache@v2
id: restore-build
@@ -90,8 +93,10 @@ jobs:
packages: write
contents: read
steps:
+
- name: Checkout
uses: actions/checkout@v2
+
- uses: actions/cache@v2
id: restore-build
with:
@@ -103,6 +108,7 @@ jobs:
./.next/standalone/
./packages.json
key: ${{ github.sha }}
+
- name: Docker meta
id: meta
uses: docker/metadata-action@v4
@@ -113,12 +119,21 @@ jobs:
tags: |
type=ref,event=pr
tpye=raw,value=dev,priority=1
+
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
+
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
+
+ - name: Check perms
+ uses: actions-cool/check-user-permission@main
+ id: checkUser
+ with:
+ require: 'write'
+
- name: Login to GHCR
- if: github.base_ref == github.head_ref
+ if: steps.checkUser.outputs.require-result == 'true'
uses: docker/login-action@v2
with:
registry: ghcr.io
@@ -130,6 +145,6 @@ jobs:
with:
platforms: linux/amd64,linux/arm64,linux/arm/v7
context: .
- push: ${{ github.base_ref == github.head_ref && github.event_name != 'pull_request'}}
+ push: ${{ steps.checkUser.outputs.require-result == 'true' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
From 7fa464b38f958bad9914ece93f8777820af7bb33 Mon Sep 17 00:00:00 2001
From: Walkx
Date: Mon, 16 May 2022 15:45:34 +0200
Subject: [PATCH 28/36] =?UTF-8?q?=F0=9F=92=9A=20Update=20.github/workflows?=
=?UTF-8?q?/docker.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-authored-by: Thomas Camlong <49837342+ajnart@users.noreply.github.com>
---
.github/workflows/docker.yml | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 61f1e5c88..cdc6f3b19 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -5,12 +5,8 @@ on:
push:
branches: [master]
paths-ignore:
- - '.github/ISSUE_TEMPLATE/**'
- - '.github/pull_request_template.md'
- - 'CODE_OF_CONDUCT.md'
- - 'CONTRIBUTING.md'
- - 'LICENSE'
- - 'README.md'
+ - '.github/**'
+ - '**.md'
tags:
- v*
From 97ca45964ad1a3005f88aec4d58e06bf3c61686f Mon Sep 17 00:00:00 2001
From: Walkx
Date: Mon, 16 May 2022 15:45:49 +0200
Subject: [PATCH 29/36] =?UTF-8?q?=F0=9F=92=9A=20Update=20.github/workflows?=
=?UTF-8?q?/docker=5Fdev.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-authored-by: Thomas Camlong <49837342+ajnart@users.noreply.github.com>
---
.github/workflows/docker_dev.yml | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/docker_dev.yml b/.github/workflows/docker_dev.yml
index 6091e9687..ad444e32e 100644
--- a/.github/workflows/docker_dev.yml
+++ b/.github/workflows/docker_dev.yml
@@ -7,12 +7,8 @@ on:
push:
branches: [dev]
paths-ignore:
- - '.github/ISSUE_TEMPLATE/**'
- - '.github/pull_request_template.md'
- - 'CODE_OF_CONDUCT.md'
- - 'CONTRIBUTING.md'
- - 'LICENSE'
- - 'README.md'
+ - '.github/**'
+ - '**.md'
pull_request:
paths-ignore:
- '.github/ISSUE_TEMPLATE/**'
From 3782499da5d5f1bfe551e5f70f11dd9368107800 Mon Sep 17 00:00:00 2001
From: Walkx
Date: Mon, 16 May 2022 15:46:04 +0200
Subject: [PATCH 30/36] =?UTF-8?q?=F0=9F=92=9A=20Update=20.github/workflows?=
=?UTF-8?q?/docker=5Fdev.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-authored-by: Thomas Camlong <49837342+ajnart@users.noreply.github.com>
---
.github/workflows/docker_dev.yml | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/docker_dev.yml b/.github/workflows/docker_dev.yml
index ad444e32e..f729279b9 100644
--- a/.github/workflows/docker_dev.yml
+++ b/.github/workflows/docker_dev.yml
@@ -11,12 +11,8 @@ on:
- '**.md'
pull_request:
paths-ignore:
- - '.github/ISSUE_TEMPLATE/**'
- - '.github/pull_request_template.md'
- - 'CODE_OF_CONDUCT.md'
- - 'CONTRIBUTING.md'
- - 'LICENSE'
- - 'README.md'
+ - '.github/**'
+ - '**.md'
workflow_dispatch:
inputs:
tags:
From 8557820e6e1c1261454f9bf0ea1a8b6ca87544a0 Mon Sep 17 00:00:00 2001
From: Chris <15677803+c00ldude1oo@users.noreply.github.com>
Date: Mon, 16 May 2022 10:54:26 -0400
Subject: [PATCH 31/36] Update docker_dev.yml
---
.github/workflows/docker_dev.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/docker_dev.yml b/.github/workflows/docker_dev.yml
index f729279b9..155529f06 100644
--- a/.github/workflows/docker_dev.yml
+++ b/.github/workflows/docker_dev.yml
@@ -9,7 +9,7 @@ on:
paths-ignore:
- '.github/**'
- '**.md'
- pull_request:
+ pull_request_target:
paths-ignore:
- '.github/**'
- '**.md'
From 8c14b3ccf9a2809523194642d98396ff19cfb8f4 Mon Sep 17 00:00:00 2001
From: Chris <15677803+c00ldude1oo@users.noreply.github.com>
Date: Mon, 16 May 2022 11:08:21 -0400
Subject: [PATCH 32/36] temp edit to test workflow
---
.github/workflows/docker_dev.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/docker_dev.yml b/.github/workflows/docker_dev.yml
index 155529f06..22af11b68 100644
--- a/.github/workflows/docker_dev.yml
+++ b/.github/workflows/docker_dev.yml
@@ -11,7 +11,7 @@ on:
- '**.md'
pull_request_target:
paths-ignore:
- - '.github/**'
+# temp remove to test workflow - '.github/**'
- '**.md'
workflow_dispatch:
inputs:
From 6904018585a081a9228b62640b7ed238e29099a2 Mon Sep 17 00:00:00 2001
From: Chris <15677803+c00ldude1oo@users.noreply.github.com>
Date: Mon, 16 May 2022 11:16:04 -0400
Subject: [PATCH 33/36] temp edit 2
---
.github/workflows/docker_dev.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/docker_dev.yml b/.github/workflows/docker_dev.yml
index 22af11b68..011a2d8cb 100644
--- a/.github/workflows/docker_dev.yml
+++ b/.github/workflows/docker_dev.yml
@@ -7,7 +7,7 @@ on:
push:
branches: [dev]
paths-ignore:
- - '.github/**'
+# temp - '.github/**'
- '**.md'
pull_request_target:
paths-ignore:
From 53ab06f97e5a0532fccd2391a1ea51892edc44c2 Mon Sep 17 00:00:00 2001
From: Chris <15677803+c00ldude1oo@users.noreply.github.com>
Date: Mon, 16 May 2022 11:20:34 -0400
Subject: [PATCH 34/36] Update docker_dev.yml
---
.github/workflows/docker_dev.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/docker_dev.yml b/.github/workflows/docker_dev.yml
index 011a2d8cb..235cbeff6 100644
--- a/.github/workflows/docker_dev.yml
+++ b/.github/workflows/docker_dev.yml
@@ -9,7 +9,7 @@ on:
paths-ignore:
# temp - '.github/**'
- '**.md'
- pull_request_target:
+ pull_request:
paths-ignore:
# temp remove to test workflow - '.github/**'
- '**.md'
From bd6edbbec69b7f79d74ae41090e15ea0ba7b14c3 Mon Sep 17 00:00:00 2001
From: Chris <15677803+c00ldude1oo@users.noreply.github.com>
Date: Mon, 16 May 2022 11:36:07 -0400
Subject: [PATCH 35/36] Reverting changes from c593334
Changing to back to how it was before c593334
---
.github/workflows/docker_dev.yml | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/.github/workflows/docker_dev.yml b/.github/workflows/docker_dev.yml
index 235cbeff6..529b1cab6 100644
--- a/.github/workflows/docker_dev.yml
+++ b/.github/workflows/docker_dev.yml
@@ -7,11 +7,11 @@ on:
push:
branches: [dev]
paths-ignore:
-# temp - '.github/**'
+ - '.github/**'
- '**.md'
pull_request:
paths-ignore:
-# temp remove to test workflow - '.github/**'
+ - '.github/**'
- '**.md'
workflow_dispatch:
inputs:
@@ -118,14 +118,8 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- - name: Check perms
- uses: actions-cool/check-user-permission@main
- id: checkUser
- with:
- require: 'write'
-
- name: Login to GHCR
- if: steps.checkUser.outputs.require-result == 'true'
+ if: github.event_name != 'pull_request'
uses: docker/login-action@v2
with:
registry: ghcr.io
@@ -137,6 +131,6 @@ jobs:
with:
platforms: linux/amd64,linux/arm64,linux/arm/v7
context: .
- push: ${{ steps.checkUser.outputs.require-result == 'true' }}
+ push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
From 6a90a124b36798443788cd8a67b2d06f6ac8c790 Mon Sep 17 00:00:00 2001
From: Chris <15677803+c00ldude1oo@users.noreply.github.com>
Date: Mon, 16 May 2022 11:37:53 -0400
Subject: [PATCH 36/36] Update docker.yml
---
.github/workflows/docker.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index cdc6f3b19..f44d4ef9b 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -114,6 +114,6 @@ jobs:
with:
platforms: linux/amd64,linux/arm64,linux/arm/v7
context: .
- push: ${{ github.event_name != 'pull_request' }}
+ push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}