Skip to content

Commit 6fe8788

Browse files
Shweta4321Shweta4321
committed
votes
1 parent 9ee3be5 commit 6fe8788

16 files changed

+384
-241
lines changed

‎Procfile

100755100644
File mode changed.

‎cosmos

-1
This file was deleted.

‎cosmos_search/settings.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@
4545
# Application definition
4646

4747
INSTALLED_APPS = [
48-
'update.apps.UpdateConfig',
49-
'search.apps.SearchConfig',
5048
'django.contrib.admin',
5149
'django.contrib.auth',
5250
'django.contrib.contenttypes',
5351
'django.contrib.sessions',
5452
'django.contrib.messages',
5553
'django.contrib.staticfiles',
54+
'update.apps.UpdateConfig',
55+
'search.apps.SearchConfig',
5656
]
5757

5858
MIDDLEWARE = [

‎manage.py

100755100644
File mode changed.

‎runtime.txt

100755100644
File mode changed.

‎search/admin.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
from django.contrib import admin # noqa
1+
from django.contrib import admin
22

3-
# Register your models here.
3+
from search.models import Votes
4+
admin.site.register(Votes)

‎search/form.py

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
from django import forms
2+
from .models import Votes
3+
4+
5+
VOTES_CHOICES = [
6+
('1', ''),
7+
('2', ''),
8+
['3', ''],
9+
('4', ''),
10+
('5', ''),
11+
]
12+
13+
14+
class VotesForm(forms.Form):
15+
project_name = forms.CharField(max_length=500, required=False)
16+
ip_address = forms.CharField(max_length=50, required=False)
17+
vote_value = forms.ChoiceField(VOTES_CHOICES, required=True,
18+
widget=forms.RadioSelect(attrs={"onclick": "this.form.submit();",
19+
"class": "votes",
20+
"data-fa-icon": "&#xf005"}))
21+
22+
def save(self):
23+
u = Votes.objects.create(
24+
project_name=self.cleaned_data['project_name'],
25+
vote_value=self.cleaned_data['vote_value'],
26+
ip_address=self.cleaned_data['ip_address'],
27+
)
28+
u.save()
29+
return u

‎search/models.py

+17-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1-
from django.db import models # noqa
1+
from django.db import models
22

3-
# Create your models here.
3+
VOTES_CHOICES = [
4+
('1', '1'),
5+
('2', '2'),
6+
('3', '3'),
7+
('4', '4'),
8+
('5', '5'),
9+
]
10+
11+
12+
class Votes(models.Model):
13+
project_name = models.CharField(max_length=500, null=True, blank=True)
14+
vote_value = models.CharField(choices=VOTES_CHOICES, default='1', max_length=20, null=True)
15+
ip_address = models.CharField(max_length=50, null=True, blank=True)
16+
17+
def __str__(self):
18+
return self.vote_value

‎search/static/css/calculator.css

+74-129
Original file line numberDiff line numberDiff line change
@@ -1,168 +1,113 @@
11
#calculator {
2-
width: 475px;
2+
width: 40% !important;
3+
min-width: 320px;
34
height: auto;
45

5-
margin: 100px auto;
6-
padding: 20px 20px 9px;
6+
margin: 0 auto;
7+
padding: 1em;
78

89
background: #949494;
9-
/*background: linear-gradient(#9dd2ea, #8bceec);*/
10-
border-radius: 3px;
11-
}
12-
.cal-top{
13-
position: relative;
14-
top: -70px;
15-
}
16-
/* Top portion */
17-
.top span.clear {
18-
float: left;
10+
box-shadow: .15em .15em .15em rgba(0, 0, 0, .2);
11+
border-radius: .2em;
1912
}
2013

21-
/* Inset shadow on the screen to create indent */
22-
.top .screen {
23-
height: 65px;
24-
width: 426px;
25-
float: left;
26-
padding: 10px 10px;
27-
background: rgb(255, 255, 255);
28-
border-radius: 3px;
29-
/*box-shadow: inset 0px 4px rgba(0, 0, 0, 0.2);*/
30-
font-size: 17px;
31-
line-height: 40px;
32-
color: white !important;
33-
text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.2);
34-
text-align: right;
35-
letter-spacing: 1px;
36-
margin-bottom: 2%;
14+
#calculator * {
15+
border-radius: .2em;
16+
border: none;
17+
outline: none;
18+
cursor: pointer;
3719
}
3820

39-
/* Clear floats */
40-
.keys, .top {
41-
overflow: hidden;
21+
#calculator input {
22+
background: white;
23+
text-shadow: .1em .1em .1em rgba(0, 0, 0, .1);
4224
}
4325

