Skip to content
This repository was archived by the owner on Mar 10, 2018. It is now read-only.

Commit f499a76

Browse files
dialexdialex
committed
rename daas to dcid
1 parent 0b907ea commit f499a76

File tree

16 files changed

+231
-34
lines changed

16 files changed

+231
-34
lines changed

‎.gitattributes‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Auto detect text files and perform LF normalization
2+
* text=auto
3+
4+
# Custom for Visual Studio
5+
*.cs diff=csharp
6+
*.sln merge=union
7+
*.csproj merge=union
8+
*.vbproj merge=union
9+
*.fsproj merge=union
10+
*.dbproj merge=union
11+
12+
# Standard to msysgit
13+
*.doc diff=astextplain
14+
*.DOC diff=astextplain
15+
*.docx diff=astextplain
16+
*.DOCX diff=astextplain
17+
*.dot diff=astextplain
18+
*.DOT diff=astextplain
19+
*.pdf diff=astextplain
20+
*.PDF diff=astextplain
21+
*.rtf diff=astextplain
22+
*.RTF diff=astextplain

‎.gitignore‎

Lines changed: 165 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,165 @@
1+
#settings.py #customized for you machine
2+
3+
#################
4+
## Eclipse
5+
#################
6+
7+
*.pydevproject
8+
.project
9+
.metadata
10+
bin/
11+
tmp/
12+
*.tmp
13+
*.bak
14+
*.swp
15+
*~.nib
16+
local.properties
17+
.classpath
18+
.settings/
19+
.loadpath
20+
21+
# External tool builders
22+
.externalToolBuilders/
23+
24+
# Locally stored "Eclipse launch configurations"
25+
*.launch
26+
27+
# CDT-specific
28+
.cproject
29+
30+
# PDT-specific
31+
.buildpath
32+
33+
34+
#################
35+
## Visual Studio
36+
#################
37+
38+
## Ignore Visual Studio temporary files, build results, and
39+
## files generated by popular Visual Studio add-ons.
40+
41+
# User-specific files
42+
*.suo
43+
*.user
44+
*.sln.docstates
45+
46+
# Build results
47+
[Dd]ebug/
48+
[Rr]elease/
49+
*_i.c
50+
*_p.c
51+
*.ilk
52+
*.meta
53+
*.obj
54+
*.pch
55+
*.pdb
56+
*.pgc
57+
*.pgd
58+
*.rsp
59+
*.sbr
60+
*.tlb
61+
*.tli
62+
*.tlh
63+
*.tmp
64+
*.vspscc
65+
.builds
66+
*.dotCover
67+
68+
## TODO: If you have NuGet Package Restore enabled, uncomment this
69+
#packages/
70+
71+
# Visual C++ cache files
72+
ipch/
73+
*.aps
74+
*.ncb
75+
*.opensdf
76+
*.sdf
77+
78+
# Visual Studio profiler
79+
*.psess
80+
*.vsp
81+
82+
# ReSharper is a .NET coding add-in
83+
_ReSharper*
84+
85+
# Installshield output folder
86+
[Ee]xpress
87+
88+
# DocProject is a documentation generator add-in
89+
DocProject/buildhelp/
90+
DocProject/Help/*.HxT
91+
DocProject/Help/*.HxC
92+
DocProject/Help/*.hhc
93+
DocProject/Help/*.hhk
94+
DocProject/Help/*.hhp
95+
DocProject/Help/Html2
96+
DocProject/Help/html
97+
98+
# Click-Once directory
99+
publish
100+
101+
# Others
102+
[Bb]in
103+
[Oo]bj
104+
sql
105+
TestResults
106+
*.Cache
107+
ClientBin
108+
stylecop.*
109+
~$*
110+
*.dbmdl
111+
Generated_Code #added for RIA/Silverlight projects
112+
113+
# Backup & report files from converting an old project file to a newer
114+
# Visual Studio version. Backup files are not needed, because we have git ;-)
115+
_UpgradeReport_Files/
116+
Backup*/
117+
UpgradeLog*.XML
118+
119+
120+
121+
############
122+
## Windows
123+
############
124+
125+
# Windows image file caches
126+
Thumbs.db
127+
128+
# Folder config file
129+
Desktop.ini
130+
131+
132+
#############
133+
## Python
134+
#############
135+
136+
*.py[co]
137+
138+
# Packages
139+
*.egg
140+
*.egg-info
141+
dist
142+
build
143+
eggs
144+
parts
145+
bin
146+
var
147+
sdist
148+
develop-eggs
149+
.installed.cfg
150+
151+
# Installer logs
152+
pip-log.txt
153+
154+
# Unit test / coverage reports
155+
.coverage
156+
.tox
157+
158+
#Translations
159+
*.mo
160+
161+
#Mr Developer
162+
.mr.developer.cfg
163+
164+
# Mac crap
165+
.DS_Store

‎LICENSE.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
 Description here...
22

