Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove bootstrap & jquery deps + Refactor app files & config #154

Merged
merged 59 commits into from
Nov 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
8999ad0
Remove bootstrap package
matiboux Nov 6, 2024
9bca6b8
Remove bootstrap imports
matiboux Nov 6, 2024
62c1121
Update layout props
matiboux Nov 6, 2024
59bcb30
Refactor default layout
matiboux Nov 6, 2024
b1ec861
Move CSS style in default layout & components
matiboux Nov 6, 2024
2cbd2fa
Refactor global layout style
matiboux Nov 6, 2024
690a333
Enable tailwind preflight base styles
matiboux Nov 6, 2024
40d3dbe
Customize tailwind screens & container
matiboux Nov 6, 2024
b7ccc04
Use custom CSS & JS for navbar
matiboux Nov 7, 2024
6e38972
Add newsline carousel style
matiboux Nov 7, 2024
94bbe9c
Refactor newsline toggle
matiboux Nov 7, 2024
3b7efc9
Add script to detect document scrollbar & its width
matiboux Nov 7, 2024
27aa9cb
Add style & script for modal
matiboux Nov 7, 2024
dcd7112
Update modal content
matiboux Nov 7, 2024
033b9a7
Move layout script in body-height.ts
matiboux Nov 7, 2024
87b0426
Move script in invalid-links.js
matiboux Nov 7, 2024
2b9e283
Fix navbar dropdown caret style
matiboux Nov 7, 2024
a100e25
Use Astro to set active navbar items
matiboux Nov 7, 2024
e5b6563
Fix navbar dropdown toggle caret style
matiboux Nov 7, 2024
63d813b
Move script in standalone-app.ts
matiboux Nov 7, 2024
97a84b2
Disable gtag & analytics code
matiboux Nov 7, 2024
b5c39c3
Move script in carousel.ts
matiboux Nov 7, 2024
b962286
Remove smallscreen script
matiboux Nov 7, 2024
2670652
Replace smallscreen style
matiboux Nov 7, 2024
1246447
Refactor layout styles
matiboux Nov 7, 2024
b336f10
Update modal styles
matiboux Nov 7, 2024
096ff52
Update layout styles
matiboux Nov 7, 2024
3bde423
Fix image in about page
matiboux Nov 7, 2024
ece34aa
Update about page styles
matiboux Nov 7, 2024
916b05d
Fix link in about page
matiboux Nov 7, 2024
c1619d9
Move global content styles
matiboux Nov 7, 2024
7ee5f2d
Move app icon assets
matiboux Nov 7, 2024
c171ea9
Fix layout styles
matiboux Nov 7, 2024
fa37cbb
Set favicon
matiboux Nov 7, 2024
40dfda6
Set favicon in site config
matiboux Nov 7, 2024
868da3a
Update epita tile image in epidocs links
matiboux Nov 7, 2024
d004112
Fix layout max width
matiboux Nov 7, 2024
e5db8cf
Move btn styles
matiboux Nov 7, 2024
5f9a54e
Update margins in about page
matiboux Nov 7, 2024
7d26a5b
Update footer styles
matiboux Nov 7, 2024
ebb282c
Update footer padding
matiboux Nov 7, 2024
d300b07
Update btn primary colors
matiboux Nov 7, 2024
5c60164
Disable script
matiboux Nov 7, 2024
b21f395
Remove popper js import
matiboux Nov 7, 2024
82036f2
Remove jquery import
matiboux Nov 7, 2024
4e0448f
Remove @popperjs/core package
matiboux Nov 7, 2024
ba93979
Remove jquery package
matiboux Nov 7, 2024
0adda3d
Install @iconify-json/mdi
matiboux Nov 7, 2024
e6cc993
Update packages
matiboux Nov 7, 2024
c4c20bb
Update modal close icon
matiboux Nov 7, 2024
300e78d
Update navbar toggler icon
matiboux Nov 7, 2024
34b44ee
Update container fluid styles
matiboux Nov 7, 2024
91ad238
Update click event handlers
matiboux Nov 7, 2024
98a0b10
Group some navbar items in dropdown
matiboux Nov 7, 2024
7d5ea29
Unpack navbar year group items
matiboux Nov 8, 2024
28769d6
Add navbar-sm screen
matiboux Nov 8, 2024
0b6361b
Fix navbar unpack styles
matiboux Nov 8, 2024
25848e6
Add navbar screens & Update navbar layout
matiboux Nov 8, 2024
7038568
Fix installed prettier package version
matiboux Nov 8, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,103 changes: 860 additions & 243 deletions app/app/package-lock.json

Large diffs are not rendered by default.

26 changes: 12 additions & 14 deletions app/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,21 @@
},
"homepage": "https://github.com/matiboux/matiboux.me#readme",
"dependencies": {
"@astrojs/check": "^0.5.8",
"@astrojs/tailwind": "^5.1.0",
"@fontsource/roboto": "^5.0.12",
"@iconify-json/fa-brands": "^1.1.8",
"@iconify-json/fa6-solid": "^1.1.20",
"@iconify/tailwind": "^0.1.4",
"@popperjs/core": "^2.11.8",
"astro": "^4.16.9",
"bootstrap": "^4.6.2",
"jquery": "^3.7.1",
"@astrojs/check": "^0.9.4",
"@astrojs/tailwind": "^5.1.2",
"@fontsource/roboto": "^5.1.0",
"@iconify-json/fa-brands": "^1.2.0",
"@iconify-json/fa6-solid": "^1.2.1",
"@iconify-json/mdi": "^1.2.1",
"@iconify/tailwind": "^1.1.3",
"astro": "^4.16.10",
"js-yaml": "^4.1.0",
"sass": "^1.71.1",
"tailwindcss": "^3.4.1",
"typescript": "^5.4.2"
"sass": "^1.80.6",
"tailwindcss": "^3.4.14",
"typescript": "^5.6.3"
},
"devDependencies": {
"@types/js-yaml": "^4.0.9",
"@types/node": "^20.11.26"
"@types/node": "^20.14.8"
}
}
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
56 changes: 56 additions & 0 deletions app/app/src/components/Footer.astro
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
---
import { githubRepositoryUrl } from '~/config'
---

