Skip to content

Commit fa95f5f

Browse files
Abdur-rahmaanJAbdur-rahmaanJ
authored
Merge pull request #334 from shopyo/feat/back-revamp
wip: Add revamp backend structure
2 parents b16b2f1 + 7e6dabf commit fa95f5f

90 files changed

Lines changed: 33459 additions & 496 deletions

File tree

Some content is hidden

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

‎.pre-commit-config.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,3 @@ repos:
2222
- id: end-of-file-fixer
2323
- id: check-yaml
2424
- id: debug-statements
25-
- id: check-added-large-files

‎README.md‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
<div align="center">
2+
3+
4+
5+
<img src="https://github.com/Abdur-rahmaanJ/shopcube/raw/main/assets/logo.png" width="200" />
6+
7+
[![First Timers Only](https://img.shields.io/badge/first--timers--only-friendly-blue.svg)](https://www.firsttimersonly.com/)
8+
9+
🇲🇺
10+
11+
</div>
12+
13+
14+
115
# Welcome to pythoncms
216

317

@@ -45,8 +59,12 @@ Each theme must have
4559

4660
```
4761
index.html
62+
base.html
4863
contact.html
4964
page.html
65+
login.html
66+
register.html
67+
unconfirmed.html
5068
```
5169

5270
- info.json
@@ -57,3 +75,31 @@ page.html
5775
"version": "1.0.20000000000003"
5876
}
5977
```
78+
79+
## Info json
80+
81+
```
82+
{
83+
"display_string": "Admin",
84+
"type": "show", // hidden if hide
85+
"icons":{
86+
"fa": "fas fa-user-lock", // set according to ACTIVE_ICONSET
87+
"boxicons": "", // set according to ACTIVE_ICONSET
88+
"file": "icon.svg" // if present, will be used and searched for
89+
// in module/static. Make sure to shopyo collecstatic in production
90+
},
91+
"url_prefix": "/appadmin",
92+
"menu": {
93+
"list users":"/", // url-prefix will be concatenated with it for sub menus.
94+
"add user": "/add",
95+
"roles":"/roles"
96+
},
97+
"menu-type": "show-menu", // or no-menu. Expects menu key if show-menu.
98+
"module_name": "appadmin",
99+
"author": {
100+
"name":"Abdur-Rahmaan Janhangeer",
101+
"website":"https://www.pythonkitchen.com/about-me/",
102+
"mail":"arj.python@gmail.com"
103+
}
104+
}
105+
```

‎assets/logo.png‎

14.2 KB
Loading

‎pythoncms/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version_info = (1, 0, 1)
1+
version_info = (1, 1, 0)
22
__version__ = ".".join([str(v) for v in version_info])

‎pythoncms/app.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
from flask_admin import Admin
1919
from flask_admin.menu import MenuLink
2020
from flask_login import current_user
21+
from shopyo.api.assets import get_static
2122
from shopyo.api.assets import register_devstatic
2223
from shopyo.api.debug import is_yo_debug
2324
from shopyo.api.file import trycopy
@@ -260,6 +261,7 @@ def inject_global_vars():
260261
"APP_NAME": APP_NAME,
261262
"len": len,
262263
"current_user": current_user,
264+
"get_static": get_static,
263265
}
264266
base_context.update(global_template_variables)
265267

‎pythoncms/config_demo.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"settings": {
77
"APP_NAME": "Demo",
88
"ACTIVE_FRONT_THEME": "editorial",
9-
"ACTIVE_BACK_THEME": "boogle",
10-
"CURRENCY": "MUR"
9+
"ACTIVE_BACK_THEME": "sneat",
10+
"CURRENCY": "MUR",
11+
"ACTIVE_ICONSET": "boxicons"
1112
}
1213
}

pythoncms/migrations/versions/a72dfd73a091_.py renamed to pythoncms/migrations/versions/7d11df1f6a08_.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
"""empty message
22
3-
Revision ID: a72dfd73a091
3+
Revision ID: 7d11df1f6a08
44
Revises:
5-
Create Date: 2023-02-01 00:26:33.820602
5+
Create Date: 2023-02-03 10:49:33.700710
66
77
"""
88
import sqlalchemy as sa
99
from alembic import op
1010

1111

1212
# revision identifiers, used by Alembic.
13-
revision = "a72dfd73a091"
13+
revision = "7d11df1f6a08"
1414
down_revision = None
1515
branch_labels = None
1616
depends_on = None

‎pythoncms/modules/box__default/appadmin/info.json‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
11
{
22
"display_string": "Admin",
33
"type": "show",
4-
"fa-icon": "fas fa-user-lock",
4+
"icons":{
5+
"fa": "fas fa-user-lock",
6+
"boxicons": "bx bx-shield"
7+
},
58
"url_prefix": "/appadmin",
9+
"menu": {
10+
"list users":"/",
11+
"add user": "/add",
12+
"roles":"/roles"
13+
},
614
"module_name": "appadmin",
715
"author": {
816
"name":"Abdur-Rahmaan Janhangeer",

‎pythoncms/modules/box__default/appadmin/static/icon.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎pythoncms/modules/box__default/appadmin/templates/appadmin/add.html‎

Lines changed: 45 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,57 @@
1-
{% extends "base/module_base.html" %}
2-
{% set active_page = "admin" %}
3-
{% block pagehead %}
4-
<title>{{active_page.capitalize()}}</title>
5-
<style>
6-
.hidden {
7-
display: none;
8-
}
1+
{% extends get_active_back_theme()+"/base.html" %}
92

10-
.show {
11-
display: inline-block;
12-
}
13-
14-
.active {
15-
width: 6rem;
16-
color: white;
17-
background-color: #34ce57;
18-
}
19-
20-
.inactive {
21-
width: 6rem;
22-
color: white;
23-
background-color: #ff253a;
24-
}
25-
26-
.all_inactive {
27-
display: none;
28-
}
29-
</style>
30-
{% endblock %}
31-
{% block sidebar %}
32-
{%include 'appadmin/blocks/sidebar.html'%}
3+
{%block head%}
4+
<script src="{{url_for('static', filename='jquery_3.2.1.min.js')}}"></script>
335
{%endblock%}
6+
347
{% block content %}
35-
<br>
36-
<div class="container col-md-6 off-set-3">
37-
<div class="card">
38-
<div class="card-body">
39-
<form action="/appadmin/add" method="post">
40-
<div class="input-group mb-3">
41-
<div class="input-group-prepend">
42-
<span class="input-group-text"><i class="fa fa-user"></i></span>
8+
<div class="container">
9+
<br>
10+
<a href="{{ url_for('appadmin.user_list') }}">
11+
<button type="button" class="btn rounded-pill btn-icon btn-primary">
12+
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" style="fill: rgb(255, 255, 255);transform: ;msFilter:;"><path d="M21 11H6.414l5.293-5.293-1.414-1.414L2.586 12l7.707 7.707 1.414-1.414L6.414 13H21z"></path></svg>
13+
</button>
14+
</a>
15+
<br>
16+
<div class="container col-md-6 off-set-3">
17+
<div class="card">
18+
<div class="card-body">
19+
<form action="/appadmin/add" method="post">
20+
<div class="input-group mb-3">
21+
<input type="email" name="email" class="form-control" id="email" placeholder="Email" required autocomplete="off">
4322
</div>
44-
<input type="email" name="email" class="form-control" id="email" placeholder="Email" required autocomplete="off">
45-
</div>
46-
<div class="input-group mb-3">
47-
<div class="input-group-prepend">
48-
<span class="input-group-text"><i class="fa fa-key"></i></span>
23+
<div class="input-group mb-3">
24+
<input type="password" name="password" class="form-control" id="user_password" placeholder="Password" required autocomplete="off">
4925
</div>
50-
<input type="password" name="password" class="form-control" id="user_password" placeholder="Password" required autocomplete="off">
51-
</div>
52-
<div class="input-group mb-3">
53-
<div class="input-group-prepend">
54-
<span class="input-group-text"><i class="fa fa-key"></i></span>
26+
<div class="input-group mb-3">
27+
<input type="text" name="first_name" class="form-control" placeholder="First Name" autocomplete="off">
5528
</div>
56-
<input type="text" name="first_name" class="form-control" placeholder="First Name" autocomplete="off">
57-
</div>
58-
<div class="input-group mb-3">
59-
<div class="input-group-prepend">
60-
<span class="input-group-text"><i class="fa fa-key"></i></span>
29+
<div class="input-group mb-3">
30+
31+
<input type="text" name="last_name" class="form-control" placeholder="Last Name" autocomplete="off">
6132
</div>
62-
<input type="text" name="last_name" class="form-control" placeholder="Last Name" autocomplete="off">
63-
</div>
64-
<div class="input-group mb-3">
65-
<div class="custom-control custom-checkbox">
66-
<input type="checkbox" name="is_admin" class="custom-control-input" id="is_admin" value="True" checked>
67-
<label for="is_admin" class="custom-control-label">Admin User</label>
33+
<div class="input-group mb-3">
34+
<div class="custom-control custom-checkbox">
35+
<input type="checkbox" name="is_admin" class="custom-control-input" id="is_admin" value="True" checked>
36+
<label for="is_admin" class="custom-control-label">Admin User</label>
37+
</div>
6838
</div>
69-
</div>
70-
<table class="table">
71-
<tbody>
72-
{%for role in roles%}
73-
<tr>
74-
<td><input type="checkbox" name="role_{{role.id}}"></td>
75-
<td>{{role.name}}</td>
76-
</tr>
77-
{%endfor%}
78-
</tbody>
79-
</table>
80-
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
81-
<input type="submit" class="btn btn-info" value="add" required>
82-
</form>
39+
<table class="table">
40+
<tbody>
41+
{%for role in roles%}
42+
<tr>
43+
<td><input type="checkbox" name="role_{{role.id}}"></td>
44+
<td>{{role.name}}</td>
45+
</tr>
46+
{%endfor%}
47+
</tbody>
48+
</table>
49+
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
50+
<input type="submit" class="btn btn-info" value="add" required>
51+
</form>
52+
</div>
8353
</div>
8454
</div>
8555
</div>
56+
8657
{% endblock %}

0 commit comments

Comments
 (0)