Skip to content

Commit

Permalink
Merge pull request #141 from UnitapApp/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
Mohamad Bastin authored Oct 17, 2023
2 parents d67f4d5 + f19e2b5 commit 004dd35
Show file tree
Hide file tree
Showing 23 changed files with 2,724 additions and 220 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/django.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ jobs:
run: python -m pip install --upgrade pip
- name: Install requests
run: pip install requests
- name: Install lnpay
run: pip install lnpay-py
- name: Install Dependencies
run: pip install -r requirements.txt
- name: Run Tests
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ __pycache__/
*.so

tmp.py
dbdata.json

# Distribution / packaging
.Python
Expand Down
18 changes: 18 additions & 0 deletions authentication/migrations/0018_userprofile_is_temporary.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 4.0.4 on 2023-10-10 11:59

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('authentication', '0017_alter_userprofile_username'),
]

operations = [
migrations.AddField(
model_name='userprofile',
name='is_temporary',
field=models.BooleanField(default=False),
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 4.0.4 on 2023-10-10 17:38

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('authentication', '0018_userprofile_is_temporary'),
]

operations = [
migrations.RenameField(
model_name='userprofile',
old_name='is_temporary',
new_name='is_new_by_wallet',
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Generated by Django 4.0.4 on 2023-10-10 23:03

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('authentication', '0019_rename_is_temporary_userprofile_is_new_by_wallet'),
]

operations = [
migrations.RemoveField(
model_name='userprofile',
name='is_new_by_wallet',
),
]
2 changes: 0 additions & 2 deletions authentication/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ def get_or_create(self, first_context_id):
except UserProfile.DoesNotExist:
_user = User.objects.create_user(username=first_context_id)
_profile = UserProfile(user=_user, initial_context_id=first_context_id)
# _profile.is_aura_verified
# _profile.is_meet_verified
_profile.save()
return _profile

Expand Down
12 changes: 12 additions & 0 deletions brightIDfaucet/celery.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,18 @@
"set-raffle-winner": {
"task": "prizetap.tasks.set_the_winner_of_raffles",
"schedule": 300
},
"request-random-words-for-linea-raffles": {
"task": "prizetap.tasks.request_random_words_for_expired_linea_raffles",
"schedule": 150
},
"draw-linea-raffles": {
"task": "prizetap.tasks.draw_expired_linea_raffles",
"schedule": 60
},
"set-linea-raffle-winners": {
"task": "prizetap.tasks.set_the_winner_of_linea_raffles",
"schedule": 60
}
}

Expand Down
492 changes: 492 additions & 0 deletions lin.csv

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions prizetap/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,16 @@ class RaffleٍEntryAdmin(admin.ModelAdmin):
def get_wallet(self, obj):
return obj.user_profile.wallets.get(wallet_type=NetworkTypes.EVM).address

class LineaRaffleEntriesAdmin(admin.ModelAdmin):
list_display = [
"pk",
"wallet_address",
"is_winner"
]



admin.site.register(Raffle, RaffleAdmin)
admin.site.register(RaffleEntry, RaffleٍEntryAdmin)
admin.site.register(Constraint, UserConstraintBaseAdmin)
admin.site.register(LineaRaffleEntries, LineaRaffleEntriesAdmin)
Loading

0 comments on commit 004dd35

Please sign in to comment.