44-
/* Applying same to the keys */
45-
.keys span, .top span.clear {
46-
float: left;
47-
position: relative;
48-
top: 0;
49-
50-
cursor: pointer;
51-
52-
width: 65px;
53-
height: 36px;
54-
26+
/* Inset shadow on the screen to create indent */
27+
.screen {
28+
width: 100%;
29+
padding: .5em;
30+
margin: .5em 0;
31+
font-size: 1em;
32+
line-height: 1.25em;
33+
color: white;
5534
background: white;
56-
border-radius: 3px;
57-
box-shadow: 0px 2px rgba(0, 0, 0, 0.2);
58-
59-
margin: 0 7px 11px 0;
60-
61-
line-height: 36px;
62-
text-align: center;
63-
64-
/* prevent selection of text inside keys */
65-
user-select: none;
66-
67-
/* Smoothing out hover and active states using css3 transitions */
68-
transition: all 0.2s ease;
35+
box-shadow: .15em .15em .15em rgba(0, 0, 0, .2);
6936
}
7037

71-
/* Remove right margins from operator keys */
72-
/* style different type of keys (operators/evaluate/clear) differently */
73-
.keys span.operator {
74-
background: #FFF0F5;
75-
margin-right: 0;
38+
#resultText {
39+
width: 100%;
40+
height: 70%;
41+
text-align: right;
42+
font-size: 1.2em;
43+
outline: none;
7644
}
7745

78-
.keys span.eval {
79-
background: #a6e3e4;
80-
/*box-shadow: 0px 4px #9da853;*/
81-
46+
#seq {
47+
width: 100%;
48+
height: 30%;
49+
text-align: right;
50+
font-size: .75em;
8251
}
8352

84-
.top span.clear {
85-
background: #ff9fa8;
86-
box-shadow: 0px 4px #ff7c87;
87-
color: white;
53+
.keys-row {
54+
width: 100%;
55+
display: flex;
56+
flex-wrap: wrap;
8857
}
8958

90-
/* Some hover effects */
91-
.keys span:hover {
92-
background: #d9d5ec;
93-
color: white;
59+
.keys-col-4 {
60+
width: calc(100% / 12 * 4);
9461
}
9562

96-
.keys span.eval:hover {
97-
background: #96cfd0;
98-
/*box-shadow: 0px 4px #717a33;*/
99-
color: #ffffff;
100-
}
101-
input#seq:focus {
102-
outline: none;
103-
background: transparent;
104-
}
105-
.top span.clear:hover {
106-
background: #f68991;
107-
box-shadow: 0px 4px #d3545d;
108-
color: white;
63+
.keys-col-8 {
64+
width: calc(100% / 12 * 8);
10965
}
11066

111-
.keys span:active {
112-
top: 4px;
67+
.adv-keys span {
68+
width: calc(100% / 2 - .2em);
69+
margin: .1em;
11370
}
11471

115-
.keys span.eval:active {
116-
box-shadow: 0px 0px #717a33;
117-
top: 4px;
72+
.base-keys span{
73+
width: calc(100% / 4 - .2em);
74+
margin: .1em;
11875
}
11976

120-
.top span.clear:active {
121-
top: 4px;
122-
box-shadow: 0px 0px #d3545d;
77+
/* Applying same to the keys */
78+
.keys * {
79+
float: left;
80+
width: 100%;
81+
box-shadow: .1em .1em .1em rgba(0, 0, 0, .2);
82+
text-align: center;
83+
84+
/* prevent selection of text inside keys */
85+
user-select: none;
86+
87+
/* Smoothing out hover and active states using css3 transitions */
88+
transition: all .2s ease;
12389
}
12490

125-
.sp {
126-
margin-right: 7px !important;
91+
/* Remove right margins from operator keys */
92+
/* style different type of keys (operators/evaluate/clear) differently */
93+
.keys .operator input {
94+
background: #FFF0F5 !important;
12795
}
12896

129-
input {
130-
border: none;
131-
background: none;
97+
.keys .eval input {
98+
background: #a6e3e4 !important;
13299
}
133100

134-
.clear {
101+
.keys .clear input {
135102
background: #dcbd5e !important;
136-
color: #fff;
137103
}
138104

139-
input.num {
140-
width: 100% !important;
141-
}
142-
input.num:focus {
143-
outline: none;
144-
}
145-
input#resultText {
146-
outline: none;
147-
padding-bottom: 4px;
148-
width: 100%;
149-
float: right;
150-
text-align: right;
151-
height: 15px;
152-
position: relative;
153-
top: -10px;
105+
/* Some hover effects */
106+
.keys span:hover {
107+
opacity: .75;
108+
top: .1em;
154109
}
155-
input[type="text"], textarea {
156-
background-color: rgb(255, 255, 255);
157-
background-image: none;
158-
color: rgb(0, 0, 0);
110+
111+
.keys *:active {
112+
top: .1em;
159113
}
160-
input#seq {
161-
width: 100%;
162-
text-align: right;
163-
padding: 0px !important;
164-
margin: 0px !important;
165-
position: relative;
166-
top: -15px;
167-
font-size: 10px;
168-
}

0 commit comments

Comments
 (0)