Skip to content

Commit 2b9974d

Browse files
ag2byteag2byte
committed
1st commit-more to come
0 parents  commit 2b9974d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+998
-0
lines changed

Diff for: ‎.vscode/settings.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"python.linting.pylintEnabled": false,
3+
"python.linting.flake8Enabled": true,
4+
"python.linting.enabled": false,
5+
"python.pythonPath": "C:\\Users\\Abhigyan Gautam\\AppData\\Local\\Programs\\Python\\Python38-32\\python.exe"
6+
}

Diff for: ‎REadme.MD

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Capstone Project under work
2+
3+
This is an incomplete project.
4+
Multiple changes will occur in the next few days before it is finally ready
5+
6+
The readme will change for the final version

Diff for: ‎Requirements.txt

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
django
2+
djangorestframework

Diff for: ‎capstone/__init__.py

Whitespace-only changes.

Diff for: ‎capstone/__pycache__/__init__.cpython-38.pyc

133 Bytes
Binary file not shown.

Diff for: ‎capstone/__pycache__/admin.cpython-38.pyc

174 Bytes
Binary file not shown.

Diff for: ‎capstone/__pycache__/models.cpython-38.pyc

387 Bytes
Binary file not shown.

Diff for: ‎capstone/__pycache__/urls.cpython-38.pyc

434 Bytes
Binary file not shown.

Diff for: ‎capstone/__pycache__/views.cpython-38.pyc

1.99 KB
Binary file not shown.

Diff for: ‎capstone/admin.py

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
from django.contrib import admin
2+
3+
# Register your models here.

Diff for: ‎capstone/apps.py

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
from django.apps import AppConfig
2+
3+
4+
class CapstoneConfig(AppConfig):
5+
name = 'capstone'

Diff for: ‎capstone/migrations/0001_initial.py

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# Generated by Django 3.0.7 on 2020-10-31 15:38
2+
3+
import django.contrib.auth.models
4+
import django.contrib.auth.validators
5+
from django.db import migrations, models
6+
import django.utils.timezone
7+
8+
9+
class Migration(migrations.Migration):
10+
11+
initial = True
12+
13+
dependencies = [
14+
('auth', '0011_update_proxy_permissions'),
15+
]
16+
17+
operations = [
18+
migrations.CreateModel(
19+
name='User',
20+
fields=[
21+
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
22+
('password', models.CharField(max_length=128, verbose_name='password')),
23+
('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
24+
('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')),
25+
('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')),
26+
('first_name', models.CharField(blank=True, max_length=30, verbose_name='first name')),
27+
('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')),
28+
('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')),
29+
('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')),
30+
('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')),
31+
('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
32+
('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups')),
33+
('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions')),
34+
],
35+
options={
36+
'verbose_name': 'user',
37+
'verbose_name_plural': 'users',
38+
'abstract': False,
39+
},
40+
managers=[
41+
('objects', django.contrib.auth.models.UserManager()),
42+
],
43+
),
44+
]

Diff for: ‎capstone/migrations/0002_delete_user.py

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Generated by Django 3.0.7 on 2020-10-31 15:41
2+
3+
from django.db import migrations
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('capstone', '0001_initial'),
10+
]
11+
12+
operations = [
13+
migrations.DeleteModel(
14+
name='User',
15+
),
16+
]

Diff for: ‎capstone/migrations/0003_user.py

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# Generated by Django 3.0.7 on 2020-10-31 15:43
2+
3+
import django.contrib.auth.models
4+
import django.contrib.auth.validators
5+
from django.db import migrations, models
6+
import django.utils.timezone
7+
8+
9+
class Migration(migrations.Migration):
10+
11+
initial = True
12+
13+
dependencies = [
14+
('auth', '0011_update_proxy_permissions'),
15+
('capstone', '0002_delete_user'),
16+
]
17+
18+
operations = [
19+
migrations.CreateModel(
20+
name='User',
21+
fields=[
22+
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
23+
('password', models.CharField(max_length=128, verbose_name='password')),
24+
('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
25+
('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')),
26+
('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')),
27+
('first_name', models.CharField(blank=True, max_length=30, verbose_name='first name')),
28+
('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')),
29+
('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')),
30+
('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')),
31+
('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')),
32+
('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
33+
('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups')),
34+
('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions')),
35+
],
36+
options={
37+
'verbose_name': 'user',
38+
'verbose_name_plural': 'users',
39+
'abstract': False,
40+
},
41+
managers=[
42+
('objects', django.contrib.auth.models.UserManager()),
43+
],
44+
),
45+
]

Diff for: ‎capstone/migrations/__init__.py

Whitespace-only changes.

Diff for: ‎capstone/migrations/__pycache__/0001_initial.cpython-38.pyc

2.26 KB
Binary file not shown.

Diff for: ‎capstone/migrations/__pycache__/0002_delete_user.cpython-38.pyc

470 Bytes
Binary file not shown.

