Skip to content

Commit

Permalink
initial thp to ggla info update
Browse files Browse the repository at this point in the history
  • Loading branch information
rdela committed Mar 9, 2021
1 parent bce4ef8 commit 80770df
Show file tree
Hide file tree
Showing 16 changed files with 33 additions and 33 deletions.
24 changes: 12 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## Welcome to Mutual-Aid-Networks! This site is for organizing mutual aid efforts within your community.
## Welcome to Mutual-Aid-Networks! This site is for organizing mutual aid efforts within your community.

## Setup

## Setup


#### 1. The general development workflow is as follows:

Expand Down Expand Up @@ -30,22 +30,22 @@ B. Rebase your topic branch onto your fork's master, which is now up to date wit
C. Create a pull request to the main Mutual-Aid-Networks repo master
- use the github UI

#### 3. Setting Up in Local Environment
#### 3. Setting Up in Local Environment

A. Download the files
Clone this repository to a folder of your choice on your local machine:

Clone this repository to a folder of your choice on your local machine:

- `git clone https://github.com/townhallproject/mutual-aid-networks.git`

- Navigate to the newly cloned repository folder
- Install the project dependencies:`npm i`
- Run `npm start` to open in localhost
- Please reach out to Megan at [email protected] for environmental variables.
-Once you receive this information please create an .env file at the root level (same level as .gitignore)
and copy and paste information into that file. Env file referenced at bottom of read me.

- Please reach out to Ricky at [email protected] for environmental variables.
-Once you receive this information please create an .env file at the root level (same level as .gitignore)
and copy and paste information into that file. Env file referenced at bottom of read me.

#### 4. Devtools setup

React and Redux devtools can be helpful tools to install for debugging in Chrome:
Expand Down
Binary file added src/assets/gg/bernie-gg-pic.jpg
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.
Binary file added src/assets/gg/ggla-black.png
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.
Binary file added src/assets/gg/youth-climate-strike.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/assets/thp/PledgeMap.png
Binary file not shown.
Binary file removed src/assets/thp/TH1.jpg
Binary file not shown.
Binary file removed src/assets/thp/TH2.jpg
Binary file not shown.
Binary file removed src/assets/thp/THP_logo_horizontal.png
Binary file not shown.
Binary file removed src/assets/thp/eventMap.png
Binary file not shown.
26 changes: 13 additions & 13 deletions src/components/About/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,25 @@ import React from 'react'
import { Col, Row } from 'antd'

import './style.scss';
import eventMap from '../../assets/thp/eventMap.png'
import pledgeMap from '../../assets/thp/PledgeMap.png'
import thpLogo from '../../assets/thp/THP_logo_horizontal.png'
import th1 from '../../assets/thp/TH1.jpg'
import th2 from '../../assets/thp/TH2.jpg'
import bernieGG from '../../assets/gg/bernie-gg-pic.jpg'
import youthCS from '../../assets/gg/youth-climate-strike.jpg'
import ggLogo from '../../assets/gg/ggla-black.png'
import tenantPower from '../../assets/gg/chinatown-tenants-timo-saarelma-latu.jpg'
import homesGuarantee from '../../assets/gg/homes-guarantee-press-conference.jpg'

import { translations } from './language'

const About = (props) => {
const { siteLanguage } = props
return (
<div className='page-container'>
<a href='https://townhallproject.com/'>
<img src={thpLogo} alt='Town Hall Project logo' className='thpLogo'/>
<a href='https://www.groundgamela.org/'>
<img src={ggLogo} alt='Ground Game Los Angeles logo' className='ggLogo'/>
</a>
<h2 className='title'>
<span>
{translations.title[siteLanguage]}
<a href='https://townhallproject.com/'> Town Hall Project.</a>
<a href='https://www.groundgamela.org/'> Ground Game Los Angeles.</a>
</span>
</h2>
<div className='container'>
Expand All @@ -31,22 +31,22 @@ const About = (props) => {
<div className='imageCollage'>
<Row>
<Col span={14}>
<img src={eventMap} alt='event map' className='map'/>
<img src={bernieGG} alt='Bernie with Ground Game group' className='map'/>
</Col>
<Col span={10}>
<img src={th1} alt='Town Hall meeting' className='hall'/>
<img src={tenantPower} alt='Chinatown Tenants protesting with LA Tenants Union' className='hall'/>
</Col>
</Row>
<Row>
<Col span={10}>
<img src={th2} alt='Town Hall meeting' className='hall'/>
<img src={homesGuarantee} alt='Homes Guarantee press conference' className='hall'/>
</Col>
<Col span={14}>
<img src={pledgeMap} alt='pledge map' className='map'/>
<img src={youthCS} alt='women speaking at Youth Climate Strike' className='map'/>
</Col>
</Row>
</div>

<p>
{translations.disclaimer[siteLanguage]}
</p>
Expand Down
8 changes: 4 additions & 4 deletions src/components/About/language.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/components/About/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
border-color: white;
}
}
.thpLogo {
.ggLogo {
width: 200px;
padding-bottom: 20px;
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/PageFooter/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ const PageFooter = (props) => {
<p>
<span>
{translations.source[siteLanguage]}
<a href="https://townhallproject.com/" rel="noopener noreferrer" target="_blank" >Town Hall Project</a>.
<a href="https://www.groundgamela.org/">Ground Game Los Angeles</a>.
</span>
<span>
{translations.contact[siteLanguage]}
<a href="mailto:[email protected]">[email protected]</a>
<a href="mailto:[email protected]">[email protected]</a>
</span>
</p>
<p>
Expand Down
2 changes: 1 addition & 1 deletion src/components/PrivacyPolicy/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const PrivacyPolicy = (props) => {
<p>
This website may use Google or other forms to collect data from the user. All data collected will be
used in accordance with instructions on the intake form. If you do not wish your data displayed, contact
<a href="mailto:[email protected]"> [email protected]</a> to have it removed.
<a href="mailto:[email protected]"> [email protected]</a> to have it removed.
</p>
</div>
</div>
Expand Down

0 comments on commit 80770df

Please sign in to comment.