Skip to content

Dev #27

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.

Sign up for GitHub

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

Merged
Giacomo-Cattani merged 196 commits into from
May 8, 2024
Merged

Dev #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
196 commits
Select commit Hold shift + click to select a range
881add4
Added to setup MUI
FabioMusi04 Apr 23, 2024
359b8db
Fixed Navbar, improved homepage
FabioMusi04 Apr 23, 2024
3eb5f72
feat: remove unused files and modify navbar
Giacomo-Cattani Apr 24, 2024
913a66a
Setup Authentication Page
Apr 24, 2024
f5fc2de
feat: edited navbar textfield
Giacomo-Cattani Apr 24, 2024
fbb9a91
feat: complete navbar login/avatar (need to implement store for see i…
Giacomo-Cattani Apr 24, 2024
27285f8
Added Fav Page
Apr 24, 2024
b5a50d6
feat: UserStore implementation
Giacomo-Cattani Apr 24, 2024
5ef15c8
Merge branch 'feat/navbar' into dev
Giacomo-Cattani Apr 24, 2024
3423d32
Merge pull request #2 from Web-Rats/dev
Giacomo-Cattani Apr 24, 2024
f171989
Merge pull request #3 from Web-Rats/feat/navbar
Giacomo-Cattani Apr 24, 2024
4e59aaf
fix: adjustment navbar
Giacomo-Cattani Apr 24, 2024
c9a241c
Merge pull request #4 from Web-Rats/feat/navbar
Giacomo-Cattani Apr 24, 2024
0317194
fix: Navbar div backColor
Apr 24, 2024
22c880e
feat: add shadow in the navbar
Giacomo-Cattani Apr 24, 2024
67d5d79
fix: HomePage && added Weather page for specic page
Apr 24, 2024
049b0ee
feat: add images + modify metadata
Giacomo-Cattani Apr 24, 2024
fad6c33
fix: change size of divider
Giacomo-Cattani Apr 24, 2024
1dba74d
feat: add logo on hover show cursor
Giacomo-Cattani Apr 24, 2024
354df84
Merge pull request #7 from Web-Rats/dev
Giacomo-Cattani Apr 24, 2024
8aa0d51
Merge pull request #6 from Web-Rats/dev
Giacomo-Cattani Apr 24, 2024
abab780
Merge pull request #5 from Web-Rats/dev
Giacomo-Cattani Apr 24, 2024
90da1c5
fix: show box for only profile logged in
Giacomo-Cattani Apr 24, 2024
78f604c
fix: navbar
Giacomo-Cattani Apr 24, 2024
4166214
fix: navbar
Giacomo-Cattani Apr 24, 2024
a8434ca
fix: navbar
Giacomo-Cattani Apr 24, 2024
6374fc8
Setup HomePage
FabioMusi04 Apr 25, 2024
8cc7f8a
feat: added current Pos && added lastCitiesSearched in the store
Apr 26, 2024
393f8a1
fix: various changes
Giacomo-Cattani Apr 26, 2024
c62d46d
feat: add icons and changes on card
Giacomo-Cattani Apr 26, 2024
e607528
feat: adjust left card, now display icon of weather, and display in t…
Giacomo-Cattani Apr 26, 2024
a13ca59
feat: navbar search city autocomplete && city database
FabioMusi04 Apr 27, 2024
dc6e486
feat: added setup onsubmitSearchCity
FabioMusi04 Apr 28, 2024
2aab5b4
Fix: City information display, error handling
FabioMusi04 Apr 28, 2024
9ad775c
Merge branch 'feat/HomePage' into dev
FabioMusi04 Apr 28, 2024
36c5c2b
fix: icon user not merged correctly, now fixed
FabioMusi04 Apr 28, 2024
f5403be
Merge pull request #8 from Web-Rats/feat/AuthPage
FabioMusi04 Apr 29, 2024
a111881
Feat: Auth password toggle visibility, fix: homepage position display…
FabioMusi04 Apr 29, 2024
3ef2c17
Fix: toggle register password/confirmpassword visibility
FabioMusi04 Apr 29, 2024
ec239b0
Merge branch 'feat/FavPage' into feat/WeatherCityPage
Giacomo-Cattani Apr 29, 2024
cb96e53
Merge pull request #9 from Web-Rats/feat/WeatherCityPage
Giacomo-Cattani Apr 29, 2024
5bbbf88
feat: add a new page for the left card
Giacomo-Cattani Apr 29, 2024
1a9eca2
feat: add LeftCard page
Giacomo-Cattani Apr 29, 2024
4d59175
Merge branch 'dev' into feat/WeatherCityPage
Giacomo-Cattani Apr 29, 2024
cd0ad2e
Merge pull request #11 from Web-Rats/feat/WeatherCityPage
Giacomo-Cattani Apr 29, 2024
45a7381
setup alert && added in auth page
FabioMusi04 Apr 29, 2024
84056fd
Update main.tsx
Giacomo-Cattani Apr 29, 2024
7639d83
feat: add LeftCard component
Giacomo-Cattani Apr 29, 2024
105f7d9
Merge branch 'dev' into feat/FavPage
Giacomo-Cattani Apr 29, 2024
32e2c7b
Delete LeftCard.tsx
Giacomo-Cattani Apr 29, 2024
ac6cb3e
fix
Giacomo-Cattani Apr 29, 2024
583d502
fix
Giacomo-Cattani Apr 29, 2024
fafac36
fix
Giacomo-Cattani Apr 29, 2024
d579870
Merge pull request #13 from Web-Rats/feat/WeatherCityPage
Giacomo-Cattani Apr 29, 2024
18abbed
feat:changes page
Giacomo-Cattani Apr 29, 2024
83bdd0d
Merge branch 'feat/WeatherCityPage' into dev
Giacomo-Cattani Apr 29, 2024
4969624
Merge branch 'feat/FavPage' into dev
Giacomo-Cattani Apr 29, 2024
80e82b9
Merge branch 'dev' of https://github.com/Web-Rats/FrontEnd into dev
Giacomo-Cattani Apr 29, 2024
9365d79
fix
Giacomo-Cattani Apr 29, 2024
da38535
Merge branch 'feat/FavPage' into dev
Giacomo-Cattani Apr 29, 2024
ee72463
Create AuthenticationPage.tsx
Giacomo-Cattani Apr 29, 2024
07f2eba
Merge branch 'dev' into feat/CustomAlert
Giacomo-Cattani Apr 29, 2024
a4b51e7
Merge pull request #14 from Web-Rats/feat/CustomAlert
FabioMusi04 Apr 29, 2024
a5a7f4e
feat: start the profilePage
Giacomo-Cattani Apr 29, 2024
3e99077
Setup profile Page with alert, changepassword, and change avatar comp…
FabioMusi04 Apr 29, 2024
4bc1ddb
Fix: responsive
Apr 30, 2024
2e0ffbb
Added Routing
Apr 30, 2024
9e82dc7
Routing && axios config
Apr 30, 2024
3e55b67
Added countrycode
Apr 30, 2024
657c241
feat: adjust homepage ,navbar, footer
Giacomo-Cattani Apr 30, 2024
5f527f0
fix: adjust padding size
Giacomo-Cattani Apr 30, 2024
398813e
Merge pull request #15 from Web-Rats/feat/HomePage2
Giacomo-Cattani Apr 30, 2024
df9c8b1
feat: profile update
Giacomo-Cattani Apr 30, 2024
b7099d4
Merge pull request #16 from Web-Rats/feat/ProfilePage
Giacomo-Cattani Apr 30, 2024
967e3b1
feat: profile card style
Giacomo-Cattani Apr 30, 2024
4f48b65
Merge pull request #17 from Web-Rats/feat/ProfilePage2
Giacomo-Cattani Apr 30, 2024
64939a2
fix: import
Giacomo-Cattani Apr 30, 2024
aa3863d
fix: padding
Giacomo-Cattani Apr 30, 2024
1ad35f0
fix: styling left card
Giacomo-Cattani Apr 30, 2024
6e4e0e4
Merge branch 'feat/FavPage' into dev
Giacomo-Cattani Apr 30, 2024
ea1e0e7
Merge pull request #18 from Web-Rats/dev
Giacomo-Cattani Apr 30, 2024
fae30c4
fix: import page
Giacomo-Cattani Apr 30, 2024
05be8e2
fix: Favourite Page
Giacomo-Cattani Apr 30, 2024
62c398d
fix: sixing
Giacomo-Cattani Apr 30, 2024
dfb6989
Merge pull request #19 from Web-Rats/dev
Giacomo-Cattani Apr 30, 2024
1319972
fix: fixing favourites page
Giacomo-Cattani Apr 30, 2024
2205db1
Fixed profile page image (to be able to update it) component
FabioMusi04 Apr 30, 2024
1fd62de
fix: some paddings, and general style of the favourite page
Giacomo-Cattani May 1, 2024
37ab869
Merge pull request #20 from Web-Rats/feat/FavPage
Giacomo-Cattani May 1, 2024
cab5182
fix: various sixing of left card and favourites cards
Giacomo-Cattani May 1, 2024
000b87a
remove favourites in store (just commented)
FabioMusi04 May 1, 2024
d3ec320
Merge branch 'dev' into feat/Routing
Giacomo-Cattani May 2, 2024
90a9457
Merge pull request #21 from Web-Rats/feat/Routing
Giacomo-Cattani May 2, 2024
b1beb56
fix: chanfes package.json
Giacomo-Cattani May 2, 2024
816850b
fix: routing not complete
Giacomo-Cattani May 2, 2024
ba09ac4
changed menu icon avatar colors
FabioMusi04 May 2, 2024
bec11df
feat: add current temp
Giacomo-Cattani May 2, 2024
87a8dc2
fix
Giacomo-Cattani May 2, 2024
3d075d7
fix
Giacomo-Cattani May 2, 2024
d291297
fix
Giacomo-Cattani May 2, 2024
65e74e7
fix
Giacomo-Cattani May 2, 2024
504c961
Added auth system
May 2, 2024
d8644dc
feat: import react-avatar-editor and start to implement crop image fo…
Giacomo-Cattani May 2, 2024
e0b9cff
feat: make profile picture picker
Giacomo-Cattani May 2, 2024
cf57fa9
fix: some changes
Giacomo-Cattani May 2, 2024
4f449ac
fix: display current temperature
Giacomo-Cattani May 3, 2024
03e5c39
feat:complete persistent storage
Giacomo-Cattani May 3, 2024
df58c73
Added Login logic with store data && fixed store creation
FabioMusi04 May 3, 2024
f6daea5
Merge branch 'dev' into feat/AuthSystem
FabioMusi04 May 3, 2024
932efbe
Merge pull request #22 from Web-Rats/feat/AuthSystem
FabioMusi04 May 3, 2024
14c5eaa
fixed store
FabioMusi04 May 3, 2024
8375f3c
feat: implement temporarily logout page (at least for testing)
Giacomo-Cattani May 3, 2024
5cc7cb8
feat: is possible to search a city and be redirected to the rigth pag…
Giacomo-Cattani May 3, 2024
17a01f0
added secure store with aes crypt
FabioMusi04 May 4, 2024
1174cbb
fix: currentPos bug axios call
May 6, 2024
b422d68
fix: axios homePage error calling
May 6, 2024
4556a60
Merge pull request #23 from Web-Rats/feat/SecureStoreCrypt
FabioMusi04 May 6, 2024
9c9a5d5
fixed cropping image tool
May 6, 2024
993ca23
feat: change version
Giacomo-Cattani May 6, 2024
25439aa
feat: change version
Giacomo-Cattani May 6, 2024
109eba5
fix: store secure
May 6, 2024
7c675bb
Merge branch 'dev' of https://github.com/Web-Rats/FrontEnd into dev
May 6, 2024
2740199
fix: change password popup
May 6, 2024
6675bde
fix: navbar search state
May 6, 2024
61baa80
feat: add loading spinners
Giacomo-Cattani May 6, 2024
1ec7d75
Merge branch 'dev' of https://github.com/Web-Rats/FrontEnd into dev
Giacomo-Cattani May 6, 2024
c7481a4
feat: adjust search bar windows
Giacomo-Cattani May 6, 2024
8df1911
fix: if city has same name
Giacomo-Cattani May 6, 2024
c4a53dc
fix: setoptions city for array
Giacomo-Cattani May 6, 2024
4faf9b7
fix: added country code and search feature
May 6, 2024
5642f7d
feat: store
Giacomo-Cattani May 6, 2024
441f5d2
fix: routing
May 6, 2024
bf78289
Merge branch 'dev' of https://github.com/Web-Rats/FrontEnd into dev
May 6, 2024
ba1964f
Merge branch 'dev' into feat/FunctionSearchWeatherCity
Giacomo-Cattani May 6, 2024
85e7840
Merge pull request #24 from Web-Rats/feat/FunctionSearchWeatherCity
Giacomo-Cattani May 6, 2024
2568f14
Added charts
May 7, 2024
ee375be
fixed authentication
May 7, 2024
e35898c
fix: navbar fix + store fix
Giacomo-Cattani May 7, 2024
a011bb8
Merge branch 'dev' of https://github.com/Web-Rats/FrontEnd into dev
Giacomo-Cattani May 7, 2024
4e8eb29
fix: Fixed a bug where if you register a new account it doesn't take …
Giacomo-Cattani May 7, 2024
0de42a7
feat: removed iso 3166
Giacomo-Cattani May 7, 2024
c7bb6f7
fix: searching city
May 7, 2024
19a1f3a
feat: try to fix
Giacomo-Cattani May 7, 2024
133ec21
fix: home page api call temp
FabioMusi04 May 7, 2024
897a8dc
fix: fix a bug where if you search for a city named different it does…
Giacomo-Cattani May 7, 2024
61fd7b6
Merge pull request #25 from Web-Rats/EditWeatherCityPage
Giacomo-Cattani May 7, 2024
61a0087
added axios connection to profile info
FabioMusi04 May 7, 2024
bd49b48
Merge branch 'dev' of https://github.com/Web-Rats/FrontEnd into dev
FabioMusi04 May 7, 2024
a60d646
fix: fix a bug where the add last searched not working
Giacomo-Cattani May 7, 2024
d825483
fix: fix a bug where in latest searched is added duplicate object
Giacomo-Cattani May 7, 2024
907b203
feat: finish to implement addlastsearched and modify view of that cards
Giacomo-Cattani May 7, 2024
da8c9c6
feat: start to implement add favourites
Giacomo-Cattani May 7, 2024
9afc476
weather city page connected data with backend (some of leftcard data)
May 8, 2024
d216796
fix: change login size
Giacomo-Cattani May 8, 2024
4054524
added bakcend connection, to fix fav
May 8, 2024
1d16da4
Merge branch 'dev' of https://github.com/Web-Rats/FrontEnd into dev
May 8, 2024
dfbe8bb
fix: favourites hearthe problem
May 8, 2024
7c1061c
fix: hearth color
May 8, 2024
43ddf2c
fix: fix styling of favourties pages
Giacomo-Cattani May 8, 2024
153f14f
fix: fix a bug where the heart is colored red when it need to be gray
Giacomo-Cattani May 8, 2024
c4cce8f
to fix: toggle hearth icon in favourites page
May 8, 2024
61d760d
Merge branch 'dev' of https://github.com/Web-Rats/FrontEnd into dev
May 8, 2024
7e4023f
favouties page (to fix: duplication on reset)
May 8, 2024
d1e1f33
fix: fix a bug where the heart animated icon is always false when ope…
Giacomo-Cattani May 8, 2024
ce5d255
Merge branch 'dev' of https://github.com/Web-Rats/FrontEnd into dev
Giacomo-Cattani May 8, 2024
da4e1a6
feat: adjust the sixing of leftcard
Giacomo-Cattani May 8, 2024
c6ca7ea
fix: favouritesPage render 1 time
May 8, 2024
b680bae
Merge branch 'dev' of https://github.com/Web-Rats/FrontEnd into dev
May 8, 2024
a8352dd
fix: fix the bug in the FavouritesPage.tsx file
May 8, 2024
4fc88b6
Merge branch 'dev' of https://github.com/Web-Rats/FrontEnd into dev
May 8, 2024
f8fb779
fix: redirect fav
May 8, 2024
df437bc
fix: fabio ho ragione io
Giacomo-Cattani May 8, 2024
ca62980
fix: fix temperature of lastsearched with the correct one
Giacomo-Cattani May 8, 2024
4fdfe1b
feat: add snow icons
Giacomo-Cattani May 8, 2024
74e809b
Fix: started icons dynamic
May 8, 2024
6c7cb18
fix: status weather on cities info
May 8, 2024
823200f
fix: img access
May 8, 2024
948dcc3
fix: added week weather
May 8, 2024
c04c855
temp changes
Giacomo-Cattani May 8, 2024
d6b7039
Merge branch 'dev' of https://github.com/Web-Rats/FrontEnd into dev
Giacomo-Cattani May 8, 2024
d68fbad
feat: complete weather types and weather names
Giacomo-Cattani May 8, 2024
dcf0fdd
feat: modify icons
Giacomo-Cattani May 8, 2024
9687168
fix image
May 8, 2024
9062c49
fix: sizing
Giacomo-Cattani May 8, 2024
9bca433
fix: fixed a bug where you can't insert into DB / display in FrontEnd…
Giacomo-Cattani May 8, 2024
b1dcdaf
fix: sizing of left card for mobile
Giacomo-Cattani May 8, 2024
f245806
fix: fix other sizing
Giacomo-Cattani May 8, 2024
0241e8a
Merge branch 'dev' into feat/Charts
Giacomo-Cattani May 8, 2024
afb8bb5
Merge pull request #26 from Web-Rats/feat/Charts
Giacomo-Cattani May 8, 2024
ba0b7fd
feat: graphs
May 8, 2024
a320cb7
Merge branch 'dev' of https://github.com/Web-Rats/FrontEnd into dev
May 8, 2024
cc74e0e
fix: import merge bug
May 8, 2024
8087480
fix: rm graphcisty duplicated
May 8, 2024
9dfb1e3
fix: unique data weather
May 8, 2024
ff9b03a
fix: sizing
Giacomo-Cattani May 8, 2024
12e589e
fix: remove all console.log useless and adjust logout page
Giacomo-Cattani May 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
6 changes: 6 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ dist
dist-ssr
*.local

/BackEnd
./BackEnd
BackEnd/
./BackEnd/
.BackEnd/

# Editor directories and files
.vscode/*
!.vscode/extensions.json
Expand Down
29 changes: 18 additions & 11 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Vite + React + TS</title>
</head>
<body>
<div id="root"></div>
<script type="module" src="/src/main.tsx"></script>
</body>
</html>

<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/weatherLogo.png" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Weather App</title>
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Inter:wght@100..900&display=swap" rel="stylesheet">
</head>


<body>
<div id="root"></div>
<script type="module" src="/src/main.tsx"></script>
</body>

</html>
Loading