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.

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

Jump to bottom

Change password #130

Open
wants to merge 81 commits into
base: backend
Choose a base branch
from
Open

Change password #130

wants to merge 81 commits into from

Conversation

TheSugarAlien
Copy link

No description provided.

agradecki and others added 30 commits April 16, 2023 00:51
@agradecki
updated Button component
531ec9a
@agradecki
added Button stories
15562ae
@A-Wodnicki
Add MarkerHandler
8019987
@A-Wodnicki
Update MarkerHandler
5f9d209
@A-Wodnicki
Update MarkerHandler
7888b04
@martao02p
icon - prepare component
4bdf9e5
@martao02p
main work
886ed86
@martao02p
cleaning
167f54b
@martao02p
prettier -trailingComma rule
9ac1f21
@martao02p
main fix
0676407
@martao02p
test of emptiness
e110f48
@marcol13
Force workflows
47a7832
@marcol13
Merge branch 'frontend' into routePointsList
5c64046
@marcol13
Force workflows
e25c05d
@A-Wodnicki
Merge pull request #79 from akai-org/MarkerHandler
dc33562 
Marker handler
@marcol13
Adding to workflows workflow_dispatch trigger
0b462ad
@Fuligor
dispach ref
71d940e
@agradecki
fix prettier settings
3047b53
@agradecki
updated button component
bb260aa
@agradecki
Merge pull request #77 from akai-org/buttonStories
d31e98d 
Storybook: Button stories
@martao02p
Merge pull request #74 from akai-org/routePointsList
034b20a 
Route points list
@marcol13
Merge pull request #94 from akai-org/frontend
c23fa77 
Merge frontend to main
@Maksymilian-Plywaczyk
Update main.yml
62ef71e
@marcol13
Add figma tokens
30125dc
@marcol13
Add update-tokens workflow
1a81e85
@marcol13
Add salmon color
900feb0
@marcol13
Add workflow
be45a9c
@marcol13
Merge branch 'figma-tokens' of https://github.com/akai-org/planer-pod…
dda99d7 
…rozy into figma-tokens
@marcol13 @github-actions
chore: update css tokens
5516ae0
@marcol13
Add color from Communicates palette - error
6a7cbf2
marcol13 and others added 29 commits July 15, 2023 13:27
@marcol13 @github-actions
chore: update css tokens
7a19820
@marcol13
Fix old styles
98e88b6
@marcol13
Merge pull request #96 from akai-org/figma-tokens
40e5e39 
Add figma tokens
@marcol13
Add border-radius-sm
ec8afbd
@marcol13 @github-actions
chore: update css tokens
218a60a
@marcol13
Merge pull request #106 from akai-org/figma-tokens
4c48300 
Figma tokens
@PixelSculptor
create basic structure of form component
ac9524a
@PixelSculptor
fix storybook documentation
5d53d54
@PixelSculptor
create input form component styles, create mixin for flex positioning…
6f5dfdb 
… and function converter from px to rem units
@PixelSculptor
add styles for label and input. Add mixins for border and font config…
438ae2a 
…uration
@PixelSculptor
fix problem with lack of custom weight for Poppins font family
1a62887
@PixelSculptor
fix problem with border box for css containers
5f9c28a
@PixelSculptor
create mixin for custom outline add styles for input placeholder and …
b1ec34f 
…focus visible pseudoclass behaviour
@PixelSculptor
create dark variant
1fa322d
@PixelSculptor
create custom styles for range input
fdcfce8
@PixelSculptor
move support for input range to mixin
927236c
@PixelSculptor
create custom styles for radio button
8a18cd3
@PixelSculptor
add selector for checkbox input
649e455
@PixelSculptor
add comments to variable file and create short docummentation for For…
494dc50 
…mInput component
@PixelSculptor
run prettier and stylint to beautify code
38befe1
@PixelSculptor
run prettier and stylelint for mixins and funntions scss file
336e9bd
@PixelSculptor
run eslint for InputForm component files
c5bac74
@PixelSculptor
fix and delete some lines after code review
7d6524a
@PixelSculptor
Merge pull request #112 from akai-org/FormInputComponent
9157041 
Form input component
@marcol13
Add codeowners file
185baa6
@marcol13
Add comments
a463d7e
@marcol13
Merge pull request #116 from akai-org/codeowners
c919c96 
Codeowners
@marcol13
Merge pull request #117 from akai-org/frontend
82b44b4 
Frontend
@TheSugarAlien
Dodana funkcja change_password
b28c63a
@Maksymilian-Plywaczyk
Copy link
Contributor

Maksymilian-Plywaczyk commented Nov 28, 2023 •
edited
Loading

Odpowiadając na zamkniętego PR:

Aktualnie branch, na który wprowadzamy nowe zmiany to "backend", gdzie też nie będziesz musiał tworzyć lokalnie bazy danych poleceniem: models.Base.metadata.create_all(bind=engine) w pliku main.py, bo to nam załatwi już migracja podpięta pod branch "backend". Wystarczy wtedy działać sobie na dockerze, a cała baza zostanie uruchomiona poprzez naszą migracje. Jeśli będzie coś dla ciebie nie zrozumiałe, śmiało pisz pomogę :)

Dlatego też, twój commit aktualnie posiada te konflikty, najlepiej będzie jak stworzysz sobie nowego brancha, gdzie zaimplementujesz swoje rozwiązanie, ale bazowo kod będzie z brancha "backend", a nie z "main"

Jeśli masz również, jakieś wątpliwości co do tworzenia PR, branchy śmiało też pisz tutaj/discord pomożemy ;)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@TheSugarAlien @Maksymilian-Plywaczyk @agradecki @A-Wodnicki @martao02p @marcol13 @Fuligor @PixelSculptor