Merge pull request '1.1.0' (#2) from dev into main

Reviewed-on: #2

CHANGELOG.md

@@ -5,9 +5,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [1.0.0] - 2025-04-11
+## [1.1.0] - 2025-04-17
-
 ### Added
-- Add versioning
+- Added Fontawesome icons to menu items
-- Add setup instructions for local development
+- Added new `isHomepage` TypeScript method for later use
-- Add badges
+- Added introduction text to the Home Page
+
+### Changed
+- Changed utility classes to include `!important` tag in order to correctly override default Forgejo styling
+
+## [1.0.0] - 2025-04-11
+### Added
+- Added versioning
+- Added setup instructions for local development
+- Added badges

README.md

@@ -2,7 +2,7 @@
 
 <div>
 <!-- Version Badge -->
-<img src="https://img.shields.io/badge/Version-1.0.0-blue" alt="Version 1.0.0">
+<img src="https://img.shields.io/badge/Version-1.1.0-blue" alt="Version 1.1.0">
 <!-- License Badge -->
 <img src="https://img.shields.io/badge/License-GPL--3.0--or--later-34ad9b" alt="License GPL--3.0--or--later">
 </div>

package.json

@@ -22,6 +22,6 @@
         "webpack": "^5.99.5",
         "webpack-cli": "^6.0.1"
     },
-    "version": "1.0.0",
+    "version": "1.1.0",
     "license": "GPL-3.0-or-later"
 }

src/js/Functions/isHomepage.ts

@@ -0,0 +1,4 @@
+export default function isHomepage(): Boolean
+{
+    return window.location.pathname === '/';
+}

src/js/loom.ts

@@ -1 +1,7 @@
-console.log('Welcome to Loom Forge!');
+import isHomepage from './Functions/isHomepage';
+
+document.addEventListener('DOMContentLoaded', () => {
+     if (isHomepage()) {
+         // Open for changes
+     }
+});

src/scss/_config.scss

@@ -1,4 +1,4 @@
-$spacingLevels: 8;
+$spacingLevels: 12;
 $fontSizeIncrement: 0.125rem;
 $fontSizeBase: 1rem;
 $fontLevels: 20;

src/scss/core/_spacing.scss

@@ -1,27 +1,27 @@
 @mixin marginClasses($i, $calc) {
     &-m {
         &-#{$i} {
-            margin: $calc;
+            margin: $calc !important;
         }
         &x-#{$i} {
-            margin-left: $calc;
+            margin-left: $calc !important;
-            margin-right: $calc;
+            margin-right: $calc !important;
         }
         &y-#{$i} {
-            margin-top: $calc;
+            margin-top: $calc !important;
-            margin-bottom: $calc;
+            margin-bottom: $calc !important;
         }
         &t-#{$i} {
-            margin-top: $calc;
+            margin-top: $calc !important;
         }
         &b-#{$i} {
-            margin-bottom: $calc;
+            margin-bottom: $calc !important;
         }
         &l-#{$i} {
-            margin-left: $calc;
+            margin-left: $calc !important;
         }
         &r-#{$i} {
-            margin-right: $calc;
+            margin-right: $calc !important;
         }
     }
 }
@@ -29,27 +29,27 @@
 @mixin paddingClasses($i, $calc) {
     &-p {
         &-#{$i} {
-            padding: $calc;
+            padding: $calc !important;
         }
         &x-#{$i} {
-            padding-left: $calc;
+            padding-left: $calc !important;
-            padding-right: $calc;
+            padding-right: $calc !important;
         }
         &y-#{$i} {
-            padding-top: $calc;
+            padding-top: $calc !important;
-            padding-bottom: $calc;
+            padding-bottom: $calc !important;
         }
         &t-#{$i} {
-            padding-top: $calc;
+            padding-top: $calc !important;
         }
         &b-#{$i} {
-            padding-bottom: $calc;
+            padding-bottom: $calc !important;
         }
         &l-#{$i} {
-            padding-left: $calc;
+            padding-left: $calc !important;
         }
         &r-#{$i} {
-            padding-right: $calc;
+            padding-right: $calc !important;
         }
     }
 }

templates/base/footer.tmpl

@@ -13,6 +13,7 @@
 
 	{{template "base/footer_content" .}}
 
