Debranding #327
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,9 @@ | ||
| INSERT INTO | ||
| page_html (name, html) | ||
| VALUES | ||
| ( | ||
| 'homePagePanel', | ||
| '<div class="row"> | ||
| <h2>Overview</h2> | ||
| </div> | ||
| <div class="row"> | ||
|
|
@@ -15,8 +19,11 @@ INSERT INTO page_html (name, html) VALUES | |
| inception through an entire software development lifecycle. The end result is a functional software | ||
| tool ready for use by the sponsor''s organization. | ||
| </p> | ||
| </div>' | ||
| ), | ||
| ( | ||
| 'sponsor', | ||
| '<div class="row"> | ||
| <h2 class="ui header">Become a Project Sponsor</h2> | ||
| </div> | ||
| <div class="row"> | ||
|
|
@@ -213,4 +220,45 @@ INSERT INTO page_html (name, html) VALUES | |
| </ol> | ||
| </div> | ||
| </div> | ||
| </div>' | ||
| ), | ||
| ( | ||
| 'loggedOutFooter', | ||
| "<div id='bringMeDownSignedIn' class='ui container stackable grid'> | ||
| <div class='three column row'> | ||
| <div class='column'> | ||
| <img src='/assets/logo.jpg' alt='Logo' style='max-width:200px; width:100%; height:auto;' /> | ||
| </div> | ||
| <div class='column'> | ||
| <p> | ||
| Department of Software Engineering<br/> | ||
| Golisano Building 70, Room 1690<br/> | ||
| 134 Lomb Memorial Drive<br/> | ||
| Rochester, NY 14623-5608 | ||
| </p> | ||
| </div> | ||
| <div class='column'> | ||
| <p> | ||
| <i class='ui mail icon'></i> | ||
| <a href='mailto:[email protected]'>[email protected]</a> | ||
| </p> | ||
| </div> | ||
| </div> | ||
| <div class='centered row' style='text-align:center;'> | ||
| <p>© " || strftime('%Y','now') || " Rochester Institute of Technology, All Rights Reserved</p> | ||
| </div> | ||
| </div>" | ||
| ), | ||
| ( | ||
| 'loggedInFooter', | ||
| "<div id='bringMeDown' class='ui container stackable grid'> | ||
| <div class='two column row'> | ||
| <div class='column'> | ||
| <h5 id='copyright'> | ||
| <i class='ui icon copyright'></i> | ||
| " || strftime('%Y','now') || " Rochester Institute of Technology, All Rights Reserved | ||
| </h5> | ||
| </div> | ||
| </div> | ||
| </div>" | ||
| ); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,94 +1,67 @@ | ||
| import React, { useContext, useEffect, useState } from "react"; | ||
| import { UserContext } from "../../util/functions/UserContext"; | ||
| import { config } from "../../util/functions/constants"; | ||
| import { SecureFetch } from "../../util/functions/secureFetch"; | ||
| import InnerHTML from "dangerously-set-html-content"; | ||
| import "./../../../css/containers/footer.css"; | ||
| import "semantic-ui-css/semantic.min.css" | ||
| import uiConfig from "../../../config/uiConfig"; | ||
|
|
||
| function Footer() { | ||
| const { user } = useContext(UserContext); | ||
| const [footerHtml, setFooterHtml] = useState(""); | ||
| const [isLoading, setIsLoading] = useState(true); | ||
|
|
||
| const signedIn = user && Object.keys(user).length > 0 && user.user; | ||
| useEffect(() => { | ||
|
|
||
| const footerName = signedIn ? "loggedInFooter" : "loggedOutFooter"; | ||
|
|
||
| setIsLoading(true); | ||
| SecureFetch(`${config.url.API_GET_HTML}?name=${footerName}`) | ||
| .then((r) => { | ||
| if (!r.ok) throw new Error("Network response was not ok"); | ||
| return r.json(); | ||
| }) | ||
| .then((data) => { | ||
| const html = data?.[0]?.html || ""; | ||
| setFooterHtml(html); | ||
| setIsLoading(false); | ||
| }) | ||
| .catch((error) => { | ||
| console.error("Error fetching footer:", error); | ||
| setFooterHtml(""); | ||
|
There was a problem hiding this comment. Instead of completely removing the footer's HTML, maybe we could leave an error message?
Author
There was a problem hiding this comment. Yes I can look into that! We could discuss this Friday too! |
||
| setIsLoading(false); | ||
| }); | ||
| }, [user]); | ||
| if (isLoading) { | ||
| return ( | ||
| <div id="footer"> | ||
| <div style={{ padding: "10px", textAlign: "center" }}> | ||
| Loading... | ||
| </div> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| return ( | ||
| <div id="footer"> | ||
| {footerHtml ? <InnerHTML html={footerHtml} /> : null} | ||
| {signedIn && ( | ||
| <div id="version" className="ui container" style={{ textAlign: "right" }}> | ||
| <h5> | ||
| <a | ||
| href={uiConfig.footers.loggedIn.githubLink} | ||
| target="_blank" | ||
| rel="noreferrer" | ||
| > | ||
| v{uiConfig.footers.loggedIn.version} | ||
| </a> | ||
| </h5> | ||
| </div> | ||
| )} | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| export default Footer; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
There was a problem hiding this comment. I appreciate the hardcoded strings and configuration variables being centered in this file! This should be great for maintainability moving forward. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| const uiConfig = { | ||
| app: { | ||
| name: "Senior Project Portal", | ||
| orgName: "Department of Software Engineering", | ||
| url: { | ||
| API_GET_HTML: "/api/getHtml" | ||
| }, | ||
| logoLight: "/assets/logo-light.png", | ||
| logoDark: "/assets/logo-dark.png", | ||
| }, | ||
| logoPath: | ||
| "/assets/Golisano _College of_Computing_and_Information_Sciences_LOGO.jpg", | ||
| footers: { | ||
| loggedOut: { | ||
| address: | ||
| "Department of Software Engineering\nGolisano Building 70, Room 1690\n134 Lomb Memorial Drive\nRochester, NY 14623-5608", | ||
| email: "[email protected]", | ||
| copyright: "Rochester Institute of Technology, All Rights Reserved", | ||
| }, | ||
| loggedIn: { | ||
| copyright: "Rochester Institute of Technology, All Rights Reserved", | ||
| version: "1.8.1", | ||
| githubLink: | ||
| "https://github.com/RIT-Software-Engineering/RIT-SE-Senior-Project", | ||
| }, | ||
| }, | ||
| }; | ||
|
|
||
| export default uiConfig; |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This information seems like it may be irrelevant to the README file in the root directory. Consider moving the information about the content editor to a .md markdown file in the test_cases directory.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I will double check, I believe the professor wanted it like this.