33
Copyright (C) 2012
4-
Diogo Nunes, ...
4+
Diogo Nunes, Cátia Ferreira, Paulo Martins, Rafael Santos, ...
55

66
This program is free software: you can redistribute it and/or modify it under
77
the terms of the GNU General Public License version 3 as published by the

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
#dcid
1+
#dcid
22

3-
**Decisão do Cidadão, é você que dcid!**
3+
**Decisão do Cidadão, é você que dcid!**

‎apache/apache_django_wsgi.conf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
Alias /images/ "c:/wamp/www/daas/templates/images/"
2-
<Directory "c:/wamp/www/daas/images>
1+
Alias /images/ "c:/wamp/www/dcid/templates/images/"
2+
<Directory "c:/wamp/www/dcid/images>
33
Order allow,deny
44
Allow from all
55
</Directory>
66

7-
#WSGIScriptAlias / "c:/wamp/www/daas/apache/django.wsgi"
7+
WSGIScriptAlias / "c:/wamp/www/dcid/apache/django.wsgi"
88

9-
<Directory "c:/wamp/www/daas/apache">
9+
<Directory "c:/wamp/www/dcid/apache">
1010
Allow from all
1111
</Directory>

‎apache/django.wsgi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import os, sys
22

3-
sys.path.append('c:/wamp/www/daas')
4-
os.environ['DJANGO_SETTINGS_MODULE'] = 'daas.settings'
3+
sys.path.append('c:/wamp/www/dcid')
4+
os.environ['DJANGO_SETTINGS_MODULE'] = 'dcid.settings'
55

66
import django.core.handlers.wsgi
77
application = django.core.handlers.wsgi.WSGIHandler()

‎dcid/settings.py‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Django settings for daas project.
1+
# Django settings for dcid project.
22

33
DEBUG = True
44
TEMPLATE_DEBUG = DEBUG
@@ -11,11 +11,11 @@
1111

1212
DATABASES = {
1313
'default': {
14-
'ENGINE': 'django.db.backends.mysql', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
15-
'NAME': 'dcid_db', # Or path to database file if using sqlite3.
16-
'USER': 'admin', # Not used with sqlite3.
17-
'PASSWORD': 'admin', # Not used with sqlite3.
18-
'HOST': '', # Set to empty string for localhost. Not used with sqlite3.
14+
'ENGINE': 'django.db.backends.mysql', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
15+
'NAME': 'dcid_db', # Or path to database file if using sqlite3.
16+
'USER': 'admin', # Not used with sqlite3.
17+
'PASSWORD': 'admin', # Not used with sqlite3.
18+
'HOST': 'localhost', # Set to empty string for localhost. Not used with sqlite3.
1919
'PORT': '', # Set to empty string for default. Not used with sqlite3.
2020
}
2121
}
@@ -78,7 +78,7 @@
7878
)
7979

8080
# Make this unique, and don't share it with anybody.
81-
SECRET_KEY = '!e)5^#c572+s#@b1r8r$3&amp;g$_=#^jl)%%ht!%_rr1qc1vjnb&amp;b'
81+
SECRET_KEY = '_5s047mnm!*flrgn)es8@kzigeqnarc2s@_q9wxkwve5c60f!5'
8282

8383
# List of callables that know how to import templates from various sources.
8484
TEMPLATE_LOADERS = (
@@ -103,8 +103,10 @@
103103
WSGI_APPLICATION = 'dcid.wsgi.application'
104104

105105
TEMPLATE_DIRS = (
106-
"/home/paulo/code4pt/dcid/templates/",
107-
# Strings here, like "/home/html/django_templates" or "C:/www/django/templates". ALWAYS use forward slashes.
106+
"C:/wamp/www/dcid/templates/",
107+
# Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
108+
# Always use forward slashes, even on Windows.
109+
# Don't forget to use absolute paths, not relative paths.
108110
)
109111

110112
INSTALLED_APPS = (

‎dcid/urls.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
url(r'^admin/', include(admin.site.urls)),
99

1010
# Examples:
11-
# url(r'^$', 'daas.views.home', name='home'),
11+
# url(r'^$', 'dcid.views.home', name='home'),
1212
# Uncomment the admin/doc line below to enable admin documentation:
1313
# url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
1414
)

‎dcid/wsgi.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""
2-
WSGI config for daas project.
2+
WSGI config for dcid project.
33
44
This module contains the WSGI application used by Django's development server
55
and any production WSGI deployments. It should expose a module-level variable
@@ -15,7 +15,7 @@
1515
"""
1616
import os
1717

18-
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "daas.settings")
18+
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "dcid.settings")
1919

2020
# This application object is used by any WSGI server configured to use this
2121
# file. This includes Django's development server, if the WSGI_APPLICATION

‎manage.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import sys
44

55
if __name__ == "__main__":
6-
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "daas.settings")
6+
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "dcid.settings")
77

88
from django.core.management import execute_from_command_line
99

0 commit comments

Comments
 (0)