Commit Graph

315 Commits

Author SHA1 Message Date
Andreas Zweili
7247681ebb readd two commands
I removed the lines by accident they broke the apache configuration
2017-12-30 19:01:04 +01:00
Ivan Hörler
d500712dc2 changed some of the views and implemented a more selfish perspective of a shop.
For shure not ideal and in NO way DRY but a solution for now.
2017-12-29 22:32:27 +01:00
Ivan Hörler
dc083d9c5e Merge branch 'currency' into frontendstyling
* currency: (25 commits)
  changed view and deleted the database unique filed
  add tableview in /currencies
  checkout the production branch on the production server
  add a registration
  disable debugging for production
  add a user profile
  extend the base template with login, profile and logout links
  add templates to support user authentication
  add url patterns to support user authentication
  remove an unnecessary shebang
  remove unnecessary attributes from the Person model
  redirect logins back to the index
  make imports more explicit
  remove an unnecessary configuration
  remove an old file
  change the article status to active
  change the content include because the org-mode file is called doku
  add a python package to the ansible role
  add fixtures with test data
  Add date to currencies list
  ...

# Conflicts:
#	Vagrantfile
#	ansible/roles/web_AI-5/tasks/main.yml
#	django/didgeridoo/didgeridoo/settings.py
#	django/didgeridoo/webshop/templates/webshop/base.html
2017-12-29 19:43:16 +01:00
Ivan Hörler
487c96710a Merge commit 'ee7232cd502afbf15f36769da0835b4a1e1358df' into currency
* commit 'ee7232cd502afbf15f36769da0835b4a1e1358df':
  checkout the production branch on the production server
  add a registration
  disable debugging for production
  add a user profile
  extend the base template with login, profile and logout links
  add templates to support user authentication
  add url patterns to support user authentication
  remove an unnecessary shebang
  remove unnecessary attributes from the Person model
  redirect logins back to the index
  make imports more explicit
  remove an unnecessary configuration
  remove an old file
  change the article status to active
  change the content include because the org-mode file is called doku
  add a python package to the ansible role
  add fixtures with test data
  fix the admin view of order of goods
  added sketch of Siteview to docs
2017-12-29 19:28:31 +01:00
Ivan Hörler
19afc446ed changed view and deleted the database unique filed 2017-12-29 19:26:01 +01:00
Ivan Hörler
13805f790d add tableview in /currencies 2017-12-29 17:02:33 +01:00
Andreas Zweili
ee7232cd50 Merge branch 'master' into production 2017-12-29 16:53:05 +01:00
Andreas Zweili
d07067dcac checkout the production branch on the production server 2017-12-29 16:52:19 +01:00
Andreas Zweili
ddd4001fb3 Merge branch 'master' into production 2017-12-29 16:46:48 +01:00
Andreas Zweili
1f3ab70dd6 add a registration 2017-12-29 16:46:21 +01:00
Ivan Hörler
7bb875e696 selfmade css file 2017-12-29 15:12:29 +01:00
Ivan Hörler
45ca9ca55e unfinshed atempt to make a nav abandoned for later use maybe 2017-12-29 15:11:45 +01:00
Andreas Zweili
c229194e50 disable debugging for production 2017-12-29 11:04:48 +01:00
Andreas Zweili
d8a1d9ef54 add a user profile 2017-12-28 19:22:00 +01:00
Andreas Zweili
59db6e221e extend the base template with login, profile and logout links 2017-12-28 19:21:29 +01:00
Andreas Zweili
de3e07dedb add templates to support user authentication 2017-12-28 19:20:28 +01:00
Andreas Zweili
56e56f0c1c add url patterns to support user authentication 2017-12-28 19:19:47 +01:00
Andreas Zweili
516dd47493 remove an unnecessary shebang 2017-12-28 19:15:35 +01:00
Andreas Zweili
fce1a6a8c2 remove unnecessary attributes from the Person model 2017-12-28 19:14:41 +01:00
Andreas Zweili
acafb61399 redirect logins back to the index 2017-12-28 19:14:00 +01:00
Andreas Zweili
f9f1c89a01 make imports more explicit 2017-12-28 16:40:04 +01:00
Andreas Zweili
f48c316f39 remove an unnecessary configuration 2017-12-28 16:26:54 +01:00
Andreas Zweili
e518669698 remove an old file 2017-12-28 16:23:22 +01:00
Andreas Zweili
48eee1c00b change the article status to active 2017-12-28 16:23:02 +01:00
Andreas Zweili
9589f0f980 change the content include because the org-mode file is called doku 2017-12-28 16:20:22 +01:00
Andreas Zweili
fc34c3fa4c add a python package to the ansible role 2017-12-27 19:35:36 +01:00
Andreas Zweili
6ddd869722 add fixtures with test data 2017-12-27 19:33:29 +01:00
Ivan Hörler
cea3252322 add bootstrap to ansible and vagrant for django-bootstrap3 support 2017-12-27 19:32:14 +01:00
Ivan Hörler
318d599a2f Add date to currencies list 2017-12-27 18:17:14 +01:00
Andreas Zweili
f6597ec69e fix the admin view of order of goods 2017-12-27 15:10:12 +01:00
Ivan Hörler
3aaf5ee62c added sketch of Siteview to docs 2017-12-27 09:26:30 +01:00
Ivan Hörler
1b7252a669 Merge branch 'master' into currency
* master:
  fix a typo
  move some parts from the vagrant file into a separate script
  make the setup script executable
  fix a typo
  add a setup script to the ansible role
  add a pip install routine to the ansible role
  add the repository to the ansible role
  fix a typo in the ansbible role
  add missing packages to the ansible role
  add a list of allowed hosts to the django settings
  change ansible includes to import_tasks
  extend the admin interface for the order class
  add an intermediate class between order and article
  add a date field to the orders class
  sort city outputs by zip code
  update readme with more up to date information
