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

Winter crossword #305

Open
wants to merge 10 commits into
base: develop
Choose a base branch
from
Open

Winter crossword #305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3fee7b2
Add programmers section
Dec 22, 2020
d90b9d5
initial commit
Feb 18, 2021
e7f6a03
crossword changes
Feb 18, 2021
f184e83
crossword changes
Feb 18, 2021
de26a7f
new package.json
Feb 18, 2021
2c9cbf6
removed import constants
Feb 19, 2021
a4c104d
pagefooter update
Feb 19, 2021
23d9a7a
reducer update
Feb 19, 2021
8ef8b07
reducer (descrip) fix
Feb 19, 2021
ab69a0e
crossword-2
Feb 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9,982 changes: 5,062 additions & 4,920 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 7 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@
"homepage": "/client-app",
"dependencies": {
"@apollo/react-hooks": "^3.1.3",
"@jaredreisinger/react-crossword": "^2.3.1",
"@stuyspec/article_extensions": "^2.0.1",
"@types/dateformat": "^3.0.0",
"@types/humps": "^1.1.2",
"@types/jest": "23.3.13",
"@types/lodash": "^4.14.168",
"@types/node": "10.12.18",
"@types/react": "^16.9.1",
"@types/react-bootstrap": "^0.32.15",
Expand All @@ -34,6 +36,7 @@
"graphql-tag": "^2.10.1",
"history": "^4.7.2",
"humps": "^2.0.1",
"node-sass": "^5.0.0",
"query-string": "^6.2.0",
"react": "^16.9.0",
"react-apollo": "^3.1.3",
Expand All @@ -49,14 +52,17 @@
"react-scripts": "^3.3.0-next.62",
"react-share": "^2.4.0",
"react-sidebar": "^3.0.2",
"react-slick": "^0.23.2",
"react-slick": "^0.23.2",
"redux": "^4.0.1",
"redux-devtools-extension": "^2.13.7",
"redux-form": "^8.2.6",
"redux-logger": "^3.0.6",
"redux-promise-middleware": "^5.1.1",
"redux-thunk": "^2.3.0",
"roman-numerals": "^0.3.2",
"semantic-ui-react": "^2.0.3",
"styled-components": "^5.2.1",
"tslib": "^2.1.0",
"typescript": "^3.7.2"
},
"scripts": {
Expand Down
Binary file added public/img/crossword_logo.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 25 additions & 1 deletion src/modules/RoutingApp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { graphql } from "react-apollo";
import gql from "graphql-tag";
import { ConnectedRouter } from "connected-react-router";
import queryString from "query-string";
import appHistory from "../tools/appHistory";
import appHistory from "../tools/appHistory";

import {
EditProfilePage,
Expand Down Expand Up @@ -35,6 +35,12 @@ import { createSession } from "./accounts/actions";

import { RecruitmentPage } from "./recruitment/components";

import { GamePage } from "./games/components";

import Crossword1 from "./crossword/Crossword1"

//import Crossword1 from "./crosswords/react-crossword-1/examples";

import { ClassifiedsRedirect } from "./core/components";

import { adRedirects } from './advertisements/constants';
Expand Down Expand Up @@ -199,6 +205,24 @@ class RoutingAppUnconnected extends PureComponent {
key={"recruitments"}
component={RecruitmentPage}
/>
<Route
exact
path={"/spec-games"}
key={"games"}
component={GamePage}
/>
<Route
exact
path={"/winter-crossword"}
key={"crossword"}
component={Crossword1}
/>
<Route
exact
path={"/crossword"}
key={"crossword"}
component={GamePage}
/>
<Route
exact
path={"/classifieds"}
Expand Down
16 changes: 3 additions & 13 deletions src/modules/core/components/PageFooter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const styles = {
background: "#fff",
height: "370px",
marginTop: "14px",
marginBottom: "60px",
marginBottom: "30px",
},
pageFooterMain: {
borderTop: "3px solid #ddd",
Expand Down Expand Up @@ -177,7 +177,6 @@ const PageFooter: React.SFC<PageFooterProps> = ({
md={8}
mdOffset={1}
lg={8}
lgOffset={0}
className={classes.sectionFlex}
>
{sections.map(section => {
Expand Down Expand Up @@ -217,11 +216,7 @@ const PageFooter: React.SFC<PageFooterProps> = ({
className={classes.creditLine}
>
<hr className={classes.hr} />
Created by Jason Kao, Nicholas Yang, Jerry Ye, Jason Lin, Darius Jankauskas, Victor Siu, and
Cathy Cai{" "}
<a href="https://github.com/stuyspec">
@The Spectator Web Department
</a>.

</Col>
<Col
xs={12}
Expand All @@ -234,11 +229,6 @@ const PageFooter: React.SFC<PageFooterProps> = ({
</Col>
<Col xs={12} smHidden mdHidden lgHidden className={classes.creditLine}>
<hr className={classes.hr} />
Created by Jason Kao, Nicholas Yang, Darius Jankuaskas, Jason Lin, Jerry Ye, Victor Siu,
and Cathy Cai{' '}
<a href="https://github.com/stuyspec">
@The Spectator Web Department
</a>.
</Col>
</Row>
</Grid>
Expand All @@ -250,4 +240,4 @@ const mapStateToProps = (state: any) => ({
descriptions: state.descriptions
});

export default connect(mapStateToProps)(injectSheet(styles)(PageFooter));
export default connect(mapStateToProps)(injectSheet(styles)(PageFooter));
Loading