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

Schedule Card Component #444

Merged
merged 27 commits into from
Jan 22, 2025
Merged
Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
db793d3
added schedule card files
lovretomic Dec 18, 2024
127ed5a
added base content
lovretomic Dec 18, 2024
e44312c
added star label
lovretomic Dec 18, 2024
8a62b43
added date formatter
lovretomic Dec 18, 2024
7ef4f73
time styles
lovretomic Dec 18, 2024
86840c9
added tag styles
lovretomic Dec 18, 2024
83988b0
added dotted break
lovretomic Dec 18, 2024
daf5f9b
added event description
lovretomic Dec 18, 2024
0728e9d
added requirements section
lovretomic Dec 18, 2024
61ebf90
Merge branch 'main' into lovretomic/schedule-card
lovretomic Jan 7, 2025
f9349a5
added speaker content
lovretomic Jan 7, 2025
7ddae63
added styles
lovretomic Jan 7, 2025
b723ae4
added multiple speakers option
lovretomic Jan 7, 2025
48ed664
added moderator option
lovretomic Jan 7, 2025
fb1cae2
added animations
lovretomic Jan 7, 2025
ae901b9
added margin animation
lovretomic Jan 7, 2025
9750b7c
changed arrow direction
lovretomic Jan 7, 2025
4f98a5e
minor fixes and cleanup
lovretomic Jan 7, 2025
41b548a
moved component
lovretomic Jan 9, 2025
3844755
Merge branch 'main' into lovretomic/schedule-card
lovretomic Jan 16, 2025
3d4eca0
moved to test page
lovretomic Jan 16, 2025
489361b
fixed moderator layout
lovretomic Jan 16, 2025
b909d2f
added button state and click handler
lovretomic Jan 16, 2025
4121edf
fixed type and seed
lovretomic Jan 16, 2025
fcd01af
added moderator divider
lovretomic Jan 21, 2025
32bcaf1
switched to enums
lovretomic Jan 21, 2025
93d18db
Merge branch 'main' into lovretomic/schedule-card
lovretomic Jan 22, 2025
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
3 changes: 2 additions & 1 deletion apps/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"globals": "^15.11.0",
"typescript": "~5.6.2",
"typescript-eslint": "^8.11.0",
"vite": "^5.4.10"
"vite": "^5.4.10",
"@ddays-app/types": "1.0.0"
}
}
6 changes: 1 addition & 5 deletions apps/app/src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
import { Router } from './router/Router';

function App() {
return (
<>
<Router />
</>
);
return <Router />;
}

export default App;
3 changes: 3 additions & 0 deletions apps/app/src/assets/icons/check-1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions apps/app/src/assets/icons/rating-star-1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions apps/app/src/assets/images/aras-logo-temp.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/app/src/assets/images/thumbnailUrl-temp.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
205 changes: 205 additions & 0 deletions apps/app/src/components/ScheduleCard/ScheduleCard.module.scss
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ne znam koliko je bitno, ali po dizajnu kad je malo duži naziv pozicije osobe, tekst bi se treba prelomit u dva reda, a kod tebe ostane u jednom redu

kod tebe:
image

figma:
image

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To je zato sta je u figminoj komponenti sirina kartice tolika da ne moze sire. Evo provjeria san, u figmi je stavljen width na fill sta je ekvivalentno width: 100 % tako da bi sta se tice responzivnosti to i trebalo bit tako

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iskreno, malo sam zbunjen koji screen u figmi trebam gledat, ali ako sam dobro upratia, po dizajnu nebi tribalo bit točkica ispod naslova u mobilnoj verziji

kod tebe:
image

