Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
scratch-www
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
xpstem
scratch-www
Commits
34440308
Commit
34440308
authored
Sep 24, 2020
by
seotts
Committed by
Karishma Chadha
Oct 22, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
work on leadership section
parent
1b574cc2
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
408 additions
and
0 deletions
+408
-0
src/views/annual-report/annual-report.jsx
src/views/annual-report/annual-report.jsx
+90
-0
src/views/annual-report/annual-report.scss
src/views/annual-report/annual-report.scss
+36
-0
src/views/annual-report/l10n.json
src/views/annual-report/l10n.json
+14
-0
src/views/annual-report/people.json
src/views/annual-report/people.json
+268
-0
No files found.
src/views/annual-report/annual-report.jsx
View file @
34440308
...
...
@@ -9,6 +9,9 @@ const React = require('react');
const
Button
=
require
(
'
../../components/forms/button.jsx
'
);
const
FlexRow
=
require
(
'
../../components/flex-row/flex-row.jsx
'
);
const
Comment
=
require
(
'
../../components/comment/comment.jsx
'
);
const
People
=
require
(
'
./people.json
'
);
const
PeopleGrid
=
require
(
'
../../components/people-grid/people-grid.jsx
'
);
const
Avatar
=
require
(
'
../../components/avatar/avatar.jsx
'
);
const
Page
=
require
(
'
../../components/page/www/page.jsx
'
);
const
render
=
require
(
'
../../lib/render.jsx
'
);
...
...
@@ -965,6 +968,93 @@ class AnnualReport extends React.Component {
</
div
>
</
div
>
</
div
>
<
div
className=
"leadership-section section"
id=
"donate"
ref=
{
this
.
setRef
(
SECTIONS
.
leadership
)
}
>
<
div
className=
"inner"
>
<
h2
>
<
FormattedMessage
id=
"annualReport.leadershipTitle"
/>
</
h2
>
<
h3
>
<
FormattedMessage
id=
"annualReport.leadershipBoard"
/>
</
h3
>
<
FlexRow
className=
"leadership-board"
>
<
div
className=
"board-member"
>
<
b
>
<
FormattedMessage
id=
"annualReport.leadershipChair"
/>
</
b
>
<
h4
>
Mitch Resnick
</
h4
>
<
FormattedMessage
id=
"annualReport.leadershipProfessor"
/>
<
br
/>
MIT Media Lab
</
div
>
<
div
className=
"board-member"
>
<
b
>
<
FormattedMessage
id=
"annualReport.leadershipViceChair"
/>
</
b
>
<
h4
>
David Siegel
</
h4
>
<
FormattedMessage
id=
"annualReport.supportersCoFounder"
/>
<
br
/>
Two Sigma
</
div
>
<
div
className=
"board-member"
>
<
b
>
<
FormattedMessage
id=
"annualReport.leadershipBoardMember"
/>
</
b
>
<
h4
>
Margaret Honey
</
h4
>
<
FormattedMessage
id=
"annualReport.leadershipPresidentCEO"
/>
<
br
/>
Two Sigma
</
div
>
<
div
className=
"board-member"
>
<
b
>
<
FormattedMessage
id=
"annualReport.leadershipBoardMember"
/>
</
b
>
<
h4
>
Christina Miller
</
h4
>
<
FormattedMessage
id=
"annualReport.leadershipFormerPresident"
/>
<
br
/>
Cartoon Network
</
div
>
<
div
className=
"board-member"
>
<
b
>
<
FormattedMessage
id=
"annualReport.leadershipBoardMember"
/>
</
b
>
<
h4
>
Avraham Kadar
</
h4
>
<
FormattedMessage
id=
"annualReport.leadershipFounderCEO"
/>
<
br
/>
BrainPOP
</
div
>
</
FlexRow
>
<
h4
>
<
FormattedMessage
id=
"annualReport.leadershipBoardSecretaryTreasurer"
/>
</
h4
>
<
FlexRow
className=
"leadership-board"
>
<
div
className=
"board-member"
>
<
b
>
<
FormattedMessage
id=
"annualReport.leadershipBoardSecretary"
/>
</
b
>
<
h4
>
Sheri Vammen
</
h4
>
</
div
>
<
div
className=
"board-member"
>
<
b
>
<
FormattedMessage
id=
"annualReport.leadershipBoardTreasurer"
/>
</
b
>
<
h4
>
Rich Sauer
</
h4
>
</
div
>
</
FlexRow
>
<
h3
>
<
FormattedMessage
id=
"annualReport.leadershipScratchTeam"
/>
</
h3
>
<
div
className=
"executive-director"
>
<
PeopleGrid
people=
{
[{
userName
:
'
Champ99
'
,
userId
:
900283
,
name
:
'
Champika
'
}]
}
/>
<
FormattedMessage
id=
"annualReport.leadershipInterim"
/>
</
div
>
<
PeopleGrid
people=
{
People
}
/>
</
div
>
</
div
>
<
div
className=
"donate-section section"
id=
"donate"
...
...
src/views/annual-report/annual-report.scss
View file @
34440308
...
...
@@ -692,6 +692,42 @@ p {
}
}
.leadership-section
{
background-color
:
#EDEDFF
;
.inner
{
width
:
620
;
}
h2
,
h3
,
h4
{
text-align
:
center
;
}
.leadership-board
{
justify-content
:
center
;
.board-member
{
text-align
:
center
;
width
:
300px
;
margin
:
60px
0
;
}
}
.executive-director
{
text-align
:
center
;
padding
:
72px
;
.avatar-text
{
font-size
:
1
.5rem
;
font-weight
:
bold
;
padding
:
12px
0
20px
0
;
}
.avatar-item
{
padding-bottom
:
0px
;
}
}
}
.donate-section
{
background-color
:
#0EBD8C
;
...
...
src/views/annual-report/l10n.json
View file @
34440308
...
...
@@ -68,6 +68,20 @@
"annualReport.supportersInspirationTitle"
:
"Inspiration Circle — $20,000+"
,
"annualReport.supportersExplorationTitle"
:
"Exploration Circle — $5,000+"
,
"annualReport.supportersInKindTitle"
:
"In-Kind Supporters 2019 – 2020"
,
"annualReport.leadershipTitle"
:
"Our Team"
,
"annualReport.leadershipBoard"
:
"Board of Directors"
,
"annualReport.leadershipChair"
:
"Chair"
,
"annualReport.leadershipProfessor"
:
"Professor of Learning Research"
,
"annualReport.leadershipViceChair"
:
"Vice Chair"
,
"annualReport.leadershipBoardMember"
:
"Board Member"
,
"annualReport.leadershipPresidentCEO"
:
"President and CEO"
,
"annualReport.leadershipFormerPresident"
:
"Former President"
,
"annualReport.leadershipFounderCEO"
:
"Founder and CEO"
,
"annualReport.leadershipBoardSecretaryTreasurer"
:
"Board Secretary & Treasurer"
,
"annualReport.leadershipBoardSecretary"
:
"Board Secretary"
,
"annualReport.leadershipBoardTreasurer"
:
"Board Treasurer"
,
"annualReport.leadershipScratchTeam"
:
"Scratch Team"
,
"annualReport.leadershipInterim"
:
"Interim Executive Director"
,
"annualReport.donateTitle"
:
"Donate"
,
"annualReport.donateMessage"
:
"Your support enables us to make Scratch free for everyone, keeps our servers running, and most importantly, we are able to provide kids around the world an opportunity to imagine, create and share. Thank you!"
,
...
...
src/views/annual-report/people.json
0 → 100644
View file @
34440308
[
{
"userName"
:
"cosmosaura"
,
"userId"
:
61436283
,
"name"
:
"Achal"
},
{
"userName"
:
"originalwow"
,
"userId"
:
56182496
,
"name"
:
"Amielle"
},
{
"userName"
:
"amylaser"
,
"userId"
:
17462181
,
"name"
:
"Amy"
},
{
"userName"
:
"achouse"
,
"userId"
:
4747093
,
"name"
:
"Annie"
},
{
"userName"
:
"wheelsonfire"
,
"userId"
:
10001044
,
"name"
:
"Ben"
},
{
"userName"
:
"BrycedTea"
,
"userId"
:
2029640
,
"name"
:
"Bryce"
},
{
"userName"
:
"designerd"
,
"userId"
:
3581881
,
"name"
:
"Carl"
},
{
"userName"
:
"tarmelop"
,
"userId"
:
2286560
,
"name"
:
"Carmelo"
},
{
"userName"
:
"carolinacr"
,
"userId"
:
40018416
,
"name"
:
"Carolina"
},
{
"userName"
:
"chrisg"
,
"userId"
:
1494
,
"name"
:
"Chris"
},
{
"userName"
:
"cwillisf"
,
"userId"
:
3532363
,
"name"
:
"Chris"
},
{
"userName"
:
"ceebee"
,
"userId"
:
2755634
,
"name"
:
"Christan"
},
{
"userName"
:
"codubee"
,
"userId"
:
10866958
,
"name"
:
"Colby"
},
{
"userName"
:
"noncanonical"
,
"userId"
:
55851826
,
"name"
:
"Craig"
},
{
"userName"
:
"dsquare"
,
"userId"
:
527836
,
"name"
:
"DD"
},
{
"userName"
:
"SunnyDay4aBlueJay"
,
"userId"
:
24164779
,
"name"
:
"Ellen"
},
{
"userName"
:
"ericr"
,
"userId"
:
159
,
"name"
:
"Eric"
},
{
"userName"
:
"speakvisually"
,
"userId"
:
3484484
,
"name"
:
"Eric"
},
{
"userName"
:
"cheddargirl"
,
"userId"
:
159139
,
"name"
:
"Franchette"
},
{
"userName"
:
"pixelmoth"
,
"userId"
:
2408962
,
"name"
:
"Jacy"
},
{
"userName"
:
"jaleesa"
,
"userId"
:
2374106
,
"name"
:
"Jaleesa"
},
{
"userName"
:
"Mos20"
,
"userId"
:
52545208
,
"name"
:
"Joan"
},
{
"userName"
:
"FredDog"
,
"userId"
:
2496866
,
"name"
:
"Jolie"
},
{
"userName"
:
"Class12321"
,
"userId"
:
2871308
,
"name"
:
"Joshua"
},
{
"userName"
:
"bluecrazie"
,
"userId"
:
50257624
,
"name"
:
"JT"
},
{
"userName"
:
"MunchtheCat"
,
"userId"
:
59383434
,
"name"
:
"Kait"
},
{
"userName"
:
"kittyloaf"
,
"userId"
:
27383273
,
"name"
:
"Karishma"
},
{
"userName"
:
"dinopickles"
,
"userId"
:
34607790
,
"name"
:
"Katelyn"
},
{
"userName"
:
"pondermake"
,
"userId"
:
26779669
,
"name"
:
"Kathy"
},
{
"userName"
:
"khanning"
,
"userId"
:
1553886
,
"name"
:
"Kreg"
},
{
"userName"
:
"KayOh"
,
"userId"
:
3018280
,
"name"
:
"Kristin"
},
{
"userName"
:
"lamatchalattei"
,
"userId"
:
61415372
,
"name"
:
"Lamar"
},
{
"userName"
:
"leoburd"
,
"userId"
:
385
,
"name"
:
"Leo"
},
{
"userName"
:
"lilyland"
,
"userId"
:
17184580
,
"name"
:
"Lily"
},
{
"userName"
:
"paperShannon101"
,
"userId"
:
38051483
,
"name"
:
"Manuj"
},
{
"userName"
:
"algorithmar"
,
"userId"
:
43013126
,
"name"
:
"Maren"
},
{
"userName"
:
"mwikali"
,
"userId"
:
24838781
,
"name"
:
"Marian"
},
{
"userName"
:
"dietbacon"
,
"userId"
:
24137617
,
"name"
:
"Mark"
},
{
"userName"
:
"Paddle2See"
,
"userId"
:
49156
,
"name"
:
"Mark"
},
{
"userName"
:
"mres"
,
"userId"
:
167
,
"name"
:
"Mitchel"
},
{
"userName"
:
"natalie"
,
"userId"
:
169
,
"name"
:
"Natalie"
},
{
"userName"
:
"sgcc_"
,
"userId"
:
21986973
,
"name"
:
"Paul"
},
{
"userName"
:
"raimondious"
,
"userId"
:
2584924
,
"name"
:
"Ray"
},
{
"userName"
:
"rtrvmwe"
,
"userId"
:
61342326
,
"name"
:
"Retrouvailles"
},
{
"userName"
:
"binnieb"
,
"userId"
:
53715539
,
"name"
:
"Robyn"
},
{
"userName"
:
"RupaLax"
,
"userId"
:
58005604
,
"name"
:
"Rupa"
},
{
"userName"
:
"Rupsthereitis"
,
"userId"
:
4685510
,
"name"
:
"Rupal"
},
{
"userName"
:
"scmb1"
,
"userId"
:
246290
,
"name"
:
"Sarah"
},
{
"userName"
:
"pizzafordessert"
,
"userId"
:
22183577
,
"name"
:
"Sean"
},
{
"userName"
:
"shruti"
,
"userId"
:
3714374
,
"name"
:
"Shruti"
},
{
"userName"
:
"starry_sky7"
,
"userId"
:
61374093
,
"name"
:
"Yulia"
},
{
"userName"
:
"Za-Chary"
,
"userId"
:
974363
,
"name"
:
"Zachary"
},
{
"userName"
:
"Zinnea"
,
"userId"
:
35911243
,
"name"
:
"Zo
\u
00eb"
}
]
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment