From 9abd81245eb492f6f12b99110e52749a83ec57a9 Mon Sep 17 00:00:00 2001 From: Oliver Marks Date: Fri, 6 Jan 2017 20:35:56 +0000 Subject: [PATCH] Initial profile management page --- .drone.yml | 41 ++++++++++++++++++ .gitignore | 1 + README.org | 8 ++++ config/settings/common.py | 2 +- config/urls.py | 1 + dev.yml | 2 +- mhackspace/static/images/hackspace.png | Bin 0 -> 1744 bytes mhackspace/templates/base.html | 3 ++ mhackspace/templates/users/user_detail.html | 26 +++++++++++ mhackspace/templates/users/user_form.html | 3 +- mhackspace/users/admin.py | 2 +- mhackspace/users/forms.py | 10 +++++ .../migrations/0002_membership_userblurb.py | 36 +++++++++++++++ .../users/migrations/0003_user_image.py | 20 +++++++++ .../migrations/0004_auto_20170106_2030.py | 24 ++++++++++ mhackspace/users/models.py | 18 ++++++-- mhackspace/users/views.py | 34 ++++++++++++--- 17 files changed, 218 insertions(+), 13 deletions(-) create mode 100644 .drone.yml create mode 100644 .gitignore create mode 100755 mhackspace/static/images/hackspace.png create mode 100644 mhackspace/users/forms.py create mode 100644 mhackspace/users/migrations/0002_membership_userblurb.py create mode 100644 mhackspace/users/migrations/0003_user_image.py create mode 100644 mhackspace/users/migrations/0004_auto_20170106_2030.py diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..ac4f3d0 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,41 @@ +pipeline: + backend: + commands: + - python manage.py test + +#volumes: +# postgres_data_dev: {} +# postgres_backup_dev: {} + +services: + postgres: + build: ./compose/postgres +# volumes: +# - postgres_data_dev:/var/lib/postgresql/data +# - postgres_backup_dev:/backups + environment: + - POSTGRES_USER=mhackspace + +# django: +# build: +# context: . +# dockerfile: ./compose/django/Dockerfile-dev +# command: /start-dev.sh +# depends_on: +# - postgres +# environment: +# - POSTGRES_USER=mhackspace +# - USE_DOCKER=yes +# volumes: +# - .:/app +# ports: +# - "8180:8000" +# links: +# - postgres +# - mailhog + + mailhog: + image: mailhog/mailhog + ports: + - "8125:8025" + diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..65426bc --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +media/* diff --git a/README.org b/README.org index e1b3262..b9b8df3 100644 --- a/README.org +++ b/README.org @@ -40,3 +40,11 @@ docker-compose -f dev.yml run django python manage.py migrate #+BEGIN_SRC sh docker-compose -f dev.yml run django python manage.py createsuperuser #+END_SRC + + +** Migrations / Managing default data +If you want to export some data you entered into the admin area you can use =dumpdata= and =loaddata= to export and import. + +#+BEGIN_SRC sh +docker-compose -fdev.yml run django python manage.py dumpdata feeds > mhackspace/feeds/fixtures/default.json +#+END_SRC diff --git a/config/settings/common.py b/config/settings/common.py index 519fb5d..778f21b 100644 --- a/config/settings/common.py +++ b/config/settings/common.py @@ -45,10 +45,10 @@ THIRD_PARTY_APPS = ( # Apps specific for this project go here. LOCAL_APPS = ( # custom users app + # Your stuff: custom apps go here 'mhackspace.users.apps.UsersConfig', 'mhackspace.feeds', 'mhackspace.contact', - # Your stuff: custom apps go here ) # See: https://docs.djangoproject.com/en/dev/ref/settings/#installed-apps diff --git a/config/urls.py b/config/urls.py index f9ae71c..5012886 100644 --- a/config/urls.py +++ b/config/urls.py @@ -17,6 +17,7 @@ urlpatterns = [ url(r'^contact/$', contact, name='contact'), + # need to be logged in for these urls # Django Admin, use {% url 'admin:index' %} url(settings.ADMIN_URL, admin.site.urls), diff --git a/dev.yml b/dev.yml index c7a5e5f..70c28d5 100644 --- a/dev.yml +++ b/dev.yml @@ -34,5 +34,5 @@ services: mailhog: image: mailhog/mailhog ports: - - "8025:8125" + - "8125:8025" diff --git a/mhackspace/static/images/hackspace.png b/mhackspace/static/images/hackspace.png new file mode 100755 index 0000000000000000000000000000000000000000..33e2ec6e4b2486d10431467efd993d5fcfbbe506 GIT binary patch literal 1744 zcmV;>1~2)EP);@BH_k8Rj z&)v?x=RN=bd7k%u{?GHi0(O`zmjUa5p8}OYIZz5LN{_e4@pS?W< z+S(+}o!gG4?U@xCcH1=Y79}Nb($u8bN1&x;6^TSQa6j{7$APDj<^Sppbm&eM2-J~C z49p{VfFA(^1OglM28ufI?gxUvLMtflcDpIc%Oj>JRvym-HsST2r@w!|yaxh-ZNLYB z(<=Brzn@Q^f1c%w7hCm&2)sui@RGST5D3(vY2CUW(gDA+xEO%(XcTXIJ7bZERU!#s z6SDj_eFCyv0Sp3eJHXGF4J0lDtC8iA%poMp3xFQG!2>KSDx%--&n27|0bR7UN!ixG z@2u`N*}&UK;sGWmUcNPfJ$vo~nr|2Q>%p8%axIz6WsBWSYpdsG0@tp+4iwx@@Bqaw z7fT8Xav`t?Ref#lB2Edjugq#2$>HFO?b}&ZT51Zx#p!9PgF#MAPFmMa3l=P6$Bs)W z52RG3Dewi7gqlp!+}mq9B<{%1=SX8C_b*vul|TWix@C3&-i z62Vhgs7qpFRTUqHLP(;B+qiZT(6j+(x(v)|x7k-)iva99dK7>^`h3)Mb^r z8d?)EML`36?d|+O7Bdn?4~clauL3J`-70GWsIY6F-@bY^1(Jj$iX5)5$G3dBrS-Y8xR^e_pS#_< zisl{%kTI_>b-U?(?m0u?$08AGIy=#Te{9`q8T@P#2Bi36N2dCAsoPDz-)}esrmkG! zS~AJu`g+!_SYb<9wyda#BaMyOJW=StCVSB1VYI0!>z9wKDjU1I8Jd`|t@d=Jb@okm zCKkin-p=UMl<^uc%WgBRs;obBh+|)WjXN*T(0t?3DAmDWwjJpk2N2Hm@0nN(Uq=U_ za5%T7kE-%SR~Mg-kMl`GgQ2htg~L30@St7+6mbBdY$IkoVUFMF$=g;%m3ojr# z92^`To|Cb201xm_XS&haq&ITL69AKYM zS6v-Whr=p(fX_r~YA%pW{@#d~izx~*MPV`?=U<@^Pu+X3t|vT&g_O8l*MC1=QGt?3 z@c!W79052Ujk2zzgRi1d!+I1+dP$_WH;&i)1aOy`*fvArM!QkPKIrlASTJa|WAQn= zcD<9@_k6yEz|YJs(8+k5k3%6gStK!|V)qXWFm>gM+1I~GfB&&m07_C9sTQ|sJ25#) zbuh@q>1or?{&vlp>y@2_lCt~ziY#@waKP$5e`0cy$4ru#Nm6lDwergSGY2ByZvjr{ zUaMZ1(LzR>xCWC{#_S91y}7N@+6XvrnxCN<3td7x8=34z&XYjee1S=pa}VJq{_ z$c}8e> zEOo?m0E?$IOVgFq8LJBx5(vU?*uA?gb8kh@Wcin*&dCayUyA_^$nxK_H;0T^OUpg! zW7Y@e3H%VLW7bh4C8fUY-1#N220?fwok(t%O#=boVI$y;dtkP;wt7(2*MVPS;XEOu zwt+U_EwdLua=q-a6?hg{V__~0_#8p_5KTLTEKga1A=vW$Wch~(f)7o5h}3nP6~GUe md)?*&@IU5Ww>h8dtG@%
+