figma:
image

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bojim se da ne razumin ili nesto krivo gledas, tockice se nalaze ispod opisa u jednom i u drugom slucaju. kad postoje zahtjevi bit ce tockice i ispod njih. sta se tice dijelova komponente, vjerojatno su malo razbaruseni bas zbog dizajna prema kojem se tocno neki dijelovi moraju prikazivat/sakrit kad je kartica otvorena/zatvorena. sta se tice brzine otvaranja, prema mojoj procjeni (kako nije naglaseno u dizajnu) reka bi da je okej. ako ne valja ostavia bi mihaeli da to prokomentira, lako se namisti kasnije

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fale točkice ispod voditelja panela

kod tebe:
image

figma:
image

Copy link
Member Author

@lovretomic lovretomic Jan 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah to je kasnije dodano. sredim (jos san i provjeria s mihaelom rekla je da samo izlistam normalno pa je valjda kasnije popravila da nsian vidia)

Original file line number Diff line number Diff line change
@@ -0,0 +1,205 @@
.scheduleCard {
background-color: $black-5;
display: flex;
gap: 14px;
flex-direction: column;
border-radius: 16px;
box-sizing: border-box;
padding: 24px;

.addedToSchedule {
background-color: $black-10;
box-sizing: border-box;
padding: 8px;
border-radius: 8px;
gap: 10px;
display: flex;

.ratingStar {
height: 16px;
width: 16px;
}

.label {
margin: 0;
@include heading-4;
text-transform: uppercase;
}
}

.timeAndArrow {
display: flex;
justify-content: space-between;
align-items: center;

.time {
@include tag-14;
margin: 0;
}

.arrowDown {
cursor: pointer;
transform: rotate(180deg);
transition: transform 0.3s ease-in-out;

&.collapsed {
transform: rotate(0deg);
}
}
}

.tag {
display: flex;
align-items: center;
gap: 8px;

.theme {
background-color: $primary-muted-orange;
@include tag-14;
margin: 0;
color: white;
height: 24px;
width: 46px;
border-radius: 100%;
display: flex;
justify-content: center;
align-items: center;
}

.label {
@include tag-14;
margin: 0;
}
}

.eventName {
color: $primary-black;
@include paragraph-16;
margin: 0;
}

.collapsibleContent {
display: flex;
flex-direction: column;
gap: 14px;
transition:
max-height 0.5s ease-in-out,
opacity 0.5s ease-in-out,
margin-top 0.5s ease-in-out;
max-height: 500px;
opacity: 1;
margin-top: 0;

&.collapsed {
max-height: 0;
overflow: hidden;
opacity: 0;
margin-top: -16px;
}
}

.eventDescription {
color: $black-70;
@include paragraph-16;
margin: 0;
}

.divider {
padding-top: 6px;
width: 100%;
@include dottedBreak(rgba(23, 22, 21, 0.5));
}

.eventRequirements {
display: flex;
gap: 8px;
flex-direction: column;

.mainLabel {
@include tag-14;
margin: 0;
margin-bottom: 10px;
}

.requirement {
display: flex;
gap: 16px;

.checkContainer {
height: 20px;
width: 20px;
background-color: $primary-muted-orange;
display: flex;
align-items: center;
justify-content: center;
border-radius: 100%;

.check {
height: 8px;
width: 8px;
}
}

.label {
margin: 0;
@include paragraph-16;
}
}
}

.speakers {
display: flex;
flex-direction: column;
gap: 32px;
}

.moderatorLabel {
@include tag-14;
margin: 0;
text-transform: uppercase;
}

.speaker {
display: flex;
gap: 12px;

.image {
width: 64px;
height: 67px;
}

.speakerInfoWrapper {
display: flex;
flex-direction: column;
align-items: flex-start;
gap: 6px;

.fullName {
@include tag-14;
text-transform: uppercase;
margin: 0;
}

.title {
@include tag-14;
text-transform: uppercase;
color: $black-50;
margin: 0;
}

.logoContainer {
max-height: 38px;
max-width: 80px;
.logo {
width: 100%;
height: 100%;
object-fit: contain;
}
}
}
}

.button {
margin-top: 32px;
}
}
Loading
Loading