Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
b9556f0
initial commit
May 10, 2022
920125f
initial commit
May 10, 2022
ff8cfad
config
May 11, 2022
082ad59
getting jinja set up, does not fully work
May 11, 2022
9499293
progress
May 12, 2022
5dabbcf
work on updating to jinja and django-jinja
May 12, 2022
8f30410
wip
May 12, 2022
df7025f
switched some more
May 13, 2022
b433c6a
auth updates
May 16, 2022
341c978
add new svgs
May 16, 2022
c08b43b
fix current time
May 16, 2022
d8bbc66
add new svg
May 16, 2022
fbbdbba
some fixes
May 16, 2022
e3e90f2
login logout functionality works, now styling is left
May 16, 2022
3c3fac3
progress
May 16, 2022
4c7c033
update password stuff
May 16, 2022
3a39cca
random chart
May 17, 2022
880aa70
work on consistent styling
May 17, 2022
4e350b0
reformat jinja files
May 17, 2022
c01b597
update some package versions
May 17, 2022
be39faf
create account base
May 17, 2022
469a682
create account base
May 17, 2022
a8262ba
implement account_base
May 17, 2022
af8b8f1
things are looking good
May 17, 2022
c6f699f
things seem mostly done
May 18, 2022
587f5c7
update npm
May 18, 2022
e6290b2
update npm
May 18, 2022
dcabcc2
delete dtl templates
May 18, 2022
b79b685
Merge pull request #1 from AidanG1/feature/jinja
AidanG1 May 18, 2022
cd4b99c
tailwind
May 20, 2022
4e07eb3
button start
May 20, 2022
5c56916
more button
May 20, 2022
a625eea
fix up button and make components page
May 20, 2022
2d3a08e
button work
May 23, 2022
5a8d9c0
fix cr things
May 24, 2022
991bf71
fix cr
May 24, 2022
feb1fbe
button progress
May 25, 2022
53d9d7c
button
May 26, 2022
06c5154
add base styles
May 26, 2022
f98fc6b
heading styles
May 26, 2022
dce9513
wip
May 26, 2022
94f6c37
toggle wip
May 31, 2022
c9cde6b
toggles looking good
May 31, 2022
190b5bb
Merge pull request #2 from AidanG1/feature/toggle
AidanG1 May 31, 2022
b3dcbad
radio
Jun 3, 2022
fc2dd0d
documentation wip
Jun 6, 2022
aea28dc
basic documentation done
Jun 9, 2022
c41a6c4
documentation progress
Jun 13, 2022
e3c18ec
remove documentation from radio
Jun 15, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,9 @@ Temporary Items
.directory


### VS Code ###
.vscode/

### PyCharm ###
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm

Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ repos:
name: djlint
entry: poetry run djlint --reformat
language: system
types_or: [html]
types_or: [html,jinja]

## system
- repo: https://github.com/asottile/pyupgrade
Expand Down
16 changes: 14 additions & 2 deletions .stylelintrc
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,25 @@
"tailwind",
"components",
"utilities",
"screen"
"screen",
"layer"
]
}],
"block-no-empty": true,
"color-no-invalid-hex": true,
"declaration-colon-space-after": "always",
"scss/at-import-partial-extension": null,
"scss/at-rule-no-unknown": [ true, {
"ignoreAtRules": [
"extends",
"apply",
"tailwind",
"components",
"utilities",
"screen",
"layer"
]
}],
"indentation": 2,
"max-empty-lines": 2,
"rule-empty-line-before": [
Expand All @@ -29,4 +41,4 @@
}
]
}
}
}
32 changes: 32 additions & 0 deletions frontend/css/app-base.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,35 @@
*
*/
@import "@/css/app.scss";


@layer base {
h1 {
@apply text-4xl font-bold mb-3;
}

h2 {
@apply text-3xl font-bold mb-2;
}


h3 {
@apply text-3xl font-semibold mb-2;
}

h4 {
@apply text-2xl font-semibold mb-1;
}

h5 {
@apply text-xl mb-1;
}

h6 {
@apply text-lg;
}

ul {
@apply list-disc list-inside;
}
}
1 change: 0 additions & 1 deletion frontend/css/app-components.css
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,5 @@
/* @import './pages/homepage.pcss'; */

@import "@/css/components/messages.scss";
@import "@/css/components/buttons.scss";
@import "@/css/components/links.scss";
@import "@/css/components/forms.scss";
6 changes: 0 additions & 6 deletions frontend/css/components/buttons.scss

This file was deleted.

4 changes: 2 additions & 2 deletions frontend/css/components/links.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.link {
@apply cursor-pointer no-underline;
@apply text-indigo-500;
@apply text-indigo-600;
@apply hover:underline;
@apply hover:text-indigo-700;
@apply hover:text-indigo-800;
}
Loading