refactor: dashboard github

Mikilio · Jul 4, 2024 · e0b0f15 · e0b0f15
1 parent ce41176
commit e0b0f15
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 23 deletions.
diff --git a/ags/desktop/fullscreen/dashboard/home/GitHub.ts b/ags/desktop/fullscreen/dashboard/home/GitHub.ts
@@ -1,23 +1,21 @@
-import Gtk from 'gi:https://Gtk?version=3.0'
-
 import options from 'options'
 
-const contribData = Variable()
+const { Gtk } = imports.gi
+const contribData = Variable([])
 const contribCount = Variable(0)
-const { username } = options.dashboard.github
+const user = options.dashboard.githubUser
 
 Utils.execAsync([
- 'curl', `https://github-contributions.vercel.app/api/v1/${username.value}`.toLowerCase()
+ 'curl', `https://github-contributions.vercel.app/api/v1/${user.value}`
 ]).then(x => {
  const out = JSON.parse(x)
 
  const daysLeftInYear = 365 - Number(Utils.exec('date +%j'))
  contribData.value = out.contributions.slice(daysLeftInYear)
 
- // Count total contribs
- let _contribCount = 0
- out.years.forEach(y => _contribCount += y.total)
- contribCount.value = _contribCount
+ let count = 0
+ out.years.forEach(y => count += y.total)
+ contribCount.value = count
 }).catch(err => print(err))
 
 const ContribBox = (intensity = 0) => Widget.DrawingArea({
@@ -69,10 +67,9 @@ export default Widget.Box({
  vertical: true,
  className: 'github',
  visible: contribCount.bind(),
- children: [
- Widget.Label({
- className: 'header',
- label: Utils.merge([username.bind(), contribCount.bind()], (u, c) => ` ${u} | ${c} total lifetime contributions`)
- }), ContribGrid
- ]
-})
+}, Widget.Label({
+ className: 'header',
+ label: Utils.merge(
+ [user.bind(), contribCount.bind()],
+ (u, c) => ` ${u} | ${c} total lifetime contributions`)
+}), ContribGrid)
diff --git a/ags/desktop/fullscreen/dashboard/home/github.sass b/ags/desktop/fullscreen/dashboard/home/github.sass
@@ -18,8 +18,12 @@
  background-color: $primary-bg
  min-width: 0.8rem
 
-window#dashboard .dashboard .github
- .header
- color: $fg
- font-size: 1.25rem
- margin-bottom: $spacing
+window#dashboard .dashboard
+ .content .github
+ @include floating_widget
+ padding: 1rem
+ margin: 0
+ .header
+ color: $fg
+ font-size: 1.25rem
+ margin-bottom: $spacing
diff --git a/ags/options/windows/dashboard.ts b/ags/options/windows/dashboard.ts
@@ -1,7 +1,7 @@
 import { opt } from 'lib/option'
 
 export default {
- github: { username: opt('TheRiceCold') },
+ githubUser: opt('TheRiceCold'),
  photo: opt(`/home/${Utils.USER}/photo-sample.jpg`),
  tasks: { directory: opt(`/home/${Utils.USER}/tasks`) },
  bio: opt('~ What we do in life, echoes in eternity ~'),
@@ -37,5 +37,4 @@ export default {
  { label: 'Virtual Machine Manager', name: 'virt-manager' },
  ]
  ]),
-
 }