+    <script src="https://kit.fontawesome.com/46e4b2c245.js" crossorigin="anonymous"></script>
 	<script src="{{AssetUrlPrefix}}/js/index.js?v={{AssetVersion}}" onerror="alert('{{ctx.Locale.Tr "alert.asset_load_failed"}}'.replace('{path}', this.src))"></script>
 	<script src="/assets/js/loomScripts.js"></script>
 

templates/base/head_navbar.tmpl

@@ -28,21 +28,39 @@
 			{{/* No links */}}
 		{{else if .IsSigned}}
 			{{if not .UnitIssuesGlobalDisabled}}
-				<a class="item{{if .PageIsIssues}} active{{end}}" href="{{AppSubUrl}}/issues">{{ctx.Locale.Tr "issues"}}</a>
+				<a class="item{{if .PageIsIssues}} active{{end}}" href="{{AppSubUrl}}/issues">
+				    <i class="fa-solid fa-circle-exclamation" style="color: #cc7373; margin-right: .5rem"></i>
+				    {{ctx.Locale.Tr "issues"}}
+				</a>
 			{{end}}
 			{{if not .UnitPullsGlobalDisabled}}
-				<a class="item{{if .PageIsPulls}} active{{end}}" href="{{AppSubUrl}}/pulls">{{ctx.Locale.Tr "pull_requests"}}</a>
+				<a class="item{{if .PageIsPulls}} active{{end}}" href="{{AppSubUrl}}/pulls">
+				    <i class="fa-solid fa-code-pull-request" style="color: #94ccbe; margin-right: .5rem"></i>
+				    {{ctx.Locale.Tr "pull_requests"}}
+                </a>
 			{{end}}
 			{{if not (and .UnitIssuesGlobalDisabled .UnitPullsGlobalDisabled)}}
 				{{if .ShowMilestonesDashboardPage}}
-					<a class="item{{if .PageIsMilestonesDashboard}} active{{end}}" href="{{AppSubUrl}}/milestones">{{ctx.Locale.Tr "milestones"}}</a>
+					<a class="item{{if .PageIsMilestonesDashboard}} active{{end}}" href="{{AppSubUrl}}/milestones">
+					   <i class="fa-solid fa-sign-post" style="margin-right: .5rem; color: #d7d496;"></i>
+					   {{ctx.Locale.Tr "milestones"}}
+                    </a>
 				{{end}}
 			{{end}}
-			<a class="item{{if .PageIsExplore}} active{{end}}" href="{{AppSubUrl}}/explore/repos">{{ctx.Locale.Tr "explore"}}</a>
+			<a class="item{{if .PageIsExplore}} active{{end}}" href="{{AppSubUrl}}/explore/repos">
+                <i class="fa-solid fa-binoculars" style="color: #777dff; margin-right: .5rem"></i>
+                {{ctx.Locale.Tr "explore"}}
+            </a>
 		{{else if .IsLandingPageOrganizations}}
-			<a class="item{{if .PageIsExplore}} active{{end}}" href="{{AppSubUrl}}/explore/organizations">{{ctx.Locale.Tr "explore"}}</a>
+			<a class="item{{if .PageIsExplore}} active{{end}}" href="{{AppSubUrl}}/explore/organizations">
+                <i class="fa-solid fa-binoculars" style="color: #777dff; margin-right: .5rem"></i>
+                {{ctx.Locale.Tr "explore"}}
+			</a>
 		{{else}}
-			<a class="item{{if .PageIsExplore}} active{{end}}" href="{{AppSubUrl}}/explore/repos">{{ctx.Locale.Tr "explore"}}</a>
+			<a class="item{{if .PageIsExplore}} active{{end}}" href="{{AppSubUrl}}/explore/repos">
+                <i class="fa-solid fa-binoculars" style="color: #777dff; margin-right: .5rem"></i>
+                {{ctx.Locale.Tr "explore"}}
+			</a>
 		{{end}}
 
 		{{template "custom/extra_links" .}}

templates/home.tmpl

@@ -1,10 +1,14 @@
 {{template "base/head" .}}
 <div role="main" aria-label="Welcome" class="page-content home">
-	<div class="center">
+	<div class="center loom-mt-10">
 		<div>
 			<h1 class="tw-font-bold loom-text-size-16l">
 				Loom Forge
 			</h1>
+			<p class="loom-my-3 loom-px-4" style="max-width: 600px; margin: 0 auto;">
+                Home to all the open-source software and packages maintained by <a href="/Danny">@Danny</a> and released under the
+                <a href="/LoomLabs">@LoomLabs</a> handle.
+			</p>
 		</div>
 	</div>
 </div>