Skip to content

Commit

Permalink
Disabled legacy routes, and set store as /
Browse files Browse the repository at this point in the history
  • Loading branch information
@DarkBrines
DarkBrines committed Nov 27, 2024
1 parent 1c687be commit 4fb171c
Show file tree
Hide file tree
Showing 11 changed files with 104 additions and 127 deletions.
13 changes: 7 additions & 6 deletions resources/js/home.js
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
textPresentation = document.querySelector('.presentation');
// UNUSED LEGACY CODE
// textPresentation = document.querySelector('.presentation');

window.addEventListener('load', (e) => {
// window.addEventListener('load', (e) => {

setTimeout(() => {
// setTimeout(() => {

textPresentation.classList.add('visible');
// textPresentation.classList.add('visible');

}, 100)
// }, 100)


})
// })
70 changes: 29 additions & 41 deletions resources/scss/layout/_header.scss
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,6 @@
/* header */

body{
&[path="/"]{
.header{
color: white;

> .logo {
filter: brightness(0) invert(1); // logo blanc
}
}
}
}

.header{
.header {
padding: 50px 7%;
display: flex;
justify-content: space-between;
Expand All @@ -25,7 +13,7 @@ body{
left: 0;
right: 0;

> .toggle-nav-btn {
>.toggle-nav-btn {
// transform: translateY(-300%);
background: none;
border: none;
Expand All @@ -34,19 +22,19 @@ body{
cursor: pointer;
transition: all $transition-duration ease;
z-index: 1;

&.active {
color: white;
}

/*
&.visible {
transform: translate(0);
}
*/
}

> .logo {
>.logo {
font-size: 33px;
font-weight: bold;
text-transform: uppercase;
Expand All @@ -64,29 +52,29 @@ body{
*/
}

> .nav {
>.nav {
display: none;
transition: all $transition-duration ease;

> .nav-list {
>.nav-list {
display: flex;
justify-content: center;
align-items: center;
flex-wrap: wrap;

> .nav-item {
>.nav-item {
padding: 0 .8rem;

&.lang-select-wrapper {
position: relative;
display: flex;
align-items: center;

> #lang-current{
>#lang-current {
cursor: pointer;
}
> #lang-select {

>#lang-select {
position: absolute;
display: none;
border-radius: 0.2rem;
Expand All @@ -96,14 +84,14 @@ body{
z-index: 2;
margin: -10%;
margin-top: 100%;

&.open {
display: block;
}
}
}

> .nav-link {
>.nav-link {
text-decoration: none;
color: inherit;
text-transform: uppercase;
Expand All @@ -118,29 +106,29 @@ body{
}
}

&:not(.top){
&:not(.top) {
background-color: white;

&:not(.mobile_menu_active){
&:not(.mobile_menu_active) {
padding-top: 12px;
padding-bottom: 12px;
color: black;
> .logo {

>.logo {
height: 40px;
filter: none; // logo vert
}

> .nav{
ul{
> li{
>.nav {
ul {
>li {
color: black;
}
}
}
}
}

&:after{
&:after {
content: "";
position: absolute;
bottom: 0;
Expand All @@ -150,18 +138,18 @@ body{
height: 1px;
}

> nav{
>nav {
&.nav {
> .nav-list {
> .nav-item {
> #lang-select {
>.nav-list {
>.nav-item {
>#lang-select {
background: rgba(0, 0, 0, 0.3);
}
}
}
}

option{
option {
color: black;
}
}
Expand Down Expand Up @@ -195,8 +183,8 @@ body{
height: 100vh;
background: black;

select{
> option{
select {
>option {
color: black;
}
}
Expand Down
14 changes: 3 additions & 11 deletions resources/views/base/header.edge
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,12 @@

<nav class="nav">
<ul class="nav-list">
<li class="nav-item"><a class="nav-link" href="/about">{{ t("ui.header.about")
}}</a></li>
<li class="nav-item"><a class="nav-link" href="/contribute">{{
t("ui.header.contribute") }}</a>
<li class="nav-item"><a class="nav-link" href="https://paxo.fr">Site principal</a></li>
<li class="nav-item"><a class="nav-link" href="https://github.com/paxo-phone" target="_blank">GitHub</a>
</li>
<li class="nav-item"><a class="nav-link" href="https://discord.gg/84Qsp6tUSK" target="_blank">{{
t("ui.header.discord") }}</a></li>
<li class="nav-item"><a class="nav-link" href="/tutorials">{{ t("ui.header.tutorials") }}</a></li>
<li class="nav-item"><a class="nav-link" href="/store">Store</a></li>
<li class="nav-item"><a class="nav-link" href="/press">{{ t("ui.header.press") }}</a></li>
<li class="nav-item"><a class="nav-link" href="/contact">{{ t("ui.header.contact") }}</a></li>
<li class="nav-item"><a class="nav-link"
href="https://tribee.fr/cagnotte/01H7DFJGAQHNWSH4SC77A9X2ZV/participation" target="_blank">{{
t("ui.header.donations") }}</a></li>
<li class="nav-item"><a class="nav-link" href="https://docs.paxo.fr">{{ t("ui.header.tutorials") }}</a></li>
<li class="nav-item lang-select-wrapper">
<div id="lang-current" href="#">
<span class="fi fi-{{ flags[i18n.locale] }}" aria-label="{{ t(`ui.languages.${i18n.locale}`) }}"></span>
Expand Down
4 changes: 0 additions & 4 deletions resources/views/base/main.edge
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@
@!section('content')
</main>
<footer style="min-height: 140px;">
<p class="text-center">
{{ t("ui.footer.contributions") }} <a style="color: white; text-decoration: underline;" href="/contributors">{{
t("ui.footer.link_text")}}</a>
</p>
<div class="social">
<ul>
<li><a href="https://github.com/paxo-phone"><i class="fa-brands fa-square-github"></i></a></li>
Expand Down
10 changes: 5 additions & 5 deletions resources/views/store/app.edge
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,21 +63,21 @@
<tr>
<td>{{release.name}}</td>
<td>
<a href="/store/app/{{app.id}}/download?r={{release.id}}">Télécharger</a>
<a href="/store/app/{{app.id}}/source?r={{release.id}}">Voir source</a>
<a href="/app/{{app.id}}/download?r={{release.id}}">Télécharger</a>
<a href="/app/{{app.id}}/source?r={{release.id}}">Voir source</a>
@if(release.changelog)
<a href="/store/app/{{app.id}}/changelog/{{release.id}}">Changelog</a>
<a href="/app/{{app.id}}/changelog/{{release.id}}">Changelog</a>
@end
</td>
</tr>
@end
</table>

<div class="flex justify-center">
<a href="/store/app/{{app.id}}/manage" class="btn btn-submit">
<a href="/app/{{app.id}}/manage" class="btn btn-submit">
Modifier
</a>
<a href="/store/app/{{app.id}}/releases/manage" class="btn btn-submit" style="margin-left: 10px;">
<a href="/app/{{app.id}}/releases/manage" class="btn btn-submit" style="margin-left: 10px;">
Gérer les versions
</a>
</div>
Expand Down
4 changes: 2 additions & 2 deletions resources/views/store/myapps.edge
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Mes Applications
</h1>
<br>
<a href="/store/new" class="btn btn-submit">Publier</a>
<a href="/new" class="btn btn-submit">Publier</a>
<br>
<h1 style="color:dimgrey;">
Vos applications
Expand All @@ -12,7 +12,7 @@

<div class="flex-container" style="display: flex; flex-wrap: wrap; justify-content: space-around; max-width: 70%;">
@each(app in apps)
<div onclick="window.location.href = '/store/app/{{ app.id }}/manage';" class="Group12" style="width: 274px; height: 75px; display: flex; margin: 10px;">
<div onclick="window.location.href = '/app/{{ app.id }}/manage';" class="Group12" style="width: 274px; height: 75px; display: flex; margin: 10px;">
<div class="img" style="width: 75px; height: 75px; background: #f4f4f4; border-radius: 20px;">
<img src="{{ app.image ?? '/img/logo.png'}}" style="width: 100%; height: 100%; object-fit: cover; border-radius: 20px;">
</div>
Expand Down
8 changes: 4 additions & 4 deletions resources/views/store/myreleases.edge
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Versions de {{app.name}}
</h1>
<br>
<a href="/store/app/{{app.id}}/releases/new" class="btn btn-submit">Nouvelle version</a>
<a href="/app/{{app.id}}/releases/new" class="btn btn-submit">Nouvelle version</a>
<br>

<table style="border: 1px solid gray;">
Expand All @@ -15,10 +15,10 @@
<tr>
<td>{{release.name}}</td>
<td>
<a href="/store/app/{{app.id}}/download?r={{release.id}}">Télécharger</a>
<a href="/store/app/{{app.id}}/source?r={{release.id}}">Voir source</a>
<a href="/app/{{app.id}}/download?r={{release.id}}">Télécharger</a>
<a href="/app/{{app.id}}/source?r={{release.id}}">Voir source</a>
@if(release.changelog)
<a href="/store/app/{{app.id}}/changelog/{{release.id}}">Changelog</a>
<a href="/app/{{app.id}}/changelog/{{release.id}}">Changelog</a>
@end
</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/store/new.edge
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Poster une nouvelle app
</h1>

<form method="POST" action="/store/new">
<form method="POST" action="/new">
<input type="text" name="name" placeholder="Nom de l'Application" required />
<input type="text" name="desc" placeholder="Description" required />
<input type="text" name="source" placeholder="Lien vers le code source" required />
Expand Down
2 changes: 1 addition & 1 deletion resources/views/store/store.edge
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<div class="flex-container" style="display: flex; flex-wrap: wrap; justify-content: space-around; max-width: 70%;">
@each(app in pager)
<div onclick="window.location.href = '/store/app/{{ app.id }}';" class="Group12" style="width: 274px; height: 75px; display: flex; margin: 10px;">
<div onclick="window.location.href = '/app/{{ app.id }}';" class="Group12" style="width: 274px; height: 75px; display: flex; margin: 10px;">
<div class="img" style="width: 75px; height: 75px; background: #f4f4f4; border-radius: 20px;">
<img src="{{ app.image ?? '/img/logo.png'}}" style="width: 100%; height: 100%; object-fit: cover; border-radius: 20px;">
</div>
Expand Down
18 changes: 9 additions & 9 deletions resources/views/store/store_container.edge
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@ Store
<div
style="width: 200px; flex-direction: column; justify-content: center; align-items: flex-start; gap: 15px; display: inline-flex">
<div style="color: #828282; font-size: 25px;">Catégories</div>
<a href="/store/" style="color: #837979; font-size: 20px;">Toutes</a>
<a href="/store/?type=0" style="color: #382222; font-size: 20px;">Productivité</a>
<a href="/store/?type=1" style="color: #382222; font-size: 20px;">Utilitaires</a>
<a href="/store/?type=2" style="color: #382222; font-size: 20px;">Communication</a>
<a href="/store/?type=3" style="color: #382222; font-size: 20px;">Jeux</a>
<a href="/store/?type=4" style="color: #382222; font-size: 20px;">Multimédia</a>
<a href="/store/?type=5" style="color: #382222; font-size: 20px;">Autres</a>
<a href="/" style="color: #837979; font-size: 20px;">Toutes</a>
<a href="/?type=0" style="color: #382222; font-size: 20px;">Productivité</a>
<a href="/?type=1" style="color: #382222; font-size: 20px;">Utilitaires</a>
<a href="/?type=2" style="color: #382222; font-size: 20px;">Communication</a>
<a href="/?type=3" style="color: #382222; font-size: 20px;">Jeux</a>
<a href="/?type=4" style="color: #382222; font-size: 20px;">Multimédia</a>
<a href="/?type=5" style="color: #382222; font-size: 20px;">Autres</a>

@if (user)
<a href="/dash" style="color: #828282; font-size: 25px; margin-top: 20px;">Mon Compte</a>
<!-- <a href="/store/mypaxo" style="color: #382222; font-size: 20px;">Mon Appareil</a> -->
<a href="/store/myapps" style="color: #382222; font-size: 20px;">Mes Applications</a>
<!-- <a href="/mypaxo" style="color: #382222; font-size: 20px;">Mon Appareil</a> -->
<a href="/myapps" style="color: #382222; font-size: 20px;">Mes Applications</a>
@else
<a href="/auth/login" style="color: #828282; font-size: 25px; margin-top: 20px;">Connexion</a>
@end
Expand Down
Loading

0 comments on commit 4fb171c

Please sign in to comment.