PR#42: remove hard coding - fedora-qa/landingpage

fedora-qa / landingpage

#42 remove hard coding

Closed 2 years ago by lbrabec. Opened 3 years ago by mannika16161.

fedora-qa/ mannika16161/landingpage remove-hard-coding into master

Removed console.log statement I added during debugging

mannika16161 • 3 years ago

b6a1975

removed hard coding from Events.js, landingPage.js, Minutes.js

mannika16161 • 3 years ago

8d9225a

src/App.js

file modified

+3 -2

		`@@ -6,6 +6,7 @@`
		`import Wizard from './wizard/Wizard';`
		`import LandingPage from './landingpage/LandingPage';`
		`import NotFound from './NotFound';`
		`+ import strings from './strings.json';`


		`class App extends Component {`
		`@@ -14,9 +15,9 @@`
		`<BrowserRouter basename={window.env.SUBDIR}>`
		`<div>`
		`<Switch>`
		`- <Route path="/" exact component={LandingPage} />`
		`+ <Route path="/" exact render={() => <LandingPage strings={strings.landingPage}/>} />`
		`<Route path="/wizard" component={Wizard} />`
		`- <Route path="/landingpage" component={LandingPage} />`
		`+ <Route path="/landingpage" render={() => <LandingPage strings={strings.landingPage}/>} />`
		`<Route component={NotFound} />`
		`</Switch>`
		`</div>`

src/landingpage/Events.js

file modified

+2 -2

		`@@ -31,8 +31,8 @@`
		`return (`
		`<div>`
		`<h1 className="padded">`
		`- Meetings and testdays in the next 7 days{" "}`
		`- <SourceLink href="https://apps.fedoraproject.org/calendar/QA/" />`
		`+ {this.props.strings.heading}{" "}`
		`+ <SourceLink href={this.props.strings.sourceLink} />`
		`</h1>`
		`<ul className="events">{meetings}</ul>`
		`</div>`

src/landingpage/LandingPage.js

file modified

+3 -4

		`@@ -66,9 +66,9 @@`

		`render() {`
		`const available_components = {`
		`- events: <Events data={this.props.meetings} />,`
		`+ events: <Events data={this.props.meetings} strings={this.props.strings.events} />,`
		`blockers: <Blockers data={this.props.blockerbugs} release={this.props.devel} />,`
		`- minutes: <Minutes data={this.props.last_qa_meeting} />,`
		`+ minutes: <Minutes data={this.props.last_qa_meeting} strings={this.props.strings.minutes}/>,`
		`}`
		`let components = _.chunk(`
		`this.state.config_mode ? this.available_components : this.state.enabled_components,`
		`@@ -121,8 +121,7 @@`
		`className="btn btn-primary btn-block btn-wrap-text btn-lg active"`
		`to="/wizard"`
		`role="button">`
		`- Do you have some spare time? Feeling like helping others? Wanna improve Fedora?`
		`- Click here!`
		`+ {this.props.strings.homePage.textOnLink}`
		`</Link>`
		`</div>`
		`</Row>`

src/landingpage/Minutes.js

file modified

+2 -2

		`@@ -4,7 +4,7 @@`
		`render() {`
		`return (`
		`<div>`
		`- <h1 className="padded">Fedora QA Meeting Minutes</h1>`
		`+ <h1 className="padded">{this.props.strings.heading}</h1>`
		`<div className="events">`
		`<a target="_blank" href={this.props.data.link} rel="noopener noreferrer">`
		`Latest minutes from {this.props.data.date}`
		`@@ -13,7 +13,7 @@`
		`Visit{" "}`
		`<a`
		`target="_blank"`
		`- href="https://meetbot.fedoraproject.org/sresults/?group_id=fedora-qa&type=team"`
		`+ href={this.props.strings.meetbotLink}`
		`rel="noopener noreferrer">`
		`meetbot`
		`</a>{" "}`

src/strings.json

file added

+15

		`@@ -0,0 +1,15 @@`
		`+ {`
		`+ "landingPage":{`
		`+ "homePage":{`
		`+ "textOnLink": "Do you have some spare time? Feeling like helping others? Wanna improve Fedora? Click here!"`
		`+ },`
		`+ "events":{`
		`+ "heading": "Meetings and testdays in the next 7 days",`
		`+ "sourceLink" : "https://apps.fedoraproject.org/calendar/QA/"`
		`+ },`
		`+ "minutes":{`
		`+ "heading": "Fedora QA Meeting Minutes",`
		`+ "meetbotLink" : "https://meetbot.fedoraproject.org/sresults/?group_id=fedora-qa&type=team"`
		`+ }`
		`+ }`
		`+ }`
		`\ No newline at end of file`

mannika16161 commented 3 years ago

1) Created a file: 'strings.json' that should contain data for all the pages and their components.
2) Removed hard coding from LandingPage.js, Events.js & Minutes.js