-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
24446bf
commit 32701d4
Showing
20 changed files
with
251 additions
and
182 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| /** @type {import("prettier").Config} */ | ||
| export default { | ||
| plugins: ["prettier-plugin-astro"], | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,22 @@ | ||
| import { defineConfig } from 'astro/config'; | ||
| import remarkGfm from 'remark-gfm'; | ||
| import Icons from 'unplugin-icons/vite'; | ||
| import sitemap from '@astrojs/sitemap'; | ||
| import { defineConfig } from "astro/config"; | ||
| import remarkGfm from "remark-gfm"; | ||
| import Icons from "unplugin-icons/vite"; | ||
| import sitemap from "@astrojs/sitemap"; | ||
|
|
||
| import alpinejs from "@astrojs/alpinejs"; | ||
|
|
||
| // https://astro.build/config | ||
| export default defineConfig({ | ||
| site: 'https://bjerk.io', | ||
| site: "https://bjerk.io", | ||
| vite: { | ||
| plugins: [Icons({ | ||
| compiler: 'astro' | ||
| })] | ||
| plugins: [ | ||
| Icons({ | ||
| compiler: "astro", | ||
| }), | ||
| ], | ||
| }, | ||
| markdown: { | ||
| remarkPlugins: [remarkGfm] | ||
| remarkPlugins: [remarkGfm], | ||
| }, | ||
| integrations: [sitemap(), alpinejs()] | ||
| }); | ||
| integrations: [sitemap(), alpinejs()], | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,6 @@ | |
| "type": "module", | ||
| "version": "0.0.3", | ||
| "packageManager": "[email protected]", | ||
| "prettier": "@simenandre/prettier", | ||
| "scripts": { | ||
| "format": "biome format ./ --write && prettier --write src/content", | ||
| "format:prettier": "prettier --write .", | ||
|
|
@@ -33,10 +32,11 @@ | |
| "@biomejs/biome": "^1.4.0", | ||
| "@iconify-json/ph": "^1.1.6", | ||
| "@iconify-json/tabler": "^1.1.103", | ||
| "prettier-plugin-astro": "^0.14.1", | ||
| "@simenandre/prettier": "^5.0.0", | ||
| "commit-and-tag-version": "^12.4.2", | ||
| "prettier": "^3.0.3", | ||
| "schema-dts": "^1.1.2", | ||
| "vitest": "^0.34.6" | ||
| } | ||
| } | ||
| } | ||
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,65 +1,65 @@ | ||
| import { beforeEach, describe, expect, it, vi } from 'vitest'; | ||
| import { formatDate, formatDateRange } from '../utils'; | ||
| import { beforeEach, describe, expect, it, vi } from "vitest"; | ||
| import { formatDate, formatDateRange } from "../utils"; | ||
|
|
||
| describe('formatDate', () => { | ||
| describe("formatDate", () => { | ||
| beforeEach(() => { | ||
| vi.useFakeTimers({ | ||
| now: new Date('2023-11-14 11:00'), | ||
| now: new Date("2023-11-14 11:00"), | ||
| }); | ||
| }); | ||
| it('should format date', () => { | ||
| expect(formatDate(new Date('2023-11-14 11:00'))).toBe( | ||
| 'tirsdag 14. november kl. 11.00', | ||
| it("should format date", () => { | ||
| expect(formatDate(new Date("2023-11-14 11:00"))).toBe( | ||
| "tirsdag 14. november kl. 11.00", | ||
| ); | ||
|
|
||
| expect(formatDate(new Date('2024-11-14 11:00'))).toBe( | ||
| 'torsdag 14. november 2024 kl. 11.00', | ||
| expect(formatDate(new Date("2024-11-14 11:00"))).toBe( | ||
| "torsdag 14. november 2024 kl. 11.00", | ||
| ); | ||
|
|
||
| expect(formatDate(new Date('2023-11-14'), false)).toBe( | ||
| 'tirsdag 14. november', | ||
| expect(formatDate(new Date("2023-11-14"), false)).toBe( | ||
| "tirsdag 14. november", | ||
| ); | ||
| }); | ||
|
|
||
| it('should format date range', () => { | ||
| it("should format date range", () => { | ||
| expect( | ||
| formatDateRange( | ||
| new Date('2023-11-14 11:00'), | ||
| new Date('2023-11-14 14:00'), | ||
| new Date("2023-11-14 11:00"), | ||
| new Date("2023-11-14 14:00"), | ||
| ), | ||
| ).toStrictEqual({ | ||
| dateFrom: 'tirsdag 14. november kl. 11.00', | ||
| dateTo: '14.00', | ||
| dateFrom: "tirsdag 14. november kl. 11.00", | ||
| dateTo: "14.00", | ||
| }); | ||
|
|
||
| expect( | ||
| formatDateRange( | ||
| new Date('2023-11-14 11:00'), | ||
| new Date('2023-11-15 14:00'), | ||
| new Date("2023-11-14 11:00"), | ||
| new Date("2023-11-15 14:00"), | ||
| ), | ||
| ).toStrictEqual({ | ||
| dateFrom: 'tirsdag 14. november kl. 11.00', | ||
| dateTo: 'onsdag 15. november kl. 14.00', | ||
| dateFrom: "tirsdag 14. november kl. 11.00", | ||
| dateTo: "onsdag 15. november kl. 14.00", | ||
| }); | ||
|
|
||
| expect( | ||
| formatDateRange( | ||
| new Date('2023-11-14 11:00'), | ||
| new Date('2024-11-15 14:00'), | ||
| new Date("2023-11-14 11:00"), | ||
| new Date("2024-11-15 14:00"), | ||
| ), | ||
| ).toStrictEqual({ | ||
| dateFrom: 'tirsdag 14. november 2023 kl. 11.00', | ||
| dateTo: 'fredag 15. november 2024 kl. 14.00', | ||
| dateFrom: "tirsdag 14. november 2023 kl. 11.00", | ||
| dateTo: "fredag 15. november 2024 kl. 14.00", | ||
| }); | ||
|
|
||
| expect( | ||
| formatDateRange( | ||
| new Date('2024-11-14 11:00'), | ||
| new Date('2024-11-15 14:00'), | ||
| new Date("2024-11-14 11:00"), | ||
| new Date("2024-11-15 14:00"), | ||
| ), | ||
| ).toStrictEqual({ | ||
| dateFrom: 'torsdag 14. november kl. 11.00', | ||
| dateTo: 'fredag 15. november 2024 kl. 14.00', | ||
| dateFrom: "torsdag 14. november kl. 11.00", | ||
| dateTo: "fredag 15. november 2024 kl. 14.00", | ||
| }); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,42 @@ | ||
| --- | ||
| import Logo from "./logo.astro"; | ||
| import DiscordIcon from "~icons/ph/discord-logo-fill"; | ||
| import Logo from "../components/logo-symbol.astro"; | ||
| import GitHubIcon from "~icons/ph/github-logo-fill"; | ||
| import LinkedInIcon from "~icons/ph/linkedin-logo-fill"; | ||
| --- | ||
|
|
||
| <footer> | ||
| <div class="container"> | ||
| <section class="about"> | ||
| <p>Vi vil være med å lage en verden hvor folk kan gjøre mer av det de er gode på, og hvor teknologien tar seg av resten. Vi skaper digitale løsninger som forbedre og forenkle måten mennesker lærer, tenker, jobber og kommuniserer på.</p> | ||
| </section> | ||
| <section class="contact"> | ||
| <p> | ||
| Arbins gate 11 | ||
| <br> | ||
| 0253 Oslo | ||
| </p> | ||
| <p> | ||
| <a href="mailto:[email protected]"> | ||
| [email protected] | ||
| </a> | ||
| <br> | ||
| <a href="tel:+4722120512">+47 22 12 05 12</a> | ||
| </p> | ||
| <div class="socials"> | ||
| <div class="footer-content"> | ||
| <section aria-labelledby="footer-about" class="about"> | ||
| <h2 id="footer-about" class="sr-only">Om Bjerk</h2> | ||
| <p>Vi vil være med å lage en verden hvor folk kan gjøre mer av det de er gode på, og hvor teknologien tar seg av resten. Vi skaper digitale løsninger som forbedre og forenkle måten mennesker lærer, tenker, jobber og kommuniserer på.</p> | ||
|
|
||
| <div class="footer-logo" aria-hidden="true"> | ||
| <Logo /> | ||
| </div> | ||
| </section> | ||
| <nav> | ||
| <ul> | ||
| <li><a href="/om-oss">Om oss →</a></li> | ||
| <li><a href="/arbeider">Arbeider →</a></li> | ||
| <li><a href="/vare-losning">Våre løsninger →</a></li> | ||
| <li><a href="/kunnskap">Kunnskap →</a></li> | ||
| <li><a href="/kontakt-oss">Kontakt oss →</a></li> | ||
| </ul> | ||
| </nav> | ||
| <section class="contact"> | ||
| <p> | ||
| Arbins gate 11 | ||
| <br> | ||
| 0253 Oslo | ||
| </p> | ||
| <p> | ||
| <a href="mailto:[email protected]"> | ||
| [email protected] | ||
| </a> | ||
| <br> | ||
| <a href="tel:+4722120512">+47 22 12 05 12</a> | ||
| </p> | ||
| <div class="socials"> | ||
| <a | ||
| aria-label="GitHub-profile for Bjerk" | ||
| href="https://github.com/bjerkio" | ||
|
|
@@ -35,33 +48,43 @@ import LinkedInIcon from "~icons/ph/linkedin-logo-fill"; | |
| href="https://www.linkedin.com/company/bjerk" | ||
| > | ||
| <LinkedInIcon /> | ||
| </a> | ||
| </div> | ||
| </a> | ||
| </div> | ||
| </section> | ||
| <!-- <ul class="links"> --> | ||
| <!-- <li><a href="/vilkar">Vilkår</a></li> --> | ||
| <!-- <li><a href="/personvern">Personvernerklæring</a></li> --> | ||
| <!-- </ul> --> | ||
| </div> | ||
|
|
||
| <!-- <ul class="links"> --> | ||
| <!-- <li><a href="/vilkar">Vilkår</a></li> --> | ||
| <!-- <li><a href="/personvern">Personvernerklæring</a></li> --> | ||
| <!-- </ul> --> | ||
| </footer> | ||
|
|
||
| <style> | ||
| section.about { | ||
| &> p { | ||
| section.about { | ||
| display: flex; | ||
| flex-direction: column; | ||
| gap: 2rem; | ||
|
|
||
| & > p { | ||
| max-width: 40ch; | ||
| } | ||
| } | ||
|
|
||
| .container { | ||
| width: var(--container-width); | ||
| .footer-logo > svg { | ||
| height: 100px; | ||
| } | ||
|
|
||
| footer { | ||
| padding-inline: 2rem; | ||
| margin-inline: auto; | ||
| padding-block: 4rem; | ||
|
|
||
| display: flex; | ||
| justify-content: space-between; | ||
| align-items: flex-start; | ||
| flex-wrap: wrap; | ||
| gap: 2rem; | ||
| } | ||
|
|
||
| .contact p:first-child { | ||
| margin-top: 1.2rem; | ||
| max-width: 30ch; | ||
|
|
||
Oops, something went wrong.