Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Account System + Tailwind Implementation #96

Merged
merged 92 commits into from
Oct 24, 2023
Merged

Account System + Tailwind Implementation #96

Changes from 1 commit
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
97287c6
installed tailwind
RuikangRPI Sep 19, 2023
7489e82
Merge branch 'main' into Tailwind
noahcussatti Sep 19, 2023
d156707
feat: Implemented Tailwind
noahcussatti Sep 21, 2023
3f55fb7
linting fixes
noahcussatti Sep 21, 2023
d6f5cae
Update settings.py
noahcussatti Sep 21, 2023
05c7a66
Added django-compressor
noahcussatti Sep 21, 2023
0b192b5
navbar revamp
RuikangRPI Sep 22, 2023
eda0f9a
Merge branch 'main' into Tailwind
noahcussatti Sep 25, 2023
c1de76c
feat: Implemented Django components
noahcussatti Sep 26, 2023
e1804f4
Created new registration form
matthewglanz Sep 26, 2023
0bade48
Added customizable registration form
matthewglanz Sep 26, 2023
e9f03e2
Merge branch 'main' into Tailwind
noahcussatti Sep 26, 2023
f8e0061
Added login page for registration verification
matthewglanz Sep 26, 2023
5ea61bb
Added login navbar item and redirect to home
matthewglanz Sep 27, 2023
0d3e460
feat: Implemented select field
noahcussatti Sep 29, 2023
974dfe1
feat; Finished tailwind page templates/components
noahcussatti Oct 3, 2023
b72ba73
Linting errors
noahcussatti Oct 3, 2023
5aa41b2
More linting
noahcussatti Oct 3, 2023
683ef4e
Update select.py
noahcussatti Oct 3, 2023
8e5b81a
Enabled Admin View
matthewglanz Oct 3, 2023
3a61fa8
Added relevant admin models
matthewglanz Oct 3, 2023
80736b5
upload
RuikangRPI Oct 3, 2023
d4532c1
added temporary navbar
noahcussatti Oct 3, 2023
3d5e8b8
Added secure superuser credentials and logout
matthewglanz Oct 3, 2023
9e4a8a6
Added placeholder profile page, extended navbar to new pages
matthewglanz Oct 3, 2023
94a74ab
Added logout redirect to home
matthewglanz Oct 3, 2023
0a7cf0c
Update the navbar in _base.html
JustinBanzon Oct 4, 2023
400ed5c
Added newline for Lint check
matthewglanz Oct 6, 2023
ad58059
alert upload
RuikangRPI Oct 6, 2023
85fd00d
fix: Navbar "Search" dropdown works correctly
noahcussatti Oct 6, 2023
1bee7f8
linting fixes
noahcussatti Oct 6, 2023
8dfd8bb
Delete tailwind.min.css
noahcussatti Oct 6, 2023
1c0857c
More linting fixes
noahcussatti Oct 6, 2023
6aac126
linting fixes
RuikangRPI Oct 6, 2023
a43124f
linting fix
RuikangRPI Oct 6, 2023
bde9b85
linting fix
RuikangRPI Oct 6, 2023
2c6f812
linting fix
RuikangRPI Oct 6, 2023
042dbb6
linting fix
RuikangRPI Oct 6, 2023
b4b82d5
linting fix
RuikangRPI Oct 6, 2023
62220eb
Removed django_compressor
noahcussatti Oct 10, 2023
f5eb402
Merge branch 'main' into Tailwind
noahcussatti Oct 10, 2023
71f172c
Fixed issues with compressor and bootstrap remnants
noahcussatti Oct 10, 2023
169a27a
Added a concept for a login page
JustinBanzon Oct 12, 2023
b8a5d04
Update upload-manually.html
noahcussatti Oct 12, 2023
1668e94
Merge branch 'Tailwind' of https://github.com/ACMAS/ACMAS-Frontend in…
JustinBanzon Oct 12, 2023
ca793a2
Revert "Added a concept for a login page"
JustinBanzon Oct 12, 2023
a76b6b5
fixed issue with select component
noahcussatti Oct 13, 2023
ec0b6ee
Enabled password change ability on profile page
matthewglanz Oct 13, 2023
a6ff9a5
Customized pages based on login status
matthewglanz Oct 13, 2023
38a8c83
Removed upload functionality for logged out users and locked pages
matthewglanz Oct 13, 2023
4f48f68
Linter fixes
matthewglanz Oct 17, 2023
7a0a032
Additional linter fixes
matthewglanz Oct 17, 2023
004f444
Adjusted import order
matthewglanz Oct 17, 2023
6a0cd67
Merge branch 'main' into New-Master-Accounts
matthewglanz Oct 17, 2023
623dbfd
More lint fixes
matthewglanz Oct 17, 2023
8017407
Merge branch 'New-Master-Accounts' of https://github.com/ACMAS/ACMAS-…
matthewglanz Oct 17, 2023
3ee581f
More Lint
matthewglanz Oct 17, 2023
f16f584
Linter
matthewglanz Oct 17, 2023
5b8782f
Whitespace fixes
matthewglanz Oct 17, 2023
4a4ed67
Whitespace fixes
matthewglanz Oct 17, 2023
79be07b
Removed tab
matthewglanz Oct 17, 2023
df866fb
Updates to .env
matthewglanz Oct 17, 2023
02a9742
Added newline at end of file
matthewglanz Oct 17, 2023
bd9e426
Added quotes to .env to fix linter issue
jaw12346 Oct 17, 2023
4da7c74
Fixed tab error
matthewglanz Oct 17, 2023
3e4f146
Adjusted Admin title
matthewglanz Oct 17, 2023
81e781a
Fixed model and spacing in view
matthewglanz Oct 17, 2023
59b4858
Linter stuff
matthewglanz Oct 17, 2023
588303e
feat: popup & icon
RuikangRPI Oct 17, 2023
1b008da
linting fixes
RuikangRPI Oct 17, 2023
938827a
Removed duplicate admin from urls
matthewglanz Oct 17, 2023
0e1df95
Removed unused import
matthewglanz Oct 17, 2023
17fb88a
lint fixes
RuikangRPI Oct 17, 2023
c2c48ad
Added check for existing superuser
matthewglanz Oct 17, 2023
b12e70b
Updated verbose names for classes
matthewglanz Oct 17, 2023
a136729
Removed Indentation
matthewglanz Oct 17, 2023
4518388
Removed whitespace
matthewglanz Oct 17, 2023
ff60c43
popup restructure & added corner position
RuikangRPI Oct 17, 2023
45c8a2b
Merge pull request #95 from ACMAS/New-Master-Accounts
jaw12346 Oct 18, 2023
fea686e
feat: toast
RuikangRPI Oct 19, 2023
e0149bc
lint fix
RuikangRPI Oct 19, 2023
171549d
lint fix
RuikangRPI Oct 19, 2023
880e839
Merge branch 'Tailwind' into login_tailwind
noahcussatti Oct 20, 2023
7a282c3
Fixed merge conflicts
noahcussatti Oct 20, 2023
ff7da93
Merge branch 'Tailwind' into login_tailwind
noahcussatti Oct 20, 2023
d3f19f8
Fix for checking if admin exists
matthewglanz Oct 20, 2023
7782832
Please Linter
matthewglanz Oct 20, 2023
98dda2e
Linter Fixes
matthewglanz Oct 22, 2023
413deca
LINT
matthewglanz Oct 22, 2023
0cbc0d6
LINT FIXES
matthewglanz Oct 22, 2023
c975f71
Updates for linter
matthewglanz Oct 22, 2023
7a2935e
Implemented requested changes
noahcussatti Oct 23, 2023
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
Prev Previous commit
Next Next commit
Merge branch 'main' into Tailwind
  • Loading branch information
@noahcussatti
noahcussatti committed Sep 19, 2023
commit 7489e8252c9aee4170e45330abc8980538427e7d

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.