<div id="footer" class="footer">
<div class="container-fluid">
<p>
Made with <span class="icon icon-[fa6-solid--heart] icon-fw icon-red"></span> by EPITA students.
<a href={`${githubRepositoryUrl}#license`}>
<img alt="CC BY-NC 4.0" src="https://mirrors.creativecommons.org/presskit/buttons/80x15/svg/by-nc.svg" />
</a> <br />
We use cookies for analytics purposes.
</p>
<ul>
<li><a href={githubRepositoryUrl} class="btn btn-primary btn-sm">Contribuez sur Github</a></li>
<li><a href="https://epidocs.eu/" class="btn btn-info btn-sm">Géré par Epidocs</a></li>
<!-- <li><a href="/tos" class="btn btn-primary btn-sm">Conditions générales</a></li> -->
</ul>
</div>
</div>

<style lang="scss">
.footer {
@apply flex-shrink-0 bg-black bg-opacity-10 pt-6 pb-8;

> .container-fluid {
@apply w-full max-w-screen-lg mx-auto px-4;
}

.icon-red {
@apply text-red-600;
}

p {
@apply mb-2;

img {
@apply inline-block h-4;
}
}

ul {
li {
@apply inline-block;

+ li {
@apply ml-1;

&::before {
@apply content-["|"] mr-2;
}
}
}
}
}
</style>
9 changes: 9 additions & 0 deletions app/app/src/components/Head.astro
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
import { build } from '~/config'
---

<link rel="icon" sizes="48x48" href={`/assets/icon-48.png?v=${build}`} />
<link rel="icon" sizes="192x192" href={`/assets/icon-192.png?v=${build}`} />
<link rel="icon" sizes="512x512" href={`/assets/icon-512.png?v=${build}`} />
<link rel="apple-touch-icon" href={`/assets/apple-icon.png?v=${build}`} />
<link rel="manifest" href="/manifest.json" />
118 changes: 118 additions & 0 deletions app/app/src/components/Modal.astro
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
---
---

<div id="warn-invalid-modal" class="modal">
<div class="modal-wrapper">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">
<span class="icon icon-[fa6-solid--triangle-exclamation] icon-fw"></span>
The link to <b id="warn-invalid-brand"></b> is invalid
</h5>
<button type="button" class="modal-close" data-dismiss="modal">
<span class="icon icon-[mdi--times] icon-fw"></span>
</button>
</div>
<div class="modal-body">
<p>Beware! This link has been tagged as invalid. This could mean:</p>
<ul>
<li>the link is dead or broken</li>
<li>the link has been taken over</li>
<li>the link points to now irrelevant information</li>
</ul>
<p>Do you really want to continue to <code id="warn-invalid-href"></code>?</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">
Close
</button>
<a href="#" id="warn-invalid-link" class="btn btn-primary" target="_blank">
Yes, continue anyway
</a>
</div>
</div>
</div>
</div>

<style lang="scss">
:global(body):has(.modal.show) {
@apply overflow-hidden;

&:global(.has-scrollbar) {
&, .modal {
padding-right: var(--scrollbar-width, 0);
}
}
}

.modal {
@apply fixed inset-0 hidden z-[1050] overflow-hidden;
@apply bg-black bg-opacity-50;
@apply w-full h-full outline-none;

&.show {
@apply block;
}

.modal-wrapper {
@apply relative;
@apply m-2 sm:mx-auto sm:my-6;
@apply w-auto max-w-screen-md;
@apply pointer-events-none;
}

.modal-content {
@apply relative flex flex-col w-full;
@apply bg-white bg-clip-padding;
@apply border border-black border-opacity-20 rounded-md;
@apply pointer-events-auto outline-0 overflow-hidden;

.modal-header {
@apply flex items-start justify-between p-4 font-medium;
@apply border-b border-black border-opacity-10;

.modal-close {
@apply -m-4 p-4;
}
}

.modal-title {
@apply m-0 text-xl;
}

.modal-body {
@apply relative flex-1 basis-auto p-4;
}

.modal-footer {
@apply flex flex-wrap items-center justify-end p-3;
@apply border-t border-black border-opacity-10;

> * {
@apply m-1;
}
}
}
}

.modal-header {
@apply text-black;
}

.modal-body {
@apply text-gray-800;
}
</style>

<script lang="ts">
const modalDismissers = document.querySelectorAll('.modal [data-dismiss="modal"]')
for (const modalDismisser of modalDismissers)
{
modalDismisser.addEventListener('click', (event) =>
{
event.preventDefault()
const modal = modalDismisser.closest('.modal')
modal.classList.toggle('show')
})
}
</script>
Loading