Skip to content

Commit

Permalink
Nouveau design : page "Votes" (#24)
Browse files Browse the repository at this point in the history
* 🐛 Fix Logo path inside README.md (#21)

* 💄 Reduce default line height

* 💄 Welcome : add margin top to start button

* 💄 Improve Result layout : add container to image, avoid having the name overlapped with other elements

* 🐛 💄 SharePopup : fix & improve rendering

* 💄 🚧 Implements new Votes page & Card component layouts (WIP)

* 💄 🚧 Improve header layout (WIP)

* 💄 Implements new Votes page background

* 💄 Implements card reverse layout (WIP)

* 💄 Add font-size clamp & rules, improves Votes page & Card component responsive layout

* 💄 Update theme colors & Navbar bg color

* 🍱 Votes : replace passer action icon

* 💄 Votes : improve ribbons container responsive dimensions

* 💄 Card : improve buttons height

* 💫 Votes : add hover animation to passer button

* 💫 Votes : improve CardSwiper grab animation (scale action buttons, update anim vars)

* Nouveau design : navs (#25)

* 💄 Improve BottomNav responsive layout, update icons

* 💄 🚧 Move ThemeSwitcher inside About page (WIP, need to update switch style)

* Nouveau design : dark theme (#26)

* 🎨 💄 Refacto & improve theme colors

* 💄 Update logo text vote color on theme switch

* 💄 ThemeSwitcher : convert px dimensions to rem

* 💬 About : update theme switch label

* Nouveau design : Mes votes (#27)

* 💄 Update Card user vote display layout

* 💄 Update Card user vote toggle layout

* 🍱 Update cross icon (for better scale with other svgs)

* 💄 MesVotes : add title

* Nouveau design : edits variés (#28)

* 💄 Update CardSwiper ribbon colors

* 🎨 Move some CSS custom properties to appropriate files (and remove the useless ones)

* 💄 Update html default font weight

* 🔧 Update MUI typography config

* 🔥 Remove useless theme gray color

* 💄 Card : Move list-style disc inside subtitle text
  • Loading branch information
Striffly authored Jun 26, 2024
1 parent b11937a commit eceec35
Show file tree
Hide file tree
Showing 38 changed files with 939 additions and 395 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# VoteFinder

![Logo](frontend/src/icons/logo.svg)
![Logo](frontend/src/assets/icons/logo.svg)

Une application web de statistiques sur les votes de l'assemblée nationale pour aider à choisir son candidat.

Expand Down
4 changes: 3 additions & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
"dependencies": {
"@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.5",
"@fontsource/roboto": "^5.0.13",
"@fontsource/manrope": "^5.0.20",
"@fontsource/poppins": "^5.0.14",
"@gsap/react": "^2.1.1",
"@mui/icons-material": "^5.15.20",
"@mui/material": "^5.15.20",
"eslint-config-prettier": "^9.1.0",
Expand Down
16 changes: 9 additions & 7 deletions frontend/src/App.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import "./assets/styles/index.scss";
import "@fontsource/roboto/300.css";
import "@fontsource/roboto/400.css";
import "@fontsource/roboto/700.css";
import "@fontsource/poppins/500-italic.css";
import "@fontsource/poppins/700-italic.css";
import "@fontsource/poppins/800-italic.css";
import "@fontsource/manrope/600.css";
import "@fontsource/manrope/800.css";

import { useState } from "react";
import ConfettiExplosion from "react-confetti-explosion";
Expand Down Expand Up @@ -94,10 +96,10 @@ function App() {
)}
{started ? (
<>
<Votes visible={tab == 0} />
<Resultats visible={tab == 1} />
<MesVotes visible={tab == 2} />
<About visible={tab == 3} />
<Votes visible={tab === 0} />
<Resultats visible={tab === 1} />
<MesVotes visible={tab === 2} />
<About visible={tab === 3} />
</>
) : (
<Welcome />
Expand Down
36 changes: 0 additions & 36 deletions frontend/src/assets/icons/contre.svg

This file was deleted.

3 changes: 3 additions & 0 deletions frontend/src/assets/icons/cross.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit eceec35

Please sign in to comment.