Commit Graph

52 Commits

Author SHA1 Message Date
Sharyn b9dc338c6d Updating search functionality setup 2018-07-09 16:29:57 +02:00
Sharyn 1beebf9b9b Fixing data proptype 2018-07-09 16:29:38 +02:00
Sharyn f4256af531 Updating eslint parser
Was complaining about ‘Parsing error: unexpected token =‘
2018-07-09 16:28:31 +02:00
Sharyn bf631f5719 Merge branch 'develop' into feat/setting-up-search-functionality 2018-07-09 14:14:34 +02:00
James Gareth Smith ac32c86b62
Merge pull request #8 from Nona-Creative/fix/assets-in-production
Fix/assets in production
2018-07-09 13:57:54 +02:00
James Gareth Smith f8bedec3ea hardcoded repo to get staging working for client review 2018-07-09 13:40:21 +02:00
James Gareth Smith 4e1e7cf90a test fix for fonts 2018-07-09 13:18:51 +02:00
James Gareth Smith fcc6983569 new repo name 2018-07-09 13:01:44 +02:00
Sharyn 165a675600 Updating staging URL in Readme 2018-07-09 11:40:27 +02:00
Sharyn bb6600318b Updating staging URL in Readme 2018-07-09 11:22:49 +02:00
Sharyn 3a9c9b052a Fixing paths 2018-07-09 11:07:56 +02:00
sharynt c803f62844
Merge pull request #7 from Nona-Creative/feat/setting-up-github-pages-repo
Setting up GitHub pages repo
2018-07-09 10:51:33 +02:00
Sharyn 05272af60d Editing Readme 2018-07-09 10:48:30 +02:00
Sharyn f56a32f23d Formatting 2018-07-09 10:47:08 +02:00
Sharyn af7ea409cc Editing Readme 2018-07-09 10:45:50 +02:00
Sharyn e657b8fb0b Updating Readme 2018-07-09 10:44:42 +02:00
Sharyn ddaeae82dc Setting up Github pages repo for deployment 2018-07-09 10:40:49 +02:00
Sharyn 6656e25aaf Extracting searchBar into its own component 2018-07-09 10:22:48 +02:00
James Gareth Smith ebad436212 setting env with NODE_ENV 2018-07-09 09:59:57 +02:00
James Gareth Smith 1a6179e931 set asset prefix 2018-07-09 09:42:19 +02:00
James Gareth Smith 8d35f87e1c ran NPM 2018-07-09 09:37:21 +02:00
sharynt 6b2286326b
Merge pull request #6 from Nona-Creative/feat/single-interview-and-if-search-is-active
Single interview and if search is active
2018-07-06 16:18:21 +02:00
Sharyn 6062bd8dab PR feedback and modal styling 2018-07-06 15:49:24 +02:00
Sharyn c96c4b8fd2 lint fixes 2018-07-06 14:36:22 +02:00
Sharyn 240a194297 Renaming activeSingleInterviewId and better modal handling 2018-07-06 14:03:08 +02:00
Sharyn 2255591e6c Merge branch 'develop' of github.com:Nona-Creative/ETHPrize into feat/single-interview-modal 2018-07-06 13:50:34 +02:00
Sharyn 9bb2636958 Adding interview content 2018-07-06 13:47:37 +02:00
Sharyn c79e58118f Adding search results component 2018-07-06 13:47:25 +02:00
Sharyn a8c1824994 Comment syntax fix 2018-07-06 13:46:38 +02:00
Sharyn fe874a2a6b Updating modal 2018-07-06 13:46:30 +02:00
Sharyn 2cf03762e1 Renaming search to browseArchives and updating components 2018-07-06 13:46:18 +02:00
sharynt 65dc886650
Merge pull request #4 from Nona-Creative/feat/site-structure-setup
Site structure setup
2018-07-05 16:57:37 +02:00
Sharyn ba3b77274a fix 2018-07-05 15:20:45 +02:00
Sharyn 15750b4c6a fixing wordcloud modal initialSlide index 2018-07-05 15:19:24 +02:00
Sharyn 7e6955e85e Updating readme 2018-07-05 13:57:05 +02:00
Sharyn 4cf34829df PR feedback 2018-07-05 13:57:00 +02:00
Sharyn 6d8385df6a code cleanup 2018-07-05 12:04:46 +02:00
Sharyn 33ba55f2f8 Adding page components
- page header
- page footer
- modal
- resources
- wordcloud
- search
- interviews list
- projects list
- topics list
2018-07-05 11:59:42 +02:00
Sharyn bf86e1ec9d Adding data object files 2018-07-05 11:57:01 +02:00
Sharyn aba679efed Adding correct fonts and updating variables 2018-07-05 11:56:51 +02:00
Sharyn 7f13093784 Changing css path 2018-06-27 15:33:33 +02:00
Sharyn 28acf5e664 Putting back deleted files 2018-06-27 15:06:10 +02:00
sharynt 53c25a6510
Merge pull request #1 from Nona-Creative/fix/deployGithubPagesLink
Update skeloton to push to correct github pages
2018-06-27 14:30:16 +02:00
Ryan Vermooten e9d30f3dfb remove yarn.lock as repo is using npm 2018-06-27 14:30:18 +02:00
Ryan Vermooten b1b63cfdc6 merge 2018-06-27 14:24:30 +02:00
Ryan Vermooten 5da88c3f11 update package.json to push to the correct github page 2018-06-27 14:19:37 +02:00
deploy be18958119 Release the Kraken! 2018-06-27 14:10:38 +02:00
sharynt afe23e0776
Update README.md 2018-06-27 13:51:03 +02:00
sharynt 0ac6197c95
Update README.md 2018-06-27 13:50:42 +02:00
Sharyn fb3f3d6af7 Site setup with next and base sass partials 2018-06-27 13:48:55 +02:00