Skip to content

Commit b8f07f1

Browse files
committed
Templates & static assets re-arranged to match views structure
1 parent 9fddc78 commit b8f07f1

File tree

244 files changed

+1123
-1338
lines changed

Some content is hidden

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

244 files changed

+1123
-1338
lines changed

.bowerrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"directory": "app/static/admin/lib"
2+
"directory": "app/static/vendor"
33
}

.codeclimate.yml

-31
This file was deleted.

.dockerignore

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ app.db
2323
.idea/
2424
.bundle/
2525

26-
# Static files at 'app/static/admin/lib'
27-
lib/
26+
# Static files at 'app/static/vendor'
27+
app/static/vendor
2828
node_modules
2929

3030
# event export files

.editorconfig

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ insert_final_newline = true
99
trim_trailing_whitespace = true
1010

1111
[*.html]
12-
indent_size = 2
12+
indent_size = 4
1313

1414
[*.js]
1515
indent_size = 4
1616

1717
[*.css]
18-
indent_size = 2
18+
indent_size = 4

.env

-1
This file was deleted.

.eslintignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
**/*{.,-}min.js
2+
app/static/js/vendor/**/*.js

.gitignore

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ app.db
1616
.idea/
1717
.bundle/
1818

19-
# Static files at 'app/static/admin/lib'
20-
lib/
19+
# Static files at 'app/static/vendor'
20+
app/static/vendor
2121
node_modules
2222

2323
# event export files

app.json

+32-32
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
{
2-
"name": "Open Event Org server",
3-
"description": "A fully functional conference event management system using flask",
4-
"repository": "https://github.com/fossasia/open-event-orga-server/",
5-
"logo": "http://labs.fossasia.org/images/fossasia.png",
6-
"keywords": [
7-
"open-event",
8-
"fossasia",
9-
"flask"
10-
],
11-
"env": {
12-
"APP_SECRET_TOKEN": {
13-
"generator": "secret"
2+
"name": "Open Event Org server",
3+
"description": "A fully functional conference event management system using flask",
4+
"repository": "https://github.com/fossasia/open-event-orga-server/",
5+
"logo": "http://labs.fossasia.org/images/fossasia.png",
6+
"keywords": [
7+
"open-event",
8+
"fossasia",
9+
"flask"
10+
],
11+
"env": {
12+
"APP_SECRET_TOKEN": {
13+
"generator": "secret"
14+
},
15+
"ON_HEROKU": "true",
16+
"FORCE_SSL": "true",
17+
"INVITATION_CODE": {
18+
"generator": "secret"
19+
}
1420
},
15-
"ON_HEROKU": "true",
16-
"FORCE_SSL": "true",
17-
"INVITATION_CODE": {
18-
"generator": "secret"
19-
}
20-
},
21-
"addons":[
22-
"heroku-postgresql:hobby-dev",
23-
"heroku-redis:hobby-dev"
24-
],
25-
"buildpacks":[
26-
{
27-
"url":"heroku/python"
28-
},
29-
{
30-
"url":"heroku/nodejs"
31-
}
21+
"addons": [
22+
"heroku-postgresql:hobby-dev",
23+
"heroku-redis:hobby-dev"
3224
],
33-
"scripts": {
34-
"postdeploy": "python manage.py initialize_db -c [email protected]:fossasia"
35-
}
25+
"buildpacks": [
26+
{
27+
"url": "heroku/python"
28+
},
29+
{
30+
"url": "heroku/nodejs"
31+
}
32+
],
33+
"scripts": {
34+
"postdeploy": "python manage.py initialize_db -c [email protected]:fossasia"
35+
}
3636
}

app/static/css/custom.min.css

-7
This file was deleted.

app/static/css/custom/common.css

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
.top_nav .nav .open>a:hover {
1616
background: transparent;
17-
background-color: transparent;
1817
}
1918

2019
ul.msg_list li.notif-menu-li a {
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)