Diff for: ‎capstone/migrations/__pycache__/0003_user.cpython-38.pyc

2.29 KB
Binary file not shown.

Diff for: ‎capstone/migrations/__pycache__/__init__.cpython-38.pyc

144 Bytes
Binary file not shown.

Diff for: ‎capstone/models.py

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
from django.db import models
2+
from django.contrib.auth.models import AbstractUser
3+
4+
# Create your models here.
5+
6+
7+
class User(AbstractUser):
8+
pass
9+
10+
class Income(models.Model):
11+
#model for income
12+
user = models.ForeignKey(User, on_delete=models.CASCADE)
13+
date = models.DateField(auto_now=True)
14+
summary = models.CharField(max_length=128)
15+
inc_type = models.CharField(choices=['Salary','Others'])
16+
17+
class Expense(models.Model):
18+
#model for expense
19+
user = models.ForeignKey(User, on_delete=models.CASCADE)
20+
date = models.DateField(auto_now=True)
21+
summary = models.CharField(max_length=128)
22+
exp_type = models.CharField(choices=['Food','Rent','Entertainment','Business','Misc'])

Diff for: ‎capstone/package-lock.json

+57
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎capstone/static/capstone/css/index.css

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
.top-name {
2+
height: 50px;
3+
margin-right: 5%;
4+
/* position: absolute; */
5+
text-align-last: right;
6+
font-weight: 800;
7+
color: #415bad;
8+
font-family: "Open Sans", arial;
9+
font-size: 40px;
10+
}

Diff for: ‎capstone/static/capstone/css/layout.css

+146
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,146 @@
1+
:root {
2+
font-size: 16px;
3+
font-family: 'Open Sans';
4+
--text-primary: #b6b6b6;
5+
--text-secondary: #ececec;
6+
--bg-primary: #0b0722;
7+
--bg-secondary: #415bad;
8+
9+
10+
}
11+
12+
body {
13+
color: black;
14+
background-color: white;
15+
margin: 0;
16+
padding: 0;
17+
}
18+
19+
body::-webkit-scrollbar {
20+
width: 0.25rem;
21+
}
22+
23+
body::-webkit-scrollbar-track {
24+
background: #1e1e24;
25+
}
26+
27+
body::-webkit-scrollbar-thumb {
28+
background: #4F4D9F;
29+
}
30+
31+
main {
32+
margin-left: 5rem;
33+
padding: 1rem;
34+
}
35+
36+
.navbar {
37+
position: fixed;
38+
width: 5rem;
39+
height: 100vh;
40+
background-color: var(--bg-primary);
41+
transition: 200ms ease;
42+
}
43+
44+
.navbar-nav {
45+
list-style: none;
46+
padding: 0;
47+
margin: 0;
48+
display: flex;
49+
flex-direction: column;
50+
align-items: center;
51+
height: 100%;
52+
}
53+
54+
.nav-item {
55+
width: 100%;
56+
}
57+
58+
.nav-item:last-child {
59+
margin-top: auto;
60+
}
61+
62+
.nav-link {
63+
display: flex;
64+
align-items: center;
65+
height: 5rem;
66+
color: var(--text-primary);
67+
text-decoration: none;
68+
filter: grayscale(100%) opacity(0.7);
69+
transition: var(--transition-speed);
70+
}
71+
72+
.nav-link svg {
73+
min-width: 2rem;
74+
margin: 0 1.5rem;
75+
}
76+
77+
.link-text {
78+
display: none;
79+
margin-left: 1rem;
80+
}
81+
82+
.nav-link:hover {
83+
filter: grayscale(0%) opacity(1);
84+
background: var(--bg-secondary);
85+
color: var(--text-secondary);
86+
}
87+
88+
89+
.navbar:hover {
90+
width: 16rem;
91+
92+
}
93+
94+
.navbar:hover .link-text {
95+
display: block;
96+
color: white;
97+
font-weight: 300;
98+
}
99+
100+
@media only screen and (max-width: 600px) {
101+
.navbar {
102+
bottom: 0;
103+
width: 100vw;
104+
height: 5rem;
105+
}
106+
107+
.logo {
108+
display: none;
109+
}
110+
111+
.navbar-nav {
112+
flex-direction: row;
113+
}
114+
115+
.nav-link {
116+
justify-content: center;
117+
}
118+
119+
main {
120+
margin: 0;
121+
}
122+
}
123+
124+
@media only screen and (min-width: 600px) {
125+
.navbar {
126+
top: 0;
127+
width: 5rem;
128+
height: 100vh;
129+
}
130+
131+
.navbar:hover {
132+
width: 16rem;
133+
}
134+
135+
.navbar:hover .link-text {
136+
display: inline;
137+
}
138+
139+
.navbar:hover .logo svg {
140+
margin-left: 11rem;
141+
}
142+
143+
.navbar:hover .logo-text {
144+
left: 0px;
145+
}
146+
}

0 commit comments

Comments
 (0)