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

#54-Subheader component #61

Merged
merged 21 commits into from
Feb 2, 2024
Merged

#54-Subheader component #61

merged 21 commits into from
Feb 2, 2024

Conversation

tGiech22
Copy link
Contributor

Changes

Created the Subheader component

Notes

Used qml properties to take in the font type to be loaded from a file and text

Test Cases

N/A

Screenshots

image

To Do

n/a

Checklist

It can be helpful to check the Checks and Files changed tabs.
Please review the contributor guide and reach out to your Tech Lead if anything is unclear.
Please request reviewers and ping on slack only after you've gone through this whole checklist.

  • All commits are tagged with the ticket number
  • No linting errors / newline at end of file warnings
  • All code follows repository-configured prettier formatting
  • No merge conflicts
  • All checks passing
  • Screenshots of UI changes (see Screenshots section)
  • Remove any non-applicable sections of this template
  • Assign the PR to yourself
  • Request reviewers & ping on Slack
  • PR is linked to the ticket (fill in the closes line below)

Closes issue #54

@tGiech22 tGiech22 self-assigned this Jan 26, 2024
Copy link
Collaborator

@Peyton-McKee Peyton-McKee left a comment

Choose a reason for hiding this comment

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

Can you go through and replace all our subheaders with this in the pit screen and send the screen shot please

@@ -48,7 +48,9 @@ set(PROJECT_SOURCES

find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick Network Mqtt)

qt_add_executable(NEROApp ${PROJECT_SOURCES})
qt_add_executable(NEROApp ${PROJECT_SOURCES}
Copy link
Collaborator

Choose a reason for hiding this comment

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

revert this change

@@ -61,8 +61,8 @@
<variable>ProjectExplorer.Project.Target.0</variable>
<valuemap type="QVariantMap">
<value type="QString" key="DeviceType">Desktop</value>
Copy link
Collaborator

Choose a reason for hiding this comment

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

dont include this file

NERODevelopment/content/SubheaderComponent.qml Outdated Show resolved Hide resolved
NERODevelopment/content/SubheaderComponent.qml Outdated Show resolved Hide resolved
NERODevelopment/content/SubheaderComponent.qml Outdated Show resolved Hide resolved
Copy link
Collaborator

@Peyton-McKee Peyton-McKee left a comment

Choose a reason for hiding this comment

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

also remember to link PR and assign yourself

Copy link
Collaborator

@Peyton-McKee Peyton-McKee left a comment

Choose a reason for hiding this comment

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

undo changes to qmlproject.qtds

@@ -0,0 +1,26 @@
import QtQuick 2.15
Copy link
Collaborator

Choose a reason for hiding this comment

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

delete entire file

@@ -85,5 +85,3 @@ install(TARGETS NEROApp
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
)

Copy link
Collaborator

Choose a reason for hiding this comment

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

undo changes

@tGiech22 tGiech22 closed this Jan 31, 2024
@tGiech22 tGiech22 deleted the Subheader-Component branch January 31, 2024 18:39
@tGiech22 tGiech22 restored the Subheader-Component branch January 31, 2024 18:39
@tGiech22 tGiech22 reopened this Feb 2, 2024
Copy link
Collaborator

@Peyton-McKee Peyton-McKee left a comment

Choose a reason for hiding this comment

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

amazing

@Peyton-McKee Peyton-McKee merged commit 693dc24 into Develop Feb 2, 2024
2 checks passed
@Peyton-McKee Peyton-McKee deleted the Subheader-Component branch February 2, 2024 03:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Refactoring - Create Subheader Component and replace all subheaders with this component
2 participants