iritmaximus/ohtuilmo
1
0
Fork 0
mirror of https://github.com/UniversityOfHelsinkiCS/ohtuilmo.git synced 2026-10-12 19:03:41 +03:00
Code Issues Packages Projects Releases Wiki Activity
2,516 Commits 1 Branch 5 Tags
main
Commit Graph
99 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
jexniemiandGitHub 5724d2b596 Update RegistrationPage.js 2018-12-15 17:00:22 +02:00
jexniemiandGitHub 595d0e00f3 Removed Question index labels from questions 2018-12-15 16:35:09 +02:00
jexniemiandGitHub 74ec72d8e2 Merge pull request #109 from ohtuprojekti-ilmo/fixDragAndDro 
Set static height to registration list elements
 2018-12-15 16:00:24 +02:00
Jeremi Nieminen 8bc5b3ce30 Set static height to registration list elements 2018-12-15 15:57:17 +02:00
Jeremi Nieminen bae12a2a01 Fixed drag and drop, fixed reducer names and removed helper texts 2018-12-14 14:34:10 +02:00
Jeremi Nieminen 32004e28e6 Removed AuthRoute and added checks if user exists in state to registration page 2018-12-13 23:17:35 +02:00
Jeremi Nieminen 76401a5dc7 Removed create topic button from other user than admin 2018-12-13 11:05:27 +02:00
Jeremi Nieminen 5f2a46f6c2 Added lists of questions to admin page with mock questions 2018-12-12 19:52:43 +02:00
jexniemiandGitHub a28c69f00d Merge branch 'master' into registration-submit 2018-12-09 23:26:13 +02:00
Jeremi Nieminen 48b7a6e9ca Added admin check to admin page 2018-12-09 22:00:51 +02:00
jexniemiandGitHub 21706e48e8 Merge pull request #87 from ohtuprojekti-ilmo/topicListPage_email_buttons 
added email buttons
 2018-12-07 23:03:42 +02:00
Jeremi Nieminen dfe89df8a2 Changed finnish values to english 2018-12-07 21:39:44 +02:00
Jeremi Nieminen 3d0ecc30cf Changed button colors 2018-12-07 21:26:16 +02:00
Jeremi Nieminen e6d1c3d218 Initial component made for adminpage and link added to hamburger menu, no admin checks yet 2018-12-02 21:42:46 +02:00
Jeremi Nieminen bf025d4923 Small style changes to user details 2018-12-02 21:26:40 +02:00
jexniemiandGitHub 59f81d900e Merge pull request #83 from ohtuprojekti-ilmo/user-details 
User details
 2018-12-02 21:08:28 +02:00
Jeremi Nieminen dee5ea66b2 Changed file name for UserDetails 2018-12-02 21:01:47 +02:00
jexniemiandGitHub a90ca9901a Merge pull request #77 from ohtuprojekti-ilmo/registration-service 
Registration service
 2018-12-02 11:06:29 +02:00
