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

Antti/frontend #27

Merged
merged 115 commits into from
Sep 2, 2024
Merged
Changes from 1 commit
Commits
Show all changes
115 commits
Select commit Hold shift + click to select a range
4e23abf
Changed interactive-widget value
anttiasmala Apr 27, 2024
97d4d06
Removed unnecessary lines and added a small circle placeholder for logo
anttiasmala Apr 27, 2024
712a95f
Added rounded value to input
anttiasmala Apr 27, 2024
5392df3
Added some color styling
anttiasmala Apr 27, 2024
7388ad7
Added rounding to the Button
anttiasmala Apr 27, 2024
1ad480d
Added a group value for password. Added text-center so registering te…
anttiasmala Apr 27, 2024
a1ad9ef
Merged main branch into antti/frontend
anttiasmala May 29, 2024
33197f4
Added logo with text and without text. Added the source of image into…
anttiasmala May 29, 2024
39b0c1c
Change blue circle to the logo. Added some logic to make image follow…
anttiasmala May 29, 2024
c2dbeda
Added password eye icon's default color to be white so it matches res…
anttiasmala May 29, 2024
cf0423b
Added select-none to make the logo feel like a 'real logo'
anttiasmala May 29, 2024
aeb9cd8
Changed Button.tsx's bg color to match greenish color style. Now the …
anttiasmala May 29, 2024
cc5aff8
Changed input's border color to be black
anttiasmala May 29, 2024
1787e32
changed interactive-widget in _app.tsx for now
anttiasmala May 30, 2024
a84b533
Created a page for logging out. Added some frontend code there. Feedb…
anttiasmala May 30, 2024
d9f428f
Changed receiver's and gift's input location
anttiasmala May 30, 2024
4a9daba
Added some styling to register page
anttiasmala May 30, 2024
815e8a9
Fixed 'No img element' error that Next.js gave. Reference: https://ne…
anttiasmala May 30, 2024
14e62f7
Created a component from Logo. Changed old logo styles to use the Log…
anttiasmala May 30, 2024
6dcb3a8
ESLint fixes
anttiasmala May 30, 2024
fb04e6d
Started to do feedback branch in this branch which is complitely wron…
anttiasmala Jun 6, 2024
e2f76ca
Revert "Started to do feedback branch in this branch which is complit…
anttiasmala Jun 6, 2024
1cf1e2a
Merged main branch into antti/frontend
anttiasmala Jun 13, 2024
763dc53
Deleted logo_with_text.png because of it does not have usage
anttiasmala Jun 13, 2024
d549a81
Changed logout buttons color and added some rounding to make it better
anttiasmala Jun 13, 2024
ef83d95
Added the colors that are used in this project into tailwind.config.t…
anttiasmala Jun 17, 2024
e629d7a
Created a new file utils/fonts.ts for fonts used at project
anttiasmala Jun 17, 2024
f8a22db
Created a new file components/Label.tsx. Label texts are used in mult…
anttiasmala Jun 17, 2024
351291b
Changed label elements to use Label components. Added some fonts and …
anttiasmala Jun 17, 2024
4b938d3
Label component is now label instead of input
anttiasmala Jun 17, 2024
b3f5d99
Changed border color, default background color and hover color to mat…
anttiasmala Jun 17, 2024
9271cab
Changed colors and added some coloring changes and some outlining cha…
anttiasmala Jun 17, 2024
6faccb5
Changed border color and hovering color in components/Input.tsx
anttiasmala Jun 17, 2024
acbfe17
Changed no account text a bit
anttiasmala Jun 19, 2024
e6c1db7
Added pb-1 into components/Label.tsx
anttiasmala Jun 20, 2024
83510ff
Removed pb-12 from Kirjaudu Sisään's text
anttiasmala Jun 20, 2024
648a19b
Changed page color in pages/register.tsx
anttiasmala Jun 20, 2024
46fdfd5
Changed _document.tsx body's color to bg-bgPage so that color does no…
anttiasmala Jun 20, 2024
0a7ba24
Removed bg-bgPage color fropm main element. Changed label elements to…
anttiasmala Jun 20, 2024
9b681f5
Copied Password styling from pages/login.tsx
anttiasmala Jun 20, 2024
89a4b9c
Added text-center attribute and lowered pt-6 to pt-3
anttiasmala Jun 20, 2024
68a04d3
Changed margin to padding. And lowered the value from 6 to 3 in login…
anttiasmala Jun 20, 2024
5886c2b
Changed pb-1 to pb-2 in Label.tsx
anttiasmala Jun 20, 2024
097a010
Added more styling changes into login.tsx
anttiasmala Jun 20, 2024
e9aaef5
Added libre_bodoni font and text-center style into TitleText element.…
anttiasmala Jun 20, 2024
79faa5f
Removed unnecessary className from TitleText component in pages/regis…
anttiasmala Jun 20, 2024
e036acf
ESLint fixes
anttiasmala Jun 21, 2024
566880e
Renamed icons' names
anttiasmala Jun 24, 2024
1f6cf56
Added pencil_edit.svg logo and created .tsx file of it
anttiasmala Jun 24, 2024
60a7533
Updated imports and mage svg files to tsx again
anttiasmala Jun 24, 2024
f5789bc
Added --ignore-existing to not overwrite already existing .tsx files.…
anttiasmala Jun 24, 2024
52f4ec6
Updated user icon to match that is in Figma
anttiasmala Jun 24, 2024
eab6968
Changed 'Lahjalistaidea' header-bar color and changed that the 'Lahja…
anttiasmala Jun 24, 2024
ee18821
Added a trash can svg and created .tsx file of it
anttiasmala Jun 24, 2024
224db31
Removed edit and delete buttons and added pencil icon for editing. Tr…
anttiasmala Jun 24, 2024
0636bdf
Did a lot of changes. Changed edit and delete buttons to be icons ins…
anttiasmala Jun 24, 2024
7adef3e
Removed div wrappers and added some line-through styling to show whic…
anttiasmala Jun 24, 2024
5cd3617
Changed trash can and pencil icons to be in same grid slot to make it…
anttiasmala Jun 24, 2024
5d43d54
Changed e.g. w-6 to width={24} etc, and re-styled the user icon at th…
anttiasmala Jun 24, 2024
fefdf1c
Added 'X-close' SVG image and created the .tsx file of it
anttiasmala Jun 24, 2024
868c1c6
Added some styling to EditModal and Modal. It is not finished yet
anttiasmala Jun 24, 2024
c38cb24
ESLint fixes
anttiasmala Jun 24, 2024
0fbc01f
Some more styling changes
anttiasmala Jun 25, 2024
aca6c0e
Changed ps-1 to pl-2 in components/Input.tsx
anttiasmala Jun 25, 2024
1209d46
Added some styling by adding mostly margins
anttiasmala Jun 25, 2024
3c0f13d
Changed text that is shown when deleting and changed gift's and recei…
anttiasmala Jun 25, 2024
f7f85c1
Changed pt to mt in components/TitleText.tsx
anttiasmala Jun 25, 2024
a0c4d77
Added a new colors value primaryText that should be used in most scen…
anttiasmala Jun 25, 2024
1ba43b8
Styling changes
anttiasmala Jun 28, 2024
d32b90b
Styling changes to components/DeleteModal.tsx to follow Figma
anttiasmala Jun 28, 2024
c7f5e2c
Changed login button's text and did some more styling changes in page…
anttiasmala Jun 28, 2024
92badcf
Added a className possibility to all of the elements in components/Lo…
anttiasmala Jun 28, 2024
914c3ea
Removed onHover styling. Should not be needed due to Inputs do have a…
anttiasmala Jun 28, 2024
23f36c5
Installed packages to new computer
anttiasmala Jul 8, 2024
777db0a
Finished register.tsx
anttiasmala Jul 8, 2024
683875e
Removed bg-orange-50 from rest of the files
anttiasmala Jul 8, 2024
2656813
Edited some styling in pages/index.tsx and in some components
anttiasmala Jul 8, 2024
bf3a3f4
ESLint fixes
anttiasmala Jul 8, 2024
ba05ad5
Created a CSS class to make password mask character a little bit bigg…
anttiasmala Jul 11, 2024
3ea6821
Changed the logout arrow icon to match the Figma's icon
anttiasmala Jul 11, 2024
c637a51
Changed background color to match Figma
anttiasmala Jul 11, 2024
fa23684
Changed text stroke width to be 0.2rem instead of 0.1
anttiasmala Jul 12, 2024
7dd1f5c
Added some changes to UserDetailModal
anttiasmala Jul 12, 2024
b8e95b3
Changed width of main wrapper. Changed some styling
anttiasmala Jul 12, 2024
b0a5e84
Changed w-72 to have max-w-72 so it can be smaller than that. Added p…
anttiasmala Jul 12, 2024
5c55f86
Changed paddings to margins and did small styling changes in pages/re…
anttiasmala Jul 12, 2024
6f055f0
Removed font-bold in components/EditModal.tsx
anttiasmala Jul 12, 2024
69379c8
Created a new div-wrapper to set max-width for form-element. Changed …
anttiasmala Jul 12, 2024
e0f36ab
Removed text-s text inside the classname of Button components
anttiasmala Jul 12, 2024
505ae90
Changed Lahjaideat's text size to a littlebit smaller. Changed text c…
anttiasmala Jul 12, 2024
4a5d035
Decided to change the stroke width to just use the Arial font. It sho…
anttiasmala Jul 15, 2024
d515cbb
Changed input-enlarge-mask-character-size CSS selector to input-enlar…
anttiasmala Jul 18, 2024
d9e15b6
Changed the text fonts and made texts a bit more light colored in pag…
anttiasmala Jul 22, 2024
9419c9e
Changed fonts in Label.tsx and register.tsx. Changed text as well a l…
anttiasmala Jul 22, 2024
86052d1
changed button sizes and text sizes in EditModal.tsx
anttiasmala Jul 22, 2024
ffb5921
ESLint fixes
anttiasmala Jul 22, 2024
283c8a4
When logging out now user will be redirected to the page where they c…
anttiasmala Jul 26, 2024
f9b4ebf
Removed the height styling from the main div-wrapper of user modal so…
anttiasmala Jul 26, 2024
2044134
ESLint fixes
anttiasmala Jul 26, 2024
640a986
Added tailwindcss plugin to .pretteirrc file so now it will make the …
anttiasmala Jul 26, 2024
811d25c
Ran npm run lint:fix command after adding the tailwindcss plugin into…
anttiasmala Jul 26, 2024
abe55fb
Changed Div-element to be the Button-element
anttiasmala Jul 31, 2024
f1fff85
Removed unnecessary hover:cursor-pointer attribute in className. Remo…
anttiasmala Jul 31, 2024
7118979
Ran tailwindcss prettier plugin
anttiasmala Aug 12, 2024
6d1d1f2
Updated small packages
anttiasmala Aug 23, 2024
ce492a1
Changed stroke to be currentColor instead of white color
anttiasmala Sep 1, 2024
fea8a04
Removed stroke-white value from className due to it has no usage
anttiasmala Sep 1, 2024
37d96cf
Deleted shared/isValidFunctions.ts file due to no usage
anttiasmala Sep 1, 2024
f67e457
Removed roboto_mono font, kept inter still due to it is used in two p…
anttiasmala Sep 2, 2024
fed9cc5
Changed default font to be Jost. Removed Jost fonts that are not need…
anttiasmala Sep 2, 2024
087bf01
Removed unused import
anttiasmala Sep 2, 2024
3176010
Deleted components/InfoModal.tsx, not in use
anttiasmala Sep 2, 2024
f91619a
Removed Inter font in /utils/font.ts. It is not in use anymore
anttiasmala Sep 2, 2024
25c2559
Updated eslint-config-next package and lowered typescript to version …
anttiasmala Sep 2, 2024
582ce72
Changed rest of the SVG images to have currentColor instead of some o…
anttiasmala Sep 2, 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
Prev Previous commit
Next Next commit
Changed text that is shown when deleting and changed gift's and recei…
…ver's position
anttiasmala committed Jun 25, 2024
commit 3c0f13d9b21b40233bc6ff50f166d1f37dbd5a2c
4 changes: 2 additions & 2 deletions components/DeleteModal.tsx
Original file line number Diff line number Diff line change
@@ -32,10 +32,10 @@ export function DeleteModal({
return (
<Modal>
<TitleText className="row-start-1 row-end-1 ps-5 font-bold">
Deleting:
Olet poistamassa lahjaa:
</TitleText>
<p className="row-start-2 row-end-2 ps-5 pt-5 text-lg w-full h-full font-bold [overflow-wrap:anywhere]">
{gift.receiver} - {gift.gift}
{gift.gift} - {gift.receiver}
</p>
<Button className="border border-yellow-500 mt-3 p-0 row-start-3 row-end-3 col-start-1 col-end-1 w-[66px] h-[66px]">
<SvgCheckMarkIcon