KevinMidboe/vinlottis
1
0
Fork 0
Code Issues 8 Pull Requests 14 Packages Projects Releases Wiki Activity
440 Commits 17 Branches 0 Tags
ea278a489250ee00a1a321375f4624f24c319a66
Commit Graph

440 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adrian Thompson ea278a4892 remove console log 2020-09-07 14:50:40 +02:00
Adrian Thompson 4a98e79414 fix conflicts and rework routes 2020-09-07 14:49:24 +02:00
Adrian Thompson 6d26da1817 resolve first batch of comments 2020-09-07 13:15:10 +02:00
KevinMidboe 1aa266ad71 Merge pull request #21 from KevinMidboe/refactor/routeSeparation 
Refactor/route separation
 2020-09-06 16:00:11 +02:00
KevinMidboe 20dd638133 Resovled merge conflict in yarn.lock. 2020-09-06 15:58:17 +02:00
KevinMidboe f6c1e35180 Removed deprecated package: requests. 2020-09-06 15:56:09 +02:00
KevinMidboe bf0670c285 Reflect backend changes. Winners nested in lottery. 2020-09-06 15:20:11 +02:00
KevinMidboe 7e08e2d628 Finer control when updating lottery. 
Lottery update now has endpoint/functions for also submitting winners,
wines and lottery (what's bought) separatly.
 2020-09-06 15:17:56 +02:00
KevinMidboe 4b926c9ece Forward /winner/:id to frontend endpoint. (w/ hash) 2020-09-06 15:17:16 +02:00
KevinMidboe a7f4f9af27 Utils file. Includes date format function. 2020-09-06 14:42:27 +02:00
KevinMidboe ec1685dfa8 Adding attendee shows toast not alert. 
Also better feedback when no colors are defined or name/phone number
missing.
 2020-09-06 14:41:04 +02:00
KevinMidboe f171853c22 Register wines, lottery and winners separatly. 
Register page now uses new /lottery, /lottery/wines and /lottery/winners
endpoints for sending information separatly. This allows lottery
(colors, bought total & stolen), lottery wines (prelottery wines) and
lottery winners (wine mapped to winner) sent. Before /lottery/winners &
/lottery was sent together to a single endpoint.
 2020-09-06 14:34:43 +02:00
KevinMidboe c1f0a1b7f3 Padding for air around elements. 2020-09-06 14:33:45 +02:00
KevinMidboe 55b3552786 Flex wrap winner raffles to not overflow vertical. 2020-09-06 14:32:29 +02:00
KevinMidboe 4f9b4ad3cf Some margin between button and text. 2020-09-06 14:29:30 +02:00
KevinMidboe ef035d3c44 Set line-height for vin-button same as font-size. 2020-09-06 14:22:01 +02:00
KevinMidboe 7684fde8e5 global rule for flex column. 2020-09-06 14:21:45 +02:00
KevinMidboe 6dc4c9080e Reflecting changes from renaming backend routes. 2020-09-06 14:21:10 +02:00
KevinMidboe 8268efe625 Include positioning stylesheet in root Vue comp. 2020-09-06 14:20:37 +02:00
KevinMidboe a30dc2a419 Renamed & moved frontend router. 2020-09-06 14:20:01 +02:00
KevinMidboe 1d714d1e5a Removed router, refactored virtual functoinality. 
- Removed the router from virtualRegistration so router.js handles routing
and virtualRegistration only exports functions.
- Refactored what code is in each of the virtual(Lottery/Registration)
files. /finish in Lottery now only sends update to all winners and
delegates sending to next winner in line, and setting timeout to
virtualRegistration.
- Better error handling and all responses from virtualRegistration has
message in json response.
 2020-09-06 14:14:26 +02:00
KevinMidboe 4f054a0437 Message uses node's https insteadof requests. 
Messages re-written to use nodes built in https over external requests
package.
Also updated message functions to always return promises and have
clearer names for what their purpose is.
 2020-09-06 14:13:36 +02:00
KevinMidboe dde8fe1cbe Renamed app > router.js. VirtualLottery in router. 2020-09-06 14:07:18 +02:00
Adrian Thompson ed6ac2ac01 move api call, remove delete requested wine button, rename emit 2020-09-04 15:42:03 +02:00
Adrian Thompson f5768044e8 Merge branch 'master' of github.com:KevinMidboe/vinlottis 2020-09-02 09:51:45 +02:00
Adrian Thompson 1e5c1faa5b quick css fix 2020-09-02 09:51:11 +02:00
Adrian Thompson 88e42cb87a fix refresh of requested wines 2020-09-01 12:30:50 +02:00
Adrian Thompson 99df5bb8c1 fix check 2020-09-01 10:56:17 +02:00
Adrian Thompson c38f5c8819 some cleaning and empty wine list check 2020-09-01 10:44:54 +02:00
Adrian Thompson a5ae46f5c3 working delete requested wine if admin 2020-09-01 10:17:17 +02:00
Adrian Thompson 1c95244850 interface on requested wines with sub-par css 2020-08-31 16:45:19 +02:00
Adrian Thompson dd9edf160e add endpoint for retrieving all requested wines 2020-08-31 12:15:22 +02:00
Adrian Thompson d67c1e77bd add new route and component for requested wines 2020-08-31 10:46:07 +02:00
Adrian Thompson c6a2bfe4b2 include modal on request specific wine 2020-08-31 10:45:42 +02:00
Adrian Thompson b25e3a38f8 add modal component 2020-08-31 10:45:18 +02:00
Adrian Thompson 543a7a6eb3 some cleanup and css fix for mobile 2020-08-30 17:27:03 +02:00
KevinMidboe fd17e11e87 Register io to all req with app.set('socketio'). 2020-08-28 18:46:35 +02:00
KevinMidboe 51a7107802 Endpoints defined and exported as functions. 
Changed all routes to functions and export them to app.js to handle the
registration of route using the functions exported from this file.
 2020-08-28 18:45:33 +02:00
Adrian Thompson aea808dae1 🍷 2020-08-28 17:20:37 +02:00
Adrian Thompson 7b7895728b loko 2020-08-28 17:01:53 +02:00
Adrian Thompson f785a111d8 cleanup 2020-08-27 16:50:04 +02:00
Adrian Thompson 15b84a9b18 add token and some styling 2020-08-27 15:15:43 +02:00
Adrian Thompson 09f0436f98 add search functionality 2020-08-27 13:25:44 +02:00
KevinMidboe 3256c62a39 Merge pull request #20 from KevinMidboe/dependabot/npm_and_yarn/elliptic-6.5.3 
Bump elliptic from 6.5.2 to 6.5.3
 2020-08-27 00:52:10 +02:00
KevinMidboe 827eb716d7 Define running port as var and log it. 2020-08-27 00:33:03 +02:00
KevinMidboe a6a84e4b29 Api files no longer return router, exports usable functions. 2020-08-27 00:31:01 +02:00
KevinMidboe ec80aa8bcc All api routes & their respective functions. 2020-08-27 00:29:01 +02:00
KevinMidboe 262efa0380 All api endpoints are moved to apiRouter. 2020-08-27 00:28:35 +02:00
KevinMidboe 5fc3bca01a Merge pull request #18 from KevinMidboe/feat/lottery-endpoint 
Feat/lottery endpoint
 2020-08-14 16:56:47 +02:00
dependabot[bot] 8431e52e0a Bump elliptic from 6.5.2 to 6.5.3 
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.2 to 6.5.3.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.2...v6.5.3)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-08-01 11:01:41 +00:00