fix: fixed styling, added proper icon (from media submodule), remove …

…unused src/index.html
ActivityWatch · Dec 3, 2023 · f76280f · f76280f
1 parent eb07bd2
commit f76280f
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 27 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,6 +12,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: "recursive"
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:
@@ -29,6 +31,8 @@ jobs:
       image: mcr.microsoft.com/playwright:v1.40.0-jammy
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: "recursive"
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:

diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "public/media"]
+	path = public/media
+	url = https://github.com/ActivityWatch/media.git
diff --git a/index.html b/index.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
+    <title>ActivityWatch Subscription</title>
+    <link rel="icon" href="/media/logo/logo.ico">
     <meta charset="UTF-8">
-    <link rel="icon" href="/favicon.ico">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>ActivityWatch</title>
   </head>
-  <body>
+  <body class="dark:bg-gray-900 dark:text-gray-100">
     <div id="app"></div>
     <script type="module" src="/src/main.ts"></script>
   </body>

diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/media b/public/media
diff --git a/src/App.vue b/src/App.vue
@@ -4,13 +4,12 @@ import MenuBar from './components/MenuBar.vue'
 </script>
 
 <template lang="pug">
-div(class="dark:bg-gray-900 dark:text-gray-100")
-  div.max-w-5xl.mx-auto.h-screen.flex.flex-col
-    header
-        MenuBar
-    main.px-4
-        RouterView
-    div.flex-grow
-    footer.text-center.p-4.text-gray-400.pt-8.text-sm
-        p Website operated by #[a.link(href="https://superuserlabs.org") Superuser Labs]
+div.max-w-5xl.mx-auto.flex.flex-col
+  header
+      MenuBar
+  main.px-4
+      RouterView
+  div.flex-grow
+  footer.text-center.p-4.text-gray-400.pt-8.text-sm
+      p Website operated by #[a.link(href="https://superuserlabs.org") Superuser Labs]
 </template>
diff --git a/src/index.html b/src/index.html