Commit Graph

175 Commits

Author SHA1 Message Date
Bogdan Artemenko
d859341310
web/satellite Master fix (#2663) 2019-07-30 18:09:47 +03:00
Yingrong Zhao
efa2c776b7
satellite/satellitedb: add updateEarnedCredits method for user_credits table (#2609)
* parent 13dd501042
author Yingrong Zhao <yingrong.zhao@gmail.com> 1563560530 -0400
committer Yingrong Zhao <yingrong.zhao@gmail.com> 1563581673 -0400

parent 13dd501042
author Yingrong Zhao <yingrong.zhao@gmail.com> 1563560530 -0400
committer Yingrong Zhao <yingrong.zhao@gmail.com> 1563581428 -0400

satellite/console: add referral link logic (#2576)

* setup referral route

* referredBy

* add user id

* modify user query

* separate optional field from userInfo

* get current reward on init of satellite gui

* remove unsed code

* fix format

* only apply 0 credit on registration

* only pass required information for rewards

* fix time parsing

* fix test and linter

* rename method

* add todo

* remove user referral logic

* add null check and fix format

* get current offer

* remove partnerID on CreateUser struct

* fix storj-sim user creation

* only redeem credit when there's an offer

* fix default offer configuration

* fix migration

* Add helper function for get correct credit duration

* add comment

* only store userid into user_credit table

* add check for partner id to set correct offer type

* change free credit to use invitee credits

* remove unecessary code

* add credit update in activateAccount

* remove unused code

* fix format

* close reader and fix front-end build

* move create credit logic into CreateUser method

* when there's no offer set, user flow shouldn't be interrupted by referral program

* add appropriate error messages

* remove unused code

* add comment

* add error class for no current offer error

* add error class for credits update

* add comment for migration

* only log secret when it's in debug level

* fix typo

* add testdata
2019-07-30 09:21:00 -04:00
Yehor Butko
518a198221
CSP implementation for satellite console (#2644)
* CSP implementation for console
2019-07-30 13:13:24 +03:00
Vitalii Shpital
2b2a01fedc
web/satellite cursor:pointer removed from new project popup (#2604) 2019-07-30 12:49:17 +03:00
Vitalii Shpital
5ab32a4944
web/satellite project payment methods code refactored, dialogs repositioned, bugs fixed (#2643) 2019-07-29 15:47:49 +03:00
Yingrong Zhao
3b6c69c594
fix mutation (#2641) 2019-07-26 10:58:17 -07:00
Faris Huskovic
2144181c99
satellite/marketingweb: Add Partner Offer Type (#2540) 2019-07-25 18:06:23 -04:00
Vitalii Shpital
4de815ae5a
web/satellite short name updated to nickname (#2610) 2019-07-24 13:59:48 +03:00
Yingrong Zhao
aaf3283b4e
satellite/console: referral link for individual users (#2614)
* init

* change give credit to be invitee credits for free credits

* remove unused variables

* fix tests
2019-07-23 12:08:07 -04:00
Nikolay Yurchenko
9204c57c06 markup for add stripe card popup (#2570) 2019-07-22 18:28:38 +03:00
Vitalii Shpital
30eeb64816
web/satellite add card button on account payment methods disabled (#2613) 2019-07-22 17:26:23 +03:00
Vitalii Shpital
499b5db83e
web/satellite info button on create account screen fixed (tooltip created) (#2612) 2019-07-22 17:21:24 +03:00
Yehor Butko
6143be5915
V3-1839 web satellite auth cookie subdomain differentiation (#2601)
* V3-1839 web satellite auth cookie subdomain differentiation
2019-07-22 12:46:26 +03:00
Yingrong Zhao
6778caf846
satellite/console: add referral link logic (#2576)
* setup referral route

* referredBy

* add user id

* modify user query

* separate optional field from userInfo

* get current reward on init of satellite gui

* remove unsed code

* fix format

* only apply 0 credit on registration

* only pass required information for rewards

* fix time parsing

* fix test and linter

* rename method

* add todo

* remove user referral logic

* add null check and fix format

* get current offer

* remove partnerID on CreateUser struct

* fix storj-sim user creation

* only redeem credit when there's an offer

* fix default offer configuration

* fix migration

* Add helper function for get correct credit duration

* add comment

* only store userid into user_credit table

* add check for partner id to set correct offer type

* change free credit to use invitee credits

* remove unecessary code
2019-07-19 14:22:10 -04:00
Vitalii Shpital
ff31f865a1
web/satellite hover to cross buttons added (#2603) 2019-07-19 18:59:15 +03:00
Vitalii Shpital
17a2e81af6
web/satellite buckets empty state and search bugs fixed (#2597) 2019-07-19 16:40:42 +03:00
Yehor Butko
af93366fb0
V3-2076 Do not allow users to type more than the allowed number of ch… (#2600)
* V3-2076 Do not allow users to type more than the allowed number of characters in the create project name field
2019-07-19 16:32:01 +03:00
Yehor Butko
8fb70aed11
Satellite frontend refactoring (#2537)
Satellite frontend refactoring
2019-07-18 16:39:39 +03:00
Vitalii Shpital
20a7748fb3
web/satellite close cross symbol bug fixed (#2583) 2019-07-17 17:33:07 +03:00
Yehor Butko
5f194b4533
SNO Dashboard API (#2427)
* SNO Dashboard API
2019-07-17 14:42:00 +03:00
Faris Huskovic
003828c348
web/marketing/pages: partner UI table (#2523)
* add UI table for partner offers

* remove award credit from partner table, add referral link column
2019-07-12 09:52:00 -04:00
Yingrong Zhao
6e57b102c5
satellite/satellitedb: remove num_redeemed in offers table (#2510)
* remove num_redeemed

* remove the field frol Offer struct

* remove the field in the UI templates

* fix merge conflict

* fix migration

* fix merge conflict

* fix typo
2019-07-12 09:19:18 -04:00
Bogdan Artemenko
32e0227c45
Project Payment methods (#2037) 2019-07-10 23:29:26 +03:00
Faris Huskovic
0d294103e9
satellite/rewards: nicer offers handling (#2390)
* organize offers

* revert changes to go.mod and go.sum

* change OfferStatus enums back to original

* revert modified auto-gen files

* don't render empty row if offers is empty

* change return val of ListAll to Offers

* fix build

* add method to check for empty offer when rendering template

* fix typo

* fix lint and typos

* lean out IsEmpty

* dont use named return vals

* better clarify offer statuses

* change back order of setting offer.Status

* lint

* satellite/marketingweb: allow disabling rewards (#2392)

* implement handler for stop offer endpoint

* use proper text and fix data-target for free-credit stop modal
2019-07-10 13:12:40 -04:00
Nikolay Yurchenko
8f024b3db8 scss beautification (#2499) 2019-07-10 12:55:40 +03:00
Vitalii Shpital
aefb775061
frontend template tabs fixed (#2497) 2019-07-09 18:04:51 +03:00
Bogdan Artemenko
e81e25c271
Web satellite master fix (#2495) 2019-07-09 16:51:33 +03:00
Vitalii Shpital
93cd05d600 error icon changed (#2475) 2019-07-08 22:46:57 -04:00
Yehor Butko
dbc07fa865
Satellite frontend tabs fixed (#2465)
* Satellite frontend tabs fixed
2019-07-08 16:45:25 +03:00
Yehor Butko
b5f8a536e5 Satellite console frontend data reload (#2457)
* Satellite console frontend data reload

* removing deleted projects, code formatted

* usage report code formatted

* removing commented code
2019-07-05 16:49:10 +03:00
Egon Elbre
e8605d312e satellite/rewards: use USD type (#2384)
* fix String converison

* add method

* rename to USD

* fix types

* fix parsing of forms

* fix tests

* fix header

* use larger type

* use int64

* rename func

* move currency to separate package

* convert types, renames

* fix usercredits

* remove unnecessary conversion

* fix comment and named params
2019-07-01 15:16:49 -04:00
Faris Huskovic
ebd976ec28
satellite/marketing: Create New Offer (#2186)
* update UI to reflect final mockups

* implement create handler and render offers table data to UI

* fix line-height unit and remove important from selectors

* update file names and ids for clarity

* shorten 'label' in ids

* localize global vars, fix endpoint names, remove unnecessary receiver, fix comments

* fix unnecessary initialization of pointer

* correct file-naming conventions

* register timeConverter in an init func for safety and remove unnecessary important from css

* consolidate create endpoints and add comments

* register timeConverter in init func

* add copyright to files

* introduce require pkg

* add proper http server unit test

* update linting and create offers concurrently in unit test

* fix getOffers comment

* add copy-right to unit-test

* fix data-races

* fix linting

* remove converter in NewServer

* requested changes in progress

* add require for checking status code

* renamed template file

* fix 400 handler

* fix missing copyright and remove extra line

* fix build

* run goroutine for testing parallel

* evaluate reqType with switch stmt and promp for credit amount in cents

* fix lint issue

* add default case

* remove unnecessary var

* fix range scope error

* remove empty lines and use long form for struct field

* fix merge conflicts

* fix template reference

* fix modal id

* not delete package

* add currency formatting and requested changes

* markup formatting

* lean out currency logic and move wait outside loop

* pass ToDollars func to home template

* fix lint
2019-06-28 10:34:10 -04:00
Egon Elbre
05a283f331 jenkins: disallow files over 600KB (#2323) 2019-06-26 08:44:52 +02:00
Yaroslav Vorobiov
841bb83a6a fix ts lint build error (#2325) 2019-06-25 08:11:04 -04:00
Yingrong Zhao
5fb2e01912
web/satellite: create ReferralStats component (#2309)
* create referral stats component

*  add title

* add copyright

* use correct font
2019-06-24 13:40:59 -04:00
Nikolay Yurchenko
20041d43ba hovers on icons, apikey name errormessage added (#2307) 2019-06-24 18:50:07 +03:00
Yehor Butko
96bc0ccfa4
SNO Dshboard initial api endpoint added (#2284)
* initial api endpoint added
2019-06-24 18:15:31 +03:00
Yingrong Zhao
1c2067a090
Create graphql query for getting user credit usage (#2255)
* set up creditUsage query

* rename function name to follow convention

* remove unused code

* add coipyright

* fix linting
2019-06-20 09:09:50 -04:00
Yehor Butko
e5fd0287e4
V3-1819 Storage node operator server and service started (#2112)
* V3-1819 Storage node operator server and service started
2019-06-20 14:52:32 +03:00
Yaroslav Vorobiov
503b951bcd
modify build scripts for satellite ui (#2228) 2019-06-18 16:36:54 +03:00
Yaroslav Vorobiov
78db9d2780
Fix project email sign in and project links and comments (#2166) 2019-06-18 13:49:11 +03:00
Faris Huskovic
7795ba8169
update UI to reflect final mockups (#2175)
* update UI to reflect final mockups

* fix line-height unit and remove important from selectors

* update file names and ids for clarity

* shorten 'label' in ids

* correct file-naming conventions

* add copyright to files

* check if break in imports is causing lint error

* resolve lint

* tidy go mod

* fix shorthands
2019-06-17 21:57:04 -04:00
Egon Elbre
f4f776d092 Use mail.test as domain in emails (#2224) 2019-06-18 02:28:40 +02:00
Yingrong Zhao
1a5483221a add fake id so there's always a segment instance created on Vue (#2214) 2019-06-14 18:33:44 +03:00
Yingrong Zhao
7a68b10904 fix satellite gui build (#2204) 2019-06-14 15:34:18 +03:00
Yingrong Zhao
ec63204ab1 fix export name for DatePicker (#2185) 2019-06-13 16:04:48 +02:00
Yingrong Zhao
6a826c53c5
fix satellite gui build issue (#2181)
* move import statement out from declare module

* delete unused component
2019-06-12 13:39:48 -04:00
Egon Elbre
fdddaa2a47 Fix marketingweb code (#2177)
* set to only listen on 127.0.0.1, move static files to same location, better template handling

* handle error

* fix path in storj-sim

* revert template handling changes

* code shouldn't panic on invalid tempalte

* do not rewrite once writing has started

* write correct error code

* use filepath for path handling

* revert change

* fix

* fix mod tidy

* use correct error code for not found, avoid infinite loop on failure
2019-06-12 09:42:39 -04:00
Yingrong Zhao
df1401d952 add segment.io into satellite GUI (#1946)
* Inject segment snippet

* Add page tracking on components mounted

* Use router state to send tracking data to segment.io

Move router tracking into router file

* Create plugin for analytics

* Add plugin

* Add .env file for segment track id

* Replace custome plugin with vue-segment-analytics package

* Rename .env file to not be used for production

* Add DNT check before tracking

clean up code

* move tracker to be above page reload

* Inject segment snippet

* Add page tracking on components mounted

* Use router state to send tracking data to segment.io

Move router tracking into router file

* Create plugin for analytics

* Add plugin

* Add .env file for segment track id

* Replace custome plugin with vue-segment-analytics package

* Rename .env file to not be used for production

* Add DNT check before tracking

clean up code

* move tracker to be above page reload
2019-06-11 15:00:23 -04:00
Bogdan Artemenko
30784484c8
Fixed error notification on fail project member deletion. (#2148) 2019-06-07 13:56:07 +03:00