Jeremi Nieminen b4586d648e Set Title as required on TopicForm 2018-12-02 11:02:10 +02:00
Jeremi Nieminen 1a5872b039 Removed empty css file and moved topicformpageinfodump straight to TopicFormPageInfo.js 2018-12-02 10:57:15 +02:00
Jeremi Nieminen e65d525022 Disabled empty select 2018-12-02 10:29:14 +02:00
Jeremi Nieminen de3693f727 Set registration page path to /register and set path / redirect to login 2018-12-01 20:56:11 +02:00
Jeremi Nieminen 95b00a3178 Added link to markdown instructions 2018-11-30 14:32:40 +02:00
Jeremi Nieminen 982ba132de Changed button color 2018-11-30 11:12:14 +02:00
Jeremi Nieminen 48147dc104 Changed preview button position 2018-11-30 11:11:21 +02:00
Jeremi Nieminen 5e88415c56 Made the fields better looking 2018-11-30 01:08:15 +02:00
Jeremi Nieminen 518d89cc42 Questions and answers sections working with redux 2018-11-30 00:37:26 +02:00
Jeremi Nieminen 416ed12560 Reducer updating questions array answer correctly 2018-11-29 17:31:09 +02:00
Jeremi Nieminen 87f04038a9 Switched preview button position and color and added longer timeout 2018-11-29 17:09:30 +02:00
Jeremi Nieminen 63750292de Added cards and made the the elements in the registration page's topic list separate component, added some styles 2018-11-26 19:24:07 +02:00
Jeremi Nieminen f7bfaf20b4 Made the topic form look cleaner 2018-11-26 14:02:13 +02:00
Jeremi Nieminen 7230542641 Removed console logs 2018-11-26 13:45:43 +02:00
Jeremi Nieminen a43bdb7341 Added indexes next to topics 2018-11-25 23:45:27 +02:00
Jeremi Nieminen 60370d96ae Drag and drop working with redux state update 2018-11-25 23:13:58 +02:00
Jeremi Nieminen 9fcdc7869f Removed all but error console logs 2018-11-25 12:01:23 +02:00
Jeremi Nieminen 51d2a9316e Fix for missing favicon in production 2018-11-24 21:50:04 +02:00
Jeremi Nieminen 04b20f7d3d Merged master into branch 2018-11-24 18:32:21 +02:00
Jeremi Nieminen d9f80c9096 Fixed topic references 2018-11-24 18:25:32 +02:00
Jeremi Nieminen 8ccce75de2 Changed registrationpage topic rendering 2018-11-24 18:09:31 +02:00
jexniemiandGitHub cf587d0f95 Merge branch 'master' into miscellaneous-fixes 2018-11-24 17:27:18 +02:00
Jeremi Nieminen b13cb99b0a Changed fetching topics on registrationpage to topics/active 2018-11-24 16:41:33 +02:00
Jeremi Nieminen 438a9351c8 Fixed notification props error 2018-11-24 16:10:15 +02:00
Jeremi Nieminen 59edf70c6b Fixed button error 2018-11-24 16:08:23 +02:00
jexniemiandGitHub c03c052736 Merge pull request #54 from ohtuprojekti-ilmo/url-fixes 
production backend accessed through https
 2018-11-24 15:49:51 +02:00
jexniemiandGitHub 1d385d448a Merge pull request #45 from ohtuprojekti-ilmo/miscellaneous-fixes 
email is now always sent, changed email content, secret acquired from…
 2018-11-24 15:36:59 +02:00
Jeremi Nieminen 952d1e2b60 Changed redirect from login to registrationpage instead of landingpage 2018-11-23 18:55:42 +02:00
Jeremi Nieminen 3d79af652c Added questions 2018-11-23 15:04:07 +02:00
Jeremi Nieminen 8bcf13e87c Registration page basic layout created with map functions for questions and topics 2018-11-23 14:55:55 +02:00
Jeremi Nieminen e77d07bc43 Added favicon and renamed title 2018-11-17 17:47:41 +02:00
Jeremi Nieminen 914228833b Added log out button to navigation bar 2018-11-17 17:20:19 +02:00
Jeremi Nieminen 9da0849861 Added loading spinner with app reducer and actions for isLoading, added redirect from login page to / 2018-11-17 13:37:24 +02:00
Jeremi Nieminen a85a3c594f Removed unused ProtectedRoute 2018-11-16 15:15:34 +02:00
Jeremi Nieminen 891acbf609 Protected router working 2018-11-16 15:08:33 +02:00
jexniemiandGitHub f5929dea97 Merge pull request #33 from ohtuprojekti-ilmo/token-check-route 
created route to check token validity
 2018-11-08 14:21:16 +02:00
Jeremi Nieminen 82e6e376fe Fixed timeout and changed error messages to finnish 2018-11-07 14:31:22 +02:00
Jeremi Nieminen b225cab490 Added animation to username in navigation bar 2018-11-07 14:09:22 +02:00
jexniemiandGitHub d9401c7c5c Merge pull request #27 from ohtuprojekti-ilmo/fixfix 
Added license and fixed security alerts
 2018-11-03 17:08:38 +02:00
Jeremi Nieminen 07a2e0f9ca Removed unused constructor 2018-11-03 16:55:40 +02:00
Jeremi Nieminen 0f60d4bd3c Refactored components, added rendering to a new page when logging in, added styles and username to navigation bar 2018-11-03 16:48:58 +02:00
Jeremi Nieminen 32fa3f859f Saves to token to localstorage when logging in 2018-11-01 17:27:30 +02:00
jexniemiandGitHub a91652c084 Merge pull request #24 from ohtuprojekti-ilmo/topic-service 
Added axios service for topics
 2018-10-30 16:50:50 +02:00
Jeremi Nieminen 26aababca9 Made some css fixes and translated login page button 2018-10-24 15:40:03 +03:00
Jeremi Nieminen 28e7f2ebc2 Resolved merge conflicts with navigation bar 2018-10-19 17:41:30 +03:00
jexniemiandGitHub 3ed2e4a8c9 Merge pull request #20 from ohtuprojekti-ilmo/topic-redux 
Added redux to topic form page
 2018-10-19 17:03:24 +03:00
