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

Feature/dynamic content #26

Merged
merged 87 commits into from
May 10, 2024
Merged

Feature/dynamic content #26

merged 87 commits into from
May 10, 2024

Conversation

manuel-pross
Copy link
Collaborator

@manuel-pross manuel-pross commented Mar 31, 2024 •
edited
Loading

Description

This PR adds the rendering logic of the homepage (hero and body).
This includes:

  • typing of strapi responses
  • components for the different strapi fields
  • styling of the different strapi fields displayed in the frontend

What dies PR does NOT include:

What type of PR is this? (check all applicable)

  • 🍕 Feature
  • 🐛 Bug Fix
  • 📝 Documentation Update
  • 🎨 Style
  • 🧑‍💻 Code Refactor
  • 🤖 Build
  • 🔁 CI
  • 📦 Chore
  • ⏩ Revert

Related Issues and Pull Requests

Fixes: #(issue/ pr number)

Closes: #(issue/ pr number)

Depends on: #(issue/ pr number)

Mobile & Desktop Screenshots/Recordings (if applicable)

Mobile

Desktop

Vim.Landing.Page.-.Google.Chrome.2024-04-28.09-56-02.mp4

[optional] Design Documents or Screenshots

https://miro.com/app/board/uXjVNKsIEgU=/?moveToWidget=3458764578884341560&cot=14

Manuel Proß added 30 commits March 27, 2024 20:43
feat(web): add link style to dynamic menu items
fb6eb6a
ops(web): add strapi api token as env var to next/web
31751ce
feat(web): add basic types for strapi page content
060d61b
refactor(web): typo error, reroute to default 404 when no page relati…
cd4d552 
…on exists
feat(web): add component for plane section of strapi page
67f9daa
feat(web): add component for conditional render content based on sect…
d4f8e3d 
…ion type
feat(web): add types for strapi content
89cdc66
refactor(web): card now uses new types and renders content correctly
55f1786
refactor(web): add ContentEntry component to base page to render cond…
4c00ff4 
…itional content based on section type
feat(web): add button to Content type
b39e369
feat(web): add basic render code to Carousel component
de54519
build(web): add react-markdown to render markdown code from strapi
47db343
feat(web): add class for styling markdown paragraph, add markdown com…
fb1bb0f 
…ponent to render strapi content
feat(web): add tailwind classes for custom drop shadow
38a94ee
feat(web): add gray color with opacity for custom drop shadow
addb8e4
refactor(web): style card accordingly to wireframes
ef8243a
feat(cms): add homepage as single type
679eaed
refactor(web): aggregate types for strapi content in one file
ecbfc41
refactor(web): adjust folder structure of components according to str…
e04021a 
…api definitions
feat(web): add fetching functions for home header and home content
016fb93
refactor(web): add inline-block to btn, to properly use it for links
4028b2c
refactor(web): fix imports, make type for SingleTypeAttributes more f…
b204b05 
…lexible
fix(web): add styles to Link tag to make whole menu item clickable
ed23971
feat(web): display dynamic content from strapi on home page
2acd417
feat(web): add list component according to strapi
b46e98e
feat(web): add all missing props to HeroSection according to strapi d…
1eea5f1 
…efinitions
refactor(web): naming of attributes
3a5ab9a
refactor(web): remove dynamic content rendering due to new type struc…
8661b95 
…ture
feat(web): style hero section according to styleguide
81dd157
feat(web): add background text to according to styleguide
9b94e82
@manuel-pross manuel-pross requested a review from jomunker May 2, 2024 12:36
@jomunker
Copy link
Collaborator

jomunker commented May 2, 2024

videoframe_4437
The right side should be also rounded at the bottom and the rounded window should not scroll away as it does right now. But this is probably not a concern for this PR.

Manuel Proß added 11 commits May 2, 2024 15:04
fix(cms): readd collection name, change plural name to singular strin…
66579b0 
…g value
refactor(web): rename variables to make fetching of news per news sec…
8f3cb0b 
…tion easier to understand
fix(cms): readd real plural name due to compile error
bd72dc5
fix(web): add relative and z-index to main content to place it over v…
80e7f71 
…im sign in the background
feat(web): add swr
44b7f79
feat(build): add swr as dependency
444ec43
refactor(web): change logic of method to fetch news per newscount to …
1b65d2a 
…be readable
refactor(web): remove unused code and dependencies
7f51c7e
refactor(web): use flatMap to filter undefined values directly
00e46ee
refactor(web): add type assertion directly to json transformation
8576c0d
fix(web): readd heading of news section
e2bb733
@manuel-pross manuel-pross requested a review from jomunker May 2, 2024 17:16
@jomunker
Copy link
Collaborator

jomunker commented May 8, 2024

pls resolve conflicts

jomunker
jomunker previously approved these changes May 8, 2024
View reviewed changes
web/package.json Show resolved Hide resolved
web/src/app/page.tsx Outdated Show resolved Hide resolved
@manuel-pross manuel-pross requested a review from jomunker May 9, 2024 12:18
@manuel-pross manuel-pross merged commit 85062fe into development May 10, 2024
2 checks passed
@manuel-pross manuel-pross deleted the feature/dynamic-content branch May 10, 2024 09:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jomunker jomunker jomunker approved these changes

Assignees

@manuel-pross manuel-pross

Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@manuel-pross @jomunker