2017-12-26 13:03:20 +01:00
Ivan Hörler
9061e66151 Duno if thats your and my config and has to be ignored but for now il commit it. 2017-12-26 13:02:19 +01:00
Andreas Zweili
2b8f41725c fix a typo 2017-12-25 22:50:42 +01:00
Andreas Zweili
16a854012d move some parts from the vagrant file into a separate script
This way both vagrant and ansible can use the script
2017-12-25 22:47:04 +01:00
Andreas Zweili
630d46fb4d make the setup script executable 2017-12-25 22:39:34 +01:00
Andreas Zweili
05cb259a30 fix a typo 2017-12-25 22:39:26 +01:00
Andreas Zweili
78eeb91f03 add a setup script to the ansible role 2017-12-25 22:34:38 +01:00
Andreas Zweili
058dc79bef add a pip install routine to the ansible role 2017-12-25 22:33:17 +01:00
Andreas Zweili
6fdad5704f add the repository to the ansible role 2017-12-25 22:33:01 +01:00
Andreas Zweili
ba2776336e fix a typo in the ansbible role 2017-12-25 22:32:37 +01:00
Andreas Zweili
ee449c4176 add missing packages to the ansible role 2017-12-25 22:32:24 +01:00
Andreas Zweili
054909b145 add a list of allowed hosts to the django settings 2017-12-25 22:32:07 +01:00
Andreas Zweili
49ac7f71a3 change ansible includes to import_tasks 2017-12-25 22:31:47 +01:00
Andreas Zweili
0ef5cdff80 extend the admin interface for the order class
In order to be able to correctly edit the an order we need the
information of the induvidual order positions. In addition a better
layout is required to better find the information.
2017-12-21 23:07:58 +01:00
Andreas Zweili
f4aa223135 add an intermediate class between order and article
Because we need additional fields in an order it's necessary to add an
additional class where the information gets stored.
2017-12-21 23:06:09 +01:00
Andreas Zweili
3dc9aa33bb add a date field to the orders class
In order to be able to identify the correct customer order it's
necessary to have the date of the order available.
2017-12-21 23:05:10 +01:00
Andreas Zweili
991fbfc6f5 sort city outputs by zip code 2017-12-20 19:51:49 +01:00
Andreas Zweili
7b3ecdf5f5 update readme with more up to date information 2017-12-20 19:48:12 +01:00
Ivan Hörler
4da981e5d6 Merge commit 'bc3b14b5dd697f1784acbcbfa0ef0948de4ef560' into currency
* commit 'bc3b14b5dd697f1784acbcbfa0ef0948de4ef560':
  add a base.html file and refactor the other html files
  refactor the views
2017-12-19 22:38:21 +01:00