Jeremi Nieminen 5982cb3ff9 Added styles and renamed stuff 2018-10-19 15:28:25 +03:00
Jeremi Nieminen 139f43d327 Refactored navigation bar name and inline css to css file 2018-10-19 12:44:42 +03:00
Jeremi Nieminen 0dc9418152 Added App.css 2018-10-18 15:32:25 +03:00
Jeremi Nieminen 5d116c2728 Moved inline styles to separate file and added idea for simple validation solution 2018-10-18 15:11:24 +03:00
Jeremi Nieminen addf993cda Configured backend urls for staging and production environments 2018-10-12 16:27:25 +03:00
Jeremi Nieminen 559b363aeb Added some styles 2018-10-12 12:31:03 +03:00
Jeremi Nieminen 8817b1af3e Refactored router, moved redux loginpage state handling from app to loginPage, added first material ui components 2018-10-10 15:25:27 +03:00
jexniemiandGitHub 6501443555 Merge pull request #10 from ohtuprojekti-ilmo/url-fix 
Url fix
 2018-10-07 18:18:41 +03:00
Jeremi Nieminen a5c24c8438 Added linting to travis 2018-10-07 17:52:21 +03:00
Jeremi Nieminen e840e933f2 Fixed default case warnings 2018-10-03 20:08:47 +03:00
Jeremi Nieminen eac5f8b242 Add reducer for username and password field state handling 2018-10-03 20:02:08 +03:00
Jeremi Nieminen 071cb687a3 Test reducer working with connected app 2018-10-03 15:39:49 +03:00
jexniemiandGitHub 06c47c6b88 Merge pull request #3 from ohtuprojekti-ilmo/cleanup 
Cleaned up package.json
 2018-09-28 10:42:09 +03:00
Jeremi Nieminen ef70abbe3c Cleaned up package.json 2018-09-28 10:40:53 +03:00
jexniemiandGitHub 828337932b Merge pull request #2 from ohtuprojekti-ilmo/dockerfile-fix 
fix frontend dockerfile
 2018-09-26 20:46:05 +03:00
Jeremi Nieminen 64c388f4fa Merged remote README.md 2018-09-23 20:31:44 +03:00
Jeremi Nieminen d41c4ecfd8 Added logger and dockerhub push to travis.yml 2018-09-23 20:30:19 +03:00
jexniemiandGitHub 25d2dafb4b Update README.md 2018-09-21 15:37:27 +03:00
jexniemiandGitHub f45b8db9af Update README.md 2018-09-21 15:36:41 +03:00
jexniemiandGitHub 1eb1f40389 Update README.md 2018-09-21 14:21:27 +03:00
jexniemiandGitHub fe9233c3cc Update README.md 2018-09-21 14:19:38 +03:00
jexniemiandGitHub 9803d2b290 Update README.md 2018-09-21 14:19:21 +03:00
jexniemiandGitHub 40b2215251 Update README.md 2018-09-21 14:16:11 +03:00
jexniemiandGitHub 564ef14d3e Update README.md 2018-09-21 14:16:00 +03:00
jexniemiandGitHub 4a2015b8d6 Update README.md 2018-09-21 14:15:24 +03:00
jexniemiandGitHub 5c5412d8f9 Update README.md 2018-09-21 14:08:16 +03:00
Jeremi Nieminen 8dc6482d91 Fixed typo 2018-09-21 14:07:01 +03:00
Jeremi Nieminen 985dd6751f Added link to Docker cheat sheet 2018-09-21 14:06:27 +03:00
Jeremi Nieminen d1f7341c85 Added Docker file 2018-09-21 14:02:22 +03:00
Jeremi Nieminen f1d21390f4 Added working test request path 2018-09-19 13:46:48 +03:00
jexniemiandGitHub 8250f69495 Merge pull request #2 from ohtuprojekti-ilmo/travis 
Set node version to 8 for travis
 2018-09-19 12:25:34 +03:00
Jeremi Nieminen c38f959f6a Set node version 2018-09-19 12:23:13 +03:00
jexniemiandGitHub 031927c62e Merge pull request #1 from ohtuprojekti-ilmo/travis 
Implemented travis, testing
 2018-09-19 12:20:39 +03:00
Jeremi Nieminen 4318049531 Implemented travis, testing 2018-09-16 21:09:41 +03:00
Jeremi Nieminen 01e0785499 Initial commit with project structure 2018-09-14 16:10:35 +03:00