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.

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

CONCD-675 Refactor simple pages #2250

Merged
merged 3 commits into from
Jan 29, 2024
Merged

Conversation

rasarkar
Copy link
Collaborator

@rasarkar rasarkar marked this pull request as ready for review January 29, 2024 18:41
@jkueloc jkueloc merged commit 316fcf8 into feature-tutorial Jan 29, 2024
3 checks passed
@rasarkar rasarkar deleted the CONCD-675-rsar-simple-pages branch February 2, 2024 13:56
rasarkar added a commit that referenced this pull request Feb 12, 2024
* CONCD-675 refactor Simple Pages (WiP)

* CONCD-675 setup codemirror

* CONCD-675 add new field to the template
jkueloc pushed a commit that referenced this pull request Feb 13, 2024
* CONCD-488 Delete Quick Tips module, but keep Simple Content Blocks (for now)

* CONCD-492 Create database tables for Tutorial slides (Requires DB Migration) (#2086)

* CONCD-492 Create database tables for Tutorial slides (WiP)

* CONCD-492 I don't actually want this to display as 'Tutorial Cards' in the admin

* CONCD-492 Card display, sort order

* CONCD-488 Delete Quick Tips module in Django admin (#2084)

* CONCD-488 Delete Quick Tips module in Django admin

* CONCD-488 database change (Requires Migration)

* CONCD-488 no idea where auth 0013 came from

* CONCD-491 post_save signal handler (#2094)

* CONCD-491 post_save signal handler

* CONCD-491 trying to resolve a merge conflict

* CONCD-531 conflicting migrations (#2105)

* CONCD-482 Build Tutorial popup and cards navigation (WiP)

* CONCD-482 Modal dialog (WiP)

* CONCD-480 Create manual link for opening tutorial (#2119)

* CONCD-480 Create manual link for opening tutorial

* CONCD-480 toggle modal

* CONCD-482 dialog layout (WiP)

* CONCD-482 Work in Progress

* CONCD-482 Bootstrap carousel

* CONCD-482 Carousel styling (WiP)

* CONCD-482 header, close button

* CONCD-482 style fixes

* CONCD-482 card images

* CONCD-482 The first card should not have a Back button

* CONCD-482 Borders

* CONCD-480 Link text should be bolded, cursor should change to a hand when hovering over the link.

* CONCD-482 Change Meta options on Card (ordering) and Tutorial Card (verbose_name_plural)

* CONCD-482 field order

* CONCD-480 Link should be underlined (#2134)

* CONCD-530 Add rich text editor for django admin fields (WiP)

* CONCD-530 added django-tinymce to Pipfile.lock

* CONCD-530 all of Pipfile.lock needs to be updated (instead of just adding a single entry)

* CONCD-530 still getting the Pipfile.lock error

* CONCD-483 Implement tutorial popup rules based on session activity and user type (WiP)

* CONCD-483 show modal

* CONCD-483 if user is not logged in, remove key from local storage

* CONCD-483 if an anonymouse user navigates to another page in the site and comes back, the popup should automatically open again

* CONCD-483 moved session code to base template

* CONCD-530 numlist, searchreplace, wordcount

* CONCD-483 fixed an issue (#2155)

* CONCD-483 fixed an issue where, if a user navigated to an asset, tutorial was not popping up

* CONCD-483 don't set the key and then immediately clear it

* CONCD-576 When adding cards to a family, display card title (rather than the ID/ pk) (#2184)

* CONCD-576 When adding cards to a family, display card title (WiP)

* CONCD-576 need to actually include the js

* CONCD-576 actually got it working, although the color is off

* CONCD-276 changed the text to a link

* CONCD-576 added unit test for new view

* CONCD-590 database migrations (#2186)

* CONCD-590 migration for class meta (card, tutorialcard)

* CONCD-590 trying to resolve an error in the feature branch

* CONCD-590 cherry-picked a commit with missing libraries (#2194)

Co-authored-by: joshuastegmaier <jstegmaier@loc.gov>

* CONCD-576 trigger when popup is dismissed (#2197)

* CONCD-629 Create data model for How To Guide (#2208)

* CONCD-630 Create database tables for How To Guide (#2218)

* CONCD-630 Create database tables for How To Guide

* CONCD-630 body field should support rich text

* CONCD-630 re-numbered migration

* CONCD-588 Add card display heading, create date, and campaign fields (#2224)

* CONCD-588 Add card display heading, create date, and campaign fields (WiP)

* CONCD-588 add create date as sortable field

* CONCD-588 add a campaign filter (WiP)

* CONCD-588 implement campaign filter

* CONCD-588 I don't believe that we should actually add a new campaign field

* CONCD-480, 482, 483 redoing a bunch of changes that had gotten stomped by a bad merge

* CONCD-588 use Card.display_heading

* Initial implementation of maintenance mode (#2227) (#2231)

* Initial implementation of maintenance mode. Updated pre-commit-config to allow 256k files. Rolled back stylelint packages so they actually work.

* Fixed typo in 503 error page

Co-authored-by: Josh Stegmaier <104993387+joshuastegmaier@users.noreply.github.com>

* CONCD-592 (#2233)

* Bump jinja2 from 3.1.2 to 3.1.3 (#2229)

Bumps [jinja2](https://github.com/pallets/jinja) from 3.1.2 to 3.1.3.
- [Release notes](https://github.com/pallets/jinja/releases)
- [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst)
- [Commits](pallets/jinja@3.1.2...3.1.3)

---
updated-dependencies:
- dependency-name: jinja2
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* CONCD-646 Simple unit test (#2232)

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* CONCD-650 Build front end for How To Guide (#2235)

* CONCD-650 Build front end for How To Guide (WiP)

* CONCD-650 I'm struggling to get this to work using bootstrap, so for now I'm going to implement it using only html and css

* CONCD-650 just barely started working on the actual layout

* CONCD-650 misc style fixes

* CONCD-650 implementing the various guides as custom panes

* CONCD-650 I think that it actually makes more sense to organize these as a carousel

* CONCD-650 fixed the issue with the 'hamburger' icon not being rendered correctly

* CONCD-650 moved the button/ label to the side

* CONCD-650 About this Campaign

* CONCD-650 Helpful links

* CONCD-650 minor fixes. I think the carousel works a lot better, if we just remove the 'slide' class

* CONCD-650 while the guide is 'hidden', its border shouldn't be visible

* CONCD-650 some code clean-up

* CONCD-650 A couple things (#2243)

* CONCD-650 slide indices were off by 1

* CONCD-650 pointer: cursor

* CONCD-651 Share data between simple pages and guides (#2242)

* CONCD-651 Share data between simple pages and guides

* CONCD-650 slide indices were off by 1

* CONCD-651 fixing an issue where view tests were failing

* CONCD-650 Initial feedback (#2245)

* CONCD-650 Make the X to escape out always available

* CONCD-650 Also make the guide closeable at any time by hitting ESC

* CONCD-650 the padding around the transcription box is missing

* CONCD-650 Reduce padding around both the How to Guide heading and the section title

* CONCD-650 Campaign.description

* CONCD-650 added padding above Helpful Links

* CONCD-650 reduced font size of Helpful Links

* Modified daily data backfill functions to split them using tasks and allow date data to be passed in from the admin (#2246) (#2247)

* Modified daily data backfill functions to split them using tasks and allow date data to be psssed in from the admin

* Updated black version in pre-commit config

* Updated black version to lint files

* Linted one other file

Co-authored-by: Josh Stegmaier <104993387+joshuastegmaier@users.noreply.github.com>

* CONCD-675 Refactor simple pages (#2250)

* CONCD-675 refactor Simple Pages (WiP)

* CONCD-675 setup codemirror

* CONCD-675 add new field to the template

* CONCD-674 display heading data has not yet been added (#2251)

* CONCD-674 display heading data has not yet been added

* CONCD-674 set the dialog box to one standard height (WiP)

* CONCD-674 fixed an issue where controls weren't always clickable

* CONCD-674 alt text

* CONCD-674 display heading should not be larger than the title (#2254)

* CONCD-650 A few more mostly small tweaks (#2255)

* CONCD-650 going to try moving the guide outside of the editor column

* CONCD-650 adjusting the vertical positioning of the guide

* CONCD-650 additional padding between the About this Campaign sections

* CONCD-650 fixed a bug where the external link symbol was being displayed next to loc.gov links

* CONCD-650 reduced font of Helpful Links

* CONCD-650 Change title to 'How-To Guide'

* CONCD-650 fixed an issue where css was having unintended consequences

* CONCD-650 trying to fix an issue where the modal cannot be interacted with, unless there is at least one guide object

* CONCD-650 center name in the title bar vertically

* CONCD-650 center X vertically

* CONCD-650 trying to make the 'x' consistent across guide sections

* CONCD-675 pull content for Simple Page from the corresponding Guide (#2258)

* CONCD-675 pull content for Simple Page from the corresponding Guide section (rather than the reverse)

* CONCD-675 reverting older changes

* CONCD-588 Card fields (#2262)

* CONCD-588 order the new fields a little more logically

* CONCD-588 added updated_on field to Card model (Requires Migration)

* CONCD-588 set Card.updated_on (Requires Migration)

* CONCD-588 renumbered migrations

* CONCD-675 How to transcribe (#2264)

* CONCD-675 exception for transcription page (WiP)

* CONCD-675 exception for transcription page

* CONCD-675 reverting this change (will no longer be needed) (#2267)

* CONCD-674 rsar reduce padding (#2270)

* CONCD-674 reduce some padding slightly

* CONCD-674 close button should align with header

* CONCD-674 set height dynamically

* CONCD-650 move title bar out of carousel (#2272)

* CONCD-650 I want to try moving the title bar outside of the carousel (WiP)

* CONCD-650 I think the title bar looks better works better outside of the carousel

* CONCD-650 show/ hide the 'hamburger' icon

* CONCD-675 include intro text from simple page body (#2273)

* Concd 650 rsar guide tweaks (#2274)

* CONCD-650 within text areas, set headers to the same size as text (1 rem) but bolded

* CONCD-650 add 8px of padding above the H3s

* CONCD-654 squashed migrations

* CONCD-654 these are now controlled through the admin, and should no longer be in settings

* CONCD-654 removed all prettier and stylelint libraries from package.json

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: joshuastegmaier <jstegmaier@loc.gov>
Co-authored-by: Josh Stegmaier <104993387+joshuastegmaier@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants