Skip to content

Commit

Permalink
Removed april fools scott
Browse files Browse the repository at this point in the history
  • Loading branch information
DumboOctopus committed Apr 1, 2021
1 parent 50ef4d2 commit d3b521d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 27 deletions.
23 changes: 2 additions & 21 deletions meow/frontend/src/components/Header/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,25 +47,6 @@ class Header extends Component {
};

render() {
let img_d = new Date(),
img_m = 3,
img_dd = 1;
let img_address_modifier = img_d.getMonth() === img_m && img_d.getDate() === img_dd;

if (img_address_modifier) {
if (this.props.theme.name !== "Scott") {
this.props.editTheme({
name: "Scott",
primary: "1B1813",
secondary: "614b37",
primary_font_color: "C48A96",
secondary_font_color: "C48A96",
tertiary: "C48A96",
id: 3
});
}
}

if (this.props.theme.primary[0] !== "#") {
this.props.editTheme({
name: "Daily Bruin",
Expand Down Expand Up @@ -100,7 +81,7 @@ class Header extends Component {
color: `${this.props.theme.primary_font_color}`
}}
>
{img_address_modifier ? "scott" : "meow"}
{"meow"}
</h1>
{this.props.device === config.MOBILE ? null : (
<h2 style={{ color: `${this.props.theme.primary_font_color}` }}>
Expand All @@ -127,7 +108,7 @@ class Header extends Component {
size="large"
onClick={this.newmeow}
>
{img_address_modifier ? "new scott" : "new meow"}
{"new meow"}
</Button>
</div>
) : null}
Expand Down
7 changes: 1 addition & 6 deletions meow/frontend/src/components/Login/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,6 @@ class Login extends React.Component {
let img_index = Math.floor(10 * Math.random() + 1);
let img_extension = img_index == 5 ? "png" : "jpg";
let img_url = `/static/cats/${img_index}.${img_extension}`;
let img_d = new Date(),
img_m = 3,
img_dd = 1;
let img_address_modifier = img_d.getMonth() === img_m && img_d.getDate() === img_dd;
img_url = img_address_modifier ? `/static/other/2.jpg` : img_url;

return (
<div
Expand Down Expand Up @@ -57,7 +52,7 @@ class Login extends React.Component {
color: "white"
}}
>
{!img_address_modifier ? "meow" : "scott"}
{"meow"}
</h1>
<Button href={AUTH_URL} size="large" icon="slack">
Sign in with Slack
Expand Down

0 comments on commit d3b521d

Please sign in to comment.